@visactor/react-vtable 1.3.3-alpha.0 → 1.3.3-alpha.1

package/es/components/base-component.d.ts

@@ -1,12 +1,10 @@
 import React from 'react';
 export interface BaseComponentProps {
     id?: string | number;
-    children?: React.ReactNode;
 }
 type ComponentProps = BaseComponentProps & {
     updateId?: number;
     componentId?: number;
-    componentIndex?: number;
 };
 export declare const createComponent: <T extends ComponentProps>(componentName: string, optionName: string, supportedEvents?: Record<string, string> | null, isSingle?: boolean) => React.FC<T>;
 export {};

package/es/components/base-component.js

@@ -6,10 +6,8 @@ import RootTableContext from "../context/table";
 
 import { bindEventsToTable } from "../eventsUtils";
 
-import { CustomLayout } from "./custom/custom-layout";
-
 export const createComponent = (componentName, optionName, supportedEvents, isSingle) => {
-    const ignoreKeys = [ "id", "updateId", "componentId", "componentIndex", "children" ], notOptionKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys, Comp = props => {
+    const ignoreKeys = [ "id", "updateId", "componentId" ], notOptionKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys, Comp = props => {
         const context = useContext(RootTableContext), eventsBinded = React.useRef(null), updateId = React.useRef(props.updateId);
         if (props.updateId !== updateId.current) {
             updateId.current = props.updateId;
@@ -17,23 +15,11 @@ export const createComponent = (componentName, optionName, supportedEvents, isSi
         }
         return useEffect((() => () => {
             supportedEvents && bindEventsToTable(context.table, null, eventsBinded.current, supportedEvents);
-        }), []), props.children ? React.Children.map(props.children, (child => React.createElement(CustomLayout, {
-            componentIndex: props.componentIndex
-        }, child))) : null;
+        }), []), null;
     };
-    return Comp.displayName = componentName, Comp.parseOption = props => {
-        const newComponentOption = pickWithout(props, notOptionKeys);
-        if (props.children) {
-            const {children: children} = props;
-            React.Children.map(children, (child => {
-                "custom-layout" === child.props.role && (newComponentOption.customLayout = "react-custom-layout"), 
-                "header-custom-layout" === child.props.role && (newComponentOption.headerCustomLayout = "react-custom-layout");
-            }));
-        }
-        return {
-            option: newComponentOption,
-            optionName: optionName,
-            isSingle: isSingle
-        };
-    }, Comp;
+    return Comp.displayName = componentName, Comp.parseOption = props => ({
+        option: pickWithout(props, notOptionKeys),
+        optionName: optionName,
+        isSingle: isSingle
+    }), Comp;
 };

