@textbus/xnote 0.0.5 → 0.0.6

package/bundles/plugins/_common/_api.d.ts

@@ -9,3 +9,4 @@ export * from './italic.tool';
 export * from './link.tool';
 export * from './strike-through.tool';
 export * from './underline.tool';
+export * from './table/_api';

package/bundles/plugins/_common/attr.tool.d.ts

@@ -8,4 +8,4 @@ export interface AttrToolProps extends Props {
     slot?: Slot | null;
     applyBefore?(): void;
 }
-export declare function AttrTool(props: AttrToolProps): () => any;
+export declare function AttrTool(props: AttrToolProps): () => import("@viewfly/core").JSXNode;

package/bundles/plugins/_common/block.tool.d.ts

@@ -1 +1 @@
-export declare function BlockTool(): () => any;
+export declare function BlockTool(): () => import("@viewfly/core").JSXNode;

package/bundles/plugins/_common/bold.tool.d.ts

@@ -1 +1 @@
-export declare function BoldTool(): () => any;
+export declare function BoldTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/code.tool.d.ts

@@ -1 +1 @@
-export declare function CodeTool(): () => any;
+export declare function CodeTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/color.tool.d.ts

@@ -8,4 +8,4 @@ export interface ColorToolProps extends Props {
     slot?: Slot | null;
     applyBefore?(): void;
 }
-export declare function ColorTool(props: ColorToolProps): () => any;
+export declare function ColorTool(props: ColorToolProps): () => import("@viewfly/core").JSXNode;

package/bundles/plugins/_common/font-family.tool.d.ts

@@ -1,2 +1,2 @@
 export declare const isSupportFont: (fontName: string) => boolean;
-export declare function FontFamilyTool(): () => any;
+export declare function FontFamilyTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/font-size.tool.d.ts

@@ -1 +1 @@
-export declare function FontSizeTool(): () => any;
+export declare function FontSizeTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/italic.tool.d.ts

@@ -1 +1 @@
-export declare function ItalicTool(): () => any;
+export declare function ItalicTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/link.tool.d.ts

@@ -1,4 +1,4 @@
 export interface LinkToolProps {
     hideToolbar?(): void;
 }
-export declare function LinkTool(props: LinkToolProps): () => any;
+export declare function LinkTool(props: LinkToolProps): () => import("@viewfly/core").JSXNode;

package/bundles/plugins/_common/strike-through.tool.d.ts

@@ -1 +1 @@
-export declare function StrikeThroughTool(): () => any;
+export declare function StrikeThroughTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/table/_api.d.ts

@@ -0,0 +1,4 @@
+export * from './cell-align.tool';
+export * from './cell-background.tool';
+export * from './merge-cells.tool';
+export * from './split-cells.tool';

package/bundles/plugins/_common/table/cell-align.tool.d.ts

@@ -0,0 +1 @@
+export declare function CellAlignTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/table/cell-background.tool.d.ts

@@ -0,0 +1 @@
+export declare function CellBackgroundTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/table/merge-cells.tool.d.ts

@@ -0,0 +1 @@
+export declare function MergeCellsTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/table/split-cells.tool.d.ts

@@ -0,0 +1 @@
+export declare function SplitCellsTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/_common/underline.tool.d.ts

@@ -1 +1 @@
-export declare function UnderlineTool(): () => any;
+export declare function UnderlineTool(): () => import("@viewfly/core/jsx-runtime").JSX.Element;

package/bundles/plugins/left-toolbar/insert-tool.d.ts

@@ -4,4 +4,4 @@ export interface InsertToolProps {
     hideTitle?: boolean;
     replace?: boolean;
 }
-export declare function InsertTool(props: InsertToolProps): () => any;
+export declare function InsertTool(props: InsertToolProps): () => import("@viewfly/core").JSXNode;

package/bundles/plugins/link-jump/link-jump.d.ts

@@ -1,4 +1,4 @@
 export declare function LinkJump(): {
     $portalHost: HTMLElement;
-    $render: () => import("@viewfly/core").ViewFlyNode<string | import("@viewfly/core").ComponentSetup<any>>;
+    $render: () => import("@viewfly/core").JSXNode;
 };

