Skip to content

feat(Page,Drawer): core bump and updates #10211

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Mar 27, 2024
Merged

feat(Page,Drawer): core bump and updates #10211

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a9c7ab
feat(Page,Drawer): core bump and updates
kmcfaul Mar 27, 2024
b489970
update layouts with core bump
kmcfaul Mar 27, 2024
92da014
fix integration
kmcfaul Mar 27, 2024
f3f59d0
move tabindex
kmcfaul Mar 27, 2024
30e2431
update snap
kmcfaul Mar 27, 2024
21dbf7c
move tabindex back
kmcfaul Mar 27, 2024
f64f67a
reup snaps
kmcfaul Mar 27, 2024
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
2 changes: 1 addition & 1 deletion packages/react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"tslib": "^2.5.0"
},
"devDependencies": {
"@patternfly/patternfly": "6.0.0-alpha.100",
"@patternfly/patternfly": "6.0.0-alpha.107",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@rollup/plugin-replace": "^5.0.2",
Expand Down
16 changes: 11 additions & 5 deletions packages/react-core/src/components/Drawer/DrawerContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import * as React from 'react';
import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
import { css } from '@patternfly/react-styles';
import { DrawerMain } from './DrawerMain';
import { DrawerColorVariant, DrawerContext } from './Drawer';
import { DrawerContext } from './Drawer';

export enum DrawerContentColorVariant {
default = 'default',
primary = 'primary',
secondary = 'secondary'
}

export interface DrawerContentProps extends React.HTMLProps<HTMLDivElement> {
/** Additional classes added to the Drawer. */
Expand All @@ -12,14 +18,14 @@ export interface DrawerContentProps extends React.HTMLProps<HTMLDivElement> {
/** Content rendered in the drawer panel. */
panelContent: React.ReactNode;
/** Color variant of the background of the drawer panel */
colorVariant?: DrawerColorVariant | 'no-background' | 'default' | 'secondary';
colorVariant?: DrawerContentColorVariant | 'default' | 'primary' | 'secondary';
}

export const DrawerContent: React.FunctionComponent<DrawerContentProps> = ({
className,
children,
panelContent,
colorVariant = DrawerColorVariant.default,
colorVariant = DrawerContentColorVariant.default,
...props
}: DrawerContentProps) => {
const { drawerContentRef } = React.useContext(DrawerContext);
Expand All @@ -29,8 +35,8 @@ export const DrawerContent: React.FunctionComponent<DrawerContentProps> = ({
<div
className={css(
styles.drawerContent,
colorVariant === DrawerColorVariant.noBackground && styles.modifiers.noBackground,
colorVariant === DrawerColorVariant.secondary && styles.modifiers.secondary,
colorVariant === DrawerContentColorVariant.primary && styles.modifiers.primary,
colorVariant === DrawerContentColorVariant.secondary && styles.modifiers.secondary,
className
)}
ref={drawerContentRef}
Expand Down
5 changes: 3 additions & 2 deletions packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
DrawerCloseButton,
DrawerSection,
Button,
DrawerColorVariant
DrawerColorVariant,
DrawerContentColorVariant
} from '@patternfly/react-core';

export const DrawerSecondaryBackground: React.FunctionComponent = () => {
Expand Down Expand Up @@ -96,7 +97,7 @@ export const DrawerSecondaryBackground: React.FunctionComponent = () => {
drawer-section
</DrawerSection>
<DrawerContent
colorVariant={contentSecondary ? DrawerColorVariant.secondary : DrawerColorVariant.default}
colorVariant={contentSecondary ? DrawerContentColorVariant.secondary : DrawerContentColorVariant.default}
panelContent={panelContent}
>
<DrawerContentBody>{drawerContent}</DrawerContentBody>
Expand Down
27 changes: 14 additions & 13 deletions packages/react-core/src/components/Page/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,19 +295,20 @@ class Page extends React.Component<PageProps, PageState> {
const Component: keyof JSX.IntrinsicElements = mainComponent;

const main = (
<Component
ref={this.mainRef}
role={role}
id={mainContainerId}
className={css(styles.pageMain)}
tabIndex={mainTabIndex}
aria-label={mainAriaLabel}
>
{group}
{!isHorizontalSubnavGrouped && nav}
{!isBreadcrumbGrouped && crumb}
{children}
</Component>
<div className={css(styles.pageMainContainer)} tabIndex={mainTabIndex}>
<Component
ref={this.mainRef}
role={role}
id={mainContainerId}
className={css(styles.pageMain)}
aria-label={mainAriaLabel}
>
{group}
{!isHorizontalSubnavGrouped && nav}
{!isBreadcrumbGrouped && crumb}
{children}
</Component>
</div>
);

const panelContent = <DrawerPanelContent>{notificationDrawer}</DrawerPanelContent>;
Expand Down
Loading