@antv/s2-vue 1.2.1 → 1.3.0-alpha.1

package/esm/index.d.ts

@@ -377,24 +377,16 @@ declare abstract class BaseFacet {
     private getScrollbarPosition;
     renderVScrollBar: (height: number, realHeight: number, scrollY: number) => void;
     getScrollBarOffset: (offset: number, scrollbar: ScrollBar) => number;
-    isScrollOverThePanelArea: ({ layerX, layerY }: Partial<S2WheelEvent>) => boolean;
-    isScrollOverTheCornerArea: ({ layerX, layerY }: Partial<S2WheelEvent>) => boolean;
-    updateHorizontalRowScrollOffset: ({ offset, layerX, layerY }: {
-        offset: any;
-        layerX: any;
-        layerY: any;
-    }) => void;
-    updateHorizontalScrollOffset: ({ offset, layerX, layerY }: {
-        offset: any;
-        layerX: any;
-        layerY: any;
-    }) => void;
-    isScrollToLeft: (deltaX: number) => boolean;
-    isScrollToRight: (deltaX: number) => boolean;
+    isScrollOverThePanelArea: ({ offsetX, offsetY }: CellScrollOffset) => boolean;
+    isScrollOverTheCornerArea: ({ offsetX, offsetY }: CellScrollOffset) => boolean;
+    updateHorizontalRowScrollOffset: ({ offset, offsetX, offsetY, }: CellScrollOffset) => void;
+    updateHorizontalScrollOffset: ({ offset, offsetX, offsetY, }: CellScrollOffset) => void;
+    isScrollToLeft: ({ deltaX, offsetX, offsetY }: CellScrollOffset) => boolean;
+    isScrollToRight: ({ deltaX, offsetX, offsetY }: CellScrollOffset) => boolean;
     isScrollToTop: (deltaY: number) => boolean;
     isScrollToBottom: (deltaY: number) => boolean;
     isVerticalScrollOverTheViewport: (deltaY: number) => boolean;
-    isHorizontalScrollOverTheViewport: (deltaX: number) => boolean;
+    isHorizontalScrollOverTheViewport: (scrollOffset: CellScrollOffset) => boolean;
     /**
      在当前表格滚动分两种情况:
      1. 当前表格无滚动条: 无需阻止外部容器滚动
@@ -402,7 +394,7 @@ declare abstract class BaseFacet {
      - 未滚动到顶部或底部: 当前表格滚动, 阻止外部容器滚动
      - 滚动到顶部或底部: 恢复外部容器滚动
      */
-    isScrollOverTheViewport: (deltaX: number, deltaY: number, layerY: number) => boolean;
+    isScrollOverTheViewport: (scrollOffset: CellScrollOffset) => boolean;
     cancelScrollFrame: () => boolean;
     clearScrollFrameIdOnMobile: () => void;
     /**
@@ -415,7 +407,7 @@ declare abstract class BaseFacet {
      */
     private stopScrollChainingIfNeeded;
     private stopScrollChaining;
-    onWheel: (event: S2WheelEvent) => void;
+    onWheel: (event: WheelEvent) => void;
     protected clip(scrollX: number, scrollY: number): void;
     /**
      * Translate panelGroup, rowHeader, cornerHeader, columnHeader ect
@@ -1088,6 +1080,14 @@ declare interface CellMeta_2 {
     [key: string]: unknown;
 }
 
+declare interface CellScrollOffset {
+    deltaX?: number;
+    deltaY?: number;
+    offset?: number;
+    offsetX: number;
+    offsetY: number;
+}
+
 declare interface CellScrollPosition_2 {
     scrollX: number;
     scrollY: number;
@@ -2904,11 +2904,6 @@ declare interface S2Theme extends CellThemes {
     background?: Background;
 }
 
-declare interface S2WheelEvent extends WheelEvent {
-    layerX: number;
-    layerY: number;
-}
-
 declare class ScrollBar extends Group {
     isHorizontal: boolean;
     trackLen: number;
@@ -2927,19 +2922,16 @@ declare class ScrollBar extends Group {
     private eventHandlers;
     private scrollFrameId;
     constructor(scrollBarCfg: ScrollBarCfg);
-    getCoordinates: () => {
-        from: string;
-        to: string;
-    };
+    private getCoordinatesName;
     /**
-     * 当前滑块滑动的位置 0 ~ 1
+     * Antv/g 4.x 版本计算 bbox 有bug, 实际渲染的宽度会比给定的宽度大, 需要对其做修正
+     * 详情: https://github.com/antvis/S2/pull/1566/files#diff-3f08348041906ddf1e4f094bfe2ac32b35ff668918d3fbb952e9227ae462cc08R52
      */
-    current: () => number;
+    private getCoordinatesWithBBoxExtraPadding;
     /**
-     * 更新滑道长度
-     * @param newTrackLen 新的滑块长度
+     * 当前滑块滑动的位置 0 ~ 1
      */
-    updateTrackLen: (newTrackLen: number) => void;
+    current: () => number;
     /**
      * 更新滑块长度
      * @param newThumbLen 新的滑道长度
@@ -3985,6 +3977,20 @@ declare abstract class SpreadSheet_2 extends EE {
     clearColumnLeafNodes(): void;
     private initHiddenColumnsDetail;
     private clearCanvasEvent;
+    /**
+     * 计算文本在画布中的宽度
+     * @param text 待计算的文本
+     * @param font 文本 css 样式
+     * @returns 文本宽度
+     */
+    measureTextWidth: ((text: number | string, font: unknown) => number) & MemoizedFunction;
+    /**
+     * 粗略计算文本在画布中的宽度
+     * @param text 待计算的文本
+     * @param font 文本 css 样式
+     * @returns 文本宽度
+     */
+    measureTextWidthRoughly: (text: any, font?: any) => number;
 }
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@antv/s2-vue",
-  "version": "1.2.1",
+  "version": "1.3.0-alpha.1",
   "main": "lib/index.js",
   "unpkg": "dist/index.min.js",
   "module": "esm/index.js",
@@ -66,7 +66,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@antv/s2": "*",
+    "@antv/s2": "^1.26.0-alpha.1",
     "@antv/s2-shared": "*",
     "@testing-library/vue": "^6.5.1",
     "@vue/tsconfig": "^0.1.3",