@depict-ai/ui 4.3.1 → 4.3.3

package/latest/index.js

@@ -1,13 +1,13 @@
-import { add_to_version_info as $9HbP8$add_to_version_info, fetch_retry as $9HbP8$fetch_retry, base_url as $9HbP8$base_url, slider_fractional_factory as $9HbP8$slider_fractional_factory, dlog as $9HbP8$dlog, camelCasifyObject as $9HbP8$camelCasifyObject, make_random_classname as $9HbP8$make_random_classname, n_col_styling_with_dist as $9HbP8$n_col_styling_with_dist, catchify as $9HbP8$catchify, layout_get_visible_recs_without_partial_rows as $9HbP8$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $9HbP8$layout_get_total_rec_amount_for_row, layout_media_query_header as $9HbP8$layout_media_query_header, report as $9HbP8$report, slider_fading_factory as $9HbP8$slider_fading_factory, Amazing_Slider as $9HbP8$Amazing_Slider, slider_snap_css as $9HbP8$slider_snap_css, observer as $9HbP8$observer, javascript_media_query as $9HbP8$javascript_media_query, queueMacroTask as $9HbP8$queueMacroTask, findMostFrequentItem as $9HbP8$findMostFrequentItem, dwarn as $9HbP8$dwarn, deparallelize_no_drop as $9HbP8$deparallelize_no_drop, ContainedImage as $9HbP8$ContainedImage, standard_price_format as $9HbP8$standard_price_format, buildThresholdList as $9HbP8$buildThresholdList, make_asyncIterable_exiter as $9HbP8$make_asyncIterable_exiter, href_change_ipns as $9HbP8$href_change_ipns, base64_encode_unicode as $9HbP8$base64_encode_unicode, base64_decode_unicode as $9HbP8$base64_decode_unicode, use_href_accessor as $9HbP8$use_href_accessor, get_session_id as $9HbP8$get_session_id, add_version_query_params as $9HbP8$add_version_query_params, instant_exec_on_suspect_history_change as $9HbP8$instant_exec_on_suspect_history_change, useExpandingContainer as $9HbP8$useExpandingContainer, hex_to_rgb as $9HbP8$hex_to_rgb, relative_luminance_from_rgb as $9HbP8$relative_luminance_from_rgb, snakeCasifyObject as $9HbP8$snakeCasifyObject, sort_obj as $9HbP8$sort_obj, make_url_with_query_params as $9HbP8$make_url_with_query_params, ListenableSet as $9HbP8$ListenableSet1, insert_surfaces as $9HbP8$insert_surfaces, is_debug as $9HbP8$is_debug } from "@depict-ai/utilishared/latest";
-import { template as $9HbP8$template, getNextElement as $9HbP8$getNextElement, insert as $9HbP8$insert, createComponent as $9HbP8$createComponent, mergeProps as $9HbP8$mergeProps, isServer as $9HbP8$isServer, spread as $9HbP8$spread, runHydrationEvents as $9HbP8$runHydrationEvents, addEventListener as $9HbP8$addEventListener, className as $9HbP8$className, memo as $9HbP8$memo, delegateEvents as $9HbP8$delegateEvents, getNextMarker as $9HbP8$getNextMarker, effect as $9HbP8$effect, classList as $9HbP8$classList, setAttribute as $9HbP8$setAttribute, style as $9HbP8$style, use as $9HbP8$use, setProperty as $9HbP8$setProperty, Dynamic as $9HbP8$Dynamic } from "solid-js/web";
-import { createSignal as $9HbP8$createSignal, createMemo as $9HbP8$createMemo, createResource as $9HbP8$createResource, Show as $9HbP8$Show, Suspense as $9HbP8$Suspense, untrack as $9HbP8$untrack, createRenderEffect as $9HbP8$createRenderEffect, Index as $9HbP8$Index, createRoot as $9HbP8$createRoot, onCleanup as $9HbP8$onCleanup, For as $9HbP8$For, getOwner as $9HbP8$getOwner, runWithOwner as $9HbP8$runWithOwner, createEffect as $9HbP8$createEffect, createContext as $9HbP8$createContext, useContext as $9HbP8$useContext, createUniqueId as $9HbP8$createUniqueId, createComputed as $9HbP8$createComputed, ErrorBoundary as $9HbP8$ErrorBoundary, splitProps as $9HbP8$splitProps, mergeProps as $9HbP8$mergeProps1, on as $9HbP8$on, batch as $9HbP8$batch, createSelector as $9HbP8$createSelector, children as $9HbP8$children, createReaction as $9HbP8$createReaction, mapArray as $9HbP8$mapArray } from "solid-js";
+import { add_to_version_info as $9HbP8$add_to_version_info, fetch_retry as $9HbP8$fetch_retry, base_url as $9HbP8$base_url, dwarn as $9HbP8$dwarn, slider_fractional_factory as $9HbP8$slider_fractional_factory, dlog as $9HbP8$dlog, camelCasifyObject as $9HbP8$camelCasifyObject, make_random_classname as $9HbP8$make_random_classname, n_col_styling_with_dist as $9HbP8$n_col_styling_with_dist, catchify as $9HbP8$catchify, layout_get_visible_recs_without_partial_rows as $9HbP8$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $9HbP8$layout_get_total_rec_amount_for_row, layout_media_query_header as $9HbP8$layout_media_query_header, report as $9HbP8$report, slider_fading_factory as $9HbP8$slider_fading_factory, Amazing_Slider as $9HbP8$Amazing_Slider, slider_snap_css as $9HbP8$slider_snap_css, observer as $9HbP8$observer, javascript_media_query as $9HbP8$javascript_media_query, queueMacroTask as $9HbP8$queueMacroTask, findMostFrequentItem as $9HbP8$findMostFrequentItem, standard_price_format as $9HbP8$standard_price_format, instant_exec_on_suspect_history_change as $9HbP8$instant_exec_on_suspect_history_change, deparallelize_no_drop as $9HbP8$deparallelize_no_drop, ContainedImage as $9HbP8$ContainedImage, buildThresholdList as $9HbP8$buildThresholdList, make_asyncIterable_exiter as $9HbP8$make_asyncIterable_exiter, href_change_ipns as $9HbP8$href_change_ipns, base64_encode_unicode as $9HbP8$base64_encode_unicode, base64_decode_unicode as $9HbP8$base64_decode_unicode, use_href_accessor as $9HbP8$use_href_accessor, get_session_id as $9HbP8$get_session_id, add_version_query_params as $9HbP8$add_version_query_params, useExpandingContainer as $9HbP8$useExpandingContainer, hex_to_rgb as $9HbP8$hex_to_rgb, relative_luminance_from_rgb as $9HbP8$relative_luminance_from_rgb, snakeCasifyObject as $9HbP8$snakeCasifyObject, sort_obj as $9HbP8$sort_obj, make_url_with_query_params as $9HbP8$make_url_with_query_params, ListenableSet as $9HbP8$ListenableSet1, insert_surfaces as $9HbP8$insert_surfaces, is_debug as $9HbP8$is_debug } from "@depict-ai/utilishared/latest";
+import { template as $9HbP8$template, getNextElement as $9HbP8$getNextElement, insert as $9HbP8$insert, createComponent as $9HbP8$createComponent, mergeProps as $9HbP8$mergeProps1, isServer as $9HbP8$isServer, spread as $9HbP8$spread, runHydrationEvents as $9HbP8$runHydrationEvents, addEventListener as $9HbP8$addEventListener, className as $9HbP8$className, memo as $9HbP8$memo, delegateEvents as $9HbP8$delegateEvents, getNextMarker as $9HbP8$getNextMarker, effect as $9HbP8$effect, classList as $9HbP8$classList, setAttribute as $9HbP8$setAttribute, style as $9HbP8$style, use as $9HbP8$use, setProperty as $9HbP8$setProperty, Dynamic as $9HbP8$Dynamic } from "solid-js/web";
+import { createSignal as $9HbP8$createSignal, createMemo as $9HbP8$createMemo, createResource as $9HbP8$createResource, createEffect as $9HbP8$createEffect, mergeProps as $9HbP8$mergeProps, Show as $9HbP8$Show, Suspense as $9HbP8$Suspense, untrack as $9HbP8$untrack, createRenderEffect as $9HbP8$createRenderEffect, Index as $9HbP8$Index, createRoot as $9HbP8$createRoot, onCleanup as $9HbP8$onCleanup, For as $9HbP8$For, getOwner as $9HbP8$getOwner, runWithOwner as $9HbP8$runWithOwner, createContext as $9HbP8$createContext, useContext as $9HbP8$useContext, createUniqueId as $9HbP8$createUniqueId, createComputed as $9HbP8$createComputed, ErrorBoundary as $9HbP8$ErrorBoundary, splitProps as $9HbP8$splitProps, on as $9HbP8$on, batch as $9HbP8$batch, createSelector as $9HbP8$createSelector, children as $9HbP8$children, createReaction as $9HbP8$createReaction, mapArray as $9HbP8$mapArray } from "solid-js";
 import { ListenableSet as $9HbP8$ListenableSet, catchify as $9HbP8$catchify1, use_href_accessor as $9HbP8$use_href_accessor1, report as $9HbP8$report1 } from "@depict-ai/utilishared/latest";
 import { createStore as $9HbP8$createStore, reconcile as $9HbP8$reconcile } from "solid-js/store";
 
 /*! Depict.ai search and product listing SDK */
 import { register_es_version } from "../multi_import_deduplicator.mjs";
 register_es_version("ui", "latest");
