Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Revert Flashbar fixes #787

Merged
merged 2 commits into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import React from 'react';
import AppLayout from '~components/app-layout';
import ScreenshotArea from '../utils/screenshot-area';
import labels from './utils/labels';
import Flashbar from '~components/flashbar';
import Table from '~components/table';
import Header from '~components/header';

export default function () {
return (
<ScreenshotArea gutters={false}>
<AppLayout
ariaLabels={labels}
notifications={
<Flashbar
items={[
{
type: 'success',
header: 'Success message',
statusIconAriaLabel: 'success',
dismissLabel: 'Dismiss notification',
dismissible: true,
onDismiss: () => void 0,
},
{
type: 'warning',
header: 'Warning message',
statusIconAriaLabel: 'warning',
dismissLabel: 'Dismiss notification',
dismissible: true,
onDismiss: () => void 0,
},
]}
stackItems={true}
i18nStrings={{
ariaLabel: 'Notifications',
notificationBarText: 'Notifications',
notificationBarAriaLabel: 'View all notifications',
errorIconAriaLabel: 'Error',
successIconAriaLabel: 'Success',
warningIconAriaLabel: 'Warning',
infoIconAriaLabel: 'Information',
inProgressIconAriaLabel: 'In progress',
}}
/>
}
disableContentPaddings={true}
content={
<Table
header={<Header variant="h1">Sticky Table Header</Header>}
items={[]}
columnDefinitions={[]}
stickyHeader={true}
/>
}
/>
</ScreenshotArea>
);
}
155 changes: 0 additions & 155 deletions pages/app-layout/with-stacked-notifications-and-table.page.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/app-layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ const OldAppLayout = React.forwardRef(
>
{notifications && (
<Notifications
disableContentPaddings={disableContentPaddings}
testUtilsClassName={testutilStyles.notifications}
labels={ariaLabels}
topOffset={disableBodyScroll ? 0 : headerHeight}
Expand Down
15 changes: 3 additions & 12 deletions src/app-layout/notifications/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,24 @@ interface NotificationsProps {
children?: React.ReactNode;
labels: AppLayoutProps.Labels | undefined;
topOffset: number | undefined;
disableContentPaddings?: boolean;
}
interface NotificationWrapperProps extends NotificationsProps {
sticky: boolean | undefined;
}

export const Notifications = React.forwardRef(
({ sticky, disableContentPaddings, ...props }: NotificationWrapperProps, ref: React.Ref<HTMLDivElement>) => {
({ sticky, ...props }: NotificationWrapperProps, ref: React.Ref<HTMLDivElement>) => {
return sticky ? (
<div ref={ref} className={styles['notifications-sticky']} style={{ top: props.topOffset }}>
<div
role="region"
className={clsx(props.testUtilsClassName, disableContentPaddings && styles['no-content-paddings'])}
aria-label={props.labels?.notifications}
>
<div role="region" className={props.testUtilsClassName} aria-label={props.labels?.notifications}>
{props.children}
</div>
</div>
) : (
<div
role="region"
ref={ref}
className={clsx(
props.testUtilsClassName,
styles.notifications,
disableContentPaddings && styles['no-content-paddings']
)}
className={clsx(props.testUtilsClassName, styles.notifications)}
aria-label={props.labels?.notifications}
>
{props.children}
Expand Down
8 changes: 0 additions & 8 deletions src/app-layout/notifications/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@
position: sticky;
#{custom-props.$flashbarStickyBottomMargin}: #{awsui.$space-xxl};
}

.no-content-paddings {
/*
When using the disableContentPaddings option, the Flashbar will use this custom property to add additional space
when the notification bar is rendered, to prevent it from overlapping the content.
*/
#{custom-props.$stackedNotificationsBottomMargin}: #{awsui.$space-scaled-l};
}
8 changes: 2 additions & 6 deletions src/app-layout/visual-refresh/notifications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ export default function Notifications() {
return null;
}

/*
The notificationsElement ref is assigned to an inner div to prevent internal bottom margin from affecting the
calculated height, which is used for sticky elements below.
*/

return (
<div
role="region"
Expand All @@ -44,8 +39,9 @@ export default function Notifications() {
testutilStyles.notifications,
'awsui-context-content-header'
)}
ref={notificationsElement}
>
<div ref={notificationsElement}>{notifications}</div>
{notifications}
</div>
);
}
9 changes: 2 additions & 7 deletions src/flashbar/collapsible-flashbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { sendToggleMetric } from './internal/analytics';
import { useFlashbar } from './common';
import { throttle } from '../internal/utils/throttle';
import { scrollElementIntoView } from '../internal/utils/scrollable-containers';
import { findUpUntil } from '../internal/utils/dom';

export { FlashbarProps };

Expand Down Expand Up @@ -113,7 +112,7 @@ export default function CollapsibleFlashbar({ items, ...restProps }: FlashbarPro
const windowHeight = window.innerHeight;
// Take the parent region into account if using the App Layout, because it might have additional margins.
// Otherwise we use the Flashbar component for this calculation.
const outerElement = findUpUntil(flashbar, element => element.getAttribute('role') === 'region') || flashbar;
const outerElement = flashbar.parentElement?.parentElement || flashbar;
const applySpacing =
isFlashbarStackExpanded && Math.ceil(outerElement.getBoundingClientRect().bottom) >= windowHeight;
if (!applySpacing) {
Expand Down Expand Up @@ -286,10 +285,7 @@ export default function CollapsibleFlashbar({ items, ...restProps }: FlashbarPro
styles.flashbar,
styles[`breakpoint-${breakpoint}`],
styles.stack,
isCollapsible && styles.collapsible,
items.length === 2 && styles['short-list'],
isFlashbarStackExpanded && styles.expanded,
isVisualRefresh && styles['visual-refresh'],
getVisualContextClassname('flashbar')
)}
ref={mergedRef}
Expand All @@ -302,8 +298,7 @@ export default function CollapsibleFlashbar({ items, ...restProps }: FlashbarPro
styles['notification-bar'],
isVisualRefresh && styles['visual-refresh'],
isFlashbarStackExpanded ? styles.expanded : styles.collapsed,
transitioning && styles['animation-running'],
items.length === 2 && styles['short-list']
transitioning && styles['animation-running']
)}
onClick={toggleCollapseExpand}
ref={notificationBarRef}
Expand Down
Loading