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

Auth VoiceOver #231

Merged
merged 14 commits into from
Dec 5, 2024
Merged

Auth VoiceOver #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
796605e
auth voiceover fix
KostiantynFandeliuk Dec 3, 2024
f6e38d8
auth console.log
KostiantynFandeliuk Dec 3, 2024
d859789
auth console.log 2
KostiantynFandeliuk Dec 3, 2024
cd4ec85
auth added attribute and email focus
KostiantynFandeliuk Dec 3, 2024
487d2c4
auth updated focus element
KostiantynFandeliuk Dec 3, 2024
7f3ecbc
added forgot pswd aria-label
KostiantynFandeliuk Dec 3, 2024
fea07f3
updated auth dropin
KostiantynFandeliuk Dec 3, 2024
6fa2b0f
Update scripts/__dropins__
Ferri0 Dec 4, 2024
a054423
Fix eslint errors
Ferri0 Dec 4, 2024
dfdc580
Rollback deleted file
Ferri0 Dec 4, 2024
f04c98e
Fix EOF
Ferri0 Dec 4, 2024
1b09570
Rollback file changes
Ferri0 Dec 4, 2024
1445449
Adjust blocks URLs
Ferri0 Dec 4, 2024
7cc5d0a
Merge branch 'develop' of github.com:hlxsites/aem-boilerplate-commerc…
Ferri0 Dec 4, 2024
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
2 changes: 1 addition & 1 deletion blocks/commerce-order-returns/commerce-order-returns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ export default async function decorate(block) {

return `${returnDetailsPath}?orderRef=${encodedOrderRef}&returnRef=${returnNumber}`;
},
routeProductDetails: (productData) => (productData ? `/products/${productData.product.urlKey}/${productData.product.sku}` : '#'),
routeProductDetails: (productData) => (productData?.product ? `/products/${productData.product.urlKey}/${productData.product.sku}` : '#'),
})(block);
}
2 changes: 1 addition & 1 deletion blocks/commerce-orders-list/commerce-orders-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default async function decorate(block) {
routeOrdersList: () => CUSTOMER_ORDERS_PATH,
routeOrderDetails: (orderNumber) => `${CUSTOMER_ORDER_DETAILS_PATH}?orderRef=${orderNumber}`,
routeReturnDetails: ({ orderNumber, returnNumber }) => `${CUSTOMER_RETURN_DETAILS_PATH}?orderRef=${orderNumber}&returnRef=${returnNumber}`,
routeOrderProduct: (productData) => (productData ? `/products/${productData.product.urlKey}/${productData.product.sku}` : '#'),
routeOrderProduct: (productData) => (productData?.product ? `/products/${productData.product.urlKey}/${productData.product.sku}` : '#'),
})(block);
}
}
2 changes: 1 addition & 1 deletion blocks/commerce-returns-list/commerce-returns-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default async function decorate(block) {
routeReturnDetails: ({ orderNumber, returnNumber }) => `${CUSTOMER_RETURN_DETAILS_PATH}?orderRef=${orderNumber}&returnRef=${returnNumber}`,
routeOrderDetails: ({ orderNumber }) => `${CUSTOMER_ORDER_DETAILS_PATH}?orderRef=${orderNumber}`,
routeReturnsList: () => CUSTOMER_RETURNS_PATH,
routeProductDetails: (productData) => (productData ? `/products/${productData.product.urlKey}/${productData.product.sku}` : '#'),
routeProductDetails: (productData) => (productData?.product ? `/products/${productData.product.urlKey}/${productData.product.sku}` : '#'),
})(block);
}
}
15 changes: 12 additions & 3 deletions blocks/header/renderAuthDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function renderSignIn(element) {
export function renderAuthDropdown(navTools) {
const dropdownElement = document.createRange().createContextualFragment(`
<div class="dropdown-wrapper nav-tools-wrapper">
<button type="button" class="nav-dropdown-button"></button>
<button type="button" class="nav-dropdown-button" aria-haspopup="dialog" aria-expanded="false" aria-controls="login-modal"></button>
<div class="nav-auth-menu-panel nav-tools-panel">
<div id="auth-dropin-container"></div>
<ul class="authenticated-user-menu">
Expand All @@ -43,17 +43,26 @@ export function renderAuthDropdown(navTools) {
navTools.append(dropdownElement);

const authDropDownPanel = navTools.querySelector('.nav-auth-menu-panel');
const authDropDownMenuList = navTools.querySelector('.authenticated-user-menu');
const authDropDownMenuList = navTools.querySelector(
'.authenticated-user-menu',
);
const authDropinContainer = navTools.querySelector('#auth-dropin-container');
const loginButton = navTools.querySelector('.nav-dropdown-button');
const logoutButtonElement = navTools.querySelector('.authenticated-user-menu > li > button');
const logoutButtonElement = navTools.querySelector(
'.authenticated-user-menu > li > button',
);

authDropDownPanel.addEventListener('click', (e) => e.stopPropagation());

async function toggleDropDownAuthMenu(state) {
const show = state ?? !authDropDownPanel.classList.contains('nav-tools-panel--show');

authDropDownPanel.classList.toggle('nav-tools-panel--show', show);
authDropDownPanel.setAttribute('role', 'dialog');
authDropDownPanel.setAttribute('aria-hidden', 'false');
authDropDownPanel.setAttribute('aria-labelledby', 'modal-title');
authDropDownPanel.setAttribute('aria-describedby', 'modal-description');
authDropDownPanel.focus();
}

loginButton.addEventListener('click', () => toggleDropDownAuthMenu());
Expand Down
Loading