package/es/components/base-component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["components/base-component.tsx"],"names":[],"mappings":"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","file":"base-component.js","sourcesContent":["import type { ReactElement } from 'react';\nimport React, { useContext, useEffect } from 'react';\nimport { isEqual, isNil, pickWithout } from '@visactor/vutils';\n\nimport type { TableContextType } from '../context/table';\nimport RootTableContext from '../context/table';\nimport { bindEventsToTable } from '../eventsUtils';\nimport { uid } from '../util';\nimport { CustomLayout } from './custom/custom-layout';\n\nexport interface BaseComponentProps {\n  id?: string | number;\n  children?: React.ReactNode;\n}\n\ntype ComponentProps = BaseComponentProps & { updateId?: number; componentId?: number; componentIndex?: number };\n\nexport const createComponent = <T extends ComponentProps>(\n  componentName: string,\n  optionName: string,\n  supportedEvents?: Record<string, string> | null,\n  isSingle?: boolean\n) => {\n  const ignoreKeys = ['id', 'updateId', 'componentId', 'componentIndex', 'children'];\n  const notOptionKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys;\n\n  const Comp: React.FC<T> = (props: T) => {\n    const context = useContext(RootTableContext);\n    // const id = React.useRef<string | number>(isNil(props.id) ? uid(optionName) : props.id);\n\n    const eventsBinded = React.useRef<T>(null);\n    const updateId = React.useRef<number>(props.updateId);\n    // const componentOption = React.useRef<Partial<T>>();\n\n    if (props.updateId !== updateId.current) {\n      // update triggered by table when table is rendered\n      updateId.current = props.updateId;\n\n      // rebind events after table render\n      const hasPrevEventsBinded = supportedEvents\n        ? bindEventsToTable(context.table, props, eventsBinded.current, supportedEvents)\n        : false;\n      if (hasPrevEventsBinded) {\n        eventsBinded.current = props;\n      }\n      // } else {\n      //   const newComponentOption: Partial<T> = pickWithout<T>(props, notOptionKeys);\n\n      //   if (!isEqual(newComponentOption, componentOption.current)) {\n      //     componentOption.current = newComponentOption;\n      //     updateToContext(context, id.current, optionName, isSingle, newComponentOption);\n      //   }\n    }\n\n    useEffect(() => {\n      return () => {\n        if (supportedEvents) {\n          bindEventsToTable(context.table, null, eventsBinded.current, supportedEvents);\n        }\n        // deleteToContext(context, id.current, optionName, isSingle);\n      };\n    }, []);\n\n    // children are all custom layout temply\n    // return props.children\n    //   ? React.cloneElement(props.children as ReactElement, { componentIndex: props.componentIndex })\n    //   : null;\n    if (props.children) {\n      return React.Children.map(props.children as ReactElement, (child: ReactElement) => {\n        return React.createElement(CustomLayout, { componentIndex: props.componentIndex }, child);\n      });\n    }\n    return null;\n  };\n\n  Comp.displayName = componentName;\n\n  (Comp as any).parseOption = (props: T & { updateId?: number; componentId?: string }) => {\n    const newComponentOption: Partial<T> = pickWithout<T>(props, notOptionKeys);\n\n    // deal width customLayout\n    if (props.children) {\n      const { children } = props;\n      React.Children.map(children as ReactElement, (child: ReactElement) => {\n        if (child.props.role === 'custom-layout') {\n          (newComponentOption as any).customLayout = 'react-custom-layout';\n        }\n        if (child.props.role === 'header-custom-layout') {\n          (newComponentOption as any).headerCustomLayout = 'react-custom-layout';\n        }\n      });\n    }\n    // if (props.children && (props.children as React.ReactElement).props.role === 'custom-layout') {\n    //   (newComponentOption as any).customLayout = 'react-custom-layout';\n    // }\n\n    return {\n      option: newComponentOption,\n      optionName,\n      isSingle\n    };\n  };\n\n  return Comp;\n};\n\n// const updateToContext = (\n//   context: TableContextType,\n//   id: string | number,\n//   optionName: string,\n//   isSingle: boolean,\n//   props: Partial<ComponentProps>\n// ) => {\n//   if (!context.optionFromChildren) {\n//     return;\n//   }\n\n//   if (isSingle) {\n//     context.optionFromChildren[optionName] = { ...props };\n//   } else {\n//     if (!context.optionFromChildren[optionName]) {\n//       context.optionFromChildren[optionName] = [];\n//     }\n\n//     const comps = context.optionFromChildren[optionName];\n//     const index = comps.findIndex((entry: any) => entry.id === id);\n\n//     if (index >= 0) {\n//       comps[index] = {\n//         id,\n//         ...props\n//       };\n//     } else {\n//       context.optionFromChildren[optionName].push({\n//         id,\n//         ...props\n//       });\n//     }\n//   }\n//   context.isChildrenUpdated = true;\n// };\n\n// const deleteToContext = (context: TableContextType, id: string | number, optionName: string, isSingle: boolean) => {\n//   if (!context.optionFromChildren) {\n//     return;\n//   }\n\n//   if (isSingle) {\n//     context.optionFromChildren[optionName] = null;\n//   } else {\n//     const comps = context.optionFromChildren[optionName] ?? [];\n//     const index = comps.findIndex((entry: any) => entry.id === id);\n\n//     if (index >= 0) {\n//       const newComps = comps.slice(0, index - 1).concat(comps.slice(index + 1));\n\n//       context.optionFromChildren[optionName] = newComps;\n//       context.isChildrenUpdated = true;\n//     }\n//   }\n// };\n"]}
+{"version":3,"sources":["components/base-component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAkB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,gBAAgB,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AASnD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,aAAqB,EACrB,UAAkB,EAClB,eAA+C,EAC/C,QAAkB,EAClB,EAAE;IACF,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAErG,MAAM,IAAI,GAAgB,CAAC,KAAQ,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAG7C,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAI,IAAI,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAS,KAAK,CAAC,QAAQ,CAAC,CAAC;QAGtD,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,OAAO,EAAE;YAEvC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;YAGlC,MAAM,mBAAmB,GAAG,eAAe;gBACzC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC;gBAChF,CAAC,CAAC,KAAK,CAAC;YACV,IAAI,mBAAmB,EAAE;gBACvB,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;aAC9B;SAQF;QAED,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,GAAG,EAAE;gBACV,IAAI,eAAe,EAAE;oBACnB,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;iBAC/E;YAEH,CAAC,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC;IAEhC,IAAY,CAAC,WAAW,GAAG,CAAC,KAAsD,EAAE,EAAE;QACrF,MAAM,kBAAkB,GAAe,WAAW,CAAI,KAAK,EAAE,aAAa,CAAC,CAAC;QAE5E,OAAO;YACL,MAAM,EAAE,kBAAkB;YAC1B,UAAU;YACV,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC","file":"base-component.js","sourcesContent":["import React, { useContext, useEffect } from 'react';\nimport { isEqual, isNil, pickWithout } from '@visactor/vutils';\n\nimport type { TableContextType } from '../context/table';\nimport RootTableContext from '../context/table';\nimport { bindEventsToTable } from '../eventsUtils';\nimport { uid } from '../util';\n\nexport interface BaseComponentProps {\n  id?: string | number;\n}\n\ntype ComponentProps = BaseComponentProps & { updateId?: number; componentId?: number };\n\nexport const createComponent = <T extends ComponentProps>(\n  componentName: string,\n  optionName: string,\n  supportedEvents?: Record<string, string> | null,\n  isSingle?: boolean\n) => {\n  const ignoreKeys = ['id', 'updateId', 'componentId'];\n  const notOptionKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys;\n\n  const Comp: React.FC<T> = (props: T) => {\n    const context = useContext(RootTableContext);\n    // const id = React.useRef<string | number>(isNil(props.id) ? uid(optionName) : props.id);\n\n    const eventsBinded = React.useRef<T>(null);\n    const updateId = React.useRef<number>(props.updateId);\n    // const componentOption = React.useRef<Partial<T>>();\n\n    if (props.updateId !== updateId.current) {\n      // update triggered by table when table is rendered\n      updateId.current = props.updateId;\n\n      // rebind events after table render\n      const hasPrevEventsBinded = supportedEvents\n        ? bindEventsToTable(context.table, props, eventsBinded.current, supportedEvents)\n        : false;\n      if (hasPrevEventsBinded) {\n        eventsBinded.current = props;\n      }\n      // } else {\n      //   const newComponentOption: Partial<T> = pickWithout<T>(props, notOptionKeys);\n\n      //   if (!isEqual(newComponentOption, componentOption.current)) {\n      //     componentOption.current = newComponentOption;\n      //     updateToContext(context, id.current, optionName, isSingle, newComponentOption);\n      //   }\n    }\n\n    useEffect(() => {\n      return () => {\n        if (supportedEvents) {\n          bindEventsToTable(context.table, null, eventsBinded.current, supportedEvents);\n        }\n        // deleteToContext(context, id.current, optionName, isSingle);\n      };\n    }, []);\n\n    return null;\n  };\n\n  Comp.displayName = componentName;\n\n  (Comp as any).parseOption = (props: T & { updateId?: number; componentId?: string }) => {\n    const newComponentOption: Partial<T> = pickWithout<T>(props, notOptionKeys);\n\n    return {\n      option: newComponentOption,\n      optionName,\n      isSingle\n    };\n  };\n\n  return Comp;\n};\n\n// const updateToContext = (\n//   context: TableContextType,\n//   id: string | number,\n//   optionName: string,\n//   isSingle: boolean,\n//   props: Partial<ComponentProps>\n// ) => {\n//   if (!context.optionFromChildren) {\n//     return;\n//   }\n\n//   if (isSingle) {\n//     context.optionFromChildren[optionName] = { ...props };\n//   } else {\n//     if (!context.optionFromChildren[optionName]) {\n//       context.optionFromChildren[optionName] = [];\n//     }\n\n//     const comps = context.optionFromChildren[optionName];\n//     const index = comps.findIndex((entry: any) => entry.id === id);\n\n//     if (index >= 0) {\n//       comps[index] = {\n//         id,\n//         ...props\n//       };\n//     } else {\n//       context.optionFromChildren[optionName].push({\n//         id,\n//         ...props\n//       });\n//     }\n//   }\n//   context.isChildrenUpdated = true;\n// };\n\n// const deleteToContext = (context: TableContextType, id: string | number, optionName: string, isSingle: boolean) => {\n//   if (!context.optionFromChildren) {\n//     return;\n//   }\n\n//   if (isSingle) {\n//     context.optionFromChildren[optionName] = null;\n//   } else {\n//     const comps = context.optionFromChildren[optionName] ?? [];\n//     const index = comps.findIndex((entry: any) => entry.id === id);\n\n//     if (index >= 0) {\n//       const newComps = comps.slice(0, index - 1).concat(comps.slice(index + 1));\n\n//       context.optionFromChildren[optionName] = newComps;\n//       context.isChildrenUpdated = true;\n//     }\n//   }\n// };\n"]}

package/es/components/index.d.ts

@@ -7,9 +7,6 @@ export { PivotCorner } from './pivot/pivot-corner';
 export { Menu } from './component/menu';
 export { Tooltip } from './component/tooltip';
 export { CustomComponent } from './custom-component';
-export { CustomLayout, type CustomLayoutFunctionArg } from './custom/custom-layout';
-export * from './custom/graphic';
-export * from './custom/component';
 type Props = {
     updateId?: number;
 };

package/es/components/index.js

@@ -13,10 +13,4 @@ export { Menu } from "./component/menu";
 export { Tooltip } from "./component/tooltip";
 
 export { CustomComponent } from "./custom-component";
-
-export { CustomLayout } from "./custom/custom-layout";
-
-export * from "./custom/graphic";
-
-export * from "./custom/component";
 //# sourceMappingURL=index.js.map

package/es/components/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["components/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAgC,MAAM,wBAAwB,CAAC;AACpF,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC","file":"index.js","sourcesContent":["import type React from 'react';\nexport { ListColumn } from './list/list-column';\nexport { PivotColumnDimension, PivotRowDimension } from './pivot/pivot-dimension';\nexport { PivotIndicator } from './pivot/pivot-indicator';\nexport { PivotColumnHeaderTitle, PivotRowHeaderTitle } from './pivot/pivot-header-title';\nexport { PivotCorner } from './pivot/pivot-corner';\nexport { Menu } from './component/menu';\nexport { Tooltip } from './component/tooltip';\n\nexport { CustomComponent } from './custom-component';\nexport { CustomLayout, type CustomLayoutFunctionArg } from './custom/custom-layout';\nexport * from './custom/graphic';\nexport * from './custom/component';\n\ntype Props = { updateId?: number };\n\nexport interface IMarkElement extends React.ReactElement<Props, React.JSXElementConstructor<Props>> {\n  id: string | number;\n}\n"]}
+{"version":3,"sources":["components/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC","file":"index.js","sourcesContent":["import type React from 'react';\nexport { ListColumn } from './list/list-column';\nexport { PivotColumnDimension, PivotRowDimension } from './pivot/pivot-dimension';\nexport { PivotIndicator } from './pivot/pivot-indicator';\nexport { PivotColumnHeaderTitle, PivotRowHeaderTitle } from './pivot/pivot-header-title';\nexport { PivotCorner } from './pivot/pivot-corner';\nexport { Menu } from './component/menu';\nexport { Tooltip } from './component/tooltip';\n\nexport { CustomComponent } from './custom-component';\n\ntype Props = { updateId?: number };\n\nexport interface IMarkElement extends React.ReactElement<Props, React.JSXElementConstructor<Props>> {\n  id: string | number;\n}\n"]}

package/es/eventsUtils.js

@@ -70,4 +70,5 @@ export const bindEventsToTable = (table, newProps, prevProps, supportedEvents =
     })), newEventProps && Object.keys(newEventProps).forEach((eventKey => {
         prevEventProps && prevEventProps[eventKey] && prevEventProps[eventKey] === newEventProps[eventKey] || table.on(supportedEvents[eventKey], newEventProps[eventKey]);
     })), !0;
