From bc8edfcf9539e0a272e820e2f0b40220cd3c0fd2 Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Tue, 16 May 2023 17:16:13 -0400 Subject: [PATCH 1/2] feat(Table): added class names for table elements --- packages/react-core/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-icons/package.json | 2 +- packages/react-styles/package.json | 2 +- packages/react-table/src/components/Table/Caption.tsx | 4 +++- packages/react-table/src/components/Table/Tbody.tsx | 1 + packages/react-table/src/components/Table/Td.tsx | 1 + packages/react-table/src/components/Table/Th.tsx | 1 + packages/react-table/src/components/Table/Thead.tsx | 1 + packages/react-table/src/components/Table/Tr.tsx | 1 + packages/react-tokens/package.json | 2 +- yarn.lock | 8 ++++---- 12 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 4af1b9f4f07..a86a9b3f68f 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.54", + "@patternfly/patternfly": "5.0.0-alpha.55", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 2cdd73b132d..2b1237d7602 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": "5.0.0-alpha.54", + "@patternfly/patternfly": "5.0.0-alpha.55", "@patternfly/react-charts": "^7.0.0-alpha.27", "@patternfly/react-code-editor": "^5.0.0-alpha.110", "@patternfly/react-core": "^5.0.0-alpha.109", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index cca726060e3..0dff1c801c9 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -32,7 +32,7 @@ "@fortawesome/free-brands-svg-icons": "^5.14.0", "@fortawesome/free-regular-svg-icons": "^5.14.0", "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@patternfly/patternfly": "5.0.0-alpha.54", + "@patternfly/patternfly": "5.0.0-alpha.55", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index c8a7d3d6c85..8564423b2b4 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.54", + "@patternfly/patternfly": "5.0.0-alpha.55", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-table/src/components/Table/Caption.tsx b/packages/react-table/src/components/Table/Caption.tsx index d1f90a44385..48705f888f1 100644 --- a/packages/react-table/src/components/Table/Caption.tsx +++ b/packages/react-table/src/components/Table/Caption.tsx @@ -1,4 +1,6 @@ import * as React from 'react'; +import styles from '@patternfly/react-styles/css/components/Table/table'; +import { css } from '@patternfly/react-styles'; export interface CaptionProps { /** Content rendered inside the caption */ @@ -8,7 +10,7 @@ export interface CaptionProps { } export const Caption: React.FunctionComponent = ({ children, className, ...props }: CaptionProps) => ( - + {children} ); diff --git a/packages/react-table/src/components/Table/Tbody.tsx b/packages/react-table/src/components/Table/Tbody.tsx index e8cbf74acf3..1e99ca92fcf 100644 --- a/packages/react-table/src/components/Table/Tbody.tsx +++ b/packages/react-table/src/components/Table/Tbody.tsx @@ -29,6 +29,7 @@ const TbodyBase: React.FunctionComponent = ({ = ({ onBlur={() => setShowTooltip(false)} onMouseEnter={tooltip !== null ? onMouseEnter : onMouseEnterProp} className={css( + styles.tableTd, className, isActionCell && styles.tableAction, textCenter && styles.modifiers.center, diff --git a/packages/react-table/src/components/Table/Th.tsx b/packages/react-table/src/components/Table/Th.tsx index 6f9ac65ef93..5461c8de975 100644 --- a/packages/react-table/src/components/Table/Th.tsx +++ b/packages/react-table/src/components/Table/Th.tsx @@ -179,6 +179,7 @@ const ThBase: React.FunctionComponent = ({ scope={component === 'th' && children ? scope : null} ref={cellRef} className={css( + styles.tableTh, className, textCenter && styles.modifiers.center, isSubheader && styles.tableSubhead, diff --git a/packages/react-table/src/components/Table/Thead.tsx b/packages/react-table/src/components/Table/Thead.tsx index 4bd37b31264..e35cca777d3 100644 --- a/packages/react-table/src/components/Table/Thead.tsx +++ b/packages/react-table/src/components/Table/Thead.tsx @@ -25,6 +25,7 @@ const TheadBase: React.FunctionComponent = ({ }: TheadProps) => ( = ({ {isSelectable && {ariaLabel}} Date: Tue, 16 May 2023 17:42:06 -0400 Subject: [PATCH 2/2] chore(Table): updated snapshots --- .../__snapshots__/RowWrapper.test.tsx.snap | 4 +- .../__snapshots__/Table.test.tsx.snap | 2894 ++++++++--------- 2 files changed, 1449 insertions(+), 1449 deletions(-) diff --git a/packages/react-table/src/components/Table/__tests__/__snapshots__/RowWrapper.test.tsx.snap b/packages/react-table/src/components/Table/__tests__/__snapshots__/RowWrapper.test.tsx.snap index 72017c8a899..a0d4fc96be9 100644 --- a/packages/react-table/src/components/Table/__tests__/__snapshots__/RowWrapper.test.tsx.snap +++ b/packages/react-table/src/components/Table/__tests__/__snapshots__/RowWrapper.test.tsx.snap @@ -5,7 +5,7 @@ exports[`RowWrapper renders correctly 1`] = `
@@ -1467,7 +1467,7 @@ exports[`Table Collapsible nested table 1`] = `
@@ -1710,7 +1710,7 @@ exports[`Table Collapsible nested table 1`] = `
@@ -2211,7 +2211,7 @@ exports[`Table Collapsible table 1`] = `
@@ -2423,7 +2423,7 @@ exports[`Table Collapsible table 1`] = `
@@ -4211,7 +4211,7 @@ exports[`Table Selectable table 1`] = `
@@ -4394,7 +4394,7 @@ exports[`Table Selectable table 1`] = `
@@ -4520,7 +4520,7 @@ exports[`Table Selectable table 1`] = `
@@ -4589,7 +4589,7 @@ exports[`Table Selectable table 1`] = `
@@ -4658,7 +4658,7 @@ exports[`Table Selectable table 1`] = `
@@ -4727,7 +4727,7 @@ exports[`Table Selectable table 1`] = `
@@ -4901,7 +4901,7 @@ exports[`Table Selectable table with Radio 1`] = `
@@ -5084,7 +5084,7 @@ exports[`Table Selectable table with Radio 1`] = `
@@ -5210,7 +5210,7 @@ exports[`Table Selectable table with Radio 1`] = `
@@ -5279,7 +5279,7 @@ exports[`Table Selectable table with Radio 1`] = `
@@ -5348,7 +5348,7 @@ exports[`Table Selectable table with Radio 1`] = `
@@ -5417,7 +5417,7 @@ exports[`Table Selectable table with Radio 1`] = `
@@ -5536,7 +5536,7 @@ exports[`Table Selectable table with selected expandable row 1`] = `
@@ -10387,13 +10387,13 @@ exports[`Table simple Editable table 1`] = `
@@ -10628,17 +10628,17 @@ exports[`Table simple Row click table 1`] = ` role="grid" >