From 8de7b914a8985509b108384e3d5079f0baf2b1cc Mon Sep 17 00:00:00 2001 From: Jarek Date: Wed, 19 May 2021 14:43:43 +0200 Subject: [PATCH 1/8] #78684 - Add margin --- Magento_GiftRegistry/templates/cart/link.phtml | 1 + 1 file changed, 1 insertion(+) diff --git a/Magento_GiftRegistry/templates/cart/link.phtml b/Magento_GiftRegistry/templates/cart/link.phtml index 692856fd5..d293d81fb 100644 --- a/Magento_GiftRegistry/templates/cart/link.phtml +++ b/Magento_GiftRegistry/templates/cart/link.phtml @@ -43,6 +43,7 @@ $entityValues = $block->getEntityValues() add button button--fluid + margin-bottom-m " > escapeHtml(__('Add All To Gift Registry')) ?> From 92d62feeab29c2932ea66800f4b78b9ed7264718 Mon Sep 17 00:00:00 2001 From: Ola Date: Fri, 21 May 2021 12:47:49 +0200 Subject: [PATCH 2/8] update tab component a11y --- Snowdog_Components/components/Molecules/tab/README.md | 6 ++++-- Snowdog_Components/components/Molecules/tab/_tab.scss | 1 - Snowdog_Components/components/Molecules/tab/tab.config.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Snowdog_Components/components/Molecules/tab/README.md b/Snowdog_Components/components/Molecules/tab/README.md index 9bbb75416..48cab627f 100644 --- a/Snowdog_Components/components/Molecules/tab/README.md +++ b/Snowdog_Components/components/Molecules/tab/README.md @@ -2,7 +2,9 @@ ## Accessibility in tabs Our components is accordion on mobile and tabs on wider screens, so we have to implement a11y feature to be used in both cases: -* use `role="widget"` on tab element +* use `role="tablist"` on the element that serves as the container for the set of tabs +* use `role="tab"` on tab element +* use `role="tabpanel"` on tab content * use `buttons` elements as a labels/headings of tabs * Buttons should have following aria attributes: * `aria-expanded` - set to `true` if tab is open, to `false` when it's closed @@ -12,7 +14,7 @@ Our components is accordion on mobile and tabs on wider screens, so we have to i * Tab content element should: * have an id to be bound to tab title * have `aria-hidden` attribute set to `true` if tab is closed and to `false` if it's open - * aria-labelledby with value of tab title id + * `aria-labelledby` with value of tab title id * Keyboard support: * accordions - on mobile, down & up arrow keys should move cursor between tab's titles, from first tab title up arrow should move a user to the last tab title, from last tab title down arrow should move user to first tab title. * tabs = on desktop - right & left arrow keys should move cursor between tab's titles, from first tab title left arrow should move a user to the last tab title, from last tab title right arrow should move user to first tab title. diff --git a/Snowdog_Components/components/Molecules/tab/_tab.scss b/Snowdog_Components/components/Molecules/tab/_tab.scss index c4566fd6c..b7abb06b2 100644 --- a/Snowdog_Components/components/Molecules/tab/_tab.scss +++ b/Snowdog_Components/components/Molecules/tab/_tab.scss @@ -75,7 +75,6 @@ } } - &__icon { display: $tab__icon-display; position: $tab__icon-position; diff --git a/Snowdog_Components/components/Molecules/tab/tab.config.js b/Snowdog_Components/components/Molecules/tab/tab.config.js index 2cda1b0cc..035ca321e 100644 --- a/Snowdog_Components/components/Molecules/tab/tab.config.js +++ b/Snowdog_Components/components/Molecules/tab/tab.config.js @@ -4,7 +4,7 @@ module.exports = { icon: { class: 'tab__icon', id: 'angle-down', - iconTitle: 'Angle Down' + hidden: true }, tabs: [ { From a0e4e010cbaeba947ea46a8c23a77b2e45cef6fa Mon Sep 17 00:00:00 2001 From: Jarek Date: Sun, 23 May 2021 15:21:21 +0200 Subject: [PATCH 3/8] #78814 - Use different id --- Magento_Msrp/templates/product/price/msrp.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Magento_Msrp/templates/product/price/msrp.phtml b/Magento_Msrp/templates/product/price/msrp.phtml index 0c835d21f..93ee27aa4 100644 --- a/Magento_Msrp/templates/product/price/msrp.phtml +++ b/Magento_Msrp/templates/product/price/msrp.phtml @@ -73,7 +73,7 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem } $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix(); - $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20); + $popupId = $block->getJsId(); $data = [ 'origin' => 'msrp', 'popupId' => '#' . $popupId, From 72b0ff8a4a9653b6d9e92e063e1b2938db852184 Mon Sep 17 00:00:00 2001 From: Jarek Date: Sun, 23 May 2021 18:55:39 +0200 Subject: [PATCH 4/8] #78814 - Add random id --- Magento_Msrp/templates/product/price/msrp.phtml | 4 ++-- Magento_Msrp/web/js/msrp-mixin.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Magento_Msrp/templates/product/price/msrp.phtml b/Magento_Msrp/templates/product/price/msrp.phtml index 93ee27aa4..5964d7e21 100644 --- a/Magento_Msrp/templates/product/price/msrp.phtml +++ b/Magento_Msrp/templates/product/price/msrp.phtml @@ -73,10 +73,10 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem } $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix(); - $popupId = $block->getJsId(); + $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20); $data = [ 'origin' => 'msrp', - 'popupId' => '#' . $popupId, + 'popupId' => $popupId, 'productName' => $block->escapeJs($block->escapeHtml($product->getName())), 'productId' => $productId, 'productIdInput' => 'input[type="hidden"][name="product"]', diff --git a/Magento_Msrp/web/js/msrp-mixin.js b/Magento_Msrp/web/js/msrp-mixin.js index 757a679d5..6510237a2 100644 --- a/Magento_Msrp/web/js/msrp-mixin.js +++ b/Magento_Msrp/web/js/msrp-mixin.js @@ -13,10 +13,14 @@ define(['jquery'], function ($) { initMsrpPopup: function () { var popupDOM = $(this.options.popUpAttr)[0], + popupButton = $('#' + this.options.popupId), $msrpPopup = $(popupDOM.innerHTML.trim()), + popupButtonId = this.options.popupId + Math.random().toString(16).slice(2), self = this; - $msrpPopup.find(this.options.productIdInput).val(this.options.productId); + popupButton.attr('id', popupButtonId) + + $msrpPopup.find(this.options.productIdInput).val(popupButtonId); $('body').append($msrpPopup); $msrpPopup.trigger('contentUpdated'); @@ -30,7 +34,7 @@ define(['jquery'], function ($) { .find(this.options.paypalCheckoutButons) .on('click', this.handleMsrpPaypalCheckout.bind(this)); - $(this.options.popupId).on('click', this.openPopup.bind(this)); + $('#' + popupButtonId).on('click', this.openPopup.bind(this)); this.$popup = $msrpPopup; From d03fd609714213d2691cec7dde199a14b87e1e57 Mon Sep 17 00:00:00 2001 From: Jarek Date: Sun, 23 May 2021 19:14:54 +0200 Subject: [PATCH 5/8] #78814 - Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68dfc77f0..750cff101 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file. ### Updated ### Removed +### Fixed +- duplicated ids for msrp price popup (#78814) + ## [Released] ## [2.19.3] - 2021-05-18 ### Fixed From 1437a5c088c3378ff88d71d8689d3170fdb1d13b Mon Sep 17 00:00:00 2001 From: Ania Date: Mon, 24 May 2021 10:09:21 +0200 Subject: [PATCH 6/8] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 750cff101..6f2ad4f67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ All notable changes to this project will be documented in this file. ## [2.19.3] - 2021-05-18 ### Fixed - fix product display with long names in minicart (#78748) +### Added +- margin top to quote button in cart (#78684) +### Updated +- tabs component accessibility ## [2.19.2] - 2021-05-18 ### Fixed From d04365f60ee53f7b01db3727787dc6e405ba52e5 Mon Sep 17 00:00:00 2001 From: Ania Date: Mon, 24 May 2021 10:11:48 +0200 Subject: [PATCH 7/8] update changelog --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2ad4f67..6b7ae8a6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,15 +9,15 @@ All notable changes to this project will be documented in this file. ### Fixed - duplicated ids for msrp price popup (#78814) +### Added +- margin top to quote button in cart (#78684) +### Updated +- tabs component accessibility ## [Released] ## [2.19.3] - 2021-05-18 ### Fixed - fix product display with long names in minicart (#78748) -### Added -- margin top to quote button in cart (#78684) -### Updated -- tabs component accessibility ## [2.19.2] - 2021-05-18 ### Fixed From 04d508ad8c3c19a95a91a24d909aadc67f689880 Mon Sep 17 00:00:00 2001 From: Ania Date: Mon, 24 May 2021 10:13:28 +0200 Subject: [PATCH 8/8] bump ver 2.20.0 --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b7ae8a6d..6230945cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,16 @@ All notable changes to this project will be documented in this file. ### Updated ### Removed + +## [Released] + +## [2.20.0] - 2021-05-24 ### Fixed - duplicated ids for msrp price popup (#78814) ### Added - margin top to quote button in cart (#78684) ### Updated - tabs component accessibility - -## [Released] ## [2.19.3] - 2021-05-18 ### Fixed - fix product display with long names in minicart (#78748)