@depict-ai/ui 2.1.3 → 2.1.5

package/latest/index.cjs

@@ -70,7 +70,7 @@ $parcel$export(module.exports, "defaultColsAtSize", () => $a3280f0aad997933$expo
 $parcel$export(module.exports, "defaultCategoryTitlePlugin", () => $a3280f0aad997933$export$7bf543b9d9be2c22);
 $parcel$export(module.exports, "version", () => $b757f75811f3261f$export$83d89fbfd8236492);
 /*! Depict.ai search and product listing SDK */
-const $b757f75811f3261f$export$83d89fbfd8236492 = "2.1.3";
+const $b757f75811f3261f$export$83d89fbfd8236492 = "2.1.5";
 const $1ab22f2cd39b3061$var$fallback_operator = "in";
 const $1ab22f2cd39b3061$var$fallback_token = "";
 const $1ab22f2cd39b3061$var$legacy_filter_prefix = "filter_";
@@ -265,7 +265,6 @@ function $93304d59a9747aa6$export$94026ee33dbabc26(props) {
     return _el$;
   })();
 }
-const $19950faaac026e09$var$_tmpl$ = /*#__PURE__*/$gVhhF$solidjsweb.template(`<img>`);
 function $19950faaac026e09$export$e6fffe67d4cdd848(whatToWatch) {
   const [size, setSize] = $gVhhF$solidjs.createSignal(0);
   const resizeObserver = new ResizeObserver($gVhhF$depictaiutilishared.catchify(records => {
@@ -290,6 +289,7 @@ function $19950faaac026e09$export$e6fffe67d4cdd848(whatToWatch) {
   });
   return size;
 }
+const $19950faaac026e09$var$onIdleFunctionsSymbol = /*@__PURE__*/Symbol("onIdleFunctions");
 function $19950faaac026e09$export$6e5611bc7e57e477(props) {
   // Enable reactive props
   const otherOptions = $gVhhF$solidjs.createMemo(() => {
@@ -312,16 +312,91 @@ function $19950faaac026e09$export$6e5611bc7e57e477(props) {
       srcset: srcset
     };
   });
-  return (() => {
-    const _el$ = $gVhhF$solidjsweb.getNextElement($19950faaac026e09$var$_tmpl$);
-    $gVhhF$solidjsweb.spread(_el$, $gVhhF$solidjsweb.mergeProps(otherOptions, src_options, {
-      get sizes() {
-        return props.size() + "px";
+  // 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 [hasSetSize, setHasSetSize] = $gVhhF$solidjs.createSignal(false);
+  const [hasDecoded, setHasDecoded] = $gVhhF$solidjs.createSignal(false);
+  const sizePX = $gVhhF$solidjs.createMemo(() => `${props.size()}px`); // props.size could be a getter that expects a cleanup so get it in this memo instead of where we set img.sizes
+  const listingContext = $84798aaa863a4909$export$8d0c4fdbb05a2f2e();
+  // Batch idle callbacks so that MutationObserver can batch the resulting mutations better, so we don't lose tons of CPU time to MutationObservers doing lots of things for each image
+  // Happened on singular, they have some weird observer (+we also have one but ours is at least 3x more efficient)
+  const executeWhenIdleBatched = fn => {
+    if (typeof requestIdleCallback !== "function") setTimeout(fn); // Old browsers don't get optimisation
+    const existingStack = listingContext?.[$19950faaac026e09$var$onIdleFunctionsSymbol];
+    if (existingStack) return existingStack.add(fn);
+    const newStack = new Set([fn]);
+    if (listingContext) listingContext[$19950faaac026e09$var$onIdleFunctionsSymbol] = newStack;
+    const processStackWhenIdle = () => requestIdleCallback(deadline => {
+      const start = performance.now();
+      const thirdDeadlineTime = deadline.timeRemaining() / 3; // observers coming after this take up 2-3x the time so don't use all of it
+      for (const fn of newStack) {
+        newStack.delete(fn);
+        fn();
+        const timeTaken = performance.now() - start;
+        if ((!deadline.timeRemaining() || timeTaken > thirdDeadlineTime) && newStack.size) {
+          // There's still work to be done but no time, so schedule another idle callback
+          processStackWhenIdle();
+          return;
+        }
       }
-    }), false, false);
-    $gVhhF$solidjsweb.runHydrationEvents();
-    return _el$;
-  })();
+      // Stack is empty
+      if (listingContext) delete listingContext[$19950faaac026e09$var$onIdleFunctionsSymbol];
+    }, {
+      timeout: 15000
+    } // long timeout, better to not have images than to freeze the browser. But also we don't want to confuse user why no iamges are loading
+    );
+
+    processStackWhenIdle();
+  };
+  let sizeSetFastPath = false;
+  let hasDecodedFastPath = false;
+  let timeoutSet = false;
+  $gVhhF$solidjsweb.spread(img, $gVhhF$solidjs.mergeProps(otherOptions), false, true);
+  $gVhhF$solidjs.createEffect(() => {
+    if (!props.size()) return; // wait until we have a size
+    if (timeoutSet) return;
+    const handler = $gVhhF$depictaiutilishared.catchify(() => {
+      img.sizes = sizePX(); // use latest available value of props.size
+      if (!sizeSetFastPath) {
+        setHasSetSize(true);
+        sizeSetFastPath = true;
+      }
+      timeoutSet = false;
+    });
+    // Throttle the updating of sizes to avoid unnecessary image re-fetches during resize
+    // And also because we first set src after sizes has been set, wait with loading and decoding images until browser is idle
+    // This greatly improves performance when loading (more) products
+    // See https://depictaiworkspace.slack.com/archives/C05NJ0K3WRL/p1698220617663139
+    executeWhenIdleBatched(handler);
+    timeoutSet = true;
+  });
+  $gVhhF$solidjs.createEffect(() => {
+    if (!props.size() || !hasSetSize()) return; // If size isn't known or set, don't assign src yet since it would cause the most low res image to load
+    Object.assign(img, src_options());
+    // Add to DOM once decoded to not require/block any paints before image has completed loading and avoid showing broken image symbol
+    // We can do this because there has to be a container around us giving us a size
+    // No need to listen if we're already in the DOM
+    if (hasDecodedFastPath) return;
+    if (props.loading === "lazy") {
+      // For lazy loading there's no decoding to wait for as it only occurs when the image is visible
+      // Make sure src is set before we put the image into the DOM though so no broken image symbol is shown
+      setHasDecoded(true);
+      hasDecodedFastPath = true;
+    }
+    img.decode().catch(e => $gVhhF$depictaiutilishared.dwarn("Failed to decode image", e, img)) // Display the image also if loading failed so webdev can debug and doesn't get "no image"
+    .then(async () => {
+      // Also wait with inserting image (i.e. paint) until browser is idle
+      await new Promise(r => executeWhenIdleBatched(r));
+      setHasDecoded(true);
+      hasDecodedFastPath = true;
+    });
+  });
+  return $gVhhF$solidjsweb.createComponent((0, $gVhhF$solidjs.Show), {
+    get when() {
+      return hasDecoded();
+    },
+    children: img
+  });
 }
 function $19950faaac026e09$var$make_srcset(url, resolutions) {
   return resolutions.map(width => `${$19950faaac026e09$var$generateImageUrl(url, width)} ${width}w`).join(", ");
@@ -359,7 +434,7 @@ function $a33065cfed827fc0$export$e4b984597b71e989(props) {
     $gVhhF$depictaiutilishared.queueMacroTask(() => setCurrentImageSize(undefined)); // 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
   });
 
-  container.append($gVhhF$solidjsweb.createComponent((0, $19950faaac026e09$export$6e5611bc7e57e477), {
+  $gVhhF$solidjsweb.insert(container, $gVhhF$solidjsweb.createComponent((0, $19950faaac026e09$export$6e5611bc7e57e477), {
     style: "width: 100%; height: 100%; object-fit: contain; position: absolute; inset: 0;",
     get size() {
       return $gVhhF$solidjs.createMemo(() => currentImageSize()?.() || 0);
@@ -4920,6 +4995,9 @@ function $d92f338ba8f9da9b$var$remap_blocks_to_index({
     const cols_showing = n_cols_currently_showing_();
     // Need to keep track of products displaced by blocks above when mapping rows to indexes in the actual grid
     const displaced_products = []; // undefined = is product, true = is content block if number instead of tuple number indicates content blocks in that row. Index in first array is row, index in second array is column
+    if (!cols_showing)
+      // Nope out of here if we don't know how many columns are showing
+      return content_blocks_by_index;
     for (let i = 0; i < wrapped_blocks.length; i++) {
       // i = row to show at
       const block = wrapped_blocks[i];
@@ -4980,7 +5058,9 @@ function $d92f338ba8f9da9b$var$remap_blocks_to_index({
 function $d92f338ba8f9da9b$var$wrap_blocks_in_div(rendered_content_blocks, max_span_columns) {
   const get_wrapped_blocks = $gVhhF$solidjs.mapArray(() => rendered_content_blocks, block => {
     if (!block) return;
-    const get_span_columns = () => Math.min(block.span_columns, max_span_columns() ?? Infinity);
+    const final_span_columns = $gVhhF$solidjs.createMemo(() => Math.min(block.span_columns, max_span_columns() ?? Infinity));
+    // If the item spans an entire row, limit the height to 1 row since there's no concept of "rows" if there are no products beside the block
+    const final_span_rows = $gVhhF$solidjs.createMemo(() => final_span_columns() === max_span_columns() ? 1 : block.span_rows);
     const [rendering_delayed, set_rendering_delayed_] = $gVhhF$solidjs.createSignal(true);
     const content = $gVhhF$solidjsweb.createComponent((0, $gVhhF$solidjs.Show), {
       get when() {
@@ -4995,10 +5075,10 @@ function $d92f338ba8f9da9b$var$wrap_blocks_in_div(rendered_content_blocks, max_s
         }));
         $gVhhF$solidjsweb.effect(_p$ => {
           const _v$ = {
-              [(0, $75777da1687ba3f6$export$c500183c31c2b22e)]: get_span_columns()
+              [(0, $75777da1687ba3f6$export$c500183c31c2b22e)]: final_span_columns()
             },
-            _v$2 = `span ${get_span_columns()}`,
-            _v$3 = `span ${block.span_rows}`;
+            _v$2 = `span ${final_span_columns()}`,
+            _v$3 = `span ${final_span_rows()}`;
           _p$._v$ = $gVhhF$solidjsweb.style(_el$, _v$, _p$._v$);
           _v$2 !== _p$._v$2 && ((_p$._v$2 = _v$2) != null ? _el$.style.setProperty("grid-column", _v$2) : _el$.style.removeProperty("grid-column"));
           _v$3 !== _p$._v$3 && ((_p$._v$3 = _v$3) != null ? _el$.style.setProperty("grid-row", _v$3) : _el$.style.removeProperty("grid-row"));
@@ -5021,7 +5101,10 @@ function $d92f338ba8f9da9b$var$wrap_blocks_in_div(rendered_content_blocks, max_s
       },
       get span_columns() {
         // Cap max width of block to the number of columns available, for everyone downstream
-        return get_span_columns();
+        return final_span_columns();
+      },
+      get span_rows() {
+        return final_span_rows();
       }
     });
   });

package/latest/index.d.ts

@@ -7,7 +7,7 @@ import { CategorySuggestion, SearchSuggestionsResponse } from "@depict-ai/types/
 import { BaseSearchRequest } from "@depict-ai/types/api/BaseSearchRequest";
 import { SearchSuggestionsRequest } from "@depict-ai/types/api/SearchSuggestionsRequest";
 import { ProductListingRequestV2 } from "@depict-ai/types/api/ProductListingRequestV2";
-export const version = "2.1.3";
+export const version = "2.1.5";
 /**
  * Use `javascript_media_query` but return a reactive accessor instead of taking a callback function
  */
@@ -152,17 +152,19 @@ export function ImageContainer(props: {
 export function makeSizeAccessor(whatToWatch: HTMLElement): Accessor<number>;
 /**
  * Automatically generate a srcset from the shopify CDN for an image and set the sizes attribute to the provided accessor.
+ * Will also delay loading and decoding of image until the browser is idle (with 5s timeout) to improve filtering/loading more performance.
  * This is used for our responsive images:
  * 1. The image must have a container with a fixed size (or aspect ratio) that is independent of the image. When aspectRatio is configured on the depict-cards element as data attribute, we will wrap the image in a ImageContainer for this. If it's false, the user has to provide this container themselves.
  * 2. We set a ResizeObserver on one of the currently visible images (see makeSizeAccessor)
  * 3. We set the size attribute of all the visible images to the size of the container we're observing. The point of this is that the sizes attribute is used to determine which image to load, and usually it's set by the user and depends on the relationship between image size and viewport size. By using a ResizeObserver, we can make sure the sizes attribute is always set to the correct value without it having to be configured. This will make so the browser always loads the correct image size for a crisp image but still fast load.
+ * You need to use insert(domNode, <ShopifyResponsiveImg size={sizeAccessor} src={src} />) if you want to insert the return value of this component into a DOM element manually, where you `import { insert } from "solid-js/web";` because we first want to insert the image once it has loaded.
  */
 export function ShopifyResponsiveImg(props: {
   resolutions?: number[];
   size: Accessor<number>;
 } & Omit<JSX.ImgHTMLAttributes<HTMLImageElement>, "srcset" | "src" | "sizes"> & {
   src: string;
-}): HTMLImageElement;
+}): JSX.Element;
 export const shopifyContainedImageContextSymbol: unique symbol;
 /**
  * Abstraction built on top of ShopifyResponsiveImg. This is your one-stop-shop If you just need a responsive image.

package/latest/index.js

@@ -1,12 +1,12 @@
-import { add_to_version_info as $9HbP8$add_to_version_info, base64_encode_unicode as $9HbP8$base64_encode_unicode, base64_decode_unicode as $9HbP8$base64_decode_unicode, dlog as $9HbP8$dlog, queueMacroTask as $9HbP8$queueMacroTask, catchify as $9HbP8$catchify, is_safari as $9HbP8$is_safari, observer as $9HbP8$observer, Amazing_Slider as $9HbP8$Amazing_Slider, slider_snap_css as $9HbP8$slider_snap_css, slider_fading_factory as $9HbP8$slider_fading_factory, slider_fractional_factory as $9HbP8$slider_fractional_factory, camelCasifyObject as $9HbP8$camelCasifyObject, make_random_classname as $9HbP8$make_random_classname, n_col_styling_with_dist as $9HbP8$n_col_styling_with_dist, 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, useExpandingContainer as $9HbP8$useExpandingContainer, standard_price_format as $9HbP8$standard_price_format, hex_to_rgb as $9HbP8$hex_to_rgb, relative_luminance_from_rgb as $9HbP8$relative_luminance_from_rgb, fetch_recs as $9HbP8$fetch_recs, snakeCasifyObject as $9HbP8$snakeCasifyObject, instant_exec_on_suspect_history_change as $9HbP8$instant_exec_on_suspect_history_change, base_url as $9HbP8$base_url, get_depict_id as $9HbP8$get_depict_id, get_user_id as $9HbP8$get_user_id, get_session_id as $9HbP8$get_session_id, sort_obj as $9HbP8$sort_obj, fetch_retry as $9HbP8$fetch_retry, add_version_query_params as $9HbP8$add_version_query_params, dwarn as $9HbP8$dwarn, make_url_with_query_params as $9HbP8$make_url_with_query_params, edit_current_page_meta_tags as $9HbP8$edit_current_page_meta_tags, javascript_media_query as $9HbP8$javascript_media_query, use_href_accessor as $9HbP8$use_href_accessor, is_debug as $9HbP8$is_debug, make_asyncIterable_exiter as $9HbP8$make_asyncIterable_exiter, href_change_ipns as $9HbP8$href_change_ipns, ContainedImage as $9HbP8$ContainedImage, buildThresholdList as $9HbP8$buildThresholdList, deparallelize_no_drop as $9HbP8$deparallelize_no_drop, ListenableSet as $9HbP8$ListenableSet, insert_surfaces as $9HbP8$insert_surfaces } from "@depict-ai/utilishared/latest";
-import { createComponent as $9HbP8$createComponent, template as $9HbP8$template, getNextElement as $9HbP8$getNextElement, effect as $9HbP8$effect, style as $9HbP8$style, spread as $9HbP8$spread, mergeProps as $9HbP8$mergeProps, runHydrationEvents as $9HbP8$runHydrationEvents, insert as $9HbP8$insert, setAttribute as $9HbP8$setAttribute, isServer as $9HbP8$isServer, addEventListener as $9HbP8$addEventListener, className as $9HbP8$className, memo as $9HbP8$memo, delegateEvents as $9HbP8$delegateEvents, classList as $9HbP8$classList, getNextMarker as $9HbP8$getNextMarker, Dynamic as $9HbP8$Dynamic, use as $9HbP8$use, setProperty as $9HbP8$setProperty } from "solid-js/web";
-import { createSignal as $9HbP8$createSignal, getOwner as $9HbP8$getOwner, createEffect as $9HbP8$createEffect, runWithOwner as $9HbP8$runWithOwner, onCleanup as $9HbP8$onCleanup, createMemo as $9HbP8$createMemo, createContext as $9HbP8$createContext, useContext as $9HbP8$useContext, createResource as $9HbP8$createResource, Suspense as $9HbP8$Suspense, Show as $9HbP8$Show, untrack as $9HbP8$untrack, createRenderEffect as $9HbP8$createRenderEffect, Index as $9HbP8$Index, createRoot as $9HbP8$createRoot, For as $9HbP8$For, createUniqueId as $9HbP8$createUniqueId, createComputed as $9HbP8$createComputed, ErrorBoundary as $9HbP8$ErrorBoundary, on as $9HbP8$on, batch as $9HbP8$batch, createReaction as $9HbP8$createReaction, mapArray as $9HbP8$mapArray, mergeProps as $9HbP8$mergeProps1 } from "solid-js";
+import { add_to_version_info as $9HbP8$add_to_version_info, base64_encode_unicode as $9HbP8$base64_encode_unicode, base64_decode_unicode as $9HbP8$base64_decode_unicode, dlog as $9HbP8$dlog, queueMacroTask as $9HbP8$queueMacroTask, catchify as $9HbP8$catchify, is_safari as $9HbP8$is_safari, observer as $9HbP8$observer, dwarn as $9HbP8$dwarn, Amazing_Slider as $9HbP8$Amazing_Slider, slider_snap_css as $9HbP8$slider_snap_css, slider_fading_factory as $9HbP8$slider_fading_factory, slider_fractional_factory as $9HbP8$slider_fractional_factory, camelCasifyObject as $9HbP8$camelCasifyObject, make_random_classname as $9HbP8$make_random_classname, n_col_styling_with_dist as $9HbP8$n_col_styling_with_dist, 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, useExpandingContainer as $9HbP8$useExpandingContainer, standard_price_format as $9HbP8$standard_price_format, hex_to_rgb as $9HbP8$hex_to_rgb, relative_luminance_from_rgb as $9HbP8$relative_luminance_from_rgb, fetch_recs as $9HbP8$fetch_recs, snakeCasifyObject as $9HbP8$snakeCasifyObject, instant_exec_on_suspect_history_change as $9HbP8$instant_exec_on_suspect_history_change, base_url as $9HbP8$base_url, get_depict_id as $9HbP8$get_depict_id, get_user_id as $9HbP8$get_user_id, get_session_id as $9HbP8$get_session_id, sort_obj as $9HbP8$sort_obj, fetch_retry as $9HbP8$fetch_retry, add_version_query_params as $9HbP8$add_version_query_params, make_url_with_query_params as $9HbP8$make_url_with_query_params, edit_current_page_meta_tags as $9HbP8$edit_current_page_meta_tags, javascript_media_query as $9HbP8$javascript_media_query, use_href_accessor as $9HbP8$use_href_accessor, is_debug as $9HbP8$is_debug, make_asyncIterable_exiter as $9HbP8$make_asyncIterable_exiter, href_change_ipns as $9HbP8$href_change_ipns, ContainedImage as $9HbP8$ContainedImage, buildThresholdList as $9HbP8$buildThresholdList, deparallelize_no_drop as $9HbP8$deparallelize_no_drop, ListenableSet as $9HbP8$ListenableSet, insert_surfaces as $9HbP8$insert_surfaces } from "@depict-ai/utilishared/latest";
+import { createComponent as $9HbP8$createComponent, insert as $9HbP8$insert, template as $9HbP8$template, getNextElement as $9HbP8$getNextElement, effect as $9HbP8$effect, style as $9HbP8$style, spread as $9HbP8$spread, setAttribute as $9HbP8$setAttribute, mergeProps as $9HbP8$mergeProps1, isServer as $9HbP8$isServer, runHydrationEvents as $9HbP8$runHydrationEvents, addEventListener as $9HbP8$addEventListener, className as $9HbP8$className, memo as $9HbP8$memo, delegateEvents as $9HbP8$delegateEvents, classList as $9HbP8$classList, getNextMarker as $9HbP8$getNextMarker, Dynamic as $9HbP8$Dynamic, use as $9HbP8$use, setProperty as $9HbP8$setProperty } from "solid-js/web";
+import { createSignal as $9HbP8$createSignal, getOwner as $9HbP8$getOwner, createEffect as $9HbP8$createEffect, runWithOwner as $9HbP8$runWithOwner, onCleanup as $9HbP8$onCleanup, createMemo as $9HbP8$createMemo, createContext as $9HbP8$createContext, useContext as $9HbP8$useContext, mergeProps as $9HbP8$mergeProps, Show as $9HbP8$Show, createResource as $9HbP8$createResource, Suspense as $9HbP8$Suspense, untrack as $9HbP8$untrack, createRenderEffect as $9HbP8$createRenderEffect, Index as $9HbP8$Index, createRoot as $9HbP8$createRoot, For as $9HbP8$For, createUniqueId as $9HbP8$createUniqueId, createComputed as $9HbP8$createComputed, ErrorBoundary as $9HbP8$ErrorBoundary, on as $9HbP8$on, batch as $9HbP8$batch, createReaction as $9HbP8$createReaction, mapArray as $9HbP8$mapArray } from "solid-js";
 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 = "2.1.3";
+const $ec291e0010116877$export$83d89fbfd8236492 = "2.1.5";
 const $4147651646da990a$var$fallback_operator = "in";
 const $4147651646da990a$var$fallback_token = "";
 const $4147651646da990a$var$legacy_filter_prefix = "filter_";
@@ -201,7 +201,6 @@ function $f18d425032111270$export$94026ee33dbabc26(props) {
     return _el$;
   })();
 }
-const $e8ffe11ed01df0fe$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<img>`);
 function $e8ffe11ed01df0fe$export$e6fffe67d4cdd848(whatToWatch) {
   const [size, setSize] = $9HbP8$createSignal(0);
   const resizeObserver = new ResizeObserver($9HbP8$catchify(records => {
@@ -226,6 +225,7 @@ function $e8ffe11ed01df0fe$export$e6fffe67d4cdd848(whatToWatch) {
   });
   return size;
 }
+const $e8ffe11ed01df0fe$var$onIdleFunctionsSymbol = /*@__PURE__*/Symbol("onIdleFunctions");
 function $e8ffe11ed01df0fe$export$6e5611bc7e57e477(props) {
   // Enable reactive props
   const otherOptions = $9HbP8$createMemo(() => {
@@ -248,16 +248,91 @@ function $e8ffe11ed01df0fe$export$6e5611bc7e57e477(props) {
       srcset: srcset
     };
   });
-  return (() => {
-    const _el$ = $9HbP8$getNextElement($e8ffe11ed01df0fe$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(otherOptions, src_options, {
-      get sizes() {
-        return props.size() + "px";
+  // 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 [hasSetSize, setHasSetSize] = $9HbP8$createSignal(false);
+  const [hasDecoded, setHasDecoded] = $9HbP8$createSignal(false);
+  const sizePX = $9HbP8$createMemo(() => `${props.size()}px`); // props.size could be a getter that expects a cleanup so get it in this memo instead of where we set img.sizes
+  const listingContext = $011607bdf658f807$export$8d0c4fdbb05a2f2e();
+  // Batch idle callbacks so that MutationObserver can batch the resulting mutations better, so we don't lose tons of CPU time to MutationObservers doing lots of things for each image
+  // Happened on singular, they have some weird observer (+we also have one but ours is at least 3x more efficient)
+  const executeWhenIdleBatched = fn => {
+    if (typeof requestIdleCallback !== "function") setTimeout(fn); // Old browsers don't get optimisation
+    const existingStack = listingContext?.[$e8ffe11ed01df0fe$var$onIdleFunctionsSymbol];
+    if (existingStack) return existingStack.add(fn);
+    const newStack = new Set([fn]);
+    if (listingContext) listingContext[$e8ffe11ed01df0fe$var$onIdleFunctionsSymbol] = newStack;
+    const processStackWhenIdle = () => requestIdleCallback(deadline => {
+      const start = performance.now();
+      const thirdDeadlineTime = deadline.timeRemaining() / 3; // observers coming after this take up 2-3x the time so don't use all of it
+      for (const fn of newStack) {
+        newStack.delete(fn);
+        fn();
+        const timeTaken = performance.now() - start;
+        if ((!deadline.timeRemaining() || timeTaken > thirdDeadlineTime) && newStack.size) {
+          // There's still work to be done but no time, so schedule another idle callback
+          processStackWhenIdle();
+          return;
+        }
       }
-    }), false, false);
-    $9HbP8$runHydrationEvents();
-    return _el$;
-  })();
+      // Stack is empty
+      if (listingContext) delete listingContext[$e8ffe11ed01df0fe$var$onIdleFunctionsSymbol];
+    }, {
+      timeout: 15000
+    } // long timeout, better to not have images than to freeze the browser. But also we don't want to confuse user why no iamges are loading
+    );
+
+    processStackWhenIdle();
+  };
+  let sizeSetFastPath = false;
+  let hasDecodedFastPath = false;
+  let timeoutSet = false;
+  $9HbP8$spread(img, $9HbP8$mergeProps(otherOptions), false, true);
+  $9HbP8$createEffect(() => {
+    if (!props.size()) return; // wait until we have a size
+    if (timeoutSet) return;
+    const handler = $9HbP8$catchify(() => {
+      img.sizes = sizePX(); // use latest available value of props.size
+      if (!sizeSetFastPath) {
+        setHasSetSize(true);
+        sizeSetFastPath = true;
+      }
+      timeoutSet = false;
+    });
+    // Throttle the updating of sizes to avoid unnecessary image re-fetches during resize
+    // And also because we first set src after sizes has been set, wait with loading and decoding images until browser is idle
+    // This greatly improves performance when loading (more) products
+    // See https://depictaiworkspace.slack.com/archives/C05NJ0K3WRL/p1698220617663139
+    executeWhenIdleBatched(handler);
+    timeoutSet = true;
+  });
+  $9HbP8$createEffect(() => {
+    if (!props.size() || !hasSetSize()) return; // If size isn't known or set, don't assign src yet since it would cause the most low res image to load
+    Object.assign(img, src_options());
+    // Add to DOM once decoded to not require/block any paints before image has completed loading and avoid showing broken image symbol
+    // We can do this because there has to be a container around us giving us a size
+    // No need to listen if we're already in the DOM
+    if (hasDecodedFastPath) return;
+    if (props.loading === "lazy") {
+      // For lazy loading there's no decoding to wait for as it only occurs when the image is visible
+      // Make sure src is set before we put the image into the DOM though so no broken image symbol is shown
+      setHasDecoded(true);
+      hasDecodedFastPath = true;
+    }
+    img.decode().catch(e => $9HbP8$dwarn("Failed to decode image", e, img)) // Display the image also if loading failed so webdev can debug and doesn't get "no image"
+    .then(async () => {
+      // Also wait with inserting image (i.e. paint) until browser is idle
+      await new Promise(r => executeWhenIdleBatched(r));
+      setHasDecoded(true);
+      hasDecodedFastPath = true;
+    });
+  });
+  return $9HbP8$createComponent((0, $9HbP8$Show), {
+    get when() {
+      return hasDecoded();
+    },
+    children: img
+  });
 }
 function $e8ffe11ed01df0fe$var$make_srcset(url, resolutions) {
   return resolutions.map(width => `${$e8ffe11ed01df0fe$var$generateImageUrl(url, width)} ${width}w`).join(", ");
@@ -295,7 +370,7 @@ function $660070e2a394b3c3$export$e4b984597b71e989(props) {
     $9HbP8$queueMacroTask(() => setCurrentImageSize(undefined)); // 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
   });
 
-  container.append($9HbP8$createComponent((0, $e8ffe11ed01df0fe$export$6e5611bc7e57e477), {
+  $9HbP8$insert(container, $9HbP8$createComponent((0, $e8ffe11ed01df0fe$export$6e5611bc7e57e477), {
     style: "width: 100%; height: 100%; object-fit: contain; position: absolute; inset: 0;",
     get size() {
       return $9HbP8$createMemo(() => currentImageSize()?.() || 0);
@@ -698,7 +773,7 @@ function $c8d5ff4524619fcd$export$d21e32dfedac04be(props) {
   const container_class = "x" + $9HbP8$createUniqueId();
   const container_element_ = (() => {
     const _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
       }
@@ -846,7 +921,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_));
@@ -972,7 +1047,7 @@ function $3da8afe3ed57cf34$export$7da560f849543dff({
       _el$4 = _el$3.nextSibling,
       [_el$5, _co$2] = $9HbP8$getNextMarker(_el$4.nextSibling);
     $9HbP8$insert(_el$, (0, $a458486f22b22f63$export$a2cc176055f8f08), _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({
       get rows() {
         return rows_object_();
       },
@@ -1369,7 +1444,7 @@ const $19976a74d273070d$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<svg><path d=
 function $19976a74d273070d$export$3b621d86b1566b2(props = {}) {
   return (() => {
     const _el$ = $9HbP8$getNextElement($19976a74d273070d$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(props, {
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(props, {
       "xmlns": "http://www.w3.org/2000/svg",
       "width": "21.064",
       "height": "21.047",
@@ -1750,7 +1825,7 @@ const $f8a56ba74eedd0c6$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<svg><path d=
 function $f8a56ba74eedd0c6$export$f21ab0717a89c77f(props) {
   return (() => {
     const _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"
@@ -2883,7 +2958,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(() => value().count_ === 0)() && !is_selected();
               },
@@ -4646,7 +4721,7 @@ function $6dee9211e57ac31a$export$ab6b147eec64fea5(props) {
   const container_class = "x" + $9HbP8$createUniqueId();
   const container_element_ = (() => {
     const _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
       }
@@ -4856,6 +4931,9 @@ function $e7a7eb102ddc0c79$var$remap_blocks_to_index({
     const cols_showing = n_cols_currently_showing_();
     // Need to keep track of products displaced by blocks above when mapping rows to indexes in the actual grid
     const displaced_products = []; // undefined = is product, true = is content block if number instead of tuple number indicates content blocks in that row. Index in first array is row, index in second array is column
+    if (!cols_showing)
+      // Nope out of here if we don't know how many columns are showing
+      return content_blocks_by_index;
     for (let i = 0; i < wrapped_blocks.length; i++) {
       // i = row to show at
       const block = wrapped_blocks[i];
@@ -4916,7 +4994,9 @@ function $e7a7eb102ddc0c79$var$remap_blocks_to_index({
 function $e7a7eb102ddc0c79$var$wrap_blocks_in_div(rendered_content_blocks, max_span_columns) {
   const get_wrapped_blocks = $9HbP8$mapArray(() => rendered_content_blocks, block => {
     if (!block) return;
-    const get_span_columns = () => Math.min(block.span_columns, max_span_columns() ?? Infinity);
+    const final_span_columns = $9HbP8$createMemo(() => Math.min(block.span_columns, max_span_columns() ?? Infinity));
+    // If the item spans an entire row, limit the height to 1 row since there's no concept of "rows" if there are no products beside the block
+    const final_span_rows = $9HbP8$createMemo(() => final_span_columns() === max_span_columns() ? 1 : block.span_rows);
     const [rendering_delayed, set_rendering_delayed_] = $9HbP8$createSignal(true);
     const content = $9HbP8$createComponent((0, $9HbP8$Show), {
       get when() {
@@ -4931,10 +5011,10 @@ function $e7a7eb102ddc0c79$var$wrap_blocks_in_div(rendered_content_blocks, max_s
         }));
         $9HbP8$effect(_p$ => {
           const _v$ = {
-              [(0, $6dee9211e57ac31a$export$c500183c31c2b22e)]: get_span_columns()
+              [(0, $6dee9211e57ac31a$export$c500183c31c2b22e)]: final_span_columns()
             },
-            _v$2 = `span ${get_span_columns()}`,
-            _v$3 = `span ${block.span_rows}`;
+            _v$2 = `span ${final_span_columns()}`,
+            _v$3 = `span ${final_span_rows()}`;
           _p$._v$ = $9HbP8$style(_el$, _v$, _p$._v$);
           _v$2 !== _p$._v$2 && ((_p$._v$2 = _v$2) != null ? _el$.style.setProperty("grid-column", _v$2) : _el$.style.removeProperty("grid-column"));
           _v$3 !== _p$._v$3 && ((_p$._v$3 = _v$3) != null ? _el$.style.setProperty("grid-row", _v$3) : _el$.style.removeProperty("grid-row"));
@@ -4947,7 +5027,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
@@ -4957,7 +5037,10 @@ function $e7a7eb102ddc0c79$var$wrap_blocks_in_div(rendered_content_blocks, max_s
       },
       get span_columns() {
         // Cap max width of block to the number of columns available, for everyone downstream
-        return get_span_columns();
+        return final_span_columns();
+      },
+      get span_rows() {
+        return final_span_rows();
       }
     });
   });
@@ -5633,7 +5716,7 @@ function $757dac7f7c6c5241$export$9bf11afa910f536e({
           get children() {
             return (() => {
               const _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;
@@ -7842,7 +7925,7 @@ const $16f0ed5ea30d8d9c$var$_tmpl$ = /*#__PURE__*/$9HbP8$template(`<svg><path d=
 function $16f0ed5ea30d8d9c$export$82eafebb825fc23f(props = {}) {
   return (() => {
     const _el$ = $9HbP8$getNextElement($16f0ed5ea30d8d9c$var$_tmpl$);
-    $9HbP8$spread(_el$, $9HbP8$mergeProps(props, {
+    $9HbP8$spread(_el$, $9HbP8$mergeProps1(props, {
       "xmlns": "http://www.w3.org/2000/svg",
       "width": "20",
       "height": "22"
@@ -8015,7 +8098,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: {
@@ -9959,7 +10042,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), {
@@ -9968,7 +10051,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() {
@@ -10112,7 +10195,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"
@@ -10272,7 +10355,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;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depict-ai/ui",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Base package containing the actual UI of Depict UI along with translations, with a not-simplified API. We recommend using @depict-ai/js-ui or @depict-ai/react-ui instead.",
   "packageManager": "yarn@3.2.2",
   "sass": "styles.scss",