@depict-ai/ui 4.7.35 → 4.8.1

package/ES10/index.cjs

@@ -18,9 +18,9 @@ function $parcel$export(e, n, v, s) {
 function $parcel$interopDefault(a) {
   return a && a.__esModule ? a.default : a;
 }
-$parcel$export(module.exports, "ModernResponsiveImage", () => $f3db423dc84bc35d$export$140423fa4bfb6d63);
 $parcel$export(module.exports, "setExtraDisplayTransformers", () => $cc9aacef898ccc9a$export$f98b8d5ea7207a1);
 $parcel$export(module.exports, "getExtraDisplayTransformers", () => $cc9aacef898ccc9a$export$b2d94be4f02525b2);
+$parcel$export(module.exports, "ModernResponsiveImage", () => $f3db423dc84bc35d$export$140423fa4bfb6d63);
 $parcel$export(module.exports, "remap_blocks_to_index", () => $f8f375d6245ffff2$export$92aa5d691d588f3f);
 $parcel$export(module.exports, "useMobileHover", () => $0deb6ff75e3d67c6$export$d4d96868197be50e);
 $parcel$export(module.exports, "useVisibilityState", () => $e7a7d2fe8a8217d8$export$54299a3c81f5425);
@@ -112,9 +112,15 @@ $parcel$export(module.exports, "SearchField", () => $98aef9965764903d$export$316
 $parcel$export(module.exports, "BreadCrumbs", () => $335c02c1241a9ca8$export$5b7c3ce0ebe51f86);
 $parcel$export(module.exports, "QuickLinks", () => $335c02c1241a9ca8$export$de035477d6fef996);
 $parcel$export(module.exports, "CategoryPage", () => $c10e33c4681f8c9b$export$e2bf8ce7779e827e);
-$parcel$export(module.exports, "makeSizeAccessors", () => $054b1113e4897051$export$54c6d6ff54e72743);
 /*! Depict.ai search and product listing SDK */
-const $aa1938dec50d6c12$export$83d89fbfd8236492 = "4.7.35";
+const $aa1938dec50d6c12$export$83d89fbfd8236492 = "4.8.1";
+
+// Value first so shopify merchants can set (extra) display transformers in the shopify app
+// Calling these functions normally doesn't do anything, but our shopify app respects them
+// Them being here is value first too because this can be easily imported in the product card editor
+let $cc9aacef898ccc9a$var$extraDisplayTransformers;
+const $cc9aacef898ccc9a$export$b2d94be4f02525b2 = () => $cc9aacef898ccc9a$var$extraDisplayTransformers;
+const $cc9aacef898ccc9a$export$f98b8d5ea7207a1 = displayTransformers => $cc9aacef898ccc9a$var$extraDisplayTransformers = displayTransformers;
 const $d067f3a30f047b41$var$ListingContext = /*@__PURE__*/$52FdA$solidjs.createContext();
 function $d067f3a30f047b41$export$e68cff63f76bd15b(props) {
   const our_object = {};
@@ -195,8 +201,12 @@ const $858fdcf73148519f$export$6066eb417ed2e9f7 = /*@__PURE__*/Symbol("listingCo
 function $858fdcf73148519f$export$6e5611bc7e57e477(props) {
   const img = new Image(); // Need to use new Image or browser might not start loading image before it's in the DOM
   const [ourRatioKeyed, setOurRatioKeyed] = $52FdA$solidjs.createSignal();
+  const [rAFSinceReturned, setRAFSinceReturned] = $52FdA$solidjs.createSignal(false);
   const sizeToUse = $52FdA$solidjs.createMemo(() => {
     var _props$sizeHeight;
+    // We first put the images into the DOM after they have been decoded. We can only get the correct object-fit value after the image is in the DOM.
+    // To avoid using an observer for knowing when the image is in the DOM (one of the most CPU intensive things when we did lighthouse optimisation) we just re-check an animationframe after we told <Show> to show the image, which seems to work reliably
+    rAFSinceReturned();
     // props.size could be a getter that expects a cleanup so get it in this memo instead of where we set img.sizes (also we need to multiply, and it's good with some diffing here so people calling the comp don't have to)
     const incomingSize = props.size();
     const ratio = ourRatioKeyed();
@@ -355,6 +365,7 @@ function $858fdcf73148519f$export$6e5611bc7e57e477(props) {
       hasDecodedFastPath = true;
     });
   });
+  $52FdA$solidjs.createEffect(() => hasDecoded() && requestAnimationFrame($52FdA$depictaiutilishared.catchify(() => setRAFSinceReturned(prev => !prev))));
   return $52FdA$solidjsweb.createComponent((0, $52FdA$solidjs.Show), {
     get when() {
       return hasDecoded();
@@ -580,13 +591,6 @@ function $f3db423dc84bc35d$export$140423fa4bfb6d63(props) {
     customUrls: $f3db423dc84bc35d$var$customUrls
   }));
 }
-
-// Value first so shopify merchants can set (extra) display transformers in the shopify app
-// Calling these functions normally doesn't do anything, but our shopify app respects them
-// Them being here is value first too because this can be easily imported in the product card editor
-let $cc9aacef898ccc9a$var$extraDisplayTransformers;
-const $cc9aacef898ccc9a$export$b2d94be4f02525b2 = () => $cc9aacef898ccc9a$var$extraDisplayTransformers;
-const $cc9aacef898ccc9a$export$f98b8d5ea7207a1 = displayTransformers => $cc9aacef898ccc9a$var$extraDisplayTransformers = displayTransformers;
 function $3e17e871e9d0911d$export$d9f36cf74e24d595(media_query) {
   const signal = $52FdA$solidjs.createSignal(false);
   $52FdA$solidjs.onCleanup($52FdA$depictaiutilishared.javascript_media_query(media_query, _ref => {
@@ -10430,7 +10434,8 @@ function $2b15291bd38ac551$export$9862539c89138352(_ref) {
   let {
     get_default_values_: get_default_values_,
     router_: router_,
-    prefix_: prefix_
+    prefix_: prefix_,
+    preserveKeys_: preserveKeys_
   } = _ref;
   const get_prefixed_default_values_ = () => {
     const default_values = get_default_values_();
@@ -10440,9 +10445,11 @@ function $2b15291bd38ac551$export$9862539c89138352(_ref) {
     }));
   };
   const prefixed_state = $367b536a2a94d24e$export$e183a13865960371(get_prefixed_default_values_(), router_);
+  const prefixedPreserveKeys = preserveKeys_ === null || preserveKeys_ === void 0 ? void 0 : preserveKeys_.map(key => prefix_ + key);
   const reset_state = () => {
     const new_defaults = get_prefixed_default_values_();
     for (const key in prefixed_state) {
+      if (prefixedPreserveKeys !== null && prefixedPreserveKeys !== void 0 && prefixedPreserveKeys.includes(key)) continue;
       const new_value = new_defaults[key];
       prefixed_state[key][1](new_value);
     }
@@ -11172,8 +11179,13 @@ class $9cbefc32b9dab36d$export$f34314aa9505732e {
           local_filter_cache: [],
           expanded_hierarchical_filters: [],
           scroll_restoration_data: [],
-          history_content_blocks: []
+          history_content_blocks: {
+            blocks: [],
+            aspectRatios: {}
+          }
         }),
+        // Don't reset content block stuff when leaving category page as we need it for scroll restoration, same with scroll restoration data (actually a bit unsure if this is needed, I think it depends on if someone cleans up our elements before the location changes or after, and maybe some of the test flakyness we have seen is due to this not existing before?)
+        preserveKeys_: ["history_content_blocks", "scroll_restoration_data"],
         router_: $parcel$interopDefault($52FdA$babelruntimehelpersclassPrivateFieldGet)(this, $9cbefc32b9dab36d$var$_router),
         prefix_: "category" + unique_instance_key_for_state + "_"
       });
@@ -12156,8 +12168,15 @@ function $484eec37514a982e$export$3925f87b1545cfc6(_ref) {
                 return for_id === id_currently_querying_for_();
               })) === null || _get_scroll_restorati2 === void 0 ? void 0 : _get_scroll_restorati2.min_results_loaded) !== null && _get_scroll_restorati !== void 0 ? _get_scroll_restorati : min_products_to_fetch_);
             });