package/bundles/plugins/toolbar/toolbar.d.ts

@@ -1 +1 @@
-export declare const Toolbar: () => () => any;
+export declare const Toolbar: () => () => import("@viewfly/core").JSXNode;

package/bundles/textbus/attributes/_api.d.ts

@@ -1,3 +1,4 @@
+export * from './cell-align.attr';
 export * from './heading.attr';
 export * from './text-align.attr';
 export * from './text-indent.attr';

package/bundles/textbus/attributes/cell-align.attr.d.ts

@@ -0,0 +1,4 @@
+import { Attribute } from '@textbus/core';
+import { AttributeLoader } from '@textbus/platform-browser';
+export declare const cellAlignAttr: Attribute<string>;
+export declare const cellAlignAttrLoader: AttributeLoader<string>;

package/bundles/textbus/components/at/at-component.view.d.ts

@@ -2,5 +2,5 @@ import { ViewComponentProps } from '@textbus/adapter-viewfly';
 import { ComponentLoader } from '@textbus/platform-browser';
 import { AtComponent } from './at.component';
 import './at.component.scss';
-export declare function AtComponentView(props: ViewComponentProps<AtComponent>): () => any;
+export declare function AtComponentView(props: ViewComponentProps<AtComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const atComponentLoader: ComponentLoader;

package/bundles/textbus/components/blockqoute/blockquote.component.d.ts

@@ -16,5 +16,5 @@ export declare class BlockquoteComponent extends Component<BlockquoteComponentSt
 }
 export declare function toBlockquote(textbus: Textbus): void;
 export declare function registerBlockquoteShortcut(textbus: Textbus): void;
-export declare function BlockquoteView(props: ViewComponentProps<BlockquoteComponent>): () => any;
+export declare function BlockquoteView(props: ViewComponentProps<BlockquoteComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const blockquoteComponentLoader: ComponentLoader;

package/bundles/textbus/components/highlight-box/highlight-box.component.d.ts

@@ -15,5 +15,5 @@ export declare class HighlightBoxComponent extends Component<HighlightBoxCompone
     getSlots(): Slot[];
     setup(): void;
 }
