@depict-ai/ui 4.3.1 → 4.3.3

package/server/ES10/index.js

@@ -1,8 +1,8 @@
-import { add_to_version_info as $b8hua$add_to_version_info, fetch_retry as $b8hua$fetch_retry, base_url as $b8hua$base_url, slider_fractional_factory as $b8hua$slider_fractional_factory, dlog as $b8hua$dlog, camelCasifyObject as $b8hua$camelCasifyObject, make_random_classname as $b8hua$make_random_classname, n_col_styling_with_dist as $b8hua$n_col_styling_with_dist, catchify as $b8hua$catchify, layout_get_visible_recs_without_partial_rows as $b8hua$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $b8hua$layout_get_total_rec_amount_for_row, layout_media_query_header as $b8hua$layout_media_query_header, report as $b8hua$report, slider_fading_factory as $b8hua$slider_fading_factory, Amazing_Slider as $b8hua$Amazing_Slider, slider_snap_css as $b8hua$slider_snap_css, observer as $b8hua$observer, javascript_media_query as $b8hua$javascript_media_query, queueMacroTask as $b8hua$queueMacroTask, findMostFrequentItem as $b8hua$findMostFrequentItem, dwarn as $b8hua$dwarn, deparallelize_no_drop as $b8hua$deparallelize_no_drop, ContainedImage as $b8hua$ContainedImage, standard_price_format as $b8hua$standard_price_format, make_asyncIterable_exiter as $b8hua$make_asyncIterable_exiter, href_change_ipns as $b8hua$href_change_ipns, base64_encode_unicode as $b8hua$base64_encode_unicode, base64_decode_unicode as $b8hua$base64_decode_unicode, use_href_accessor as $b8hua$use_href_accessor, get_session_id as $b8hua$get_session_id, add_version_query_params as $b8hua$add_version_query_params, instant_exec_on_suspect_history_change as $b8hua$instant_exec_on_suspect_history_change, useExpandingContainer as $b8hua$useExpandingContainer, hex_to_rgb as $b8hua$hex_to_rgb, relative_luminance_from_rgb as $b8hua$relative_luminance_from_rgb, snakeCasifyObject as $b8hua$snakeCasifyObject, make_url_with_query_params as $b8hua$make_url_with_query_params, sort_obj as $b8hua$sort_obj, ListenableSet as $b8hua$ListenableSet1, insert_surfaces as $b8hua$insert_surfaces } from "@depict-ai/utilishared/ES10";
-import { ssr as $b8hua$ssr, ssrHydrationKey as $b8hua$ssrHydrationKey, ssrStyle as $b8hua$ssrStyle, escape as $b8hua$escape, createComponent as $b8hua$createComponent, mergeProps as $b8hua$mergeProps, isServer as $b8hua$isServer, ssrElement as $b8hua$ssrElement, ssrClassList as $b8hua$ssrClassList, insert as $b8hua$insert, ssrAttribute as $b8hua$ssrAttribute, spread as $b8hua$spread, Dynamic as $b8hua$Dynamic } from "solid-js/web";
-import { createSignal as $b8hua$createSignal, createMemo as $b8hua$createMemo, createResource as $b8hua$createResource, Show as $b8hua$Show, Suspense as $b8hua$Suspense, untrack as $b8hua$untrack, createRenderEffect as $b8hua$createRenderEffect, Index as $b8hua$Index, createRoot as $b8hua$createRoot, onCleanup as $b8hua$onCleanup, For as $b8hua$For, getOwner as $b8hua$getOwner, runWithOwner as $b8hua$runWithOwner, createEffect as $b8hua$createEffect, createContext as $b8hua$createContext, useContext as $b8hua$useContext, createUniqueId as $b8hua$createUniqueId, createComputed as $b8hua$createComputed, ErrorBoundary as $b8hua$ErrorBoundary, splitProps as $b8hua$splitProps, mergeProps as $b8hua$mergeProps1, on as $b8hua$on, batch as $b8hua$batch, createSelector as $b8hua$createSelector, children as $b8hua$children, createReaction as $b8hua$createReaction, mapArray as $b8hua$mapArray } from "solid-js";
-import { ListenableSet as $b8hua$ListenableSet, catchify as $b8hua$catchify1, use_href_accessor as $b8hua$use_href_accessor1, report as $b8hua$report1 } from "@depict-ai/utilishared/ES10";
+import { add_to_version_info as $b8hua$add_to_version_info, fetch_retry as $b8hua$fetch_retry, base_url as $b8hua$base_url, dwarn as $b8hua$dwarn, slider_fractional_factory as $b8hua$slider_fractional_factory, dlog as $b8hua$dlog, camelCasifyObject as $b8hua$camelCasifyObject, make_random_classname as $b8hua$make_random_classname, n_col_styling_with_dist as $b8hua$n_col_styling_with_dist, catchify as $b8hua$catchify, layout_get_visible_recs_without_partial_rows as $b8hua$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $b8hua$layout_get_total_rec_amount_for_row, layout_media_query_header as $b8hua$layout_media_query_header, report as $b8hua$report, slider_fading_factory as $b8hua$slider_fading_factory, Amazing_Slider as $b8hua$Amazing_Slider, slider_snap_css as $b8hua$slider_snap_css, observer as $b8hua$observer, javascript_media_query as $b8hua$javascript_media_query, queueMacroTask as $b8hua$queueMacroTask, findMostFrequentItem as $b8hua$findMostFrequentItem, standard_price_format as $b8hua$standard_price_format, instant_exec_on_suspect_history_change as $b8hua$instant_exec_on_suspect_history_change, deparallelize_no_drop as $b8hua$deparallelize_no_drop, ContainedImage as $b8hua$ContainedImage, make_asyncIterable_exiter as $b8hua$make_asyncIterable_exiter, href_change_ipns as $b8hua$href_change_ipns, base64_encode_unicode as $b8hua$base64_encode_unicode, base64_decode_unicode as $b8hua$base64_decode_unicode, use_href_accessor as $b8hua$use_href_accessor, get_session_id as $b8hua$get_session_id, add_version_query_params as $b8hua$add_version_query_params, useExpandingContainer as $b8hua$useExpandingContainer, hex_to_rgb as $b8hua$hex_to_rgb, relative_luminance_from_rgb as $b8hua$relative_luminance_from_rgb, snakeCasifyObject as $b8hua$snakeCasifyObject, make_url_with_query_params as $b8hua$make_url_with_query_params, sort_obj as $b8hua$sort_obj, ListenableSet as $b8hua$ListenableSet1, insert_surfaces as $b8hua$insert_surfaces } from "@depict-ai/utilishared/ES10";
+import { ssr as $b8hua$ssr, ssrHydrationKey as $b8hua$ssrHydrationKey, ssrStyle as $b8hua$ssrStyle, escape as $b8hua$escape, createComponent as $b8hua$createComponent, mergeProps as $b8hua$mergeProps1, isServer as $b8hua$isServer, ssrElement as $b8hua$ssrElement, ssrClassList as $b8hua$ssrClassList, insert as $b8hua$insert, ssrAttribute as $b8hua$ssrAttribute, spread as $b8hua$spread, Dynamic as $b8hua$Dynamic } from "solid-js/web";
+import { createSignal as $b8hua$createSignal, createMemo as $b8hua$createMemo, createResource as $b8hua$createResource, createEffect as $b8hua$createEffect, mergeProps as $b8hua$mergeProps, Show as $b8hua$Show, Suspense as $b8hua$Suspense, untrack as $b8hua$untrack, createRenderEffect as $b8hua$createRenderEffect, Index as $b8hua$Index, createRoot as $b8hua$createRoot, onCleanup as $b8hua$onCleanup, For as $b8hua$For, getOwner as $b8hua$getOwner, runWithOwner as $b8hua$runWithOwner, createContext as $b8hua$createContext, useContext as $b8hua$useContext, createUniqueId as $b8hua$createUniqueId, createComputed as $b8hua$createComputed, ErrorBoundary as $b8hua$ErrorBoundary, splitProps as $b8hua$splitProps, on as $b8hua$on, batch as $b8hua$batch, createSelector as $b8hua$createSelector, children as $b8hua$children, createReaction as $b8hua$createReaction, mapArray as $b8hua$mapArray } from "solid-js";
 import $b8hua$babelruntimehelpersdefineProperty from "@babel/runtime/helpers/defineProperty";
+import { ListenableSet as $b8hua$ListenableSet, catchify as $b8hua$catchify1, use_href_accessor as $b8hua$use_href_accessor1, report as $b8hua$report1 } from "@depict-ai/utilishared/ES10";
 import $b8hua$babelruntimehelpersclassPrivateFieldSet from "@babel/runtime/helpers/classPrivateFieldSet";
 import $b8hua$babelruntimehelpersclassPrivateFieldGet from "@babel/runtime/helpers/classPrivateFieldGet";
 import { createStore as $b8hua$createStore, reconcile as $b8hua$reconcile } from "solid-js/store";
@@ -10,7 +10,7 @@ import { createStore as $b8hua$createStore, reconcile as $b8hua$reconcile } from
 /*! Depict.ai search and product listing SDK */
 import { register_es_version } from "../../multi_import_deduplicator.mjs";
 register_es_version("ui", "ES10");
