, InternalBaseComponentProps {
__inFilteringToken?: boolean;
@@ -222,6 +222,8 @@ const InternalSelect = React.forwardRef(
const mergedRef = useMergeRefs(rootRef, __internalRootRef);
+ const dropdownProps = getDropdownProps();
+
return (
({
diff --git a/src/split-panel/index.tsx b/src/split-panel/index.tsx
index 522b97f8a9..cb7e663ce2 100644
--- a/src/split-panel/index.tsx
+++ b/src/split-panel/index.tsx
@@ -25,7 +25,7 @@ import { useVisualRefresh } from '../internal/hooks/use-visual-mode';
import { useUniqueId } from '../internal/hooks/use-unique-id';
import { SplitPanelContentSide } from './side';
import { SplitPanelContentBottom } from './bottom';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
export { SplitPanelProps };
diff --git a/src/table/__tests__/header-cell.test.tsx b/src/table/__tests__/header-cell.test.tsx
index 06b4eeffc1..89884b8184 100644
--- a/src/table/__tests__/header-cell.test.tsx
+++ b/src/table/__tests__/header-cell.test.tsx
@@ -9,7 +9,7 @@ import { renderHook } from '../../__tests__/render-hook';
import styles from '../../../lib/components/table/header-cell/styles.css.js';
import resizerStyles from '../../../lib/components/table/resizer/styles.css.js';
import { useStickyColumns } from '../../../lib/components/table/sticky-columns';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
const testItem = {
test: 'test',
diff --git a/src/table/body-cell/index.tsx b/src/table/body-cell/index.tsx
index 13a963aff8..981dcbf55b 100644
--- a/src/table/body-cell/index.tsx
+++ b/src/table/body-cell/index.tsx
@@ -8,7 +8,7 @@ import { TableProps } from '../interfaces';
import { TableTdElement, TableTdElementProps } from './td-element';
import { InlineEditor } from './inline-editor';
import LiveRegion from '../../internal/components/live-region/index.js';
-import { useInternalI18n } from '../../internal/i18n/context';
+import { useInternalI18n } from '../../i18n/context';
import { usePrevious } from '../../internal/hooks/use-previous';
const submitHandlerFallback = () => {
diff --git a/src/table/body-cell/inline-editor.tsx b/src/table/body-cell/inline-editor.tsx
index 9a941a6781..32092f54a2 100644
--- a/src/table/body-cell/inline-editor.tsx
+++ b/src/table/body-cell/inline-editor.tsx
@@ -10,7 +10,7 @@ import styles from './styles.css.js';
import { Optional } from '../../internal/types';
import FocusLock, { FocusLockRef } from '../../internal/components/focus-lock';
import LiveRegion from '../../internal/components/live-region';
-import { useInternalI18n } from '../../internal/i18n/context';
+import { useInternalI18n } from '../../i18n/context';
// A function that does nothing
const noop = () => undefined;
diff --git a/src/table/header-cell/index.tsx b/src/table/header-cell/index.tsx
index 4a79ac0f7a..9ba182646c 100644
--- a/src/table/header-cell/index.tsx
+++ b/src/table/header-cell/index.tsx
@@ -11,7 +11,7 @@ import { Resizer } from '../resizer';
import { useUniqueId } from '../../internal/hooks/use-unique-id';
import { InteractiveComponent } from '../thead';
import { getStickyClassNames } from '../utils';
-import { useInternalI18n } from '../../internal/i18n/context';
+import { useInternalI18n } from '../../i18n/context';
import { StickyColumnsModel, useStickyCellStyles } from '../sticky-columns';
import { useMergeRefs } from '../../internal/hooks/use-merge-refs';
diff --git a/src/tabs/__tests__/tabs.test.tsx b/src/tabs/__tests__/tabs.test.tsx
index 48576a4542..a4907c7a43 100644
--- a/src/tabs/__tests__/tabs.test.tsx
+++ b/src/tabs/__tests__/tabs.test.tsx
@@ -7,7 +7,7 @@ import Tabs, { TabsProps } from '../../../lib/components/tabs';
import styles from '../../../lib/components/tabs/styles.css.js';
import createWrapper, { TabsWrapper } from '../../../lib/components/test-utils/dom';
import { KeyCode } from '@cloudscape-design/test-utils-core/dist/utils';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
let mockHorizontalOverflow = false;
jest.mock('../../../lib/components/tabs/scroll-utils', () => {
diff --git a/src/tabs/tab-header-bar.tsx b/src/tabs/tab-header-bar.tsx
index b4a42e5b58..fceec8dfdf 100644
--- a/src/tabs/tab-header-bar.tsx
+++ b/src/tabs/tab-header-bar.tsx
@@ -15,7 +15,7 @@ import {
} from './scroll-utils';
import { hasModifierKeys, isPlainLeftClick } from '../internal/events';
import { useVisualRefresh } from '../internal/hooks/use-visual-mode';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
import { useContainerQuery } from '@cloudscape-design/component-toolkit';
export interface TabHeaderBarProps {
diff --git a/src/tag-editor/__tests__/tag-editor.test.tsx b/src/tag-editor/__tests__/tag-editor.test.tsx
index e998ffec14..2a420b606f 100644
--- a/src/tag-editor/__tests__/tag-editor.test.tsx
+++ b/src/tag-editor/__tests__/tag-editor.test.tsx
@@ -7,7 +7,7 @@ import TagEditor, { TagEditorProps } from '../../../lib/components/tag-editor';
import createWrapper, { TagEditorWrapper } from '../../../lib/components/test-utils/dom';
import { i18nStrings, MAX_KEY_LENGTH, MAX_VALUE_LENGTH } from './common';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
const defaultProps = {
i18nStrings,
diff --git a/src/tag-editor/index.tsx b/src/tag-editor/index.tsx
index cea6216164..05a80ab978 100644
--- a/src/tag-editor/index.tsx
+++ b/src/tag-editor/index.tsx
@@ -24,7 +24,7 @@ import styles from './styles.css.js';
import { applyDisplayName } from '../internal/utils/apply-display-name';
import useBaseComponent from '../internal/hooks/use-base-component';
import LiveRegion from '../internal/components/live-region';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
export { TagEditorProps };
diff --git a/src/tag-editor/validation.ts b/src/tag-editor/validation.ts
index 6f06fa322a..c62baddf31 100644
--- a/src/tag-editor/validation.ts
+++ b/src/tag-editor/validation.ts
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
-import { ComponentFormatFunction } from '../internal/i18n/context';
+import { ComponentFormatFunction } from '../i18n/context';
import { TagEditorProps } from './interfaces';
/**
diff --git a/src/tiles/tile.tsx b/src/tiles/tile.tsx
index 2d1621f010..e96e8cf8a0 100644
--- a/src/tiles/tile.tsx
+++ b/src/tiles/tile.tsx
@@ -23,7 +23,6 @@ interface TileProps {
export const Tile = React.forwardRef(
({ item, selected, name, breakpoint, onChange }: TileProps, forwardedRef: React.Ref) => {
const internalRef = useRef(null);
- const controlId = item.controlId || `${name}-value-${item.value}`;
const isVisualRefresh = useVisualRefresh();
const mergedRef = useMergeRefs(internalRef, forwardedRef);
@@ -58,7 +57,7 @@ export const Tile = React.forwardRef(
label={item.label}
description={item.description}
disabled={item.disabled}
- controlId={controlId}
+ controlId={item.controlId}
/>
{item.image && {item.image}
}
diff --git a/src/token-group/__tests__/token-group.test.tsx b/src/token-group/__tests__/token-group.test.tsx
index ac46004966..1a74b7be05 100644
--- a/src/token-group/__tests__/token-group.test.tsx
+++ b/src/token-group/__tests__/token-group.test.tsx
@@ -11,7 +11,7 @@ import icons from '../../../lib/components/icon/icons';
import selectors from '../../../lib/components/token-group/styles.selectors.js';
import optionSelectors from '../../../lib/components/internal/components/option/styles.selectors.js';
import tokenListSelectors from '../../../lib/components/internal/components/token-list/styles.selectors.js';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
function renderTokenGroup(props: TokenGroupProps = {}): TokenGroupWrapper {
const { container } = render();
diff --git a/src/top-navigation/__tests__/top-navigation.test.tsx b/src/top-navigation/__tests__/top-navigation.test.tsx
index fb2beb6ac0..460fdc677a 100644
--- a/src/top-navigation/__tests__/top-navigation.test.tsx
+++ b/src/top-navigation/__tests__/top-navigation.test.tsx
@@ -10,7 +10,7 @@ import createWrapper from '../../../lib/components/test-utils/dom';
import TopNavigationWrapper, {
OverflowMenu as OverflowMenuWrapper,
} from '../../../lib/components/test-utils/dom/top-navigation';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
export const I18N_STRINGS: TopNavigationProps.I18nStrings = {
searchIconAriaLabel: 'Search',
diff --git a/src/top-navigation/internal.tsx b/src/top-navigation/internal.tsx
index 295b9ad158..d087a0730a 100644
--- a/src/top-navigation/internal.tsx
+++ b/src/top-navigation/internal.tsx
@@ -19,7 +19,7 @@ import { ButtonTrigger } from '../internal/components/menu-dropdown';
import styles from './styles.css.js';
import { checkSafeUrl } from '../internal/utils/check-safe-url';
import { SomeRequired } from '../internal/types';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
export type InternalTopNavigationProps = SomeRequired & InternalBaseComponentProps;
diff --git a/src/top-navigation/parts/overflow-menu/index.tsx b/src/top-navigation/parts/overflow-menu/index.tsx
index 70fe885659..65f30f45d5 100644
--- a/src/top-navigation/parts/overflow-menu/index.tsx
+++ b/src/top-navigation/parts/overflow-menu/index.tsx
@@ -10,7 +10,7 @@ import { HeaderProps } from './header';
import styles from '../../styles.css.js';
import { TopNavigationProps } from '../../interfaces';
-import { useInternalI18n } from '../../../internal/i18n/context';
+import { useInternalI18n } from '../../../i18n/context';
interface OverflowMenuProps {
headerText?: string;
items?: TopNavigationProps['utilities'];
diff --git a/src/wizard/__tests__/wizard.test.tsx b/src/wizard/__tests__/wizard.test.tsx
index 69fafd4d02..f0a15a7f07 100644
--- a/src/wizard/__tests__/wizard.test.tsx
+++ b/src/wizard/__tests__/wizard.test.tsx
@@ -7,7 +7,7 @@ import liveRegionStyles from '../../../lib/components/internal/components/live-r
import createWrapper from '../../../lib/components/test-utils/dom';
import Button from '../../../lib/components/button';
import Wizard, { WizardProps } from '../../../lib/components/wizard';
-import TestI18nProvider from '../../../lib/components/internal/i18n/testing';
+import TestI18nProvider from '../../../lib/components/i18n/testing';
import styles from '../../../lib/components/wizard/styles.selectors.js';
import { DEFAULT_I18N_SETS, DEFAULT_STEPS } from './common';
diff --git a/src/wizard/internal.tsx b/src/wizard/internal.tsx
index ecf22be8e0..eebfee85a8 100644
--- a/src/wizard/internal.tsx
+++ b/src/wizard/internal.tsx
@@ -13,7 +13,7 @@ import { useMergeRefs } from '../internal/hooks/use-merge-refs';
import { useVisualRefresh } from '../internal/hooks/use-visual-mode';
import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
-import { useInternalI18n } from '../internal/i18n/context';
+import { useInternalI18n } from '../i18n/context';
import { FunnelMetrics } from '../internal/analytics';
import { useFunnel } from '../internal/analytics/hooks/use-funnel';
diff --git a/src/wizard/wizard-form.tsx b/src/wizard/wizard-form.tsx
index a0bc70e1b1..dbd4147dbf 100644
--- a/src/wizard/wizard-form.tsx
+++ b/src/wizard/wizard-form.tsx
@@ -63,49 +63,57 @@ export default function WizardForm({
return (
<>
-
-
- {i18nStrings.collapsedStepsLabel?.(activeStepIndex + 1, steps.length)}
-
-
-
- {title}
- {isOptional && {` - ${i18nStrings.optional}`}}
-
-
-
{({ funnelStepProps }) => (
- onSkipToClick(skipToTargetIndex)}
- showPrevious={activeStepIndex !== 0}
- isPrimaryLoading={isPrimaryLoading}
- showSkipTo={showSkipTo}
- skipToButtonText={skipToButtonText}
- />
- }
- secondaryActions={secondaryActions}
- errorText={errorText}
- errorIconAriaLabel={i18nStrings.errorIconAriaLabel}
- {...funnelStepProps}
- >
- {content}
-
+ <>
+
+
+ {i18nStrings.collapsedStepsLabel?.(activeStepIndex + 1, steps.length)}
+
+
+
+ {title}
+ {isOptional && {` - ${i18nStrings.optional}`}}
+
+
+
+
+ onSkipToClick(skipToTargetIndex)}
+ showPrevious={activeStepIndex !== 0}
+ isPrimaryLoading={isPrimaryLoading}
+ showSkipTo={showSkipTo}
+ skipToButtonText={skipToButtonText}
+ />
+ }
+ secondaryActions={secondaryActions}
+ errorText={errorText}
+ errorIconAriaLabel={i18nStrings.errorIconAriaLabel}
+ {...funnelStepProps}
+ >
+ {content}
+
+
)}