Skip to content

Commit 2196366

Browse files
authored
chore: Taking use-merge-ref from toolkit (#3514)
1 parent 820ce66 commit 2196366

File tree

67 files changed

+86
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+86
-153
lines changed

src/alert/internal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import React, { useRef } from 'react';
44
import clsx from 'clsx';
55

6+
import { useMergeRefs } from '@cloudscape-design/component-toolkit/internal';
67
import { getAnalyticsMetadataAttribute } from '@cloudscape-design/component-toolkit/internal/analytics-metadata';
78

89
import { InternalButton } from '../button/internal';
@@ -16,7 +17,6 @@ import { LinkDefaultVariantContext } from '../internal/context/link-default-vari
1617
import { fireNonCancelableEvent } from '../internal/events';
1718
import useForwardFocus from '../internal/hooks/forward-focus';
1819
import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
19-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
2020
import { useVisualRefresh } from '../internal/hooks/use-visual-mode';
2121
import { awsuiPluginsInternal } from '../internal/plugins/api';
2222
import { createUseDiscoveredAction, createUseDiscoveredContent } from '../internal/plugins/helpers';

src/app-layout-toolbar/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import React from 'react';
44

5-
import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
5+
import { useMergeRefs, warnOnce } from '@cloudscape-design/component-toolkit/internal';
66
import { getAnalyticsMetadataAttribute } from '@cloudscape-design/component-toolkit/internal/analytics-metadata';
77

88
import { applyDefaults } from '../app-layout/defaults';
@@ -15,7 +15,6 @@ import { getBaseProps } from '../internal/base-component';
1515
import { NonCancelableCustomEvent } from '../internal/events';
1616
import useBaseComponent from '../internal/hooks/use-base-component';
1717
import { useControllable } from '../internal/hooks/use-controllable';
18-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1918
import { useMobile } from '../internal/hooks/use-mobile';
2019
import { useVisualRefresh } from '../internal/hooks/use-visual-mode';
2120
import { isDevelopment } from '../internal/is-development';

src/app-layout/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import React from 'react';
44

5-
import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
5+
import { useMergeRefs, warnOnce } from '@cloudscape-design/component-toolkit/internal';
66

77
import { useInternalI18n } from '../i18n/context';
88
import { getBaseProps } from '../internal/base-component';
99
import { NonCancelableCustomEvent } from '../internal/events';
1010
import useBaseComponent from '../internal/hooks/use-base-component';
1111
import { useControllable } from '../internal/hooks/use-controllable';
12-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1312
import { useMobile } from '../internal/hooks/use-mobile';
1413
import { useVisualRefresh } from '../internal/hooks/use-visual-mode';
1514
import { isDevelopment } from '../internal/is-development';

src/app-layout/visual-refresh-toolbar/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import React, { useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
44

5-
import { useStableCallback } from '@cloudscape-design/component-toolkit/internal';
5+
import { useMergeRefs, useStableCallback } from '@cloudscape-design/component-toolkit/internal';
66

77
import ScreenreaderOnly from '../../internal/components/screenreader-only';
88
import { SplitPanelSideToggleProps } from '../../internal/context/split-panel-context';
99
import { fireNonCancelableEvent } from '../../internal/events';
1010
import { useControllable } from '../../internal/hooks/use-controllable';
1111
import { useIntersectionObserver } from '../../internal/hooks/use-intersection-observer';
12-
import { useMergeRefs } from '../../internal/hooks/use-merge-refs';
1312
import { useMobile } from '../../internal/hooks/use-mobile';
1413
import { useUniqueId } from '../../internal/hooks/use-unique-id';
1514
import { useGetGlobalBreadcrumbs } from '../../internal/plugins/helpers/use-global-breadcrumbs';

src/area-chart/chart-container.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
44

5+
import { useMergeRefs } from '@cloudscape-design/component-toolkit/internal';
6+
57
import AxisLabel from '../internal/components/cartesian-chart/axis-label';
68
import BlockEndLabels, { useBLockEndLabels } from '../internal/components/cartesian-chart/block-end-labels';
79
import { CartesianChartContainer } from '../internal/components/cartesian-chart/chart-container';
810
import EmphasizedBaseline from '../internal/components/cartesian-chart/emphasized-baseline';
911
import InlineStartLabels from '../internal/components/cartesian-chart/inline-start-labels';
1012
import LabelsMeasure from '../internal/components/cartesian-chart/labels-measure';
1113
import ChartPlot from '../internal/components/chart-plot';
12-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1314
import useContainerWidth from '../internal/utils/use-container-width';
1415
import { useSelector } from './async-store';
1516
import AreaChartPopover from './elements/chart-popover';

src/area-chart/internal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
import React, { useEffect, useRef, useState } from 'react';
44
import clsx from 'clsx';
55

6-
import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
6+
import { useMergeRefs, warnOnce } from '@cloudscape-design/component-toolkit/internal';
77
import { getIsRtl } from '@cloudscape-design/component-toolkit/internal';
88

99
import { getBaseProps } from '../internal/base-component';
1010
import ChartStatusContainer, { getChartStatus } from '../internal/components/chart-status-container';
1111
import { ChartWrapper } from '../internal/components/chart-wrapper';
1212
import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
13-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1413
import { isDevelopment } from '../internal/is-development';
1514
import { SomeRequired } from '../internal/types';
1615
import { nodeBelongs } from '../internal/utils/node-belongs';

src/attribute-editor/internal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
import React, { useImperativeHandle, useRef, useState } from 'react';
44
import clsx from 'clsx';
55

6+
import { useMergeRefs } from '@cloudscape-design/component-toolkit/internal';
7+
68
import { ButtonProps } from '../button/interfaces';
79
import { InternalButton } from '../button/internal';
810
import { getBaseProps } from '../internal/base-component';
911
import { matchBreakpointMapping } from '../internal/breakpoints';
1012
import { useContainerBreakpoints } from '../internal/hooks/container-queries';
1113
import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
12-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1314
import { usePrevious } from '../internal/hooks/use-previous';
1415
import { useUniqueId } from '../internal/hooks/use-unique-id';
1516
import { SomeRequired } from '../internal/types';

src/breadcrumb-group/implementation.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React, { useEffect, useRef, useState } from 'react';
44
import clsx from 'clsx';
55

66
import { useContainerQuery } from '@cloudscape-design/component-toolkit';
7-
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';
7+
import { getLogicalBoundingClientRect, useMergeRefs } from '@cloudscape-design/component-toolkit/internal';
88
import { getAnalyticsMetadataAttribute } from '@cloudscape-design/component-toolkit/internal/analytics-metadata';
99

1010
import { InternalButton } from '../button/internal';
@@ -14,7 +14,6 @@ import { useInternalI18n } from '../i18n/context';
1414
import InternalIcon from '../icon/internal';
1515
import { getBaseProps } from '../internal/base-component';
1616
import { fireCancelableEvent } from '../internal/events';
17-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1817
import { checkSafeUrl } from '../internal/utils/check-safe-url';
1918
import { createWidgetizedComponent } from '../internal/widgets';
2019
import { AllItemsDropdown } from './all-items-dropdown';

src/button-group/internal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
44
import clsx from 'clsx';
55

6-
import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
6+
import { useMergeRefs, warnOnce } from '@cloudscape-design/component-toolkit/internal';
77

88
import { ButtonProps } from '../button/interfaces';
99
import { getBaseProps } from '../internal/base-component';
@@ -13,7 +13,6 @@ import {
1313
SingleTabStopNavigationProvider,
1414
} from '../internal/context/single-tab-stop-navigation-context';
1515
import { hasModifierKeys } from '../internal/events';
16-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
1716
import { KeyCode } from '../internal/keycode';
1817
import { circleIndex } from '../internal/utils/circle-index';
1918
import handleKey from '../internal/utils/handle-key';

src/button/internal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React, { useEffect, useRef, useState } from 'react';
44
import clsx from 'clsx';
55

6-
import { warnOnce } from '@cloudscape-design/component-toolkit/internal';
6+
import { useMergeRefs, warnOnce } from '@cloudscape-design/component-toolkit/internal';
77
import {
88
getAnalyticsLabelAttribute,
99
getAnalyticsMetadataAttribute,
@@ -26,7 +26,6 @@ import { fireCancelableEvent, isPlainLeftClick } from '../internal/events';
2626
import useForwardFocus from '../internal/hooks/forward-focus';
2727
import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
2828
import useHiddenDescription from '../internal/hooks/use-hidden-description';
29-
import { useMergeRefs } from '../internal/hooks/use-merge-refs';
3029
import { useModalContextLoadingButtonComponent } from '../internal/hooks/use-modal-component-analytics';
3130
import { usePerformanceMarks } from '../internal/hooks/use-performance-marks';
3231
import { useUniqueId } from '../internal/hooks/use-unique-id';

0 commit comments

Comments
 (0)