Skip to content

fix(drawer): remove hidden when drawer is expanded #4034

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
tlabaj merged 1 commit into from
Apr 29, 2020
Merged

fix(drawer): remove hidden when drawer is expanded #4034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions packages/react-core/src/components/Drawer/Drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ export interface DrawerProps extends React.HTMLProps<HTMLDivElement> {

export interface DrawerContextProps {
isExpanded: boolean;
isStatic: boolean;
}

export const DrawerContext = React.createContext<Partial<DrawerContextProps>>({
isExpanded: false
isExpanded: false,
isStatic: false
});

export const Drawer: React.SFC<DrawerProps> = ({
Expand All @@ -34,7 +36,7 @@ export const Drawer: React.SFC<DrawerProps> = ({
position = 'right',
...props
}: DrawerProps) => (
<DrawerContext.Provider value={{ isExpanded }}>
<DrawerContext.Provider value={{ isExpanded, isStatic }}>
<div
className={css(
styles.drawer,
Expand Down
6 changes: 2 additions & 4 deletions packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const DrawerPanelContent: React.SFC<DrawerPanelContentProps> = ({
...props
}: DrawerPanelContentProps) => (
<DrawerContext.Consumer>
{({ isExpanded }) => (
{({ isExpanded, isStatic }) => (
<div
className={css(
styles.drawerPanel,
Expand All @@ -42,9 +42,7 @@ export const DrawerPanelContent: React.SFC<DrawerPanelContentProps> = ({
widthOn2Xl && styles.modifiers[`width_${widthOn2Xl}On_2xl` as keyof typeof styles.modifiers],
className
)}
hidden={!isExpanded}
aria-hidden={!isExpanded}
aria-expanded={isExpanded}
hidden={isStatic ? false : !isExpanded}
{...props}
>
{children}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Drawer/__tests__/Generated/DrawerPanelContent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ import { DrawerPanelContent } from '../../DrawerPanelContent';
import {} from '../..';

it('DrawerPanelContent should match snapshot (auto-generated)', () => {
const view = shallow(<DrawerPanelContent className={"''"} children={<div>ReactNode</div>} noPadding={false} />);
const view = shallow(<DrawerPanelContent className={"''"} children={<div>ReactNode</div>} />);
expect(view).toMatchSnapshot();
});
1 change: 1 addition & 0 deletions ...s/react-core/src/components/Drawer/__tests__/Generated/__snapshots__/Drawer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ exports[`Drawer should match snapshot (auto-generated) 1`] = `
value={
Object {
"isExpanded": false,
"isStatic": false,
}
}
>
Expand Down
10 changes: 0 additions & 10 deletions packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ exports[`Drawer isExpanded = false and isInline = false and isStatic = false 1`]
</div>
<DrawerPanelContent>
<div
aria-expanded={false}
aria-hidden={true}
className="pf-c-drawer__panel"
hidden={true}
>
Expand Down Expand Up @@ -176,8 +174,6 @@ exports[`Drawer isExpanded = false and isInline = true and isStatic = false 1`]
</div>
<DrawerPanelContent>
<div
aria-expanded={false}
aria-hidden={true}
className="pf-c-drawer__panel"
hidden={true}
>
Expand Down Expand Up @@ -311,8 +307,6 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = false 1`]
</div>
<DrawerPanelContent>
<div
aria-expanded={true}
aria-hidden={false}
className="pf-c-drawer__panel"
hidden={false}
>
Expand Down Expand Up @@ -446,8 +440,6 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = true 1`] =
</div>
<DrawerPanelContent>
<div
aria-expanded={true}
aria-hidden={false}
className="pf-c-drawer__panel"
hidden={false}
>
Expand Down Expand Up @@ -581,8 +573,6 @@ exports[`Drawer isExpanded = true and isInline = true and isStatic = false 1`] =
</div>
<DrawerPanelContent>
<div
aria-expanded={true}
aria-hidden={false}
className="pf-c-drawer__panel"
hidden={false}
>
Expand Down