@noraent/nora-datagrid 0.0.74 → 0.0.76

package/lib/cjs/DataGrid.js

@@ -23,7 +23,7 @@ console.info(`%c
 ██║  ██║██╔══██║   ██║   ██╔══██║╚════╝██║   ██║██╔══██╗██║██║  ██║
 ██████╔╝██║  ██║   ██║   ██║  ██║      ╚██████╔╝██║  ██║██║██████╔╝
 ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚═╝  ╚═╝       ╚═════╝ ╚═╝  ╚═╝╚═╝╚═════╝   Beta3(v${packageJsonExpr.version}) 
-`, "color: #27c382; font-size:10px");
+`, "color:#22577A");
 const DataGridMaster = React.forwardRef((props, _ref) => {
     const { gridRef } = props;
     const apiRef = useGridInitialization(gridRef, props);

package/lib/cjs/buildPackage.json

@@ -1,6 +1,6 @@
 {
   "name": "@noraent/nora-datagrid",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "module": "./lib/esm/index.js",
   "main": "./lib/cjs/index.js",
   "private": false,
@@ -20,7 +20,7 @@
     "preview": "vite preview",
     "test": "jest",
     "tsc-build": "tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json && npm run vite-build && npm run copy-scss",
-    "vite-build": "vite build",
+    "vite-build": "pnpm run build:production",
     "publish:npm": "rm -rf dist && mkdir dist && npm run vite-build && npm run copy-package",
     "copy-package": "cp package.json dist/buildPackage.json && cp package.json lib/cjs/buildPackage.json&& cp package.json lib/esm/buildPackage.json",
     "copy-scss": "cpx \"src/**/*.scss\" lib/cjs && cpx \"src/**/*.scss\" lib/esm"

package/lib/cjs/components/TwoDimensionalVirtualizedList.js

@@ -99,6 +99,8 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         return widths;
     }, [columns]);
     const domRef = React.useRef(null);
+    const prevStartRef = useRef(0);
+    const prevEndRef = useRef(0);
     const getItemRange = useEventCallback(() => {
         var _a, _b;
         if (!domRef) {
@@ -110,12 +112,20 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         const rightScrollTop = Math.round((_b = (_a = domRef.current) === null || _a === void 0 ? void 0 : _a.scrollTop) !== null && _b !== void 0 ? _b : 0);
         const dataSource = gridRef.current.store.state.dataSource;
         const start = Math.max(0, binarySearchIndex(cumulativeHeights, rightScrollTop) - overscanTopRow);
+        if (start !== 0 && start === prevStartRef.current) {
+            return {
+                start: prevStartRef.current,
+                end: prevEndRef.current,
+            };
+        }
         let end = Math.min(start + overscanBottomRow, dataSource.length);
         let startAdjust = start ? start + overscanTopRow : start;
         while (end < dataSource.length && cumulativeHeights[end] - cumulativeHeights[startAdjust] <= windowSize.height) {
             end++;
         }
         end = Math.min(end + overscanBottomRow, dataSource.length);
+        prevStartRef.current = start;
+        prevEndRef.current = end;
         return { start, end };
     });
     const { start, end } = getItemRange();
@@ -150,14 +160,14 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         const container = e.currentTarget;
         const scrollTop = container.scrollTop;
         const scrollLeft = container.scrollLeft;
-        rightScroll.scrollTop = scrollTop;
-        bottomScroll.scrollLeft = scrollLeft;
         if (prevScrollTop.current !== scrollTop) {
             handleScrollController(e.nativeEvent);
+            rightScroll.scrollTop = scrollTop;
             prevScrollTop.current = scrollTop;
         }
         if (prevScrollLeft.current !== scrollLeft) {
             handleScrollBottomController(e.nativeEvent);
+            bottomScroll.scrollLeft = scrollLeft;
             prevScrollLeft.current = scrollLeft;
         }
     });
@@ -182,15 +192,12 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         }
         isLocked.current = true;
         const domScroll = domRef.current;
-        const rightScroll = rightScrollRef.current;
         const currentTarget = e.target;
         requestAnimationFrame(() => {
             ReactDOM.flushSync(() => {
                 const scrollTop = currentTarget.scrollTop;
-                if (domScroll && rightScroll) {
-                    domScroll.scrollTop = scrollTop;
-                    currentTarget.scrollTop !== undefined && setScrollTop(scrollTop);
-                }
+                domScroll.scrollTop = scrollTop;
+                currentTarget.scrollTop !== undefined && setScrollTop(scrollTop);
             });
         });
     }, []);

package/lib/esm/DataGrid.js

@@ -23,7 +23,7 @@ console.info(`%c
 ██║  ██║██╔══██║   ██║   ██╔══██║╚════╝██║   ██║██╔══██╗██║██║  ██║
 ██████╔╝██║  ██║   ██║   ██║  ██║      ╚██████╔╝██║  ██║██║██████╔╝
 ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚═╝  ╚═╝       ╚═════╝ ╚═╝  ╚═╝╚═╝╚═════╝   Beta3(v${packageJsonExpr.version}) 