-const $ec291e0010116877$export$83d89fbfd8236492 = "4.3.1";
+const $ec291e0010116877$export$83d89fbfd8236492 = "4.3.3";
 const $b5cccc8ee7d24677$var$transform_elements = sorted_cols_at_size => {
   const cols_at_size = [];
   for (let i = 0; i < sorted_cols_at_size.length; i++) {
@@ -426,7 +426,7 @@ function $c8d5ff4524619fcd$export$d21e32dfedac04be(props) {
   const container_class = "x" + $9HbP8$createUniqueId();
   const container_element_ = (() => {
     var _el$ = $9HbP8$getNextElement($c8d5ff4524619fcd$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(() => props.element_attributes, {
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(() => props.element_attributes, {
       "classList": {
         [container_class]: true
       }
@@ -669,7 +669,7 @@ function $c4492d24952ed731$export$d41d19e89346fa2({
       } = slider;
       const Layout = props => $c8d5ff4524619fcd$export$445d8d3f5f706a40(props, insert_here, true);
       // Do like this, so we don't have to call mergeProps ourselves
-      $9HbP8$createComponent(Layout, $9HbP8$mergeProps({
+      $9HbP8$createComponent(Layout, $9HbP8$mergeProps1({
         rows: "all",
         layout: "slider"
       }, layout_options_));
@@ -974,7 +974,7 @@ function $e8ffe11ed01df0fe$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] = $9HbP8$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] = $9HbP8$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] = $9HbP8$createSignal(false);
@@ -990,7 +990,7 @@ function $e8ffe11ed01df0fe$export$6e5611bc7e57e477(props) {
     if (loading === "force-lazy") return true;
     return loading === "lazy" && !isPrioritisedImage();
   });
-  const modifiedOtherAttributes = $9HbP8$mergeProps1(otherAttributes, {
+  const modifiedOtherAttributes = $9HbP8$mergeProps(otherAttributes, {
     get loading() {
       return shouldActuallyEnableLazyLoading() ? "lazy" : undefined;
     }
@@ -1030,13 +1030,18 @@ function $e8ffe11ed01df0fe$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[$e8ffe11ed01df0fe$export$f8945274f08a3105] ||= new Set();
     const [, setMostPrevalentAspectRatio] = listingContext[$e8ffe11ed01df0fe$export$6066eb417ed2e9f7] ||= $9HbP8$createSignal();
     img.addEventListener("load", $9HbP8$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_) ? {
@@ -1054,7 +1059,11 @@ function $e8ffe11ed01df0fe$export$6e5611bc7e57e477(props) {
     $9HbP8$onCleanup(() => prevValue && aspectRatios.delete(prevValue));
   }
   $9HbP8$onCleanup(() => gotCleanedUp = true);
-  $9HbP8$spread(img, $9HbP8$mergeProps1(modifiedOtherAttributes), false, true);
+  $9HbP8$spread(img, $9HbP8$mergeProps(modifiedOtherAttributes), false, true);
+  $9HbP8$createRenderEffect(() => {
+    props.src;
+    srcJustChanged = true;
+  });
   $9HbP8$createEffect(() => {
     if (!props.size()) return; // wait until we have a size, run every time the size changes
     if (timeoutSet) return;
@@ -1124,48 +1133,22 @@ function $660070e2a394b3c3$export$e4b984597b71e989(props) {
   const [mostPrevalentAspectRatio] = context ?
   // If the context exists we have to create the signal here as getting it here would be too late when it's created by ShopifyResponsiveImg below
   context[(0, $e8ffe11ed01df0fe$export$6066eb417ed2e9f7)] ||= $9HbP8$createSignal() : [];
-  const [aspectRatio, setAspectRatio] = $9HbP8$createSignal($9HbP8$untrack(() => props.aspectRatio));
   const container = $f18d425032111270$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?.();
+        if (targetRatio != undefined) return `var(${(0, $bb15dfb548a7666e$export$8a2234b5b1a5ebd4)}, ${targetRatio})`;
+      }
+      return props.aspectRatio;
     }
   });
   const owner = $9HbP8$getOwner();
   let createdSizeAccessor = false;
   let wasCleanedUp = false;
-  let timeout;
-  $9HbP8$createEffect(() => {
-    const {
-      autoAdjustAspectRatio: autoAdjustAspectRatio
-    } = props;
-    if (autoAdjustAspectRatio) {
-      const targetRatio = mostPrevalentAspectRatio?.();
-      if (targetRatio != undefined) {
-        const targetValue = `var(${(0, $bb15dfb548a7666e$export$8a2234b5b1a5ebd4)}, ${targetRatio})`;
-        const updateAspectRatio = $9HbP8$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);
-  });
   $9HbP8$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
@@ -1179,7 +1162,7 @@ function $660070e2a394b3c3$export$e4b984597b71e989(props) {
     $9HbP8$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
   });
 
-  $9HbP8$insert(container, $9HbP8$createComponent((0, $e8ffe11ed01df0fe$export$6e5611bc7e57e477), $9HbP8$mergeProps({
+  $9HbP8$insert(container, $9HbP8$createComponent((0, $e8ffe11ed01df0fe$export$6e5611bc7e57e477), $9HbP8$mergeProps1({
     get size() {
       return $9HbP8$createMemo(() => currentImageSize()?.() || 0);
     },
@@ -1194,7 +1177,7 @@ function $660070e2a394b3c3$export$e4b984597b71e989(props) {
   return container;
 }
 function $70bb27cc6be01fc7$export$9d4a4b669b1929ab(props) {
-  return $9HbP8$createComponent((0, $660070e2a394b3c3$export$e4b984597b71e989), $9HbP8$mergeProps(props, {
+  return $9HbP8$createComponent((0, $660070e2a394b3c3$export$e4b984597b71e989), $9HbP8$mergeProps1(props, {
     get imgProps() {
       return {
         ...props.imgProps,
@@ -1211,6 +1194,12 @@ function $70bb27cc6be01fc7$export$9d4a4b669b1929ab(props) {
     }
   }));
 }
+function $8c0f86cb3e266eeb$export$a71e92cfbb498adc(props) {
+  return $9HbP8$createMemo(() => {
+    const price_formatting = props.price_formatting_;
+    return $9HbP8$standard_price_format(props.price_, price_formatting.places_after_comma_, price_formatting.decimal_places_delimiter_, price_formatting.thousands_delimiter_);
+  });
+}
 var $5a6c386e1bde5665$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<div class=img-wrapper>`),
   $5a6c386e1bde5665$var$_tmpl$2 = /*#__PURE__*/$9HbP8$template(`<span class="d-price original">`),
   $5a6c386e1bde5665$var$_tmpl$3 = /*#__PURE__*/$9HbP8$template(`<div class=right-part><div class=text-container><span class="d-title line-clamp"></span><span class=d-price></span><!$><!/></div><!$><!/>`),
@@ -1218,10 +1207,12 @@ var $5a6c386e1bde5665$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<div class=img-
 function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
   display_: display_,
   FavoriteButton_: FavoriteButton_,
-  isExpanded_: isExpanded_,
+  userWantsExpandedSignal_: [userWantsExpanded, setUserWantsExpanded],
   textFadeInAnimationRunning_: textFadeInAnimationRunning_,
   outerRef_: outerRef_,
-  animationDuration_: animationDuration_
+  animationDuration_: animationDuration_,
+  priceFormatting_: priceFormatting_,
+  pseudoRouter_: pseudoRouter_
 }) {
   const variantToUse = $9HbP8$createMemo(() => {
     const display = display_();
@@ -1229,11 +1220,13 @@ function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
   });
   const imageUrl = $9HbP8$createMemo(() => variantToUse()?.image_urls?.[0]);
   const [animationIsRunning, setAnimationIsRunning] = textFadeInAnimationRunning_;
-  const [isExpandedThrottledByOurEffectRun, setIsExpandedThrottledByOurEffectRun] = $9HbP8$createSignal($9HbP8$untrack(isExpanded_));
+  const [isExpandedThrottledByOurEffectRun, setIsExpandedThrottledByOurEffectRun] = $9HbP8$createSignal($9HbP8$untrack(userWantsExpanded));
   const [animationEffectExists, setAnimationEffectExists] = $9HbP8$createSignal(false);
   const [salePrice] = $9HbP8$createResource(() => variantToUse()?.sale_price);
   const [originalPrice] = $9HbP8$createResource(() => variantToUse()?.original_price);
-  const isOnSale = $9HbP8$createMemo(() => salePrice.latest !== originalPrice.latest); // .latest doesn't trigger suspense
+  const isOnSale = $9HbP8$createMemo(() => !salePrice.loading && !originalPrice.loading && salePrice.latest !== originalPrice.latest); // .latest doesn't trigger suspense after the initial load
+  const enableLink = $9HbP8$createMemo(() => userWantsExpanded() && !animationIsRunning());
+  const href = $9HbP8$createMemo(() => variantToUse()?.page_url);
   const FavoriteButton = FavoriteButton_; // Just to get rid of the type error - TS doesn't understand <Show>
   return (() => {
     var _el$ = $9HbP8$getNextElement($5a6c386e1bde5665$var$_tmpl$4),
@@ -1243,9 +1236,24 @@ function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
       [_el$15, _co$4] = $9HbP8$getNextMarker(_el$14.nextSibling);
     var _ref$ = outerRef_;
     typeof _ref$ === "function" ? $9HbP8$use(_ref$, _el$) : outerRef_ = _el$;
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(() => isExpanded_() && !animationIsRunning() ? {
-      href: variantToUse()?.page_url
-    } : {}), false, true);
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(() => enableLink() ? {
+      href: href()
+    } : {}, {
+      get onClick() {
+        return $9HbP8$catchify(event_ => {
+          if (enableLink()) {
+            pseudoRouter_.navigate_.go_to_({
+              new_url_: href(),
+              is_replace_: false,
+              event_: event_
+            });
+            if (event_.defaultPrevented)
+              // We single-page-navigated in this tab, close the look
+              setUserWantsExpanded(false);
+          }
+        });
+      }
+    }), false, true);
     $9HbP8$insert(_el$, $9HbP8$createComponent((0, $9HbP8$Show), {
       when: imageUrl,
       get fallback() {
@@ -1270,10 +1278,13 @@ function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
                 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
               }
             });
           }
@@ -1283,7 +1294,7 @@ function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
     }), _el$13, _co$3);
     $9HbP8$insert(_el$, $9HbP8$createComponent((0, $9HbP8$Show), {
       get when() {
-        return (animationEffectExists() ? isExpandedThrottledByOurEffectRun() : isExpanded_()) || animationIsRunning();
+        return (animationEffectExists() ? isExpandedThrottledByOurEffectRun() : userWantsExpanded()) || animationIsRunning();
       },
       get children() {
         var _el$3 = $9HbP8$getNextElement($5a6c386e1bde5665$var$_tmpl$3),
@@ -1310,7 +1321,7 @@ function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
             setAnimationIsRunning(true);
             $9HbP8$runWithOwner(owner, () => {
               $9HbP8$createRenderEffect(() => {
-                const expanded = isExpanded_();
+                const expanded = userWantsExpanded();
                 // Still glitches in chrome (probably not fixable) and sometimes the timing is off in Safari but fuck it, I couldn't massage the WAAPI to improve it in any way (without reading computed style) to make the reversing of animations glitch less
                 textContainerAnimation.pause();
                 textContainerAnimation.updatePlaybackRate(expanded ? 1 : -1);
@@ -1330,26 +1341,68 @@ function $5a6c386e1bde5665$export$b73ed90f0ee50dc3({
           height: "1em",
           width: "20ch"
         }));
-        $9HbP8$insert(_el$6, (() => {
-          var _c$ = $9HbP8$memo(() => !!(!variantToUse() || salePrice.loading));
-          return () => _c$() ? $9HbP8$createComponent((0, $d134eae24341b4a1$export$89c6019e4baa40b1), {
-            height: "1em",
-            width: "20ch"
-          }) : salePrice();
-        })());
+        $9HbP8$insert(_el$6, $9HbP8$createComponent((0, $9HbP8$Show), {
+          get when() {
+            return variantToUse() && !salePrice.loading;
+          },
+          get fallback() {
+            return $9HbP8$createComponent((0, $d134eae24341b4a1$export$89c6019e4baa40b1), {
+              height: "1em",
+              width: "20ch"
+            });
+          },
+          get children() {
+            return $9HbP8$createComponent((0, $9HbP8$Show), {
+              get when() {
+                return salePrice.latest;
+              },
+              get children() {
+                return [$9HbP8$memo(() => priceFormatting_().pre_), $9HbP8$createComponent((0, $8c0f86cb3e266eeb$export$a71e92cfbb498adc), {
+                  get price_() {
+                    return salePrice();
+                  },
+                  get price_formatting_() {
+                    return priceFormatting_();
+                  }
+                }), $9HbP8$memo(() => priceFormatting_().post_)];
+              }
+            });
+          }
+        }));
         $9HbP8$insert(_el$4, $9HbP8$createComponent((0, $9HbP8$Show), {
           get when() {
             return isOnSale();
           },
           get children() {
             var _el$7 = $9HbP8$getNextElement($5a6c386e1bde5665$var$_tmpl$2);
-            $9HbP8$insert(_el$7, (() => {
-              var _c$2 = $9HbP8$memo(() => !!(!variantToUse() || originalPrice.loading));
-              return () => _c$2() ? $9HbP8$createComponent((0, $d134eae24341b4a1$export$89c6019e4baa40b1), {
-                height: "1em",
-                width: "20ch"
-              }) : originalPrice();
-            })());
+            $9HbP8$insert(_el$7, $9HbP8$createComponent((0, $9HbP8$Show), {
+              get when() {
+                return variantToUse() && !originalPrice.loading;
+              },
+              get fallback() {
+                return $9HbP8$createComponent((0, $d134eae24341b4a1$export$89c6019e4baa40b1), {
+                  height: "1em",
+                  width: "20ch"
+                });
+              },
+              get children() {
+                return $9HbP8$createComponent((0, $9HbP8$Show), {
+                  get when() {
+                    return salePrice.latest;
+                  },
+                  get children() {
+                    return [$9HbP8$memo(() => priceFormatting_().pre_), $9HbP8$createComponent((0, $8c0f86cb3e266eeb$export$a71e92cfbb498adc), {
+                      get price_() {
+                        return originalPrice();
+                      },
+                      get price_formatting_() {
+                        return priceFormatting_();
+                      }
+                    }), $9HbP8$memo(() => priceFormatting_().post_)];
+                  }
+                });
+              }
+            }));
             return _el$7;
           }
         }), _el$9, _co$);
@@ -1423,10 +1476,12 @@ var $7555dcad3b8a4632$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<div class=scro
 function $7555dcad3b8a4632$export$ebf0b1d4f90c09ae({
   displays_: displays_,
   FavoriteButton_: FavoriteButton_,
-  userWantsExpandedSignal_: [userWantsExpanded, setUserWantsExpanded],
+  userWantsExpandedSignal_: userWantsExpandedSignal_,
   containerWidth_: containerWidth_,
   animationDuration_: animationDuration_,
-  supportsHover_: supportsHover_
+  supportsHover_: supportsHover_,
+  priceFormatting_: priceFormatting_,
+  pseudoRouter_: pseudoRouter_
 }) {
   let isAffectedByChromeBug = false;
   // If the user requests the drawer to be expanded or not
@@ -1435,6 +1490,7 @@ function $7555dcad3b8a4632$export$ebf0b1d4f90c09ae({
   // 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 = $9HbP8$createSignal(false);
   const [getSecondPartAnimationRunning] = textFadeInAnimationRunning;
+  const [userWantsExpanded, setUserWantsExpanded] = userWantsExpandedSignal_;
   $62a8f670f8464532$export$7b9a0e99f0aeb2f3().then(is => isAffectedByChromeBug = is);
   return $9HbP8$createComponent((0, $011607bdf658f807$export$e68cff63f76bd15b), {
     get children() {
@@ -1456,7 +1512,7 @@ function $7555dcad3b8a4632$export$ebf0b1d4f90c09ae({
               behavior: "smooth"
             });
           }), _el$2);
-          $9HbP8$spread(_el$2, $9HbP8$mergeProps({
+          $9HbP8$spread(_el$2, $9HbP8$mergeProps1({
             get classList() {
               return {
                 expanded: userWantsExpanded(),
@@ -1480,11 +1536,13 @@ function $7555dcad3b8a4632$export$ebf0b1d4f90c09ae({
             },
             children: (display, index) => {
               return $9HbP8$createComponent((0, $5a6c386e1bde5665$export$b73ed90f0ee50dc3), {
+                pseudoRouter_: pseudoRouter_,
                 animationDuration_: animationDuration_,
                 display_: display,
                 FavoriteButton_: FavoriteButton_,
-                isExpanded_: userWantsExpanded,
+                userWantsExpandedSignal_: userWantsExpandedSignal_,
                 textFadeInAnimationRunning_: textFadeInAnimationRunning,
+                priceFormatting_: priceFormatting_,
                 outerRef_: el => $9HbP8$createEffect(() => {
                   if (index !== 0) return;
                   const resizeObserver = new ResizeObserver($9HbP8$catchify(records => setLookItemHeight(records.at(-1).contentRect.height)));
@@ -1527,10 +1585,10 @@ function $28ee4f7db3cc44b8$export$44809a8a3e867e30({
   expandedLooksSignal_: [expandedLooks_, setExpandedLooks],
   FavoriteButton_: FavoriteButton_,
   placeholderImageAspectRatio_: placeholderImageAspectRatio_,
-  animationDuration_: animationDuration_
+  animationDuration_: animationDuration_,
+  priceFormatting_: priceFormatting_,
+  pseudoRouter_: pseudoRouter_
 }) {
-  // TODO: shopify, run displayTransformers to get dynamic prices
-  // TODO: format prices
   const [coverImage] = display_?.image_urls || [];
   const useWantsExpandedSignal_ = $9HbP8$createSignal(false);
   const [userWantsExpanded, setUserWantsExpanded] = useWantsExpandedSignal_;
@@ -1574,7 +1632,7 @@ function $28ee4f7db3cc44b8$export$44809a8a3e867e30({
     when: display_,
     get fallback() {
       return $9HbP8$createComponent((0, $7f60f09116a3fe61$export$3f37af283f8fb843), {
-        aspectRatio: placeholderImageAspectRatio_
+        aspectRatio: `var(${(0, $bb15dfb548a7666e$export$8a2234b5b1a5ebd4)}, ${placeholderImageAspectRatio_})`
       });
     },
     get children() {
@@ -1592,11 +1650,125 @@ function $28ee4f7db3cc44b8$export$44809a8a3e867e30({
     containerWidth_: containerWidth_,
     animationDuration_: animationDuration_,
     supportsHover_: supportsHover_,
-    FavoriteButton_: FavoriteButton_
+    FavoriteButton_: FavoriteButton_,
+    priceFormatting_: priceFormatting_,
+    pseudoRouter_: pseudoRouter_
   })]);
   return container;
 }
 $9HbP8$delegateEvents(["click"]);
+
+/**
+ * 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 $a281666e5c15c2ec$export$29d28dadc2d6b631(clickEvent) {
+  return clickEvent?.button ||
+  // if not zero it's a wheel click which opens in new tab
+  clickEvent?.metaKey ||
+  // if true, cmd button on macOS which opens in new tab
+  clickEvent?.ctrlKey ||
+  // if true, ctrl button on windows or linux which opens in new tab
+  clickEvent?.shiftKey // if true, shift button on windows, linux or macOS which opens in a new window
+  ;
+}
+
+class $4fd2ba03703a7d92$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
+     */
+  #throwing_on_navigation(...args) {
+    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_(...args);
+    } catch (e) {
+      queueMicrotask(() => {
+        throw e;
+      });
+    }
+  }
+  /**
+  * Vue has async router that needs to be awaited (it navigates after a microtask)
+  * This standardises waiting for all kinds of routers
+  */
+  #get_navigation_happened_promise(is_replace) {
+    return new Promise(resolve => {
+      const handler = what_happened => {
+        if (what_happened === (is_replace ? "replaceState" : "pushState")) {
+          resolve();
+          (0, $9HbP8$instant_exec_on_suspect_history_change).delete(handler);
+        }
+      };
+      (0, $9HbP8$instant_exec_on_suspect_history_change).add(handler);
+    });
+  }
+  navigate_ = {
+    /**
+    * Call this if you *just* want to replace the state object in history.state
+    */
+    replace_state_: new_state => {
+      // 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?.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_: $9HbP8$catchify(async ({
+      new_url_: raw_new_url,
+      event_: event_,
+      force_spa_navigation_: force_spa_navigation_,
+      is_replace_: is_replace_,
+      listing_query_: listing_query_,
+      scroll = true
+    }) => {
+      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 ($a281666e5c15c2ec$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
+          $9HbP8$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_?.preventDefault();
+      const promise = this.#get_navigation_happened_promise(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) $9HbP8$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 this.#throwing_on_navigation.call(this, {
+        is_replace: is_replace_,
+        new_url: new_url_ instanceof URL ? new_url_ : new URL(new_url_, location.origin),
+        scroll: scroll
+      });
+      await promise;
+    })
+  };
+  constructor(on_navigation, listing_query_state_key) {
+    this.listing_query_state_key = listing_query_state_key;
+    this.on_navigation_ = on_navigation;
+  }
+}
 var $f577edfe2240eec1$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<div class="depict recommendations looks"style=--animation-duration:240ms>`);
 let $f577edfe2240eec1$var$expandedLooksSignal_;
 function $f577edfe2240eec1$export$1935e6bdfc5ed8ce(props) {
@@ -1605,6 +1777,7 @@ function $f577edfe2240eec1$export$1935e6bdfc5ed8ce(props) {
       equals: false
     });
     const expandingAnimationDuration = 240;
+    const pseudoRouter = new (0, $4fd2ba03703a7d92$export$7e1297a3a19f10d8)("hard_navigation");
     const grid_spacing_override = $9HbP8$createMemo(() => {
       const {
         gridSpacing_: gridSpacing_
@@ -1630,21 +1803,37 @@ function $f577edfe2240eec1$export$1935e6bdfc5ed8ce(props) {
       });
       const decoded = await response?.json?.().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 $f577edfe2240eec1$var$runDisplayTransformersForLooks(baseData, listings, props.displayTransformers_);
+    });
+    $9HbP8$createEffect(() => {
+      const {
+        onNavigation_: onNavigation_
+      } = props;
+      if (onNavigation_) pseudoRouter.on_navigation_ = onNavigation_;
     });
     return (() => {
       var _el$ = $9HbP8$getNextElement($f577edfe2240eec1$var$_tmpl$);
       $9HbP8$insert(_el$, $9HbP8$createComponent((0, $011607bdf658f807$export$e68cff63f76bd15b), {
         get children() {
           return $c4492d24952ed731$export$d41d19e89346fa2({
-            product_card_template_: (display, info) => $28ee4f7db3cc44b8$export$44809a8a3e867e30({
+            product_card_template_: display => $28ee4f7db3cc44b8$export$44809a8a3e867e30({
               display_: display,
               FavoriteButton_: props.FavoriteButton_,
               placeholderImageAspectRatio_: props.imagePlaceholderAspectRatio_,
               animationDuration_: expandingAnimationDuration,
-              expandedLooksSignal_: $f577edfe2240eec1$var$expandedLooksSignal_
+              expandedLooksSignal_: $f577edfe2240eec1$var$expandedLooksSignal_,
+              priceFormatting_: () => props.priceFormatting_,
+              pseudoRouter_: pseudoRouter
             }),
             recommendations_resource_: looksResource,
             title_: () => props.title_,
@@ -1659,6 +1848,53 @@ function $f577edfe2240eec1$export$1935e6bdfc5ed8ce(props) {
     })();
   }, "LookSlider failed");
 }
+async function $f577edfe2240eec1$var$runDisplayTransformersForLooks(baseData, listings, displayTransformers) {
+  try {
+    const {
+      products: productTransformer,
+      categories: providedListingTransformer
+    } = displayTransformers || {};
+    if (!productTransformer && !providedListingTransformer) return listings;
+    const listingTransformer = providedListingTransformer || (({
+      data: data
+    }) => data);
+    const displaysToTransform = [];
+    const displayIdsPerListingId = {};
+    const transformedListingsPromise = listingTransformer({
+      ...baseData,
+      data: listings.map(({
+        displays: displays,
+        ...listing
+      }) => {
+        // 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++) {
+          const display = displays[i];
+          const uniqueIdOfDisplay = $16351e4c87b90b3d$export$548d053aba053d79(display);
+          displaysToTransform.push(display);
+          (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 => [$16351e4c87b90b3d$export$548d053aba053d79(display), display]));
+    return transformedListings.map(listing => $9HbP8$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) {
+    $9HbP8$dwarn("Displaytransformers threw", e);
+    return [];
+  }
+}
 const $90980bd87c9960f9$export$3064e1e8c6513da3 = new Set();
 let $90980bd87c9960f9$var$has_ran = false;
 function $90980bd87c9960f9$export$5162a71f252e6122() {
@@ -1699,21 +1935,6 @@ function $90980bd87c9960f9$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 $a281666e5c15c2ec$export$29d28dadc2d6b631(clickEvent) {
-  return clickEvent?.button ||
-  // if not zero it's a wheel click which opens in new tab
-  clickEvent?.metaKey ||
-  // if true, cmd button on macOS which opens in new tab
-  clickEvent?.ctrlKey ||
-  // if true, ctrl button on windows or linux which opens in new tab
-  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
  */
@@ -1753,12 +1974,6 @@ function $d8dbf52fea1773e2$export$f50b88e2a00918b5(fn) {
     }
   };
 }
-function $8c0f86cb3e266eeb$export$a71e92cfbb498adc(props) {
-  return $9HbP8$createMemo(() => {
-    const price_formatting = props.price_formatting_;
-    return $9HbP8$standard_price_format(props.price_, price_formatting.places_after_comma_, price_formatting.decimal_places_delimiter_, price_formatting.thousands_delimiter_);
-  });
-}
 function $f4125ce4984deee6$export$fb40a80c530e5f2b(selectedIndex, groupIndex, indexInGroup) {
   const isSelected = $9HbP8$createMemo(() => {
     const selectedValue = selectedIndex();
@@ -3125,7 +3340,7 @@ function $5285d2814d0fac0c$export$b94867ecbd698f21({
     $9HbP8$insert(_el$5, $9HbP8$createComponent((0, $19976a74d273070d$export$3b621d86b1566b2), {}));
     var _ref$2 = submit_button_ref_;
     typeof _ref$2 === "function" ? $9HbP8$use(_ref$2, _el$6) : submit_button_ref_ = _el$6;
-    $9HbP8$spread(_el$6, $9HbP8$mergeProps({
+    $9HbP8$spread(_el$6, $9HbP8$mergeProps1({
       get onClick() {
         return $9HbP8$catchify(() => submit_query_());
       }
@@ -3762,7 +3977,7 @@ function $4ce5b8892775b62d$export$67152d26d4f56ee8({
   const href = $9HbP8$createMemo(() => 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 => (() => {
     var _el$ = $9HbP8$getNextElement($4ce5b8892775b62d$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(props, {
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(props, {
       get href() {
         return href();
       },
@@ -4156,7 +4371,7 @@ function $2f3171b02c8f4a5d$export$af1fb307bbba2417({
   $9HbP8$createComputed($9HbP8$on(search_field_value_[0], () => !suggestions_updating_blocked() && set_selected_index(undefined), {
     defer: true
   })); // reset autocomplete position if query changes
-  return [$9HbP8$createComponent((0, $903297121898e5ff$export$d4994a86c6235f72), $9HbP8$mergeProps(sharedSuggestionProps, {
+  return [$9HbP8$createComponent((0, $903297121898e5ff$export$d4994a86c6235f72), $9HbP8$mergeProps1(sharedSuggestionProps, {
     get title_() {
       return i18n_.popular_;
     },
@@ -4166,7 +4381,7 @@ function $2f3171b02c8f4a5d$export$af1fb307bbba2417({
       return itemIndexes_.suggestionsIndex_;
     },
     showPlaceholders_: () => showPlaceholders() || noResults_() && !noResultsPopularSuggestions.latest
-  })), $9HbP8$createComponent((0, $903297121898e5ff$export$d4994a86c6235f72), $9HbP8$mergeProps(sharedSuggestionProps, {
+  })), $9HbP8$createComponent((0, $903297121898e5ff$export$d4994a86c6235f72), $9HbP8$mergeProps1(sharedSuggestionProps, {
     get title_() {
       return i18n_.previous_;
     },
@@ -4183,7 +4398,7 @@ function $2f3171b02c8f4a5d$export$af1fb307bbba2417({
       return _el$;
     })(),
     showPlaceholders_: () => false
-  })), $9HbP8$createComponent((0, $903297121898e5ff$export$d4994a86c6235f72), $9HbP8$mergeProps(sharedSuggestionProps, {
+  })), $9HbP8$createComponent((0, $903297121898e5ff$export$d4994a86c6235f72), $9HbP8$mergeProps1(sharedSuggestionProps, {
     get title_() {
       return i18n_.content_;
     },
@@ -4705,7 +4920,7 @@ function $024fbc0a2d796fad$export$b2539bed5023c21c(props) {
   return $9HbP8$createComponent($024fbc0a2d796fad$var$TabsContext.Provider, {
     value: new (0, $9HbP8$ListenableSet)(),
     get children() {
-      return $9HbP8$createComponent($024fbc0a2d796fad$var$ActualTabs, $9HbP8$mergeProps(props, {
+      return $9HbP8$createComponent($024fbc0a2d796fad$var$ActualTabs, $9HbP8$mergeProps1(props, {
         get children() {
           return props.children;
         }
@@ -4735,7 +4950,7 @@ function $024fbc0a2d796fad$var$ActualTabs(props) {
     },
     children: item => {
       const weSelected = $9HbP8$createMemo(() => isSelected(item().id));
-      return $9HbP8$createComponent((0, $9HbP8$Dynamic), $9HbP8$mergeProps({
+      return $9HbP8$createComponent((0, $9HbP8$Dynamic), $9HbP8$mergeProps1({
         get component() {
           return props.AnchorComponent;
         },
@@ -4842,7 +5057,7 @@ function $024fbc0a2d796fad$export$3e41faf802a29e71(props) {
   if (!currentTabs) throw new Error("Tab must be a child of Tabs");
   const id = $9HbP8$createUniqueId();
   const ourSet = currentTabs;
-  const extendedProps = $9HbP8$mergeProps1({
+  const extendedProps = $9HbP8$mergeProps({
     id: id
   }, props);
   ourSet.add(extendedProps);
@@ -4956,102 +5171,6 @@ function $ca6f574bd8772184$var$history_state_change(signals, entries, state) {
     }
   });
 }
-class $4fd2ba03703a7d92$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
-     */
-  #throwing_on_navigation(...args) {
-    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_(...args);
-    } catch (e) {
-      queueMicrotask(() => {
-        throw e;
-      });
-    }
-  }
-  /**
-  * Vue has async router that needs to be awaited (it navigates after a microtask)
-  * This standardises waiting for all kinds of routers
-  */
-  #get_navigation_happened_promise(is_replace) {
-    return new Promise(resolve => {
-      const handler = what_happened => {
-        if (what_happened === (is_replace ? "replaceState" : "pushState")) {
-          resolve();
-          (0, $9HbP8$instant_exec_on_suspect_history_change).delete(handler);
-        }
-      };
-      (0, $9HbP8$instant_exec_on_suspect_history_change).add(handler);
-    });
-  }
-  navigate_ = {
-    /**
-    * Call this if you *just* want to replace the state object in history.state
-    */
-    replace_state_: new_state => {
-      // 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?.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_: $9HbP8$catchify(async ({
-      new_url_: raw_new_url,
-      event_: event_,
-      force_spa_navigation_: force_spa_navigation_,
-      is_replace_: is_replace_,
-      listing_query_: listing_query_,
-      scroll = true
-    }) => {
-      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 ($a281666e5c15c2ec$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
-          $9HbP8$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_?.preventDefault();
-      const promise = this.#get_navigation_happened_promise(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) $9HbP8$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 this.#throwing_on_navigation.call(this, {
-        is_replace: is_replace_,
-        new_url: new_url_ instanceof URL ? new_url_ : new URL(new_url_, location.origin),
-        scroll: scroll
-      });
-      await promise;
-    })
-  };
-  constructor(on_navigation, listing_query_state_key) {
-    this.listing_query_state_key = listing_query_state_key;
-    this.on_navigation_ = on_navigation;
-  }
-}
 var $2a26c8ff1ef1fe75$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<div class=image-container>`);
 function $2a26c8ff1ef1fe75$export$41e1a079d40a0d58(props) {
   const [display] = $9HbP8$createResource(() => ({
@@ -5168,7 +5287,7 @@ function $3da8afe3ed57cf34$export$7da560f849543dff({
       _el$5 = _el$4.nextSibling,
       [_el$6, _co$2] = $9HbP8$getNextMarker(_el$5.nextSibling);
     $9HbP8$insert(_el$2, (0, $a458486f22b22f63$export$a2cc176055f8f08), _el$4, _co$);
-    $9HbP8$insert(_el$2, $9HbP8$createComponent((0, $c8d5ff4524619fcd$export$d21e32dfedac04be), $9HbP8$mergeProps({
+    $9HbP8$insert(_el$2, $9HbP8$createComponent((0, $c8d5ff4524619fcd$export$d21e32dfedac04be), $9HbP8$mergeProps1({
       get rows() {
         return rows_object_();
       },
@@ -5544,14 +5663,14 @@ function $8560c919ff763930$var$ActualShopTheLookButton(props) {
   const displayStyleValue = $9HbP8$createMemo(() => hasAnythingToShow() ? "" : "none");
   const button = (() => {
     var _el$2 = $9HbP8$getNextElement($8560c919ff763930$var$_tmpl$2);
-    $9HbP8$spread(_el$2, $9HbP8$mergeProps(() => localProps.buttonAttributes), false, true);
+    $9HbP8$spread(_el$2, $9HbP8$mergeProps1(() => localProps.buttonAttributes), false, true);
     $9HbP8$insert(_el$2, () => localProps?.buttonAttributes?.children || "Shop the look");
     $9HbP8$runHydrationEvents();
     return _el$2;
   })();
   $9HbP8$createEffect(() => button.style.display = displayStyleValue()); // Set our attributes like this, so we allow total control over the button from the outside via buttonAttributes
   $9HbP8$createEffect(() => !hasAnythingToShow() && closeModal()); // close modal if we ever get into the state of having it open and not having anything to show
-  $8560c919ff763930$var$modalProps = $9HbP8$mergeProps1(partForModal, {
+  $8560c919ff763930$var$modalProps = $9HbP8$mergeProps(partForModal, {
     products_to_shop_: products_to_shop_
   });
   button.addEventListener("click", openModal);
@@ -6287,7 +6406,7 @@ var $f8a56ba74eedd0c6$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<svg><path d="M
 function $f8a56ba74eedd0c6$export$f21ab0717a89c77f(props) {
   return (() => {
     var _el$ = $9HbP8$getNextElement($f8a56ba74eedd0c6$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(props, {
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(props, {
       "xmlns": "http://www.w3.org/2000/svg",
       "width": "11",
       "height": "12"
@@ -7762,7 +7881,7 @@ const $93716a9ad0dea854$export$414f6a19d38e655c = ({
                 [_el$6, _co$] = $9HbP8$getNextMarker(_el$5.nextSibling),
                 _el$7 = _el$6.nextSibling,
                 [_el$8, _co$2] = $9HbP8$getNextMarker(_el$7.nextSibling);
-              $9HbP8$spread(_el$2, $9HbP8$mergeProps(attributes, {
+              $9HbP8$spread(_el$2, $9HbP8$mergeProps1(attributes, {
                 get disabled() {
                   return $9HbP8$memo(() => !!count_zero())() && !is_selected();
                 },
@@ -9160,7 +9279,7 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
     // 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 => $9HbP8$mergeProps1(item, {
+    const transformedSuggestions = transformerResult.filter(item => item.is_suggestion !== false).map(item => $9HbP8$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];
@@ -9720,7 +9839,7 @@ function $172e1b898d457050$export$7de92c4c2205ebf3({
       [_el$6, _co$2] = $9HbP8$getNextMarker(_el$5.nextSibling);
     $9HbP8$insert(_el$2, () => i18n_.search_recs_title_());
     $9HbP8$insert(_el$, (0, $a458486f22b22f63$export$a2cc176055f8f08), _el$4, _co$);
-    $9HbP8$insert(_el$, $9HbP8$createComponent((0, $c8d5ff4524619fcd$export$d21e32dfedac04be), $9HbP8$mergeProps({
+    $9HbP8$insert(_el$, $9HbP8$createComponent((0, $c8d5ff4524619fcd$export$d21e32dfedac04be), $9HbP8$mergeProps1({
       rows: rows_object,
       layout: "grid",
       element_attributes: {
@@ -10449,7 +10568,7 @@ function $6dee9211e57ac31a$export$ab6b147eec64fea5(props) {
   const container_class = "x" + $9HbP8$createUniqueId();
   const container_element_ = (() => {
     var _el$ = $9HbP8$getNextElement($6dee9211e57ac31a$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(() => props.element_attributes, {
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(() => props.element_attributes, {
       "classList": {
         [container_class]: true
       }
@@ -10724,7 +10843,7 @@ function $e7a7eb102ddc0c79$var$wrap_blocks_in_div(rendered_content_blocks, max_s
         return _el$;
       }
     });
-    return $9HbP8$mergeProps1(block, {
+    return $9HbP8$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
@@ -10965,7 +11084,7 @@ function $2d25e42846eac370$export$3925f87b1545cfc6({
                         } = slider;
                         const Layout = props => $c8d5ff4524619fcd$export$445d8d3f5f706a40(props, insert_here, true);
                         // Do like this, so we don't have to call mergeProps ourselves
-                        $9HbP8$createComponent(Layout, $9HbP8$mergeProps(layout_options_, {
+                        $9HbP8$createComponent(Layout, $9HbP8$mergeProps1(layout_options_, {
                           rows: "all",
                           get cols_at_size() {
                             return modified_cols_at_size();
@@ -11470,7 +11589,7 @@ function $757dac7f7c6c5241$export$9bf11afa910f536e({
           get children() {
             return (() => {
               var _el$34 = $9HbP8$getNextElement($757dac7f7c6c5241$var$_tmpl$5);
-              $9HbP8$insert(_el$34, $9HbP8$createComponent((0, $fab07f52c9861732$export$3f1a388cc0d8fed7), $9HbP8$mergeProps(args_for_filtering_, {
+              $9HbP8$insert(_el$34, $9HbP8$createComponent((0, $fab07f52c9861732$export$3f1a388cc0d8fed7), $9HbP8$mergeProps1(args_for_filtering_, {
                 are_in_modal_: true
               })));
               return _el$34;
@@ -12236,7 +12355,7 @@ function $b2bf2cdcff8142d8$export$f631859cab12b342({
       [_el$8, _co$] = $9HbP8$getNextMarker(_el$7.nextSibling),
       _el$9 = _el$8.nextSibling,
       [_el$10, _co$2] = $9HbP8$getNextMarker(_el$9.nextSibling);
-    $9HbP8$insert(_el$4, $9HbP8$createComponent(LinkIfPossible, $9HbP8$mergeProps(make_link_attributes, {
+    $9HbP8$insert(_el$4, $9HbP8$createComponent(LinkIfPossible, $9HbP8$mergeProps1(make_link_attributes, {
       tabIndex: "-1",
       get children() {
         return $9HbP8$createComponent((0, $190927650b4840eb$export$605674723bcc715c), {
@@ -12245,7 +12364,7 @@ function $b2bf2cdcff8142d8$export$f631859cab12b342({
         });
       }
     })));
-    $9HbP8$insert(_el$5, $9HbP8$createComponent(LinkIfPossible, $9HbP8$mergeProps({
+    $9HbP8$insert(_el$5, $9HbP8$createComponent(LinkIfPossible, $9HbP8$mergeProps1({
       "class": "content-title line-clamp"
     }, make_link_attributes, {
       get title() {
@@ -12392,7 +12511,7 @@ function $49de9d31aeea1b5e$export$6d0c9c22f6652669({
       },
       number_of_results_: num_results
     }), _el$3, _co$);
-    $9HbP8$insert(_el$, $9HbP8$createComponent((0, $c8d5ff4524619fcd$export$d21e32dfedac04be), $9HbP8$mergeProps({
+    $9HbP8$insert(_el$, $9HbP8$createComponent((0, $c8d5ff4524619fcd$export$d21e32dfedac04be), $9HbP8$mergeProps1({
       layout: "grid",
       element_attributes: {
         class: "cards"
@@ -12779,7 +12898,7 @@ function $7097477c78a89208$export$a54ec244c8863715({
   });
   const [sort_and_filter_element_, set_sort_and_filter_element_] = $9HbP8$createSignal();
   const no_results_text_ = $9HbP8$createMemo(() => (search_results_()?.content_search_links?.length ? i18n_.no_products_ : i18n_.no_results_text_)());
-  const results_for = $9HbP8$createComponent((0, $f8c929beb82c512b$export$9dd50d35b9d94fdf), $9HbP8$mergeProps({
+  const results_for = $9HbP8$createComponent((0, $f8c929beb82c512b$export$9dd50d35b9d94fdf), $9HbP8$mergeProps1({
     get type() {
       return (0, $f8c929beb82c512b$export$2452208c79fe93ea).products;
     },
@@ -14672,7 +14791,7 @@ function $df5d81d0fe61ff21$var$add_us_to_crumbs(plp_meta) {
   return $9HbP8$createMemo(() => {
     const api_value = plp_meta()?.breadcrumbs;
     if (!api_value) return api_value;
-    return [...api_value, $9HbP8$mergeProps1(plp_meta(), {
+    return [...api_value, $9HbP8$mergeProps(plp_meta(), {
       get page_url() {
         return href_accessor();
       }