diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 95adcf7cced..52118d723b5 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.8.1" }, "devDependencies": { - "@patternfly/patternfly": "6.5.0-prerelease.55", + "@patternfly/patternfly": "6.5.0-prerelease.58", "case-anything": "^3.1.2", "css": "^3.0.0", "fs-extra": "^11.3.3" diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 8d3ee97e990..85d9ddf6c5f 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -23,7 +23,7 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "6.5.0-prerelease.55", + "@patternfly/patternfly": "6.5.0-prerelease.58", "@patternfly/react-charts": "workspace:^", "@patternfly/react-code-editor": "workspace:^", "@patternfly/react-core": "workspace:^", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index f9a1078d21d..97672e2d39a 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -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.55", + "@patternfly/patternfly": "6.5.0-prerelease.58", "@rhds/icons": "^2.1.0", "fs-extra": "^11.3.3", "tslib": "^2.8.1" diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index 914d47b2e1c..878cd9a93aa 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "6.5.0-prerelease.55", + "@patternfly/patternfly": "6.5.0-prerelease.58", "change-case": "^5.4.4", "fs-extra": "^11.3.3" }, diff --git a/packages/react-table/src/components/Table/Table.tsx b/packages/react-table/src/components/Table/Table.tsx index 144fc0ccb24..fc2305011a2 100644 --- a/packages/react-table/src/components/Table/Table.tsx +++ b/packages/react-table/src/components/Table/Table.tsx @@ -50,6 +50,8 @@ export interface TableProps extends React.HTMLProps, OUIAProps role?: string; /** @beta Flag indicating if the table should have plain styling with a transparent background */ isPlain?: boolean; + /** @beta Flag indicating if the table should not have plain styling when in the glass theme */ + isNoPlainOnGlass?: boolean; /** If set to true, the table header sticks to the top of its container */ isStickyHeader?: boolean; /** @hide Forwarded ref */ @@ -97,6 +99,7 @@ const TableBase: React.FunctionComponent = ({ borders = true, isStickyHeader = false, isPlain = false, + isNoPlainOnGlass = false, gridBreakPoint = TableGridBreakpoint.gridMd, 'aria-label': ariaLabel, role = 'grid', @@ -226,6 +229,7 @@ const TableBase: React.FunctionComponent = ({ isStriped && styles.modifiers.striped, isExpandable && styles.modifiers.expandable, isPlain && styles.modifiers.plain, + isNoPlainOnGlass && styles.modifiers.noPlainOnGlass, hasNoInset && stylesTreeView.modifiers.noInset, isNested && 'pf-m-nested', hasAnimations && styles.modifiers.animateExpand diff --git a/packages/react-table/src/components/Table/__tests__/Table.test.tsx b/packages/react-table/src/components/Table/__tests__/Table.test.tsx index 3e7af5c9cd5..e5a6dc373a2 100644 --- a/packages/react-table/src/components/Table/__tests__/Table.test.tsx +++ b/packages/react-table/src/components/Table/__tests__/Table.test.tsx @@ -156,3 +156,33 @@ test(`Renders with class ${styles.modifiers.plain} when isPlain is true`, () => expect(screen.getByRole('grid', { name: 'Test table' })).toHaveClass(styles.modifiers.plain); }); + +test(`Does not render with class ${styles.modifiers.plain} when isPlain is not defined`, () => { + render(); + + expect(screen.getByRole('grid', { name: 'Test table' })).not.toHaveClass(styles.modifiers.plain); +}); + +test(`Does not render with class ${styles.modifiers.plain} when isPlain is false`, () => { + render(
); + + expect(screen.getByRole('grid', { name: 'Test table' })).not.toHaveClass(styles.modifiers.plain); +}); + +test(`Renders with class ${styles.modifiers.noPlainOnGlass} when isNoPlainOnGlass is true`, () => { + render(
); + + expect(screen.getByRole('grid', { name: 'Test table' })).toHaveClass(styles.modifiers.noPlainOnGlass); +}); + +test(`Does not render with class ${styles.modifiers.noPlainOnGlass} when isNoPlainOnGlass is undefined`, () => { + render(
); + + expect(screen.getByRole('grid', { name: 'Test table' })).not.toHaveClass(styles.modifiers.noPlainOnGlass); +}); + +test(`Does not render with class ${styles.modifiers.noPlainOnGlass} when isNoPlainOnGlass is false`, () => { + render(
); + + expect(screen.getByRole('grid', { name: 'Test table' })).not.toHaveClass(styles.modifiers.noPlainOnGlass); +}); diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index f692d63231f..f3d6f52f130 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "@adobe/css-tools": "^4.4.4", - "@patternfly/patternfly": "6.5.0-prerelease.55", + "@patternfly/patternfly": "6.5.0-prerelease.58", "fs-extra": "^11.3.3" } } diff --git a/yarn.lock b/yarn.lock index d63a624fc8a..3bd295b02d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5079,10 +5079,10 @@ __metadata: languageName: node linkType: hard -"@patternfly/patternfly@npm:6.5.0-prerelease.55": - version: 6.5.0-prerelease.55 - resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.55" - checksum: 10c0/02921ae29db7ac07ec977589b5233397536831d818372289f040685835031562bff398f9e5cd594210bfc6d216dbbf22a9d70a454a5d044bb99e53e186651f1e +"@patternfly/patternfly@npm:6.5.0-prerelease.58": + version: 6.5.0-prerelease.58 + resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.58" + checksum: 10c0/b2262ff41ee3cbf376e978e2e9c2290f105c1784b2f7968981769221f464afb9aac84b91462581f58b55bc9fb6a71d617253bbbf69f30ea89f5117122c78c154 languageName: node linkType: hard @@ -5180,7 +5180,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-core@workspace:packages/react-core" dependencies: - "@patternfly/patternfly": "npm:6.5.0-prerelease.55" + "@patternfly/patternfly": "npm:6.5.0-prerelease.58" "@patternfly/react-icons": "workspace:^" "@patternfly/react-styles": "workspace:^" "@patternfly/react-tokens": "workspace:^" @@ -5201,7 +5201,7 @@ __metadata: resolution: "@patternfly/react-docs@workspace:packages/react-docs" dependencies: "@patternfly/documentation-framework": "npm:^6.36.7" - "@patternfly/patternfly": "npm:6.5.0-prerelease.55" + "@patternfly/patternfly": "npm:6.5.0-prerelease.58" "@patternfly/patternfly-a11y": "npm:5.1.0" "@patternfly/react-charts": "workspace:^" "@patternfly/react-code-editor": "workspace:^" @@ -5241,7 +5241,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.55" + "@patternfly/patternfly": "npm:6.5.0-prerelease.58" "@rhds/icons": "npm:^2.1.0" fs-extra: "npm:^11.3.3" tslib: "npm:^2.8.1" @@ -5328,7 +5328,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-styles@workspace:packages/react-styles" dependencies: - "@patternfly/patternfly": "npm:6.5.0-prerelease.55" + "@patternfly/patternfly": "npm:6.5.0-prerelease.58" change-case: "npm:^5.4.4" fs-extra: "npm:^11.3.3" languageName: unknown @@ -5370,7 +5370,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.55" + "@patternfly/patternfly": "npm:6.5.0-prerelease.58" fs-extra: "npm:^11.3.3" languageName: unknown linkType: soft