@visactor/react-vtable 1.8.3-alpha.0 → 1.8.3

package/es/index.d.ts

@@ -1,4 +1,4 @@
 export * from './tables';
 export * from './table-components';
 export * from './components';
-export declare const version = "1.8.3-alpha.0";
+export declare const version = "1.8.3";

package/es/index.js

@@ -4,5 +4,5 @@ export * from "./table-components";
 
 export * from "./components";
 
-export const version = "1.8.3-alpha.0";
+export const version = "1.8.3";
 //# sourceMappingURL=index.js.map

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAE7B,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.8.3-alpha.0\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAE7B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.8.3\";\n"]}

package/es/table-components/custom/custom-layout.js

@@ -12,7 +12,7 @@ export const CustomLayout = (props, ref) => {
     const {componentId: componentId, children: children} = props;
     if (!isValidElement(children)) return null;
     const context = useContext(RootTableContext), {table: table} = context, isHeaderCustomLayout = "header-custom-layout" === children.props.role, container = useRef(new Map), createGraphic = useCallback((args => {
-        const key = `${args.col}-${args.row}`;
+        const key = `${args.originCol}-${args.originRow}`;
         let group;
         if (container.current.has(key)) {
             const currentContainer = container.current.get(key);

package/es/table-components/custom/custom-layout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["table-components/custom/custom-layout.tsx"],"names":[],"mappings":"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","file":"custom-layout.js","sourcesContent":["/* eslint-disable react-hooks/rules-of-hooks */\nimport type { PropsWithChildren, ReactElement } from 'react';\nimport React, { isValidElement, useCallback, useContext, useLayoutEffect, useRef } from 'react';\nimport RootTableContext from '../../context/table';\nimport { Group } from '@visactor/vtable/es/vrender';\nimport type { ICustomLayoutFuc, CustomRenderFunctionArg } from '@visactor/vtable/es/ts-types';\nimport type { FiberRoot } from 'react-reconciler';\nimport { reconcilor } from './reconciler';\nimport { LegacyRoot } from 'react-reconciler/constants';\n\ntype CustomLayoutProps = { componentId: string };\n\nexport type CustomLayoutFunctionArg = Partial<CustomRenderFunctionArg> & {\n  role?: 'custom-layout' | 'header-custom-layout';\n  renderDefault?: boolean;\n};\n\nexport const CustomLayout: React.FC<CustomLayoutProps> = (props: PropsWithChildren<CustomLayoutProps>, ref) => {\n  const { componentId, children } = props;\n  if (!isValidElement(children)) {\n    return null;\n  }\n  const context = useContext(RootTableContext);\n  const { table } = context;\n\n  const isHeaderCustomLayout = children.props.role === 'header-custom-layout';\n\n  // react customLayout component container cache\n  const container = useRef<Map<string, FiberRoot>>(new Map());\n\n  // customLayout function for vtable\n  const createGraphic: ICustomLayoutFuc = useCallback(\n    args => {\n      const key = `${args.col}-${args.row}`;\n      let group;\n      if (container.current.has(key)) {\n        const currentContainer = container.current.get(key);\n        // reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);\n        reconcilorUpdateContainer(children, currentContainer, args);\n        group = currentContainer.containerInfo;\n        // 这里更新group，可能会残留dx dy\n      } else {\n        group = new Group({});\n        const currentContainer = reconcilor.createContainer(group, LegacyRoot, null, null, null, 'custom', null, null);\n        container.current.set(key, currentContainer);\n        reconcilorUpdateContainer(children, currentContainer, args);\n        // const ele = React.cloneElement(children, { ...args });\n        // reconcilor.updateContainer(ele, currentContainer, null);\n      }\n\n      return {\n        rootContainer: group,\n        renderDefault: !!children.props.renderDefault\n      };\n    },\n    [children]\n  );\n\n  const removeContainer = useCallback((col: number, row: number) => {\n    const key = `${col}-${row}`;\n    if (container.current.has(key)) {\n      const currentContainer = container.current.get(key);\n      reconcilor.updateContainer(null, currentContainer, null);\n      // group = currentContainer.containerInfo;\n      container.current.delete(key);\n    }\n  }, []);\n\n  const removeAllContainer = useCallback(() => {\n    container.current.forEach((value, key) => {\n      const currentContainer = value;\n      reconcilor.updateContainer(null, currentContainer, null);\n    });\n    container.current.clear();\n  }, []);\n\n  useLayoutEffect(() => {\n    // init and release\n    // eslint-disable-next-line no-undef\n    console.log('init', props, table);\n    // table && (table._reactCreateGraphic = createGraphic); // never go to here\n    // table?.renderWithRecreateCells();\n    return () => {\n      // eslint-disable-next-line no-undef\n      console.log('release', props, table);\n    };\n  }, []);\n\n  useLayoutEffect(() => {\n    // update props\n    // eslint-disable-next-line no-undef\n    console.log('update props', props, table);\n\n    table?.checkReactCustomLayout(removeAllContainer); // init reactCustomLayout component\n    if (table && !table.reactCustomLayout?.hasReactCreateGraphic(componentId, isHeaderCustomLayout)) {\n      table.reactCustomLayout?.setReactCreateGraphic(\n        componentId,\n        createGraphic,\n        // container.current,\n        isHeaderCustomLayout\n      ); // set customLayout function\n      table.reactCustomLayout?.setReactRemoveGraphic(componentId, removeContainer, isHeaderCustomLayout); // set customLayout function\n      table.reactCustomLayout?.updateCustomCell(componentId, isHeaderCustomLayout); // update cell content\n    } else if (table) {\n      table.reactCustomLayout?.setReactCreateGraphic(\n        componentId,\n        createGraphic,\n        // container.current,\n        isHeaderCustomLayout\n      ); // update customLayout function\n      // update all container\n      container.current.forEach((value, key) => {\n        const [col, row] = key.split('-').map(Number);\n        // const width = table.getColWidth(col); // to be fixed: may be merge cell\n        // const height = table.getRowHeight(row); // to be fixed: may be merge cell\n        const { width, height } = getCellRect(col, row, table);\n        const currentContainer = value;\n        const args = {\n          col,\n          row,\n          dataValue: table.getCellOriginValue(col, row),\n          value: table.getCellValue(col, row) || '',\n          rect: {\n            left: 0,\n            top: 0,\n            right: width,\n            bottom: height,\n            width,\n            height\n          },\n          table\n        };\n        // update element in container\n        const group = currentContainer.containerInfo;\n        reconcilorUpdateContainer(children, currentContainer, args);\n        // reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);\n        table.scenegraph.updateNextFrame();\n      });\n    }\n  });\n\n  return null;\n};\n\nfunction reconcilorUpdateContainer(children: ReactElement, currentContainer: any, args: any) {\n  reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);\n  // group = group.firstChild;\n  // if (isReactElement(group.attribute.html?.dom)) {\n  //   const div = document.createElement('div');\n  //   const root = ReactDOM.createRoot(div as HTMLElement);\n  //   root.render(group.attribute.html.dom);\n  //   group.attribute.html.dom = div;\n  //   // debugger;\n  //   // group.html.dom = div;\n  // }\n}\n\nfunction getCellRect(col: number, row: number, table: any) {\n  const range = table.getCellRange(col, row);\n  const rect = table.getCellsRect(range.start.col, range.start.row, range.end.col, range.end.row);\n  return rect;\n}\n"]}
+{"version":3,"sources":["table-components/custom/custom-layout.tsx"],"names":[],"mappings":"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","file":"custom-layout.js","sourcesContent":["/* eslint-disable react-hooks/rules-of-hooks */\nimport type { PropsWithChildren, ReactElement } from 'react';\nimport React, { isValidElement, useCallback, useContext, useLayoutEffect, useRef } from 'react';\nimport RootTableContext from '../../context/table';\nimport { Group } from '@visactor/vtable/es/vrender';\nimport type { ICustomLayoutFuc, CustomRenderFunctionArg } from '@visactor/vtable/es/ts-types';\nimport type { FiberRoot } from 'react-reconciler';\nimport { reconcilor } from './reconciler';\nimport { LegacyRoot } from 'react-reconciler/constants';\n\ntype CustomLayoutProps = { componentId: string };\n\nexport type CustomLayoutFunctionArg = Partial<CustomRenderFunctionArg> & {\n  role?: 'custom-layout' | 'header-custom-layout';\n  renderDefault?: boolean;\n};\n\nexport const CustomLayout: React.FC<CustomLayoutProps> = (props: PropsWithChildren<CustomLayoutProps>, ref) => {\n  const { componentId, children } = props;\n  if (!isValidElement(children)) {\n    return null;\n  }\n  const context = useContext(RootTableContext);\n  const { table } = context;\n\n  const isHeaderCustomLayout = children.props.role === 'header-custom-layout';\n\n  // react customLayout component container cache\n  const container = useRef<Map<string, FiberRoot>>(new Map());\n\n  // customLayout function for vtable\n  const createGraphic: ICustomLayoutFuc = useCallback(\n    args => {\n      const key = `${(args as any).originCol}-${(args as any).originRow}`;\n      let group;\n      if (container.current.has(key)) {\n        const currentContainer = container.current.get(key);\n        // reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);\n        reconcilorUpdateContainer(children, currentContainer, args);\n        group = currentContainer.containerInfo;\n        // 这里更新group，可能会残留dx dy\n      } else {\n        group = new Group({});\n        const currentContainer = reconcilor.createContainer(group, LegacyRoot, null, null, null, 'custom', null, null);\n        container.current.set(key, currentContainer);\n        reconcilorUpdateContainer(children, currentContainer, args);\n        // const ele = React.cloneElement(children, { ...args });\n        // reconcilor.updateContainer(ele, currentContainer, null);\n      }\n\n      return {\n        rootContainer: group,\n        renderDefault: !!children.props.renderDefault\n      };\n    },\n    [children]\n  );\n\n  const removeContainer = useCallback((col: number, row: number) => {\n    const key = `${col}-${row}`;\n    if (container.current.has(key)) {\n      const currentContainer = container.current.get(key);\n      reconcilor.updateContainer(null, currentContainer, null);\n      // group = currentContainer.containerInfo;\n      container.current.delete(key);\n    }\n  }, []);\n\n  const removeAllContainer = useCallback(() => {\n    container.current.forEach((value, key) => {\n      const currentContainer = value;\n      reconcilor.updateContainer(null, currentContainer, null);\n    });\n    container.current.clear();\n  }, []);\n\n  useLayoutEffect(() => {\n    // init and release\n    // eslint-disable-next-line no-undef\n    console.log('init', props, table);\n    // table && (table._reactCreateGraphic = createGraphic); // never go to here\n    // table?.renderWithRecreateCells();\n    return () => {\n      // eslint-disable-next-line no-undef\n      console.log('release', props, table);\n    };\n  }, []);\n\n  useLayoutEffect(() => {\n    // update props\n    // eslint-disable-next-line no-undef\n    console.log('update props', props, table);\n\n    table?.checkReactCustomLayout(removeAllContainer); // init reactCustomLayout component\n    if (table && !table.reactCustomLayout?.hasReactCreateGraphic(componentId, isHeaderCustomLayout)) {\n      table.reactCustomLayout?.setReactCreateGraphic(\n        componentId,\n        createGraphic,\n        // container.current,\n        isHeaderCustomLayout\n      ); // set customLayout function\n      table.reactCustomLayout?.setReactRemoveGraphic(componentId, removeContainer, isHeaderCustomLayout); // set customLayout function\n      table.reactCustomLayout?.updateCustomCell(componentId, isHeaderCustomLayout); // update cell content\n    } else if (table) {\n      table.reactCustomLayout?.setReactCreateGraphic(\n        componentId,\n        createGraphic,\n        // container.current,\n        isHeaderCustomLayout\n      ); // update customLayout function\n      // update all container\n      container.current.forEach((value, key) => {\n        const [col, row] = key.split('-').map(Number);\n        // const width = table.getColWidth(col); // to be fixed: may be merge cell\n        // const height = table.getRowHeight(row); // to be fixed: may be merge cell\n        const { width, height } = getCellRect(col, row, table);\n        const currentContainer = value;\n        const args = {\n          col,\n          row,\n          dataValue: table.getCellOriginValue(col, row),\n          value: table.getCellValue(col, row) || '',\n          rect: {\n            left: 0,\n            top: 0,\n            right: width,\n            bottom: height,\n            width,\n            height\n          },\n          table\n        };\n        // update element in container\n        const group = currentContainer.containerInfo;\n        reconcilorUpdateContainer(children, currentContainer, args);\n        // reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);\n        table.scenegraph.updateNextFrame();\n      });\n    }\n  });\n\n  return null;\n};\n\nfunction reconcilorUpdateContainer(children: ReactElement, currentContainer: any, args: any) {\n  reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);\n  // group = group.firstChild;\n  // if (isReactElement(group.attribute.html?.dom)) {\n  //   const div = document.createElement('div');\n  //   const root = ReactDOM.createRoot(div as HTMLElement);\n  //   root.render(group.attribute.html.dom);\n  //   group.attribute.html.dom = div;\n  //   // debugger;\n  //   // group.html.dom = div;\n  // }\n}\n\nfunction getCellRect(col: number, row: number, table: any) {\n  const range = table.getCellRange(col, row);\n  const rect = table.getCellsRect(range.start.col, range.start.row, range.end.col, range.end.row);\n  return rect;\n}\n"]}

package/es/table-components/custom/vtable-react-attribute-plugin.js

@@ -14,11 +14,10 @@ export class VTableReactAttributePlugin extends ReactAttributePlugin {
         if (!stage) return;
         const ReactDOM = stage.params.ReactDOM, {element: element} = react;
         let {container: container} = react;
-        if (!(element && ReactDOM && ReactDOM.createRoot)) return;
+        if (container && (container = checkFrozenContainer(graphic)), !(element && ReactDOM && ReactDOM.createRoot)) return;
         const id = isNil(react.id) ? `${null !== (_a = graphic.id) && void 0 !== _a ? _a : graphic._uid}_react` : react.id;
         if (this.htmlMap && this.htmlMap[id] && container && container !== this.htmlMap[id].container && this.removeElement(id), 
         this.htmlMap && this.htmlMap[id]) this.htmlMap[id].root.render(element); else {
-            container && (container = checkFrozenContainer(graphic));
             const {wrapContainer: wrapContainer, nativeContainer: nativeContainer} = this.getWrapContainer(stage, container);
             if (wrapContainer) {
                 const root = ReactDOM.createRoot(wrapContainer);
@@ -98,6 +97,6 @@ function checkFrozenContainer(graphic) {
     let {container: container} = graphic.attribute.react;
     const {table: table} = stage;
     return container === table.bodyDomContainer && col < table.frozenColCount && row >= table.rowCount - table.bottomFrozenRowCount ? container = table.bottomFrozenBodyDomContainer : container === table.bodyDomContainer && col >= table.colCount - table.rightFrozenColCount && row >= table.rowCount - table.bottomFrozenRowCount ? container = table.rightFrozenBottomDomContainer : container === table.bodyDomContainer && row >= table.rowCount - table.bottomFrozenRowCount ? container = table.bottomFrozenBodyDomContainer : container === table.bodyDomContainer && col < table.frozenColCount ? container = table.frozenBodyDomContainer : container === table.bodyDomContainer && col >= table.colCount - table.rightFrozenColCount ? container = table.rightFrozenBodyDomContainer : container === table.headerDomContainer && col < table.frozenColCount ? container = table.frozenHeaderDomContainer : container === table.headerDomContainer && col >= table.colCount - table.rightFrozenColCount && (container = table.rightFrozenHeaderDomContainer), 
-    graphic.attribute.react.container = container, container;
+    container;
 }
 //# sourceMappingURL=vtable-react-attribute-plugin.js.map

package/es/table-components/custom/vtable-react-attribute-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["table-components/custom/vtable-react-attribute-plugin.ts"],"names":[],"mappings":"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","file":"vtable-react-attribute-plugin.js","sourcesContent":["import type {\n  CommonDomOptions,\n  CreateDOMParamsType,\n  IGraphic,\n  IGroup,\n  IStage,\n  IText,\n  SimpleDomStyleOptions\n} from '@visactor/vtable/es/vrender';\nimport { DefaultAttribute, ReactAttributePlugin, application } from '@visactor/vtable/es/vrender';\nimport { calculateAnchorOfBounds, isFunction, isNil, isObject, isString, styleStringToObject } from '@visactor/vutils';\nimport type { CreateDOMParamsTypeForVTable } from './vtable-browser-env-contribution';\n\nexport class VTableReactAttributePlugin extends ReactAttributePlugin {\n  declare htmlMap: Record<\n    string,\n    {\n      root?: any;\n      unmount?: () => void;\n      wrapContainer: HTMLElement;\n      nativeContainer: HTMLElement;\n      container: string | HTMLElement | null;\n      renderId: number;\n      graphic: IGraphic;\n    }\n  >;\n  removeElement(id: string) {\n    super.removeElement(id);\n    delete this.htmlMap[id];\n  }\n\n  renderGraphicHTML(graphic: IGraphic) {\n    const { react } = graphic.attribute;\n    if (!react) {\n      return;\n    }\n    const stage = graphic.stage;\n    if (!stage) {\n      return;\n    }\n    const ReactDOM = stage.params.ReactDOM;\n    const { element } = react;\n    let { container } = react;\n    if (!(element && ReactDOM && ReactDOM.createRoot)) {\n      return;\n    }\n    const id = isNil(react.id) ? `${graphic.id ?? graphic._uid}_react` : react.id;\n\n    if (this.htmlMap && this.htmlMap[id] && container && container !== this.htmlMap[id].container) {\n      this.removeElement(id);\n    }\n\n    if (!this.htmlMap || !this.htmlMap[id]) {\n      // deal with frozen container\n      if (container) {\n        container = checkFrozenContainer(graphic);\n      }\n\n      // createa a wrapper contianer to be the root of react element\n      const { wrapContainer, nativeContainer } = this.getWrapContainer(stage, container);\n\n      if (wrapContainer) {\n        const root = ReactDOM.createRoot(wrapContainer);\n        root.render(element);\n\n        if (!this.htmlMap) {\n          this.htmlMap = {};\n        }\n\n        this.htmlMap[id] = { root, wrapContainer, nativeContainer, container, renderId: this.renderId, graphic };\n      }\n    } else {\n      // update react element\n      this.htmlMap[id].root.render(element);\n    }\n\n    if (!this.htmlMap || !this.htmlMap[id]) {\n      return;\n    }\n\n    const { wrapContainer, nativeContainer } = this.htmlMap[id];\n\n    this.updateStyleOfWrapContainer(graphic, stage, wrapContainer, nativeContainer, react);\n    this.htmlMap[id].renderId = this.renderId;\n  }\n\n  getWrapContainer(stage: IStage, userContainer?: string | HTMLElement | null, domParams?: CreateDOMParamsType) {\n    let nativeContainer;\n    if (userContainer) {\n      if (typeof userContainer === 'string') {\n        nativeContainer = application.global.getElementById(userContainer);\n      } else {\n        nativeContainer = userContainer;\n      }\n    } else {\n      nativeContainer = stage.window.getContainer();\n    }\n    // 创建wrapGroup\n    return {\n      wrapContainer: application.global.createDom({ tagName: 'div', parent: nativeContainer, ...domParams }),\n      nativeContainer\n    };\n  }\n\n  updateStyleOfWrapContainer(\n    graphic: IGraphic,\n    stage: IStage,\n    wrapContainer: HTMLElement,\n    nativeContainer: HTMLElement,\n    options: SimpleDomStyleOptions & CommonDomOptions\n  ) {\n    const { pointerEvents } = options;\n    let calculateStyle = this.parseDefaultStyleFromGraphic(graphic);\n\n    calculateStyle.display = graphic.attribute.visible !== false ? 'block' : 'none';\n    // 事件穿透\n    calculateStyle.pointerEvents = pointerEvents === true ? 'all' : pointerEvents ? pointerEvents : 'none';\n    // 定位wrapGroup\n    if (!wrapContainer.style.position) {\n      wrapContainer.style.position = 'absolute';\n      // nativeContainer.style.position = 'relative'; // 'relative' will cause the problem of container position\n    }\n    let left: number = 0;\n    let top: number = 0;\n    const b = graphic.globalAABBBounds;\n\n    let anchorType = options.anchorType;\n\n    if (isNil(anchorType)) {\n      anchorType = graphic.type === 'text' ? 'position' : 'boundsLeftTop';\n    }\n\n    if (anchorType === 'boundsLeftTop') {\n      // 兼容老的配置，统一配置\n      anchorType = 'top-left';\n    }\n    if (anchorType === 'position' || b.empty()) {\n      const matrix = graphic.globalTransMatrix;\n      left = matrix.e;\n      top = matrix.f;\n    } else {\n      const anchor = calculateAnchorOfBounds(b, anchorType);\n\n      left = anchor.x;\n      top = anchor.y;\n    }\n\n    // 查看wrapGroup的位置\n    // const wrapGroupTL = application.global.getElementTopLeft(wrapGroup, false);\n    const containerTL = application.global.getElementTopLeft(nativeContainer, false);\n    const windowTL = stage.window.getTopLeft(false);\n    const offsetX = left + windowTL.left - containerTL.left;\n    const offsetTop = top + windowTL.top - containerTL.top;\n    // wrapGroup.style.transform = `translate(${offsetX}px, ${offsetTop}px)`;\n    calculateStyle.left = `${offsetX}px`;\n    calculateStyle.top = `${offsetTop}px`;\n\n    if (graphic.type === 'text' && anchorType === 'position') {\n      calculateStyle = {\n        ...calculateStyle,\n        ...this.getTransformOfText(graphic as IText)\n      };\n    }\n\n    if (isFunction(options.style)) {\n      const userStyle = options.style(\n        { top: offsetTop, left: offsetX, width: b.width(), height: b.height() },\n        graphic,\n        wrapContainer\n      );\n\n      if (userStyle) {\n        calculateStyle = { ...calculateStyle, ...userStyle };\n      }\n    } else if (isObject(options.style)) {\n      calculateStyle = { ...calculateStyle, ...options.style };\n    } else if (isString(options.style) && options.style) {\n      calculateStyle = { ...calculateStyle, ...styleStringToObject(options.style as string) };\n    }\n\n    // 更新样式\n    application.global.updateDom(wrapContainer, {\n      width: options.width,\n      height: options.height,\n      style: calculateStyle,\n      graphic\n    } as CreateDOMParamsTypeForVTable);\n  }\n\n  protected drawHTML() {\n    if (application.global.env === 'browser') {\n      (this.pluginService.stage as any).children // fix interactive layer problem\n        .sort((a: IGraphic, b: IGraphic) => {\n          return (a.attribute.zIndex ?? DefaultAttribute.zIndex) - (b.attribute.zIndex ?? DefaultAttribute.zIndex);\n        })\n        .forEach((group: IGroup) => {\n          this.renderGroupHTML(group);\n        });\n\n      this.clearCacheContainer();\n    }\n  }\n}\n\nfunction checkFrozenContainer(graphic: IGraphic) {\n  const { col, row, stage } = graphic.parent;\n  let { container } = graphic.attribute.react;\n  const { table } = stage as any;\n  // deal with react dom container\n  if (\n    container === table.bodyDomContainer &&\n    col < table.frozenColCount &&\n    row >= table.rowCount - table.bottomFrozenRowCount\n  ) {\n    container = table.bottomFrozenBodyDomContainer;\n  } else if (\n    container === table.bodyDomContainer &&\n    col >= table.colCount - table.rightFrozenColCount &&\n    row >= table.rowCount - table.bottomFrozenRowCount\n  ) {\n    container = table.rightFrozenBottomDomContainer;\n  } else if (container === table.bodyDomContainer && row >= table.rowCount - table.bottomFrozenRowCount) {\n    container = table.bottomFrozenBodyDomContainer;\n  } else if (container === table.bodyDomContainer && col < table.frozenColCount) {\n    container = table.frozenBodyDomContainer;\n  } else if (container === table.bodyDomContainer && col >= table.colCount - table.rightFrozenColCount) {\n    container = table.rightFrozenBodyDomContainer;\n  } else if (container === table.headerDomContainer && col < table.frozenColCount) {\n    container = table.frozenHeaderDomContainer;\n  } else if (container === table.headerDomContainer && col >= table.colCount - table.rightFrozenColCount) {\n    container = table.rightFrozenHeaderDomContainer;\n  }\n\n  graphic.attribute.react.container = container;\n  return container;\n}\n"]}
+{"version":3,"sources":["table-components/custom/vtable-react-attribute-plugin.ts"],"names":[],"mappings":"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","file":"vtable-react-attribute-plugin.js","sourcesContent":["import type {\n  CommonDomOptions,\n  CreateDOMParamsType,\n  IGraphic,\n  IGroup,\n  IStage,\n  IText,\n  SimpleDomStyleOptions\n} from '@visactor/vtable/es/vrender';\nimport { DefaultAttribute, ReactAttributePlugin, application } from '@visactor/vtable/es/vrender';\nimport { calculateAnchorOfBounds, isFunction, isNil, isObject, isString, styleStringToObject } from '@visactor/vutils';\nimport type { CreateDOMParamsTypeForVTable } from './vtable-browser-env-contribution';\n\nexport class VTableReactAttributePlugin extends ReactAttributePlugin {\n  declare htmlMap: Record<\n    string,\n    {\n      root?: any;\n      unmount?: () => void;\n      wrapContainer: HTMLElement;\n      nativeContainer: HTMLElement;\n      container: string | HTMLElement | null;\n      renderId: number;\n      graphic: IGraphic;\n    }\n  >;\n  removeElement(id: string) {\n    super.removeElement(id);\n    delete this.htmlMap[id];\n  }\n\n  renderGraphicHTML(graphic: IGraphic) {\n    const { react } = graphic.attribute;\n    if (!react) {\n      return;\n    }\n    const stage = graphic.stage;\n    if (!stage) {\n      return;\n    }\n    const ReactDOM = stage.params.ReactDOM;\n    const { element } = react;\n    let { container } = react;\n    // deal with frozen container\n    if (container) {\n      container = checkFrozenContainer(graphic);\n    }\n\n    if (!(element && ReactDOM && ReactDOM.createRoot)) {\n      return;\n    }\n    const id = isNil(react.id) ? `${graphic.id ?? graphic._uid}_react` : react.id;\n\n    if (this.htmlMap && this.htmlMap[id] && container && container !== this.htmlMap[id].container) {\n      this.removeElement(id);\n    }\n\n    if (!this.htmlMap || !this.htmlMap[id]) {\n      // createa a wrapper contianer to be the root of react element\n      const { wrapContainer, nativeContainer } = this.getWrapContainer(stage, container);\n\n      if (wrapContainer) {\n        const root = ReactDOM.createRoot(wrapContainer);\n        root.render(element);\n\n        if (!this.htmlMap) {\n          this.htmlMap = {};\n        }\n\n        this.htmlMap[id] = { root, wrapContainer, nativeContainer, container, renderId: this.renderId, graphic };\n      }\n    } else {\n      // update react element\n      this.htmlMap[id].root.render(element);\n    }\n\n    if (!this.htmlMap || !this.htmlMap[id]) {\n      return;\n    }\n\n    const { wrapContainer, nativeContainer } = this.htmlMap[id];\n\n    this.updateStyleOfWrapContainer(graphic, stage, wrapContainer, nativeContainer, react);\n    this.htmlMap[id].renderId = this.renderId;\n  }\n\n  getWrapContainer(stage: IStage, userContainer?: string | HTMLElement | null, domParams?: CreateDOMParamsType) {\n    let nativeContainer;\n    if (userContainer) {\n      if (typeof userContainer === 'string') {\n        nativeContainer = application.global.getElementById(userContainer);\n      } else {\n        nativeContainer = userContainer;\n      }\n    } else {\n      nativeContainer = stage.window.getContainer();\n    }\n    // 创建wrapGroup\n    return {\n      wrapContainer: application.global.createDom({ tagName: 'div', parent: nativeContainer, ...domParams }),\n      nativeContainer\n    };\n  }\n\n  updateStyleOfWrapContainer(\n    graphic: IGraphic,\n    stage: IStage,\n    wrapContainer: HTMLElement,\n    nativeContainer: HTMLElement,\n    options: SimpleDomStyleOptions & CommonDomOptions\n  ) {\n    const { pointerEvents } = options;\n    let calculateStyle = this.parseDefaultStyleFromGraphic(graphic);\n\n    calculateStyle.display = graphic.attribute.visible !== false ? 'block' : 'none';\n    // 事件穿透\n    calculateStyle.pointerEvents = pointerEvents === true ? 'all' : pointerEvents ? pointerEvents : 'none';\n    // 定位wrapGroup\n    if (!wrapContainer.style.position) {\n      wrapContainer.style.position = 'absolute';\n      // nativeContainer.style.position = 'relative'; // 'relative' will cause the problem of container position\n    }\n    let left: number = 0;\n    let top: number = 0;\n    const b = graphic.globalAABBBounds;\n\n    let anchorType = options.anchorType;\n\n    if (isNil(anchorType)) {\n      anchorType = graphic.type === 'text' ? 'position' : 'boundsLeftTop';\n    }\n\n    if (anchorType === 'boundsLeftTop') {\n      // 兼容老的配置，统一配置\n      anchorType = 'top-left';\n    }\n    if (anchorType === 'position' || b.empty()) {\n      const matrix = graphic.globalTransMatrix;\n      left = matrix.e;\n      top = matrix.f;\n    } else {\n      const anchor = calculateAnchorOfBounds(b, anchorType);\n\n      left = anchor.x;\n      top = anchor.y;\n    }\n\n    // 查看wrapGroup的位置\n    // const wrapGroupTL = application.global.getElementTopLeft(wrapGroup, false);\n    const containerTL = application.global.getElementTopLeft(nativeContainer, false);\n    const windowTL = stage.window.getTopLeft(false);\n    const offsetX = left + windowTL.left - containerTL.left;\n    const offsetTop = top + windowTL.top - containerTL.top;\n    // wrapGroup.style.transform = `translate(${offsetX}px, ${offsetTop}px)`;\n    calculateStyle.left = `${offsetX}px`;\n    calculateStyle.top = `${offsetTop}px`;\n\n    if (graphic.type === 'text' && anchorType === 'position') {\n      calculateStyle = {\n        ...calculateStyle,\n        ...this.getTransformOfText(graphic as IText)\n      };\n    }\n\n    if (isFunction(options.style)) {\n      const userStyle = options.style(\n        { top: offsetTop, left: offsetX, width: b.width(), height: b.height() },\n        graphic,\n        wrapContainer\n      );\n\n      if (userStyle) {\n        calculateStyle = { ...calculateStyle, ...userStyle };\n      }\n    } else if (isObject(options.style)) {\n      calculateStyle = { ...calculateStyle, ...options.style };\n    } else if (isString(options.style) && options.style) {\n      calculateStyle = { ...calculateStyle, ...styleStringToObject(options.style as string) };\n    }\n\n    // 更新样式\n    application.global.updateDom(wrapContainer, {\n      width: options.width,\n      height: options.height,\n      style: calculateStyle,\n      graphic\n    } as CreateDOMParamsTypeForVTable);\n  }\n\n  protected drawHTML() {\n    if (application.global.env === 'browser') {\n      (this.pluginService.stage as any).children // fix interactive layer problem\n        .sort((a: IGraphic, b: IGraphic) => {\n          return (a.attribute.zIndex ?? DefaultAttribute.zIndex) - (b.attribute.zIndex ?? DefaultAttribute.zIndex);\n        })\n        .forEach((group: IGroup) => {\n          this.renderGroupHTML(group);\n        });\n\n      this.clearCacheContainer();\n    }\n  }\n}\n\nfunction checkFrozenContainer(graphic: IGraphic) {\n  const { col, row, stage } = graphic.parent;\n  let { container } = graphic.attribute.react;\n  const { table } = stage as any;\n  // deal with react dom container\n  if (\n    container === table.bodyDomContainer &&\n    col < table.frozenColCount &&\n    row >= table.rowCount - table.bottomFrozenRowCount\n  ) {\n    container = table.bottomFrozenBodyDomContainer;\n  } else if (\n    container === table.bodyDomContainer &&\n    col >= table.colCount - table.rightFrozenColCount &&\n    row >= table.rowCount - table.bottomFrozenRowCount\n  ) {\n    container = table.rightFrozenBottomDomContainer;\n  } else if (container === table.bodyDomContainer && row >= table.rowCount - table.bottomFrozenRowCount) {\n    container = table.bottomFrozenBodyDomContainer;\n  } else if (container === table.bodyDomContainer && col < table.frozenColCount) {\n    container = table.frozenBodyDomContainer;\n  } else if (container === table.bodyDomContainer && col >= table.colCount - table.rightFrozenColCount) {\n    container = table.rightFrozenBodyDomContainer;\n  } else if (container === table.headerDomContainer && col < table.frozenColCount) {\n    container = table.frozenHeaderDomContainer;\n  } else if (container === table.headerDomContainer && col >= table.colCount - table.rightFrozenColCount) {\n    container = table.rightFrozenHeaderDomContainer;\n  }\n\n  // graphic.attribute.react.container = container;\n  return container;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vtable",
-  "version": "1.8.3-alpha.0",
+  "version": "1.8.3",
   "description": "The react version of VTable",
   "keywords": [
     "react",
@@ -43,10 +43,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@visactor/vtable": "1.8.3-alpha.0",
     "@visactor/vutils": "~0.18.14",
     "react-is": "^18.2.0",
-    "react-reconciler": "0.29.2"
+    "react-reconciler": "0.29.2",
+    "@visactor/vtable": "1.8.3"
   },
   "devDependencies": {
     "@visactor/vchart": "1.12.1",
@@ -91,9 +91,9 @@
     "@types/react-is": "^17.0.3",
     "@arco-design/web-react": "2.60.2",
     "@types/react-reconciler": "0.28.8",
-    "@internal/ts-config": "0.0.1",
     "@internal/bundler": "0.0.1",
-    "@internal/eslint-config": "0.0.1"
+    "@internal/eslint-config": "0.0.1",
+    "@internal/ts-config": "0.0.1"
   },
   "scripts": {
     "start": "vite ./demo",