@visactor/vtable 0.15.3 → 0.15.4

package/cjs/event/EventHandler.js

@@ -109,6 +109,10 @@ class EventHandler {
                 const listener = this.listeners[key];
                 listener.target.removeEventListener && listener.target.removeEventListener(listener.type, listener.listener, ...listener.options);
             }
+            for (const key in this.reseizeListeners) {
+                const resizeObserver = this.reseizeListeners[key];
+                null == resizeObserver || resizeObserver.disConnect();
+            }
             this.listeners = {};
         }
     }

package/cjs/event/EventHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/EventHandler.ts"],"names":[],"mappings":"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","file":"EventHandler.js","sourcesContent":["import type { AnyFunction, EventListenerId } from '../ts-types';\nimport type { EventTarget as CustomEventTarget } from './EventTarget';\nimport { debounce } from '../tools/debounce';\nimport { Env } from '../tools/env';\n\nlet idCount = 1;\ntype EventHandlerTarget = EventTarget | CustomEventTarget;\ntype Listener = AnyFunction;\ntype EventListenerObject = {\n  target: EventHandlerTarget;\n  type: string;\n  listener: Listener;\n  options: any[];\n};\n\nexport type ResizeObserverCallBack = ({ width, height }: { width: number; height: number }) => void;\n\nexport class ResizeObserver {\n  resizeTime = 100;\n  element: HTMLElement;\n  cb: ResizeObserverCallBack;\n  observer?: MutationObserver;\n  lastSize: {\n    width: number;\n    height: number;\n  } = {\n    width: 0,\n    height: 0\n  };\n  callBackDebounce: () => void;\n\n  constructor(element: HTMLElement, cb: ResizeObserverCallBack, resizeTime?: number) {\n    this.element = element;\n    this.cb = cb;\n    this.lastSize = this.getSize();\n    if (resizeTime) {\n      this.resizeTime = Math.max(resizeTime, 16);\n    }\n\n    this.callBackDebounce = debounce(this.callBack, this.resizeTime);\n    //TODO: 这个地方的 addEventListener resize 应该更改到下面的else逻辑中，兼容ResizeObserver不存在的情况\n    window?.addEventListener('resize', this.onResize);\n    // 优先使用 ResizeObserver\n    if ('ResizeObserver' in window) {\n      // @ts-ignore\n      const ResizeObserverWindow: any = window.ResizeObserver;\n      this.observer = new ResizeObserverWindow(this.mutationResize);\n      this.observer?.observe(this.element);\n    } else if ('MutationObserver' in window) {\n      this.observer = new MutationObserver(this.mutationResize);\n      this.observer.observe(this.element, {\n        attributes: true,\n        attributeFilter: ['style']\n      });\n    }\n  }\n\n  mutationResize = () => {\n    this.onResize();\n  };\n\n  disConnect() {\n    window.removeEventListener('resize', this.onResize);\n    if (this.observer) {\n      this.observer.disconnect();\n      this.observer = undefined;\n    }\n  }\n\n  callBack = () => {\n    const newSize = this.getSize();\n    if (newSize.width === this.lastSize.width && newSize.height === this.lastSize.height) {\n      return;\n    }\n    this.lastSize = newSize;\n    this.cb && this.cb({ ...this.lastSize });\n  };\n\n  setSize(size: { width: number; height: number }) {\n    this.lastSize = size;\n  }\n\n  private onResize = () => {\n    if (this.checkSize()) {\n      this.callBackDebounce();\n    }\n  };\n\n  private checkSize() {\n    const newSize = this.getSize();\n    if (newSize.width === this.lastSize.width && newSize.height === this.lastSize.height) {\n      return false;\n    }\n    return true;\n  }\n\n  getSize() {\n    if (!this.element) {\n      return {\n        ...this.lastSize\n      };\n    }\n    return {\n      width: Math.floor(this.element.clientWidth),\n      height: Math.floor(this.element.clientHeight)\n    };\n  }\n}\n\nexport class EventHandler {\n  private listeners: {\n    [key: string]: EventListenerObject;\n  } = {};\n\n  private reseizeListeners: {\n    [key: string]: ResizeObserver;\n  } = {};\n\n  on(\n    target: HTMLElement | Window | EventHandlerTarget,\n    type: string,\n    listener: Listener,\n    ...options: any[]\n  ): EventListenerId {\n    if (Env.mode === 'node') {\n      return -1;\n    }\n    const id = idCount++;\n    if (target?.addEventListener) {\n      if (type !== 'resize' || (target as Window) === window) {\n        (target as EventTarget)?.addEventListener(type, listener, ...(options as []));\n      } else {\n        const resizeObserver = new ResizeObserver(target as HTMLElement, listener);\n        this.reseizeListeners[id] = resizeObserver;\n      }\n    }\n    const obj = { target, type, listener, options };\n    this.listeners[id] = obj;\n    return id;\n  }\n  once(\n    target: EventHandlerTarget,\n    type: string,\n    listener: Listener,\n    ...options: (boolean | AddEventListenerOptions)[]\n  ): EventListenerId {\n    if (Env.mode === 'node') {\n      return -1;\n    }\n    const id = this.on(\n      target,\n      type,\n      (...args) => {\n        this.off(id);\n        listener(...args);\n      },\n      ...options\n    );\n    return id;\n  }\n  off(id: EventListenerId | null | undefined): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    if (id == null) {\n      return;\n    }\n    const obj = this.listeners?.[id];\n    if (!obj) {\n      return;\n    }\n    delete this.listeners[id];\n    if (obj.target.removeEventListener) {\n      obj.target.removeEventListener(obj.type, obj.listener, ...(obj.options as []));\n    }\n  }\n  fire(target: EventTarget, type: string, ...args: any[]): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    for (const key in this.listeners) {\n      const listener = this.listeners[key];\n      if (listener.target === target && listener.type === type) {\n        listener.listener.call(listener.target, ...args);\n      }\n    }\n  }\n  hasListener(target: EventTarget, type: string): boolean {\n    if (Env.mode === 'node') {\n      return false;\n    }\n    let result = false;\n    for (const key in this.listeners) {\n      const listener = this.listeners[key];\n      if (listener.target === target && listener.type === type) {\n        result = true;\n      }\n    }\n\n    return result;\n  }\n  clear(): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    for (const key in this.listeners) {\n      const listener = this.listeners[key];\n      if (listener.target.removeEventListener) {\n        listener.target.removeEventListener(listener.type, listener.listener, ...(listener.options as []));\n      }\n    }\n\n    this.listeners = {};\n  }\n  release(): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    this.clear();\n    (this as any).listeners = {};\n  }\n}\n"]}
+{"version":3,"sources":["../src/event/EventHandler.ts"],"names":[],"mappings":"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","file":"EventHandler.js","sourcesContent":["import type { AnyFunction, EventListenerId } from '../ts-types';\nimport type { EventTarget as CustomEventTarget } from './EventTarget';\nimport { debounce } from '../tools/debounce';\nimport { Env } from '../tools/env';\n\nlet idCount = 1;\ntype EventHandlerTarget = EventTarget | CustomEventTarget;\ntype Listener = AnyFunction;\ntype EventListenerObject = {\n  target: EventHandlerTarget;\n  type: string;\n  listener: Listener;\n  options: any[];\n};\n\nexport type ResizeObserverCallBack = ({ width, height }: { width: number; height: number }) => void;\n\nexport class ResizeObserver {\n  resizeTime = 100;\n  element: HTMLElement;\n  cb: ResizeObserverCallBack;\n  observer?: MutationObserver;\n  lastSize: {\n    width: number;\n    height: number;\n  } = {\n    width: 0,\n    height: 0\n  };\n  callBackDebounce: () => void;\n\n  constructor(element: HTMLElement, cb: ResizeObserverCallBack, resizeTime?: number) {\n    this.element = element;\n    this.cb = cb;\n    this.lastSize = this.getSize();\n    if (resizeTime) {\n      this.resizeTime = Math.max(resizeTime, 16);\n    }\n\n    this.callBackDebounce = debounce(this.callBack, this.resizeTime);\n    //TODO: 这个地方的 addEventListener resize 应该更改到下面的else逻辑中，兼容ResizeObserver不存在的情况\n    window?.addEventListener('resize', this.onResize);\n    // 优先使用 ResizeObserver\n    if ('ResizeObserver' in window) {\n      // @ts-ignore\n      const ResizeObserverWindow: any = window.ResizeObserver;\n      this.observer = new ResizeObserverWindow(this.mutationResize);\n      this.observer?.observe(this.element);\n    } else if ('MutationObserver' in window) {\n      this.observer = new MutationObserver(this.mutationResize);\n      this.observer.observe(this.element, {\n        attributes: true,\n        attributeFilter: ['style']\n      });\n    }\n  }\n\n  mutationResize = () => {\n    this.onResize();\n  };\n\n  disConnect() {\n    window.removeEventListener('resize', this.onResize);\n    if (this.observer) {\n      this.observer.disconnect();\n      this.observer = undefined;\n    }\n  }\n\n  callBack = () => {\n    const newSize = this.getSize();\n    if (newSize.width === this.lastSize.width && newSize.height === this.lastSize.height) {\n      return;\n    }\n    this.lastSize = newSize;\n    this.cb && this.cb({ ...this.lastSize });\n  };\n\n  setSize(size: { width: number; height: number }) {\n    this.lastSize = size;\n  }\n\n  private onResize = () => {\n    if (this.checkSize()) {\n      this.callBackDebounce();\n    }\n  };\n\n  private checkSize() {\n    const newSize = this.getSize();\n    if (newSize.width === this.lastSize.width && newSize.height === this.lastSize.height) {\n      return false;\n    }\n    return true;\n  }\n\n  getSize() {\n    if (!this.element) {\n      return {\n        ...this.lastSize\n      };\n    }\n    return {\n      width: Math.floor(this.element.clientWidth),\n      height: Math.floor(this.element.clientHeight)\n    };\n  }\n}\n\nexport class EventHandler {\n  private listeners: {\n    [key: string]: EventListenerObject;\n  } = {};\n\n  private reseizeListeners: {\n    [key: string]: ResizeObserver;\n  } = {};\n\n  on(\n    target: HTMLElement | Window | EventHandlerTarget,\n    type: string,\n    listener: Listener,\n    ...options: any[]\n  ): EventListenerId {\n    if (Env.mode === 'node') {\n      return -1;\n    }\n    const id = idCount++;\n    if (target?.addEventListener) {\n      if (type !== 'resize' || (target as Window) === window) {\n        (target as EventTarget)?.addEventListener(type, listener, ...(options as []));\n      } else {\n        const resizeObserver = new ResizeObserver(target as HTMLElement, listener);\n        this.reseizeListeners[id] = resizeObserver;\n      }\n    }\n    const obj = { target, type, listener, options };\n    this.listeners[id] = obj;\n    return id;\n  }\n  once(\n    target: EventHandlerTarget,\n    type: string,\n    listener: Listener,\n    ...options: (boolean | AddEventListenerOptions)[]\n  ): EventListenerId {\n    if (Env.mode === 'node') {\n      return -1;\n    }\n    const id = this.on(\n      target,\n      type,\n      (...args) => {\n        this.off(id);\n        listener(...args);\n      },\n      ...options\n    );\n    return id;\n  }\n  off(id: EventListenerId | null | undefined): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    if (id == null) {\n      return;\n    }\n    const obj = this.listeners?.[id];\n    if (!obj) {\n      return;\n    }\n    delete this.listeners[id];\n    if (obj.target.removeEventListener) {\n      obj.target.removeEventListener(obj.type, obj.listener, ...(obj.options as []));\n    }\n  }\n  fire(target: EventTarget, type: string, ...args: any[]): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    for (const key in this.listeners) {\n      const listener = this.listeners[key];\n      if (listener.target === target && listener.type === type) {\n        listener.listener.call(listener.target, ...args);\n      }\n    }\n  }\n  hasListener(target: EventTarget, type: string): boolean {\n    if (Env.mode === 'node') {\n      return false;\n    }\n    let result = false;\n    for (const key in this.listeners) {\n      const listener = this.listeners[key];\n      if (listener.target === target && listener.type === type) {\n        result = true;\n      }\n    }\n\n    return result;\n  }\n  clear(): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    for (const key in this.listeners) {\n      const listener = this.listeners[key];\n      if (listener.target.removeEventListener) {\n        listener.target.removeEventListener(listener.type, listener.listener, ...(listener.options as []));\n      }\n    }\n\n    for (const key in this.reseizeListeners) {\n      const resizeObserver: ResizeObserver = this.reseizeListeners[key];\n      resizeObserver?.disConnect();\n    }\n\n    this.listeners = {};\n  }\n  release(): void {\n    if (Env.mode === 'node') {\n      return;\n    }\n    this.clear();\n    (this as any).listeners = {};\n  }\n}\n"]}

package/cjs/event/media-click.js

@@ -54,4 +54,5 @@ function bindMediaClick(table) {
     }));
 }
 
