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

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

@@ -1,9 +1,19 @@
-import { OnesEditor } from '../../../../@ones-editor/core';
-import OnesEditorBlockMenuButton from './menu-button';
-export default class OnesEditorBlockMenuButtons {
+import { BlockElement, OnesEditor } from '../../../../@ones-editor/core';
+import EmptyBlockMenu from '../empty-block-menu';
+import BlockMenu from '../block-menu';
+export default class OnesEditorBlockMenuButton {
     private editor;
-    rootButton: OnesEditorBlockMenuButton;
-    private parentButton;
+    buttonElement: HTMLButtonElement;
+    emptyBlockMenu: EmptyBlockMenu;
+    blockMenu: BlockMenu;
+    private dragHandler;
     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/core/src/core/types.d.ts

@@ -109,7 +109,6 @@ export interface ConvertBlockResult {
 }
 export interface DeleteBlockEventOptions {
     child: boolean;
-    data?: unknown;
 }
 export type CommandItemType = 'normal' | 'separator' | 'section';
 export type CommandItemState = 'disabled' | 'checked' | 'selected';
@@ -148,7 +147,6 @@ export interface CommandItem {
     hideGroupItem?: boolean;
     setCloseable?: (closeable: Closeable) => void;
     beforePopup?: (parent: unknown) => void;
-    shouldShown?: (currentBlock: BlockElement) => boolean;
 }
 export interface BlockCommandItem extends CommandItem {
     blockId: string;
@@ -174,25 +172,10 @@ 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';
@@ -210,17 +193,10 @@ export interface CustomDragObject {
 }
 export type DragObject = StandardDragObject | CustomDragObject;
 export interface CustomDropInsertPos {
-    type: 'custom';
     rect: DOMRect;
     data: unknown;
-    targetBlock?: BlockElement;
 }
-export type CombineDropInsertPos = {
-    type: 'combine';
-    pos: 'left' | 'right';
-    onCombine: CombineToCreateOptions['onCombine'];
-};
-export type DropInsertPos = 'before' | 'after' | CombineDropInsertPos | CustomDropInsertPos;
+export type DropInsertPos = 'before' | 'after' | CustomDropInsertPos;
 export interface DropOptions {
     isSourceBlock: boolean;
     targetBlock: BlockElement;
@@ -550,7 +526,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, data?: unknown) => void;
+    deleteBlock: (block: BlockElement, newRange?: OnesEditorDocRange) => void;
     getTextPosition: () => BlockTextPosition;
     getBlockString: (block: BlockElement, options?: {
         boxReplacement: string;

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

@@ -1,4 +1,4 @@
-import { BlockContentElement, BlockElement, DropInsertPos, OnesEditor } from '../../../@ones-editor/core';
+import { BlockElement, DropInsertPos, OnesEditor } from '../../../@ones-editor/core';
 export declare const INDICATOR_SIZE = 2;
 interface DropTarget {
     block: BlockElement;
@@ -9,10 +9,9 @@ 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 | BlockContentElement): DOMRect;
+    getViewRect(block: BlockElement): DOMRect;
 }
 export {};

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

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

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

@@ -1,6 +1,5 @@
 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的接口
@@ -21,7 +20,6 @@ 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数组