virtua 0.45.0 → 0.45.1

package/lib/solid/index.jsx

@@ -968,9 +968,9 @@ const createWindowScroller = (store, isHorizontal) => {
 /**
  * @internal
  */
-const createGridScroller = (vStore, hStore) => {
-    const vScroller = createScroller(vStore, false);
-    const hScroller = createScroller(hStore, true);
+const createGridScroller = (rowStore, colStore) => {
+    const vScroller = createScroller(rowStore, false);
+    const hScroller = createScroller(colStore, true);
     return {
         $observe(viewportElement) {
             vScroller.$observe(viewportElement);
@@ -1111,10 +1111,8 @@ const createWindowResizer = (store, isHorizontal) => {
 /**
  * @internal
  */
-const createGridResizer = (vStore, hStore) => {
+const createGridResizer = (rowStore, colStore) => {
     let viewportElement;
-    const heightKey = "height";
-    const widthKey = "width";
     const mountedIndexes = new WeakMap();
     const maybeCachedRowIndexes = new Set();
     const maybeCachedColIndexes = new Set();
@@ -1123,13 +1121,13 @@ const createGridResizer = (vStore, hStore) => {
     const resizeObserver = createResizeObserver((entries) => {
         const resizedRows = new Set();
         const resizedCols = new Set();
-        for (const { target, contentRect } of entries) {
+        for (const { target, contentRect: { width, height }, } of entries) {
             // Skip zero-sized rects that may be observed under `display: none` style
             if (!target.offsetParent)
                 continue;
             if (target === viewportElement) {
-                vStore.$update(ACTION_VIEWPORT_RESIZE, contentRect[heightKey]);
-                hStore.$update(ACTION_VIEWPORT_RESIZE, contentRect[widthKey]);
+                rowStore.$update(ACTION_VIEWPORT_RESIZE, height);
+                colStore.$update(ACTION_VIEWPORT_RESIZE, width);
             }
             else {
                 const cell = mountedIndexes.get(target);
@@ -1137,20 +1135,16 @@ const createGridResizer = (vStore, hStore) => {
                     const [rowIndex, colIndex] = cell;
                     const key = getKey(rowIndex, colIndex);
                     const prevSize = sizeCache.get(key);
-                    const size = [
-                        contentRect[heightKey],
-                        contentRect[widthKey],
-                    ];
                     let rowResized;
                     let colResized;
                     if (!prevSize) {
                         rowResized = colResized = true;
                     }
                     else {
-                        if (prevSize[0] !== size[0]) {
+                        if (prevSize[0] !== height) {
                             rowResized = true;
                         }
-                        if (prevSize[1] !== size[1]) {
+                        if (prevSize[1] !== width) {
                             colResized = true;
                         }
                     }
@@ -1161,7 +1155,7 @@ const createGridResizer = (vStore, hStore) => {
                         resizedCols.add(colIndex);
                     }
                     if (rowResized || colResized) {
-                        sizeCache.set(key, size);
+                        sizeCache.set(key, [height, width]);
                     }
                 }
             }
@@ -1180,7 +1174,7 @@ const createGridResizer = (vStore, hStore) => {
                     heightResizes.push([rowIndex, maxHeight]);
                 }
             });
-            vStore.$update(ACTION_ITEM_RESIZE, heightResizes);
+            rowStore.$update(ACTION_ITEM_RESIZE, heightResizes);
         }
         if (resizedCols.size) {
             const widthResizes = [];
@@ -1196,7 +1190,7 @@ const createGridResizer = (vStore, hStore) => {
                     widthResizes.push([colIndex, maxWidth]);
                 }
             });
-            hStore.$update(ACTION_ITEM_RESIZE, widthResizes);
+            colStore.$update(ACTION_ITEM_RESIZE, widthResizes);
         }
     });
     return {
@@ -1215,19 +1209,19 @@ const createGridResizer = (vStore, hStore) => {
         },
         $resizeCols(cols) {
             for (const [c] of cols) {
-                for (let r = 0; r < vStore.$getItemsLength(); r++) {
+                for (let r = 0; r < rowStore.$getItemsLength(); r++) {
                     sizeCache.delete(getKey(r, c));
                 }
             }
-            hStore.$update(ACTION_ITEM_RESIZE, cols);
+            colStore.$update(ACTION_ITEM_RESIZE, cols);
         },
         $resizeRows(rows) {
             for (const [r] of rows) {
-                for (let c = 0; c < hStore.$getItemsLength(); c++) {
+                for (let c = 0; c < colStore.$getItemsLength(); c++) {
                     sizeCache.delete(getKey(r, c));
                 }
             }
-            vStore.$update(ACTION_ITEM_RESIZE, rows);
+            rowStore.$update(ACTION_ITEM_RESIZE, rows);
         },
         $dispose: resizeObserver._dispose,
     };