fix: Fix AppLayoutToolbar breadcrumbs SSR glitch #3856
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| import React from 'react'; | ||
| import { render } from '@testing-library/react'; | ||
|
|
||
| import { | ||
| NotificationsSkeleton, | ||
| ToolbarSkeleton, | ||
| } from '../../../../../lib/components/app-layout/visual-refresh-toolbar/skeleton/skeleton-parts'; | ||
|
|
||
| describe('ToolbarSkeleton', () => { | ||
| test('renders with discoveredBreadcrumbs', () => { | ||
| const { container } = render( | ||
| <ToolbarSkeleton | ||
| appLayoutInternals={ | ||
| { | ||
| breadcrumbs: null, | ||
| discoveredBreadcrumbs: { items: [] }, | ||
| } as any | ||
| } | ||
| toolbarProps={{} as any} | ||
| /> | ||
| ); | ||
| expect(container).toBeTruthy(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('NotificationsSkeleton', () => { | ||
| test('renders', () => { | ||
| const { container } = render(<NotificationsSkeleton appLayoutInternals={{} as any}>{null}</NotificationsSkeleton>); | ||
| expect(container).toBeTruthy(); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| import React from 'react'; | ||
| import clsx from 'clsx'; | ||
|
|
||
| import { BreadcrumbGroupProps } from '../../../breadcrumb-group/interfaces'; | ||
| import { BreadcrumbsSlot, ToolbarSlot } from './slots'; | ||
|
|
||
| import testutilStyles from '../../test-classes/styles.css.js'; | ||
| import toolbarStyles from '../toolbar/styles.css.js'; | ||
|
|
||
| interface ToolbarContainerProps { | ||
| children: React.ReactNode; | ||
| hasAiDrawer?: boolean; | ||
| } | ||
|
|
||
| export function ToolbarContainer({ children, hasAiDrawer }: ToolbarContainerProps) { | ||
| return ( | ||
| <div className={clsx(toolbarStyles['toolbar-container'], hasAiDrawer && toolbarStyles['with-ai-drawer'])}> | ||
| {children} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| interface ToolbarBreadcrumbsWrapperProps { | ||
| children: React.ReactNode; | ||
| includeTestUtils?: boolean; | ||
| } | ||
|
|
||
| export function ToolbarBreadcrumbsWrapper({ children, includeTestUtils = false }: ToolbarBreadcrumbsWrapperProps) { | ||
|
There was a problem hiding this comment. This component is only used once further down, so it does not need to be exported, or it could even be removed? |
||
| return ( | ||
| <div | ||
| className={clsx(toolbarStyles['universal-toolbar-breadcrumbs'], includeTestUtils && testutilStyles.breadcrumbs)} | ||
|
There was a problem hiding this comment. Why do we only add the |
||
| > | ||
| {children} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export function ToolbarDrawersWrapper() { | ||
|
There was a problem hiding this comment. Also this is used only once below in the same file |
||
| return <div className={toolbarStyles['universal-toolbar-drawers']} />; | ||
| } | ||
|
|
||
| interface ToolbarBreadcrumbsSectionProps { | ||
| ownBreadcrumbs: React.ReactNode; | ||
| discoveredBreadcrumbs?: BreadcrumbGroupProps | null; | ||
| includeTestUtils?: boolean; | ||
| } | ||
|
|
||
| export function ToolbarBreadcrumbsSection({ | ||
| ownBreadcrumbs, | ||
| discoveredBreadcrumbs, | ||
| includeTestUtils = false, | ||
| }: ToolbarBreadcrumbsSectionProps) { | ||
| return ( | ||
| <ToolbarBreadcrumbsWrapper includeTestUtils={includeTestUtils}> | ||
| <BreadcrumbsSlot ownBreadcrumbs={ownBreadcrumbs} discoveredBreadcrumbs={discoveredBreadcrumbs} /> | ||
| </ToolbarBreadcrumbsWrapper> | ||
| ); | ||
| } | ||
|
|
||
| interface ToolbarSkeletonStructureProps { | ||
| ownBreadcrumbs: React.ReactNode; | ||
| discoveredBreadcrumbs?: BreadcrumbGroupProps | null; | ||
| } | ||
|
|
||
| export const ToolbarSkeletonStructure = React.forwardRef<HTMLElement, ToolbarSkeletonStructureProps>( | ||
| ({ ownBreadcrumbs, discoveredBreadcrumbs }, ref) => ( | ||
| <ToolbarSlot ref={ref}> | ||
| <ToolbarContainer> | ||
| <ToolbarBreadcrumbsSection ownBreadcrumbs={ownBreadcrumbs} discoveredBreadcrumbs={discoveredBreadcrumbs} /> | ||
| <ToolbarDrawersWrapper /> | ||
| </ToolbarContainer> | ||
| </ToolbarSlot> | ||
| ) | ||
| ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think here we could reuse this
isWidgetReadyfunction:components/src/app-layout/visual-refresh-toolbar/state/invariants.ts
Lines 5 to 7 in d11c844