-exports.bindMediaClick = bindMediaClick;
+exports.bindMediaClick = bindMediaClick;
+//# sourceMappingURL=media-click.js.map

package/cjs/event/scroll.js

@@ -51,6 +51,5 @@ function isScrollToRight(deltaX, state) {
     return 0 !== totalWidth && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1;
 }
 
-//# sourceMappingURL=scroll.js.map
 exports.handleWhell = handleWhell, exports.isVerticalScrollable = isVerticalScrollable, 
 exports.isHorizontalScrollable = isHorizontalScrollable;

package/cjs/index.d.ts

@@ -12,7 +12,7 @@ import type { MousePointerCellEvent } from './ts-types/events';
 import * as CustomLayout from './render/layout';
 export { getDataCellPath } from './tools/get-data-path';
 export * from './render/jsx';
-export declare const version = "0.15.3";
+export declare const version = "0.15.4";
 export { TYPES, core, ListTable, ListTableConstructorOptions, PivotTable, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/cjs/index.js

@@ -101,6 +101,6 @@ Object.defineProperty(exports, "getDataCellPath", {
     get: function() {
         return get_data_path_1.getDataCellPath;
     }
-}), __exportStar(require("./render/jsx"), exports), exports.version = "0.15.3", 
+}), __exportStar(require("./render/jsx"), exports), exports.version = "0.15.4", 
 exports.getIcons = getIcons, exports.clearGlobal = clearGlobal, TYPES.AggregationType;
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAiDlC,sBAAK;AAhDP,6CAA+B;AAiD7B,oBAAI;AAhDN,6CAA+B;AAwE7B,oBAAI;AAvEN,+CAAiC;AACjC,qDAAuC;AA2ErC,4BAAQ;AA1EV,iDAAmC;AAoEjC,wBAAM;AAnER,yEAA2D;AA6EzD,wCAAc;AAvDhB,2CAAwC;AAuBtC,0FAvBO,qBAAS,OAuBP;AAtBX,6CAA0C;AAwBxC,2FAxBO,uBAAU,OAwBP;AAvBZ,6CAA0C;AA0BxC,2FA1BO,uBAAU,OA0BP;AAxBZ,8DAAgD;AAoD9C,oCAAY;AA/Cd,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAgDhC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAhBC,4BAAQ;AAkBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AArBC,kCAAW;AAsBb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\n// import { container, loadCanvasPicker } from '@visactor/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.15.3\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAiDlC,sBAAK;AAhDP,6CAA+B;AAiD7B,oBAAI;AAhDN,6CAA+B;AAwE7B,oBAAI;AAvEN,+CAAiC;AACjC,qDAAuC;AA2ErC,4BAAQ;AA1EV,iDAAmC;AAoEjC,wBAAM;AAnER,yEAA2D;AA6EzD,wCAAc;AAvDhB,2CAAwC;AAuBtC,0FAvBO,qBAAS,OAuBP;AAtBX,6CAA0C;AAwBxC,2FAxBO,uBAAU,OAwBP;AAvBZ,6CAA0C;AA0BxC,2FA1BO,uBAAU,OA0BP;AAxBZ,8DAAgD;AAoD9C,oCAAY;AA/Cd,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAgDhC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAhBC,4BAAQ;AAkBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AArBC,kCAAW;AAsBb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\n// import { container, loadCanvasPicker } from '@visactor/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.15.4\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}

