diff --git a/packages/react-core/package.json b/packages/react-core/package.json index b62b4ba13ee..bf439071c36 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.3.0-prerelease.33", + "@patternfly/patternfly": "6.3.0-prerelease.36", "case-anything": "^3.1.2", "css": "^3.0.0", "fs-extra": "^11.3.0" diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 84babbf0dcc..270deb675f6 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.3.0-prerelease.33", + "@patternfly/patternfly": "6.3.0-prerelease.36", "@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 8f625d2bc02..3d65f7dec7f 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -33,7 +33,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.3.0-prerelease.33", + "@patternfly/patternfly": "6.3.0-prerelease.36", "fs-extra": "^11.3.0", "tslib": "^2.8.1" }, diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index 2849f852511..cea50b78e43 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.3.0-prerelease.33", + "@patternfly/patternfly": "6.3.0-prerelease.36", "change-case": "^5.4.4", "fs-extra": "^11.3.0" }, diff --git a/packages/react-table/src/components/Table/Td.tsx b/packages/react-table/src/components/Table/Td.tsx index 298ad9c593f..30f2791685f 100644 --- a/packages/react-table/src/components/Table/Td.tsx +++ b/packages/react-table/src/components/Table/Td.tsx @@ -43,6 +43,8 @@ export interface TdProps extends BaseCellProps, Omit = ({ children, className, isActionCell = false, + hasAction = false, component = 'td', dataLabel, textCenter = false, @@ -279,6 +282,7 @@ const TdBase: React.FunctionComponent = ({ styles.tableTd, className, isActionCell && styles.tableAction, + hasAction && styles.modifiers.action, textCenter && styles.modifiers.center, noPadding && styles.modifiers.noPadding, isStickyColumn && scrollStyles.tableStickyCell, diff --git a/packages/react-table/src/components/Table/examples/Table.md b/packages/react-table/src/components/Table/examples/Table.md index 659754c54c8..9e6883cd0df 100644 --- a/packages/react-table/src/components/Table/examples/Table.md +++ b/packages/react-table/src/components/Table/examples/Table.md @@ -184,6 +184,8 @@ To make a cell an action cell, render an `ActionsColumn` component inside a row' If actions menus are getting clipped by other items on the page, such as sticky columns or rows, the `ActionsColumn` can be passed a `menuAppendTo` prop to adjust where the actions menu is appended. +When a table row contains mixed content of text and interactive elements, the `hasAction` property may be passed to a `Td` which contains interactive content like the below example's start `Button`. This will align buttons and other elements with other cells' text. Note that `hasAction` should not be used with `Td`s in an `ActionsColumn` because that comes with it's own spacing. + ```ts file="TableActions.tsx" ``` diff --git a/packages/react-table/src/components/Table/examples/TableActions.tsx b/packages/react-table/src/components/Table/examples/TableActions.tsx index 5468d4f965d..a7aec8bea0d 100644 --- a/packages/react-table/src/components/Table/examples/TableActions.tsx +++ b/packages/react-table/src/components/Table/examples/TableActions.tsx @@ -146,7 +146,7 @@ export const TableActions: React.FunctionComponent = () => { {repo.prs} {repo.workspaces} {repo.lastCommit} - + {singleActionButton} diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index 27f065f97e3..198580802fd 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "@adobe/css-tools": "^4.4.2", - "@patternfly/patternfly": "6.3.0-prerelease.33", + "@patternfly/patternfly": "6.3.0-prerelease.36", "fs-extra": "^11.3.0" } } diff --git a/yarn.lock b/yarn.lock index 2e9c0aec227..3faf6730af6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3639,10 +3639,10 @@ __metadata: languageName: node linkType: hard -"@patternfly/patternfly@npm:6.3.0-prerelease.33": - version: 6.3.0-prerelease.33 - resolution: "@patternfly/patternfly@npm:6.3.0-prerelease.33" - checksum: 10c0/36fc724fdfd810e8cb36cfeddf6534469305039f6514dab71b477447de8b408757ffa9d4273702e327f9c0cf7e4fd40c9e92c8ffc9ddd98e013e2ba2d356b0ee +"@patternfly/patternfly@npm:6.3.0-prerelease.36": + version: 6.3.0-prerelease.36 + resolution: "@patternfly/patternfly@npm:6.3.0-prerelease.36" + checksum: 10c0/1c50ce51475581efe7c88885153a6ef1e69ffab8e7b016073d684294aa173b05081da8f313609e81f3eeea456874726934295e2837349ff109ed90eb15e9ad9a languageName: node linkType: hard @@ -3740,7 +3740,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-core@workspace:packages/react-core" dependencies: - "@patternfly/patternfly": "npm:6.3.0-prerelease.33" + "@patternfly/patternfly": "npm:6.3.0-prerelease.36" "@patternfly/react-icons": "workspace:^" "@patternfly/react-styles": "workspace:^" "@patternfly/react-tokens": "workspace:^" @@ -3761,7 +3761,7 @@ __metadata: resolution: "@patternfly/react-docs@workspace:packages/react-docs" dependencies: "@patternfly/documentation-framework": "npm:^6.5.20" - "@patternfly/patternfly": "npm:6.3.0-prerelease.33" + "@patternfly/patternfly": "npm:6.3.0-prerelease.36" "@patternfly/patternfly-a11y": "npm:5.1.0" "@patternfly/react-charts": "workspace:^" "@patternfly/react-code-editor": "workspace:^" @@ -3801,7 +3801,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.3.0-prerelease.33" + "@patternfly/patternfly": "npm:6.3.0-prerelease.36" fs-extra: "npm:^11.3.0" tslib: "npm:^2.8.1" peerDependencies: @@ -3885,7 +3885,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-styles@workspace:packages/react-styles" dependencies: - "@patternfly/patternfly": "npm:6.3.0-prerelease.33" + "@patternfly/patternfly": "npm:6.3.0-prerelease.36" change-case: "npm:^5.4.4" fs-extra: "npm:^11.3.0" languageName: unknown @@ -3927,7 +3927,7 @@ __metadata: resolution: "@patternfly/react-tokens@workspace:packages/react-tokens" dependencies: "@adobe/css-tools": "npm:^4.4.2" - "@patternfly/patternfly": "npm:6.3.0-prerelease.33" + "@patternfly/patternfly": "npm:6.3.0-prerelease.36" fs-extra: "npm:^11.3.0" languageName: unknown linkType: soft