feat: update

red-armor · Sep 16, 2023 · 3a91e98 · 3a91e98
1 parent dba0170
commit 3a91e98
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/packages/data-model/src/FixedBuffer.ts b/packages/data-model/src/FixedBuffer.ts
@@ -114,16 +114,18 @@ class FixedBuffer {
       const position = idx;
       this._newItemMetaIndices[position] = itemMeta;
       this._indices[position] = index;
-    } else {
-      const position = this.getPosition(
-        index,
-        safeRange.startIndex,
-        safeRange.endIndex
-      );
-      if (position === position) {
-        this._newItemMetaIndices[position] = itemMeta;
-      }
+      return position
+    }
+    const position = this.getPosition(
+      index,
+      safeRange.startIndex,
+      safeRange.endIndex
+    );
+    if (position === position) {
+      this._indices[position] = index;
+      this._newItemMetaIndices[position] = itemMeta;
     }
+    return position
   }
 
   getMaxValue() {
@@ -138,8 +140,7 @@ class FixedBuffer {
     const arr = [];
     const nextItemMetaIndices = new Array(this._recyclerReservedBufferSize);
     for (let idx = 0; idx < this._recyclerReservedBufferSize; idx++) {
-      if (typeof this._newItemMetaIndices[idx] === 'number') {
-        // const targetIndex = this._bufferSet.indices[idx]
+      if (this._newItemMetaIndices[idx]) {
         const targetIndex = this._indices[idx];
         const itemMeta = this._newItemMetaIndices[idx];
         arr.push({

diff --git a/packages/data-model/src/ListBaseDimensions.ts b/packages/data-model/src/ListBaseDimensions.ts
@@ -580,6 +580,8 @@ class ListBaseDimensions<ItemT extends {} = {}> {
           {
             recycleState,
             spaceState,
+            // @ts-ignore
+            rangeState: stateResult.rangeState,
           },
           this._stateResult
         );
@@ -588,7 +590,11 @@ class ListBaseDimensions<ItemT extends {} = {}> {
       }
     }
 
-    this._stateResult = stateResult;
+    this._stateResult = {
+      ...stateResult,
+      // @ts-ignore
+      rangeState: stateResult.rangeState,
+    };
   }
 
   setState(state: ListState<ItemT>, force = false) {
@@ -778,6 +784,7 @@ class ListBaseDimensions<ItemT extends {} = {}> {
     const stateResult = {
       recycleState: recycleStateResult.filter((v) => v),
       spaceState: spaceStateResult.filter((v) => v),
+      rangeState: state,
     };
 
     return stateResult;

diff --git a/packages/data-model/src/ListGroupDimensions.ts b/packages/data-model/src/ListGroupDimensions.ts
@@ -1,7 +1,6 @@
 import Batchinator from '@x-oasis/batchinator';
 import isClamped from '@x-oasis/is-clamped';
 import noop from '@x-oasis/noop';
-import shallowArrayEqual from '@x-oasis/shallow-array-equal';
 import resolveChanged from '@x-oasis/resolve-changed';
 import defaultBooleanValue from '@x-oasis/default-boolean-value';
 import PrefixIntervalTree from '@x-oasis/prefix-interval-tree';