@ones-editor/editor 1.1.20-beta.3 → 1.1.20-beta.4

package/@ones-editor/block-menu/src/block-menu-button/index.d.ts

@@ -1,19 +1,9 @@
-import { BlockElement, OnesEditor } from '../../../../@ones-editor/core';
-import EmptyBlockMenu from '../empty-block-menu';
-import BlockMenu from '../block-menu';
-export default class OnesEditorBlockMenuButton {
+import { OnesEditor } from '../../../../@ones-editor/core';
+import OnesEditorBlockMenuButton from './menu-button';
+export default class OnesEditorBlockMenuButtons {
     private editor;
-    buttonElement: HTMLButtonElement;
-    emptyBlockMenu: EmptyBlockMenu;
-    blockMenu: BlockMenu;
-    private dragHandler;
+    rootButton: OnesEditorBlockMenuButton;
+    private parentButton;
     constructor(editor: OnesEditor);
     destroy(): void;
-    handleHoverBlock: (hoverBlock: BlockElement | null, oldBlock: BlockElement | null, event: MouseEvent) => void;
-    handleButtonClick: () => void;
-    updatePlaceholder: (block: BlockElement) => void;
-    handleChanged: () => void;
-    createButton(): HTMLButtonElement;
-    setButtonType(type: 'move' | 'insert'): void;
-    updateButton(block: BlockElement): void;
 }

package/@ones-editor/block-menu/src/block-menu-button/menu-button/index.d.ts

@@ -0,0 +1,32 @@
+import { BlockElement, OnesEditor } from '../../../../../@ones-editor/core';
+import EmptyBlockMenu from '../../empty-block-menu';
+import BlockMenu from '../../block-menu';
+export declare enum MenuButtonType {
+    ROOT = "root",
+    PARENT = "parent"
+}
+export default class OnesEditorBlockMenuButton {
+    private editor;
+    private menuType;
+    buttonElement: HTMLButtonElement;
+    emptyBlockMenu: EmptyBlockMenu;
+    blockMenu: BlockMenu;
+    private dragHandler;
+    private menuButtonType;
+    private removeButtonDelay;
+    private shouldRemoveParentButton;
+    private removeTimer;
+    constructor(editor: OnesEditor, menuType: MenuButtonType);
+    destroy(): void;
+    handleHoverBlock: (hoverBlock: BlockElement | null, oldBlock: BlockElement | null, event: MouseEvent) => void;
+    showRootButton(hoverBlock: BlockElement): void;
+    showParentButton(hoverBlock: BlockElement): void;
+    removeParentButton: () => void;
+    addButtonToView(block: BlockElement): void;
+    handleButtonClick: () => void;
+    updatePlaceholder: (block: BlockElement) => void;
+    handleChanged: () => void;
+    createButton(): HTMLButtonElement;
+    setButtonType(type: 'move' | 'insert'): void;
+    updateButton(block: BlockElement): void;
+}

package/@ones-editor/core/src/core/composition/editor-input.d.ts

@@ -25,11 +25,11 @@ export declare class EditorInput implements OnesEditorInput {
     editor: OnesEditor;
     composing: boolean;
     callbacks: EditorInputCallbacks;
-    inputElement: HTMLTextAreaElement;
+    inputElement: HTMLInputElement;
     constructor(editor: OnesEditor, callbacks: EditorInputCallbacks);
     private isInCommandbar;
     destroy(): void;
-    getInput(): HTMLTextAreaElement;
+    getInput(): HTMLInputElement;
     focus(): void;
     isInDisableScrollMask(target: HTMLElement): boolean;
     handleWindowBlur: () => void;

package/@ones-editor/core/src/core/types.d.ts

@@ -109,6 +109,7 @@ export interface ConvertBlockResult {
 }
 export interface DeleteBlockEventOptions {
     child: boolean;
+    data?: unknown;
 }
 export type CommandItemType = 'normal' | 'separator' | 'section';
 export type CommandItemState = 'disabled' | 'checked' | 'selected';
@@ -147,6 +148,7 @@ export interface CommandItem {
     hideGroupItem?: boolean;
     setCloseable?: (closeable: Closeable) => void;
     beforePopup?: (parent: unknown) => void;
+    shouldShown?: (currentBlock: BlockElement) => boolean;
 }
 export interface BlockCommandItem extends CommandItem {
     blockId: string;
@@ -172,10 +174,25 @@ export interface BlockProperties {
     blockCommands?: Record<string, BlockCommands>;
     abstract?: string;
 }
+export interface CombineToCreateOptions {
+    /**
+     * @returns sideway 两侧合并（左右 indicator），body 中间合并（target block 激活）（暂未实现）
+     */
+    combinable: (source: BlockElement, target: BlockElement) => undefined | 'sideway' | 'body';
+    onCombine: (editor: OnesEditor, source: BlockElement, target: BlockElement, position: CombineDropInsertPos['pos'], dragObject: DragObject | null) => BlockElement | undefined;
+}
 export interface BlockOptions {
     name: string;
     insertBlockCommandItems?: CommandItem[];
     handleInsertEmptyBlock?: (editor: OnesEditor, options: InsertEmptyBlockOptions) => Promise<BlockElement | null>;
+    /**
+     * 当前 hover 的元素是否可以展示左侧更多按钮
+     * @param editor 编辑器实例
+     * @param hoverBlock hover 元素
+     * @returns true -> 展示，false -> 不展示
+     */
+    contentMenuBtnShouldShown?: (editor: OnesEditor, hoverBlock: BlockElement) => boolean;
+    combineToCreate?: CombineToCreateOptions;
 }
 export interface StandardDragObject {
     type: 'block';
@@ -193,10 +210,17 @@ export interface CustomDragObject {
 }
 export type DragObject = StandardDragObject | CustomDragObject;
 export interface CustomDropInsertPos {
+    type: 'custom';
     rect: DOMRect;
     data: unknown;
+    targetBlock?: BlockElement;
 }
-export type DropInsertPos = 'before' | 'after' | CustomDropInsertPos;
+export type CombineDropInsertPos = {
+    type: 'combine';
+    pos: 'left' | 'right';
+    onCombine: CombineToCreateOptions['onCombine'];
+};
+export type DropInsertPos = 'before' | 'after' | CombineDropInsertPos | CustomDropInsertPos;
 export interface DropOptions {
     isSourceBlock: boolean;
     targetBlock: BlockElement;
@@ -526,7 +550,7 @@ export interface OnesEditor extends TypedEmitter<OnesEditorEvents> {
     clearSelectedContents: () => void;
     insertBlock: (containerId: string, blockIndex: number, blockData: DocBlock, newRange?: OnesEditorDocRange, options?: InsertBlockOptions) => BlockElement;
     insertEmbed: (containerId: string, blockIndex: number, embedType: string, embedData: DocEmbedData, newRange?: OnesEditorDocRange, attributes?: DocBlockAttributes) => BlockElement;
-    deleteBlock: (block: BlockElement, newRange?: OnesEditorDocRange) => void;
+    deleteBlock: (block: BlockElement, newRange?: OnesEditorDocRange, data?: unknown) => void;
     getTextPosition: () => BlockTextPosition;
     getBlockString: (block: BlockElement, options?: {
         boxReplacement: string;
@@ -581,7 +605,7 @@ export type PasteOptions = {
     toPlainText?: boolean;
 };
 export interface OnesEditorInput {
-    readonly inputElement: HTMLTextAreaElement;
+    readonly inputElement: HTMLInputElement;
     destroy: () => void;
     focus: () => void;
     handleDocumentSelectionChange: () => void;

package/@ones-editor/drop-target/src/drop-indicator.d.ts

@@ -1,4 +1,4 @@
-import { BlockElement, DropInsertPos, OnesEditor } from '../../../@ones-editor/core';
+import { BlockContentElement, BlockElement, DropInsertPos, OnesEditor } from '../../../@ones-editor/core';
 export declare const INDICATOR_SIZE = 2;
 interface DropTarget {
     block: BlockElement;
@@ -9,9 +9,10 @@ export default class DropIndicator {
     private indicator;
     target: DropTarget | null;
     constructor(editor: OnesEditor);
+    createIndicator(): void;
     show(block: BlockElement, insertPos: DropInsertPos): void;
     hide(): void;
     private getIndicatorRect;
-    getViewRect(block: BlockElement): DOMRect;
+    getViewRect(block: BlockElement | BlockContentElement): DOMRect;
 }
 export {};

package/@ones-editor/drop-target/src/drop-target.d.ts

@@ -1,4 +1,4 @@
-import { BlockElement, ContainerElement, OnesEditor } from '../../../@ones-editor/core';
+import { BlockElement, CombineToCreateOptions, ContainerElement, OnesEditor } from '../../../@ones-editor/core';
 import DropIndicator from './drop-indicator';
 export interface DropHandler {
     handleDrop: (editor: OnesEditor, dragData: BlockElement | File[], targetContainer: ContainerElement, blockIndex: number) => boolean | undefined;
@@ -12,6 +12,7 @@ export default class OnesEditorDropTarget {
         dropEffect: 'move' | 'none';
     } | undefined;
     handlers: DropHandler[];
+    combineToCreate: CombineToCreateOptions[];
     constructor(editor: OnesEditor);
     destroy(): void;
     addHandler(handler: DropHandler): void;

package/@ones-editor/drop-target/src/find-drop-target.d.ts

@@ -1,3 +1,3 @@
 import { BlockElement, OnesEditor } from '../../../@ones-editor/core';
-export declare function findTargetBlock(editor: OnesEditor, x: number, y: number): BlockElement | null;
+export declare function findTargetBlock(editor: OnesEditor, x?: number, y?: number): BlockElement | null;
 export declare function canInsertAsSibling(editor: OnesEditor, block: BlockElement): boolean;

package/@ones-editor/image-embed/src/drag-drop/handle-drop-over.d.ts

@@ -1,7 +1,4 @@
 import { BlockElement, DragObject, OnesEditor } from '../../../../@ones-editor/core';
 import { ImageDragInsertPos } from './types';
-export declare function getDragInsertPos(editor: OnesEditor, block: BlockElement, images: HTMLElement[], x: number, y?: number): {
-    rect: DOMRect;
-    data: number;
-};
+export declare function getDragInsertPos(editor: OnesEditor, block: BlockElement, images: HTMLElement[], x: number, y?: number): ImageDragInsertPos;
 export declare function handleDropOver(editor: OnesEditor, block: BlockElement, dragObject: DragObject | DataTransferItemList | null, x: number, y: number): ImageDragInsertPos | undefined;

package/@ones-editor/layout-block/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "@ones-editor/layout-block",
+  "version": "1.0.0",
+  "type": "module",
+  "private": true,
+  "main": "./src/index.ts",
+  "types": "src/index.d.ts"
+}

package/@ones-editor/layout-block/src/block-drop.d.ts

@@ -0,0 +1,3 @@
+import { LayoutKindBlock } from './types';
+export declare const handleDrop: LayoutKindBlock['handleDrop'];
+export declare const handleDropOver: LayoutKindBlock['handleDropOver'];

package/@ones-editor/layout-block/src/child-containers.d.ts

@@ -0,0 +1,3 @@
+import { BlockElement, ContainerElement } from '../../../@ones-editor/core';
+export declare function getChildContainers(block: BlockElement, from?: string, to?: string): ContainerElement[];
+export declare function getChildSeparators(block: BlockElement): HTMLElement[];

package/@ones-editor/layout-block/src/column-resizer/index.d.ts

@@ -0,0 +1,2 @@
+import { OnesEditor } from '../../../../@ones-editor/core';
+export default function initLayoutColumnWidthDragger(editor: OnesEditor): void;

package/@ones-editor/layout-block/src/columns-options.d.ts

@@ -0,0 +1,2 @@
+import { BlockOptions, OnesEditor } from '../../../@ones-editor/core';
+export declare function getLayoutOptions(editor: OnesEditor): BlockOptions;

package/@ones-editor/layout-block/src/constants.d.ts

@@ -0,0 +1,28 @@
+/**
+ * 名称
+ */
+export declare const LAYOUT_NAME = "LayoutBlock";
+/**
+ * 快捷键
+ */
+export declare const LAYOUT_SHORTCUT_ID = "insert-layout";
+/**
+ * 快捷键提示
+ */
+export declare const LAYOUT_SHORTCUT_SUBTEXT = "/layout";
+export declare const LAYOUT_BLOCK_TYPE = "layout";
+/**
+ * 最大分栏数
+ */
+export declare const MAX_LAYOUT_COLUMNS = 6;
+/**
+ * 分栏最小宽度，百分比
+ */
+export declare const MIN_LAYOUT_WIDTH_PERCENT = 0.08;
+export declare const DROP_BLOCK_TYPE_WHITE_LIST: string[];
+export declare const DROP_EMBED_BLOCK_TYPE_WHITE_LIST: string[];
+/**
+ * custom dom
+ */
+export declare const LAYOUT_SEPARATOR_CLASS_NAME = "layout-separator";
+export declare const LAYOUT_SEPARATOR_INDEX_ATTRIBUTE_KEY = "layoutSeparatorIndex";

package/@ones-editor/layout-block/src/index.d.ts

@@ -0,0 +1,4 @@
+import './locale';
+import './layout-styles.scss';
+import { LayoutKindBlock } from './types';
+export declare const LayoutBlock: LayoutKindBlock;

package/@ones-editor/layout-block/src/layout-creator/index.d.ts

@@ -0,0 +1,27 @@
+import { Closeable, CommandItem } from '../../../../@ones-editor/core';
+import { CreateLayoutData } from '../types';
+declare class LayoutCreatorItem implements CommandItem, CreateLayoutData {
+    id: string;
+    name: string;
+    colCount?: number | undefined;
+    classPrefix: {
+        container: string;
+        title: string;
+        column: string;
+    };
+    element: HTMLElement;
+    closeable: Closeable | null;
+    columnsArray: number[];
+    constructor();
+    setCloseable: (closeable: Closeable) => void;
+    destroy: () => void;
+    createLayoutCreatorElement(): HTMLDivElement;
+    handleCreatorClick: (event: MouseEvent) => void;
+    handleCreatorLeave: () => void;
+    handleLayoutCreatorColumnEnter: (event: MouseEvent) => void;
+    highlightLayoutCreatorColumn: (colIndex: number) => void;
+    setColumnClassByIndex: (column: HTMLElement | null, index: number, targetIndex: number) => void;
+    showCreateLayoutCount: (colIndex: number) => void;
+}
+export declare function getLayoutCreatorItem(): LayoutCreatorItem;
+export {};

package/@ones-editor/layout-block/src/layout-operations.d.ts

@@ -0,0 +1,11 @@
+import { BlockElement, OnesEditor, InsertEmptyBlockOptions, BlockPathComponent } from '../../../@ones-editor/core';
+export declare function handleInsertEmptyBlock(editor: OnesEditor, options: InsertEmptyBlockOptions): Promise<BlockElement>;
+export declare function createLayout(editor: OnesEditor, col: number | BlockElement[], path: BlockPathComponent): BlockElement;
+export declare function selectContainer(editor: OnesEditor, layoutBlockElement: BlockElement, startContainerID: string, endContainerID?: string): void;
+export declare function reorderColumns(editor: OnesEditor, layoutBlock: BlockElement, sourceContainerID: string, position: number): void;
+export declare function combineLayoutBlock(editor: OnesEditor, from: BlockElement, to: BlockElement, position?: number): void;
+export declare function addColumn(editor: OnesEditor, targetBlock: BlockElement, options?: {
+    sourceBlock?: BlockElement;
+    position?: number;
+}): void;
+export declare function deleteColumn(editor: OnesEditor, columnContainerID: string, layoutBlock: BlockElement): void;

package/@ones-editor/layout-block/src/locale/en-us.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+    layout: {
+        title: string;
+        columnDrag: string;
+    };
+};
+export default _default;

package/@ones-editor/layout-block/src/locale/index.d.ts

@@ -0,0 +1 @@
+export {};

package/@ones-editor/layout-block/src/locale/ja-jp.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+    layout: {
+        title: string;
+        columnDrag: string;
+    };
+};
+export default _default;

package/@ones-editor/layout-block/src/locale/zh-cn.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+    layout: {
+        title: string;
+        columnDrag: string;
+    };
+};
+export default _default;

package/@ones-editor/layout-block/src/percent-bar.d.ts

@@ -0,0 +1,3 @@
+import { ContainerElement, OnesEditor } from '../../../@ones-editor/core';
+import { LayoutDocBlock } from './types';
+export declare function createPercentBar(editor: OnesEditor, container: ContainerElement, layoutData: LayoutDocBlock, index: number): void;

package/@ones-editor/layout-block/src/selection.d.ts

@@ -0,0 +1,5 @@
+import { LayoutKindBlock } from './types';
+export declare const updateSelection: LayoutKindBlock['updateSelection'];
+export declare const clearSelection: LayoutKindBlock['clearSelection'];
+export declare const getSelectedContainers: LayoutKindBlock['getSelectedContainers'];
+export declare const getTextToolbarReferenceClient: LayoutKindBlock['getTextToolbarReferenceClient'];

package/@ones-editor/layout-block/src/toolbar.d.ts

@@ -0,0 +1,35 @@
+import { OnesEditor, BlockElement, BlockCommands, CommandItem, AutoScroll, OnesEditorCustom, ContainerElement } from '../../../@ones-editor/core';
+export declare function createSeparatorContainer(editor: OnesEditor, childContainerId: string, index: number): HTMLDivElement;
+export declare function createActionBar(editor: OnesEditor, containerID: string, _blockElement: BlockElement, columnRemovable?: boolean): HTMLDivElement;
+export declare function elementToDataUrl(editor: OnesEditor, element: HTMLElement): Promise<string>;
+export declare class OnesEditorCustomLayoutDragHandler implements OnesEditorCustom {
+    private editor;
+    activeLayoutBlock?: BlockElement;
+    columnContainer?: ContainerElement;
+    draggingContainer?: HTMLElement;
+    autoScroll?: AutoScroll;
+    startPosition?: {
+        x: number;
+        y: number;
+    };
+    get separators(): HTMLElement[] | undefined;
+    get draggingContainerIndex(): number | undefined;
+    constructor(editor: OnesEditor);
+    destroy(): void;
+    private handleMouseDown;
+    private previewShouldScale;
+    private initContainerPreview;
+    private handleDragStart;
+    private handleDrag;
+    private handleDragEnd;
+    private getClosetSeparator;
+}
+export declare class ColumnsBlockCommands implements BlockCommands {
+    protected editor: OnesEditor;
+    protected block: BlockElement;
+    group: string;
+    constructor(editor: OnesEditor, block: BlockElement);
+    _commands: CommandItem[];
+    get commands(): CommandItem[];
+    executeCommand(editor: OnesEditor, block: BlockElement, item: CommandItem): void;
+}

package/@ones-editor/layout-block/src/types.d.ts

@@ -0,0 +1,31 @@
+import { ComplexKindBlock, DocBlock } from '../../../@ones-editor/core';
+export interface LayoutDocBlock extends DocBlock {
+    children: string[];
+    colsWidth: number[];
+}
+export type LayoutKindBlock = ComplexKindBlock;
+export type LayoutDropData = {
+    isValidColumnDragging: boolean;
+    position: number;
+};
+export interface CreateLayoutData {
+    colCount?: number;
+}
+/**
+ * @deprecated
+ */
+export declare const COMMANDS: readonly [{
+    readonly id: "column-2";
+    readonly name: "2 columns";
+}, {
+    readonly id: "column-3";
+    readonly name: "3 columns";
+}, {
+    readonly id: "column-4";
+    readonly name: "4 columns";
+}, {
+    readonly id: "add-column";
+    readonly name: "AddColumn";
+}];
+export type CommandID = (typeof COMMANDS)[number]['id'];
+export declare function getColumnLengthByType(type: string): number;

package/@ones-editor/to-docx/src/doc2other/core.d.ts

@@ -1,5 +1,6 @@
 import { DocBlock, DocObject } from '../../../../@ones-editor/core';
 import { CalcCell } from './table';
+import { CalcCol } from './layout';
 import { BlockObject, CodeObject, ExportState, GetDocByBlockFunc, GetTextsByBoxFunc, MD5Func } from './types';
 /**
  * 生成docx/html blocks的接口
@@ -20,6 +21,7 @@ export interface BlocksGenerator {
     addTableMatrix(colsWidth: number[], matrix: CalcCell[][], data: DocObject): Promise<void>;
     addVirtualBlock(blockId: string, data: DocObject, maxWidth: number): Promise<void>;
     addEmptyParagraph(): void;
+    addLayoutMatrix(colsWidth: number[], matrix: CalcCol[], data: DocObject): Promise<void>;
 }
 export declare function convertBlocksOfDoc(parent: string, // 父节点，暂时只有list block需要这个
 blocks: DocBlock[], data: DocObject, // 协作笔记里的block数组

package/@ones-editor/to-docx/src/doc2other/layout.d.ts

@@ -0,0 +1,10 @@
+import { DocBlock } from '../../../../@ones-editor/core';
+export interface CalcCol {
+    cellId: string | undefined;
+    originalWidth: number;
+    width: number;
+}
+/**
+ * 处理分栏数据结构：实际就是一行多列的表格数据
+ */
+export declare function buildLayoutMatrix(block: DocBlock, maxWidth: number): CalcCol[];