-            const doesnt_have_content_blocks = $52FdA$solidjs.createMemo(() => !content_blocks_by_row_());
-            const content_blocks_ = $52FdA$solidjs.createMemo(() => doesnt_have_content_blocks() ? () => [] : $f8f375d6245ffff2$export$791ef57e62e21c3f({
+            const layout = $52FdA$solidjs.createMemo(() => {
+              const incoming_layout = layout_options_().layout;
+              if (incoming_layout === "slider-without-filters") return "slider";
+              return incoming_layout || "grid";
+            });
+            const doesnt_have_content_blocks = $52FdA$solidjs.createMemo(() => !content_blocks_by_row_() || layout() !== "grid");
+            const content_blocks_ = $52FdA$solidjs.createMemo(() => doesnt_have_content_blocks() ?
+            // This bailing here is to not use proxy/stores and retain old browser compatibility when no content blocks are present
+            () => [] : $f8f375d6245ffff2$export$791ef57e62e21c3f({
               content_blocks_: content_blocks_by_row_,
               cols_at_size_: modified_cols_at_size,
               set_top_row_shortened_by_: set_top_row_shortened_by_
@@ -12169,11 +12188,6 @@ function $484eec37514a982e$export$3925f87b1545cfc6(_ref) {
                 num_placeholders_: num_placeholders_
               });
             });
-            const layout = $52FdA$solidjs.createMemo(() => {
-              const incoming_layout = layout_options_().layout;
-              if (incoming_layout === "slider-without-filters") return "slider";
-              return incoming_layout || "grid";
-            });
             const [get_suspense_is_blocked, set_suspense_is_blocked] = $52FdA$solidjs.createSignal(false);
             const block_suspense_if_needed = () => {
               if (!is_just_after_plp_results_update) return;
@@ -12196,7 +12210,6 @@ function $484eec37514a982e$export$3925f87b1545cfc6(_ref) {
             }, {
               defer: true
             }));
-            $52FdA$solidjs.createEffect(() => layout() !== "grid" && !doesnt_have_content_blocks() && $52FdA$depictaiutilishared.dwarn("Slider layout doesn't support content blocks"));
             /*
             This suspense ensures that if someone has async templates, we still show placeholders until the product cards actually have finished rendering (automagically since they're createResource's)
             We're creating it outside the <Show> so that we can benefit from <For>'s optimisation between changing results
@@ -15960,97 +15973,140 @@ function $c3a7faae6f2b93c9$export$7af06a63c5a976c9(el, listing_id, i18n_) {
   $52FdA$solidjs.onCleanup(disconnect);
 }
 $52FdA$solidjsweb.delegateEvents(["click"]);
-var $c19709057a32b2e7$var$_tmpl$ = /*#__PURE__*/$52FdA$solidjsweb.template(`<a class=d-standard-content-wrapper><video loop class=d-standard-content>`);
+var $c19709057a32b2e7$var$_tmpl$ = /*#__PURE__*/$52FdA$solidjsweb.template(`<video loop class=d-standard-content>`);
 function $c19709057a32b2e7$export$780a853d15174484(_ref) {
   let {
-    contentBlock_: {
-      content: {
-        link: link,
-        type: type,
-        url: mediaUrl
-      }
-    },
-    router_: router_
+    link_: link_,
+    type_: type_,
+    router_: router_,
+    setAspectRatioWas_: setAspectRatioWas_,
+    mediaUrl_: mediaUrl_,
+    aspectRatioWhenAloneInRow_: aspectRatioWhenAloneInRow_
   } = _ref;
-  if (type === "image") {
-    const [wrapperSize, setWrapperSize] = $52FdA$solidjs.createSignal();
-    return $52FdA$solidjsweb.createComponent((0, $52FdA$solidjsweb.Dynamic), $52FdA$solidjsweb.mergeProps({
-      component: link ? "a" : "div",
-      "class": "d-standard-content-wrapper",
-      ref: el => setWrapperSize(() => $054b1113e4897051$export$54c6d6ff54e72743(el)),
-      get onClick() {
-        return $52FdA$depictaiutilisharedlatest.catchify(ev => link && router_.navigate_.go_to_({
-          new_url_: link,
-          is_replace_: false,
-          event_: ev
-        }));
-      }
-    }, link && {
-      href: link
-    }, {
-      get children() {
-        return $52FdA$solidjsweb.createComponent((0, $f3db423dc84bc35d$export$140423fa4bfb6d63), {
-          size: () => {
-            var _wrapperSize, _wrapperSize$;
-            return ((_wrapperSize = wrapperSize()) === null || _wrapperSize === void 0 ? void 0 : (_wrapperSize$ = _wrapperSize[0]) === null || _wrapperSize$ === void 0 ? void 0 : _wrapperSize$.call(_wrapperSize)) || 0;
-          },
-          sizeHeight: () => {
-            var _wrapperSize2, _wrapperSize2$;
-            return ((_wrapperSize2 = wrapperSize()) === null || _wrapperSize2 === void 0 ? void 0 : (_wrapperSize2$ = _wrapperSize2[1]) === null || _wrapperSize2$ === void 0 ? void 0 : _wrapperSize2$.call(_wrapperSize2)) || 0;
-          },
-          src: mediaUrl,
-          "class": "d-standard-content"
-        });
-      }
-    }));
-  }
-  if (type === "video") {
-    const pageVisible = $e7a7d2fe8a8217d8$export$54299a3c81f5425();
-    return (() => {
-      var _el$ = $52FdA$solidjsweb.getNextElement($c19709057a32b2e7$var$_tmpl$),
-        _el$2 = _el$.firstChild;
-      $52FdA$solidjsweb.addEventListener(_el$, "click", $52FdA$depictaiutilisharedlatest.catchify(ev => router_.navigate_.go_to_({
-        new_url_: link,
+  const [wrapperSize, setWrapperSize] = $52FdA$solidjs.createSignal();
+  const isImage = type_ === "image";
+  return $52FdA$solidjsweb.createComponent((0, $52FdA$solidjsweb.Dynamic), $52FdA$solidjsweb.mergeProps({
+    component: link_ ? "a" : "div",
+    "class": "d-standard-content-wrapper",
+    get style() {
+      return $52FdA$solidjsweb.memo(() => !!aspectRatioWhenAloneInRow_())() ? "--media-aspect-ratio: ".concat(aspectRatioWhenAloneInRow_()) : "";
+    },
+    ref: el => isImage && setWrapperSize(() => $054b1113e4897051$export$54c6d6ff54e72743(el)),
+    get onClick() {
+      return $52FdA$depictaiutilisharedlatest.catchify(ev => link_ && router_.navigate_.go_to_({
+        new_url_: link_,
         is_replace_: false,
         event_: ev
-      })), true);
-      $52FdA$solidjsweb.setAttribute(_el$, "href", link);
-      $52FdA$solidjsweb.use(element => $52FdA$solidjs.createEffect(() => {
-        if (pageVisible()) element.play().catch(e => $52FdA$depictaiutilishared.dlog("Failed to play", e));else element.pause();
-      }), _el$2);
-      $52FdA$solidjsweb.setAttribute(_el$2, "src", mediaUrl);
-      $52FdA$solidjsweb.setProperty(_el$2, "controls", false);
-      $52FdA$solidjsweb.setProperty(_el$2, "muted", true);
-      $52FdA$solidjsweb.setProperty(_el$2, "autoplay", true);
-      $52FdA$solidjsweb.setProperty(_el$2, "playsinline", true);
-      $52FdA$solidjsweb.runHydrationEvents();
-      return _el$;
-    })();
-  }
+      }));
+    }
+  }, link_ && {
+    href: link_
+  }, {
+    get children() {
+      return $52FdA$solidjsweb.createComponent((0, $52FdA$solidjs.Switch), {
+        get children() {
+          return [$52FdA$solidjsweb.createComponent((0, $52FdA$solidjs.Match), {
+            when: isImage,
+            get children() {
+              return $52FdA$solidjsweb.createComponent((0, $f3db423dc84bc35d$export$140423fa4bfb6d63), {
+                size: () => {
+                  var _wrapperSize, _wrapperSize$;
+                  return ((_wrapperSize = wrapperSize()) === null || _wrapperSize === void 0 ? void 0 : (_wrapperSize$ = _wrapperSize[0]) === null || _wrapperSize$ === void 0 ? void 0 : _wrapperSize$.call(_wrapperSize)) || 0;
+                },
+                sizeHeight: () => {
+                  var _wrapperSize2, _wrapperSize2$;
+                  return ((_wrapperSize2 = wrapperSize()) === null || _wrapperSize2 === void 0 ? void 0 : (_wrapperSize2$ = _wrapperSize2[1]) === null || _wrapperSize2$ === void 0 ? void 0 : _wrapperSize2$.call(_wrapperSize2)) || 0;
+                },
+                src: mediaUrl_,
+                "class": "d-standard-content",
+                ref: el => el.addEventListener("load", $52FdA$depictaiutilisharedlatest.catchify(() => setAspectRatioWas_(el.naturalWidth / el.naturalHeight)))
+              });
+            }
+          }), $52FdA$solidjsweb.createComponent((0, $52FdA$solidjs.Match), {
+            when: type_ === "video",
+            get children() {
+              var _el$ = $52FdA$solidjsweb.getNextElement($c19709057a32b2e7$var$_tmpl$);
+              $52FdA$solidjsweb.use(element => {
+                const pageVisible = $e7a7d2fe8a8217d8$export$54299a3c81f5425();
+                element.addEventListener("loadedmetadata", $52FdA$depictaiutilisharedlatest.catchify(() => setAspectRatioWas_(element.videoWidth / element.videoHeight)));
+                $52FdA$solidjs.createEffect(() => {
+                  if (pageVisible()) element.play().catch(e => $52FdA$depictaiutilishared.dlog("Failed to play", e));else element.pause();
+                });
+              }, _el$);
+              $52FdA$solidjsweb.setAttribute(_el$, "src", mediaUrl_);
+              $52FdA$solidjsweb.setProperty(_el$, "controls", false);
+              $52FdA$solidjsweb.setProperty(_el$, "muted", true);
+              $52FdA$solidjsweb.setProperty(_el$, "autoplay", true);
+              $52FdA$solidjsweb.setProperty(_el$, "playsinline", true);
+              return _el$;
+            }
+          })];
+        }
+      });
+    }
+  }));
 }
-$52FdA$solidjsweb.delegateEvents(["click"]);
 function $0c035bbe7e30b438$export$7a92d995f1bf3592(history_content_blocks_, plp_meta, content_blocks_by_row_, router_) {
+  let hasSeenContentBlock = false;
   const [historyContentBlocks, setHistoryContentBlocks] = history_content_blocks_;
+  const contentComponents = new Map();
   $52FdA$solidjs.createEffect(() => {
     var _plp_meta;
     const serverContentBlock = (_plp_meta = plp_meta()) === null || _plp_meta === void 0 ? void 0 : _plp_meta.content_blocks;
-    if (serverContentBlock && JSON.stringify(serverContentBlock) !== JSON.stringify(historyContentBlocks())) setHistoryContentBlocks(serverContentBlock);
+    const currentHistory = $52FdA$solidjs.untrack(historyContentBlocks);
+    // Only write to the history if the content blocks have changed when a new backend results arrives (we have them in history so scroll restoration works when going back, even when running shopify without single page navigations where our script dies inbetween pages).
+    if (serverContentBlock && JSON.stringify(serverContentBlock) !== JSON.stringify(currentHistory.blocks)) setHistoryContentBlocks({
+      ...currentHistory,
+      blocks: serverContentBlock
+    });
   });
   const contentBlocksByRow = $52FdA$solidjs.createMemo(() => {
     const developerProvided = content_blocks_by_row_();
-    const fromHistory = historyContentBlocks();
-    // If none come from backend/History, fall back to developer provided/what usually is undefined. layout="slider" and layout="slider-without-filters" is only supported if content blocks is undefined, so if we don't do that those layouts are broken.
-    if (developerProvided || !fromHistory.length) return developerProvided;
+    const {
+      blocks: blocksFromHistory
+    } = historyContentBlocks();
+    if (developerProvided) return developerProvided;
+    // If we didn't get any content blocks (backend always return empty array) and we haven't seen any content blocks yet, return undefined
+    // This is so the result rendering (PLPResults) will still use flexbox provided rendering on existing customers, so adding this isn't a breaking change
+    // We don't want to switch rendering method every time one switches between a collection that hasn't vs has content blocks though, so once we've seen one content block we'll switch to css-grid-based rendering
+    if (!(blocksFromHistory !== null && blocksFromHistory !== void 0 && blocksFromHistory.length) && !hasSeenContentBlock) return;
     const content = [];
-    fromHistory.forEach(row => {
+    hasSeenContentBlock = true;
+    blocksFromHistory.forEach(row => {
+      const {
+        content: {
+          link: link,
+          type: type,
+          url: url
+        }
+      } = row;
+      // Key the "content"-component by the link, type and url, so we can reuse the component (and later downstream the block elements) if it's the same
+      // This makes the block not flicker when going backwards/forwards if the content is the same on both pages
+      // Also it lets us rewrite the blocks state in the history based on the block aspect ratio without infinite looping
+      const componentCacheKey = JSON.stringify([link, type, url]);
+      let component = contentComponents.get(componentCacheKey);
+      if (!component) {
+        component = () => $52FdA$solidjsweb.createComponent((0, $c19709057a32b2e7$export$780a853d15174484), {
+          link_: link,
+          type_: type,
+          mediaUrl_: url,
+          router_: router_,
+          aspectRatioWhenAloneInRow_: () => historyContentBlocks().aspectRatios[componentCacheKey],
+          setAspectRatioWas_: aspectRatio => setHistoryContentBlocks(prev => ({
+            ...prev,
+            aspectRatios: {
+              ...prev.aspectRatios,
+              [componentCacheKey]: Math.round(aspectRatio * 100) / 100
+            }
+          }))
+        });
+        contentComponents.set(componentCacheKey, component);
+      }
       const contentBlock = {
         span_columns: row.span_columns,
         span_rows: row.span_rows,
         position: row.position,
-        content: () => $52FdA$solidjsweb.createComponent((0, $c19709057a32b2e7$export$780a853d15174484), {
-          contentBlock_: row,
-          router_: router_
-        })
+        content: component
       };
       content[row.row] = contentBlock;
     });

package/ES10/index.d.ts

@@ -1,8 +1,8 @@
-import { JSX, Accessor, Setter, Signal } from "solid-js";
 import { Display, ModernDisplay, report, Amazing_Slider, useExpandingContainer, ColsAtSize, Elem, Node_Array } from "@depict-ai/utilishared/ES10";
 import { ContentLink, SearchResponse, SearchFilter as _SearchFilter1 } from "@depict-ai/types/api/SearchResponse";
 import { Ancestors, ListingSuggestion, SearchSuggestionsResponseV3 } from "@depict-ai/types/api/SearchSuggestionsResponseV3";
 import { ProductListing, GetListingResponse, ContentBlock as _ContentBlock1 } from "@depict-ai/types/api/GetListingResponse";
+import { JSX, Accessor, Setter, Signal } from "solid-js";
 import { SearchFilter, SearchRequestV3, SortModel } from "@depict-ai/types/api/SearchRequestV3";
 import { ProductListingResponseV3, SearchFilter as _SearchFilter2 } from "@depict-ai/types/api/ProductListingResponseV3";
 import { SearchSuggestionsRequestV3 } from "@depict-ai/types/api/SearchSuggestionsRequestV3";
@@ -11,7 +11,61 @@ import { GetListingRequest } from "@depict-ai/types/api/GetListingRequest";
 import { BaseSearchRequestV3 } from "@depict-ai/types/api/BaseSearchRequestV3";
 import { FeaturedInDisplay } from "@depict-ai/types/api/FeaturedInResponseV3";
 import { SearchFilter as _SearchFilter3 } from "@depict-ai/types/api/SearchRequestV2";
-export const version = "4.7.35";
+export const version = "4.8.1";
+type DisplayTransformerAlwaysThereData = {
+  merchant: string;
+  market: string;
+  locale: string;
+};
+type CanBePromiseWrapped<T> = T | Promise<T>;
+export type ModernDisplayWithPageUrl<T extends ModernDisplay> = { [K in keyof T]: K extends "variant_displays" ? (T[K][number] & {
+  page_url: string;
+})[] : T[K] };
+/**
+ * A ProductListing with ancestors added in, this is what we pass to the display transformers as the ancestors might be required to construct the URL
+ */
+type ProductListingWithAncestors = ProductListing & {
+  ancestors: Ancestors;
+};
+/**
+ * The displayTransformer for categories does not only get a list of ListingSuggestions, when a search query has listing suggestions, but also their ancestors since we show breadcrumbs for the listing suggestions. To let the user differentiate (since the suggestion ones can be added/removed but not the ancestors) we add a boolean is_suggestion to the listing suggestions passed to the displayTransformer.
+ */
+type ListingSuggestionForTransformer = (ListingSuggestion & {
+  is_suggestion: true;
+}) | (Omit<ListingSuggestion, "suggestions_result_id"> & {
+  is_suggestion: false;
+});
+/**
+ * DisplayTransformers supersede pageURLCreator
+ * DisplayTransformers are functions that take in a list of categories, content search results or products and then can transform or enrich the data for each category, content search result or product card in a batched way.
+ */
+export type DisplayTransformers<InputDisplay extends ModernDisplay, OutputDisplay extends ModernDisplay | never> = {
+  products?: (options: DisplayTransformerAlwaysThereData & {
+    displays: InputDisplay[];
+  }) => CanBePromiseWrapped<OutputDisplay extends ModernDisplay ? ModernDisplayWithPageUrl<OutputDisplay>[] : never>;
+  categories?: <T extends ProductListingWithAncestors | ListingSuggestionForTransformer>(options: DisplayTransformerAlwaysThereData & {
+    data: T[];
+  }) => CanBePromiseWrapped<(T & {
+    page_url: string;
+  })[]>;
+  contentResults?: (options: DisplayTransformerAlwaysThereData & {
+    data: ContentLink[];
+  }) => CanBePromiseWrapped<ContentLink[]>;
+};
+export type SomethingTakingADisplayTransformers<InputDisplay extends Display, OutputDisplay extends ModernDisplay | never> = InputDisplay extends ModernDisplay ? "page_url" extends keyof InputDisplay["variant_displays"][number] ? {
+  display_transformers: DisplayTransformers<InputDisplay, OutputDisplay>;
+} : {
+  display_transformers: DisplayTransformers<InputDisplay, OutputDisplay>;
+} : {
+  page_url_creator?: never;
+  display_transformers?: never;
+};
+export const getExtraDisplayTransformers: () => DisplayTransformers<any, any> | undefined;
+/**
+ * When called from inside the shopify apps product card editor, this registers extra display transformers to be ran alongside Depict's default added ones. The ones for products and content will run after Depicts but the ones for categories will run before Depicts.
+ * @param displayTransformers
+ */
+export const setExtraDisplayTransformers: <InputDisplay extends ModernDisplay, OutputDisplay extends ModernDisplay = ModernDisplayWithPageUrl<InputDisplay>>(displayTransformers: DisplayTransformers<InputDisplay, OutputDisplay>) => DisplayTransformers<InputDisplay, OutputDisplay>;
 /**
  * Provider to wrap every listing (group of products) in
  * Used for example for deduplicating ResizeObservers for responsive images
@@ -115,10 +169,6 @@ export function TextPlaceholder(props: {
   class?: string;
 }): JSX.Element;
 export function DefaultInstantCardPlaceholder(): HTMLDivElement;
-/**
- * Returns two accessors (one width and one height) that will update when the size of the provided element changes, to be used with ResponsiveImg
- */
-export function makeSizeAccessors(whatToWatch: HTMLElement): [Accessor<number>, Accessor<number>];
 export const shopifyContainedImageContextSymbol: unique symbol;
 /**
  * Abstraction built on top of ShopifyResponsiveImg. This is your one-stop-shop If you just need a responsive image.
@@ -147,60 +197,6 @@ export function ModernResponsiveContainedImage(props: Parameters<typeof ShopifyC
  * Wrapper around ShopifyResponsiveImg (component that just does an image, without wrapping in div). The wrapper allows ShopifyResponsiveImg to work both with shopify CDN URLs and arbitrary URLs, where the latter will be fed through Depict's cloudflare resizer.
  */
 export function ModernResponsiveImage(props: Parameters<typeof ShopifyResponsiveImg>[0]): import("solid-js").JSX.Element;
-type DisplayTransformerAlwaysThereData = {
-  merchant: string;
-  market: string;
-  locale: string;
-};
-type CanBePromiseWrapped<T> = T | Promise<T>;
-export type ModernDisplayWithPageUrl<T extends ModernDisplay> = { [K in keyof T]: K extends "variant_displays" ? (T[K][number] & {
-  page_url: string;
-})[] : T[K] };
-/**
- * A ProductListing with ancestors added in, this is what we pass to the display transformers as the ancestors might be required to construct the URL
- */
-type ProductListingWithAncestors = ProductListing & {
-  ancestors: Ancestors;
-};
-/**
- * The displayTransformer for categories does not only get a list of ListingSuggestions, when a search query has listing suggestions, but also their ancestors since we show breadcrumbs for the listing suggestions. To let the user differentiate (since the suggestion ones can be added/removed but not the ancestors) we add a boolean is_suggestion to the listing suggestions passed to the displayTransformer.
- */
-type ListingSuggestionForTransformer = (ListingSuggestion & {
-  is_suggestion: true;
-}) | (Omit<ListingSuggestion, "suggestions_result_id"> & {
-  is_suggestion: false;
-});
-/**
- * DisplayTransformers supersede pageURLCreator
- * DisplayTransformers are functions that take in a list of categories, content search results or products and then can transform or enrich the data for each category, content search result or product card in a batched way.
- */
-export type DisplayTransformers<InputDisplay extends ModernDisplay, OutputDisplay extends ModernDisplay | never> = {
-  products?: (options: DisplayTransformerAlwaysThereData & {
-    displays: InputDisplay[];
-  }) => CanBePromiseWrapped<OutputDisplay extends ModernDisplay ? ModernDisplayWithPageUrl<OutputDisplay>[] : never>;
-  categories?: <T extends ProductListingWithAncestors | ListingSuggestionForTransformer>(options: DisplayTransformerAlwaysThereData & {
-    data: T[];
-  }) => CanBePromiseWrapped<(T & {
-    page_url: string;
-  })[]>;
-  contentResults?: (options: DisplayTransformerAlwaysThereData & {
-    data: ContentLink[];
-  }) => CanBePromiseWrapped<ContentLink[]>;
-};
-export type SomethingTakingADisplayTransformers<InputDisplay extends Display, OutputDisplay extends ModernDisplay | never> = InputDisplay extends ModernDisplay ? "page_url" extends keyof InputDisplay["variant_displays"][number] ? {
-  display_transformers: DisplayTransformers<InputDisplay, OutputDisplay>;
-} : {
-  display_transformers: DisplayTransformers<InputDisplay, OutputDisplay>;
-} : {
-  page_url_creator?: never;
-  display_transformers?: never;
-};
-export const getExtraDisplayTransformers: () => DisplayTransformers<any, any> | undefined;
-/**
- *
- * @param displayTransformers
- */
-export const setExtraDisplayTransformers: <InputDisplay extends ModernDisplay, OutputDisplay extends ModernDisplay = ModernDisplayWithPageUrl<InputDisplay>>(displayTransformers: DisplayTransformers<InputDisplay, OutputDisplay>) => DisplayTransformers<InputDisplay, OutputDisplay>;
 /**
  * Use `javascript_media_query` but return a reactive accessor instead of taking a callback function
  */
@@ -1315,6 +1311,10 @@ export const embedded_num_products: ({
  * Gets available listings for a given merchant, market and locale
  */
 export function get_listings(merchant: string, market: string, locale: string): Promise<import("@depict-ai/types/api/ListListingsResponseItem").ListListingsResponseItem1[]>;
+type ContentBlockHistoryState = {
+  blocks: _ContentBlock1[];
+  aspectRatios: Record<string, number>;
+};
 type GeneralCategoryListingOptions = {
   market: string;
   merchant: string;
@@ -1351,7 +1351,7 @@ export class DepictCategory<InputDisplay extends Display, OutputDisplay extends
       expanded_: boolean;
     }[]>;
     scroll_restoration_data: Signal<ScrollRestorationData>;
-    history_content_blocks: Signal<_ContentBlock1[]>;
+    history_content_blocks: Signal<ContentBlockHistoryState>;
   };
   /**
    * Signal representing the currently selected filters. Will update to always reflect the state of the current URL. Calling the setter triggers a navigation (replaceState) to an updated URL.