Skip to content

Commit 0465e00

Browse files
authored
Merge branch 'main' into iss4461
2 parents 1b58830 + d73cb66 commit 0465e00

278 files changed

Lines changed: 2450 additions & 446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
},
3131
"devDependencies": {
3232
"@octokit/rest": "^19.0.7",
33-
"@patternfly/patternfly": "^6.1.0",
34-
"@patternfly/react-code-editor": "^6.1.0",
35-
"@patternfly/react-core": "^6.1.0",
36-
"@patternfly/react-table": "^6.1.0",
33+
"@patternfly/patternfly": "^6.2.0-prerelease.26",
34+
"@patternfly/react-code-editor": "^6.2.0-prerelease.36",
35+
"@patternfly/react-core": "^6.2.0-prerelease.34",
36+
"@patternfly/react-table": "^6.2.0-prerelease.35",
3737
"glob": "^8.1.0",
3838
"lerna": "^6.4.1",
3939
"react": "^18",

packages/ast-helpers/CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,44 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# 1.4.0-alpha.165 (2025-04-02)
7+
8+
**Note:** Version bump only for package @patternfly/ast-helpers
9+
10+
11+
12+
13+
14+
# 1.4.0-alpha.164 (2025-04-02)
15+
16+
**Note:** Version bump only for package @patternfly/ast-helpers
17+
18+
19+
20+
21+
22+
# 1.4.0-alpha.163 (2025-03-28)
23+
24+
25+
### Features
26+
27+
* **ver:** update design tokens version & regenerate screenshots ([#4511](https://github.com/patternfly/patternfly-org/issues/4511)) ([4bd624d](https://github.com/patternfly/patternfly-org/commit/4bd624db116fae1f09aa75a3973ebb79be1aa803))
28+
29+
30+
31+
32+
33+
# 1.4.0-alpha.162 (2025-03-27)
34+
35+
36+
### Features
37+
38+
* **ver:** update to 6.2 prerelease versions ([#4510](https://github.com/patternfly/patternfly-org/issues/4510)) ([8a2f9b1](https://github.com/patternfly/patternfly-org/commit/8a2f9b1f89a2b930d38379e10caf943af57ae51f))
39+
40+
41+
42+
43+
644
# 1.4.0-alpha.161 (2025-03-18)
745

846
**Note:** Version bump only for package @patternfly/ast-helpers

packages/ast-helpers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@patternfly/ast-helpers",
33
"description": "Acorn AST helpers for working with live code",
4-
"version": "1.4.0-alpha.161",
4+
"version": "1.4.0-alpha.165",
55
"author": "Red Hat",
66
"license": "MIT",
77
"publishConfig": {

packages/documentation-framework/CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,44 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## 6.7.2 (2025-04-02)
7+
8+
**Note:** Version bump only for package @patternfly/documentation-framework
9+
10+
11+
12+
13+
14+
## 6.7.1 (2025-04-02)
15+
16+
**Note:** Version bump only for package @patternfly/documentation-framework
17+
18+
19+
20+
21+
22+
# 6.7.0 (2025-03-28)
23+
24+
25+
### Features
26+
27+
* **ver:** update design tokens version & regenerate screenshots ([#4511](https://github.com/patternfly/patternfly-org/issues/4511)) ([4bd624d](https://github.com/patternfly/patternfly-org/commit/4bd624db116fae1f09aa75a3973ebb79be1aa803))
28+
29+
30+
31+
32+
33+
# 6.6.0 (2025-03-27)
34+
35+
36+
### Features
37+
38+
* **ver:** update to 6.2 prerelease versions ([#4510](https://github.com/patternfly/patternfly-org/issues/4510)) ([8a2f9b1](https://github.com/patternfly/patternfly-org/commit/8a2f9b1f89a2b930d38379e10caf943af57ae51f))
39+
40+
41+
42+
43+
644
## 6.5.20 (2025-03-18)
745

846
**Note:** Version bump only for package @patternfly/documentation-framework

packages/documentation-framework/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@patternfly/documentation-framework",
33
"description": "A framework to build documentation for PatternFly.",
4-
"version": "6.5.20",
4+
"version": "6.7.2",
55
"author": "Red Hat",
66
"license": "MIT",
77
"bin": {
@@ -12,7 +12,7 @@
1212
"@babel/preset-env": "^7.24.3",
1313
"@babel/preset-react": "^7.24.1",
1414
"@mdx-js/util": "1.6.16",
15-
"@patternfly/ast-helpers": "^1.4.0-alpha.161",
15+
"@patternfly/ast-helpers": "^1.4.0-alpha.165",
1616
"@reach/router": "npm:@gatsbyjs/reach-router@1.3.9",
1717
"autoprefixer": "9.8.6",
1818
"babel-loader": "^9.1.3",
@@ -72,10 +72,10 @@
7272
"webpack-merge": "5.8.0"
7373
},
7474
"peerDependencies": {
75-
"@patternfly/patternfly": "^6.1.0",
76-
"@patternfly/react-code-editor": "^6.1.0",
77-
"@patternfly/react-core": "^6.1.0",
78-
"@patternfly/react-table": "^6.1.0",
75+
"@patternfly/patternfly": "^6.2.0-prerelease.26",
76+
"@patternfly/react-code-editor": "^6.2.0-prerelease.36",
77+
"@patternfly/react-core": "^6.2.0-prerelease.34",
78+
"@patternfly/react-table": "^6.2.0-prerelease.35",
7979
"react": "^17.0.0 || ^18.0.0",
8080
"react-dom": "^17.0.0 || ^18.0.0"
8181
}

packages/documentation-framework/scripts/webpack/webpack.base.config.js

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = (_env, argv) => {
2828
publicPath: '/',
2929
pathinfo: false, // https://webpack.js.org/guides/build-performance/#output-without-path-info,
3030
hashDigestLength: 8,
31-
clean: true, // Clean the output directory before emit.
31+
clean: true // Clean the output directory before emit.
3232
},
3333
amd: false, // We don't use any AMD modules, helps performance
3434
mode: isProd ? 'production' : 'development',
@@ -47,9 +47,9 @@ module.exports = (_env, argv) => {
4747
/react-[\w-]+\/patternfly-docs\/.*\/examples/, //fixes for extensions
4848
/react-[\w-]+\\patternfly-docs\\.*\\examples/,
4949
path.resolve(__dirname, '../../../../node_modules/@patternfly/design-tokens/patternfly-docs/content')
50-
].concat(includePaths.map(path => new RegExp(path))),
50+
].concat(includePaths.map((path) => new RegExp(path))),
5151
exclude: [
52-
path.resolve(__dirname, '../../node_modules'), // Temporarily compile theme using webpack for development
52+
path.resolve(__dirname, '../../node_modules') // Temporarily compile theme using webpack for development
5353
],
5454
use: {
5555
loader: 'babel-loader',
@@ -58,13 +58,16 @@ module.exports = (_env, argv) => {
5858
cacheCompression: false,
5959
presets: [
6060
'@babel/preset-react',
61-
['@babel/preset-env', {
62-
loose: true,
63-
targets: '> 1%, not dead'
64-
}],
65-
],
61+
[
62+
'@babel/preset-env',
63+
{
64+
loose: true,
65+
targets: '> 1%, not dead'
66+
}
67+
]
68+
]
6669
}
67-
},
70+
}
6871
},
6972
{
7073
test: /\.(png|jpe?g|webp)$/,
@@ -74,7 +77,7 @@ module.exports = (_env, argv) => {
7477
adapter: require('responsive-loader/sharp'),
7578
name: '[name].[contenthash].[ext]',
7679
outputPath: 'images/'
77-
},
80+
}
7881
}
7982
},
8083
{
@@ -101,6 +104,12 @@ module.exports = (_env, argv) => {
101104
filename: 'fonts/[name][ext][query]'
102105
}
103106
},
107+
{
108+
test: /\.m?js$/,
109+
resolve: {
110+
fullySpecified: false
111+
}
112+
}
104113
]
105114
},
106115
resolve: {
@@ -109,23 +118,20 @@ module.exports = (_env, argv) => {
109118
'client-styles': path.resolve(process.cwd(), 'patternfly-docs/patternfly-docs.css.js'),
110119
'./routes-client': path.resolve(process.cwd(), 'patternfly-docs/patternfly-docs.routes.js'),
111120
'./routes-generated': path.resolve(process.cwd(), 'patternfly-docs/generated/index.js'),
112-
process: "process/browser"
121+
process: 'process/browser'
113122
},
114-
modules: [
115-
'node_modules',
116-
...module.paths,
117-
],
123+
modules: ['node_modules', ...module.paths],
118124
fallback: {
119-
"path": require.resolve("path-browserify")
120-
},
125+
path: require.resolve('path-browserify')
126+
}
121127
},
122128
// Use this module's node_modules first (for use in Core/React workspaces)
123129
resolveLoader: {
124-
modules: module.paths,
130+
modules: module.paths
125131
},
126132
plugins: [
127133
new webpack.ProvidePlugin({
128-
process: 'process/browser',
134+
process: 'process/browser'
129135
}),
130136
new webpack.DefinePlugin({
131137
'process.env.NODE_ENV': JSON.stringify(mode),
@@ -144,11 +150,9 @@ module.exports = (_env, argv) => {
144150
'process.env.prurl': JSON.stringify(process.env.CIRCLE_PULL_REQUEST || '')
145151
}),
146152
new CopyWebpackPlugin({
147-
patterns: [
148-
{ from: path.join(__dirname, '../../assets'), to: 'assets' }
149-
]
153+
patterns: [{ from: path.join(__dirname, '../../assets'), to: 'assets' }]
150154
})
151155
],
152156
stats: 'minimal'
153157
};
154-
}
158+
};

