@revolist/revogrid 3.5.2 → 3.6.1

package/custom-element/revo-grid.js

@@ -616,9 +616,10 @@ class DimensionProvider {
     const dimension = this.stores[type].getCurrentState();
     this.viewports.stores[type].setViewport({ virtualSize: dimension.realSize });
   }
-  drop() {
+  dropColumns() {
     for (let type of columnTypes) {
       this.stores[type].drop();
+      this.viewports.stores[type].clear();
     }
   }
   setColumns(type, newLength, sizes, noVirtual = false) {
@@ -3351,7 +3352,7 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
     }
   }
   columnChanged(newVal = []) {
-    this.dimensionProvider.drop();
+    this.dimensionProvider.dropColumns();
     const columnGather = ColumnDataProvider.getColumns(newVal, 0, this.columnTypes);
     this.beforecolumnsset.emit(columnGather);
     for (let type of columnTypes) {

package/custom-element/revogr-row-headers2.js

@@ -270,21 +270,23 @@ class ViewportStore {
     const outsize = frameOffset * 2 * dimension.originItemSize;
     virtualSize += outsize;
     let maxCoordinate = virtualSize;
+    // if real size is bigger than virtual size, then the end will be real size decreased by virtual size
+    // but sometimes the real size slightly bigger than virtual size, so we need to check it and fallback max coordinate to virtual size
     if (dimension.realSize > virtualSize) {
-      maxCoordinate = dimension.realSize - virtualSize;
+      maxCoordinate = Math.max(dimension.realSize - virtualSize, virtualSize);
     }
     let toUpdate = {
       lastCoordinate: position,
     };
     let pos = position;
     pos -= frameOffset * dimension.originItemSize;
-    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate;
+    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate; // todo: check if maxCoordinate can be removed
     const firstItem = getFirstItem(this.getItems());
     const lastItem = getLastItem(this.getItems());
     // left position changed
     if (!isActiveRange(pos, firstItem)) {
       toUpdate = Object.assign(Object.assign({}, toUpdate), getUpdatedItemsByPosition(pos, this.getItems(), this.store.get('realCount'), virtualSize, dimension));
-      setStore(this.store, Object.assign({}, toUpdate));
+      this.setViewport(Object.assign({}, toUpdate));
       // right position changed
     }
     else if (firstItem && this.store.get('virtualSize') + pos > (lastItem === null || lastItem === void 0 ? void 0 : lastItem.end)) {
@@ -298,7 +300,7 @@ class ViewportStore {
         };
         updateMissingAndRange(items, missing, range);
         toUpdate = Object.assign(Object.assign(Object.assign({}, toUpdate), { items: [...items] }), range);
-        setStore(this.store, Object.assign({}, toUpdate));
+        this.setViewport(Object.assign({}, toUpdate));
       }
     }
   }
@@ -317,6 +319,7 @@ class ViewportStore {
     if (dropToOriginalSize) {
       items = setItemSizes(items, start, dropToOriginalSize, this.store.get('lastCoordinate'));
     }
+    console.log('items', items);
     // loop through array from initial item after recombination
     while (i < count) {
       const item = items[start];
@@ -340,7 +343,7 @@ class ViewportStore {
         start = 0;
       }
     }
-    setStore(this.store, { items: [...items] });
+    this.setViewport({ items: [...items] });
   }
   getItems() {
     return {

package/dist/cjs/revo-grid_11.cjs.entry.js

@@ -4464,9 +4464,10 @@ class DimensionProvider {
     const dimension = this.stores[type].getCurrentState();
     this.viewports.stores[type].setViewport({ virtualSize: dimension.realSize });
   }
-  drop() {
+  dropColumns() {
     for (let type of columnTypes) {
       this.stores[type].drop();
+      this.viewports.stores[type].clear();
     }
   }
   setColumns(type, newLength, sizes, noVirtual = false) {
@@ -4766,21 +4767,23 @@ class ViewportStore {
     const outsize = frameOffset * 2 * dimension.originItemSize;
     virtualSize += outsize;
     let maxCoordinate = virtualSize;
+    // if real size is bigger than virtual size, then the end will be real size decreased by virtual size
+    // but sometimes the real size slightly bigger than virtual size, so we need to check it and fallback max coordinate to virtual size
     if (dimension.realSize > virtualSize) {
-      maxCoordinate = dimension.realSize - virtualSize;
+      maxCoordinate = Math.max(dimension.realSize - virtualSize, virtualSize);
     }
     let toUpdate = {
       lastCoordinate: position,
     };
     let pos = position;
     pos -= frameOffset * dimension.originItemSize;
-    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate;
+    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate; // todo: check if maxCoordinate can be removed
     const firstItem = getFirstItem(this.getItems());
     const lastItem = getLastItem(this.getItems());
     // left position changed
     if (!isActiveRange(pos, firstItem)) {
       toUpdate = Object.assign(Object.assign({}, toUpdate), getUpdatedItemsByPosition(pos, this.getItems(), this.store.get('realCount'), virtualSize, dimension));
-      setStore(this.store, Object.assign({}, toUpdate));
+      this.setViewport(Object.assign({}, toUpdate));
       // right position changed
     }
     else if (firstItem && this.store.get('virtualSize') + pos > (lastItem === null || lastItem === void 0 ? void 0 : lastItem.end)) {
@@ -4794,7 +4797,7 @@ class ViewportStore {
         };
         updateMissingAndRange(items, missing, range);
         toUpdate = Object.assign(Object.assign(Object.assign({}, toUpdate), { items: [...items] }), range);
-        setStore(this.store, Object.assign({}, toUpdate));
+        this.setViewport(Object.assign({}, toUpdate));
       }
     }
   }
@@ -4813,6 +4816,7 @@ class ViewportStore {
     if (dropToOriginalSize) {
       items = setItemSizes(items, start, dropToOriginalSize, this.store.get('lastCoordinate'));
     }
+    console.log('items', items);
     // loop through array from initial item after recombination
     while (i < count) {
       const item = items[start];
@@ -4836,7 +4840,7 @@ class ViewportStore {
         start = 0;
       }
     }
-    setStore(this.store, { items: [...items] });
+    this.setViewport({ items: [...items] });
   }
   getItems() {
     return {
@@ -25269,7 +25273,7 @@ const RevoGridComponent = class {
     }
   }
   columnChanged(newVal = []) {
-    this.dimensionProvider.drop();
+    this.dimensionProvider.dropColumns();
     const columnGather = ColumnDataProvider.getColumns(newVal, 0, this.columnTypes);
     this.beforecolumnsset.emit(columnGather);
     for (let type of columnTypes) {

package/dist/collection/components/revo-grid/revo-grid.js

@@ -387,7 +387,7 @@ export class RevoGridComponent {
     }
   }
   columnChanged(newVal = []) {
-    this.dimensionProvider.drop();
+    this.dimensionProvider.dropColumns();
     const columnGather = ColumnDataProvider.getColumns(newVal, 0, this.columnTypes);
     this.beforecolumnsset.emit(columnGather);
     for (let type of columnTypes) {

package/dist/collection/services/dimension.provider.js

@@ -55,9 +55,10 @@ export default class DimensionProvider {
     const dimension = this.stores[type].getCurrentState();
     this.viewports.stores[type].setViewport({ virtualSize: dimension.realSize });
   }
-  drop() {
+  dropColumns() {
     for (let type of columnTypes) {
       this.stores[type].drop();
+      this.viewports.stores[type].clear();
     }
   }
   setColumns(type, newLength, sizes, noVirtual = false) {

package/dist/collection/store/viewPort/viewport.store.js

@@ -40,21 +40,23 @@ export default class ViewportStore {
     const outsize = frameOffset * 2 * dimension.originItemSize;
     virtualSize += outsize;
     let maxCoordinate = virtualSize;
+    // if real size is bigger than virtual size, then the end will be real size decreased by virtual size
+    // but sometimes the real size slightly bigger than virtual size, so we need to check it and fallback max coordinate to virtual size
     if (dimension.realSize > virtualSize) {
-      maxCoordinate = dimension.realSize - virtualSize;
+      maxCoordinate = Math.max(dimension.realSize - virtualSize, virtualSize);
     }
     let toUpdate = {
       lastCoordinate: position,
     };
     let pos = position;
     pos -= frameOffset * dimension.originItemSize;
-    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate;
+    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate; // todo: check if maxCoordinate can be removed
     const firstItem = getFirstItem(this.getItems());
     const lastItem = getLastItem(this.getItems());
     // left position changed
     if (!isActiveRange(pos, firstItem)) {
       toUpdate = Object.assign(Object.assign({}, toUpdate), getUpdatedItemsByPosition(pos, this.getItems(), this.store.get('realCount'), virtualSize, dimension));
-      setStore(this.store, Object.assign({}, toUpdate));
+      this.setViewport(Object.assign({}, toUpdate));
       // right position changed
     }
     else if (firstItem && this.store.get('virtualSize') + pos > (lastItem === null || lastItem === void 0 ? void 0 : lastItem.end)) {
@@ -68,7 +70,7 @@ export default class ViewportStore {
         };
         updateMissingAndRange(items, missing, range);
         toUpdate = Object.assign(Object.assign(Object.assign({}, toUpdate), { items: [...items] }), range);
-        setStore(this.store, Object.assign({}, toUpdate));
+        this.setViewport(Object.assign({}, toUpdate));
       }
     }
   }
@@ -87,6 +89,7 @@ export default class ViewportStore {
     if (dropToOriginalSize) {
       items = setItemSizes(items, start, dropToOriginalSize, this.store.get('lastCoordinate'));
     }
+    console.log('items', items);
     // loop through array from initial item after recombination
     while (i < count) {
       const item = items[start];
@@ -110,7 +113,7 @@ export default class ViewportStore {
         start = 0;
       }
     }
-    setStore(this.store, { items: [...items] });
+    this.setViewport({ items: [...items] });
   }
   getItems() {
     return {

package/dist/esm/revo-grid_11.entry.js

@@ -4460,9 +4460,10 @@ class DimensionProvider {
     const dimension = this.stores[type].getCurrentState();
     this.viewports.stores[type].setViewport({ virtualSize: dimension.realSize });
   }
-  drop() {
+  dropColumns() {
     for (let type of columnTypes) {
       this.stores[type].drop();
+      this.viewports.stores[type].clear();
     }
   }
   setColumns(type, newLength, sizes, noVirtual = false) {
@@ -4762,21 +4763,23 @@ class ViewportStore {
     const outsize = frameOffset * 2 * dimension.originItemSize;
     virtualSize += outsize;
     let maxCoordinate = virtualSize;
+    // if real size is bigger than virtual size, then the end will be real size decreased by virtual size
+    // but sometimes the real size slightly bigger than virtual size, so we need to check it and fallback max coordinate to virtual size
     if (dimension.realSize > virtualSize) {
-      maxCoordinate = dimension.realSize - virtualSize;
+      maxCoordinate = Math.max(dimension.realSize - virtualSize, virtualSize);
     }
     let toUpdate = {
       lastCoordinate: position,
     };
     let pos = position;
     pos -= frameOffset * dimension.originItemSize;
-    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate;
+    pos = pos < 0 ? 0 : pos < maxCoordinate ? pos : maxCoordinate; // todo: check if maxCoordinate can be removed
     const firstItem = getFirstItem(this.getItems());
     const lastItem = getLastItem(this.getItems());
     // left position changed
     if (!isActiveRange(pos, firstItem)) {
       toUpdate = Object.assign(Object.assign({}, toUpdate), getUpdatedItemsByPosition(pos, this.getItems(), this.store.get('realCount'), virtualSize, dimension));
-      setStore(this.store, Object.assign({}, toUpdate));
+      this.setViewport(Object.assign({}, toUpdate));
       // right position changed
     }
     else if (firstItem && this.store.get('virtualSize') + pos > (lastItem === null || lastItem === void 0 ? void 0 : lastItem.end)) {
@@ -4790,7 +4793,7 @@ class ViewportStore {
         };
         updateMissingAndRange(items, missing, range);
         toUpdate = Object.assign(Object.assign(Object.assign({}, toUpdate), { items: [...items] }), range);
-        setStore(this.store, Object.assign({}, toUpdate));
+        this.setViewport(Object.assign({}, toUpdate));
       }
     }
   }
@@ -4809,6 +4812,7 @@ class ViewportStore {
     if (dropToOriginalSize) {
       items = setItemSizes(items, start, dropToOriginalSize, this.store.get('lastCoordinate'));
     }
+    console.log('items', items);
     // loop through array from initial item after recombination
     while (i < count) {
       const item = items[start];
@@ -4832,7 +4836,7 @@ class ViewportStore {
         start = 0;
       }
     }
-    setStore(this.store, { items: [...items] });
+    this.setViewport({ items: [...items] });
   }
   getItems() {
     return {
@@ -25265,7 +25269,7 @@ const RevoGridComponent = class {
     }
   }
   columnChanged(newVal = []) {
-    this.dimensionProvider.drop();
+    this.dimensionProvider.dropColumns();
     const columnGather = ColumnDataProvider.getColumns(newVal, 0, this.columnTypes);
     this.beforecolumnsset.emit(columnGather);
     for (let type of columnTypes) {