Skip to content

Commit 60f9568

Browse files
authored
chore: Remove unused app layout widget code (#3874)
1 parent aa6e28c commit 60f9568

File tree

9 files changed

+2
-63
lines changed

9 files changed

+2
-63
lines changed

src/app-layout/__tests__/widget-old-mocks.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,19 @@ function createMockComponent(componentName: string) {
1111

1212
// Mock previous widgetized components
1313
jest.mock('../../../lib/components/app-layout/visual-refresh-toolbar/navigation', () => ({
14-
createWidgetizedAppLayoutNavigation: () => {},
1514
AppLayoutNavigationImplementation: createMockComponent('AppLayoutNavigationImplementation'),
1615
}));
1716
jest.mock('../../../lib/components/app-layout/visual-refresh-toolbar/drawer', () => ({
18-
createWidgetizedAppLayoutDrawer: () => {},
1917
AppLayoutDrawerImplementation: createMockComponent('AppLayoutDrawerImplementation'),
20-
createWidgetizedAppLayoutGlobalDrawers: () => {},
2118
AppLayoutGlobalDrawersImplementation: createMockComponent('AppLayoutGlobalDrawersImplementation'),
2219
}));
2320
jest.mock('../../../lib/components/app-layout/visual-refresh-toolbar/notifications', () => ({
24-
createWidgetizedAppLayoutNotifications: () => {},
2521
AppLayoutNotificationsImplementation: createMockComponent('AppLayoutNotificationsImplementation'),
2622
}));
2723
jest.mock('../../../lib/components/app-layout/visual-refresh-toolbar/toolbar', () => ({
28-
createWidgetizedAppLayoutToolbar: () => {},
2924
AppLayoutToolbarImplementation: createMockComponent('AppLayoutToolbarImplementation'),
3025
}));
3126
jest.mock('../../../lib/components/app-layout/visual-refresh-toolbar/split-panel', () => ({
32-
createWidgetizedAppLayoutSplitPanelDrawerBottom: () => {},
3327
AppLayoutSplitPanelDrawerBottomImplementation: createMockComponent('AppLayoutSplitPanelDrawerBottomImplementation'),
34-
createWidgetizedAppLayoutSplitPanelDrawerSide: () => {},
3528
AppLayoutSplitPanelDrawerSideImplementation: createMockComponent('AppLayoutSplitPanelDrawerSideImplementation'),
3629
}));

src/app-layout/visual-refresh-toolbar/drawer/global-drawers.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33
import React, { useRef } from 'react';
44

5-
import { createWidgetizedComponent } from '../../../internal/widgets';
65
import { AppLayoutInternals } from '../interfaces';
76
import AppLayoutGlobalDrawer from './global-drawer';
87

@@ -42,5 +41,3 @@ export function AppLayoutGlobalDrawersImplementation({
4241
</>
4342
);
4443
}
45-
46-
export const createWidgetizedAppLayoutGlobalDrawers = createWidgetizedComponent(AppLayoutGlobalDrawersImplementation);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
export { createWidgetizedAppLayoutDrawer, AppLayoutDrawerImplementation } from './local-drawer';
5-
export { createWidgetizedAppLayoutGlobalDrawers, AppLayoutGlobalDrawersImplementation } from './global-drawers';
4+
export { AppLayoutDrawerImplementation } from './local-drawer';
5+
export { AppLayoutGlobalDrawersImplementation } from './global-drawers';

src/app-layout/visual-refresh-toolbar/drawer/local-drawer.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import clsx from 'clsx';
77
import { InternalButton } from '../../../button/internal';
88
import PanelResizeHandle from '../../../internal/components/panel-resize-handle';
99
import customCssProps from '../../../internal/generated/custom-css-properties';
10-
import { createWidgetizedComponent } from '../../../internal/widgets';
1110
import { getLimitedValue } from '../../../split-panel/utils/size-utils';
1211
import { TOOLS_DRAWER_ID } from '../../utils/use-drawers';
1312
import { getDrawerStyles } from '../compute-layout';
@@ -147,5 +146,3 @@ export function AppLayoutDrawerImplementation({ appLayoutInternals }: AppLayoutD
147146
</Transition>
148147
);
149148
}
150-
151-
export const createWidgetizedAppLayoutDrawer = createWidgetizedComponent(AppLayoutDrawerImplementation);

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import { createLoadableComponent } from '../../internal/widgets/loader-mock';
5-
import { createWidgetizedAppLayoutDrawer, createWidgetizedAppLayoutGlobalDrawers } from './drawer';
6-
import { createWidgetizedAppLayoutNavigation } from './navigation';
7-
import { createWidgetizedAppLayoutNotifications } from './notifications';
8-
import {
9-
createWidgetizedAppLayoutSplitPanelDrawerBottom,
10-
createWidgetizedAppLayoutSplitPanelDrawerSide,
11-
} from './split-panel';
125
import { AppLayoutStateProvider as AppLayoutStateImplementation, createWidgetizedAppLayoutState } from './state';
13-
import { createWidgetizedAppLayoutToolbar } from './toolbar';
146
import { AfterMainSlotImplementation, createWidgetizedAppLayoutAfterMainSlot } from './widget-areas/after-main-slot';
157
import { BeforeMainSlotImplementation, createWidgetizedAppLayoutBeforeMainSlot } from './widget-areas/before-main-slot';
168
import {
@@ -19,16 +11,6 @@ import {
1911
} from './widget-areas/bottom-content-slot';
2012
import { createWidgetizedAppLayoutTopContentSlot, TopContentSlotImplementation } from './widget-areas/top-content-slot';
2113

22-
// Legacy widgetized parts
23-
export const AppLayoutNavigation = createWidgetizedAppLayoutNavigation();
24-
export const AppLayoutDrawer = createWidgetizedAppLayoutDrawer();
25-
export const AppLayoutGlobalDrawers = createWidgetizedAppLayoutGlobalDrawers();
26-
export const AppLayoutNotifications = createWidgetizedAppLayoutNotifications();
27-
export const AppLayoutToolbar = createWidgetizedAppLayoutToolbar();
28-
export const AppLayoutSplitPanelBottom = createWidgetizedAppLayoutSplitPanelDrawerBottom();
29-
export const AppLayoutSplitPanelSide = createWidgetizedAppLayoutSplitPanelDrawerSide();
30-
31-
// Refactored widgetized parts
3214
export const AppLayoutBeforeMainSlot = createWidgetizedAppLayoutBeforeMainSlot(
3315
createLoadableComponent(BeforeMainSlotImplementation)
3416
);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import clsx from 'clsx';
66
import { findUpUntil } from '@cloudscape-design/component-toolkit/dom';
77

88
import { InternalButton } from '../../../button/internal';
9-
import { createWidgetizedComponent } from '../../../internal/widgets';
109
import { getDrawerStyles } from '../compute-layout';
1110
import { AppLayoutInternals } from '../interfaces';
12-
import { NotificationsSlot } from '../skeleton/slots';
1311

1412
import sharedStyles from '../../resize/styles.css.js';
1513
import testutilStyles from '../../test-classes/styles.css.js';
@@ -83,8 +81,3 @@ export function AppLayoutNavigationImplementation({ appLayoutInternals }: AppLay
8381
</div>
8482
);
8583
}
86-
87-
export const createWidgetizedAppLayoutNavigation = createWidgetizedComponent(
88-
AppLayoutNavigationImplementation,
89-
NotificationsSlot
90-
);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import clsx from 'clsx';
66
import { useResizeObserver } from '@cloudscape-design/component-toolkit/internal';
77

88
import { highContrastHeaderClassName } from '../../../internal/utils/content-header-utils';
9-
import { createWidgetizedComponent } from '../../../internal/widgets';
109
import { AppLayoutInternals } from '../interfaces';
11-
import { NotificationsSkeleton } from '../skeleton/skeleton-parts';
1210
import { NotificationsSlot } from '../skeleton/slots';
1311

1412
import testutilStyles from '../../test-classes/styles.css.js';
@@ -58,8 +56,3 @@ export function AppLayoutNotificationsImplementation({
5856
</NotificationsSlot>
5957
);
6058
}
61-
62-
export const createWidgetizedAppLayoutNotifications = createWidgetizedComponent(
63-
AppLayoutNotificationsImplementation,
64-
NotificationsSkeleton
65-
);

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

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

5-
import { createWidgetizedComponent } from '../../../internal/widgets';
65
import { SplitPanelProvider, SplitPanelProviderProps } from '../../split-panel';
76
import { getDrawerStyles } from '../compute-layout';
87
import { AppLayoutInternals } from '../interfaces';
@@ -57,11 +56,3 @@ export function AppLayoutSplitPanelDrawerBottomImplementation({
5756
</SplitPanelProvider>
5857
);
5958
}
60-
61-
export const createWidgetizedAppLayoutSplitPanelDrawerSide = createWidgetizedComponent(
62-
AppLayoutSplitPanelDrawerSideImplementation
63-
);
64-
65-
export const createWidgetizedAppLayoutSplitPanelDrawerBottom = createWidgetizedComponent(
66-
AppLayoutSplitPanelDrawerBottomImplementation
67-
);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ import clsx from 'clsx';
66

77
import { useResizeObserver } from '@cloudscape-design/component-toolkit/internal';
88

9-
import { createWidgetizedComponent } from '../../../internal/widgets';
109
import { AppLayoutProps } from '../../interfaces';
1110
import { OnChangeParams } from '../../utils/use-drawers';
1211
import { Focusable, FocusControlMultipleStates } from '../../utils/use-focus-control';
1312
import { AppLayoutInternals } from '../interfaces';
14-
import { ToolbarSkeleton } from '../skeleton/skeleton-parts';
1513
import { BreadcrumbsSlot, ToolbarSlot } from '../skeleton/slots';
1614
import { DrawerTriggers, SplitPanelToggleProps } from './drawer-triggers';
1715
import TriggerButton from './trigger-button';
@@ -246,8 +244,3 @@ export function AppLayoutToolbarImplementation({
246244
</ToolbarSlot>
247245
);
248246
}
249-
250-
export const createWidgetizedAppLayoutToolbar = createWidgetizedComponent(
251-
AppLayoutToolbarImplementation,
252-
ToolbarSkeleton
253-
);

0 commit comments

Comments
 (0)