-};
+};
+//# sourceMappingURL=eventsUtils.js.map

package/es/index.d.ts

@@ -1,4 +1,5 @@
+import * as VTable from '@visactor/vtable';
 export * from './tables';
 export * from './components';
-export * from './vtable';
-export declare const version = "1.3.3-alpha.0";
+export { VTable };
+export declare const version = "1.3.3-alpha.1";

package/es/index.js

@@ -1,8 +1,9 @@
+import * as VTable from "@visactor/vtable";
+
 export * from "./tables";
 
 export * from "./components";
 
-export * from "./vtable";
+export { VTable };
 
-export const version = "1.3.3-alpha.0";
-//# sourceMappingURL=index.js.map
+export const version = "1.3.3-alpha.1";

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AAEzB,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './components';\nexport * from './vtable';\n\nexport const version = \"1.3.3-alpha.0\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAC;AAE3C,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","file":"index.js","sourcesContent":["import * as VTable from '@visactor/vtable';\n\nexport * from './tables';\nexport * from './components';\nexport { VTable };\n\nexport const version = \"1.3.3-alpha.1\";\n"]}

package/es/tables/base-table.d.ts

@@ -1,4 +1,4 @@
-import { VTable } from '../vtable';
+import * as VTable from '@visactor/vtable';
 import React from 'react';
 import type { ContainerProps } from '../containers/withContainer';
 import type { EventsProps } from '../eventsUtils';
@@ -12,7 +12,6 @@ export interface BaseTableProps extends EventsProps {
     width?: number;
     height?: number;
     skipFunctionDiff?: boolean;
-    ReactDOM?: any;
     onReady?: (instance: IVTable, isInitial: boolean) => void;
     onError?: (err: Error) => void;
 }

package/es/tables/base-table.js

@@ -1,4 +1,4 @@
-import { VTable } from "../vtable";
+import * as VTable from "@visactor/vtable";
 
 import React, { useState, useEffect, useRef, useImperativeHandle, useCallback } from "react";
 
@@ -14,14 +14,6 @@ import { REACT_PRIVATE_PROPS } from "../constants";
 
 import { bindEventsToTable, TABLE_EVENTS_KEYS, TABLE_EVENTS } from "../eventsUtils";
 
-import { VTableReactAttributePlugin } from "../components/custom/vtable-react-attribute-plugin";
-
-import { reactEnvModule } from "../components/custom/vtable-browser-env-contribution";
-
-const {container: container, isBrowserEnv: isBrowserEnv} = VTable.VRender;
-
-isBrowserEnv() && container.load(reactEnvModule);
-
 const notOptionKeys = [ ...REACT_PRIVATE_PROPS, ...TABLE_EVENTS_KEYS, "skipFunctionDiff", "onError", "onReady", "option", "records", "container" ], getComponentId = (child, index) => `${child && child.type && (child.type.displayName || child.type.name)}-${index}`, parseOptionFromChildren = props => {
     const optionFromChildren = {};
     return toArray(props.children).map(((child, index) => {
@@ -48,15 +40,11 @@ const notOptionKeys = [ ...REACT_PRIVATE_PROPS, ...TABLE_EVENTS_KEYS, "skipFunct
     }) : Object.assign(Object.assign(Object.assign({
         records: props.records
     }, prevOption.current), optionFromChildren.current), {
-        clearDOM: !1,
-        customConfig: {
-            createReactContainer: !0
-        }
+        clearDOM: !1
     })), [ hasOption, hasRecords ]), createTable = useCallback((props => {
         let vtable;
         vtable = "pivot-table" === props.type ? new VTable.PivotTable(props.container, parseOption(props)) : "pivot-chart" === props.type ? new VTable.PivotChart(props.container, parseOption(props)) : new VTable.ListTable(props.container, parseOption(props)), 
-        vtable.scenegraph.stage.reactAttribute = props.ReactDOM, vtable.scenegraph.stage.pluginService.register(new VTableReactAttributePlugin), 
-        vtable.scenegraph.stage.params.ReactDOM = props.ReactDOM, tableContext.current = Object.assign(Object.assign({}, tableContext.current), {
+        tableContext.current = Object.assign(Object.assign({}, tableContext.current), {
             table: vtable
         }), isUnmount.current = !1;
     }), [ parseOption ]), handleTableRender = useCallback((() => {
@@ -104,8 +92,7 @@ const notOptionKeys = [ ...REACT_PRIVATE_PROPS, ...TABLE_EVENTS_KEYS, "skipFunct
             key: childId
         }, React.cloneElement(child, {
             updateId: updateId,
-            componentId: childId,
-            componentIndex: index
+            componentId: childId
         }));
     })));
 }));

