Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion packages/react-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"tslib": "^2.8.1"
},
"devDependencies": {
"@patternfly/patternfly": "6.5.0-prerelease.67",
"@patternfly/patternfly": "6.5.0-prerelease.71",
"case-anything": "^3.1.2",
"css": "^3.0.0",
"fs-extra": "^11.3.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
size === ButtonSize.sm && styles.modifiers.small,
size === ButtonSize.lg && styles.modifiers.displayLg,
isCircle && styles.modifiers.circle,
isDocked && styles.modifiers.dock, // Replace with docked class from https://github.com/patternfly/patternfly/pull/8308
isDocked && styles.modifiers.docked,
isDocked && isTextExpanded && styles.modifiers.textExpanded,
className
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,14 +556,14 @@ describe('Favorite button', () => {
});

describe('Dock variant', () => {
test(`Renders with class ${styles.modifiers.dock} when isDocked = true`, () => {
test(`Renders with class ${styles.modifiers.docked} when isDocked = true`, () => {
render(<Button isDocked>Dock Button</Button>);
expect(screen.getByRole('button')).toHaveClass(styles.modifiers.dock);
expect(screen.getByRole('button')).toHaveClass(styles.modifiers.docked);
});

test(`Does not render with class ${styles.modifiers.dock} when isDocked is not passed`, () => {
test(`Does not render with class ${styles.modifiers.docked} when isDocked is not passed`, () => {
render(<Button>Button</Button>);
expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.dock);
expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.docked);
});

test(`Renders with class ${styles.modifiers.textExpanded} when isTextExpanded = true and isDocked = true`, () => {
Expand All @@ -585,14 +585,14 @@ describe('Dock variant', () => {
expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.textExpanded);
});

test(`Renders with both ${styles.modifiers.dock} and ${styles.modifiers.textExpanded} when both props are true`, () => {
test(`Renders with both ${styles.modifiers.docked} and ${styles.modifiers.textExpanded} when both props are true`, () => {
render(
<Button isDocked isTextExpanded>
Dock Text Expanded Button
</Button>
);
const button = screen.getByRole('button');
expect(button).toHaveClass(styles.modifiers.dock);
expect(button).toHaveClass(styles.modifiers.docked);
expect(button).toHaveClass(styles.modifiers.textExpanded);
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Compass/Compass.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const Compass: React.FunctionComponent<CompassProps> = ({

const compassContent = (
<div
className={css(styles.compass, dock !== undefined && styles.modifiers.dock, className)}
className={css(styles.compass, dock !== undefined && styles.modifiers.docked, className)}
{...props}
style={{ ...props.style, ...backgroundImageStyles }}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,12 @@ test('Matches the snapshot with drawer', () => {
expect(asFragment()).toMatchSnapshot();
});

test(`Renders with ${styles.modifiers.dock} class when dock is passed`, () => {
test(`Renders with ${styles.modifiers.docked} class when dock is passed`, () => {
render(<Compass dock={<div>Dock content</div>} data-testid="compass" />);
expect(screen.getByTestId('compass')).toHaveClass(styles.modifiers.dock);
expect(screen.getByTestId('compass')).toHaveClass(styles.modifiers.docked);
});

test(`Does not render with ${styles.modifiers.dock} class when dock is not passed`, () => {
test(`Does not render with ${styles.modifiers.docked} class when dock is not passed`, () => {
render(<Compass data-testid="compass" />);
expect(screen.getByTestId('compass')).not.toHaveClass(styles.modifiers.dock);
expect(screen.getByTestId('compass')).not.toHaveClass(styles.modifiers.docked);
});
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
isDisabled && styles.modifiers.disabled,
isPlaceholder && styles.modifiers.placeholder,
isSettings && styles.modifiers.settings,
isDocked && styles.modifiers.dock, // Replace with docked class from https://github.com/patternfly/patternfly/pull/8308
isDocked && styles.modifiers.docked,
isDocked && isTextExpanded && styles.modifiers.textExpanded,
size === MenuToggleSize.sm && styles.modifiers.small,
className
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@ test('Does not render custom icon when icon prop and isSettings are passed', ()
expect(screen.queryByText('Custom icon')).not.toBeInTheDocument();
});

test(`Renders with class ${styles.modifiers.dock} when isDocked is passed`, () => {
test(`Renders with class ${styles.modifiers.docked} when isDocked is passed`, () => {
render(<MenuToggle isDocked>Dock Toggle</MenuToggle>);
expect(screen.getByRole('button')).toHaveClass(styles.modifiers.dock);
expect(screen.getByRole('button')).toHaveClass(styles.modifiers.docked);
});

test(`Does not render with class ${styles.modifiers.dock} when isDocked is not passed`, () => {
test(`Does not render with class ${styles.modifiers.docked} when isDocked is not passed`, () => {
render(<MenuToggle>Toggle</MenuToggle>);
expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.dock);
expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.docked);
});

test(`Renders with class ${styles.modifiers.textExpanded} when isTextExpanded is passed and isDocked is passed`, () => {
Expand All @@ -185,13 +185,13 @@ test(`Does not render with class ${styles.modifiers.textExpanded} when isTextExp
expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.textExpanded);
});

test(`Renders with both ${styles.modifiers.dock} and ${styles.modifiers.textExpanded} when both props are passed`, () => {
test(`Renders with both ${styles.modifiers.docked} and ${styles.modifiers.textExpanded} when both props are passed`, () => {
render(
<MenuToggle isDocked isTextExpanded>
Dock Text Expanded Toggle
</MenuToggle>
);
const button = screen.getByRole('button');
expect(button).toHaveClass(styles.modifiers.dock);
expect(button).toHaveClass(styles.modifiers.docked);
expect(button).toHaveClass(styles.modifiers.textExpanded);
});
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Page/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ class Page extends Component<PageProps, PageState> {
{...rest}
className={css(
styles.page,
variant === 'docked' && styles.modifiers.dock,
variant === 'docked' && styles.modifiers.docked,
width !== null && height !== null && 'pf-m-resize-observer',
width !== null && `pf-m-breakpoint-${getBreakpoint(width)}`,
height !== null && `pf-m-height-breakpoint-${getVerticalBreakpoint(height)}`,
Expand Down
25 changes: 18 additions & 7 deletions packages/react-core/src/components/Page/__tests__/Page.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -391,29 +391,29 @@ describe('Page', () => {
});
});

describe('Page dock variant', () => {
test(`Does not render with dock classes when variant is default`, () => {
describe('Page docked variant', () => {
test(`Does not render with docked classes when variant is default`, () => {
render(<Page {...props} variant="default" data-testid="page"></Page>);

const page = screen.getByTestId('page');
expect(page).not.toHaveClass(styles.modifiers.dock);
expect(page).not.toHaveClass(styles.modifiers.docked);
expect(page.querySelector(`.${styles.pageDock}`)).not.toBeInTheDocument();
expect(page.querySelector(`.${styles.pageDockMain}`)).not.toBeInTheDocument();
});

test(`Does not render with dock classes when variant is not passed`, () => {
test(`Does not render with docked classes when variant is not passed`, () => {
render(<Page data-testid="page"></Page>);

const page = screen.getByTestId('page');
expect(page).not.toHaveClass(styles.modifiers.dock);
expect(page).not.toHaveClass(styles.modifiers.docked);
expect(page.querySelector(`.${styles.pageDock}`)).not.toBeInTheDocument();
expect(page.querySelector(`.${styles.pageDockMain}`)).not.toBeInTheDocument();
});

test(`Renders with ${styles.modifiers.dock} class when variant is docked`, () => {
test(`Renders with ${styles.modifiers.docked} class when variant is docked`, () => {
render(<Page {...props} variant="docked" data-testid="page"></Page>);

expect(screen.getByTestId('page')).toHaveClass(styles.modifiers.dock);
expect(screen.getByTestId('page')).toHaveClass(styles.modifiers.docked);
});

test('Renders dock content when dockContent and variant="docked" is passed', () => {
Expand Down Expand Up @@ -481,6 +481,17 @@ describe('Page dock variant', () => {
expect(pageDock).toHaveClass(styles.modifiers.textExpanded);
});

test(`Does not render with ${styles.modifiers.docked} class when variant is default`, () => {
render(<Page {...props} variant="default" data-testid="page"></Page>);

expect(screen.getByTestId('page')).not.toHaveClass(styles.modifiers.docked);
});

test(`Does not render with ${styles.modifiers.docked} class when variant is not passed`, () => {
render(<Page data-testid="page"></Page>);
expect(screen.getByTestId('page')).not.toHaveClass(styles.modifiers.docked);
});

test(`Renders with ${styles.pageDockMain} wrapper when variant is docked`, () => {
render(<Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);

Expand Down
2 changes: 1 addition & 1 deletion packages/react-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:a11y": "patternfly-a11y --config patternfly-a11y.config"
},
"dependencies": {
"@patternfly/patternfly": "6.5.0-prerelease.67",
"@patternfly/patternfly": "6.5.0-prerelease.71",
"@patternfly/react-charts": "workspace:^",
"@patternfly/react-code-editor": "workspace:^",
"@patternfly/react-core": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-regular-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@patternfly/patternfly": "6.5.0-prerelease.67",
"@patternfly/patternfly": "6.5.0-prerelease.71",
"@rhds/icons": "^2.1.0",
"fs-extra": "^11.3.3",
"tslib": "^2.8.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"clean": "rimraf dist css"
},
"devDependencies": {
"@patternfly/patternfly": "6.5.0-prerelease.67",
"@patternfly/patternfly": "6.5.0-prerelease.71",
"change-case": "^5.4.4",
"fs-extra": "^11.3.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"devDependencies": {
"@adobe/css-tools": "^4.4.4",
"@patternfly/patternfly": "6.5.0-prerelease.67",
"@patternfly/patternfly": "6.5.0-prerelease.71",
"fs-extra": "^11.3.3"
}
}
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5070,10 +5070,10 @@ __metadata:
languageName: node
linkType: hard

"@patternfly/patternfly@npm:6.5.0-prerelease.67":
version: 6.5.0-prerelease.67
resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.67"
checksum: 10c0/7e42179e955ef0b300a8814925d59482ca67c87e1018fe350be9875691da86c49d61d5fc1ffc1f37275dc524605351686dd462ee1d0d6703b477308ed75a7c88
"@patternfly/patternfly@npm:6.5.0-prerelease.71":
version: 6.5.0-prerelease.71
resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.71"
checksum: 10c0/08ab7878527666704ae99f5250e1a0446959143f744d4f0f9508aeb7e2a143dd088b8dc6bb4b0ca6679e9923d5c7cd8068d176070bce7b0c7992c48a865864d9
languageName: node
linkType: hard

Expand Down Expand Up @@ -5171,7 +5171,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@patternfly/react-core@workspace:packages/react-core"
dependencies:
"@patternfly/patternfly": "npm:6.5.0-prerelease.67"
"@patternfly/patternfly": "npm:6.5.0-prerelease.71"
"@patternfly/react-icons": "workspace:^"
"@patternfly/react-styles": "workspace:^"
"@patternfly/react-tokens": "workspace:^"
Expand All @@ -5192,7 +5192,7 @@ __metadata:
resolution: "@patternfly/react-docs@workspace:packages/react-docs"
dependencies:
"@patternfly/documentation-framework": "npm:^6.36.8"
"@patternfly/patternfly": "npm:6.5.0-prerelease.67"
"@patternfly/patternfly": "npm:6.5.0-prerelease.71"
"@patternfly/patternfly-a11y": "npm:5.1.0"
"@patternfly/react-charts": "workspace:^"
"@patternfly/react-code-editor": "workspace:^"
Expand Down Expand Up @@ -5232,7 +5232,7 @@ __metadata:
"@fortawesome/free-brands-svg-icons": "npm:^5.15.4"
"@fortawesome/free-regular-svg-icons": "npm:^5.15.4"
"@fortawesome/free-solid-svg-icons": "npm:^5.15.4"
"@patternfly/patternfly": "npm:6.5.0-prerelease.67"
"@patternfly/patternfly": "npm:6.5.0-prerelease.71"
"@rhds/icons": "npm:^2.1.0"
fs-extra: "npm:^11.3.3"
tslib: "npm:^2.8.1"
Expand Down Expand Up @@ -5319,7 +5319,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@patternfly/react-styles@workspace:packages/react-styles"
dependencies:
"@patternfly/patternfly": "npm:6.5.0-prerelease.67"
"@patternfly/patternfly": "npm:6.5.0-prerelease.71"
change-case: "npm:^5.4.4"
fs-extra: "npm:^11.3.3"
languageName: unknown
Expand Down Expand Up @@ -5361,7 +5361,7 @@ __metadata:
resolution: "@patternfly/react-tokens@workspace:packages/react-tokens"
dependencies:
"@adobe/css-tools": "npm:^4.4.4"
"@patternfly/patternfly": "npm:6.5.0-prerelease.67"
"@patternfly/patternfly": "npm:6.5.0-prerelease.71"
fs-extra: "npm:^11.3.3"
languageName: unknown
linkType: soft
Expand Down
Loading