export advanced table types (#409)

zalify · Aug 22, 2024 · e8c374f · e8c374f
1 parent 6308501
commit e8c374f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/packages/easy-email-core/src/blocks/advanced/generateAdvancedTableBlock.tsx b/packages/easy-email-core/src/blocks/advanced/generateAdvancedTableBlock.tsx
@@ -77,7 +77,7 @@ export function generateAdvancedTableBlock(option: {
   });
 }
 
-export interface ITableData {
+export interface IAdvancedTableData {
   content: string;
   colSpan?: number;
   rowSpan?: number;
@@ -92,6 +92,6 @@ export type AdvancedTableBlock = IBlockData<
   },
   {
     content?: string;
-    tableSource: ITableData[][];
+    tableSource: IAdvancedTableData[][];
   }
 >;
diff --git a/packages/easy-email-core/src/blocks/advanced/index.ts b/packages/easy-email-core/src/blocks/advanced/index.ts
@@ -24,6 +24,7 @@ import {
   AdvancedHero,
   AdvancedTable,
 } from './blocks';
+import { IAdvancedTableData, AdvancedTableBlock } from './generateAdvancedTableBlock';
 
 export const advancedBlocks = {
   [AdvancedType.TEXT]: AdvancedText,
@@ -46,3 +47,4 @@ export const advancedBlocks = {
 
 export { Operator, OperatorSymbol };
 export type { AdvancedBlock, ICondition, IConditionGroup, IConditionGroupItem };
+export type { IAdvancedTableData, AdvancedTableBlock };
diff --git a/...y-email-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/index.tsx b/...y-email-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/index.tsx
@@ -1,9 +1,8 @@
-import { getShadowRoot } from '@/utils';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import TableColumnTool from './tableTool';
-import { useBlock, useFocusIdx } from '@';
+import { getShadowRoot, useBlock, useFocusIdx } from 'easy-email-editor';
 
 export function TableOperation() {
   const shadowRoot = getShadowRoot();

diff --git a/...mail-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/tableTool.ts b/...mail-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/tableTool.ts
@@ -7,7 +7,7 @@ import {
   getTdBoundaryIndex,
   getBoundaryRectAndElement,
 } from './util';
-import { AdvancedTableBlock } from '@core/blocks/advanced/generateAdvancedTableBlock';
+import { AdvancedTableBlock } from 'easy-email-core';
 
 interface IBorderTool {
   top: Element;

diff --git a/...asy-email-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/type.ts b/...asy-email-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/type.ts
@@ -1,6 +1,6 @@
-import { ITableData } from '@core/blocks/advanced/generateAdvancedTableBlock';
+import { IAdvancedTableData } from 'easy-email-core';
 
-export interface IOperationData extends ITableData {
+export interface IOperationData extends IAdvancedTableData {
   top: number;
   bottom: number;
   left: number;

diff --git a/...asy-email-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/util.ts b/...asy-email-extensions/src/AttributePanel/components/blocks/AdvancedTable/Operation/util.ts
@@ -1,6 +1,6 @@
 import { DATA_CONTENT_EDITABLE_IDX } from 'easy-email-editor';
 import { IBoundaryRect, IBoundingPosition, IOperationData } from './type';
-import { AdvancedTableBlock } from '@core/blocks/advanced/generateAdvancedTableBlock';
+import { AdvancedTableBlock } from 'easy-email-core';
 
 const getEditorElementClientRect = (target: any) => {
   let left = target.offsetLeft;