packages/documentation-framework/versions.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
11
{
22
"Releases": [
33
{
4-
"name": "6.1.0",
4+
"name": "6.2.0",
55
"date": "2024-12-17",
66
"latest": true,
7+
"versions": {
8+
"@patternfly/patternfly": "6.2.0-prerelease.26",
9+
"@patternfly/react-catalog-view-extension": "6.1.0-prerelease.4",
10+
"@patternfly/react-charts": "8.2.0-prerelease.26",
11+
"@patternfly/react-code-editor": "6.2.0-prerelease.36",
12+
"@patternfly/react-component-groups": "6.2.0-prerelease.7",
13+
"@patternfly/react-core": "6.2.0-prerelease.34",
14+
"@patternfly/react-drag-drop": "6.2.0-prerelease.36",
15+
"@patternfly/react-icons": "6.2.0-prerelease.12",
16+
"@patternfly/react-log-viewer": "6.1.0-prerelease.2",
17+
"@patternfly/react-styles": "6.2.0-prerelease.11",
18+
"@patternfly/react-table": "6.2.0-prerelease.35",
19+
"@patternfly/react-tokens": "6.2.0-prerelease.11",
20+
"@patternfly/react-topology": "6.2.0-prerelease.6",
21+
"@patternfly/react-user-feedback": "6.1.0-prerelease.2",
22+
"@patternfly/react-console": "6.0.0",
23+
"@patternfly/quickstarts": "6.2.0-prerelease.7",
24+
"@patternfly/react-virtualized-extension": "6.0.0",
25+
"@patternfly/react-templates": "6.2.0-prerelease.35",
26+
"@patternfly/chatbot": "2.2.0-prerelease.37",
27+
"@patternfly/data-view": "6.1.0"
28+
}
29+
},{
30+
"name": "6.1.0",
31+
"date": "2024-12-17",
32+
"hidden": true,
733
"versions": {
834
"@patternfly/patternfly": "6.1.0",
935
"@patternfly/react-catalog-view-extension": "6.0.0",

packages/documentation-site/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
"screenshots": "pf-docs-framework screenshots"
1818
},
1919
"dependencies": {
20-
"@patternfly/chatbot": "2.1.0",
21-
"@patternfly/design-tokens": "1.13.0",
20+
"@patternfly/chatbot": "2.2.0-prerelease.37",
21+
"@patternfly/design-tokens": "1.13.2",
2222
"@patternfly/documentation-framework": "workspace:*",
23-
"@patternfly/quickstarts": "6.2.0-prerelease.5",
24-
"@patternfly/react-catalog-view-extension": "6.0.0",
25-
"@patternfly/react-component-groups": "6.1.0",
23+
"@patternfly/quickstarts": "6.2.0-prerelease.7",
24+
"@patternfly/react-catalog-view-extension": "6.1.0-prerelease.4",
25+
"@patternfly/react-component-groups": "6.2.0-prerelease.7",
2626
"@patternfly/react-console": "6.0.0",
2727
"@patternfly/react-data-view": "6.1.0",
28-
"@patternfly/react-docs": "7.1.0",
29-
"@patternfly/react-log-viewer": "6.1.0",
30-
"@patternfly/react-topology": "6.1.0",
31-
"@patternfly/react-user-feedback": "6.0.0",
28+
"@patternfly/react-docs": "7.2.0-prerelease.54",
29+
"@patternfly/react-log-viewer": "6.1.0-prerelease.2",
30+
"@patternfly/react-topology": "6.2.0-prerelease.6",
31+
"@patternfly/react-user-feedback": "6.1.0-prerelease.2",
3232
"@patternfly/react-virtualized-extension": "6.0.0",
3333
"marked": "^15.0.7",
3434
"react": "^17.0.0 || ^18.0.0",

packages/documentation-site/patternfly-docs/content/accessibility/helper-text/helper-text.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ To implement an accessible PatternFly **helper text**:
3030
```
3131
- Structure the helper text as a `ul` element and each helper text item as a `li` element if there is more than one helper text item.
3232
- Make the helper text component an `aria-live` region if the helper text item(s) have static text and styling, but will dynamically render.
33-
- Ensure there is visually hidden text for assistive technologies such as screen readers that conveys the status type if the helper text item has static text and will always be rendered, but the styling will dynamically update.
33+
- Ensure there is visually hidden text for assistive technologies such as screen readers that conveys the status type if:
34+
- the helper text item has static text and will always be rendered, but the styling will dynamically update, or
35+
- the helper text item text content itself doesn't convey a status type
3436
- Avoid passing interactive content as helper text.
3537

3638
## Testing
@@ -48,7 +50,7 @@ At a minimum, a helper text should meet the following criteria:
4850
<Checkbox id="helperText-a11y-checkbox-3" label="If the helper text item(s) are intended to have static text and styling, but be dynamically rendered, the helper text component is made into a live region." description={<span>The <code className="ws-code">aria-live</code> value should be "polite" when doing so. This will announce to users of assistive technologies when new helper text has rendered, keeping them informed of any remaining criteria or issues that need to be addressed.</span>} />
4951
</ListItem>
5052
<ListItem>
51-
<Checkbox id="helperText-a11y-checkbox-4" label="If the helper text item(s) are intended to have static text and always be visible, but have dynamic styling, ensure there is visually hidden text within the helper text item that conveys its status type." description={<span>This is best achieved by using our <code className="ws-code">pf-v5-screen-reader</code> class.</span>} />
53+
<Checkbox id="helperText-a11y-checkbox-4" label="If the helper text item(s) are intended to have static text and always be visible, but have dynamic styling, or the helper text item(s) content doesn't convey a status, ensure there is visually hidden text within the helper text item that conveys its status type." description={<span>This is best achieved by using our <code className="ws-code">pf-v6-screen-reader</code> class.</span>} />
5254
</ListItem>
5355
<ListItem>
5456
<Checkbox id="helperText-a11y-checkbox-5" label="There is no interactive content in any helper text items." />
@@ -67,7 +69,7 @@ The following React props have been provided for more fine-tuned control over ac
6769
| `isLiveRegion` | `HelperText` | Makes the helper text component a live region with a value of `"polite"`. **Required** when helper text item(s) are intended or expected to have static text, but dynamically render. |
6870
| `component="li"` | `HelperTextItem` | Sets the wrapper element of the helper text item to a list item. **Required** when `HelperText` has `component="ul"` passed in. |
6971
| `id` | `HelperTextItem` | Sets the `id` attribute of the helper text item, which should be passed to the main element's `aria-describedby` attribute. |
70-
| `screenReaderText="[text that conveys status type]"` | `HelperTextItem` | Renders visually hidden text when the `isDynamic` prop is also passed in. Typically this should convey the status type of the helper text item, and will render immediately after the item text. |
72+
| `screenReaderText="[text that conveys status type]"` | `HelperTextItem` | Renders visually hidden text when the `isDynamic` prop is also passed in. Typically this should convey the status type of the helper text item, and will render immediately after the item text. This can be prevented from rendering by passing an empty string `''` as a value. |
7173
| `variant="[default, indeterminate, warning, error, or success]"` | `HelperTextItem` | Sets the text styling and icon. This prop should only be passed in when the helper text item should visually convey some sort of status. |
7274

7375
## HTML/CSS customization
@@ -82,5 +84,21 @@ The following HTML attributes and PatternFly classes can be used for more fine-t
8284
| `role="list"` | `ul.pf-v6-c-helper-text` | Indicates that the helper text component is a list element. **Required**.<br/><br/>This role is redundant since `.pf-v6-c-helper-text` can be a `<ul>` element, but it is required for assistive technologies to announce the list properly. |
8385
| `id` | `.pf-v6-c-helper-text__item` | Sets the `id` attribute of the helper text item, which should be passed to the main element's `aria-describedby` attribute if the `.pf-v6-c-helper-text` element is not given an `id` instead. |
8486
| `aria-hidden="true"` | `.pf-v6-c-helper-text__item-icon > i` | Removes the helper text item icon from the accessibility tree, preventing assistive technologies from potentially announcing duplicate or unnecessary information without visually hiding it. **Required**. |
85-
| `.pf-v5-screen-reader` | `.pf-v6-c-helper-text__item.pf-m-dynamic > span` | Renders visually hidden text that is accessible only to assistive technologies such as a screen reader. **Required** if the helper text item is intended or expected to contain static text and always be visible, but have dynamic styling. Typically this should convey the status type of the helper text item. |
86-
87+
| `.pf-v6-screen-reader` | `.pf-v6-c-helper-text__item.pf-m-dynamic > span` | Renders visually hidden text that is accessible only to assistive technologies such as a screen reader. This should be included if the helper text item is intended or expected to contain static text and always be visible, but have dynamic styling, or if the helper text item content doesn't convey a status. Typically this should convey the status type of the helper text item. |
88+
89+
## Additional considerations
90+
91+
Consumers must ensure they take any additional considerations when customizing helper text, using it in a way not described or recommended by PatternFly, or in various other specific use-cases not outlined elsewhere on this page.
92+
93+
### Visually hidden text
94+
95+
While we recommend including visually hidden text for helper text items, it's important to understand more about the when and why. Typically we recommend including visually hidden text within the helper text item for 2 scenarios:
96+
97+
- the helper text item content is static, but the styling and status will dynamically change
98+
- the helper text item content does not clearly convey any type of status
99+
100+
For the first scenario, if helper text item content will always remain static, any visual styling changes themselves won't be conveyed to users. Including visually hidden text within the helper text item can help convey that change in status and styling when navigating to the helper text item, but also via `aria-live` announcements. Without this visually hidden text, the same text content would be announced without any change at best, or nothing would be announced at worst in the case of `aria-live`.
101+
102+
For the second scenario, it can be difficult for some users to understand the difference between messages of different status types depending on the wording. Including visually hidden text that helps convey that status can help differentiate between the two, or better understand whether a single helper text item is crucial to continuing through a workflow or not.
103+
104+
It is also worth noting that localization must also be considered when it comes to the visually hidden text. If you provide localization elsewhere in your codebase - especially the area where helper text is being used - you must provide localization for the visually hidden text of the helper text item.

0 commit comments

Comments
 (0)