package/cjs/layout/pivot-header-layout.d.ts

@@ -1,4 +1,4 @@
-import type { CellAddress, CellRange, IPivotTableCellHeaderPaths, LayoutObjectId, CellLocation, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, IDimensionInfo, IExtensionRowDefine, IPagination } from '../ts-types';
+import type { CellAddress, CellRange, IPivotTableCellHeaderPaths, LayoutObjectId, CellLocation, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, IDimensionInfo, IExtensionRowDefine, IPagination, IColumnDimension, IRowDimension } from '../ts-types';
 import type { HeaderData, IndicatorData, LayoutMapAPI, WidthData } from '../ts-types/list-table/layout-map/api';
 import type { PivotTable } from '../PivotTable';
 import type { PivotChart } from '../PivotChart';
@@ -22,8 +22,8 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     private _rowHeaderCellIds;
     private _rowHeaderCellIds_FULL;
     private _columnWidths;
-    rowsDefine: (IDimension | string)[];
-    columnsDefine: (IDimension | string)[];
+    rowsDefine: (IRowDimension | string)[];
+    columnsDefine: (IColumnDimension | string)[];
     indicatorsDefine: (IIndicator | string)[];
     columnPaths: number[][];
     private _headerObjects;

package/cjs/layout/pivot-header-layout.js