package/es/tables/base-table.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tables/base-table.tsx"],"names":[],"mappings":"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","file":"base-table.js","sourcesContent":["/* eslint-disable react/display-name */\n// import * as VTable from '@visactor/vtable';\nimport { VTable } from '../vtable';\nimport React, { useState, useEffect, useRef, useImperativeHandle, useCallback } from 'react';\nimport type { ContainerProps } from '../containers/withContainer';\nimport withContainer from '../containers/withContainer';\nimport type { TableContextType } from '../context/table';\nimport RootTableContext from '../context/table';\nimport { isEqual, isNil, pickWithout } from '@visactor/vutils';\nimport { toArray } from '../util';\nimport { REACT_PRIVATE_PROPS } from '../constants';\nimport type { IMarkElement } from '../components';\nimport type {\n  EventsProps\n  // LegendEventProps,\n  // ScrollBarEventProps,\n  // BrushEventProps,\n  // DataZoomEventProps,\n  // PlayerEventProps,\n  // DimensionEventProps,\n  // HierarchyEventProps,\n  // TableLifeCycleEventProps\n} from '../eventsUtils';\nimport { bindEventsToTable, TABLE_EVENTS_KEYS, TABLE_EVENTS } from '../eventsUtils';\nimport { VTableReactAttributePlugin } from '../components/custom/vtable-react-attribute-plugin';\nimport { reactEnvModule } from '../components/custom/vtable-browser-env-contribution';\nconst { container, isBrowserEnv } = VTable.VRender;\n\nexport type IVTable = VTable.ListTable | VTable.PivotTable | VTable.PivotChart;\nexport type IOption =\n  | VTable.ListTableConstructorOptions\n  | VTable.PivotTableConstructorOptions\n  | VTable.PivotChartConstructorOptions;\n\nexport interface BaseTableProps extends EventsProps {\n  type?: string;\n  /** 上层container */\n  container?: HTMLDivElement;\n  /** option */\n  option?: any;\n  /** 数据 */\n  records?: Record<string, unknown>[];\n  /** 画布宽度 */\n  width?: number;\n  /** 画布高度 */\n  height?: number;\n  skipFunctionDiff?: boolean;\n\n  ReactDOM?: any;\n\n  /** 表格渲染完成事件 */\n  onReady?: (instance: IVTable, isInitial: boolean) => void;\n  /** throw error when chart run into an error */\n  onError?: (err: Error) => void;\n}\n\n// for react-vtable\nif (isBrowserEnv()) {\n  container.load(reactEnvModule);\n}\n\ntype Props = React.PropsWithChildren<BaseTableProps>;\n\nconst notOptionKeys = [\n  ...REACT_PRIVATE_PROPS,\n  ...TABLE_EVENTS_KEYS,\n  'skipFunctionDiff',\n  'onError',\n  'onReady',\n  'option',\n  'records',\n  'container'\n];\n\nconst getComponentId = (child: React.ReactNode, index: number) => {\n  const componentName = child && (child as any).type && ((child as any).type.displayName || (child as any).type.name);\n  return `${componentName}-${index}`;\n};\n\nconst parseOptionFromChildren = (props: Props) => {\n  const optionFromChildren: Omit<IOption, 'type' | 'data' | 'width' | 'height'> = {};\n\n  toArray(props.children).map((child, index) => {\n    const parseOption = child && (child as any).type && (child as any).type.parseOption;\n\n    if (parseOption && (child as any).props) {\n      const childProps = isNil((child as any).props.componentId)\n        ? {\n            ...(child as any).props,\n            componentId: getComponentId(child, index)\n          }\n        : (child as any).props;\n\n      const optionResult = parseOption(childProps);\n\n      if (optionResult.isSingle) {\n        optionFromChildren[optionResult.optionName] = optionResult.option;\n      } else {\n        if (!optionFromChildren[optionResult.optionName]) {\n          optionFromChildren[optionResult.optionName] = [];\n        }\n\n        optionFromChildren[optionResult.optionName].push(optionResult.option);\n      }\n    }\n  });\n\n  return optionFromChildren;\n};\n\nconst BaseTable: React.FC<Props> = React.forwardRef((props, ref) => {\n  const [updateId, setUpdateId] = useState<number>(0);\n  const tableContext = useRef<TableContextType>({});\n  useImperativeHandle(ref, () => tableContext.current?.table);\n  const hasOption = !!props.option;\n  const hasRecords = !!props.records;\n  const isUnmount = useRef<boolean>(false);\n  const prevOption = useRef(pickWithout(props, notOptionKeys));\n  const optionFromChildren = useRef<Omit<IOption, 'records'>>(null);\n  const prevRecords = useRef(props.records);\n  const eventsBinded = React.useRef<BaseTableProps>(null);\n  const skipFunctionDiff = !!props.skipFunctionDiff;\n\n  const parseOption = useCallback(\n    (props: Props) => {\n      if (hasOption && props.option) {\n        if (hasRecords && props.records) {\n          return {\n            ...props.option,\n            clearDOM: false,\n            records: props.records\n          };\n        }\n        return {\n          ...props.option,\n          clearDOM: false\n        };\n      }\n      return {\n        records: props.records,\n        ...prevOption.current,\n        ...optionFromChildren.current,\n        clearDOM: false,\n        customConfig: {\n          createReactContainer: true\n        }\n        // ...tableContext.current?.optionFromChildren\n      } as IOption;\n    },\n    [hasOption, hasRecords]\n  );\n\n  const createTable = useCallback(\n    (props: Props) => {\n      let vtable;\n      if (props.type === 'pivot-table') {\n        vtable = new VTable.PivotTable(props.container, parseOption(props));\n      } else if (props.type === 'pivot-chart') {\n        vtable = new VTable.PivotChart(props.container, parseOption(props));\n      } else {\n        vtable = new VTable.ListTable(props.container, parseOption(props));\n      }\n      // vtable.scenegraph.stage.enableReactAttribute(ReactDOM);\n      vtable.scenegraph.stage.reactAttribute = props.ReactDOM;\n      vtable.scenegraph.stage.pluginService.register(new VTableReactAttributePlugin());\n      vtable.scenegraph.stage.params.ReactDOM = props.ReactDOM;\n      tableContext.current = { ...tableContext.current, table: vtable };\n      isUnmount.current = false;\n    },\n    [parseOption]\n  );\n\n  const handleTableRender = useCallback(() => {\n    if (!isUnmount.current) {\n      if (!tableContext.current || !tableContext.current.table) {\n        return;\n      }\n      // rebind events after render\n      bindEventsToTable(tableContext.current.table, props, eventsBinded.current, TABLE_EVENTS);\n\n      // to be fixed\n      // will cause another useEffect\n      setUpdateId(updateId + 1);\n      if (props.onReady) {\n        props.onReady(tableContext.current.table, updateId === 0);\n      }\n    }\n  }, [updateId, setUpdateId, props]);\n\n  const renderTable = useCallback(() => {\n    if (tableContext.current.table) {\n      // eslint-disable-next-line promise/catch-or-return\n      tableContext.current.table.render();\n      handleTableRender();\n    }\n  }, [handleTableRender]);\n\n  useEffect(() => {\n    const newOptionFromChildren = hasOption ? null : parseOptionFromChildren(props);\n\n    if (!tableContext.current?.table) {\n      if (!hasOption) {\n        optionFromChildren.current = newOptionFromChildren;\n      }\n\n      createTable(props);\n      renderTable();\n      // bindEventsToTable(tableContext.current.table, props, null, TABLE_EVENTS);\n      // tableContext.current = {\n      //   ...tableContext.current,\n      //   isChildrenUpdated: false\n      // };\n      eventsBinded.current = props;\n      return;\n    }\n\n    if (hasOption) {\n      if (!isEqual(eventsBinded.current.option, props.option, { skipFunction: skipFunctionDiff })) {\n        // eslint-disable-next-line promise/catch-or-return\n        tableContext.current.table.updateOption(parseOption(props));\n        handleTableRender();\n        eventsBinded.current = props;\n      } else if (\n        hasRecords &&\n        !isEqual(eventsBinded.current.records, props.records, { skipFunction: skipFunctionDiff })\n      ) {\n        tableContext.current.table.setRecords(props.records as any[]);\n        handleTableRender();\n        eventsBinded.current = props;\n      }\n      return;\n    }\n\n    const newOption = pickWithout(props, notOptionKeys);\n\n    if (\n      !isEqual(newOption, prevOption.current, { skipFunction: skipFunctionDiff }) ||\n      // tableContext.current.isChildrenUpdated\n      !isEqual(newOptionFromChildren, optionFromChildren.current, { skipFunction: skipFunctionDiff })\n    ) {\n      prevOption.current = newOption;\n      optionFromChildren.current = newOptionFromChildren;\n\n      // eslint-disable-next-line promise/catch-or-return\n      tableContext.current.table.updateOption(parseOption(props));\n      handleTableRender();\n      eventsBinded.current = props;\n    } else if (hasRecords && !isEqual(props.records, prevRecords.current, { skipFunction: skipFunctionDiff })) {\n      prevRecords.current = props.records;\n      tableContext.current.table.setRecords(props.records);\n      handleTableRender();\n      eventsBinded.current = props;\n    }\n    // tableContext.current = {\n    //   ...tableContext.current,\n    //   isChildrenUpdated: false\n    // };\n  }, [createTable, hasOption, hasRecords, parseOption, handleTableRender, renderTable, skipFunctionDiff, props]);\n\n  useEffect(() => {\n    return () => {\n      if (tableContext) {\n        if (tableContext.current && tableContext.current.table) {\n          tableContext.current.table.release();\n          tableContext.current = null;\n        }\n      }\n      eventsBinded.current = null;\n      isUnmount.current = true;\n    };\n  }, []);\n\n  return (\n    <RootTableContext.Provider value={tableContext.current}>\n      {toArray(props.children).map((child: React.ReactNode, index: number) => {\n        if (typeof child === 'string') {\n          return;\n        }\n\n        const childId = getComponentId(child, index);\n\n        // const componentName =\n        //   child && (child as any).type && ((child as any).type.displayName || (child as any).type.name);\n        // const childId = `${componentName}-${index}`;\n\n        return (\n          // <React.Fragment key={(child as any)?.props?.id ?? (child as any)?.id ?? `child-${index}`}>\n          //   {React.cloneElement(child as IMarkElement, {\n          //     updateId: updateId\n          //   })}\n          // </React.Fragment>\n          <React.Fragment key={childId}>\n            {React.cloneElement(child as React.ReactElement<any, React.JSXElementConstructor<any>>, {\n              updateId: updateId,\n              componentId: childId,\n              componentIndex: index\n            })}\n          </React.Fragment>\n        );\n      })}\n    </RootTableContext.Provider>\n  );\n});\n\nexport const createTable = <T extends Props>(componentName: string, type?: string, callback?: (props: T) => T) => {\n  const Com = withContainer<ContainerProps, T>(BaseTable as any, componentName, (props: T) => {\n    props.type = type;\n\n    if (callback) {\n      return callback(props);\n    }\n\n    if (type) {\n      return { ...props, type };\n    }\n    return props;\n  });\n  Com.displayName = componentName;\n  return Com;\n};\n"]}
+{"version":3,"sources":["tables/base-table.tsx"],"names":[],"mappings":"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","file":"base-table.js","sourcesContent":["/* eslint-disable react/display-name */\nimport * as VTable from '@visactor/vtable';\nimport React, { useState, useEffect, useRef, useImperativeHandle, useCallback } from 'react';\nimport type { ContainerProps } from '../containers/withContainer';\nimport withContainer from '../containers/withContainer';\nimport type { TableContextType } from '../context/table';\nimport RootTableContext from '../context/table';\nimport { isEqual, isNil, pickWithout } from '@visactor/vutils';\nimport { toArray } from '../util';\nimport { REACT_PRIVATE_PROPS } from '../constants';\nimport type { IMarkElement } from '../components';\nimport type {\n  EventsProps\n  // LegendEventProps,\n  // ScrollBarEventProps,\n  // BrushEventProps,\n  // DataZoomEventProps,\n  // PlayerEventProps,\n  // DimensionEventProps,\n  // HierarchyEventProps,\n  // TableLifeCycleEventProps\n} from '../eventsUtils';\nimport { bindEventsToTable, TABLE_EVENTS_KEYS, TABLE_EVENTS } from '../eventsUtils';\n\nexport type IVTable = VTable.ListTable | VTable.PivotTable | VTable.PivotChart;\nexport type IOption =\n  | VTable.ListTableConstructorOptions\n  | VTable.PivotTableConstructorOptions\n  | VTable.PivotChartConstructorOptions;\n\nexport interface BaseTableProps extends EventsProps {\n  type?: string;\n  /** 上层container */\n  container?: HTMLDivElement;\n  /** option */\n  option?: any;\n  /** 数据 */\n  records?: Record<string, unknown>[];\n  /** 画布宽度 */\n  width?: number;\n  /** 画布高度 */\n  height?: number;\n  skipFunctionDiff?: boolean;\n\n  /** 表格渲染完成事件 */\n  onReady?: (instance: IVTable, isInitial: boolean) => void;\n  /** throw error when chart run into an error */\n  onError?: (err: Error) => void;\n}\n\ntype Props = React.PropsWithChildren<BaseTableProps>;\n\nconst notOptionKeys = [\n  ...REACT_PRIVATE_PROPS,\n  ...TABLE_EVENTS_KEYS,\n  'skipFunctionDiff',\n  'onError',\n  'onReady',\n  'option',\n  'records',\n  'container'\n];\n\nconst getComponentId = (child: React.ReactNode, index: number) => {\n  const componentName = child && (child as any).type && ((child as any).type.displayName || (child as any).type.name);\n  return `${componentName}-${index}`;\n};\n\nconst parseOptionFromChildren = (props: Props) => {\n  const optionFromChildren: Omit<IOption, 'type' | 'data' | 'width' | 'height'> = {};\n\n  toArray(props.children).map((child, index) => {\n    const parseOption = child && (child as any).type && (child as any).type.parseOption;\n\n    if (parseOption && (child as any).props) {\n      const childProps = isNil((child as any).props.componentId)\n        ? {\n            ...(child as any).props,\n            componentId: getComponentId(child, index)\n          }\n        : (child as any).props;\n\n      const optionResult = parseOption(childProps);\n\n      if (optionResult.isSingle) {\n        optionFromChildren[optionResult.optionName] = optionResult.option;\n      } else {\n        if (!optionFromChildren[optionResult.optionName]) {\n          optionFromChildren[optionResult.optionName] = [];\n        }\n\n        optionFromChildren[optionResult.optionName].push(optionResult.option);\n      }\n    }\n  });\n\n  return optionFromChildren;\n};\n\nconst BaseTable: React.FC<Props> = React.forwardRef((props, ref) => {\n  const [updateId, setUpdateId] = useState<number>(0);\n  const tableContext = useRef<TableContextType>({});\n  useImperativeHandle(ref, () => tableContext.current?.table);\n  const hasOption = !!props.option;\n  const hasRecords = !!props.records;\n  const isUnmount = useRef<boolean>(false);\n  const prevOption = useRef(pickWithout(props, notOptionKeys));\n  const optionFromChildren = useRef<Omit<IOption, 'records'>>(null);\n  const prevRecords = useRef(props.records);\n  const eventsBinded = React.useRef<BaseTableProps>(null);\n  const skipFunctionDiff = !!props.skipFunctionDiff;\n\n  const parseOption = useCallback(\n    (props: Props) => {\n      if (hasOption && props.option) {\n        if (hasRecords && props.records) {\n          return {\n            ...props.option,\n            clearDOM: false,\n            records: props.records\n          };\n        }\n        return {\n          ...props.option,\n          clearDOM: false\n        };\n      }\n      return {\n        records: props.records,\n        ...prevOption.current,\n        ...optionFromChildren.current,\n        clearDOM: false\n        // ...tableContext.current?.optionFromChildren\n      } as IOption;\n    },\n    [hasOption, hasRecords]\n  );\n\n  const createTable = useCallback(\n    (props: Props) => {\n      let vtable;\n      if (props.type === 'pivot-table') {\n        vtable = new VTable.PivotTable(props.container, parseOption(props));\n      } else if (props.type === 'pivot-chart') {\n        vtable = new VTable.PivotChart(props.container, parseOption(props));\n      } else {\n        vtable = new VTable.ListTable(props.container, parseOption(props));\n      }\n      tableContext.current = { ...tableContext.current, table: vtable };\n      isUnmount.current = false;\n    },\n    [parseOption]\n  );\n\n  const handleTableRender = useCallback(() => {\n    if (!isUnmount.current) {\n      if (!tableContext.current || !tableContext.current.table) {\n        return;\n      }\n      // rebind events after render\n      bindEventsToTable(tableContext.current.table, props, eventsBinded.current, TABLE_EVENTS);\n\n      // to be fixed\n      // will cause another useEffect\n      setUpdateId(updateId + 1);\n      if (props.onReady) {\n        props.onReady(tableContext.current.table, updateId === 0);\n      }\n    }\n  }, [updateId, setUpdateId, props]);\n\n  const renderTable = useCallback(() => {\n    if (tableContext.current.table) {\n      // eslint-disable-next-line promise/catch-or-return\n      tableContext.current.table.render();\n      handleTableRender();\n    }\n  }, [handleTableRender]);\n\n  useEffect(() => {\n    const newOptionFromChildren = hasOption ? null : parseOptionFromChildren(props);\n\n    if (!tableContext.current?.table) {\n      if (!hasOption) {\n        optionFromChildren.current = newOptionFromChildren;\n      }\n\n      createTable(props);\n      renderTable();\n      // bindEventsToTable(tableContext.current.table, props, null, TABLE_EVENTS);\n      // tableContext.current = {\n      //   ...tableContext.current,\n      //   isChildrenUpdated: false\n      // };\n      eventsBinded.current = props;\n      return;\n    }\n\n    if (hasOption) {\n      if (!isEqual(eventsBinded.current.option, props.option, { skipFunction: skipFunctionDiff })) {\n        // eslint-disable-next-line promise/catch-or-return\n        tableContext.current.table.updateOption(parseOption(props));\n        handleTableRender();\n        eventsBinded.current = props;\n      } else if (\n        hasRecords &&\n        !isEqual(eventsBinded.current.records, props.records, { skipFunction: skipFunctionDiff })\n      ) {\n        tableContext.current.table.setRecords(props.records as any[]);\n        handleTableRender();\n        eventsBinded.current = props;\n      }\n      return;\n    }\n\n    const newOption = pickWithout(props, notOptionKeys);\n\n    if (\n      !isEqual(newOption, prevOption.current, { skipFunction: skipFunctionDiff }) ||\n      // tableContext.current.isChildrenUpdated\n      !isEqual(newOptionFromChildren, optionFromChildren.current, { skipFunction: skipFunctionDiff })\n    ) {\n      prevOption.current = newOption;\n      optionFromChildren.current = newOptionFromChildren;\n\n      // eslint-disable-next-line promise/catch-or-return\n      tableContext.current.table.updateOption(parseOption(props));\n      handleTableRender();\n      eventsBinded.current = props;\n    } else if (hasRecords && !isEqual(props.records, prevRecords.current, { skipFunction: skipFunctionDiff })) {\n      prevRecords.current = props.records;\n      tableContext.current.table.setRecords(props.records);\n      handleTableRender();\n      eventsBinded.current = props;\n    }\n    // tableContext.current = {\n    //   ...tableContext.current,\n    //   isChildrenUpdated: false\n    // };\n  }, [createTable, hasOption, hasRecords, parseOption, handleTableRender, renderTable, skipFunctionDiff, props]);\n\n  useEffect(() => {\n    return () => {\n      if (tableContext) {\n        if (tableContext.current && tableContext.current.table) {\n          tableContext.current.table.release();\n          tableContext.current = null;\n        }\n      }\n      eventsBinded.current = null;\n      isUnmount.current = true;\n    };\n  }, []);\n\n  return (\n    <RootTableContext.Provider value={tableContext.current}>\n      {toArray(props.children).map((child: React.ReactNode, index: number) => {\n        if (typeof child === 'string') {\n          return;\n        }\n\n        const childId = getComponentId(child, index);\n\n        // const componentName =\n        //   child && (child as any).type && ((child as any).type.displayName || (child as any).type.name);\n        // const childId = `${componentName}-${index}`;\n\n        return (\n          // <React.Fragment key={(child as any)?.props?.id ?? (child as any)?.id ?? `child-${index}`}>\n          //   {React.cloneElement(child as IMarkElement, {\n          //     updateId: updateId\n          //   })}\n          // </React.Fragment>\n          <React.Fragment key={childId}>\n            {React.cloneElement(child as React.ReactElement<any, React.JSXElementConstructor<any>>, {\n              updateId: updateId,\n              componentId: childId\n            })}\n          </React.Fragment>\n        );\n      })}\n    </RootTableContext.Provider>\n  );\n});\n\nexport const createTable = <T extends Props>(componentName: string, type?: string, callback?: (props: T) => T) => {\n  const Com = withContainer<ContainerProps, T>(BaseTable as any, componentName, (props: T) => {\n    props.type = type;\n\n    if (callback) {\n      return callback(props);\n    }\n\n    if (type) {\n      return { ...props, type };\n    }\n    return props;\n  });\n  Com.displayName = componentName;\n  return Com;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vtable",
-  "version": "1.3.3-alpha.0",
+  "version": "1.3.3-alpha.1",
   "description": "The react version of VTable",
   "keywords": [
     "react",
@@ -43,13 +43,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@visactor/vtable": "1.3.3-alpha.0",
+    "@visactor/vtable": "1.3.3-alpha.1",
     "@visactor/vutils": "~0.18.9",
-    "react-is": "^18.2.0",
-    "react-reconciler": "0.29.2"
+    "react-is": "^18.2.0"
   },
   "devDependencies": {
-    "@visactor/vchart": "1.11.0",
+    "@visactor/vchart": "1.11.4",
     "@rushstack/eslint-patch": "~1.1.4",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
@@ -90,10 +89,9 @@
     "axios": "^1.4.0",
     "@types/react-is": "^17.0.3",
     "@arco-design/web-react": "2.60.2",
-    "@types/react-reconciler": "0.28.8",
     "@internal/bundler": "0.0.1",
-    "@internal/ts-config": "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",

package/cjs/components/custom/component.d.ts

@@ -1,12 +0,0 @@
-import type { ReactElement, ReactNode, Ref, JSXElementConstructor } from 'react';
-import type { VRender } from '@visactor/vtable';
-type IGraphic = VRender.IGraphic;
-type TagAttributes = VRender.TagAttributes;
-type IEventParamsType = VRender.IEventParamsType;
-type GraphicProps<IGraphicGraphicAttribute> = {
-    attribute: IGraphicGraphicAttribute;
-    ref?: Ref<IGraphic>;
-    children?: ReactNode;
-} & IEventParamsType;
-export declare const Tag: (props: GraphicProps<TagAttributes>) => ReactElement<GraphicProps<TagAttributes>, JSXElementConstructor<GraphicProps<TagAttributes>>>;
-export {};

package/cjs/components/custom/component.js

@@ -1,6 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.Tag = void 0, exports.Tag = "tag";
-//# sourceMappingURL=component.js.map

package/cjs/components/custom/component.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["components/custom/component.ts"],"names":[],"mappings":";;;AAYa,QAAA,GAAG,GAEqF,KAAY,CAAC","file":"component.js","sourcesContent":["import type { ReactElement, ReactNode, Ref, JSXElementConstructor } from 'react';\nimport type { VRender } from '@visactor/vtable';\ntype IGraphic = VRender.IGraphic;\ntype TagAttributes = VRender.TagAttributes;\ntype IEventParamsType = VRender.IEventParamsType;\n\ntype GraphicProps<IGraphicGraphicAttribute> = {\n  attribute: IGraphicGraphicAttribute;\n  ref?: Ref<IGraphic>;\n  children?: ReactNode;\n} & IEventParamsType;\n\nexport const Tag: (\n  props: GraphicProps<TagAttributes>\n) => ReactElement<GraphicProps<TagAttributes>, JSXElementConstructor<GraphicProps<TagAttributes>>> = 'tag' as any;\n"]}

package/cjs/components/custom/custom-layout.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-import type { CustomRenderFunctionArg } from '@visactor/vtable/src/ts-types';
-type CustomLayoutProps = {
-    componentIndex?: number;
-};
-export type CustomLayoutFunctionArg = Partial<CustomRenderFunctionArg> & {
-    role?: 'custom-layout' | 'header-custom-layout';
-};
-export declare const CustomLayout: React.FC<CustomLayoutProps>;
-export {};

package/cjs/components/custom/custom-layout.js

@@ -1,96 +0,0 @@
-"use strict";
-
-var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
-    void 0 === k2 && (k2 = k);
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    desc && !("get" in desc ? !m.__esModule : desc.writable || desc.configurable) || (desc = {
-        enumerable: !0,
-        get: function() {
-            return m[k];
-        }
-    }), Object.defineProperty(o, k2, desc);
-} : function(o, m, k, k2) {
-    void 0 === k2 && (k2 = k), o[k2] = m[k];
-}), __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function(o, v) {
-    Object.defineProperty(o, "default", {
-        enumerable: !0,
-        value: v
-    });
-} : function(o, v) {
-    o.default = v;
-}), __importStar = this && this.__importStar || function(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (null != mod) for (var k in mod) "default" !== k && Object.prototype.hasOwnProperty.call(mod, k) && __createBinding(result, mod, k);
-    return __setModuleDefault(result, mod), result;
-}, __importDefault = this && this.__importDefault || function(mod) {
-    return mod && mod.__esModule ? mod : {
-        default: mod
-    };
-};
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.CustomLayout = void 0;
-
-const react_1 = __importStar(require("react")), table_1 = __importDefault(require("../../context/table")), vtable_1 = require("@visactor/vtable"), reconciler_1 = require("./reconciler"), constants_1 = require("react-reconciler/constants"), {Group: Group} = vtable_1.VRender, CustomLayout = (props, ref) => {
-    const {componentIndex: componentIndex, children: children} = props;
-    if (!(0, react_1.isValidElement)(children)) return null;
-    const context = (0, react_1.useContext)(table_1.default), {table: table} = context, isHeaderCustomLayout = "header-custom-layout" === children.props.role, container = (0, 
-    react_1.useRef)(new Map), createGraphic = (0, react_1.useCallback)((args => {
-        const key = `${args.col}-${args.row}`;
-        let group;
-        if (container.current.has(key)) {
-            const currentContainer = container.current.get(key);
-            reconcilorUpdateContainer(children, currentContainer, group, args), group = currentContainer.containerInfo;
-        } else {
-            group = new Group({});
-            const currentContainer = reconciler_1.reconcilor.createContainer(group, constants_1.LegacyRoot, null, null, null, "custom", null, null);
-            container.current.set(key, currentContainer), reconcilorUpdateContainer(children, currentContainer, group, args);
-        }
-        return {
-            rootContainer: group,
-            renderDefault: !1
-        };
-    }), [ children ]), removeContainer = (0, react_1.useCallback)(((col, row) => {
-        const key = `${col}-${row}`;
-        if (container.current.has(key)) {
-            const currentContainer = container.current.get(key);
-            reconciler_1.reconcilor.updateContainer(null, currentContainer, null), container.current.delete(key);
-        }
-    }), []);
-    return (0, react_1.useLayoutEffect)((() => () => {}), []), (0, react_1.useLayoutEffect)((() => {
-        var _a, _b, _c, _d;
-        null == table || table.checkReactCustomLayout(), table && !(null === (_a = table.reactCustomLayout) || void 0 === _a ? void 0 : _a.hasReactCreateGraphic(componentIndex, isHeaderCustomLayout)) ? (null === (_b = table.reactCustomLayout) || void 0 === _b || _b.setReactCreateGraphic(componentIndex, createGraphic, isHeaderCustomLayout), 
-        null === (_c = table.reactCustomLayout) || void 0 === _c || _c.setReactRemoveGraphic(componentIndex, removeContainer, isHeaderCustomLayout), 
-        null === (_d = table.reactCustomLayout) || void 0 === _d || _d.updateCustomCell(componentIndex, isHeaderCustomLayout)) : table && container.current.forEach(((value, key) => {
-            const [col, row] = key.split("-").map(Number), width = table.getColWidth(col), height = table.getRowHeight(row), currentContainer = value, args = {
-                col: col,
-                row: row,
-                dataValue: table.getCellOriginValue(col, row),
-                value: table.getCellValue(col, row) || "",
-                rect: {
-                    left: 0,
-                    top: 0,
-                    right: width,
-                    bottom: height,
-                    width: width,
-                    height: height
-                },
-                table: table
-            }, group = currentContainer.containerInfo;
-            reconcilorUpdateContainer(children, currentContainer, group, args), table.scenegraph.updateNextFrame();
-        }));
-    })), null;
-};
-
-function reconcilorUpdateContainer(children, currentContainer, group, args) {
-    reconciler_1.reconcilor.updateContainer(react_1.default.cloneElement(children, Object.assign({}, args)), currentContainer, null);
-}
-
-function isReactElement(obj) {
-    return obj && obj.$$typeof === Symbol.for("react.element");
-}
-
-//# sourceMappingURL=custom-layout.js.map
-exports.CustomLayout = CustomLayout;