-`, "color: #27c382; font-size:10px");
+`, "color:#22577A");
 const DataGridMaster = React.forwardRef((props, _ref) => {
     const { gridRef } = props;
     const apiRef = useGridInitialization(gridRef, props);

package/lib/esm/buildPackage.json

@@ -1,6 +1,6 @@
 {
   "name": "@noraent/nora-datagrid",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "module": "./lib/esm/index.js",
   "main": "./lib/cjs/index.js",
   "private": false,
@@ -20,7 +20,7 @@
     "preview": "vite preview",
     "test": "jest",
     "tsc-build": "tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json && npm run vite-build && npm run copy-scss",
-    "vite-build": "vite build",
+    "vite-build": "pnpm run build:production",
     "publish:npm": "rm -rf dist && mkdir dist && npm run vite-build && npm run copy-package",
     "copy-package": "cp package.json dist/buildPackage.json && cp package.json lib/cjs/buildPackage.json&& cp package.json lib/esm/buildPackage.json",
     "copy-scss": "cpx \"src/**/*.scss\" lib/cjs && cpx \"src/**/*.scss\" lib/esm"

package/lib/esm/components/TwoDimensionalVirtualizedList.js

@@ -99,6 +99,8 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         return widths;
     }, [columns]);
     const domRef = React.useRef(null);
+    const prevStartRef = useRef(0);
+    const prevEndRef = useRef(0);
     const getItemRange = useEventCallback(() => {
         var _a, _b;
         if (!domRef) {
@@ -110,12 +112,20 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         const rightScrollTop = Math.round((_b = (_a = domRef.current) === null || _a === void 0 ? void 0 : _a.scrollTop) !== null && _b !== void 0 ? _b : 0);
         const dataSource = gridRef.current.store.state.dataSource;
         const start = Math.max(0, binarySearchIndex(cumulativeHeights, rightScrollTop) - overscanTopRow);
+        if (start !== 0 && start === prevStartRef.current) {
+            return {
+                start: prevStartRef.current,
+                end: prevEndRef.current,
+            };
+        }
         let end = Math.min(start + overscanBottomRow, dataSource.length);
         let startAdjust = start ? start + overscanTopRow : start;
         while (end < dataSource.length && cumulativeHeights[end] - cumulativeHeights[startAdjust] <= windowSize.height) {
             end++;
         }
         end = Math.min(end + overscanBottomRow, dataSource.length);
+        prevStartRef.current = start;
+        prevEndRef.current = end;
         return { start, end };
     });
     const { start, end } = getItemRange();
@@ -150,14 +160,14 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         const container = e.currentTarget;
         const scrollTop = container.scrollTop;
         const scrollLeft = container.scrollLeft;
-        rightScroll.scrollTop = scrollTop;
-        bottomScroll.scrollLeft = scrollLeft;
         if (prevScrollTop.current !== scrollTop) {
             handleScrollController(e.nativeEvent);
+            rightScroll.scrollTop = scrollTop;
             prevScrollTop.current = scrollTop;
         }
         if (prevScrollLeft.current !== scrollLeft) {
             handleScrollBottomController(e.nativeEvent);
+            bottomScroll.scrollLeft = scrollLeft;
             prevScrollLeft.current = scrollLeft;
         }
     });
@@ -182,15 +192,12 @@ const DynamicVirtualScroll = React.memo(({ children }) => {
         }
         isLocked.current = true;
         const domScroll = domRef.current;
-        const rightScroll = rightScrollRef.current;
         const currentTarget = e.target;
         requestAnimationFrame(() => {
             ReactDOM.flushSync(() => {
                 const scrollTop = currentTarget.scrollTop;
-                if (domScroll && rightScroll) {
-                    domScroll.scrollTop = scrollTop;
-                    currentTarget.scrollTop !== undefined && setScrollTop(scrollTop);
-                }
+                domScroll.scrollTop = scrollTop;
+                currentTarget.scrollTop !== undefined && setScrollTop(scrollTop);
             });
         });
     }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noraent/nora-datagrid",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "module": "./lib/esm/index.js",
   "main": "./lib/cjs/index.js",
   "private": false,
@@ -20,7 +20,7 @@
     "preview": "vite preview",
     "test": "jest",
     "tsc-build": "tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json && npm run vite-build && npm run copy-scss",
-    "vite-build": "vite build",
+    "vite-build": "pnpm run build:production",
     "publish:npm": "rm -rf dist && mkdir dist && npm run vite-build && npm run copy-package",
     "copy-package": "cp package.json dist/buildPackage.json && cp package.json lib/cjs/buildPackage.json&& cp package.json lib/esm/buildPackage.json",
     "copy-scss": "cpx \"src/**/*.scss\" lib/cjs && cpx \"src/**/*.scss\" lib/esm"