From ba5a1c87e5e8f8561d6a1bc9d616f3172a744aab Mon Sep 17 00:00:00 2001 From: Michael Dowse Date: Mon, 10 Feb 2025 15:46:53 +0100 Subject: [PATCH] chore: Experiement - VR as primary theme - Only export toolbar app layout --- build-tools/utils/themes.js | 4 ++-- src/app-layout/internal.tsx | 15 +-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/build-tools/utils/themes.js b/build-tools/utils/themes.js index 5066477bbf..0c84eb7c2a 100644 --- a/build-tools/utils/themes.js +++ b/build-tools/utils/themes.js @@ -12,8 +12,8 @@ const themes = [ designTokensDir: 'design-tokens', designTokensPackageJson: { name: '@cloudscape-design/design-tokens' }, outputPath: path.join(workspace.targetPath, 'components'), - primaryThemePath: './classic/index.js', - secondaryThemePaths: ['./visual-refresh-secondary/index.js'], + primaryThemePath: './visual-refresh/index.js', + secondaryThemePaths: [], }, ]; diff --git a/src/app-layout/internal.tsx b/src/app-layout/internal.tsx index 033d14ad76..b4f8fd1e10 100644 --- a/src/app-layout/internal.tsx +++ b/src/app-layout/internal.tsx @@ -2,22 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import React from 'react'; -import { useVisualRefresh } from '../internal/hooks/use-visual-mode'; -import ClassicAppLayout from './classic'; import { AppLayoutProps, AppLayoutPropsWithDefaults } from './interfaces'; -import { useAppLayoutToolbarEnabled } from './utils/feature-flags'; -import RefreshedAppLayout from './visual-refresh'; import ToolbarAppLayout from './visual-refresh-toolbar'; export const AppLayoutInternal = React.forwardRef((props, ref) => { - const isRefresh = useVisualRefresh(); - const isToolbar = useAppLayoutToolbarEnabled(); - if (isRefresh) { - if (isToolbar) { - return ; - } else { - return ; - } - } - return ; + return ; });