Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AC-2487::Accordions do not indicate current state #3977

Merged
merged 11 commits into from
Nov 15, 2022
Merged

AC-2487::Accordions do not indicate current state #3977

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f56d423
AC-2487::Accordions do not indicate current state
glo82145 Oct 12, 2022
9e60161
Merge branch 'develop' into AC-2487-v1
glo82145 Oct 12, 2022
e0513af
AC-2487::fixed failing test cases
glo82145 Oct 12, 2022
369cbaf
Merge branch 'AC-2487-v1' of github.com:glo71317/pwa-studio into AC-2…
glo82145 Oct 12, 2022
2851911
AC-2487::fixed failing test cases
glo82145 Oct 12, 2022
6cc1d8a
AC-2487::run prettier command for filterModalOpenButton.js
glo82145 Oct 12, 2022
312be51
AC-2487::added translation as suggested
glo82145 Nov 15, 2022
608978c
Merge branch 'develop' into AC-2487-v1
glo82145 Nov 15, 2022
e637145
AC-2487::fixed failing test case
glo82145 Nov 15, 2022
2c3eb44
AC-2487::worked on failing test cases
glo82145 Nov 15, 2022
5119264
AC-2487::worked on failing test cases
glo82145 Nov 15, 2022
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
7 changes: 7 additions & 0 deletions packages/venia-ui/lib/components/FilterModalOpenButton/filterModalOpenButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ const FilterModalOpenButton = props => {
const { filters, classes: propsClasses } = props;
const classes = useStyle(defaultClasses, propsClasses);
const { handleOpen } = useFilterModal({ filters });
const handleKeypress = e => {
if (e.code == 'Enter') {
handleOpen;
}
};

return (
<Button
Expand All @@ -19,9 +24,11 @@ const FilterModalOpenButton = props => {
}}
data-cy="FilterModalOpenButton-button"
onClick={handleOpen}
onKeyDown={handleKeypress}
type="button"
aria-live="polite"
aria-busy="false"
aria-label="Filter Button for Filter Options"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a translation for this string please?

>
<FormattedMessage
id={'productList.filter'}
Expand Down
4 changes: 4 additions & 0 deletions ...es/venia-ui/lib/components/OrderHistoryPage/__tests__/__snapshots__/orderRow.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ exports[`it does not render order details if loading is true 1`] = `
/>
</div>
<button
aria-expanded={false}
className="contentToggleContainer"
onClick={[MockFunction handleContentToggle]}
type="button"
Expand Down Expand Up @@ -285,6 +286,7 @@ exports[`it renders collapsed order row 1`] = `
/>
</div>
<button
aria-expanded={false}
className="contentToggleContainer"
onClick={[MockFunction handleContentToggle]}
type="button"
Expand Down Expand Up @@ -571,6 +573,7 @@ exports[`it renders open order row 1`] = `
/>
</div>
<button
aria-expanded={true}
className="contentToggleContainer"
onClick={[MockFunction handleContentToggle]}
type="button"
Expand Down Expand Up @@ -867,6 +870,7 @@ exports[`it renders with missing order information 1`] = `
/>
</div>
<button
aria-expanded={false}
className="contentToggleContainer"
onClick={[MockFunction]}
type="button"
Expand Down
1 change: 1 addition & 0 deletions packages/venia-ui/lib/components/OrderHistoryPage/orderRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ const OrderRow = props => {
className={classes.contentToggleContainer}
onClick={handleContentToggle}
type="button"
aria-expanded={isOpen}
>
{contentToggleIcon}
</button>
Expand Down
1 change: 1 addition & 0 deletions ...ages/venia-ui/lib/components/ProductSort/__tests__/__snapshots__/productSort.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ exports[`renders correctly 1`] = `
aria-busy="false"
>
<button
aria-label="Sort Button Collapsed"
disabled={false}
onClick={[Function]}
onDragStart={[Function]}
Expand Down
9 changes: 9 additions & 0 deletions packages/venia-ui/lib/components/ProductSort/productSort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ const ProductSort = props => {
setExpanded(!expanded);
};

const handleKeypress = e => {
if (e.code == 'Enter') {
setExpanded(expanded);
}
};
const result = expanded ? 'Sort Button Expanded' : 'Sort Button Collapsed';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you add translations for these strings please?


return (
<div
ref={elementRef}
Expand All @@ -171,6 +178,8 @@ const ProductSort = props => {
}}
onClick={handleSortClick}
data-cy="ProductSort-sortButton"
onKeyDown={handleKeypress}
aria-label={result}
>
<span className={classes.mobileText}>
<FormattedMessage
Expand Down