@visactor/vtable 1.26.2 → 1.26.3

package/es/scenegraph/utils/padding.d.ts

@@ -1,6 +1,9 @@
-export declare function getQuadProps(paddingOrigin: number | string | number[] | {
+type PaddingObject = {
     left?: number;
     right?: number;
     top?: number;
     bottom?: number;
-}): [number, number, number, number];
+};
+type Quad = [any, any, any, any];
+export declare function getQuadProps(paddingOrigin: number | string | any[] | PaddingObject): Quad;
+export {};

package/es/scenegraph/utils/padding.js

@@ -1,14 +1,18 @@
-import { parsePadding } from "./../../vrender";
+function normalizeQuadArray(values) {
+    return 0 === values.length ? [ 0, 0, 0, 0 ] : 1 === values.length ? [ values[0], values[0], values[0], values[0] ] : 2 === values.length ? [ values[0], values[1], values[0], values[1] ] : 3 === values.length ? [ values[0], values[1], values[2], values[1] ] : [ values[0], values[1], values[2], values[3] ];
+}
 
-import { isArray, isNumber, isString } from "@visactor/vutils";
+function parseStringQuad(padding) {
+    const tokens = padding.trim().split(/\s+/), values = tokens.map((token => Number.parseFloat(token))).filter((value => Number.isFinite(value)));
+    return values.length === tokens.length && values.length > 0 ? normalizeQuadArray(values) : [ padding, padding, padding, padding ];
+}
 
