From ec3ba29ddfe7178111e5841c6ac0ef1e25bb62cc Mon Sep 17 00:00:00 2001 From: Titani Labaj <39532947+tlabaj@users.noreply.github.com> Date: Fri, 21 Jul 2023 09:38:06 -0400 Subject: [PATCH 1/5] Rebase postv5 (#9393) * chore(deps): bump docs framework (#9370) * chore(docs): Updated screenshots (#9337) * chore(docs): Updated screenshots * updated screenshots after logo update --------- Co-authored-by: Titani * chore(release): releasing packages [ci skip] - @patternfly/react-docs@6.0.0-prerelease.26 * chore(deps): bump to latest chore version (#9389) * chore(deps): bump to latest chore version * bump to 16 * chore(release): releasing packages [ci skip] - @patternfly/react-charts@7.0.0-prerelease.12 - @patternfly/react-code-editor@5.0.0-prerelease.24 - @patternfly/react-core@5.0.0-prerelease.24 - @patternfly/react-docs@6.0.0-prerelease.27 - @patternfly/react-icons@5.0.0-prerelease.9 - demo-app-ts@5.0.0-prerelease.22 - @patternfly/react-styles@5.0.0-prerelease.7 - @patternfly/react-table@5.0.0-prerelease.24 - @patternfly/react-tokens@5.0.0-prerelease.9 * fix(fileupload): use default readonly text input instead of plain (#9387) * fix(fileupload): use default readonly text input instead of plain * chore(build): snaps * fix(CodeEditor): prevent clicks in textarea from opening fileupload (#9385) * fix(toolbar): added chip container class to toolbar content (#9379) * feat(Menu): added support for tooltips to menu (#9382) * fix(whitespace): Update readme to trigger release * chore(release): releasing packages [ci skip] - @patternfly/react-code-editor@5.0.0-prerelease.25 - @patternfly/react-core@5.0.0-prerelease.25 - @patternfly/react-docs@6.0.0-prerelease.28 - demo-app-ts@5.0.0-prerelease.23 - @patternfly/react-table@5.0.0-prerelease.25 * fix(Toolbar): resolved typeerror on full page demo (#9355) * chore(TreeView): converted examples to TS (#9286) * fix(ExpandableSection): added ARIA attributes (#9303) * fix(ExpandableSection): added ARIA attributes * Updated failing snapshots due to mismatching generated ID * chore(Tooltip): updated unit tests (#9295) * chore(Tooltip): updated unit tests * Updated mock and tests * Updated based on Austin feedback * Updated integration tests * Removed unused imports * Updated remaining tests using Popper mock * Removed extraenous snapshot test * Removed test * Split out onTooltipHidden test * chore(Card): added tests for new clickable/selectable (#9262) * chore(Card): added tests for new clickable/selectable * Added tests for clickable cards * Updated card with actions test * fix(Slider): reverted taborder (#9293) * fix(chore): Fix deprecated wizard integration tests (#9312) * fix(chore): Fix deprecated wizard integration tests * updated non deprecated test as well --------- Co-authored-by: Titani --------- Co-authored-by: Titani Co-authored-by: patternfly-build Co-authored-by: Michael Coker <35148959+mcoker@users.noreply.github.com> Co-authored-by: Dallas Co-authored-by: Dana Gutride Co-authored-by: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com> --- packages/react-core/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index cc1c80150cb..24d242ec577 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -1,6 +1,10 @@ { "name": "@patternfly/react-core", +<<<<<<< HEAD "version": "5.1.1-prerelease.0", +======= + "version": "5.0.0-prerelease.25", +>>>>>>> 0d5ec4fd2 (Rebase postv5 (#9393)) "description": "This library provides a set of common React components for use with the PatternFly reference implementation.", "main": "dist/js/index.js", "module": "dist/esm/index.js", From d6ecd426d1f4f8b08e2fec00d3ea314ef2f1dec1 Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Thu, 20 Jul 2023 10:21:07 -0400 Subject: [PATCH 2/5] feat(misc): update screenreader classname --- .../react-core/src/components/Alert/Alert.tsx | 3 +- .../__snapshots__/Alert.test.tsx.snap | 2 +- .../react-core/src/components/Badge/Badge.tsx | 2 +- .../src/components/Banner/Banner.tsx | 2 +- .../CalendarMonth/CalendarMonth.tsx | 2 +- .../react-core/src/components/Card/Card.tsx | 2 +- .../src/components/Card/CardHeader.tsx | 2 +- .../src/components/DataList/DataListItem.tsx | 2 +- .../__snapshots__/DatePicker.test.tsx.snap | 14 +++---- .../components/HelperText/HelperTextItem.tsx | 2 +- .../__snapshots__/HelperText.test.tsx.snap | 2 +- .../src/components/Modal/ModalBoxTitle.tsx | 3 +- .../__snapshots__/ModalBoxTitle.test.tsx.snap | 10 ++--- .../MultipleFileUploadStatusItem.tsx | 6 +-- ...MultipleFileUploadStatusItem.test.tsx.snap | 16 +++---- .../src/components/Nav/NavExpandable.tsx | 3 +- .../__snapshots__/NavExpandable.test.tsx.snap | 2 +- .../__tests__/__snapshots__/Nav.test.tsx.snap | 2 +- .../NotificationDrawerListItemHeader.tsx | 3 +- ...ficationDrawerListItemHeader.test.tsx.snap | 2 +- .../src/components/Popover/PopoverHeader.tsx | 2 +- .../src/components/Skeleton/Skeleton.tsx | 2 +- .../__snapshots__/Skeleton.test.tsx.snap | 42 +++++++++---------- .../ApplicationLauncherContent.tsx | 3 +- 24 files changed, 63 insertions(+), 68 deletions(-) diff --git a/packages/react-core/src/components/Alert/Alert.tsx b/packages/react-core/src/components/Alert/Alert.tsx index d1f00a44258..43560655bd0 100644 --- a/packages/react-core/src/components/Alert/Alert.tsx +++ b/packages/react-core/src/components/Alert/Alert.tsx @@ -2,7 +2,6 @@ import * as React from 'react'; import { useState } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Alert/alert'; -import accessibleStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility'; import { AlertIcon } from './AlertIcon'; import { capitalize, useOUIAProps, OUIAProps } from '../../helpers'; import { AlertContext } from './AlertContext'; @@ -117,7 +116,7 @@ export const Alert: React.FunctionComponent = ({ const ouiaProps = useOUIAProps(Alert.displayName, ouiaId, ouiaSafe, variant); const getHeadingContent = ( - {variantLabel} + {variantLabel} {title} ); diff --git a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap index 4aafdb74b1c..19863d7206a 100644 --- a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap +++ b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap @@ -23,7 +23,7 @@ exports[`Matches snapshot 1`] = ` class="pf-v5-c-alert__title" > Custom alert: diff --git a/packages/react-core/src/components/Badge/Badge.tsx b/packages/react-core/src/components/Badge/Badge.tsx index d2d00753abe..1fe3e0042ee 100644 --- a/packages/react-core/src/components/Badge/Badge.tsx +++ b/packages/react-core/src/components/Badge/Badge.tsx @@ -25,7 +25,7 @@ export const Badge: React.FunctionComponent = ({ className={css(styles.badge, (isRead ? styles.modifiers.read : styles.modifiers.unread) as any, className)} > {children} - {screenReaderText && {screenReaderText}} + {screenReaderText && {screenReaderText}} ); Badge.displayName = 'Badge'; diff --git a/packages/react-core/src/components/Banner/Banner.tsx b/packages/react-core/src/components/Banner/Banner.tsx index 1478c568f6b..99e08574369 100644 --- a/packages/react-core/src/components/Banner/Banner.tsx +++ b/packages/react-core/src/components/Banner/Banner.tsx @@ -34,7 +34,7 @@ export const Banner: React.FunctionComponent = ({ )} {...props} > - {screenReaderText && {screenReaderText}} + {screenReaderText && {screenReaderText}} {children} ); diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx index c49cc6b715e..c2bd704bea9 100644 --- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx +++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx @@ -377,7 +377,7 @@ export const CalendarMonth = ({ {calendar[0].map(({ date }, index) => ( - {longWeekdayFormat(date)} + {longWeekdayFormat(date)} {weekdayFormat(date)} ))} diff --git a/packages/react-core/src/components/Card/Card.tsx b/packages/react-core/src/components/Card/Card.tsx index 68e4fe3bcc0..d369d60adbf 100644 --- a/packages/react-core/src/components/Card/Card.tsx +++ b/packages/react-core/src/components/Card/Card.tsx @@ -165,7 +165,7 @@ export const Card: React.FunctionComponent = ({ > {hasSelectableInput && ( = ({ const getClickableSelectableProps = () => { const baseProps = { className: 'pf-m-standalone', - inputClassName: isClickable && !isSelectable && 'pf-v5-screen-reader', + inputClassName: isClickable && !isSelectable && 'pf-screen-reader', label: <>, 'aria-label': selectableActions.selectableActionAriaLabel, 'aria-labelledby': selectableActions.selectableActionAriaLabelledby, diff --git a/packages/react-core/src/components/DataList/DataListItem.tsx b/packages/react-core/src/components/DataList/DataListItem.tsx index 1cadc75bd11..4463f4c4c17 100644 --- a/packages/react-core/src/components/DataList/DataListItem.tsx +++ b/packages/react-core/src/components/DataList/DataListItem.tsx @@ -93,7 +93,7 @@ export class DataListItem extends React.Component { > {onSelectableRowChange && ( onSelectableRowChange(event, id)} diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap index e41744bb558..fdbdb89d1fb 100644 --- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap +++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap @@ -218,7 +218,7 @@ exports[`With popover opened 1`] = ` scope="col" > Sunday @@ -233,7 +233,7 @@ exports[`With popover opened 1`] = ` scope="col" > Monday @@ -248,7 +248,7 @@ exports[`With popover opened 1`] = ` scope="col" > Tuesday @@ -263,7 +263,7 @@ exports[`With popover opened 1`] = ` scope="col" > Wednesday @@ -278,7 +278,7 @@ exports[`With popover opened 1`] = ` scope="col" > Thursday @@ -293,7 +293,7 @@ exports[`With popover opened 1`] = ` scope="col" > Friday @@ -308,7 +308,7 @@ exports[`With popover opened 1`] = ` scope="col" > Saturday diff --git a/packages/react-core/src/components/HelperText/HelperTextItem.tsx b/packages/react-core/src/components/HelperText/HelperTextItem.tsx index 8306a7bd3d5..58e4d7b3791 100644 --- a/packages/react-core/src/components/HelperText/HelperTextItem.tsx +++ b/packages/react-core/src/components/HelperText/HelperTextItem.tsx @@ -78,7 +78,7 @@ export const HelperTextItem: React.FunctionComponent = ({ {children} - {isDynamic && : {screenReaderText};} + {isDynamic && : {screenReaderText};} ); diff --git a/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap b/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap index 61179f8e388..19a0d911e53 100644 --- a/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap +++ b/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap @@ -45,7 +45,7 @@ exports[`HelperText dynamic helper text renders successfully 1`] = ` > help test text : default status; diff --git a/packages/react-core/src/components/Modal/ModalBoxTitle.tsx b/packages/react-core/src/components/Modal/ModalBoxTitle.tsx index e153b803c71..3c6131cc49b 100644 --- a/packages/react-core/src/components/Modal/ModalBoxTitle.tsx +++ b/packages/react-core/src/components/Modal/ModalBoxTitle.tsx @@ -1,7 +1,6 @@ import * as React from 'react'; import modalStyles from '@patternfly/react-styles/css/components/ModalBox/modal-box'; import { css } from '@patternfly/react-styles'; -import accessibleStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility'; import { capitalize } from '../../helpers'; import { Tooltip } from '../Tooltip'; import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon'; @@ -64,7 +63,7 @@ export const ModalBoxTitle: React.FunctionComponent = ({ {isVariantIcon(titleIconVariant) ? variantIcons[titleIconVariant] : } )} - {label && {label}} + {label && {label}} {title} ); diff --git a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap index 0630bdf9d09..fd2ff96af11 100644 --- a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap +++ b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap @@ -24,7 +24,7 @@ exports[`ModalBoxTitle alert variant 1`] = ` Warning alert: @@ -93,7 +93,7 @@ exports[`ModalBoxTitle custom variant 1`] = ` Custom alert: @@ -130,7 +130,7 @@ exports[`ModalBoxTitle danger variant 1`] = ` Danger alert: @@ -167,7 +167,7 @@ exports[`ModalBoxTitle info variant 1`] = ` Info alert: @@ -204,7 +204,7 @@ exports[`ModalBoxTitle success variant 1`] = ` Success alert: diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx index 7cfab80a1d3..627cb739a05 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx @@ -88,7 +88,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent resolve(reader.result); reader.onerror = () => reject(reader.error); - reader.onprogress = data => { + reader.onprogress = (data) => { if (data.lengthComputable) { setLoadPercentage((data.loaded / data.total) * 100); } @@ -103,7 +103,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent { + .then((data) => { setLoadResult('success'); setLoadPercentage(100); onReadFinished(file); @@ -148,7 +148,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent
{fileIcon || }
-
+
{progressAriaLiveMessage && typeof progressAriaLiveMessage === 'function' && progressAriaLiveMessage(+loadPercentage.toFixed(2))} diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap index d99f2fb44b5..51fc3f12f42 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap @@ -27,7 +27,7 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = ` >
Progress value is 0%.
@@ -143,7 +143,7 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = ` >
Progress value is 0%.
@@ -256,7 +256,7 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres >
test message
@@ -371,7 +371,7 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe >
test message 0
@@ -486,7 +486,7 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when >
Progress value is 42%.
@@ -618,7 +618,7 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file >
Progress value is 0%.
@@ -733,7 +733,7 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = ` >
Progress value is 0%.
@@ -846,7 +846,7 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe >
Progress value is 0%.
diff --git a/packages/react-core/src/components/Nav/NavExpandable.tsx b/packages/react-core/src/components/Nav/NavExpandable.tsx index 74ec1e523fe..09b418cff82 100644 --- a/packages/react-core/src/components/Nav/NavExpandable.tsx +++ b/packages/react-core/src/components/Nav/NavExpandable.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; import styles from '@patternfly/react-styles/css/components/Nav/nav'; -import a11yStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility'; import { css } from '@patternfly/react-styles'; import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon'; import { getUniqueId } from '../../helpers/util'; @@ -145,7 +144,7 @@ export class NavExpandable extends React.Component
); }; diff --git a/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap b/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap index 27c7f4abb41..8f9a66f19fa 100644 --- a/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap +++ b/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap @@ -6,7 +6,7 @@ exports[`skeleton circle skeleton 1`] = ` class="pf-v5-c-skeleton pf-m-circle" >
@@ -18,7 +18,7 @@ exports[`skeleton default 1`] = ` class="pf-v5-c-skeleton" >
@@ -30,7 +30,7 @@ exports[`skeleton skeleton with 2xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-2xl" > @@ -42,7 +42,7 @@ exports[`skeleton skeleton with 3xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-3xl" > @@ -54,7 +54,7 @@ exports[`skeleton skeleton with 4xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-4xl" > @@ -67,7 +67,7 @@ exports[`skeleton skeleton with 25% height 1`] = ` style="--pf-v5-c-skeleton--Height: 25%;" > @@ -80,7 +80,7 @@ exports[`skeleton skeleton with 25% width 1`] = ` style="--pf-v5-c-skeleton--Width: 25%;" > @@ -93,7 +93,7 @@ exports[`skeleton skeleton with 33% height 1`] = ` style="--pf-v5-c-skeleton--Height: 33%;" > @@ -106,7 +106,7 @@ exports[`skeleton skeleton with 33% width 1`] = ` style="--pf-v5-c-skeleton--Width: 33%;" > @@ -119,7 +119,7 @@ exports[`skeleton skeleton with 50% height 1`] = ` style="--pf-v5-c-skeleton--Height: 50%;" > @@ -132,7 +132,7 @@ exports[`skeleton skeleton with 50% width 1`] = ` style="--pf-v5-c-skeleton--Width: 50%;" > @@ -145,7 +145,7 @@ exports[`skeleton skeleton with 66% height 1`] = ` style="--pf-v5-c-skeleton--Height: 66%;" > @@ -158,7 +158,7 @@ exports[`skeleton skeleton with 66% width 1`] = ` style="--pf-v5-c-skeleton--Width: 66%;" > @@ -171,7 +171,7 @@ exports[`skeleton skeleton with 75% height 1`] = ` style="--pf-v5-c-skeleton--Height: 75%;" > @@ -184,7 +184,7 @@ exports[`skeleton skeleton with 75% width 1`] = ` style="--pf-v5-c-skeleton--Width: 75%;" > @@ -197,7 +197,7 @@ exports[`skeleton skeleton with 100% height 1`] = ` style="--pf-v5-c-skeleton--Height: 100%;" > @@ -209,7 +209,7 @@ exports[`skeleton skeleton with lg font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-lg" > @@ -221,7 +221,7 @@ exports[`skeleton skeleton with md font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-md" > @@ -233,7 +233,7 @@ exports[`skeleton skeleton with sm font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-sm" > @@ -245,7 +245,7 @@ exports[`skeleton skeleton with xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-xl" > @@ -257,7 +257,7 @@ exports[`skeleton square skeleton 1`] = ` class="pf-v5-c-skeleton pf-m-square" > diff --git a/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx index 0aa45676ec9..3186f33e4d8 100644 --- a/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx +++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx @@ -1,7 +1,6 @@ import * as React from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/AppLauncher/app-launcher'; -import accessibleStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility'; import { ApplicationLauncherIcon } from './ApplicationLauncherIcon'; import { ApplicationLauncherText } from './ApplicationLauncherText'; import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon'; @@ -25,7 +24,7 @@ export const ApplicationLauncherContent: React.FunctionComponent - (opens new window) + (opens new window) )} From b2cb8fba5cb9a3cbd75430337ef1326f1e607c58 Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Mon, 31 Jul 2023 09:17:21 -0400 Subject: [PATCH 3/5] add prefix --- .../react-core/src/components/Alert/Alert.tsx | 2 +- .../__snapshots__/Alert.test.tsx.snap | 2 +- .../react-core/src/components/Badge/Badge.tsx | 2 +- .../src/components/Banner/Banner.tsx | 2 +- .../CalendarMonth/CalendarMonth.tsx | 2 +- .../react-core/src/components/Card/Card.tsx | 2 +- .../src/components/Card/CardHeader.tsx | 2 +- .../src/components/DataList/DataListItem.tsx | 2 +- .../__snapshots__/DatePicker.test.tsx.snap | 14 +++---- .../components/HelperText/HelperTextItem.tsx | 2 +- .../__snapshots__/HelperText.test.tsx.snap | 2 +- .../src/components/Modal/ModalBoxTitle.tsx | 2 +- .../__snapshots__/ModalBoxTitle.test.tsx.snap | 10 ++--- .../MultipleFileUploadStatusItem.tsx | 2 +- ...MultipleFileUploadStatusItem.test.tsx.snap | 16 +++---- .../src/components/Nav/NavExpandable.tsx | 2 +- .../__snapshots__/NavExpandable.test.tsx.snap | 2 +- .../__tests__/__snapshots__/Nav.test.tsx.snap | 2 +- .../NotificationDrawerListItemHeader.tsx | 2 +- ...ficationDrawerListItemHeader.test.tsx.snap | 2 +- .../src/components/Popover/PopoverHeader.tsx | 2 +- .../src/components/Skeleton/Skeleton.tsx | 2 +- .../__snapshots__/Skeleton.test.tsx.snap | 42 +++++++++---------- .../ApplicationLauncherContent.tsx | 2 +- 24 files changed, 61 insertions(+), 61 deletions(-) diff --git a/packages/react-core/src/components/Alert/Alert.tsx b/packages/react-core/src/components/Alert/Alert.tsx index 43560655bd0..2aeada78078 100644 --- a/packages/react-core/src/components/Alert/Alert.tsx +++ b/packages/react-core/src/components/Alert/Alert.tsx @@ -116,7 +116,7 @@ export const Alert: React.FunctionComponent = ({ const ouiaProps = useOUIAProps(Alert.displayName, ouiaId, ouiaSafe, variant); const getHeadingContent = ( - {variantLabel} + {variantLabel} {title} ); diff --git a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap index 19863d7206a..a83c6798d3b 100644 --- a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap +++ b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap @@ -23,7 +23,7 @@ exports[`Matches snapshot 1`] = ` class="pf-v5-c-alert__title" > Custom alert: diff --git a/packages/react-core/src/components/Badge/Badge.tsx b/packages/react-core/src/components/Badge/Badge.tsx index 1fe3e0042ee..d2d00753abe 100644 --- a/packages/react-core/src/components/Badge/Badge.tsx +++ b/packages/react-core/src/components/Badge/Badge.tsx @@ -25,7 +25,7 @@ export const Badge: React.FunctionComponent = ({ className={css(styles.badge, (isRead ? styles.modifiers.read : styles.modifiers.unread) as any, className)} > {children} - {screenReaderText && {screenReaderText}} + {screenReaderText && {screenReaderText}} ); Badge.displayName = 'Badge'; diff --git a/packages/react-core/src/components/Banner/Banner.tsx b/packages/react-core/src/components/Banner/Banner.tsx index 99e08574369..df01c6b0a7e 100644 --- a/packages/react-core/src/components/Banner/Banner.tsx +++ b/packages/react-core/src/components/Banner/Banner.tsx @@ -34,7 +34,7 @@ export const Banner: React.FunctionComponent = ({ )} {...props} > - {screenReaderText && {screenReaderText}} + {screenReaderText && {screenReaderText}} {children} ); diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx index c2bd704bea9..c49cc6b715e 100644 --- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx +++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx @@ -377,7 +377,7 @@ export const CalendarMonth = ({ {calendar[0].map(({ date }, index) => ( - {longWeekdayFormat(date)} + {longWeekdayFormat(date)} {weekdayFormat(date)} ))} diff --git a/packages/react-core/src/components/Card/Card.tsx b/packages/react-core/src/components/Card/Card.tsx index d369d60adbf..68e4fe3bcc0 100644 --- a/packages/react-core/src/components/Card/Card.tsx +++ b/packages/react-core/src/components/Card/Card.tsx @@ -165,7 +165,7 @@ export const Card: React.FunctionComponent = ({ > {hasSelectableInput && ( = ({ const getClickableSelectableProps = () => { const baseProps = { className: 'pf-m-standalone', - inputClassName: isClickable && !isSelectable && 'pf-screen-reader', + inputClassName: isClickable && !isSelectable && 'pf-v5-screen-reader', label: <>, 'aria-label': selectableActions.selectableActionAriaLabel, 'aria-labelledby': selectableActions.selectableActionAriaLabelledby, diff --git a/packages/react-core/src/components/DataList/DataListItem.tsx b/packages/react-core/src/components/DataList/DataListItem.tsx index 4463f4c4c17..1cadc75bd11 100644 --- a/packages/react-core/src/components/DataList/DataListItem.tsx +++ b/packages/react-core/src/components/DataList/DataListItem.tsx @@ -93,7 +93,7 @@ export class DataListItem extends React.Component { > {onSelectableRowChange && ( onSelectableRowChange(event, id)} diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap index fdbdb89d1fb..e41744bb558 100644 --- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap +++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap @@ -218,7 +218,7 @@ exports[`With popover opened 1`] = ` scope="col" > Sunday @@ -233,7 +233,7 @@ exports[`With popover opened 1`] = ` scope="col" > Monday @@ -248,7 +248,7 @@ exports[`With popover opened 1`] = ` scope="col" > Tuesday @@ -263,7 +263,7 @@ exports[`With popover opened 1`] = ` scope="col" > Wednesday @@ -278,7 +278,7 @@ exports[`With popover opened 1`] = ` scope="col" > Thursday @@ -293,7 +293,7 @@ exports[`With popover opened 1`] = ` scope="col" > Friday @@ -308,7 +308,7 @@ exports[`With popover opened 1`] = ` scope="col" > Saturday diff --git a/packages/react-core/src/components/HelperText/HelperTextItem.tsx b/packages/react-core/src/components/HelperText/HelperTextItem.tsx index 58e4d7b3791..46665f777c4 100644 --- a/packages/react-core/src/components/HelperText/HelperTextItem.tsx +++ b/packages/react-core/src/components/HelperText/HelperTextItem.tsx @@ -78,7 +78,7 @@ export const HelperTextItem: React.FunctionComponent = ({ {children} - {isDynamic && : {screenReaderText};} + {isDynamic && : {screenReaderText};} ); diff --git a/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap b/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap index 19a0d911e53..bc7fa094120 100644 --- a/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap +++ b/packages/react-core/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap @@ -45,7 +45,7 @@ exports[`HelperText dynamic helper text renders successfully 1`] = ` > help test text : default status; diff --git a/packages/react-core/src/components/Modal/ModalBoxTitle.tsx b/packages/react-core/src/components/Modal/ModalBoxTitle.tsx index 3c6131cc49b..1612b09eba5 100644 --- a/packages/react-core/src/components/Modal/ModalBoxTitle.tsx +++ b/packages/react-core/src/components/Modal/ModalBoxTitle.tsx @@ -63,7 +63,7 @@ export const ModalBoxTitle: React.FunctionComponent = ({ {isVariantIcon(titleIconVariant) ? variantIcons[titleIconVariant] : } )} - {label && {label}} + {label && {label}} {title} ); diff --git a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap index fd2ff96af11..112406099e3 100644 --- a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap +++ b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalBoxTitle.test.tsx.snap @@ -24,7 +24,7 @@ exports[`ModalBoxTitle alert variant 1`] = ` Warning alert: @@ -93,7 +93,7 @@ exports[`ModalBoxTitle custom variant 1`] = ` Custom alert: @@ -130,7 +130,7 @@ exports[`ModalBoxTitle danger variant 1`] = ` Danger alert: @@ -167,7 +167,7 @@ exports[`ModalBoxTitle info variant 1`] = ` Info alert: @@ -204,7 +204,7 @@ exports[`ModalBoxTitle success variant 1`] = ` Success alert: diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx index 627cb739a05..5cafa5c9033 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx @@ -148,7 +148,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent
{fileIcon || }
-
+
{progressAriaLiveMessage && typeof progressAriaLiveMessage === 'function' && progressAriaLiveMessage(+loadPercentage.toFixed(2))} diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap index 51fc3f12f42..d99f2fb44b5 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap @@ -27,7 +27,7 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = ` >
Progress value is 0%.
@@ -143,7 +143,7 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = ` >
Progress value is 0%.
@@ -256,7 +256,7 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres >
test message
@@ -371,7 +371,7 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe >
test message 0
@@ -486,7 +486,7 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when >
Progress value is 42%.
@@ -618,7 +618,7 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file >
Progress value is 0%.
@@ -733,7 +733,7 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = ` >
Progress value is 0%.
@@ -846,7 +846,7 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe >
Progress value is 0%.
diff --git a/packages/react-core/src/components/Nav/NavExpandable.tsx b/packages/react-core/src/components/Nav/NavExpandable.tsx index 09b418cff82..73231581e91 100644 --- a/packages/react-core/src/components/Nav/NavExpandable.tsx +++ b/packages/react-core/src/components/Nav/NavExpandable.tsx @@ -144,7 +144,7 @@ export class NavExpandable extends React.Component
); }; diff --git a/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap b/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap index 8f9a66f19fa..b159a78129e 100644 --- a/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap +++ b/packages/react-core/src/components/Skeleton/__tests__/__snapshots__/Skeleton.test.tsx.snap @@ -6,7 +6,7 @@ exports[`skeleton circle skeleton 1`] = ` class="pf-v5-c-skeleton pf-m-circle" >
@@ -18,7 +18,7 @@ exports[`skeleton default 1`] = ` class="pf-v5-c-skeleton" >
@@ -30,7 +30,7 @@ exports[`skeleton skeleton with 2xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-2xl" > @@ -42,7 +42,7 @@ exports[`skeleton skeleton with 3xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-3xl" > @@ -54,7 +54,7 @@ exports[`skeleton skeleton with 4xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-4xl" > @@ -67,7 +67,7 @@ exports[`skeleton skeleton with 25% height 1`] = ` style="--pf-v5-c-skeleton--Height: 25%;" > @@ -80,7 +80,7 @@ exports[`skeleton skeleton with 25% width 1`] = ` style="--pf-v5-c-skeleton--Width: 25%;" > @@ -93,7 +93,7 @@ exports[`skeleton skeleton with 33% height 1`] = ` style="--pf-v5-c-skeleton--Height: 33%;" > @@ -106,7 +106,7 @@ exports[`skeleton skeleton with 33% width 1`] = ` style="--pf-v5-c-skeleton--Width: 33%;" > @@ -119,7 +119,7 @@ exports[`skeleton skeleton with 50% height 1`] = ` style="--pf-v5-c-skeleton--Height: 50%;" > @@ -132,7 +132,7 @@ exports[`skeleton skeleton with 50% width 1`] = ` style="--pf-v5-c-skeleton--Width: 50%;" > @@ -145,7 +145,7 @@ exports[`skeleton skeleton with 66% height 1`] = ` style="--pf-v5-c-skeleton--Height: 66%;" > @@ -158,7 +158,7 @@ exports[`skeleton skeleton with 66% width 1`] = ` style="--pf-v5-c-skeleton--Width: 66%;" > @@ -171,7 +171,7 @@ exports[`skeleton skeleton with 75% height 1`] = ` style="--pf-v5-c-skeleton--Height: 75%;" > @@ -184,7 +184,7 @@ exports[`skeleton skeleton with 75% width 1`] = ` style="--pf-v5-c-skeleton--Width: 75%;" > @@ -197,7 +197,7 @@ exports[`skeleton skeleton with 100% height 1`] = ` style="--pf-v5-c-skeleton--Height: 100%;" > @@ -209,7 +209,7 @@ exports[`skeleton skeleton with lg font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-lg" > @@ -221,7 +221,7 @@ exports[`skeleton skeleton with md font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-md" > @@ -233,7 +233,7 @@ exports[`skeleton skeleton with sm font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-sm" > @@ -245,7 +245,7 @@ exports[`skeleton skeleton with xl font size 1`] = ` class="pf-v5-c-skeleton pf-m-text-xl" > @@ -257,7 +257,7 @@ exports[`skeleton square skeleton 1`] = ` class="pf-v5-c-skeleton pf-m-square" > diff --git a/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx index 3186f33e4d8..0fd7153316a 100644 --- a/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx +++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx @@ -24,7 +24,7 @@ export const ApplicationLauncherContent: React.FunctionComponent - (opens new window) + (opens new window) )} From c64ce0383f2871d053e03e7517af817089a2b4c1 Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Mon, 31 Jul 2023 14:14:26 -0400 Subject: [PATCH 4/5] fix missing merge conflict --- packages/react-core/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 24d242ec577..cc1c80150cb 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -1,10 +1,6 @@ { "name": "@patternfly/react-core", -<<<<<<< HEAD "version": "5.1.1-prerelease.0", -======= - "version": "5.0.0-prerelease.25", ->>>>>>> 0d5ec4fd2 (Rebase postv5 (#9393)) "description": "This library provides a set of common React components for use with the PatternFly reference implementation.", "main": "dist/js/index.js", "module": "dist/esm/index.js", From 961b796d4318365ba4982c9e554cb4bc9c7f5f9c Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Thu, 3 Aug 2023 09:47:03 -0400 Subject: [PATCH 5/5] update Banner test --- .../src/components/Banner/__tests__/Banner.test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx b/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx index 7de60cd5e15..888b33c1287 100644 --- a/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx +++ b/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx @@ -51,9 +51,9 @@ test('Renders with class name pf-m-blue when "blue" is passed to variant prop', expect(screen.getByText('Test')).toHaveClass('pf-m-blue'); }); -test('Does not render pf-v5-u-screen-reader class by default', () => { +test('Does not render pf-v5-screen-reader class by default', () => { render(Test); - expect(screen.getByText('Test')).not.toContainHTML(''); + expect(screen.getByText('Test')).not.toContainHTML(''); }); test('Renders screenReaderText passed via prop', () => {