Merge branch 'develop' into patch-1

magento · Sep 14, 2022 · 289bf5f · 289bf5f
2 parents 9909b05 + b9ba68a
commit 289bf5f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 19 deletions.
diff --git a/dev.dockerfile b/dev.dockerfile
@@ -36,7 +36,7 @@ WORKDIR /usr/src/app
 # node:alpine comes with a configured user and group
 RUN chown -R node:node /usr/src/app
 # copy build from previous stage
-COPY --from=build /usr/src/app .
+COPY --chown=node:node --from=build /usr/src/app .
 USER node
 # command to run application
 CMD [ "yarn", "workspace", "@magento/venia-concept", "run", "watch"]
diff --git a/packages/venia-ui/lib/components/Gallery/item.js b/packages/venia-ui/lib/components/Gallery/item.js
@@ -14,7 +14,7 @@ import GalleryItemShimmer from './item.shimmer';
 import defaultClasses from './item.module.css';
 import WishlistGalleryButton from '../Wishlist/AddToListButton';
 
-import AddToCartbutton from '../Gallery/addToCartButton';
+import AddToCartButton from './addToCartButton';
 // eslint-disable-next-line no-unused-vars
 import Rating from '../Rating';
 
@@ -58,7 +58,7 @@ const GalleryItem = props => {
     ) : null;
 
     const addButton = isSupportedProductType ? (
-        <AddToCartbutton item={item} urlSuffix={productUrlSuffix} />
+        <AddToCartButton item={item} urlSuffix={productUrlSuffix} />
     ) : (
         <div className={classes.unavailableContainer}>
             <Info />

diff --git a/packages/venia-ui/lib/components/LegacyMiniCart/kebab.js b/packages/venia-ui/lib/components/LegacyMiniCart/kebab.js
@@ -24,7 +24,7 @@ const Kebab = props => {
             >
                 <Icon src={MoreVerticalIcon} />
             </button>
-            <ul aria-hidden="true" className={toggleClass}>
+            <ul aria-hidden={isOpen ? 'false' : 'true'} className={toggleClass}>
                 {children}
             </ul>
         </div>

diff --git a/packages/venia-ui/lib/components/LegacyMiniCart/kebab.module.css b/packages/venia-ui/lib/components/LegacyMiniCart/kebab.module.css
@@ -34,5 +34,4 @@
 .kebab {
     composes: bg-white from global;
     composes: border-0 from global;
-    composes: outline-none from global;
 }
diff --git a/packages/venia-ui/lib/components/SearchPage/__tests__/__snapshots__/searchPage.spec.js.snap b/packages/venia-ui/lib/components/SearchPage/__tests__/__snapshots__/searchPage.spec.js.snap
@@ -21,7 +21,6 @@ exports[`Search Page Component error view does not render when data is present 1
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -136,7 +135,6 @@ exports[`Search Page Component filter button/modal does not render if there are
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -215,7 +213,6 @@ exports[`Search Page Component filter button/modal renders when there are filter
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -494,7 +491,6 @@ exports[`Search Page Component search results heading renders a generic message
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -604,7 +600,6 @@ exports[`Search Page Component search results heading renders a specific message
           }
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -776,7 +771,6 @@ exports[`Search Page Component sort button/container does not render if total co
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -832,7 +826,6 @@ exports[`Search Page Component sort button/container renders when total count >
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -935,7 +928,6 @@ exports[`Search Page Component total count renders 0 items if data.products.tota
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >
@@ -991,7 +983,6 @@ exports[`Search Page Component total count renders results from data 1`] = `
           id="searchPage.searchTermEmpty"
         />
         <span
-          aria-busy="true"
           aria-live="polite"
           className="totalPages"
         >

diff --git a/packages/venia-ui/lib/components/SearchPage/searchPage.js b/packages/venia-ui/lib/components/SearchPage/searchPage.js
@@ -173,11 +173,7 @@ const SearchPage = props => {
 
     const itemCountHeading =
         data && !loading ? (
-            <span
-                aria-live="polite"
-                aria-busy="true"
-                className={classes.totalPages}
-            >
+            <span aria-live="polite" className={classes.totalPages}>
                 {formatMessage(
                     {
                         id: 'searchPage.totalPages',