Skip to content

Commit

Permalink
Merge branch 'main' of github.com:cloudscape-design/components into f…
Browse files Browse the repository at this point in the history
…eat-table-progressive-loading
  • Loading branch information
pan-kot committed May 29, 2024
2 parents 538f61d + cb92fe2 commit 8c85dc9
Show file tree
Hide file tree
Showing 32 changed files with 39 additions and 113 deletions.
2 changes: 1 addition & 1 deletion pages/app-layout/fill-content-area.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Navigation, Tools, Breadcrumbs } from './utils/content-blocks';
import * as toolsContent from './utils/tools-content';
import labels from './utils/labels';
import Box from '~components/box';
import { getIsRtl } from '~components/internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

export default function () {
return (
Expand Down
2 changes: 1 addition & 1 deletion pages/popover/container-test.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React, { useCallback, useMemo, useRef, useState } from 'react';
import ScreenshotArea from '../utils/screenshot-area';
import PopoverContainer from '~components/popover/container';
import { getIsRtl } from '~components/internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';
import clsx from 'clsx';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
Expand Down
2 changes: 1 addition & 1 deletion src/app-layout/__tests__/widgetized-layout.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
import React from 'react';
import { render } from '@testing-library/react';
import { createWidgetizedAppLayout } from '../../../lib/components/app-layout/widget';
import { createWidgetizedAppLayout } from '../../../lib/components/app-layout/implementation';
import { AppLayoutProps, AppLayoutPropsWithDefaults } from '../../../lib/components/app-layout/interfaces';
import { FlagsHolder, awsuiGlobalFlagsSymbol } from '../../../lib/components/internal/utils/global-flags';
import { useVisualRefresh } from '../../../lib/components/internal/hooks/use-visual-mode';
Expand Down
2 changes: 1 addition & 1 deletion src/app-layout/internal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { createWidgetizedAppLayout } from './widget';
import { createWidgetizedAppLayout } from './implementation';

export const AppLayoutInternal = createWidgetizedAppLayout();
2 changes: 1 addition & 1 deletion src/app-layout/utils/use-app-layout-placement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { useObservedElement } from './use-observed-element';
import { useResizeObserver } from '@cloudscape-design/component-toolkit/internal';
import { getLogicalBoundingClientRect } from '../../internal/direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

export function useAppLayoutPlacement(headerSelector: string, footerSelector: string) {
const mainElementRef = useRef<HTMLElement>(null);
Expand Down
6 changes: 5 additions & 1 deletion src/app-layout/utils/use-pointer-events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import { useCallback } from 'react';
import styles from '../styles.css.js';
import { SizeControlProps } from './interfaces';
import { getIsRtl, getLogicalClientX, getLogicalBoundingClientRect } from '../../internal/direction.js';
import {
getIsRtl,
getLogicalClientX,
getLogicalBoundingClientRect,
} from '@cloudscape-design/component-toolkit/internal';

export const usePointerEvents = ({
position,
Expand Down
2 changes: 1 addition & 1 deletion src/app-layout/visual-refresh/context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import useBackgroundOverlap from './use-background-overlap';
import { useDrawers } from '../utils/use-drawers';
import { useUniqueId } from '../../internal/hooks/use-unique-id';
import { SPLIT_PANEL_MIN_WIDTH } from '../split-panel';
import { getOffsetInlineStart } from '../../internal/direction';
import { getOffsetInlineStart } from '@cloudscape-design/component-toolkit/internal';

interface AppLayoutInternals extends AppLayoutPropsWithDefaults {
activeDrawerId: string | null;
Expand Down
3 changes: 0 additions & 3 deletions src/app-layout/widget.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/area-chart/internal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { useMergeRefs } from '../internal/hooks/use-merge-refs';
import { SomeRequired } from '../internal/types';
import { nodeBelongs } from '../internal/utils/node-belongs';
import { ChartWrapper } from '../internal/components/chart-wrapper';
import { getIsRtl } from '../internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

type InternalAreaChartProps<T extends AreaChartProps.DataTypes> = SomeRequired<
AreaChartProps<T>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { formatTicks, getSVGTextSize, getVisibleTicks } from './label-utils';
import { ChartDataTypes } from '../../../mixed-line-bar-chart/interfaces';
import { useInternalI18n } from '../../../i18n/context';
import ResponsiveText from '../responsive-text';
import { getIsRtl } from '../../direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

const OFFSET_PX = 12;

Expand Down
2 changes: 1 addition & 1 deletion src/internal/components/dropdown/dropdown-fit-handler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { getBreakpointValue } from '../../breakpoints';
import { getLogicalBoundingClientRect } from '../../direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';
import { BoundingBox, getOverflowParents, getOverflowParentDimensions } from '../../utils/scrollable-containers';
import styles from './styles.css.js';

Expand Down
2 changes: 1 addition & 1 deletion src/internal/components/dropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { useUniqueId } from '../../hooks/use-unique-id/index.js';
import customCssProps from '../../generated/custom-css-properties';
import { useResizeObserver } from '@cloudscape-design/component-toolkit/internal';
import { nodeBelongs } from '../../utils/node-belongs';
import { getLogicalBoundingClientRect } from '../../direction.js';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

interface DropdownContainerProps {
children?: React.ReactNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import React from 'react';
import { render } from '@testing-library/react';
import ResponsiveText from '../../../../../lib/components/internal/components/responsive-text';
import { getTextWidth } from '../../../../../lib/components/internal/components/responsive-text/responsive-text-utils';
import { getIsRtl } from '../../../../../lib/components/internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

jest.mock('../../../../../lib/components/internal/components/responsive-text/responsive-text-utils', () => ({
...jest.requireActual('../../../../../lib/components/internal/components/responsive-text/responsive-text-utils'),
getTextWidth: jest.fn().mockReturnValue(0),
}));

jest.mock('../../../../../lib/components/internal/direction', () => ({
...jest.requireActual('../../../../../lib/components/internal/direction'),
jest.mock('@cloudscape-design/component-toolkit/internal', () => ({
...jest.requireActual('@cloudscape-design/component-toolkit/internal'),
getIsRtl: jest.fn().mockReturnValue(false),
}));

Expand Down
2 changes: 1 addition & 1 deletion src/internal/components/responsive-text/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
import React, { memo, useEffect, useRef } from 'react';
import { getTextWidth } from './responsive-text-utils';
import { getIsRtl } from '../../direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

interface ResponsiveTextProps {
x: number;
Expand Down
72 changes: 0 additions & 72 deletions src/internal/direction.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/internal/utils/handle-key.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { KeyCode } from '../keycode';
import { getIsRtl } from '../direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

export function isEventLike(event: any): event is EventLike {
return event.currentTarget instanceof HTMLElement || event.currentTarget instanceof SVGElement;
Expand Down
6 changes: 3 additions & 3 deletions src/mixed-line-bar-chart/__tests__/mixed-chart.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { lineSeries3, renderMixedChart } from './common';
import createComputedTextLengthMock from './computed-text-length-mock';
import { KeyCode } from '@cloudscape-design/test-utils-core/dist/utils';
import positions from '../../../lib/components/popover/utils/positions';
import { getIsRtl } from '../../../lib/components/internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

jest.mock('../../../lib/components/popover/utils/positions', () => {
return {
Expand All @@ -21,8 +21,8 @@ jest.mock('../../../lib/components/popover/utils/positions', () => {
};
});

jest.mock('../../../lib/components/internal/direction', () => ({
...jest.requireActual('../../../lib/components/internal/direction'),
jest.mock('@cloudscape-design/component-toolkit/internal', () => ({
...jest.requireActual('@cloudscape-design/component-toolkit/internal'),
getIsRtl: jest.fn().mockReturnValue(false),
}));

Expand Down
2 changes: 1 addition & 1 deletion src/mixed-line-bar-chart/chart-container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { useMergeRefs } from '../internal/hooks/use-merge-refs';
import { nodeBelongs } from '../internal/utils/node-belongs';
import { CartesianChartContainer } from '../internal/components/cartesian-chart/chart-container';
import { useHeightMeasure } from '../internal/hooks/container-queries/use-height-measure';
import { getIsRtl } from '../internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

const INLINE_START_LABELS_MARGIN = 16;
const BLOCK_END_LABELS_OFFSET = 12;
Expand Down
6 changes: 3 additions & 3 deletions src/pie-chart/__tests__/responsive-text.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import React from 'react';
import { render, waitFor } from '@testing-library/react';
import ResponsiveText from '../../../lib/components/pie-chart/responsive-text';
import { renderTextContent } from '../../../lib/components/internal/components/responsive-text/index';
import { getIsRtl } from '../../../lib/components/internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

jest.mock('../../../lib/components/internal/components/responsive-text/index', () => ({
...jest.requireActual('../../../lib/components/internal/components/responsive-text/index'),
renderTextContent: jest.fn(),
}));

jest.mock('../../../lib/components/internal/direction', () => ({
...jest.requireActual('../../../lib/components/internal/direction'),
jest.mock('@cloudscape-design/component-toolkit/internal', () => ({
...jest.requireActual('@cloudscape-design/component-toolkit/internal'),
getIsRtl: jest.fn().mockReturnValue(false),
}));

Expand Down
2 changes: 1 addition & 1 deletion src/pie-chart/responsive-text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
import React, { memo, useEffect, useRef } from 'react';
import { renderTextContent } from '../internal/components/responsive-text';
import { getIsRtl } from '../internal/direction';
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';

interface ResponsiveTextProps {
x: number;
Expand Down
2 changes: 1 addition & 1 deletion src/popover/use-popover-position.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
scrollRectangleIntoView,
} from '../internal/utils/scrollable-containers';
import { getContainingBlock } from '../internal/utils/dom';
import { getLogicalBoundingClientRect } from '../internal/direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

export default function usePopoverPosition({
popoverRef,
Expand Down
2 changes: 1 addition & 1 deletion src/split-panel/__tests__/widgetized-panel.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { render } from '@testing-library/react';
import { FlagsHolder, awsuiGlobalFlagsSymbol } from '../../../lib/components/internal/utils/global-flags';
import { useVisualRefresh } from '../../../lib/components/internal/hooks/use-visual-mode';
import createWrapper from '../../../lib/components/test-utils/dom';
import { createWidgetizedSplitPanel } from '../../../lib/components/split-panel/widget';
import { createWidgetizedSplitPanel } from '../../../lib/components/split-panel/implementation';
import { SplitPanelProps } from '../../../lib/components/split-panel/interfaces';
import { SplitPanelContextProvider } from '../../../lib/components/internal/context/split-panel-context';
import { defaultSplitPanelContextProps } from './helpers';
Expand Down
2 changes: 1 addition & 1 deletion src/split-panel/internal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { createWidgetizedSplitPanel } from './widget';
import { createWidgetizedSplitPanel } from './implementation';

export const SplitPanelInternal = createWidgetizedSplitPanel();
3 changes: 0 additions & 3 deletions src/split-panel/widget.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/table/resizer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useStableCallback } from '@cloudscape-design/component-toolkit/internal
import { useUniqueId } from '../../internal/hooks/use-unique-id';
import { getHeaderWidth, getResizerElements } from './resizer-lookup';
import { useSingleTabStopNavigation } from '../../internal/context/single-tab-stop-navigation-context.js';
import { getIsRtl, getLogicalBoundingClientRect, getLogicalPageX } from '../../internal/direction.js';
import { getIsRtl, getLogicalBoundingClientRect, getLogicalPageX } from '@cloudscape-design/component-toolkit/internal';
import handleKey, { isEventLike } from '../../internal/utils/handle-key';

interface ResizerProps {
Expand Down
2 changes: 1 addition & 1 deletion src/table/resizer/resizer-lookup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { findUpUntil } from '@cloudscape-design/component-toolkit/dom';
import tableStyles from '../styles.css.js';
import resizerStyles from './styles.css.js';
import { getOverflowParents } from '../../internal/utils/scrollable-containers.js';
import { getLogicalBoundingClientRect } from '../../internal/direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

export function getResizerElements(resizerElement: null | HTMLElement) {
if (!resizerElement) {
Expand Down
2 changes: 1 addition & 1 deletion src/table/sticky-columns/use-sticky-columns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
StickyColumnsWrapperState,
} from './interfaces';
import { isCellStatesEqual, isWrapperStatesEqual, updateCellOffsets } from './utils';
import { getScrollInlineStart, getLogicalBoundingClientRect } from '../../internal/direction';
import { getScrollInlineStart, getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

// We allow the table to have a minimum of 148px of available space besides the sum of the widths of the sticky columns
// This value is an UX recommendation and is approximately 1/3 of our smallest breakpoint (465px)
Expand Down
2 changes: 1 addition & 1 deletion src/table/sticky-columns/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { CellOffsets, StickyColumnsCellState, StickyColumnsProps, StickyColumnsWrapperState } from './interfaces';
import { getLogicalBoundingClientRect } from '../../internal/direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

export function isCellStatesEqual(s1: null | StickyColumnsCellState, s2: null | StickyColumnsCellState): boolean {
if (s1 && s2) {
Expand Down
2 changes: 1 addition & 1 deletion src/table/sticky-scrollbar/use-sticky-scrollbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getContainingBlock } from '../../internal/utils/dom';
import { getOverflowParents } from '../../internal/utils/scrollable-containers';
import { browserScrollbarSize } from '../../internal/utils/browser-scrollbar-size';
import globalVars from '../../internal/styles/global-vars';
import { getLogicalBoundingClientRect } from '../../internal/direction.js';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

export const updatePosition = (
tableEl: HTMLElement | null,
Expand Down
2 changes: 1 addition & 1 deletion src/table/sticky-scrolling.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { getOverflowParents } from '../internal/utils/scrollable-containers';
import { getLogicalBoundingClientRect } from '../internal/direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

/**
* @param containerRef ref to surrounding container with sticky element
Expand Down
2 changes: 1 addition & 1 deletion src/table/use-column-widths.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useResizeObserver, useStableCallback } from '@cloudscape-design/component-toolkit/internal';
import React, { useEffect, useRef, useState, createContext, useContext } from 'react';
import { setElementWidths } from './column-widths-utils';
import { getLogicalBoundingClientRect } from '../internal/direction';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

export const DEFAULT_COLUMN_WIDTH = 120;

Expand Down
2 changes: 1 addition & 1 deletion src/tabs/scroll-utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import smoothScroll from './smooth-scroll';
import { getIsRtl, getScrollInlineStart } from '../internal/direction';
import { getIsRtl, getScrollInlineStart } from '@cloudscape-design/component-toolkit/internal';

export const onPaginationClick = (
headerBarRef: React.RefObject<HTMLUListElement>,
Expand Down

0 comments on commit 8c85dc9

Please sign in to comment.