package/cjs/components/custom/custom-layout.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["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 } from 'react';\nimport React, { isValidElement, useCallback, useContext, useLayoutEffect, useRef } from 'react';\nimport RootTableContext from '../../context/table';\nimport { VRender } from '@visactor/vtable';\nimport type { ICustomLayoutFuc, CustomRenderFunctionArg } from '@visactor/vtable/src/ts-types';\nimport type { FiberRoot } from 'react-reconciler';\nimport { reconcilor } from './reconciler';\nimport { LegacyRoot } from 'react-reconciler/constants';\n\nconst { Group } = VRender;\ntype CustomLayoutProps = { componentIndex?: number };\n\nexport type CustomLayoutFunctionArg = Partial<CustomRenderFunctionArg> & {\n  role?: 'custom-layout' | 'header-custom-layout';\n};\n\nexport const CustomLayout: React.FC<CustomLayoutProps> = (props: PropsWithChildren<CustomLayoutProps>, ref) => {\n  const { componentIndex, 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, group, args);\n        group = currentContainer.containerInfo;\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, group, args);\n        // const ele = React.cloneElement(children, { ...args });\n        // reconcilor.updateContainer(ele, currentContainer, null);\n      }\n\n      return {\n        rootContainer: group,\n        renderDefault: false\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  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(); // init reactCustomLayout component\n    if (table && !table.reactCustomLayout?.hasReactCreateGraphic(componentIndex, isHeaderCustomLayout)) {\n      table.reactCustomLayout?.setReactCreateGraphic(\n        componentIndex,\n        createGraphic,\n        // container.current,\n        isHeaderCustomLayout\n      ); // set customLayout function\n      table.reactCustomLayout?.setReactRemoveGraphic(componentIndex, removeContainer, isHeaderCustomLayout); // set customLayout function\n      table.reactCustomLayout?.updateCustomCell(componentIndex, isHeaderCustomLayout); // update cell content\n    } else if (table) {\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 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, group, 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, currentContainer, group, args) {\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 isReactElement(obj) {\n  return obj && obj.$$typeof === Symbol.for('react.element');\n}\n"]}