-export function getQuadProps(paddingOrigin) {
+function normalizePaddingObject(paddingOrigin) {
     var _a, _b, _c, _d;
-    if (isNumber(paddingOrigin) || isString(paddingOrigin) || isArray(paddingOrigin)) {
-        let padding = parsePadding(paddingOrigin);
-        return "number" == typeof padding || "string" == typeof padding ? padding = [ padding, padding, padding, padding ] : Array.isArray(padding) && (padding = padding.slice(0)), 
-        padding;
-    }
-    return paddingOrigin && (isFinite(paddingOrigin.bottom) || isFinite(paddingOrigin.left) || isFinite(paddingOrigin.right) || isFinite(paddingOrigin.top)) ? [ null !== (_a = paddingOrigin.top) && void 0 !== _a ? _a : 0, null !== (_b = paddingOrigin.right) && void 0 !== _b ? _b : 0, null !== (_c = paddingOrigin.bottom) && void 0 !== _c ? _c : 0, null !== (_d = paddingOrigin.left) && void 0 !== _d ? _d : 0 ] : [ 0, 0, 0, 0 ];
+    return Number.isFinite(paddingOrigin.bottom) || Number.isFinite(paddingOrigin.left) || Number.isFinite(paddingOrigin.right) || Number.isFinite(paddingOrigin.top) ? [ null !== (_a = paddingOrigin.top) && void 0 !== _a ? _a : 0, null !== (_b = paddingOrigin.right) && void 0 !== _b ? _b : 0, null !== (_c = paddingOrigin.bottom) && void 0 !== _c ? _c : 0, null !== (_d = paddingOrigin.left) && void 0 !== _d ? _d : 0 ] : [ 0, 0, 0, 0 ];
+}
+
+export function getQuadProps(paddingOrigin) {
+    return Array.isArray(paddingOrigin) ? normalizeQuadArray(paddingOrigin.slice(0, 4)) : "number" == typeof paddingOrigin && Number.isFinite(paddingOrigin) ? [ paddingOrigin, paddingOrigin, paddingOrigin, paddingOrigin ] : "string" == typeof paddingOrigin ? parseStringQuad(paddingOrigin) : paddingOrigin && "object" == typeof paddingOrigin ? normalizePaddingObject(paddingOrigin) : [ 0, 0, 0, 0 ];
 }
 //# sourceMappingURL=padding.js.map

package/es/scenegraph/utils/padding.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/utils/padding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE/D,MAAM,UAAU,YAAY,CAC1B,aAA4G;;IAE5G,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QAChF,IAAI,OAAO,GAAG,YAAY,CAAC,aAAuB,CAAC,CAAC;QACpD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC9D,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAChD;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAQ,CAAC;SACnC;QACD,OAAO,OAAc,CAAC;KACvB;SAAM,IACL,aAAa;QACb,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC;YAC7B,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC;YAC5B,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC;YAC7B,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAC9B;QACA,OAAO,CAAC,MAAA,aAAa,CAAC,GAAG,mCAAI,CAAC,EAAE,MAAA,aAAa,CAAC,KAAK,mCAAI,CAAC,EAAE,MAAA,aAAa,CAAC,MAAM,mCAAI,CAAC,EAAE,MAAA,aAAa,CAAC,IAAI,mCAAI,CAAC,CAAC,CAAC;KAC/G;IACD,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACtB,CAAC","file":"padding.js","sourcesContent":["import { parsePadding } from './../../vrender';\nimport { isArray, isNumber, isString } from '@visactor/vutils';\n\nexport function getQuadProps(\n  paddingOrigin: number | string | number[] | { left?: number; right?: number; top?: number; bottom?: number }\n): [number, number, number, number] {\n  if (isNumber(paddingOrigin) || isString(paddingOrigin) || isArray(paddingOrigin)) {\n    let padding = parsePadding(paddingOrigin as number);\n    if (typeof padding === 'number' || typeof padding === 'string') {\n      padding = [padding, padding, padding, padding];\n    } else if (Array.isArray(padding)) {\n      padding = padding.slice(0) as any;\n    }\n    return padding as any;\n  } else if (\n    paddingOrigin &&\n    (isFinite(paddingOrigin.bottom) ||\n      isFinite(paddingOrigin.left) ||\n      isFinite(paddingOrigin.right) ||\n      isFinite(paddingOrigin.top))\n  ) {\n    return [paddingOrigin.top ?? 0, paddingOrigin.right ?? 0, paddingOrigin.bottom ?? 0, paddingOrigin.left ?? 0];\n  }\n  return [0, 0, 0, 0];\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/utils/padding.ts"],"names":[],"mappings":"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","file":"padding.js","sourcesContent":["type PaddingObject = { left?: number; right?: number; top?: number; bottom?: number };\ntype Quad = [any, any, any, any];\n\nfunction normalizeQuadArray(values: any[]): Quad {\n  if (values.length === 0) {\n    return [0, 0, 0, 0];\n  }\n  if (values.length === 1) {\n    return [values[0], values[0], values[0], values[0]];\n  }\n  if (values.length === 2) {\n    return [values[0], values[1], values[0], values[1]];\n  }\n  if (values.length === 3) {\n    return [values[0], values[1], values[2], values[1]];\n  }\n  return [values[0], values[1], values[2], values[3]];\n}\n\nfunction parseStringQuad(padding: string): Quad {\n  const tokens = padding.trim().split(/\\s+/);\n  const values = tokens.map(token => Number.parseFloat(token)).filter(value => Number.isFinite(value));\n\n  if (values.length === tokens.length && values.length > 0) {\n    return normalizeQuadArray(values);\n  }\n\n  return [padding, padding, padding, padding];\n}\n\nfunction normalizePaddingObject(paddingOrigin: PaddingObject): Quad {\n  if (\n    Number.isFinite(paddingOrigin.bottom) ||\n    Number.isFinite(paddingOrigin.left) ||\n    Number.isFinite(paddingOrigin.right) ||\n    Number.isFinite(paddingOrigin.top)\n  ) {\n    return [paddingOrigin.top ?? 0, paddingOrigin.right ?? 0, paddingOrigin.bottom ?? 0, paddingOrigin.left ?? 0];\n  }\n  return [0, 0, 0, 0];\n}\n\nexport function getQuadProps(paddingOrigin: number | string | any[] | PaddingObject): Quad {\n  if (Array.isArray(paddingOrigin)) {\n    return normalizeQuadArray(paddingOrigin.slice(0, 4));\n  }\n\n  if (typeof paddingOrigin === 'number' && Number.isFinite(paddingOrigin)) {\n    return [paddingOrigin, paddingOrigin, paddingOrigin, paddingOrigin];\n  }\n\n  if (typeof paddingOrigin === 'string') {\n    return parseStringQuad(paddingOrigin);\n  }\n\n  if (paddingOrigin && typeof paddingOrigin === 'object') {\n    return normalizePaddingObject(paddingOrigin);\n  }\n\n  return [0, 0, 0, 0];\n}\n"]}

package/es/state/state.js

@@ -30,6 +30,8 @@ import { endMoveCol, startMoveCol, updateMoveCol } from "./cell-move";
 
 import { getIconAndPositionFromTarget } from "../scenegraph/utils/icon";
 
+import { getBodyHorizontalScrollRange } from "../scenegraph/component/util";
+
 import { debounce } from "../tools/debounce";
 
 import { updateResizeColumn } from "./resize/update-resize-column";
@@ -530,8 +532,8 @@ export class StateManager {
         }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
     }
     updateHorizontalScrollBar(xRatio) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const totalWidth = this.table.getAllColsWidth(), oldHorizontalBarPos = this.scroll.horizontalBarPos, frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0, rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0, scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset);