@@ -625,11 +625,11 @@ class PivotHeaderLayoutMap {
         return this.getHeaderCellAdressById(hd.id);
     }
     getBody(_col, _row) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const paths = this.getCellHeaderPaths(_col, _row);
         if (this.indicatorsAsCol) {
-            const indicatorKey = null === (_a = paths.colHeaderPaths.find((colPath => colPath.indicatorKey))) || void 0 === _a ? void 0 : _a.indicatorKey;
-            return null !== (_d = null !== (_c = null === (_b = this._indicators) || void 0 === _b ? void 0 : _b.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _c ? _c : this._indicators[0]) && void 0 !== _d ? _d : {
+            const indicatorKey = null === (_b = null === (_a = paths.colHeaderPaths) || void 0 === _a ? void 0 : _a.find((colPath => colPath.indicatorKey))) || void 0 === _b ? void 0 : _b.indicatorKey;
+            return null !== (_e = null !== (_d = null === (_c = this._indicators) || void 0 === _c ? void 0 : _c.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _d ? _d : this._indicators[0]) && void 0 !== _e ? _e : {
                 id: "",
                 field: void 0,
                 indicatorKey: void 0,
@@ -637,8 +637,8 @@ class PivotHeaderLayoutMap {
                 define: void 0
             };
         }
-        const indicatorKey = null === (_e = paths.rowHeaderPaths.find((rowPath => rowPath.indicatorKey))) || void 0 === _e ? void 0 : _e.indicatorKey;
-        return null !== (_h = null !== (_g = null === (_f = this._indicators) || void 0 === _f ? void 0 : _f.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _g ? _g : this._indicators[0]) && void 0 !== _h ? _h : {
+        const indicatorKey = null === (_g = null === (_f = paths.rowHeaderPaths) || void 0 === _f ? void 0 : _f.find((rowPath => rowPath.indicatorKey))) || void 0 === _g ? void 0 : _g.indicatorKey;
+        return null !== (_k = null !== (_j = null === (_h = this._indicators) || void 0 === _h ? void 0 : _h.find((indicator => indicator.indicatorKey === indicatorKey))) && void 0 !== _j ? _j : this._indicators[0]) && void 0 !== _k ? _k : {
             id: "",
             field: void 0,
             indicatorKey: void 0,
@@ -693,10 +693,9 @@ class PivotHeaderLayoutMap {
     getCellHeaderPathsWidthTreeNode(col, row) {
         if (this._CellHeaderPathMap.has(`${col}-${row}`)) return this._CellHeaderPathMap.get(`${col}-${row}`);
         const recordCol = this.getBodyIndexByCol(col), recordRow = this.getBodyIndexByRow(row) + this.currentPageStartIndex;
-        let colPath, rowPath;
+        let colPath = [], rowPath = [];
         if (row >= 0 && recordCol >= 0 && (colPath = this.columnDimensionTree.getTreePath(recordCol, this.showHeader && this.showColumnHeader ? row - (this.columnHeaderTitle ? 1 : 0) : this.columnDimensionTree.totalLevel)), 
         col >= 0 && recordRow >= 0) if ("tree" === this.rowHierarchyType) {
-            rowPath = [];
             const row_pathIds = this._rowHeaderCellIds[recordRow];
             let findTree = this.rowDimensionTree, level = 0;
             for (;findTree; ) {