package/cjs/components/custom/graphic.d.ts

@@ -1,32 +0,0 @@
-import type { ReactElement, ReactNode, Ref, JSXElementConstructor } from 'react';
-import type { VRender } from '@visactor/vtable';
-type IGraphic = VRender.IGraphic;
-type IGroupGraphicAttribute = VRender.IGroupGraphicAttribute;
-type ITextGraphicAttribute = VRender.ITextGraphicAttribute;
-type IEventParamsType = VRender.IEventParamsType;
-type IArcGraphicAttribute = VRender.IArcGraphicAttribute;
-type ICircleGraphicAttribute = VRender.ICircleGraphicAttribute;
-type IImageGraphicAttribute = VRender.IImageGraphicAttribute;
-type ILineGraphicAttribute = VRender.ILineGraphicAttribute;
-type IPathGraphicAttribute = VRender.IPathGraphicAttribute;
-type IRectGraphicAttribute = VRender.IRectGraphicAttribute;
-type ISymbolGraphicAttribute = VRender.ISymbolGraphicAttribute;
-type IRichTextGraphicAttribute = VRender.IRichTextGraphicAttribute;
-type IPolygonGraphicAttribute = VRender.IPolygonGraphicAttribute;
-type GraphicProps<IGraphicGraphicAttribute> = {
-    attribute: IGraphicGraphicAttribute;
-    ref?: Ref<IGraphic>;
-    children?: ReactNode;
-} & IEventParamsType;
-export declare const Group: (props: GraphicProps<IGroupGraphicAttribute>) => ReactElement<GraphicProps<IGroupGraphicAttribute>, JSXElementConstructor<GraphicProps<IGroupGraphicAttribute>>>;
-export declare const Text: (props: GraphicProps<ITextGraphicAttribute>) => ReactElement<GraphicProps<ITextGraphicAttribute>, JSXElementConstructor<GraphicProps<ITextGraphicAttribute>>>;
-export declare const Arc: (props: GraphicProps<IArcGraphicAttribute>) => ReactElement<GraphicProps<IArcGraphicAttribute>, JSXElementConstructor<GraphicProps<IArcGraphicAttribute>>>;
-export declare const Circle: (props: GraphicProps<ICircleGraphicAttribute>) => ReactElement<GraphicProps<ICircleGraphicAttribute>, JSXElementConstructor<GraphicProps<ICircleGraphicAttribute>>>;
-export declare const Image: (props: GraphicProps<IImageGraphicAttribute>) => ReactElement<GraphicProps<IImageGraphicAttribute>, JSXElementConstructor<GraphicProps<IImageGraphicAttribute>>>;
-export declare const Line: (props: GraphicProps<ILineGraphicAttribute>) => ReactElement<GraphicProps<ILineGraphicAttribute>, JSXElementConstructor<GraphicProps<ILineGraphicAttribute>>>;
-export declare const Path: (props: GraphicProps<IPathGraphicAttribute>) => ReactElement<GraphicProps<IPathGraphicAttribute>, JSXElementConstructor<GraphicProps<IPathGraphicAttribute>>>;
-export declare const Rect: (props: GraphicProps<IRectGraphicAttribute>) => ReactElement<GraphicProps<IRectGraphicAttribute>, JSXElementConstructor<GraphicProps<IRectGraphicAttribute>>>;
-export declare const Symbol: (props: GraphicProps<ISymbolGraphicAttribute>) => ReactElement<GraphicProps<ISymbolGraphicAttribute>, JSXElementConstructor<GraphicProps<ISymbolGraphicAttribute>>>;
-export declare const RichText: (props: GraphicProps<IRichTextGraphicAttribute>) => ReactElement<GraphicProps<IRichTextGraphicAttribute>, JSXElementConstructor<GraphicProps<IRichTextGraphicAttribute>>>;
-export declare const Polygon: (props: GraphicProps<IPolygonGraphicAttribute>) => ReactElement<GraphicProps<IPolygonGraphicAttribute>, JSXElementConstructor<GraphicProps<IPolygonGraphicAttribute>>>;
-export {};

