Merge branch 'main' into harms3d

* main:
  Update 1 translation file (Shopify#3847)
  Fix cart performance measurement to exclude debounce delays (Shopify#3833)
  Update 1 translation file (Shopify#3841)
  Update main from the latest release branch (Shopify#3828)
  remove accessibility labels for hidden elements in the product page (Shopify#3826)
  Update translations: Shopify#3803 (Shopify#3817)
  Create stale.yml (Shopify#3816)
  Surface Nested Cart Lines (Shopify#3803)
  add an aria label for product quantity (Shopify#3809)
  Update 2 translation files (Shopify#3814)
  Update translations: buyer (Shopify#3812)
  Update translations: merchant (Shopify#3811)
  Improve unit price display with the `unit_price_with_measurement_filter` (Shopify#3805)
  Update translations: merchant (Shopify#3793)

Author: schoenwaldnils

.github/workflows/stale.yml

@@ -0,0 +1,27 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '38 16 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue has been marked as stale due to inactivity for 60 days. Please comment or update if this is still relevant, otherwise it will be closed in 7 days.'
+        stale-pr-message: 'This pull request has been marked as stale due to inactivity for 60 days. If no further activity occurs, it will be closed in 7 days.'
+        stale-issue-label: 'inactive'
+        stale-pr-label: 'inactive'

assets/cart.js

@@ -145,6 +145,9 @@ class CartItems extends HTMLElement {
   }
 
   updateQuantity(line, quantity, event, name, variantId) {
+    const eventTarget = event.currentTarget instanceof CartRemoveButton ? 'clear' : 'change';
+    const cartPerformanceUpdateMarker = CartPerformance.createStartingMarker(`${eventTarget}:user-action`);
+
     this.enableLoading(line);
 
     const body = JSON.stringify({
@@ -153,7 +156,6 @@ class CartItems extends HTMLElement {
       sections: this.getSectionsToRender().map((section) => section.section),
       sections_url: window.location.pathname,
     });
-    const eventTarget = event.currentTarget instanceof CartRemoveButton ? 'clear' : 'change';
 
     fetch(`${routes.cart_change_url}`, { ...fetchConfig(), ...{ body } })
       .then((response) => {
@@ -162,7 +164,7 @@ class CartItems extends HTMLElement {
       .then((state) => {
         const parsedState = JSON.parse(state);
 
-        CartPerformance.measure(`${eventTarget}:paint-updated-sections"`, () => {
+        CartPerformance.measure(`${eventTarget}:paint-updated-sections`, () => {
           const quantityElement =
             document.getElementById(`Quantity-${line}`) || document.getElementById(`Drawer-quantity-${line}`);
           const items = document.querySelectorAll('.cart-item');
@@ -182,7 +184,8 @@ class CartItems extends HTMLElement {
 
           this.getSectionsToRender().forEach((section) => {
             const elementToReplace =
-              document.getElementById(section.id).querySelector(section.selector) || document.getElementById(section.id);
+              document.getElementById(section.id).querySelector(section.selector) ||
+              document.getElementById(section.id);
             elementToReplace.innerHTML = this.getSectionInnerHTML(
               parsedState.sections[section.section],
               section.selector
@@ -212,8 +215,6 @@ class CartItems extends HTMLElement {
           }
         });
 
-        CartPerformance.measureFromEvent(`${eventTarget}:user-action`, event);
-
         publish(PUB_SUB_EVENTS.cartUpdate, { source: 'cart-items', cartData: parsedState, variantId: variantId });
       })
       .catch(() => {
@@ -223,6 +224,7 @@ class CartItems extends HTMLElement {
       })
       .finally(() => {
         this.disableLoading(line);
+        CartPerformance.measureFromMarker(`${eventTarget}:user-action`, cartPerformanceUpdateMarker);
       });
   }
 
@@ -284,8 +286,9 @@ if (!customElements.get('cart-note')) {
           'input',
           debounce((event) => {
             const body = JSON.stringify({ note: event.target.value });
-            fetch(`${routes.cart_update_url}`, { ...fetchConfig(), ...{ body } })
-              .then(() => CartPerformance.measureFromEvent('note-update:user-action', event));
+            fetch(`${routes.cart_update_url}`, { ...fetchConfig(), ...{ body } }).then(() =>
+              CartPerformance.measureFromEvent('note-update:user-action', event)
+            );
           }, ON_CHANGE_DEBOUNCE_TIMER)
         );
       }

assets/component-cart-drawer.css

@@ -218,6 +218,11 @@ cart-drawer-items {
   max-width: 100%;
 }
 
+.cart-drawer .cart-item__nested-line .cart-item__image {
+  max-width: 60%;
+  float: right;
+}
+
 .cart-drawer .cart-items thead {
   margin-bottom: 0.5rem;
 }
@@ -255,6 +260,10 @@ cart-drawer-items {
   padding-top: 1.7rem;
 }
 
+.cart-drawer .cart-items .cart-item__nested-line td:not(.cart-item__quantity) {
+  padding-top: 1rem;
+}
+
 .cart-drawer .cart-item > td + td {
   padding-left: 1rem;
 }

assets/component-cart-items.css

@@ -32,6 +32,14 @@ cart-items .title-wrapper-with-link {
   align-items: flex-start;
 }
 
+.cart-item__nested-line .cart-item__image-container {
+  min-width: calc(10rem / var(--font-body-scale));
+  justify-content: right;
+  img {
+    width: 60%;
+  }
+}
+
 .cart-item__image-container:after {
   content: none;
 }
@@ -237,6 +245,10 @@ cart-remove-button .icon-remove {
     margin-bottom: 3.5rem;
   }
 
+  .cart-item:has(+ .cart-item__nested-line) {
+    margin-bottom: 1.5rem;
+  }
+
   .cart-item:last-child {
     margin-bottom: 0;
   }
@@ -290,6 +302,10 @@ cart-remove-button .icon-remove {
     padding-top: 4rem;
   }
 
+  .cart-items .cart-item__nested-line td {
+    padding-top: 1rem;
+  }
+
   .cart-item {
     display: table-row;
   }

assets/component-price.css

@@ -96,6 +96,5 @@
   letter-spacing: 0.04rem;
   line-height: calc(1 + 0.2 / var(--font-body-scale));
   margin-top: 0.2rem;
-  text-transform: uppercase;
   color: rgba(var(--color-foreground), 0.7);
 }

assets/customer.css

@@ -644,7 +644,6 @@
   letter-spacing: 0.07rem;
   line-height: calc(1 + 0.2 / var(--font-body-scale));
   margin-top: 0.2rem;
-  text-transform: uppercase;
   color: rgba(var(--color-foreground), 0.7);
 }
 

assets/product-info.js

@@ -372,6 +372,19 @@ if (!customElements.get('product-info')) {
             }
           } else {
             current.innerHTML = updated.innerHTML;
+            if (selector === '.quantity__label') {
+              const updatedAriaLabelledBy = updated.getAttribute('aria-labelledby');
+              if (updatedAriaLabelledBy) {
+                current.setAttribute('aria-labelledby', updatedAriaLabelledBy);
+                // Update the referenced visually hidden element
+                const labelId = updatedAriaLabelledBy;
+                const currentHiddenLabel = document.getElementById(labelId);
+                const updatedHiddenLabel = html.getElementById(labelId);
+                if (currentHiddenLabel && updatedHiddenLabel) {
+                  currentHiddenLabel.textContent = updatedHiddenLabel.textContent;
+                }
+              }
+            }
           }
         }
       }

config/settings_schema.json

@@ -2,7 +2,7 @@
   {
     "name": "theme_info",
     "theme_name": "Dawn Harms3D",
-    "theme_version": "15.3.0",
+    "theme_version": "15.4.0",
     "theme_author": "Harms3D / Nils Schönwald",
     "theme_documentation_url": "https://github.com/schoenwaldnils/dawn",
     "theme_support_url": "https://github.com/schoenwaldnils/dawn"

locales/bg.json

@@ -129,7 +129,8 @@
         "in_cart_html": "<span class=\"quantity-cart\">{{ quantity }}</span> в количката",
         "note": "Преглед на правилата за количества",
         "min_of": "Мин. {{ quantity }}",
-        "max_of": "Макс. {{ quantity }}"
+        "max_of": "Макс. {{ quantity }}",
+        "in_cart_aria_label": "Количество ({{ quantity }} в количката)"
       },
       "price": {
         "from_price_html": "От {{ price }}",
@@ -163,6 +164,7 @@
         "load_video": "Пускане на видео {{ index }} във визуализатора на галерията",
         "image_available": "Изображение {{ index }} вече е налично във визуализатора на галерията"
       },
+      "nested_label": "{{ title }} за {{ parent_title }}",
       "view_full_details": "Покажи пълните подробности",
       "shipping_policy_html": "<a href=\"{{ link }}\">Доставката</a> се изчислява при плащане.",
       "choose_options": "Изберете опции",

locales/cs.json

@@ -138,7 +138,8 @@
         "in_cart_html": "<span class=\"quantity-cart\">{{ quantity }}</span> v košíku",
         "note": "Zobrazit pravidla množství",
         "min_of": "Minimum {{ quantity }}",
-        "max_of": "Maximum {{ quantity }}"
+        "max_of": "Maximum {{ quantity }}",
+        "in_cart_aria_label": "Množství ({{ quantity }} v košíku)"
       },
       "price": {
         "from_price_html": "Od {{ price }}",
@@ -165,6 +166,7 @@
         "load_video": "Přehrát video {{ index }} v zobrazení galerie",
         "image_available": "Obrázek {{ index }} je nyní k dispozici v zobrazení galerie"
       },
+      "nested_label": "{{ title }} pro {{ parent_title }}",
       "view_full_details": "Zobrazit veškeré podrobnosti",
       "shipping_policy_html": "<a href=\"{{ link }}\">Poštovné</a> se vypočítá na pokladně.",
       "choose_options": "Výběr možností",