-export declare function HighlightBoxView(props: ViewComponentProps<HighlightBoxComponent>): () => any;
+export declare function HighlightBoxView(props: ViewComponentProps<HighlightBoxComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const highlightBoxComponentLoader: ComponentLoader;

package/bundles/textbus/components/image/image.component.d.ts

@@ -13,5 +13,5 @@ export declare class ImageComponent extends Component<ImageComponentState> {
     static fromJSON(textbus: Textbus, json: ComponentStateLiteral<ImageComponentState>): ImageComponent;
     getSlots(): Slot[];
 }
-export declare function ImageView(props: ViewComponentProps<ImageComponent>): () => any;
+export declare function ImageView(props: ViewComponentProps<ImageComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const imageComponentLoader: ComponentLoader;

package/bundles/textbus/components/katex/katex.component.d.ts

@@ -12,5 +12,5 @@ export declare class KatexComponent extends Component<KatexComponentState> {
     constructor(textbus: Textbus, state?: KatexComponentState);
     getSlots(): Slot[];
 }
-export declare function KatexComponentView(props: ViewComponentProps<KatexComponent>): () => any;
+export declare function KatexComponentView(props: ViewComponentProps<KatexComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const katexComponentLoader: ComponentLoader;

package/bundles/textbus/components/list/list.component.d.ts

@@ -17,5 +17,5 @@ export declare class ListComponent extends Component<ListComponentState> {
     getSlots(): Slot[];
     setup(): void;
 }
-export declare function ListComponentView(props: ViewComponentProps<ListComponent>): () => any;
+export declare function ListComponentView(props: ViewComponentProps<ListComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const listComponentLoader: ComponentLoader;

package/bundles/textbus/components/paragraph/paragraph.component.d.ts

@@ -13,6 +13,6 @@ export declare class ParagraphComponent extends Component<ParagraphComponentStat
     getSlots(): Slot[];
     setup(): void;
 }
-export declare function ParagraphView(props: ViewComponentProps<ParagraphComponent>): () => any;
+export declare function ParagraphView(props: ViewComponentProps<ParagraphComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const paragraphComponentLoader: ComponentLoader;
 export declare function deltaToBlock(delta: DeltaLite, textbus: Textbus): Component<import("@textbus/core").State>[];

package/bundles/textbus/components/root/root.component.d.ts

@@ -14,5 +14,5 @@ export declare class RootComponent extends Component<RootComponentState> {
     setup(): void;
     afterCheck(): void;
 }
-export declare function RootView(props: ViewComponentProps<RootComponent>): () => any;
+export declare function RootView(props: ViewComponentProps<RootComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const rootComponentLoader: ComponentLoader;

package/bundles/textbus/components/source-code/source-code.component.d.ts

@@ -33,5 +33,5 @@ export declare class SourceCodeComponent extends Component<SourceCodeComponentSt
     cancelEmphasize: () => void;
     emphasize: () => void;
 }
-export declare function SourceCodeView(props: ViewComponentProps<SourceCodeComponent>): () => any;
+export declare function SourceCodeView(props: ViewComponentProps<SourceCodeComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const sourceCodeComponentLoader: ComponentLoader;

package/bundles/textbus/components/step/step-component.view.d.ts

@@ -2,5 +2,5 @@ import { ViewComponentProps } from '@textbus/adapter-viewfly';
 import { ComponentLoader } from '@textbus/platform-browser';
 import { StepComponent } from './step.component';
 import './step.component.scss';
-export declare function StepComponentView(props: ViewComponentProps<StepComponent>): () => any;
+export declare function StepComponentView(props: ViewComponentProps<StepComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const stepComponentLoader: ComponentLoader;

package/bundles/textbus/components/table/components/left-bar.d.ts

@@ -5,4 +5,4 @@ export interface TopBarProps {
     isFocus: Signal<boolean>;
     component: TableComponent;
 }
-export declare function LeftBar(props: TopBarProps): () => any;
+export declare function LeftBar(props: TopBarProps): () => import("@viewfly/core").JSXNode;

package/bundles/textbus/components/table/components/resize-column.d.ts

@@ -6,4 +6,4 @@ export interface ResizeColumnProps {
     layoutWidth: Signal<number[]>;
     onActiveStateChange(isActive: boolean): void;
 }
-export declare function ResizeColumn(props: ResizeColumnProps): () => any;
+export declare function ResizeColumn(props: ResizeColumnProps): () => import("@viewfly/core").JSXNode;

package/bundles/textbus/components/table/components/resize-row.d.ts

@@ -4,4 +4,4 @@ export interface ResizeRowProps {
     tableRef: StaticRef<HTMLTableElement>;
     component: TableComponent;
 }
-export declare function ResizeRow(props: ResizeRowProps): () => any;
+export declare function ResizeRow(props: ResizeRowProps): () => import("@viewfly/core").JSXNode;

package/bundles/textbus/components/table/components/scroll.d.ts

@@ -2,4 +2,4 @@ import { Props, Signal } from '@viewfly/core';
 export interface ScrollProps extends Props {
     isFocus: Signal<boolean>;
 }
-export declare function Scroll(props: ScrollProps): () => any;
+export declare function Scroll(props: ScrollProps): () => import("@viewfly/core").JSXNode;

package/bundles/textbus/components/table/components/selection-mask.d.ts

@@ -10,4 +10,4 @@ export interface SelectionMaskProps {
     component: TableComponent;
     tableRef: StaticRef<HTMLTableElement>;
 }
-export declare function SelectionMask(props: SelectionMaskProps): () => any;
+export declare function SelectionMask(props: SelectionMaskProps): () => import("@viewfly/core").JSXNode;

package/bundles/textbus/components/table/components/top-bar.d.ts

@@ -5,4 +5,4 @@ export interface TopBarProps {
     component: TableComponent;
     layoutWidth: Signal<number[]>;
 }
-export declare function TopBar(props: TopBarProps): () => any;
+export declare function TopBar(props: TopBarProps): () => import("@viewfly/core").JSXNode;

package/bundles/textbus/components/table/table-component.view.d.ts

@@ -1,7 +1,6 @@
 import { ViewComponentProps } from '@textbus/adapter-viewfly';
 import { ComponentLoader } from '@textbus/platform-browser';
 import './table.component.scss';
-import { TableCellConfig, TableComponent } from './table.component';
-export declare const TableComponentView: (props: ViewComponentProps<TableComponent>) => () => any;
+import { TableComponent } from './table.component';
+export declare const TableComponentView: (props: ViewComponentProps<TableComponent>) => () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const tableComponentLoader: ComponentLoader;
-export declare function autoComplete(table: TableCellConfig[][]): TableCellConfig[][];

package/bundles/textbus/components/table/table.component.d.ts

@@ -1,30 +1,53 @@
 import { Component, ComponentStateLiteral, ContentType, Slot, Subject, Textbus } from '@textbus/core';
 import { TableSelection } from './components/selection-mask';
-export interface TableCellConfig {
-    rowspan: number;
-    colspan: number;
+import { Rectangle, RenderRow } from './tools/merge';
+export interface Cell {
+    id: string;
     slot: Slot;
 }
 export interface Row {
     height: number;
-    cells: TableCellConfig[];
+    cells: Cell[];
 }
+export type TableComponentMergeCellConfig = Record<string, string>;
 export interface TableComponentState {
-    layoutWidth: number[];
+    columnsConfig: number[];
     rows: Row[];
+    mergeConfig: TableComponentMergeCellConfig;
 }
 export declare class TableComponent extends Component<TableComponentState> {
     static componentName: string;
     static type: ContentType;
     static fromJSON(textbus: Textbus, json: ComponentStateLiteral<TableComponentState>): TableComponent;
     private selection;
+    private commander;
     constructor(textbus: Textbus, state?: TableComponentState);
     focus: Subject<boolean>;
     tableSelection: import("@viewfly/core").Signal<TableSelection | null>;
+    ignoreSelectionChanges: boolean;
+    private normalizedData;
     getSlots(): Slot[];
+    mergeCellBySelection(): void;
+    splitCellsBySelection(): void;
+    getMaxRectangle(startSlot: Slot, endSlot: Slot): Rectangle | null;
+    getSelectedNormalizedSlots(): {
+        row: Row;
+        cells: import("./tools/merge").RenderCell[];
+    }[] | null;
+    getSelectedRect(): Rectangle | null;
+    getSelectedNormalizedSlotsByRectangle(rectangle: Rectangle): {
+        row: Row;
+        cells: import("./tools/merge").RenderCell[];
+    }[];
+    getCellBySlot(slot: Slot): Cell | null;
+    getNormalizedData(): RenderRow[];
+    selectRow(startIndex: number, endIndex?: number): void;
+    selectColumn(startIndex: number, endIndex?: number): void;
+    private getMergedRectangles;
+    private getCoordinateById;
     setup(): void;
-    deleteColumn(index: number): void;
-    deleteRow(index: number): void;
+    deleteColumns(): void;
+    deleteRows(): void;
     insertColumn(index: number): void;
     insertRow(index: number): void;
 }

package/bundles/textbus/components/table/table.service.d.ts

@@ -2,13 +2,5 @@ import { Subject } from '@textbus/core';
 export declare class TableService {
     onInsertRowBefore: Subject<number | null>;
     onInsertColumnBefore: Subject<number | null>;
-    onSelectColumns: Subject<{
-        start: number;
-        end: number;
-    } | null>;
-    onSelectRows: Subject<{
-        start: number;
-        end: number;
-    } | null>;
     onScroll: Subject<number>;
 }

package/bundles/textbus/components/table/tools/complete.d.ts

@@ -0,0 +1,19 @@
+import { Slot } from '@textbus/core';
+import { TableComponentMergeCellConfig } from '../table.component';
+export interface TableCellConfig {
+    rowspan: number;
+    colspan: number;
+    slot: Slot;
+    id: string;
+}
+/**
+ * 修复不规范表格，并补全空位
+ * @param table
+ */
+export declare function autoComplete(table: TableCellConfig[][]): {
+    mergedConfig: TableComponentMergeCellConfig;
+    table: {
+        id: string;
+        slot: Slot;
+    }[][];
+};

package/bundles/textbus/components/table/tools/merge.d.ts

@@ -0,0 +1,23 @@
+import { Cell, Row } from '../table.component';
+export declare class Rectangle {
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+    constructor(x1: number, y1: number, x2: number, y2: number);
+    intersects(other: Rectangle): boolean;
+    merge(other: Rectangle): Rectangle;
+}
+export declare function findNonIntersectingRectangles(rectangles: Rectangle[]): Rectangle[];
+export declare function getMaxRectangle(start: Rectangle, rectangles: Rectangle[]): Rectangle;
+export interface RenderRow {
+    row: Row;
+    cells: RenderCell[];
+}
+export interface RenderCell {
+    rowspan: number;
+    colspan: number;
+    visible: boolean;
+    raw: Cell;
+}
+export declare function applyRectangles(rows: Row[], rectangles: Rectangle[]): RenderRow[];

package/bundles/textbus/components/timeline/timeline-component.view.d.ts

@@ -2,5 +2,5 @@ import { ViewComponentProps } from '@textbus/adapter-viewfly';
 import { ComponentLoader } from '@textbus/platform-browser';
 import { TimelineComponent } from './timeline.component';
 import './timeline.component.scss';
-export declare function TimelineComponentView(props: ViewComponentProps<TimelineComponent>): () => any;
+export declare function TimelineComponentView(props: ViewComponentProps<TimelineComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const timelineComponentLoader: ComponentLoader;

package/bundles/textbus/components/todolist/todolist.component.d.ts

@@ -14,5 +14,5 @@ export declare class TodolistComponent extends Component<TodolistComponentState>
     getSlots(): Slot[];
     setup(): void;
 }
-export declare function TodolistView(props: ViewComponentProps<TodolistComponent>): () => any;
+export declare function TodolistView(props: ViewComponentProps<TodolistComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const todolistComponentLoader: ComponentLoader;

package/bundles/textbus/components/video/video.component.d.ts

@@ -13,5 +13,5 @@ export declare class VideoComponent extends Component<VideoComponentState> {
     static fromJSON(textbus: Textbus, json: ComponentStateLiteral<VideoComponentState>): VideoComponent;
     getSlots(): never[];
 }
-export declare function VideoView(props: ViewComponentProps<VideoComponent>): () => any;
+export declare function VideoView(props: ViewComponentProps<VideoComponent>): () => import("@viewfly/core/jsx-runtime").JSX.Element;
 export declare const videoComponentLoader: ComponentLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A high-performance rich text editor that supports multiplayer online collaboration.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -27,22 +27,24 @@
   },
   "dependencies": {
     "@tanbo/color": "^0.1.1",
-    "@textbus/adapter-viewfly": "^4.0.3",
-    "@textbus/collaborate": "^4.0.3",
-    "@textbus/core": "^4.0.3",
-    "@textbus/platform-browser": "^4.0.3",
-    "@viewfly/core": "^1.0.2",
-    "@viewfly/hooks": "^1.0.2",
-    "@viewfly/platform-browser": "^1.0.3",
-    "@viewfly/scoped-css": "^1.0.2",
+    "@textbus/adapter-viewfly": "^4.1.0",
+    "@textbus/collaborate": "^4.1.0",
+    "@textbus/core": "^4.1.0",
+    "@textbus/platform-browser": "^4.1.0",
+    "@viewfly/core": "^1.0.5",
+    "@viewfly/hooks": "^1.0.5",
+    "@viewfly/platform-browser": "^1.0.5",
+    "@viewfly/scoped-css": "^1.0.5",
     "highlight.js": "^11.9.0",
-    "katex": "^0.16.10"
+    "katex": "^0.16.10",
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@types/jest": "^29.5.2",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
     "@typescript-eslint/parser": "^5.8.0",
     "@viewfly/devtools": "^1.0.2",
@@ -60,6 +62,7 @@
     "ip": "^2.0.1",
     "less": "^4.1.3",
     "less-loader": "^11.1.3",
+    "lerna": "^8.1.8",
     "mini-css-extract-plugin": "^2.4.5",
     "postcss": "^8.4.38",
     "postcss-loader": "^7.3.3",