Skip to content

Commit

Permalink
fix(Tabs): Removed isHelpAction prop from TabsAction (#8560)
Browse files Browse the repository at this point in the history
* fix(Tabs): Removed isHelpAction prop from TabsAction

* Add TabAction to docs

* update to core 4.224.0

* resolve conflicts

Co-authored-by: Titani <tlabaj@redaht.com>
tlabaj and Titani authored Jan 18, 2023

Verified

This commit was signed with the committer’s verified signature.
XSAM Sam Xie
1 parent f456ccb commit 05fa1b0
Showing 11 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion packages/react-console/package.json
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
},
"dependencies": {
"@novnc/novnc": "^1.3.0",
"@patternfly/patternfly": "4.222.4",
"@patternfly/patternfly": "4.224.0",
"@patternfly/react-core": "^4.273.0",
"@spice-project/spice-html5": "^0.2.1",
"@types/file-saver": "^2.0.1",
2 changes: 1 addition & 1 deletion packages/react-core/package.json
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@
"tslib": "^2.0.0"
},
"devDependencies": {
"@patternfly/patternfly": "4.222.4",
"@patternfly/patternfly": "4.224.0",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^3.0.0",
5 changes: 1 addition & 4 deletions packages/react-core/src/components/Tabs/TabAction.tsx
Original file line number Diff line number Diff line change
@@ -11,8 +11,6 @@ export interface TabActionProps extends Omit<React.HTMLProps<HTMLButtonElement>,
className?: string;
/** Click callback for tab action button */
onClick?: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void;
/** Flag indicating if the tab action is a help action */
isHelpAction?: boolean;
/** Flag indicating if the tab action is disabled */
isDisabled?: boolean;
/** Accessible label for the tab action */
@@ -25,7 +23,6 @@ const TabActionBase: React.FunctionComponent<TabActionProps> = ({
children,
className,
onClick,
isHelpAction,
isDisabled,
'aria-label': ariaLabel = 'Tab action',
innerRef,
@@ -34,7 +31,7 @@ const TabActionBase: React.FunctionComponent<TabActionProps> = ({
ouiaSafe,
...props
}: TabActionProps) => (
<span className={css(styles.tabsItemAction, isHelpAction && styles.modifiers.help, className)}>
<span className={css(styles.tabsItemAction, className)}>
<Button
ref={innerRef}
type="button"
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Tabs/examples/Tabs.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
id: Tabs
section: components
cssPrefix: pf-c-tabs
propComponents: ['Tabs', 'Tab', 'TabContent', 'TabTitleText', 'TabTitleIcon', 'horizontalOverflowObject']
propComponents: ['Tabs', 'Tab', TabAction, 'TabContent', 'TabTitleText', 'TabTitleIcon', 'horizontalOverflowObject']
ouia: true
---

Original file line number Diff line number Diff line change
@@ -41,7 +41,6 @@ export const TabsHelp: React.FunctionComponent = () => {
actions={
<>
<TabAction
isHelpAction
aria-label={`Help action for ${tab}`}
ref={ref}
{...(tab === 'Help disabled' && { isDisabled: true })}
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ export const TabsHelpAndClose: React.FunctionComponent = () => {
title={<TabTitleText>{tab}</TabTitleText>}
actions={
<>
<TabAction isHelpAction aria-label={`Help for ${tab}`} ref={ref}>
<TabAction aria-label={`Help for ${tab}`} ref={ref}>
<HelpIcon />
</TabAction>
<TabAction aria-label={`Close ${tab}`} onClick={e => onClose(e, index)} isDisabled={tabs.length === 1}>
2 changes: 1 addition & 1 deletion packages/react-docs/package.json
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
"test:a11y": "patternfly-a11y --config patternfly-a11y.config"
},
"dependencies": {
"@patternfly/patternfly": "4.222.4",
"@patternfly/patternfly": "4.224.0",
"@patternfly/react-catalog-view-extension": "^4.93.24",
"@patternfly/react-charts": "^6.94.15",
"@patternfly/react-code-editor": "^4.82.100",
2 changes: 1 addition & 1 deletion packages/react-icons/package.json
Original file line number Diff line number Diff line change
@@ -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": "4.222.4",
"@patternfly/patternfly": "4.224.0",
"fs-extra": "^6.0.1",
"glob": "^7.1.2",
"rimraf": "^2.6.2",
2 changes: 1 addition & 1 deletion packages/react-styles/package.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"clean": "rimraf dist css"
},
"devDependencies": {
"@patternfly/patternfly": "4.222.4",
"@patternfly/patternfly": "4.224.0",
"camel-case": "^3.0.0",
"css": "^2.2.3",
"fs-extra": "^6.0.1",
2 changes: 1 addition & 1 deletion packages/react-tokens/package.json
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
"clean": "rimraf dist"
},
"devDependencies": {
"@patternfly/patternfly": "4.222.4",
"@patternfly/patternfly": "4.224.0",
"css": "^2.2.3",
"fs-extra": "^6.0.1",
"glob": "^7.1.2",
22 changes: 14 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -3643,6 +3643,20 @@
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.222.4.tgz#5d988779c50df3dafc989d6e807d16971e34d228"
integrity sha512-+0fk4dzxEbWn+hgaOnR0BjfeUdEeVVrqfH7+GFeFc+RKjEMjIR/BZbWWN8YQDezmDv6A32gHmEKaY3Uwbt06Lw==

"@patternfly/patternfly@4.224.0":
version "4.224.0"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.224.0.tgz#7982840526da101f8f9a571651cce0cd2610deac"
integrity sha512-kSE9drpxRr0P8NuVc66QHwSpH90xJKmPGSXBGLntiabHNqR15Fql7wFZdgxT4REc/Y3AXYWs+g8kWtBVduXR5w==

"@patternfly/react-catalog-view-extension@^4.93.24":
version "4.95.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-4.95.1.tgz#a8ff4b14364a8505ff5156e3be6737032a70e277"
integrity sha512-GqWyih2GHagI+Yt9+VDmGRC8pv/989nExrisDLWbMNYaRKeZXEmr/LaWXTGJzD+fmZFYjc4wqd5tuJ0VkAp/jg==
dependencies:
"@patternfly/patternfly" "4.222.4"
"@patternfly/react-core" "^4.267.6"
"@patternfly/react-styles" "^4.92.3"

"@pmmmwh/react-refresh-webpack-plugin@0.5.7":
version "0.5.7"
resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2"
@@ -3657,14 +3671,6 @@
loader-utils "^2.0.0"
schema-utils "^3.0.0"
source-map "^0.7.3"
"@patternfly/react-catalog-view-extension@^4.93.24":
version "4.95.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-catalog-view-extension/-/react-catalog-view-extension-4.95.1.tgz#a8ff4b14364a8505ff5156e3be6737032a70e277"
integrity sha512-GqWyih2GHagI+Yt9+VDmGRC8pv/989nExrisDLWbMNYaRKeZXEmr/LaWXTGJzD+fmZFYjc4wqd5tuJ0VkAp/jg==
dependencies:
"@patternfly/patternfly" "4.222.4"
"@patternfly/react-core" "^4.267.6"
"@patternfly/react-styles" "^4.92.3"

"@reach/router@1.3.4":
version "1.3.4"

0 comments on commit 05fa1b0

Please sign in to comment.