diff --git a/pages/app-layout/utils/external-global-left-panel-widget.tsx b/pages/app-layout/utils/external-global-left-panel-widget.tsx index 2d0e1919f21..f1a18cb18ee 100644 --- a/pages/app-layout/utils/external-global-left-panel-widget.tsx +++ b/pages/app-layout/utils/external-global-left-panel-widget.tsx @@ -99,12 +99,15 @@ const AIDrawer = () => { ); }; +const searchParams = new URL(location.hash.substring(1), location.href).searchParams; + export const leftDrawerPayload: DrawerPayload = { id: 'ai-panel', resizable: true, isExpandable: true, defaultSize: DEFAULT_SIZE, preserveInactiveContent: true, + defaultActive: searchParams.get('leftDrawerDefaultActive') === 'true', ariaLabels: { closeButton: 'Close AI Panel drawer', diff --git a/pages/app/index.tsx b/pages/app/index.tsx index 8acc87f7fdb..0febf904b92 100644 --- a/pages/app/index.tsx +++ b/pages/app/index.tsx @@ -27,6 +27,8 @@ interface GlobalFlags { appLayoutWidget?: boolean; appLayoutToolbar?: boolean; appLayoutHideToolbarBreadcrumbs?: boolean; + appLayoutHideToolbar?: boolean; + appLayoutSimplifiedView?: boolean; oneTheme?: boolean; } // used for local dev / testing @@ -107,6 +109,8 @@ const { appLayoutWidget, appLayoutToolbar, appLayoutHideToolbarBreadcrumbs, + appLayoutHideToolbar, + appLayoutSimplifiedView, appLayoutDelayedWidget, } = parseQuery(history.location.search); const oneTheme = theme === Theme.OneTheme; @@ -125,6 +129,8 @@ if (!window[awsuiCustomFlagsSymbol]) { window[awsuiGlobalFlagsSymbol].appLayoutWidget = appLayoutWidget; window[awsuiGlobalFlagsSymbol].appLayoutToolbar = appLayoutToolbar; window[awsuiGlobalFlagsSymbol].appLayoutHideToolbarBreadcrumbs = appLayoutHideToolbarBreadcrumbs; +window[awsuiGlobalFlagsSymbol].appLayoutHideToolbar = appLayoutHideToolbar; +window[awsuiGlobalFlagsSymbol].appLayoutSimplifiedView = appLayoutSimplifiedView; window[awsuiCustomFlagsSymbol].appLayoutDelayedWidget = appLayoutDelayedWidget; window[awsuiGlobalFlagsSymbol].oneTheme = oneTheme; diff --git a/src/app-layout/__integ__/hide-toolbar.test.ts b/src/app-layout/__integ__/hide-toolbar.test.ts new file mode 100644 index 00000000000..51dbe28db63 --- /dev/null +++ b/src/app-layout/__integ__/hide-toolbar.test.ts @@ -0,0 +1,107 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 +import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects'; +import useBrowser from '@cloudscape-design/browser-test-tools/use-browser'; + +import createWrapper from '../../../lib/components/test-utils/selectors'; +import { getUrlParams } from './utils'; + +const appLayout = createWrapper().findAppLayout(); +const toolbar = appLayout.findToolbar(); +const appLayoutBreadcrumbs = appLayout.findBreadcrumbs().findBreadcrumbGroup(); +const consumerBreadcrumbs = createWrapper().find('[data-testid="global-nav-header"]').findBreadcrumbGroup(); + +class HideToolbarPage extends BasePageObject { + clickTestId(testId: string) { + return this.click(`[data-testid="${testId}"]`); + } + + /** + * Distance from the top of App Layout to the first header of the page content. + * The content region itself is `display: contents` and has no box to measure. + */ + async getContentOffset() { + const { top: rootTop } = await this.getBoundingBox(appLayout.toSelector()); + const { top: contentTop } = await this.getBoundingBox(appLayout.findContentRegion().findHeader().toSelector()); + return contentTop - rootTop; + } +} + +function setupTest(params: Record, testFn: (page: HideToolbarPage) => Promise) { + return useBrowser(async browser => { + const page = new HideToolbarPage(browser); + await browser.url(`#/app-layout/global-nav-breadcrumbs?${getUrlParams('refresh-toolbar', params)}`); + await page.waitForVisible(appLayout.findContentRegion().toSelector()); + await testFn(page); + }); +} + +const hiddenToolbarParams = { appLayoutHideToolbar: 'true' }; + +describe('appLayoutHideToolbar flag', () => { + test( + 'renders a visible toolbar without the flag', + setupTest({}, async page => { + await expect(page.isDisplayed(toolbar.toSelector())).resolves.toBe(true); + await expect(page.isDisplayed(appLayoutBreadcrumbs.toSelector())).resolves.toBe(true); + }) + ); + + test( + 'keeps the toolbar and its breadcrumbs in the DOM but not displayed', + setupTest(hiddenToolbarParams, async page => { + await expect(page.isExisting(toolbar.toSelector())).resolves.toBe(true); + await expect(page.isDisplayed(toolbar.toSelector())).resolves.toBe(false); + await expect(page.isExisting(appLayoutBreadcrumbs.toSelector())).resolves.toBe(true); + await expect(page.isDisplayed(appLayoutBreadcrumbs.toSelector())).resolves.toBe(false); + }) + ); + + // Global flags are read once on page load, so each toolbar state is measured in its own browser session + // instead of switching the URL (and relying on a reload) within one session. + test('does not reserve space for the hidden toolbar', async () => { + let toolbarHeight = 0; + let offsetWithToolbar = 0; + let offsetWithHiddenToolbar = 0; + + await setupTest({}, async page => { + await expect(page.isDisplayed(toolbar.toSelector())).resolves.toBe(true); + ({ height: toolbarHeight } = await page.getBoundingBox(toolbar.toSelector())); + offsetWithToolbar = await page.getContentOffset(); + })(); + + await setupTest(hiddenToolbarParams, async page => { + await expect(page.isDisplayed(toolbar.toSelector())).resolves.toBe(false); + offsetWithHiddenToolbar = await page.getContentOffset(); + })(); + + expect(toolbarHeight).toBeGreaterThan(0); + // allow 1px for sub-pixel rounding + expect(Math.abs(offsetWithToolbar - toolbarHeight - offsetWithHiddenToolbar)).toBeLessThanOrEqual(1); + }); + + test( + 'publishes breadcrumbs to registerBreadcrumbsConsumer and keeps them updated', + setupTest(hiddenToolbarParams, async page => { + await page.clickTestId('toggle-nav-header'); + await page.waitForVisible(consumerBreadcrumbs.toSelector()); + await expect(page.getText(consumerBreadcrumbs.toSelector())).resolves.toContain('Resource'); + await expect(page.getText(consumerBreadcrumbs.toSelector())).resolves.not.toContain('Level 3'); + + await page.clickTestId('append-breadcrumb'); + await page.waitForAssertion(() => + expect(page.getText(consumerBreadcrumbs.toSelector())).resolves.toContain('Level 3') + ); + await expect(page.isDisplayed(toolbar.toSelector())).resolves.toBe(false); + }) + ); + + test( + 'publishes breadcrumbs to a consumer that registers after App Layout rendered', + setupTest(hiddenToolbarParams, async page => { + await page.clickTestId('delay-nav-header'); + await page.waitForVisible(consumerBreadcrumbs.toSelector()); + await expect(page.getText(consumerBreadcrumbs.toSelector())).resolves.toContain('Resource'); + }) + ); +}); diff --git a/src/app-layout/__tests__/hide-toolbar.test.tsx b/src/app-layout/__tests__/hide-toolbar.test.tsx new file mode 100644 index 00000000000..929e0a022db --- /dev/null +++ b/src/app-layout/__tests__/hide-toolbar.test.tsx @@ -0,0 +1,149 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 +import React from 'react'; +import { cleanup, render, waitFor } from '@testing-library/react'; + +import AppLayout from '../../../lib/components/app-layout'; +import { isAppLayoutHideToolbar } from '../../../lib/components/app-layout/utils/feature-flags'; +import BreadcrumbGroup, { BreadcrumbGroupProps } from '../../../lib/components/breadcrumb-group'; +import { clearInitialMessages } from '../../../lib/components/internal/plugins/widget/core'; +import * as widgetPlugins from '../../../lib/components/plugins'; +import { describeEachAppLayout, renderComponent, setPendingGlobalFlag } from './utils'; + +import skeletonStyles from '../../../lib/components/app-layout/visual-refresh-toolbar/skeleton/styles.css.js'; +import toolbarStyles from '../../../lib/components/app-layout/visual-refresh-toolbar/toolbar/styles.css.js'; + +const breadcrumbItems: BreadcrumbGroupProps['items'] = [ + { text: 'Home', href: '/home' }, + { text: 'Resource', href: '/resource' }, +]; + +function isToolbarHidden(toolbar: HTMLElement) { + return toolbar.classList.contains(toolbarStyles['toolbar-hidden']); +} + +afterEach(() => setPendingGlobalFlag('appLayoutHideToolbar', undefined)); + +describe('isAppLayoutHideToolbar', () => { + test('returns false when the flag is not set', () => { + expect(isAppLayoutHideToolbar()).toBe(false); + }); + + test('returns false when the flag is false', () => { + setPendingGlobalFlag('appLayoutHideToolbar', false); + expect(isAppLayoutHideToolbar()).toBe(false); + }); + + test('returns true when the flag is true', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + expect(isAppLayoutHideToolbar()).toBe(true); + }); +}); + +describeEachAppLayout({ themes: ['refresh-toolbar'] }, () => { + test('renders a visible toolbar when the flag is not set', () => { + const { wrapper } = renderComponent(); + expect(wrapper.findToolbar()).toBeTruthy(); + expect(isToolbarHidden(wrapper.findToolbar()!.getElement())).toBe(false); + }); + + test('keeps the toolbar mounted but hidden when the flag is set', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent(); + expect(wrapper.findToolbar()).toBeTruthy(); + expect(isToolbarHidden(wrapper.findToolbar()!.getElement())).toBe(true); + // toggles are rendered inside the hidden toolbar + expect(wrapper.findToolbar()!.getElement()).toContainElement(wrapper.findNavigationToggle()!.getElement()); + expect(wrapper.findToolbar()!.getElement()).toContainElement(wrapper.findToolsToggle()!.getElement()); + }); + + test('renders a top border for the content area in place of the hidden toolbar', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent(); + const toolbar = wrapper.findToolbar()!.getElement(); + const border = toolbar.nextElementSibling; + expect(border).toHaveClass(skeletonStyles['hidden-toolbar-border']); + expect(wrapper.findAllByClassName(skeletonStyles['hidden-toolbar-border'])).toHaveLength(1); + }); + + test('does not render the content area top border when the flag is not set', () => { + const { wrapper } = renderComponent(); + expect(wrapper.findByClassName(skeletonStyles['hidden-toolbar-border'])).toBeNull(); + }); + + test('keeps rendering breadcrumbs inside the hidden toolbar', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent(} />); + const breadcrumbs = wrapper.findBreadcrumbs()!.findBreadcrumbGroup()!; + expect(breadcrumbs.findBreadcrumbLinks().map(link => link.getElement().textContent)).toEqual(['Home', 'Resource']); + expect(wrapper.findToolbar()!.getElement()).toContainElement(breadcrumbs.getElement()); + }); + + test('keeps rendering the content and open navigation when the flag is set', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent( + {}} content="main content" /> + ); + expect(isToolbarHidden(wrapper.findToolbar()!.getElement())).toBe(true); + expect(wrapper.findContentRegion().getElement()).toHaveTextContent('main content'); + expect(wrapper.findNavigation().getElement()).toHaveTextContent('nav'); + }); + + test('keeps rendering an open tools drawer when the flag is set', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent( {}} />); + expect(isToolbarHidden(wrapper.findToolbar()!.getElement())).toBe(true); + expect(wrapper.findTools().getElement()).toHaveTextContent('tools content'); + }); +}); + +describeEachAppLayout({ themes: ['refresh-toolbar'], sizes: ['desktop'] }, () => { + beforeEach(() => clearInitialMessages()); + afterEach(() => { + cleanup(); + clearInitialMessages(); + }); + + test('reports breadcrumbs to registerBreadcrumbsConsumer when the flag is set', async () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const onBreadcrumbsChange = jest.fn(); + const registration = widgetPlugins.registerBreadcrumbsConsumer({ onBreadcrumbsChange }); + const onFollow = jest.fn(); + + render(} />); + + await waitFor(() => + expect(onBreadcrumbsChange).toHaveBeenLastCalledWith( + expect.objectContaining({ items: breadcrumbItems, onFollow }) + ) + ); + registration.unregister(); + }); + + test('reports breadcrumb updates to registerBreadcrumbsConsumer when the flag is set', async () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const onBreadcrumbsChange = jest.fn(); + const registration = widgetPlugins.registerBreadcrumbsConsumer({ onBreadcrumbsChange }); + + const { rerender } = render(} />); + await waitFor(() => + expect(onBreadcrumbsChange).toHaveBeenLastCalledWith(expect.objectContaining({ items: breadcrumbItems })) + ); + + const updatedItems = [...breadcrumbItems, { text: 'Details', href: '/details' }]; + rerender(} />); + await waitFor(() => + expect(onBreadcrumbsChange).toHaveBeenLastCalledWith(expect.objectContaining({ items: updatedItems })) + ); + registration.unregister(); + }); +}); + +describeEachAppLayout({ themes: ['classic', 'refresh'] }, () => { + test('does not affect non-toolbar designs', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent(); + expect(wrapper.findNavigation().getElement()).toHaveTextContent('nav'); + expect(wrapper.findContentRegion().getElement()).toHaveTextContent('main content'); + }); +}); diff --git a/src/app-layout/__tests__/skeleton.test.tsx b/src/app-layout/__tests__/skeleton.test.tsx index 37ee5c3793e..d2f823228e3 100644 --- a/src/app-layout/__tests__/skeleton.test.tsx +++ b/src/app-layout/__tests__/skeleton.test.tsx @@ -6,12 +6,15 @@ import { render } from '@testing-library/react'; import { isThemeActive } from '@cloudscape-design/component-toolkit/internal'; import AppLayout from '../../../lib/components/app-layout'; -import { BeforeMainSlotSkeleton } from '../../../lib/components/app-layout/visual-refresh-toolbar/skeleton/skeleton-parts'; +import { + BeforeMainSlotSkeleton, + ToolbarSkeleton, +} from '../../../lib/components/app-layout/visual-refresh-toolbar/skeleton/skeleton-parts'; import AppLayoutToolbar from '../../../lib/components/app-layout-toolbar'; import BreadcrumbGroup from '../../../lib/components/breadcrumb-group'; import { getFunnelKeySelector } from '../../../lib/components/internal/analytics/selectors'; import { getIconHTML } from '../../icon/__tests__/utils'; -import { describeEachAppLayout, renderComponent } from './utils'; +import { describeEachAppLayout, renderComponent, setPendingGlobalFlag } from './utils'; import testutilStyles from '../../../lib/components/app-layout/test-classes/styles.selectors.js'; import navStyles from '../../../lib/components/app-layout/visual-refresh-toolbar/navigation/styles.selectors.js'; @@ -181,6 +184,55 @@ describeEachAppLayout({ themes: ['refresh-toolbar'] }, () => { expect(toolbarContainer!.getElement()).toHaveClass(toolbarStyles['universal-toolbar']); expect(toolbarContainer!.getElement()).toHaveClass(testutilStyles.toolbar); }); + + describe('with appLayoutHideToolbar flag', () => { + afterEach(() => setPendingGlobalFlag('appLayoutHideToolbar', undefined)); + + it('renders a visible skeleton toolbar when the flag is not set', () => { + const { wrapper } = renderComponent(); + const toolbar = wrapper.findByClassName(skeletonStyles['toolbar-container'])!.getElement(); + expect(toolbar).not.toHaveClass(toolbarStyles['toolbar-hidden']); + expect(wrapper.findByClassName(skeletonStyles['hidden-toolbar-border'])).toBeNull(); + }); + + it('keeps the skeleton toolbar mounted but hidden when the flag is set', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { wrapper } = renderComponent( + } /> + ); + const toolbar = wrapper.findByClassName(skeletonStyles['toolbar-container'])!.getElement(); + expect(toolbar).toHaveClass(toolbarStyles['toolbar-hidden']); + // breadcrumbs and toggles still render inside, needed for SSR and breadcrumbs reporting + expect(toolbar).toContainElement(wrapper.findBreadcrumbs()!.getElement()); + expect(toolbar).toContainElement(wrapper.findNavigationToggle()!.getElement()); + // the content area keeps a top border in place of the hidden toolbar + expect(toolbar.nextElementSibling).toHaveClass(skeletonStyles['hidden-toolbar-border']); + }); + }); + }); +}); + +describe('ToolbarSkeleton', () => { + const appLayoutInternals = { breadcrumbs:
test breadcrumbs
} as any; + + afterEach(() => setPendingGlobalFlag('appLayoutHideToolbar', undefined)); + + function findToolbar(container: HTMLElement) { + return container.querySelector(`.${skeletonStyles['toolbar-container']}`)!; + } + + it('is visible by default', () => { + const { container } = render(); + expect(findToolbar(container)).not.toHaveClass(toolbarStyles['toolbar-hidden']); + expect(container.querySelector(`.${skeletonStyles['hidden-toolbar-border']}`)).toBeNull(); + }); + + it('is hidden but keeps its content when the appLayoutHideToolbar flag is set', () => { + setPendingGlobalFlag('appLayoutHideToolbar', true); + const { container } = render(); + expect(findToolbar(container)).toHaveClass(toolbarStyles['toolbar-hidden']); + expect(findToolbar(container)).toHaveTextContent('test breadcrumbs'); + expect(findToolbar(container).nextElementSibling).toHaveClass(skeletonStyles['hidden-toolbar-border']); }); }); diff --git a/src/app-layout/__tests__/utils.tsx b/src/app-layout/__tests__/utils.tsx index da4c34f42f3..7bc88eb4da5 100644 --- a/src/app-layout/__tests__/utils.tsx +++ b/src/app-layout/__tests__/utils.tsx @@ -9,6 +9,7 @@ import { clearVisualRefreshState, setGlobalFlag } from '@cloudscape-design/compo import { ComponentWrapper } from '@cloudscape-design/test-utils-core/dom'; import AppLayout, { AppLayoutProps } from '../../../lib/components/app-layout'; +import { PendingGlobalFlags } from '../../../lib/components/app-layout/utils/feature-flags'; import customCssProps from '../../../lib/components/internal/generated/custom-css-properties'; import { forceMobileModeSymbol } from '../../../lib/components/internal/hooks/use-mobile'; import { SplitPanelProps } from '../../../lib/components/split-panel'; @@ -49,6 +50,22 @@ const defaultTestConfig: AppLayoutTestConfig = { }; const globalWithFlags = globalThis as any; +const globalFlagsSymbol = Symbol.for('awsui-global-flags'); + +/** + * Typed counterpart of toolkit's `setGlobalFlag` for flags the toolkit does not declare yet. + */ +export function setPendingGlobalFlag( + flagName: FlagName, + value: PendingGlobalFlags[FlagName] | undefined +) { + globalWithFlags[globalFlagsSymbol] = globalWithFlags[globalFlagsSymbol] ?? {}; + if (value === undefined) { + delete globalWithFlags[globalFlagsSymbol][flagName]; + } else { + globalWithFlags[globalFlagsSymbol][flagName] = value; + } +} export function describeEachAppLayout(callback: AppLayoutTestSuite): void; export function describeEachAppLayout(config: Partial, callback: AppLayoutTestSuite): void; diff --git a/src/app-layout/utils/feature-flags.ts b/src/app-layout/utils/feature-flags.ts index 5b052cd4c6d..595b1f6d51f 100644 --- a/src/app-layout/utils/feature-flags.ts +++ b/src/app-layout/utils/feature-flags.ts @@ -25,3 +25,20 @@ export const useAppLayoutToolbarDesignEnabled = () => { }; export const isAppLayoutHideToolbarBreadcrumbsEnabled = () => !!getGlobalFlag('appLayoutHideToolbarBreadcrumbs'); + +// Flags not yet declared in component-toolkit's GlobalFlags. +// Remove once component-toolkit declares them, and call getGlobalFlag directly. +export interface PendingGlobalFlags { + appLayoutHideToolbar?: boolean; + appLayoutSimplifiedView?: boolean; +} + +type ToolkitFlagName = Parameters[0]; + +const getPendingGlobalFlag = ( + flagName: FlagName +): PendingGlobalFlags[FlagName] | undefined => + getGlobalFlag(flagName as unknown as ToolkitFlagName) as PendingGlobalFlags[FlagName] | undefined; + +export const isAppLayoutHideToolbar = () => !!getPendingGlobalFlag('appLayoutHideToolbar'); +export const isAppLayoutSimplifiedView = () => !!getPendingGlobalFlag('appLayoutSimplifiedView'); diff --git a/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx b/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx index 256d2ff0473..3b995c8ec15 100644 --- a/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx +++ b/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx @@ -12,6 +12,7 @@ import customCssProps from '../../../internal/generated/custom-css-properties'; import { usePrevious } from '../../../internal/hooks/use-previous'; import { getLimitedValue } from '../../../split-panel/utils/size-utils'; import { AppLayoutProps } from '../../interfaces'; +import { isAppLayoutHideToolbar, isAppLayoutSimplifiedView } from '../../utils/feature-flags'; import { FocusControlState } from '../../utils/use-focus-control'; import { AppLayoutInternals, InternalDrawer } from '../interfaces'; import { OnChangeParams } from '../state/use-ai-drawer'; @@ -154,6 +155,8 @@ export function AppLayoutGlobalAiDrawerImplementation({ [styles['drawer-hidden']]: !show && drawerTransitionState === 'exited', [testutilStyles['drawer-closed']]: !activeAiDrawer, [styles['drawer-expanded']]: isExpanded, + [styles['simplified-view']]: isAppLayoutSimplifiedView(), + [styles['with-hidden-toolbar']]: isAppLayoutHideToolbar(), } )} ref={drawerRef} diff --git a/src/app-layout/visual-refresh-toolbar/drawer/styles.scss b/src/app-layout/visual-refresh-toolbar/drawer/styles.scss index ddd8049051f..84d5adba163 100644 --- a/src/app-layout/visual-refresh-toolbar/drawer/styles.scss +++ b/src/app-layout/visual-refresh-toolbar/drawer/styles.scss @@ -288,6 +288,7 @@ $ai-drawer-heider-height: 42px; } > .drawer-content-container { + box-sizing: border-box; min-inline-size: calc(var(#{custom-props.$drawerMinSize}) - #{awsui.$space-xs}); grid-column: 1 / span 1; background-color: awsui.$color-background-layout-panel-content; @@ -443,6 +444,53 @@ $ai-drawer-heider-height: 42px; border-start-end-radius: 0; } } + + &.with-hidden-toolbar:not(.drawer-expanded) { + @mixin hidden-toolbar-separator { + // the drawer cell is raised above the navigation, so the shadow is not covered (see skeleton/styles.scss) + box-shadow: awsui.$border-divider-section-width 0 0 0 awsui.$color-border-layout; + + @include styles.with-direction('rtl') { + box-shadow: calc(-1 * #{awsui.$border-divider-section-width}) 0 0 0 awsui.$color-border-layout; + } + } + + @include desktop-only { + @include theming.dark-mode-only { + @include hidden-toolbar-separator; + } + @include theming.one-theme-only { + @include hidden-toolbar-separator; + } + } + } + + &.simplified-view > .drawer-content-container { + border-start-end-radius: 0; + clip-path: none; + + @include styles.with-direction('rtl') { + clip-path: none; + } + + > .drawer-content > .drawer-content-header { + background-color: awsui.$color-background-container-content; + + // no corner fillers next to the back-to-console slot, the corners are square + > .drawer-back-to-console-slot { + &:before, + &:after { + display: none; + } + } + + @include theming.dark-mode-only { + > .drawer-content-header-content:has(+ .drawer-back-to-console-slot) { + border-start-end-radius: 0; + } + } + } + } } &.bottom-drawer { diff --git a/src/app-layout/visual-refresh-toolbar/skeleton/slots.tsx b/src/app-layout/visual-refresh-toolbar/skeleton/slots.tsx index 7772645b27c..817484c65c4 100644 --- a/src/app-layout/visual-refresh-toolbar/skeleton/slots.tsx +++ b/src/app-layout/visual-refresh-toolbar/skeleton/slots.tsx @@ -5,6 +5,7 @@ import clsx from 'clsx'; import { BreadcrumbGroupImplementation } from '../../../breadcrumb-group/implementation'; import { BreadcrumbGroupProps } from '../../../breadcrumb-group/interfaces'; +import { isAppLayoutHideToolbar, isAppLayoutSimplifiedView } from '../../utils/feature-flags'; import { BreadcrumbsSlotContext, BreadcrumbsSlotContextType } from '../contexts'; import testutilStyles from '../../test-classes/styles.css.js'; @@ -17,18 +18,30 @@ interface ToolbarSlotProps { children?: React.ReactNode; } -export const ToolbarSlot = React.forwardRef(({ className, style, children }, ref) => ( -
} - className={clsx(styles['toolbar-container'], toolbarStyles['universal-toolbar'], testutilStyles.toolbar, className)} - style={{ - insetBlockStart: style?.insetBlockStart ?? 0, - ...style, - }} - > - {children} -
-)); +export const ToolbarSlot = React.forwardRef(({ className, style, children }, ref) => { + const hidden = isAppLayoutHideToolbar(); + const insetBlockStart = style?.insetBlockStart ?? 0; + return ( + <> +
} + className={clsx( + styles['toolbar-container'], + toolbarStyles['universal-toolbar'], + testutilStyles.toolbar, + hidden && toolbarStyles['toolbar-hidden'], + isAppLayoutSimplifiedView() && toolbarStyles['simplified-view'], + className + )} + style={{ insetBlockStart, ...style }} + > + {children} +
+ {/* the content area keeps a top border in the toolbar border color, where the hidden toolbar would be */} + {hidden &&
} + + ); +}); interface NotificationsSlotProps { className?: string; diff --git a/src/app-layout/visual-refresh-toolbar/skeleton/styles.scss b/src/app-layout/visual-refresh-toolbar/skeleton/styles.scss index 4b4d4ac56bc..09057de79fa 100644 --- a/src/app-layout/visual-refresh-toolbar/skeleton/styles.scss +++ b/src/app-layout/visual-refresh-toolbar/skeleton/styles.scss @@ -137,6 +137,12 @@ @include desktop-only { grid-area: ai-drawer; position: sticky; + + // Without the toolbar, the AI drawer draws the separator to the main content right outside its edge + // (drawer/styles.scss). The navigation next to it would cover it otherwise. + &.with-hidden-toolbar { + z-index: constants.$drawer-z-index + 1; + } } } @@ -220,6 +226,26 @@ box-sizing: border-box; } +/** + * A zero-height sticky element placed in the toolbar grid area when the toolbar is hidden by a feature flag. + * Draws a top border for the content area in the toolbar border color, without taking any space. + */ +.hidden-toolbar-border { + grid-area: toolbar; + position: sticky; + z-index: constants.$toolbar-z-index; + + &:before { + content: ''; + position: absolute; + inset-inline: 0; + inset-block-start: 0; + block-size: awsui.$border-divider-section-width; + background-color: awsui.$color-border-layout; + pointer-events: none; + } +} + /** * A zero-height sticky element placed in the toolbar grid area when the toolbar is absent * and the left panel (AI drawer) is open. It reuses the toolbar's pseudo-element technique @@ -276,6 +302,17 @@ border-block-start: awsui.$border-divider-section-width solid awsui.$color-border-layout; } } + + // square corner next to the AI drawer, same as the toolbar in simplified view + &.pseudo-toolbar-simplified-view { + @include theming.dark-mode-only { + border-start-start-radius: 0; + } + + &::after { + border-start-start-radius: 0; + } + } } .notifications-container { diff --git a/src/app-layout/visual-refresh-toolbar/toolbar/styles.scss b/src/app-layout/visual-refresh-toolbar/toolbar/styles.scss index 0508f31f1c6..6a992f423df 100644 --- a/src/app-layout/visual-refresh-toolbar/toolbar/styles.scss +++ b/src/app-layout/visual-refresh-toolbar/toolbar/styles.scss @@ -29,6 +29,10 @@ $toolbar-height: 42px; transition-property: inset-block-start, opacity; } + &.toolbar-hidden { + display: none; + } + &.with-ai-drawer:not(:has(.universal-toolbar-ai-custom)) { &:before, &:after { @@ -165,6 +169,25 @@ $toolbar-height: 42px; block-size: 100%; } } + + // square corners next to the AI drawer + &.simplified-view { + &.with-ai-drawer:not(:has(.universal-toolbar-ai-custom)):after, + > .universal-toolbar-ai-custom:after { + border-start-start-radius: 0; + } + + @include theming.dark-mode-only { + > .toolbar-container.with-ai-drawer { + border-start-start-radius: 0; + } + } + @include theming.one-theme-only { + > .toolbar-container.with-ai-drawer { + border-start-start-radius: 0; + } + } + } } .drawers-desktop-triggers-container, diff --git a/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx b/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx index 972c7120a36..6e0461c15bf 100644 --- a/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx +++ b/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx @@ -5,6 +5,7 @@ import clsx from 'clsx'; import { AppLayoutBuiltInErrorBoundary } from '../../../error-boundary/internal'; import { createWidgetizedComponent } from '../../../internal/widgets'; +import { isAppLayoutHideToolbar, isAppLayoutSimplifiedView } from '../../utils/feature-flags'; import { ActiveDrawersContext } from '../../utils/visibility-context'; import { AppLayoutGlobalAiDrawerImplementation } from '../drawer/global-ai-drawer'; import { AppLayoutNavigationImplementation as AppLayoutNavigation } from '../navigation'; @@ -80,13 +81,19 @@ export const BeforeMainSlotImplementationInternal = ({ insetBlockStart: appLayoutState.appLayoutInternals?.verticalOffsets?.toolbar, }} > -
+
)} {aiDrawer && (