Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/react-core/src/components/Alert/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -117,7 +116,7 @@ export const Alert: React.FunctionComponent<AlertProps> = ({
const ouiaProps = useOUIAProps(Alert.displayName, ouiaId, ouiaSafe, variant);
const getHeadingContent = (
<React.Fragment>
<span className={css(accessibleStyles.screenReader)}>{variantLabel}</span>
<span className="pf-v5-screen-reader">{variantLabel}</span>
{title}
</React.Fragment>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`Matches snapshot 1`] = `
class="pf-v5-c-alert__title"
>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
Custom alert:
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Banner/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const Banner: React.FunctionComponent<BannerProps> = ({
)}
{...props}
>
{screenReaderText && <span className="pf-v5-u-screen-reader">{screenReaderText}</span>}
{screenReaderText && <span className="pf-v5-screen-reader">{screenReaderText}</span>}
{children}
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(<Banner>Test</Banner>);
expect(screen.getByText('Test')).not.toContainHTML('<span class="pf-v5-u-screen-reader"></span>');
expect(screen.getByText('Test')).not.toContainHTML('<span class="pf-v5-screen-reader"></span>');
});

test('Renders screenReaderText passed via prop', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const HelperTextItem: React.FunctionComponent<HelperTextItemProps> = ({

<span className={css(styles.helperTextItemText)}>
{children}
{isDynamic && <span className="pf-v5-u-screen-reader">: {screenReaderText};</span>}
{isDynamic && <span className="pf-v5-screen-reader">: {screenReaderText};</span>}
</span>
</Component>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports[`HelperText dynamic helper text renders successfully 1`] = `
>
help test text
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
: default status;
</span>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-core/src/components/Modal/ModalBoxTitle.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -64,7 +63,7 @@ export const ModalBoxTitle: React.FunctionComponent<ModalBoxTitleProps> = ({
{isVariantIcon(titleIconVariant) ? variantIcons[titleIconVariant] : <CustomIcon />}
</span>
)}
{label && <span className={css(accessibleStyles.screenReader)}>{label}</span>}
{label && <span className="pf-v5-screen-reader">{label}</span>}
<span className={css(modalStyles.modalBoxTitleText)}>{title}</span>
</h1>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`ModalBoxTitle alert variant 1`] = `
</svg>
</span>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
Warning alert:
</span>
Expand Down Expand Up @@ -93,7 +93,7 @@ exports[`ModalBoxTitle custom variant 1`] = `
</svg>
</span>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
Custom alert:
</span>
Expand Down Expand Up @@ -130,7 +130,7 @@ exports[`ModalBoxTitle danger variant 1`] = `
</svg>
</span>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
Danger alert:
</span>
Expand Down Expand Up @@ -167,7 +167,7 @@ exports[`ModalBoxTitle info variant 1`] = `
</svg>
</span>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
Info alert:
</span>
Expand Down Expand Up @@ -204,7 +204,7 @@ exports[`ModalBoxTitle success variant 1`] = `
</svg>
</span>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
Success alert:
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent<MultipleFileU
const reader = new FileReader();
reader.onload = () => resolve(reader.result);
reader.onerror = () => reject(reader.error);
reader.onprogress = data => {
reader.onprogress = (data) => {
if (data.lengthComputable) {
setLoadPercentage((data.loaded / data.total) * 100);
}
Expand All @@ -103,7 +103,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent<MultipleFileU
} else {
onReadStarted(file);
readFile(file)
.then(data => {
.then((data) => {
setLoadResult('success');
setLoadPercentage(100);
onReadFinished(file);
Expand Down
3 changes: 1 addition & 2 deletions packages/react-core/src/components/Nav/NavExpandable.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -145,7 +144,7 @@ export class NavExpandable extends React.Component<NavExpandableProps, NavExpand
</PageSidebarContext.Consumer>
<section className={css(styles.navSubnav)} aria-labelledby={this.id} hidden={expandedState ? null : true}>
{srText && (
<h2 className={css(a11yStyles.screenReader)} id={this.id}>
<h2 className="pf-v5-screen-reader" id={this.id}>
{srText}
</h2>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exports[`NavExpandable should match snapshot (auto-generated) 1`] = `
hidden=""
>
<h2
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
id="''"
>
''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ exports[`Nav Expandable Nav List with aria label 1`] = `
hidden=""
>
<h2
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
id="grp-1"
>
Section 1 - Example sub-navigation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/excl
import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
import { css } from '@patternfly/react-styles';
import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
import a11yStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility';

import maxLines from '@patternfly/react-tokens/dist/esm/c_notification_drawer__list_item_header_title_max_lines';

Expand Down Expand Up @@ -87,7 +86,7 @@ export const NotificationDrawerListItemHeader: React.FunctionComponent<Notificat
ref={titleRef}
className={css(styles.notificationDrawerListItemHeaderTitle, truncateTitle && styles.modifiers.truncate)}
>
{srTitle && <span className={css(a11yStyles.screenReader)}>{srTitle}</span>}
{srTitle && <span className="pf-v5-screen-reader">{srTitle}</span>}
{title}
</HeadingLevel>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ exports[`NotificationDrawerListItemHeader list item header with srTitle applied
class="pf-v5-c-notification-drawer__list-item-header-title"
>
<span
class="pf-v5-u-screen-reader"
class="pf-v5-screen-reader"
>
screen reader title
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const PopoverHeader: React.FunctionComponent<PopoverHeaderProps> = ({
{icon && <PopoverHeaderIcon>{icon}</PopoverHeaderIcon>}
<PopoverHeaderText headingLevel={titleHeadingLevel}>
{alertSeverityVariant && alertSeverityScreenReaderText && (
<span className="pf-v5-u-screen-reader">{alertSeverityScreenReaderText}</span>
<span className="pf-v5-screen-reader">{alertSeverityScreenReaderText}</span>
)}
{children}
</PopoverHeaderText>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Skeleton/Skeleton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const Skeleton: React.FunctionComponent<SkeletonProps> = ({
} as React.CSSProperties
})}
>
<span className="pf-v5-u-screen-reader">{screenreaderText}</span>
<span className="pf-v5-screen-reader">{screenreaderText}</span>
</div>
);
};
Expand Down
Loading