Merge pull request #3485 from VisActor/fix/domain-cache-scroll

fix: update visible when layout end
VisActor · Dec 4, 2024 · 2baadd6 · 2baadd6
2 parents 281f972 + 29a7478
commit 2baadd6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/common/changes/@visactor/vchart/fix-domain-cache-scroll_2024-12-03-08-00.json b/common/changes/@visactor/vchart/fix-domain-cache-scroll_2024-12-03-08-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vchart",
+      "comment": "fix: upgrade scrollbar visible after layout. fix#3452",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vchart"
+}
diff --git a/packages/vchart/src/component/data-zoom/data-filter-base-component.ts b/packages/vchart/src/component/data-zoom/data-filter-base-component.ts
@@ -900,9 +900,15 @@ export abstract class DataFilterBaseComponent<T extends IDataFilterComponentSpec
     super.updateLayoutAttribute();
   }
 
-  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {
-    super.onLayoutStart(layoutRect, viewRect, ctx);
-    const isShown = this._autoUpdate(layoutRect);
+  protected _autoVisible(isShown: boolean) {
+    if (!this._auto) {
+      return;
+    }
+    if (isShown) {
+      this.show();
+    } else {
+      this.hide();
+    }
     const sizeKey = this._isHorizontal ? 'height' : 'width';
     this.layout.setLayoutRect(
       {
@@ -912,9 +918,22 @@ export abstract class DataFilterBaseComponent<T extends IDataFilterComponentSpec
         [sizeKey]: AttributeLevel.Built_In
       }
     );
+  }
+
+  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {
+    super.onLayoutStart(layoutRect, viewRect, ctx);
+    const isShown = this._autoUpdate(layoutRect);
+    this._autoVisible(isShown);
     this._dataUpdating = false;
   }
 
+  onLayoutEnd(ctx: any): void {
+    // 布局结束后, start和end会发生变化, 因此需要再次更新visible
+    const isShown = !(this._start === 0 && this._end === 1);
+    this._autoVisible(isShown);
+    super.onLayoutEnd(ctx);
+  }
+
   /**
    * bounds预计算
    * @param rect
@@ -1004,11 +1023,6 @@ export abstract class DataFilterBaseComponent<T extends IDataFilterComponentSpec
       isShown = !(start === 0 && end === 1);
     }
     this.setStartAndEnd(this._start, this._end);
-    if (isShown) {
-      this.show();
-    } else {
-      this.hide();
-    }
     this._cacheVisibility = isShown;
     return isShown;
   }

diff --git a/packages/vchart/src/component/data-zoom/scroll-bar/scroll-bar.ts b/packages/vchart/src/component/data-zoom/scroll-bar/scroll-bar.ts
@@ -158,7 +158,10 @@ export class ScrollBar<T extends IScrollBarSpec = IScrollBarSpec> extends DataFi
   }
 
   protected _handleDataCollectionChange() {
-    // do nothing
+    if (this._spec.auto) {
+      const data = this._data.getDataView();
+      data.reRunAllTransform();
+    }
   }
 
   protected _initCommonEvent() {