+        var _a, _b, _c, _d;
+        const oldHorizontalBarPos = this.scroll.horizontalBarPos, scrollRange = getBodyHorizontalScrollRange(this.table);
         let horizontalBarPos = Math.ceil(xRatio * scrollRange);
         isValid(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
         const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
@@ -539,8 +541,8 @@ export class StateManager {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
-            scrollHeight: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
-            scrollWidth: null === (_h = this.table.theme.scrollStyle) || void 0 === _h ? void 0 : _h.width,
+            scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
+            scrollWidth: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -555,8 +557,8 @@ export class StateManager {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
-            scrollHeight: null === (_j = this.table.theme.scrollStyle) || void 0 === _j ? void 0 : _j.width,
-            scrollWidth: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
+            scrollHeight: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
+            scrollWidth: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -609,13 +611,13 @@ export class StateManager {
         }), oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
     }
     setScrollLeft(left, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!this.table || !this.table.scenegraph) return;
         this.table.scrollLeft;
-        const totalWidth = this.table.getAllColsWidth(), frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0, rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0, scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset), sizeTolerance = (null === (_g = this.table.options.customConfig) || void 0 === _g ? void 0 : _g._disableColumnAndRowSizeRound) ? 1 : 0;
+        const scrollRange = getBodyHorizontalScrollRange(this.table), sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
         left = Math.max(0, Math.min(left, scrollRange - sizeTolerance)), left = Math.ceil(left);
         const oldHorizontalBarPos = this.scroll.horizontalBarPos, xRatio = scrollRange ? left / scrollRange : 0;
-        if ((oldHorizontalBarPos !== left || !0 === (null === (_j = null === (_h = this.table.options) || void 0 === _h ? void 0 : _h.customConfig) || void 0 === _j ? void 0 : _j.scrollEventAlwaysTrigger)) && triggerEvent) {
+        if ((oldHorizontalBarPos !== left || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
             let horizontalBarPos = left;
             isValid(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
             const dx = horizontalBarPos - oldHorizontalBarPos;
@@ -623,8 +625,8 @@ export class StateManager {
                 event: null == event ? void 0 : event.nativeEvent,
                 scrollTop: this.scroll.verticalBarPos,
                 scrollLeft: horizontalBarPos,
-                scrollHeight: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
-                scrollWidth: null === (_l = this.table.theme.scrollStyle) || void 0 === _l ? void 0 : _l.width,
+                scrollHeight: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
+                scrollWidth: null === (_e = this.table.theme.scrollStyle) || void 0 === _e ? void 0 : _e.width,
                 viewHeight: this.table.tableNoFrameHeight,
                 viewWidth: this.table.tableNoFrameWidth,
                 scrollDirection: "horizontal",
@@ -643,8 +645,8 @@ export class StateManager {
             event: null == event ? void 0 : event.nativeEvent,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
-            scrollHeight: null === (_m = this.table.theme.scrollStyle) || void 0 === _m ? void 0 : _m.width,
-            scrollWidth: null === (_o = this.table.theme.scrollStyle) || void 0 === _o ? void 0 : _o.width,
+            scrollHeight: null === (_f = this.table.theme.scrollStyle) || void 0 === _f ? void 0 : _f.width,
+            scrollWidth: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",