-const $8db9a15135765c11$export$83d89fbfd8236492 = "4.3.1";
+const $8db9a15135765c11$export$83d89fbfd8236492 = "4.3.3";
 const $a9c7ba6087881ac2$var$transform_elements = sorted_cols_at_size => {
   const cols_at_size = [];
   for (let i = 0; i < sorted_cols_at_size.length; i++) {
@@ -436,7 +436,7 @@ var $63f1f8dbcd07d3b0$var$_tmpl$ = ["<div", ' class="', '">', "</div>"],
   $63f1f8dbcd07d3b0$var$_tmpl$2 = ["<style", ' type="text/css">', "</style>"];
 function $63f1f8dbcd07d3b0$export$d21e32dfedac04be(props) {
   const container_class = "x" + $b8hua$createUniqueId();
-  const container_element_ = $b8hua$ssrElement("div", $b8hua$mergeProps(() => props.element_attributes, {
+  const container_element_ = $b8hua$ssrElement("div", $b8hua$mergeProps1(() => props.element_attributes, {
     classList: {
       [container_class]: true
     }
@@ -640,7 +640,7 @@ function $39ddb986053fb759$export$d41d19e89346fa2(_ref) {
       } = slider;
       const Layout = props => $63f1f8dbcd07d3b0$export$445d8d3f5f706a40(props, insert_here, true);
       // Do like this, so we don't have to call mergeProps ourselves
-      $b8hua$createComponent(Layout, $b8hua$mergeProps({
+      $b8hua$createComponent(Layout, $b8hua$mergeProps1({
         rows: "all",
         layout: "slider"
       }, layout_options_));
@@ -919,7 +919,7 @@ function $56047603f9d212b6$export$6e5611bc7e57e477(props) {
   });
   // Work around https://github.com/solidjs/solid/issues/1828
   const img = new Image(); // Need to use new Image or browser might not start loading image before it's in the DOM
-  const [, otherAttributes] = $b8hua$splitProps(props, ["resolutions", "size", "src", "srcSet", "loading", "customUrls" // Can't have properties ending on underscore because the property name mangling will get confused by this <-
+  const [, otherAttributes] = $b8hua$splitProps(props, ["resolutions", "size", "src", "srcSet", "loading", "keyRatioUpdating", "customUrls" // Can't have properties ending on underscore because the property name mangling will get confused by this <-
   ]);
 
   const [hasSetSize, setHasSetSize] = $b8hua$createSignal(false);
@@ -935,7 +935,7 @@ function $56047603f9d212b6$export$6e5611bc7e57e477(props) {
     if (loading === "force-lazy") return true;
     return loading === "lazy" && !isPrioritisedImage();
   });
-  const modifiedOtherAttributes = $b8hua$mergeProps1(otherAttributes, {
+  const modifiedOtherAttributes = $b8hua$mergeProps(otherAttributes, {
     get loading() {
       return shouldActuallyEnableLazyLoading() ? "lazy" : undefined;
     }
@@ -975,13 +975,18 @@ function $56047603f9d212b6$export$6e5611bc7e57e477(props) {
   let hasDecodedFastPath = false;
   let timeoutSet = false;
   let gotCleanedUp = false;
+  let srcJustChanged = true;
   img.classList.add("s-responsive-image");
   if (listingContext) {
     let prevValue;
     const aspectRatios = listingContext[$56047603f9d212b6$export$f8945274f08a3105] || (listingContext[$56047603f9d212b6$export$f8945274f08a3105] = new Set());
     const [, setMostPrevalentAspectRatio] = listingContext[$56047603f9d212b6$export$6066eb417ed2e9f7] || (listingContext[$56047603f9d212b6$export$6066eb417ed2e9f7] = $b8hua$createSignal());
     img.addEventListener("load", $b8hua$catchify(() => {
-      // Save our aspect ratio whenever it changes, so that we can base the containers on the most dominant aspect ratio, used in SearchModalV2
+      if (props.keyRatioUpdating) {
+        if (!srcJustChanged) return;
+        srcJustChanged = false;
+      }
+      // Save our aspect ratio whenever it changes, so that we can base the containers on the most dominant aspect ratio, used in SearchModalV2 and LookItem
       const aspectRatio_ = img.naturalWidth / img.naturalHeight;
       if (prevValue) aspectRatios.delete(prevValue);
       const newValue = !isNaN(aspectRatio_) ? {
@@ -1002,7 +1007,11 @@ function $56047603f9d212b6$export$6e5611bc7e57e477(props) {
     $b8hua$onCleanup(() => prevValue && aspectRatios.delete(prevValue));
   }
   $b8hua$onCleanup(() => gotCleanedUp = true);
-  $b8hua$spread(img, $b8hua$mergeProps1(modifiedOtherAttributes), false, true);
+  $b8hua$spread(img, $b8hua$mergeProps(modifiedOtherAttributes), false, true);
+  $b8hua$createRenderEffect(() => {
+    props.src;
+    srcJustChanged = true;
+  });
   $b8hua$createEffect(() => {
     if (!props.size()) return; // wait until we have a size, run every time the size changes
     if (timeoutSet) return;
@@ -1070,48 +1079,22 @@ function $4df489344a0f97c7$export$e4b984597b71e989(props) {
     context[$4df489344a0f97c7$export$d7b7ab832c20e2f4] = $b8hua$createSignal();
   const [currentImageSize, setCurrentImageSize] = (context === null || context === void 0 ? void 0 : context[$4df489344a0f97c7$export$d7b7ab832c20e2f4]) || $4df489344a0f97c7$var$backupSizeSignal; // use global fallback signal (might lead to blurry images) if no context is available
   const [mostPrevalentAspectRatio] = context ? context[(0, $56047603f9d212b6$export$6066eb417ed2e9f7)] || (context[(0, $56047603f9d212b6$export$6066eb417ed2e9f7)] = $b8hua$createSignal()) : [];
-  const [aspectRatio, setAspectRatio] = $b8hua$createSignal($b8hua$untrack(() => props.aspectRatio));
   const container = $801e8845d3fa3653$export$94026ee33dbabc26({
     // Write getters manually instead of using JSX, so we can do more complex logic in the aspectRatio getter without increasing bundle size
     get class() {
       return props.class;
     },
     get aspectRatio() {
-      return aspectRatio();
+      if (props.autoAdjustAspectRatio) {
+        const targetRatio = mostPrevalentAspectRatio === null || mostPrevalentAspectRatio === void 0 ? void 0 : mostPrevalentAspectRatio();
+        if (targetRatio != undefined) return "var(".concat((0, $5eaa00b951637e96$export$8a2234b5b1a5ebd4), ", ").concat(targetRatio, ")");
+      }
+      return props.aspectRatio;
     }
   });
   const owner = $b8hua$getOwner();
   let createdSizeAccessor = false;
   let wasCleanedUp = false;
-  let timeout;
-  $b8hua$createEffect(() => {
-    const {
-      autoAdjustAspectRatio: autoAdjustAspectRatio
-    } = props;
-    if (autoAdjustAspectRatio) {
-      const targetRatio = mostPrevalentAspectRatio === null || mostPrevalentAspectRatio === void 0 ? void 0 : mostPrevalentAspectRatio();
-      if (targetRatio != undefined) {
-        const targetValue = "var(".concat((0, $5eaa00b951637e96$export$8a2234b5b1a5ebd4), ", ").concat(targetRatio, ")");
-        const updateAspectRatio = $b8hua$catchify(() => setAspectRatio(targetValue));
-        if (autoAdjustAspectRatio === "smoothed") {
-          if (!timeout)
-            // If we don't have a timeout yet, also update instantly. This is so that the aspect ratio does get set at the start of a transition, if it changes (when using smoothing).
-            updateAspectRatio();
-          clearTimeout(timeout);
-          timeout = setTimeout(() => {
-            timeout = undefined;
-            updateAspectRatio();
-          }, 500);
-          return;
-        }
-        return updateAspectRatio();
-      }
-    } else {
-      clearTimeout(timeout);
-      timeout = undefined;
-    }
-    setAspectRatio(props.aspectRatio);
-  });
   $b8hua$createEffect(() => {
     if (currentImageSize() || wasCleanedUp) return; // We get into the effect when onCleanup is called if we don't have wasCleanedUp
     // ensure we always have a size accessor
@@ -1125,7 +1108,7 @@ function $4df489344a0f97c7$export$e4b984597b71e989(props) {
     $b8hua$queueMacroTask(() => setCurrentImageSize()); // unset the size accessor next event loop iteration, so that all onCleanup's have time to run, since the effects run more aggressively and can create a size accessor with a cleaned up owner otherwise
   });
 
-  $b8hua$insert(container, $b8hua$createComponent((0, $56047603f9d212b6$export$6e5611bc7e57e477), $b8hua$mergeProps({
+  $b8hua$insert(container, $b8hua$createComponent((0, $56047603f9d212b6$export$6e5611bc7e57e477), $b8hua$mergeProps1({
     get size() {
       return $b8hua$createMemo(() => {
         var _currentImageSize;
@@ -1144,7 +1127,7 @@ function $4df489344a0f97c7$export$e4b984597b71e989(props) {
   return container;
 }
 function $98688279b9059f50$export$9d4a4b669b1929ab(props) {
-  return $b8hua$createComponent((0, $4df489344a0f97c7$export$e4b984597b71e989), $b8hua$mergeProps(props, {
+  return $b8hua$createComponent((0, $4df489344a0f97c7$export$e4b984597b71e989), $b8hua$mergeProps1(props, {
     get imgProps() {
       return {
         ...props.imgProps,
@@ -1161,6 +1144,12 @@ function $98688279b9059f50$export$9d4a4b669b1929ab(props) {
     }
   }));
 }
+function $60ec7a29849d81db$export$a71e92cfbb498adc(props) {
+  return $b8hua$createMemo(() => {
+    const price_formatting = props.price_formatting_;
+    return $b8hua$standard_price_format(props.price_, price_formatting.places_after_comma_, price_formatting.decimal_places_delimiter_, price_formatting.thousands_delimiter_);
+  });
+}
 var $0c5b1686f971e5e7$var$_tmpl$ = ["<div", ' class="img-wrapper">', "</div>"],
   $0c5b1686f971e5e7$var$_tmpl$2 = ["<span", ' class="d-price original">', "</span>"],
   $0c5b1686f971e5e7$var$_tmpl$3 = ["<div", ' class="right-part"><div class="text-container"><span class="d-title line-clamp">', '</span><span class="', '">', "</span><!--$-->", "<!--/--></div><!--$-->", "<!--/--></div>"];
@@ -1168,10 +1157,12 @@ function $0c5b1686f971e5e7$export$b73ed90f0ee50dc3(_ref) {
   let {
     display_: display_,
     FavoriteButton_: FavoriteButton_,
-    isExpanded_: isExpanded_,
+    userWantsExpandedSignal_: [userWantsExpanded, setUserWantsExpanded],
     textFadeInAnimationRunning_: textFadeInAnimationRunning_,
     outerRef_: outerRef_,
-    animationDuration_: animationDuration_
+    animationDuration_: animationDuration_,
+    priceFormatting_: priceFormatting_,
+    pseudoRouter_: pseudoRouter_
   } = _ref;
   const variantToUse = $b8hua$createMemo(() => {
     const display = display_();
@@ -1182,7 +1173,7 @@ function $0c5b1686f971e5e7$export$b73ed90f0ee50dc3(_ref) {
     return (_variantToUse = variantToUse()) === null || _variantToUse === void 0 ? void 0 : (_variantToUse$image_u = _variantToUse.image_urls) === null || _variantToUse$image_u === void 0 ? void 0 : _variantToUse$image_u[0];
   });
   const [animationIsRunning, setAnimationIsRunning] = textFadeInAnimationRunning_;
-  const [isExpandedThrottledByOurEffectRun, setIsExpandedThrottledByOurEffectRun] = $b8hua$createSignal($b8hua$untrack(isExpanded_));
+  const [isExpandedThrottledByOurEffectRun, setIsExpandedThrottledByOurEffectRun] = $b8hua$createSignal($b8hua$untrack(userWantsExpanded));
   const [animationEffectExists, setAnimationEffectExists] = $b8hua$createSignal(false);
   const [salePrice] = $b8hua$createResource(() => {
     var _variantToUse2;
@@ -1192,16 +1183,18 @@ function $0c5b1686f971e5e7$export$b73ed90f0ee50dc3(_ref) {
     var _variantToUse3;
     return (_variantToUse3 = variantToUse()) === null || _variantToUse3 === void 0 ? void 0 : _variantToUse3.original_price;
   });
-  const isOnSale = $b8hua$createMemo(() => salePrice.latest !== originalPrice.latest); // .latest doesn't trigger suspense
+  const isOnSale = $b8hua$createMemo(() => !salePrice.loading && !originalPrice.loading && salePrice.latest !== originalPrice.latest); // .latest doesn't trigger suspense after the initial load
+  const enableLink = $b8hua$createMemo(() => userWantsExpanded() && !animationIsRunning());
+  const href = $b8hua$createMemo(() => {
+    var _variantToUse4;
+    return (_variantToUse4 = variantToUse()) === null || _variantToUse4 === void 0 ? void 0 : _variantToUse4.page_url;
+  });
   const FavoriteButton = FavoriteButton_; // Just to get rid of the type error - TS doesn't understand <Show>
-  return $b8hua$ssrElement("a", $b8hua$mergeProps({
+  return $b8hua$ssrElement("a", $b8hua$mergeProps1({
     "class": "look-item"
-  }, () => {
-    var _variantToUse4;
-    return isExpanded_() && !animationIsRunning() ? {
-      href: (_variantToUse4 = variantToUse()) === null || _variantToUse4 === void 0 ? void 0 : _variantToUse4.page_url
-    } : {};
-  }), () => ["<!--$-->", $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
+  }, () => enableLink() ? {
+    href: href()
+  } : {}), () => ["<!--$-->", $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
     when: imageUrl,
     get fallback() {
       return $b8hua$createComponent((0, $3ab4aa97880fb88d$export$3f37af283f8fb843), {
@@ -1224,10 +1217,13 @@ function $0c5b1686f971e5e7$export$b73ed90f0ee50dc3(_ref) {
               return imageUrl();
             },
             get aspectRatio() {
-              return isExpanded_() ? 0.75 : 1;
+              return userWantsExpanded() ? 0.75 : 1;
             },
             get autoAdjustAspectRatio() {
-              return isExpanded_() ? "smoothed" : false;
+              return userWantsExpanded();
+            },
+            imgProps: {
+              keyRatioUpdating: true
             }
           });
         }
@@ -1235,25 +1231,73 @@ function $0c5b1686f971e5e7$export$b73ed90f0ee50dc3(_ref) {
     }
   })), "<!--/-->", "<!--$-->", $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
     get when() {
-      return (animationEffectExists() ? isExpandedThrottledByOurEffectRun() : isExpanded_()) || animationIsRunning();
+      return (animationEffectExists() ? isExpandedThrottledByOurEffectRun() : userWantsExpanded()) || animationIsRunning();
     },
     get children() {
       var _$escape2, _variantToUse5;
       return $b8hua$ssr($0c5b1686f971e5e7$var$_tmpl$3, $b8hua$ssrHydrationKey(), (_$escape2 = $b8hua$escape((_variantToUse5 = variantToUse()) === null || _variantToUse5 === void 0 ? void 0 : _variantToUse5.title)) !== null && _$escape2 !== void 0 ? _$escape2 : $b8hua$escape($b8hua$createComponent((0, $ceafb6fb91c6f394$export$89c6019e4baa40b1), {
         height: "1em",
         width: "20ch"
-      })), "d-price ".concat(isOnSale() ? "sale" : ""), !variantToUse() || salePrice.loading ? $b8hua$escape($b8hua$createComponent((0, $ceafb6fb91c6f394$export$89c6019e4baa40b1), {
-        height: "1em",
-        width: "20ch"
-      })) : $b8hua$escape(salePrice()), $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
+      })), "d-price ".concat(isOnSale() ? "sale" : ""), $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
         get when() {
-          return isOnSale();
+          return variantToUse() && !salePrice.loading;
         },
-        get children() {
-          return $b8hua$ssr($0c5b1686f971e5e7$var$_tmpl$2, $b8hua$ssrHydrationKey(), !variantToUse() || originalPrice.loading ? $b8hua$escape($b8hua$createComponent((0, $ceafb6fb91c6f394$export$89c6019e4baa40b1), {
+        get fallback() {
+          return $b8hua$createComponent((0, $ceafb6fb91c6f394$export$89c6019e4baa40b1), {
             height: "1em",
             width: "20ch"
-          })) : $b8hua$escape(originalPrice()));
+          });
+        },
+        get children() {
+          return $b8hua$createComponent((0, $b8hua$Show), {
+            get when() {
+              return salePrice.latest;
+            },
+            get children() {
+              return [priceFormatting_().pre_, $b8hua$createComponent((0, $60ec7a29849d81db$export$a71e92cfbb498adc), {
+                get price_() {
+                  return salePrice();
+                },
+                get price_formatting_() {
+                  return priceFormatting_();
+                }
+              }), priceFormatting_().post_];
+            }
+          });
+        }
+      })), $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
+        get when() {
+          return isOnSale();
+        },
+        get children() {
+          return $b8hua$ssr($0c5b1686f971e5e7$var$_tmpl$2, $b8hua$ssrHydrationKey(), $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
+            get when() {
+              return variantToUse() && !originalPrice.loading;
+            },
+            get fallback() {
+              return $b8hua$createComponent((0, $ceafb6fb91c6f394$export$89c6019e4baa40b1), {
+                height: "1em",
+                width: "20ch"
+              });
+            },
+            get children() {
+              return $b8hua$createComponent((0, $b8hua$Show), {
+                get when() {
+                  return salePrice.latest;
+                },
+                get children() {
+                  return [priceFormatting_().pre_, $b8hua$createComponent((0, $60ec7a29849d81db$export$a71e92cfbb498adc), {
+                    get price_() {
+                      return originalPrice();
+                    },
+                    get price_formatting_() {
+                      return priceFormatting_();
+                    }
+                  }), priceFormatting_().post_];
+                }
+              });
+            }
+          })));
         }
       })), $b8hua$escape($b8hua$createComponent((0, $b8hua$Show), {
         when: FavoriteButton_,
@@ -1321,10 +1365,12 @@ function $4089a7972a508539$export$ebf0b1d4f90c09ae(_ref) {
   let {
     displays_: displays_,
     FavoriteButton_: FavoriteButton_,
-    userWantsExpandedSignal_: [userWantsExpanded, setUserWantsExpanded],
+    userWantsExpandedSignal_: userWantsExpandedSignal_,
     containerWidth_: containerWidth_,
     animationDuration_: animationDuration_,
-    supportsHover_: supportsHover_
+    supportsHover_: supportsHover_,
+    priceFormatting_: priceFormatting_,
+    pseudoRouter_: pseudoRouter_
   } = _ref;
   let isAffectedByChromeBug = false;
   // If the user requests the drawer to be expanded or not
@@ -1333,6 +1379,7 @@ function $4089a7972a508539$export$ebf0b1d4f90c09ae(_ref) {
   // The following three signals just contain the state if the animations are actually running and should only be set by the respective animation code
   const textFadeInAnimationRunning = $b8hua$createSignal(false);
   const [getSecondPartAnimationRunning] = textFadeInAnimationRunning;
+  const [userWantsExpanded, setUserWantsExpanded] = userWantsExpandedSignal_;
   $72017ebd8b9df947$export$7b9a0e99f0aeb2f3().then(is => isAffectedByChromeBug = is);
   return $b8hua$createComponent((0, $5441862cd2f5e111$export$e68cff63f76bd15b), {
     get children() {
@@ -1341,7 +1388,7 @@ function $4089a7972a508539$export$ebf0b1d4f90c09ae(_ref) {
           return containerWidth_() || !displays_;
         },
         get children() {
-          return $b8hua$ssr($4089a7972a508539$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$ssrElement("div", $b8hua$mergeProps({
+          return $b8hua$ssr($4089a7972a508539$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$ssrElement("div", $b8hua$mergeProps1({
             get ["class"]() {
               return "look-overlay ".concat(userWantsExpanded() ? "expanded" : "", " ").concat(!getSecondPartAnimationRunning() && userWantsExpanded() ? "resting-fully-expanded" : "");
             }
@@ -1355,11 +1402,13 @@ function $4089a7972a508539$export$ebf0b1d4f90c09ae(_ref) {
             },
             children: (display, index) => {
               return $b8hua$createComponent((0, $0c5b1686f971e5e7$export$b73ed90f0ee50dc3), {
+                pseudoRouter_: pseudoRouter_,
                 animationDuration_: animationDuration_,
                 display_: display,
                 FavoriteButton_: FavoriteButton_,
-                isExpanded_: userWantsExpanded,
+                userWantsExpandedSignal_: userWantsExpandedSignal_,
                 textFadeInAnimationRunning_: textFadeInAnimationRunning,
+                priceFormatting_: priceFormatting_,
                 outerRef_: el => $b8hua$createEffect(() => {
                   if (index !== 0) return;
                   const resizeObserver = new ResizeObserver($b8hua$catchify(records => setLookItemHeight(records.at(-1).contentRect.height)));
@@ -1401,10 +1450,10 @@ function $697d8713dc82b9ab$export$44809a8a3e867e30(_ref) {
     expandedLooksSignal_: [expandedLooks_, setExpandedLooks],
     FavoriteButton_: FavoriteButton_,
     placeholderImageAspectRatio_: placeholderImageAspectRatio_,
-    animationDuration_: animationDuration_
+    animationDuration_: animationDuration_,
+    priceFormatting_: priceFormatting_,
+    pseudoRouter_: pseudoRouter_
   } = _ref;
-  // TODO: shopify, run displayTransformers to get dynamic prices
-  // TODO: format prices
   const [coverImage] = (display_ === null || display_ === void 0 ? void 0 : display_.image_urls) || [];
   const useWantsExpandedSignal_ = $b8hua$createSignal(false);
   const [userWantsExpanded, setUserWantsExpanded] = useWantsExpandedSignal_;
@@ -1437,7 +1486,7 @@ function $697d8713dc82b9ab$export$44809a8a3e867e30(_ref) {
     when: display_,
     get fallback() {
       return $b8hua$createComponent((0, $3ab4aa97880fb88d$export$3f37af283f8fb843), {
-        aspectRatio: placeholderImageAspectRatio_
+        aspectRatio: "var(".concat((0, $5eaa00b951637e96$export$8a2234b5b1a5ebd4), ", ").concat(placeholderImageAspectRatio_, ")")
       });
     },
     get children() {
@@ -1455,10 +1504,136 @@ function $697d8713dc82b9ab$export$44809a8a3e867e30(_ref) {
     containerWidth_: containerWidth_,
     animationDuration_: animationDuration_,
     supportsHover_: supportsHover_,
-    FavoriteButton_: FavoriteButton_
+    FavoriteButton_: FavoriteButton_,
+    priceFormatting_: priceFormatting_,
+    pseudoRouter_: pseudoRouter_
   })]);
   return container;
 }
+
+/**
+ * This function is used to determine if the user is trying to open a link in a new tab or window, and we therefore should not single page navigate
+ * @param clickEvent The click event that triggered the navigation
+ */
+function $9b35d1384e31813a$export$29d28dadc2d6b631(clickEvent) {
+  return (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.button) || (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.metaKey) || (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.ctrlKey) || (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.shiftKey // if true, shift button on windows, linux or macOS which opens in a new window
+  );
+}
+
+function $ac571292d606f30b$var$_classPrivateMethodInitSpec(obj, privateSet) {
+  $ac571292d606f30b$var$_checkPrivateRedeclaration(obj, privateSet);
+  privateSet.add(obj);
+}
+function $ac571292d606f30b$var$_checkPrivateRedeclaration(obj, privateCollection) {
+  if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
+}
+function $ac571292d606f30b$var$_classPrivateMethodGet(receiver, privateSet, fn) {
+  if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
+  return fn;
+}
+var $ac571292d606f30b$var$_throwing_on_navigation = /*#__PURE__*/new WeakSet();
+var $ac571292d606f30b$var$_get_navigation_happened_promise = /*#__PURE__*/new WeakSet();
+class $ac571292d606f30b$export$7e1297a3a19f10d8 {
+  /**
+  * Function that will be called when we want to navigate, or a string saying it's not an SPA. You can change this OTG
+  */ /**
+     * We store listing_id in history.state and do operate on this both here and in js-ui, this is the key to be used which js-ui provides
+     */ /**
+        * Vue has async router that needs to be awaited (it navigates after a microtask)
+        * This standardises waiting for all kinds of routers
+        */
+  constructor(on_navigation, listing_query_state_key) {
+    $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_get_navigation_happened_promise);
+    $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_throwing_on_navigation);
+    $b8hua$babelruntimehelpersdefineProperty(this, "on_navigation_", void 0);
+    $b8hua$babelruntimehelpersdefineProperty(this, "listing_query_state_key", void 0);
+    $b8hua$babelruntimehelpersdefineProperty(this, "navigate_", {
+      /**
+      * Call this if you *just* want to replace the state object in history.state
+      */
+      replace_state_: new_state => {
+        var _globalThis$history;
+        // This doesn't break any router, so we just do this directly for now, since many don't expose an interface for changing the state
+        globalThis === null || globalThis === void 0 || (_globalThis$history = globalThis.history) === null || _globalThis$history === void 0 || _globalThis$history.replaceState(new_state, "");
+      },
+      /**
+      * Call this to change the URL
+      * @param new_url_ new URL to go to
+      * @param event_ event if you have this in a click handler, will not do anything on cmd/ctrl or non-left click then
+      * @param force_spa_navigation_ if you want to force SPA navigation even if on_navigation_ is set to "hard_navigation". You should only set this to true for inter-SDK-page navigations
+      * @param is_replace_ if you want to replace the current URL in history instead of pushing a new one
+      * @param listing_id_ If you are navigating to a category and know the listing_id of, please provide it. This is for making a better devEx in js-ui
+      */
+      go_to_: $b8hua$catchify(async _ref => {
+        let {
+          new_url_: raw_new_url,
+          event_: event_,
+          force_spa_navigation_: force_spa_navigation_,
+          is_replace_: is_replace_,
+          listing_query_: listing_query_,
+          scroll = true
+        } = _ref;
+        const new_url_ = raw_new_url instanceof URL ? raw_new_url : new URL(raw_new_url, location.origin);
+        const wants_hard_navigation = this.on_navigation_ === "hard_navigation";
+        if ($9b35d1384e31813a$export$29d28dadc2d6b631(event_)) return;
+        const different_origin = new_url_.origin !== location.origin;
+        if (wants_hard_navigation && (!force_spa_navigation_ || different_origin)) {
+          if (force_spa_navigation_ && different_origin)
+            // If we call history.pushState on a different origin, it will throw an error, so fallback to hard navigations
+            $b8hua$dwarn("Can't single page navigate to", new_url_.href, "due to different origin, this MIGHT mean you should fix the URLs");
+          if (!event_)
+            // If we haven't gotten an event, nothing will happen by not calling prevent default, so we need to change the URL
+            location.assign(new_url_);
+          return;
+        }
+        event_ === null || event_ === void 0 || event_.preventDefault();
+        const promise = $ac571292d606f30b$var$_classPrivateMethodGet(this, $ac571292d606f30b$var$_get_navigation_happened_promise, $ac571292d606f30b$var$_get_navigation_happened_promise2).call(this, true);
+        if (force_spa_navigation_ && wants_hard_navigation) {
+          // Don't allow hard navigation if we're forcing SPA navigation, which we do for things where PageReplacer can be used for performance
+          const new_state = history.state;
+          if (listing_query_) {
+            // In JS-UI we need to know the listing_id of the current category, therefore push it into state
+            if (!this.listing_query_state_key) $b8hua$report(new Error("listing_query_state_key is not set"), "error");
+            new_state[this.listing_query_state_key] = listing_query_;
+          }
+          history[is_replace_ ? "replaceState" : "pushState"](new_state, "", new_url_);
+        } else $ac571292d606f30b$var$_classPrivateMethodGet(this, $ac571292d606f30b$var$_throwing_on_navigation, $ac571292d606f30b$var$_throwing_on_navigation2).call(this, {
+          is_replace: is_replace_,
+          new_url: new_url_ instanceof URL ? new_url_ : new URL(new_url_, location.origin),
+          scroll: scroll
+        });
+        await promise;
+      })
+    });
+    this.listing_query_state_key = listing_query_state_key;
+    this.on_navigation_ = on_navigation;
+  }
+}
+function $ac571292d606f30b$var$_throwing_on_navigation2() {
+  const {
+    on_navigation_: on_navigation_
+  } = this;
+  if (typeof on_navigation_ !== "function") throw new Error("on_navigation_ is not a function");
+  // make sure that we don't accidentally catchify if the SDK consumer has fucked up
+  try {
+    return on_navigation_(...arguments);
+  } catch (e) {
+    queueMicrotask(() => {
+      throw e;
+    });
+  }
+}
+function $ac571292d606f30b$var$_get_navigation_happened_promise2(is_replace) {
+  return new Promise(resolve => {
+    const handler = what_happened => {
+      if (what_happened === (is_replace ? "replaceState" : "pushState")) {
+        resolve();
+        (0, $b8hua$instant_exec_on_suspect_history_change).delete(handler);
+      }
+    };
+    (0, $b8hua$instant_exec_on_suspect_history_change).add(handler);
+  });
+}
 var $cee56a95f722f55f$var$_tmpl$ = ["<div", ' class="depict recommendations looks" style="', '">', "</div>"];
 let $cee56a95f722f55f$var$expandedLooksSignal_;
 function $cee56a95f722f55f$export$1935e6bdfc5ed8ce(props) {
@@ -1467,6 +1642,7 @@ function $cee56a95f722f55f$export$1935e6bdfc5ed8ce(props) {
       equals: false
     }));
     const expandingAnimationDuration = 240;
+    const pseudoRouter = new (0, $ac571292d606f30b$export$7e1297a3a19f10d8)("hard_navigation");
     const grid_spacing_override = $b8hua$createMemo(() => {
       const {
         gridSpacing_: gridSpacing_
@@ -1494,19 +1670,35 @@ function $cee56a95f722f55f$export$1935e6bdfc5ed8ce(props) {
       });
       const decoded = await (response === null || response === void 0 ? void 0 : (_json = (_ref2 = response).json) === null || _json === void 0 ? void 0 : _json.call(_ref2).catch(() => false));
       if (!decoded)
-        // If network fails, make sure to return empty array adn SolidRecommendationSlider will remove its elements
+        // If network fails, make sure to return empty array and SolidRecommendationSlider will remove its elements
         return [];
-      return decoded.listings;
+      const {
+        listings: listings
+      } = decoded;
+      const baseData = {
+        merchant: merchant,
+        market: market,
+        locale: locale
+      };
+      return $cee56a95f722f55f$var$runDisplayTransformersForLooks(baseData, listings, props.displayTransformers_);
+    });
+    $b8hua$createEffect(() => {
+      const {
+        onNavigation_: onNavigation_
+      } = props;
+      if (onNavigation_) pseudoRouter.on_navigation_ = onNavigation_;
     });
     return $b8hua$ssr($cee56a95f722f55f$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$ssrStyle("--animation-duration: ".concat(expandingAnimationDuration, "ms")), $b8hua$escape($b8hua$createComponent((0, $5441862cd2f5e111$export$e68cff63f76bd15b), {
       get children() {
         return $39ddb986053fb759$export$d41d19e89346fa2({
-          product_card_template_: (display, info) => $697d8713dc82b9ab$export$44809a8a3e867e30({
+          product_card_template_: display => $697d8713dc82b9ab$export$44809a8a3e867e30({
             display_: display,
             FavoriteButton_: props.FavoriteButton_,
             placeholderImageAspectRatio_: props.imagePlaceholderAspectRatio_,
             animationDuration_: expandingAnimationDuration,
-            expandedLooksSignal_: $cee56a95f722f55f$var$expandedLooksSignal_
+            expandedLooksSignal_: $cee56a95f722f55f$var$expandedLooksSignal_,
+            priceFormatting_: () => props.priceFormatting_,
+            pseudoRouter_: pseudoRouter
           }),
           recommendations_resource_: looksResource,
           title_: () => props.title_,
@@ -1519,6 +1711,58 @@ function $cee56a95f722f55f$export$1935e6bdfc5ed8ce(props) {
     })));
   }, "LookSlider failed");
 }
+async function $cee56a95f722f55f$var$runDisplayTransformersForLooks(baseData, listings, displayTransformers) {
+  try {
+    const {
+      products: productTransformer,
+      categories: providedListingTransformer
+    } = displayTransformers || {};
+    if (!productTransformer && !providedListingTransformer) return listings;
+    const listingTransformer = providedListingTransformer || (_ref3 => {
+      let {
+        data: data
+      } = _ref3;
+      return data;
+    });
+    const displaysToTransform = [];
+    const displayIdsPerListingId = {};
+    const transformedListingsPromise = listingTransformer({
+      ...baseData,
+      data: listings.map(_ref4 => {
+        let {
+          displays: displays,
+          ...listing
+        } = _ref4;
+        // Populate our displays by id and displayIdToListings object in the .map where we add ancestors to the listings, for peak efficiency
+        for (let i = 0; i < displays.length; i++) {
+          var _listing$listing_id;
+          const display = displays[i];
+          const uniqueIdOfDisplay = $6a4c7ed6d005505c$export$548d053aba053d79(display);
+          displaysToTransform.push(display);
+          (displayIdsPerListingId[_listing$listing_id = listing.listing_id] || (displayIdsPerListingId[_listing$listing_id] = [])).push(uniqueIdOfDisplay);
+        }
+        return {
+          ...listing,
+          ancestors: []
+        };
+      })
+    });
+    // This allows the person providing the displayTransformer to re-order and remove displays
+    const transformedProducts = productTransformer ? await productTransformer({
+      ...baseData,
+      displays: displaysToTransform
+    }) : displaysToTransform;
+    const transformedListings = await transformedListingsPromise;
+    const transformedDisplayById = Object.fromEntries(transformedProducts.map(display => [$6a4c7ed6d005505c$export$548d053aba053d79(display), display]));
+    return transformedListings.map(listing => $b8hua$mergeProps(listing, {
+      // use mergeProps because in preview browser we add getters in this object, that would be called too early otherwise
+      displays: (displayIdsPerListingId[listing.listing_id] || []).map(displayId => transformedDisplayById[displayId]).filter(v => v)
+    }));
+  } catch (e) {
+    $b8hua$dwarn("Displaytransformers threw", e);
+    return [];
+  }
+}
 const $68e6625c8d51f847$export$3064e1e8c6513da3 = new Set();
 let $68e6625c8d51f847$var$has_ran = false;
 function $68e6625c8d51f847$export$5162a71f252e6122() {
@@ -1560,15 +1804,6 @@ function $68e6625c8d51f847$var$starts_with_any_prefix(key) {
   }
 }
 
-/**
- * This function is used to determine if the user is trying to open a link in a new tab or window, and we therefore should not single page navigate
- * @param clickEvent The click event that triggered the navigation
- */
-function $9b35d1384e31813a$export$29d28dadc2d6b631(clickEvent) {
-  return (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.button) || (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.metaKey) || (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.ctrlKey) || (clickEvent === null || clickEvent === void 0 ? void 0 : clickEvent.shiftKey // if true, shift button on windows, linux or macOS which opens in a new window
-  );
-}
-
 /**
  * Symbol used to identify the version of a SearchModal function. Values right now: 1 = 1st gen classic modal, 2 = second gen modal
  */
@@ -1609,12 +1844,6 @@ function $01c33966d9ddb108$export$f50b88e2a00918b5(fn) {
     }
   };
 }
-function $60ec7a29849d81db$export$a71e92cfbb498adc(props) {
-  return $b8hua$createMemo(() => {
-    const price_formatting = props.price_formatting_;
-    return $b8hua$standard_price_format(props.price_, price_formatting.places_after_comma_, price_formatting.decimal_places_delimiter_, price_formatting.thousands_delimiter_);
-  });
-}
 function $d0883254246d3eb6$export$fb40a80c530e5f2b(selectedIndex, groupIndex, indexInGroup) {
   const isSelected = $b8hua$createMemo(() => {
     const selectedValue = selectedIndex();
@@ -1944,7 +2173,7 @@ function $6d95ef50ee01d5a1$export$5d2caaa6b530761c() {
 var $9783d437ad61594c$var$_tmpl$ = '<path d="M11.669 10.531l9.156-9.156a.78.78 0 0 0 .237-.569c0-.221-.079-.412-.237-.569A.8.8 0 0 0 20.24 0a.77.77 0 0 0-.569.237l-9.14 9.14-9.14-9.14A.79.79 0 0 0 .807 0a.77.77 0 0 0-.569.237A.78.78 0 0 0 0 .807a.77.77 0 0 0 .237.569l9.156 9.156-9.156 9.14c-.159.157-.237.349-.237.569s.079.412.237.569c.085.085.174.148.268.19a1.095 1.095 0 0 0 .316.048.894.894 0 0 0 .285-.048.84.84 0 0 0 .285-.19l9.139-9.14 9.14 9.14a.894.894 0 0 0 .268.19 1.049 1.049 0 0 0 .301.048.941.941 0 0 0 .301-.048.84.84 0 0 0 .285-.19.78.78 0 0 0 .237-.569c0-.221-.079-.412-.237-.569z"></path>';
 function $9783d437ad61594c$export$3b621d86b1566b2() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps({
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1({
     xmlns: "http://www.w3.org/2000/svg",
     width: "21.064",
     height: "21.064",
@@ -2050,7 +2279,7 @@ function $02b6641aa50ce528$export$ba17c5b7e6dda39f(_ref) {
 var $ef0f18a578b32578$var$_tmpl$ = '<path d="M19.811 20.174l-6.234-6.809a7.96 7.96 0 0 0 .923-1.179c.274-.424.502-.865.687-1.323a8.04 8.04 0 0 0 .42-1.436 7.88 7.88 0 0 0 .144-1.507c0-.526-.051-1.042-.154-1.548-.096-.506-.243-.995-.441-1.466s-.441-.919-.728-1.343a8.28 8.28 0 0 0-.984-1.21 7.86 7.86 0 0 0-1.2-.984A7.56 7.56 0 0 0 10.89.651C10.418.453 9.929.302 9.423.2S8.401.046 7.875.046 6.833.097 6.327.2 5.332.453 4.86.651a7.56 7.56 0 0 0-1.354.718c-.431.287-.831.615-1.2.984a8.28 8.28 0 0 0-.984 1.21 7.73 7.73 0 0 0-.728 1.343c-.198.472-.349.96-.451 1.466A8.31 8.31 0 0 0 0 7.921a8.31 8.31 0 0 0 .144 1.548c.103.506.253.995.451 1.466a8.08 8.08 0 0 0 .728 1.354 7.86 7.86 0 0 0 .984 1.2 7.54 7.54 0 0 0 1.2.995c.431.287.882.53 1.354.728.472.191.96.338 1.466.441a8.31 8.31 0 0 0 1.548.144c.451 0 .896-.038 1.333-.113a7.83 7.83 0 0 0 1.282-.328 7.55 7.55 0 0 0 1.2-.533 8.08 8.08 0 0 0 1.107-.749l6.245 6.809a.45.45 0 0 0 .174.123.55.55 0 0 0 .205.041.61.61 0 0 0 .195-.031c.061-.021.116-.055.164-.102.109-.096.164-.219.164-.369.007-.144-.038-.267-.133-.369zM1.046 7.921c0-.937.178-1.818.533-2.646.362-.834.851-1.559 1.466-2.174.622-.615 1.347-1.101 2.174-1.456.827-.362 1.712-.543 2.656-.543s1.829.181 2.656.543c.827.355 1.548.841 2.164 1.456.622.615 1.111 1.34 1.466 2.174a6.52 6.52 0 0 1 .543 2.646c0 .943-.181 1.829-.543 2.656a6.89 6.89 0 0 1-1.466 2.174c-.615.615-1.336 1.104-2.164 1.466-.827.356-1.712.533-2.656.533s-1.829-.178-2.656-.533c-.827-.362-1.552-.851-2.174-1.466-.615-.622-1.104-1.347-1.466-2.174-.355-.827-.533-1.712-.533-2.656z"></path>';
 function $ef0f18a578b32578$export$82eafebb825fc23f() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps({
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1({
     xmlns: "http://www.w3.org/2000/svg",
     width: "20",
     height: "22",
@@ -2060,7 +2289,7 @@ function $ef0f18a578b32578$export$82eafebb825fc23f() {
 var $3c5e15c6ee4227a9$var$_tmpl$ = '<path d="M56 26.455a13.71 13.71 0 0 0-9.578 3.967A13.71 13.71 0 0 0 42.455 40v176a13.71 13.71 0 0 0 3.967 9.578A13.71 13.71 0 0 0 56 229.545h144A13.71 13.71 0 0 0 213.545 216V88a2.456 2.456 0 0 1 0-.002c.001-1.452-.597-2.895-1.623-3.922l-55.998-55.998a5.61 5.61 0 0 0-3.922-1.623 2.456 2.456 0 0 1-.002 0zm0 11.09h88A2.456 2.456 0 0 1 146.455 40v48c0 2.903 2.642 5.545 5.545 5.545h48A2.456 2.456 0 0 1 202.455 96v120a2.456 2.456 0 0 1-2.455 2.455H56A2.456 2.456 0 0 1 53.545 216V40A2.456 2.456 0 0 1 56 37.545zm103.061 11.498a2.456 2.456 0 0 1 2.676.531l28.689 28.689a2.456 2.456 0 0 1-1.736 4.191H160A2.456 2.456 0 0 1 157.545 80V51.311a2.456 2.456 0 0 1 1.516-2.268zM96 130.455c-2.903 0-5.545 2.642-5.545 5.545s2.642 5.545 5.545 5.545h64c2.903 0 5.545-2.642 5.545-5.545s-2.642-5.545-5.545-5.545zm0 32c-2.903 0-5.545 2.642-5.545 5.545s2.642 5.545 5.545 5.545h64c2.903 0 5.545-2.642 5.545-5.545s-2.642-5.545-5.545-5.545z"></path>';
 function $3c5e15c6ee4227a9$export$605674723bcc715c() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps({
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1({
     xmlns: "http://www.w3.org/2000/svg",
     width: "32",
     height: "32",
@@ -2648,7 +2877,7 @@ function $584c06c09cf4609d$export$b94867ecbd698f21(_ref) {
     get children() {
       return $b8hua$ssr($584c06c09cf4609d$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$ssrAttribute("aria-label", $b8hua$escape(i18n_.back_(), true), false), $b8hua$escape($b8hua$createComponent(BackIcon_, {})));
     }
-  })), "query ".concat(!!on_back_ ? "has-adjacent-back-button" : ""), $b8hua$ssrAttribute("aria-label", $b8hua$escape(i18n_.search_field_field_aria_label_(), true), false) + $b8hua$ssrAttribute("value", $b8hua$escape(search_field_value_[0](), true), false) + $b8hua$ssrAttribute("placeholder", $b8hua$escape(i18n_.placeholder_text_(), true), false), $b8hua$ssrAttribute("title", $b8hua$escape(i18n_.clear_filters_query_sorting_after_submit_(), true), false), $b8hua$ssrStyle($b8hua$createMemo(() => search_field_value_[0]() ? "" : "display: none")()), $b8hua$escape($b8hua$createComponent((0, $9783d437ad61594c$export$3b621d86b1566b2), {})), $b8hua$ssrElement("button", $b8hua$mergeProps({
+  })), "query ".concat(!!on_back_ ? "has-adjacent-back-button" : ""), $b8hua$ssrAttribute("aria-label", $b8hua$escape(i18n_.search_field_field_aria_label_(), true), false) + $b8hua$ssrAttribute("value", $b8hua$escape(search_field_value_[0](), true), false) + $b8hua$ssrAttribute("placeholder", $b8hua$escape(i18n_.placeholder_text_(), true), false), $b8hua$ssrAttribute("title", $b8hua$escape(i18n_.clear_filters_query_sorting_after_submit_(), true), false), $b8hua$ssrStyle($b8hua$createMemo(() => search_field_value_[0]() ? "" : "display: none")()), $b8hua$escape($b8hua$createComponent((0, $9783d437ad61594c$export$3b621d86b1566b2), {})), $b8hua$ssrElement("button", $b8hua$mergeProps1({
     "class": "submit major",
     type: "button"
   }, () => isNewModal ? {
@@ -3186,7 +3415,7 @@ function $26db6925469636a4$export$67152d26d4f56ee8(_ref) {
     var _listing_;
     return (_listing_ = listing_()) === null || _listing_ === void 0 ? void 0 : _listing_.page_url;
   }); // <- could be made reactive getter created in displayTransformers, read it in memo here since it might create computations (for example in the preview-brower), and there's no owner in the onClick handler
-  const LinkToListing = props => $b8hua$ssrElement("a", $b8hua$mergeProps(props, {
+  const LinkToListing = props => $b8hua$ssrElement("a", $b8hua$mergeProps1(props, {
     get href() {
       return href();
     }
@@ -3497,7 +3726,7 @@ function $4acc866f8fdfc002$export$af1fb307bbba2417(_ref) {
   $b8hua$createComputed($b8hua$on(search_field_value_[0], () => !suggestions_updating_blocked() && set_selected_index(undefined), {
     defer: true
   })); // reset autocomplete position if query changes
-  return [$b8hua$createComponent((0, $5175a47d13b7c228$export$d4994a86c6235f72), $b8hua$mergeProps(sharedSuggestionProps, {
+  return [$b8hua$createComponent((0, $5175a47d13b7c228$export$d4994a86c6235f72), $b8hua$mergeProps1(sharedSuggestionProps, {
     get title_() {
       return i18n_.popular_;
     },
@@ -3507,7 +3736,7 @@ function $4acc866f8fdfc002$export$af1fb307bbba2417(_ref) {
       return itemIndexes_.suggestionsIndex_;
     },
     showPlaceholders_: () => showPlaceholders() || noResults_() && !noResultsPopularSuggestions.latest
-  })), $b8hua$createComponent((0, $5175a47d13b7c228$export$d4994a86c6235f72), $b8hua$mergeProps(sharedSuggestionProps, {
+  })), $b8hua$createComponent((0, $5175a47d13b7c228$export$d4994a86c6235f72), $b8hua$mergeProps1(sharedSuggestionProps, {
     get title_() {
       return i18n_.previous_;
     },
@@ -3518,7 +3747,7 @@ function $4acc866f8fdfc002$export$af1fb307bbba2417(_ref) {
     },
     extraTitleRowElements_: () => $b8hua$ssr($4acc866f8fdfc002$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$escape(i18n_.clear_all_from_filter_crumbs_())),
     showPlaceholders_: () => false
-  })), $b8hua$createComponent((0, $5175a47d13b7c228$export$d4994a86c6235f72), $b8hua$mergeProps(sharedSuggestionProps, {
+  })), $b8hua$createComponent((0, $5175a47d13b7c228$export$d4994a86c6235f72), $b8hua$mergeProps1(sharedSuggestionProps, {
     get title_() {
       return i18n_.content_;
     },
@@ -3931,7 +4160,7 @@ function $6a439680ae7e9ba3$export$b2539bed5023c21c(props) {
   return $b8hua$createComponent($6a439680ae7e9ba3$var$TabsContext.Provider, {
     value: new (0, $b8hua$ListenableSet)(),
     get children() {
-      return $b8hua$createComponent($6a439680ae7e9ba3$var$ActualTabs, $b8hua$mergeProps(props, {
+      return $b8hua$createComponent($6a439680ae7e9ba3$var$ActualTabs, $b8hua$mergeProps1(props, {
         get children() {
           return props.children;
         }
@@ -3961,7 +4190,7 @@ function $6a439680ae7e9ba3$var$ActualTabs(props) {
     },
     children: item => {
       const weSelected = $b8hua$createMemo(() => isSelected(item().id));
-      return $b8hua$createComponent((0, $b8hua$Dynamic), $b8hua$mergeProps({
+      return $b8hua$createComponent((0, $b8hua$Dynamic), $b8hua$mergeProps1({
         get component() {
           return props.AnchorComponent;
         },
@@ -4044,7 +4273,7 @@ function $6a439680ae7e9ba3$export$3e41faf802a29e71(props) {
   if (!currentTabs) throw new Error("Tab must be a child of Tabs");
   const id = $b8hua$createUniqueId();
   const ourSet = currentTabs;
-  const extendedProps = $b8hua$mergeProps1({
+  const extendedProps = $b8hua$mergeProps({
     id: id
   }, props);
   ourSet.add(extendedProps);
@@ -4164,120 +4393,6 @@ function $972f6bce0f9d61be$var$history_state_change(signals, entries, state) {
     }
   });
 }
-function $ac571292d606f30b$var$_classPrivateMethodInitSpec(obj, privateSet) {
-  $ac571292d606f30b$var$_checkPrivateRedeclaration(obj, privateSet);
-  privateSet.add(obj);
-}
-function $ac571292d606f30b$var$_checkPrivateRedeclaration(obj, privateCollection) {
-  if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
-}
-function $ac571292d606f30b$var$_classPrivateMethodGet(receiver, privateSet, fn) {
-  if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
-  return fn;
-}
-var $ac571292d606f30b$var$_throwing_on_navigation = /*#__PURE__*/new WeakSet();
-var $ac571292d606f30b$var$_get_navigation_happened_promise = /*#__PURE__*/new WeakSet();
-class $ac571292d606f30b$export$7e1297a3a19f10d8 {
-  /**
-  * Function that will be called when we want to navigate, or a string saying it's not an SPA. You can change this OTG
-  */ /**
-     * We store listing_id in history.state and do operate on this both here and in js-ui, this is the key to be used which js-ui provides
-     */ /**
-        * Vue has async router that needs to be awaited (it navigates after a microtask)
-        * This standardises waiting for all kinds of routers
-        */
-  constructor(on_navigation, listing_query_state_key) {
-    $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_get_navigation_happened_promise);
-    $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_throwing_on_navigation);
-    $b8hua$babelruntimehelpersdefineProperty(this, "on_navigation_", void 0);
-    $b8hua$babelruntimehelpersdefineProperty(this, "listing_query_state_key", void 0);
-    $b8hua$babelruntimehelpersdefineProperty(this, "navigate_", {
-      /**
-      * Call this if you *just* want to replace the state object in history.state
-      */
-      replace_state_: new_state => {
-        var _globalThis$history;
-        // This doesn't break any router, so we just do this directly for now, since many don't expose an interface for changing the state
-        globalThis === null || globalThis === void 0 || (_globalThis$history = globalThis.history) === null || _globalThis$history === void 0 || _globalThis$history.replaceState(new_state, "");
-      },
-      /**
-      * Call this to change the URL
-      * @param new_url_ new URL to go to
-      * @param event_ event if you have this in a click handler, will not do anything on cmd/ctrl or non-left click then
-      * @param force_spa_navigation_ if you want to force SPA navigation even if on_navigation_ is set to "hard_navigation". You should only set this to true for inter-SDK-page navigations
-      * @param is_replace_ if you want to replace the current URL in history instead of pushing a new one
-      * @param listing_id_ If you are navigating to a category and know the listing_id of, please provide it. This is for making a better devEx in js-ui
-      */
-      go_to_: $b8hua$catchify(async _ref => {
-        let {
-          new_url_: raw_new_url,
-          event_: event_,
-          force_spa_navigation_: force_spa_navigation_,
-          is_replace_: is_replace_,
-          listing_query_: listing_query_,
-          scroll = true
-        } = _ref;
-        const new_url_ = raw_new_url instanceof URL ? raw_new_url : new URL(raw_new_url, location.origin);
-        const wants_hard_navigation = this.on_navigation_ === "hard_navigation";
-        if ($9b35d1384e31813a$export$29d28dadc2d6b631(event_)) return;
-        const different_origin = new_url_.origin !== location.origin;
-        if (wants_hard_navigation && (!force_spa_navigation_ || different_origin)) {
-          if (force_spa_navigation_ && different_origin)
-            // If we call history.pushState on a different origin, it will throw an error, so fallback to hard navigations
-            $b8hua$dwarn("Can't single page navigate to", new_url_.href, "due to different origin, this MIGHT mean you should fix the URLs");
-          if (!event_)
-            // If we haven't gotten an event, nothing will happen by not calling prevent default, so we need to change the URL
-            location.assign(new_url_);
-          return;
-        }
-        event_ === null || event_ === void 0 || event_.preventDefault();
-        const promise = $ac571292d606f30b$var$_classPrivateMethodGet(this, $ac571292d606f30b$var$_get_navigation_happened_promise, $ac571292d606f30b$var$_get_navigation_happened_promise2).call(this, true);
-        if (force_spa_navigation_ && wants_hard_navigation) {
-          // Don't allow hard navigation if we're forcing SPA navigation, which we do for things where PageReplacer can be used for performance
-          const new_state = history.state;
-          if (listing_query_) {
-            // In JS-UI we need to know the listing_id of the current category, therefore push it into state
-            if (!this.listing_query_state_key) $b8hua$report(new Error("listing_query_state_key is not set"), "error");
-            new_state[this.listing_query_state_key] = listing_query_;
-          }
-          history[is_replace_ ? "replaceState" : "pushState"](new_state, "", new_url_);
-        } else $ac571292d606f30b$var$_classPrivateMethodGet(this, $ac571292d606f30b$var$_throwing_on_navigation, $ac571292d606f30b$var$_throwing_on_navigation2).call(this, {
-          is_replace: is_replace_,
-          new_url: new_url_ instanceof URL ? new_url_ : new URL(new_url_, location.origin),
-          scroll: scroll
-        });
-        await promise;
-      })
-    });
-    this.listing_query_state_key = listing_query_state_key;
-    this.on_navigation_ = on_navigation;
-  }
-}
-function $ac571292d606f30b$var$_throwing_on_navigation2() {
-  const {
-    on_navigation_: on_navigation_
-  } = this;
-  if (typeof on_navigation_ !== "function") throw new Error("on_navigation_ is not a function");
-  // make sure that we don't accidentally catchify if the SDK consumer has fucked up
-  try {
-    return on_navigation_(...arguments);
-  } catch (e) {
-    queueMicrotask(() => {
-      throw e;
-    });
-  }
-}
-function $ac571292d606f30b$var$_get_navigation_happened_promise2(is_replace) {
-  return new Promise(resolve => {
-    const handler = what_happened => {
-      if (what_happened === (is_replace ? "replaceState" : "pushState")) {
-        resolve();
-        (0, $b8hua$instant_exec_on_suspect_history_change).delete(handler);
-      }
-    };
-    (0, $b8hua$instant_exec_on_suspect_history_change).add(handler);
-  });
-}
 var $b652875d5a5139ec$var$_tmpl$ = ["<div", ' class="image-container">', "</div>"];
 function $b652875d5a5139ec$export$41e1a079d40a0d58(props) {
   const [display] = $b8hua$createResource(() => ({
@@ -4377,7 +4492,7 @@ function $e3efeb558d952696$export$7da560f849543dff(_ref) {
     get children() {
       return $b8hua$ssr($e3efeb558d952696$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$escape(title()));
     }
-  }), $b8hua$ssr($e3efeb558d952696$var$_tmpl$2, $b8hua$ssrHydrationKey(), $b8hua$escape($ca55612a53dbbdd2$export$a2cc176055f8f08()), $b8hua$escape($b8hua$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $b8hua$mergeProps({
+  }), $b8hua$ssr($e3efeb558d952696$var$_tmpl$2, $b8hua$ssrHydrationKey(), $b8hua$escape($ca55612a53dbbdd2$export$a2cc176055f8f08()), $b8hua$escape($b8hua$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $b8hua$mergeProps1({
     get rows() {
       return rows_object_();
     },
@@ -4673,7 +4788,7 @@ function $6b0fd8fd20df8ccf$var$ActualShopTheLookButton(props) {
   }, true);
   $b8hua$createEffect(() => button.style.display = displayStyleValue()); // Set our attributes like this, so we allow total control over the button from the outside via buttonAttributes
   $b8hua$createEffect(() => !hasAnythingToShow() && closeModal()); // close modal if we ever get into the state of having it open and not having anything to show
-  $6b0fd8fd20df8ccf$var$modalProps = $b8hua$mergeProps1(partForModal, {
+  $6b0fd8fd20df8ccf$var$modalProps = $b8hua$mergeProps(partForModal, {
     products_to_shop_: products_to_shop_
   });
   button.addEventListener("click", openModal);
@@ -5109,7 +5224,7 @@ const $19e828709c7723a0$export$48513f6b9f8ce62d = props => {
 };
 var $ff3225aef892a467$var$_tmpl$ = '<path d="M10.173 5.548H5.5V.875c0-.075-.027-.14-.081-.193S5.301.601 5.226.601s-.14.027-.193.081-.081.118-.081.193v4.673H.274c-.075 0-.14.027-.193.081A.27.27 0 0 0 0 5.827c0 .075.027.14.081.193s.118.081.193.081h4.678v4.673c0 .075.027.14.081.193s.118.081.193.081.14-.027.193-.081.081-.118.081-.193V6.101h4.673a.27.27 0 0 0 .199-.081c.054-.054.08-.118.08-.193a.27.27 0 0 0-.279-.279z" fill="#000"></path>';
 function $ff3225aef892a467$export$f21ab0717a89c77f(props) {
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps(props, {
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1(props, {
     xmlns: "http://www.w3.org/2000/svg",
     width: "11",
     height: "12"
@@ -6377,7 +6492,7 @@ const $830ea8efda59884e$export$414f6a19d38e655c = _ref => {
           const MakeButton = attributes => {
             const label = $b8hua$createMemo(() => value().name_ || value().value_ + "");
             const count_zero = $b8hua$createMemo(() => value().count_ === 0);
-            return $b8hua$ssrElement("button", $b8hua$mergeProps(attributes, {
+            return $b8hua$ssrElement("button", $b8hua$mergeProps1(attributes, {
               get disabled() {
                 return count_zero() && !is_selected();
               },
@@ -6687,7 +6802,7 @@ var $d2988f745661df9c$export$2e2bcd8739ae039 = {
 var $905f44be08b7378e$var$_tmpl$ = '<path d="M4.617 12.738a.48.48 0 0 1-.164-.027c-.051-.023-.094-.055-.129-.098L.125 8.414A.39.39 0 0 1 0 8.117c0-.113.039-.211.125-.293s.18-.125.293-.125.215.043.297.125l3.902 3.902L16.086.262c.082-.082.18-.125.297-.125s.211.043.293.125.125.184.125.301-.043.215-.125.297L4.914 12.613c-.039.043-.086.078-.141.098s-.102.027-.156.027zm0 0"></path>';
 function $905f44be08b7378e$export$f2ca6fc699ca1fb4() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps({
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1({
     xmlns: "http://www.w3.org/2000/svg",
     width: "16.8",
     height: "14"
@@ -7830,7 +7945,7 @@ async function $284849364a6ef73a$var$_run_url_creator_for_suggest2(merchant, mar
   // Filter out our transformed ancestors
   const transformedAncestors = Object.fromEntries(transformerResult.filter(item => item.is_suggestion === false).map(item => [item.listing_id, item]));
   // Add the now transformed ancestors into the ancestors of the listing suggestions
-  const transformedSuggestions = transformerResult.filter(item => item.is_suggestion !== false).map(item => $b8hua$mergeProps1(item, {
+  const transformedSuggestions = transformerResult.filter(item => item.is_suggestion !== false).map(item => $b8hua$mergeProps(item, {
     // Use mergeProps instead of spread since page_url and other properties could be a getter that solid components should call
     ancestors: item.ancestors.map(ancestor => {
       const newAncestor = transformedAncestors[ancestor.listing_id];
@@ -8337,7 +8452,7 @@ function $8ef6232475d44150$export$7de92c4c2205ebf3(_ref) {
     return (0, $981356a8bf29ad72$export$6c9030e511152266) + get_showing_recommendation_rows() * Math.max(...possible_num_columns);
   });
   // Don't tear down elements every time one updates the page - don't put them within <Show>
-  const elements = $b8hua$ssr($8ef6232475d44150$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$escape(i18n_.search_recs_title_()), $b8hua$escape($ca55612a53dbbdd2$export$a2cc176055f8f08()), $b8hua$escape($b8hua$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $b8hua$mergeProps({
+  const elements = $b8hua$ssr($8ef6232475d44150$var$_tmpl$, $b8hua$ssrHydrationKey(), $b8hua$escape(i18n_.search_recs_title_()), $b8hua$escape($ca55612a53dbbdd2$export$a2cc176055f8f08()), $b8hua$escape($b8hua$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $b8hua$mergeProps1({
     rows: rows_object,
     layout: "grid",
     element_attributes: {
@@ -9194,7 +9309,7 @@ var $64d94dcaa058dc7b$var$_tmpl$ = ["<style", ' type="text/css">', "</style>"];
 const $64d94dcaa058dc7b$export$c500183c31c2b22e = "--spans-columns";
 function $64d94dcaa058dc7b$export$ab6b147eec64fea5(props) {
   const container_class = "x" + $b8hua$createUniqueId();
-  const container_element_ = $b8hua$ssrElement("div", $b8hua$mergeProps(() => props.element_attributes, {
+  const container_element_ = $b8hua$ssrElement("div", $b8hua$mergeProps1(() => props.element_attributes, {
     classList: {
       [container_class]: true
     }
@@ -9464,7 +9579,7 @@ function $ff7feae4dddd6073$var$wrap_blocks_in_div(rendered_content_blocks, max_s
         })));
       }
     });
-    return $b8hua$mergeProps1(block, {
+    return $b8hua$mergeProps(block, {
       // Create content divs for the blocks with as much fine-grained diffing as possible?
       content: () => {
         // Sneaky on-demand rendering, so we don't render more blocks than we can show: we have the rendered value here and don't return a function that renders because if our block would be moved around we'd be guaranteed to re-render
@@ -9706,7 +9821,7 @@ function $7faea0096f14b59b$export$3925f87b1545cfc6(_ref) {
                       } = slider;
                       const Layout = props => $63f1f8dbcd07d3b0$export$445d8d3f5f706a40(props, insert_here, true);
                       // Do like this, so we don't have to call mergeProps ourselves
-                      $b8hua$createComponent(Layout, $b8hua$mergeProps(layout_options_, {
+                      $b8hua$createComponent(Layout, $b8hua$mergeProps1(layout_options_, {
                         rows: "all",
                         get cols_at_size() {
                           return modified_cols_at_size();
@@ -9867,7 +9982,7 @@ var $79af35736fe8e5c8$var$_tmpl$ = '<path d="M6.199 10.254a.35.35 0 0 0-.496 0L3
   $79af35736fe8e5c8$var$_tmpl$2 = '<path d="M10.852 6.301H8.051a.35.35 0 0 1-.352-.352V4.551a.35.35 0 0 1 .352-.352h2.801a.35.35 0 0 1 .348.352v1.398a.35.35 0 0 1-.348.352zm-2.453-.699H10.5v-.703H8.398zm3.851 3.5H8.051c-.195 0-.352-.16-.352-.352V7.352A.35.35 0 0 1 8.051 7h4.199c.191 0 .352.156.352.352V8.75c0 .191-.16.352-.352.352zm-3.852-.703h3.5V7.7h-3.5zm5.25 3.499H8.051a.35.35 0 0 1-.352-.348v-1.402a.35.35 0 0 1 .352-.348h5.598a.35.35 0 0 1 .352.348v1.402a.35.35 0 0 1-.352.348zm-5.25-.699H13.3V10.5H8.398zm0 0"></path>';
 function $79af35736fe8e5c8$export$da32f7add8a22e86() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps({
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1({
     xmlns: "http://www.w3.org/2000/svg",
     width: "14",
     height: "14",
@@ -9877,7 +9992,7 @@ function $79af35736fe8e5c8$export$da32f7add8a22e86() {
 var $73e3c96bc365e0e9$var$_tmpl$ = '<path d="M6.199 10.254a.35.35 0 0 0-.496 0L3.5 12.453V.348a.35.35 0 0 0-.7 0v12.105L.598 10.254c-.137-.137-.359-.137-.492 0a.35.35 0 0 0 0 .492l2.797 2.801a.35.35 0 0 0 .496 0L6.2 10.746c.137-.137.137-.355 0-.492zm3.25 1.644H8.051a.35.35 0 0 1-.352-.348v-1.402a.35.35 0 0 1 .352-.348h1.398a.35.35 0 0 1 .352.348v1.402a.35.35 0 0 1-.352.348zm-1.051-.699h.703V10.5h-.703zm2.454-2.097H8.051c-.195 0-.352-.16-.352-.352V7.352A.35.35 0 0 1 8.051 7h2.801a.35.35 0 0 1 .348.352V8.75c0 .191-.156.352-.348.352zm-2.453-.703H10.5V7.7H8.398zm3.851-2.098H8.051a.35.35 0 0 1-.352-.352V4.551a.35.35 0 0 1 .352-.352h4.199c.191 0 .352.156.352.352v1.398c0 .195-.16.352-.352.352zm-3.852-.699h3.5v-.703h-3.5zm5.25-2.102H8.051a.35.35 0 0 1-.352-.352V1.75c0-.191.156-.352.352-.352h5.598c.195 0 .352.16.352.352v1.398a.35.35 0 0 1-.352.352zm-5.25-.699H13.3v-.699H8.398zm0 0"></path>';
 function $73e3c96bc365e0e9$export$d10e63059ddb9fd4() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return $b8hua$ssrElement("svg", $b8hua$mergeProps({
+  return $b8hua$ssrElement("svg", $b8hua$mergeProps1({
     xmlns: "http://www.w3.org/2000/svg",
     width: "14",
     height: "14",
@@ -9993,7 +10108,7 @@ function $082c4ed3e22f8d71$export$9bf11afa910f536e(_ref) {
           })));
         },
         get children() {
-          return $b8hua$ssr($082c4ed3e22f8d71$var$_tmpl$5, $b8hua$ssrHydrationKey(), $b8hua$escape($b8hua$createComponent((0, $f6b0500577e1b210$export$3f1a388cc0d8fed7), $b8hua$mergeProps(args_for_filtering_, {
+          return $b8hua$ssr($082c4ed3e22f8d71$var$_tmpl$5, $b8hua$ssrHydrationKey(), $b8hua$escape($b8hua$createComponent((0, $f6b0500577e1b210$export$3f1a388cc0d8fed7), $b8hua$mergeProps1(args_for_filtering_, {
             are_in_modal_: true
           }))));
         }
@@ -10589,7 +10704,7 @@ function $22470de5f42cc35d$export$f631859cab12b342(_ref) {
     if (content_result_) return $b8hua$ssrElement("a", attributes, () => $b8hua$escape(children), true);
     return $b8hua$ssrElement("div", attributes, () => $b8hua$escape(children), true);
   };
-  return $b8hua$ssr($22470de5f42cc35d$var$_tmpl$2, $b8hua$ssrHydrationKey(), $b8hua$escape($b8hua$createComponent(LinkIfPossible, $b8hua$mergeProps(make_link_attributes, {
+  return $b8hua$ssr($22470de5f42cc35d$var$_tmpl$2, $b8hua$ssrHydrationKey(), $b8hua$escape($b8hua$createComponent(LinkIfPossible, $b8hua$mergeProps1(make_link_attributes, {
     tabIndex: "-1",
     get children() {
       return $b8hua$createComponent((0, $3c5e15c6ee4227a9$export$605674723bcc715c), {
@@ -10597,7 +10712,7 @@ function $22470de5f42cc35d$export$f631859cab12b342(_ref) {
         height: "28"
       });
     }
-  }))), $b8hua$escape($b8hua$createComponent(LinkIfPossible, $b8hua$mergeProps({
+  }))), $b8hua$escape($b8hua$createComponent(LinkIfPossible, $b8hua$mergeProps1({
     "class": "content-title line-clamp"
   }, make_link_attributes, {
     get title() {
@@ -10752,7 +10867,7 @@ function $d53ebed6f63304e4$export$6d0c9c22f6652669(_ref) {
       return (0, $69602b3d8fd54c38$export$2452208c79fe93ea).content;
     },
     number_of_results_: num_results
-  })), $b8hua$escape($b8hua$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $b8hua$mergeProps({
+  })), $b8hua$escape($b8hua$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $b8hua$mergeProps1({
     layout: "grid",
     element_attributes: {
       class: "cards"
@@ -11145,7 +11260,7 @@ function $da279c5a540c6846$export$a54ec244c8863715(_ref) {
     var _search_results_4, _search_results_4$con;
     return ((_search_results_4 = search_results_()) !== null && _search_results_4 !== void 0 && (_search_results_4$con = _search_results_4.content_search_links) !== null && _search_results_4$con !== void 0 && _search_results_4$con.length ? i18n_.no_products_ : i18n_.no_results_text_)();
   });
-  const results_for = $b8hua$createComponent((0, $69602b3d8fd54c38$export$9dd50d35b9d94fdf), $b8hua$mergeProps({
+  const results_for = $b8hua$createComponent((0, $69602b3d8fd54c38$export$9dd50d35b9d94fdf), $b8hua$mergeProps1({
     get type() {
       return (0, $69602b3d8fd54c38$export$2452208c79fe93ea).products;
     },
@@ -13117,7 +13232,7 @@ function $4b4b262708b516ee$var$add_us_to_crumbs(plp_meta) {
     var _plp_meta3;
     const api_value = (_plp_meta3 = plp_meta()) === null || _plp_meta3 === void 0 ? void 0 : _plp_meta3.breadcrumbs;
     if (!api_value) return api_value;
-    return [...api_value, $b8hua$mergeProps1(plp_meta(), {
+    return [...api_value, $b8hua$mergeProps(plp_meta(), {
       get page_url() {
         return href_accessor();
       }