virtua 0.52.4 → 0.52.6

package/lib/svelte/VGrid.svelte

@@ -8,6 +8,7 @@
     createContainerGridDriver,
     createGridLayout,
     createGridPlan,
+    createGridSpanIndex,
     createVirtualStore,
     getAxisItem,
     getAxisLength,
@@ -48,6 +49,9 @@
 
   const rowLayout = createGridLayout(rows, rowHeight, gap);
   const colLayout = createGridLayout(cols, colWidth, gap);
+  let rowSizes = $derived(rowLayout.$getSizes(rows, rowHeight));
+  let colSizes = $derived(colLayout.$getSizes(cols, colWidth));
+  let spanIndex = $derived(createGridSpanIndex(spans));
   const rowStore = createVirtualStore(rowLayout);
   const colStore = createVirtualStore(colLayout);
   const driver = createContainerGridDriver(rowStore, colStore);
@@ -82,28 +86,11 @@
   rowStore.$subscribe(UPDATE_SCROLL_END_EVENT, notifyScrollEnd);
   colStore.$subscribe(UPDATE_SCROLL_END_EVENT, notifyScrollEnd);
 
-  // The sizes read from the items are tracked, so the items mutated in place are followed.
   $effect.pre(() => {
-    updateGridAxis(
-      rowStore,
-      rowLayout,
-      rows,
-      rowHeight,
-      headerRows,
-      footerRows,
-      true,
-    );
+    updateGridAxis(rowStore, rowLayout, rows, rowSizes, headerRows, footerRows);
   });
   $effect.pre(() => {
-    updateGridAxis(
-      colStore,
-      colLayout,
-      cols,
-      colWidth,
-      headerCols,
-      footerCols,
-      true,
-    );
+    updateGridAxis(colStore, colLayout, cols, colSizes, headerCols, footerCols);
   });
   let rowCount = $derived(stateVersion && rowStore.$getItemsLength());
   let colCount = $derived(stateVersion && colStore.$getItemsLength());
@@ -114,8 +101,8 @@
       colLayout,
       rowStore.$getRange(bufferSize),
       colStore.$getRange(bufferSize),
+      spanIndex,
       sectionRows,
-      spans,
       keepMounted,
       ariaSort,
     );

package/lib/svelte/utils.d.ts

@@ -2,6 +2,11 @@ import { ItemsRange } from '../core/index.js';
 export declare const styleToString: (obj: Record<string, string | undefined>) => string;
 export declare const isSameRange: (prev: ItemsRange, next: ItemsRange) => boolean;
 export declare const defaultGetKey: (_data: unknown, i: number) => string;
+export type ItemAttrs = {
+    [key: string]: any;
+    style?: Record<string, string | undefined>;
+    class?: string;
+};
 /**
  * A function that provides properties/attributes for item element
  */

package/lib/svelte/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../src/svelte/utils.ts"],"sourcesContent":["import type { ItemsRange } from \"../core/index.js\";\n\nexport const styleToString = (\n  obj: Record<string, string | undefined>,\n): string => {\n  return Object.keys(obj).reduce((acc, k) => {\n    const value = obj[k];\n    if (value == null) {\n      return acc;\n    }\n    return acc + `${k}:${value};`;\n  }, \"\");\n};\n\nexport const isSameRange = (prev: ItemsRange, next: ItemsRange): boolean => {\n  return prev[0] === next[0] && prev[1] === next[1];\n};\n\nexport const defaultGetKey = (_data: unknown, i: number) => \"_\" + i;\n\n/**\n * @internal\n */\nexport type ItemAttrs = {\n  [key: string]: any;\n  style?: Record<string, string | undefined>;\n  class?: string;\n};\n\n/**\n * A function that provides properties/attributes for item element\n */\nexport type ItemProps<T = unknown> = (payload: {\n  item: T;\n  index: number;\n}) => ItemAttrs | undefined;\n"],"mappings":";AAEA,IAAa,iBACX,QACW;CACX,OAAO,OAAO,KAAK,GAAG,CAAC,CAAC,QAAQ,KAAK,MAAM;EACzC,MAAM,QAAQ,IAAI;EAClB,IAAI,SAAS,MACX,OAAO;EAET,OAAO,MAAM,GAAG,EAAE,GAAG,MAAM;CAC7B,GAAG,EAAE;AACP;AAEA,IAAa,eAAe,MAAkB,SAA8B;CAC1E,OAAO,KAAK,OAAO,KAAK,MAAM,KAAK,OAAO,KAAK;AACjD;AAEA,IAAa,iBAAiB,OAAgB,MAAc,MAAM"}
+{"version":3,"file":"utils.js","names":[],"sources":["../../src/svelte/utils.ts"],"sourcesContent":["import type { ItemsRange } from \"../core/index.js\";\n\nexport const styleToString = (\n  obj: Record<string, string | undefined>,\n): string => {\n  return Object.keys(obj).reduce((acc, k) => {\n    const value = obj[k];\n    if (value == null) {\n      return acc;\n    }\n    return acc + `${k}:${value};`;\n  }, \"\");\n};\n\nexport const isSameRange = (prev: ItemsRange, next: ItemsRange): boolean => {\n  return prev[0] === next[0] && prev[1] === next[1];\n};\n\nexport const defaultGetKey = (_data: unknown, i: number) => \"_\" + i;\n\nexport type ItemAttrs = {\n  [key: string]: any;\n  style?: Record<string, string | undefined>;\n  class?: string;\n};\n\n/**\n * A function that provides properties/attributes for item element\n */\nexport type ItemProps<T = unknown> = (payload: {\n  item: T;\n  index: number;\n}) => ItemAttrs | undefined;\n"],"mappings":";AAEA,IAAa,iBACX,QACW;CACX,OAAO,OAAO,KAAK,GAAG,CAAC,CAAC,QAAQ,KAAK,MAAM;EACzC,MAAM,QAAQ,IAAI;EAClB,IAAI,SAAS,MACX,OAAO;EAET,OAAO,MAAM,GAAG,EAAE,GAAG,MAAM;CAC7B,GAAG,EAAE;AACP;AAEA,IAAa,eAAe,MAAkB,SAA8B;CAC1E,OAAO,KAAK,OAAO,KAAK,MAAM,KAAK,OAAO,KAAK;AACjD;AAEA,IAAa,iBAAiB,OAAgB,MAAc,MAAM"}