package/cjs/components/custom/graphic.js

@@ -1,9 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.Polygon = exports.RichText = exports.Symbol = exports.Rect = exports.Path = exports.Line = exports.Image = exports.Circle = exports.Arc = exports.Text = exports.Group = void 0, 
-exports.Group = "group", exports.Text = "text", exports.Arc = "arc", exports.Circle = "circle", 
-exports.Image = "image", exports.Line = "line", exports.Path = "path", exports.Rect = "rect", 
-exports.Symbol = "symbol", exports.RichText = "richtext", exports.Polygon = "polygon";
-//# sourceMappingURL=graphic.js.map

package/cjs/components/custom/graphic.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["components/custom/graphic.ts"],"names":[],"mappings":";;;AA2Ba,QAAA,KAAK,GAGhB,OAAc,CAAC;AAEJ,QAAA,IAAI,GAGf,MAAa,CAAC;AAEH,QAAA,GAAG,GAGd,KAAY,CAAC;AAEF,QAAA,MAAM,GAGjB,QAAe,CAAC;AAEL,QAAA,KAAK,GAGhB,OAAc,CAAC;AAEJ,QAAA,IAAI,GAGf,MAAa,CAAC;AAEH,QAAA,IAAI,GAGf,MAAa,CAAC;AAEH,QAAA,IAAI,GAGf,MAAa,CAAC;AAEH,QAAA,MAAM,GAGjB,QAAe,CAAC;AAEL,QAAA,QAAQ,GAKjB,UAAiB,CAAC;AAET,QAAA,OAAO,GAKhB,SAAgB,CAAC","file":"graphic.js","sourcesContent":["// export const Group = 'group';\n// export const Rect = 'rect';\n// export const Text = 'text';\n\nimport type { ReactElement, ReactNode, Ref, JSXElementConstructor } from 'react';\nimport type { VRender } from '@visactor/vtable';\n\ntype IGraphic = VRender.IGraphic;\ntype IGroupGraphicAttribute = VRender.IGroupGraphicAttribute;\ntype ITextGraphicAttribute = VRender.ITextGraphicAttribute;\ntype IEventParamsType = VRender.IEventParamsType;\ntype IArcGraphicAttribute = VRender.IArcGraphicAttribute;\ntype ICircleGraphicAttribute = VRender.ICircleGraphicAttribute;\ntype IImageGraphicAttribute = VRender.IImageGraphicAttribute;\ntype ILineGraphicAttribute = VRender.ILineGraphicAttribute;\ntype IPathGraphicAttribute = VRender.IPathGraphicAttribute;\ntype IRectGraphicAttribute = VRender.IRectGraphicAttribute;\ntype ISymbolGraphicAttribute = VRender.ISymbolGraphicAttribute;\ntype IRichTextGraphicAttribute = VRender.IRichTextGraphicAttribute;\ntype IPolygonGraphicAttribute = VRender.IPolygonGraphicAttribute;\n\ntype GraphicProps<IGraphicGraphicAttribute> = {\n  attribute: IGraphicGraphicAttribute;\n  ref?: Ref<IGraphic>;\n  children?: ReactNode;\n} & IEventParamsType;\n\nexport const Group: (\n  props: GraphicProps<IGroupGraphicAttribute>\n) => ReactElement<GraphicProps<IGroupGraphicAttribute>, JSXElementConstructor<GraphicProps<IGroupGraphicAttribute>>> =\n  'group' as any;\n\nexport const Text: (\n  props: GraphicProps<ITextGraphicAttribute>\n) => ReactElement<GraphicProps<ITextGraphicAttribute>, JSXElementConstructor<GraphicProps<ITextGraphicAttribute>>> =\n  'text' as any;\n\nexport const Arc: (\n  props: GraphicProps<IArcGraphicAttribute>\n) => ReactElement<GraphicProps<IArcGraphicAttribute>, JSXElementConstructor<GraphicProps<IArcGraphicAttribute>>> =\n  'arc' as any;\n\nexport const Circle: (\n  props: GraphicProps<ICircleGraphicAttribute>\n) => ReactElement<GraphicProps<ICircleGraphicAttribute>, JSXElementConstructor<GraphicProps<ICircleGraphicAttribute>>> =\n  'circle' as any;\n\nexport const Image: (\n  props: GraphicProps<IImageGraphicAttribute>\n) => ReactElement<GraphicProps<IImageGraphicAttribute>, JSXElementConstructor<GraphicProps<IImageGraphicAttribute>>> =\n  'image' as any;\n\nexport const Line: (\n  props: GraphicProps<ILineGraphicAttribute>\n) => ReactElement<GraphicProps<ILineGraphicAttribute>, JSXElementConstructor<GraphicProps<ILineGraphicAttribute>>> =\n  'line' as any;\n\nexport const Path: (\n  props: GraphicProps<IPathGraphicAttribute>\n) => ReactElement<GraphicProps<IPathGraphicAttribute>, JSXElementConstructor<GraphicProps<IPathGraphicAttribute>>> =\n  'path' as any;\n\nexport const Rect: (\n  props: GraphicProps<IRectGraphicAttribute>\n) => ReactElement<GraphicProps<IRectGraphicAttribute>, JSXElementConstructor<GraphicProps<IRectGraphicAttribute>>> =\n  'rect' as any;\n\nexport const Symbol: (\n  props: GraphicProps<ISymbolGraphicAttribute>\n) => ReactElement<GraphicProps<ISymbolGraphicAttribute>, JSXElementConstructor<GraphicProps<ISymbolGraphicAttribute>>> =\n  'symbol' as any;\n\nexport const RichText: (\n  props: GraphicProps<IRichTextGraphicAttribute>\n) => ReactElement<\n  GraphicProps<IRichTextGraphicAttribute>,\n  JSXElementConstructor<GraphicProps<IRichTextGraphicAttribute>>\n> = 'richtext' as any;\n\nexport const Polygon: (\n  props: GraphicProps<IPolygonGraphicAttribute>\n) => ReactElement<\n  GraphicProps<IPolygonGraphicAttribute>,\n  JSXElementConstructor<GraphicProps<IPolygonGraphicAttribute>>\n> = 'polygon' as any;\n"]}

package/cjs/components/custom/reconciler.d.ts

@@ -1,5 +0,0 @@
-import { VRender } from '@visactor/vtable';
-import ReactReconciler from 'react-reconciler';
-type Graphic = VRender.Graphic;
-export declare const reconcilor: ReactReconciler.Reconciler<Graphic, any, any, Graphic, Graphic>;
-export {};