@ones-editor/editor 2.1.0 → 2.1.1-beta.1

package/@ones-editor/comments/src/comments-helper/old-version-comment.d.ts

@@ -0,0 +1,17 @@
+import { DocObject, EditorSimpleSelectionRange, OnesEditor, OnesEditorComment } from '../../../../@ones-editor/core';
+export interface AddCommentToOldVersionBody {
+    avatarUrl: string;
+    containerId: string;
+    startBlockId: string;
+    startOffset: number;
+    endBlockId: string;
+    endOffset: number;
+    commentId?: string;
+    commentGroupId?: string;
+    comment: DocObject;
+    abstract?: string;
+}
+export declare function addCommentToOldVersion(editor: OnesEditor, version: number, range: EditorSimpleSelectionRange, comment: OnesEditorComment, commentDoc: DocObject): Promise<void>;
+export declare function replyCommentToOldVersion(editor: OnesEditor, version: number, comment: OnesEditorComment, commentDoc: DocObject): Promise<unknown>;
+export declare function updateCommentToOldDoc(editor: OnesEditor, version: number, commentId: string, commentDoc: DocObject): Promise<unknown>;
+export declare function deleteCommentFromOldDoc(editor: OnesEditor, version: number, commentId: string): Promise<unknown>;

package/@ones-editor/comments/src/index.d.ts

@@ -8,4 +8,7 @@ export { OnesEditorComments };
 export type { CommentItem } from './comment-item';
 export type { CommentGroupItem } from './comments-list/group-item';
 export { removeCommentFromBlock } from './actions/remove-comment-from-block';
+export { addCommentToTextBlocks } from './actions/add-comment-to-text-block';
+export { addCommentToBlock } from './actions/add-comment-to-block';
 export { editorAddComment } from './actions/editor-add-comment';
+export * from './comments-helper/old-version-comment';

package/@ones-editor/core/src/core/blocks/common/block-properties.d.ts

@@ -1,10 +1,10 @@
-import { BlockCommands, BlockElement, OnesEditor } from '../../types';
+import { BlockCommands, BlockElement, BoxCommands, OnesEditor, TextBlockContentChild } from '../../types';
 export declare function getBlockProperties(editor: OnesEditor, block: BlockElement): import("../../types").BlockProperties | undefined;
-export declare function getBlockCommandsWithHook(editor: OnesEditor, block: BlockElement): Record<string, BlockCommands>;
-export declare function getSpecialBlockCommands(editor: OnesEditor, blockElement: BlockElement, group: string): {
-    element: import("../../types").BlockContentElement;
-    commands: import("../../types").CommandItem[];
-} | {
-    element: null;
-    commands: never[];
-};
+export declare function getBlockCommandsWithHook(editor: OnesEditor, block: BlockElement, child: TextBlockContentChild | null): Record<string, BlockCommands>;
+interface SpecialBlockCommands {
+    element: HTMLElement | null;
+    blockCommands: BlockCommands[];
+    boxCommands: BoxCommands[];
+}
+export declare function getSpecialBlockCommands(editor: OnesEditor, blockElement: BlockElement, child: TextBlockContentChild | null, group: string): SpecialBlockCommands;
+export {};

package/@ones-editor/core/src/core/blocks/complex-blocks/child-blocks.d.ts

@@ -1,7 +1,8 @@
-import { BlockElement, OnesEditor, SelectedBlock } from '../../types';
+import { BlockElement, OnesEditor, SelectedBlock, SelectionRange } from '../../types';
 export type GetAllChildBlocksOptions = {
     simpleBlockOnly?: boolean;
     visibleOnly?: boolean;
+    range?: SelectionRange;
 };
 export declare function getAllChildBlocks(editor: OnesEditor, options?: GetAllChildBlocksOptions): BlockElement[];
 export declare function getAllSelectedBlocks(editor: OnesEditor, options?: GetAllChildBlocksOptions): SelectedBlock[];

package/@ones-editor/core/src/core/blocks/text-blocks/base/child.d.ts

@@ -1,10 +1,5 @@
-import { BlockElement, BoxElement, InsertionElement } from '../../../types';
-export type TextBlockContentTextChild = HTMLSpanElement & {
-    __neverUse: 'TextBlockContentTextChild';
-};
-export type TextBlockContentInsertionChild = InsertionElement;
-export type TextBlockContentBoxChild = BoxElement;
-export type TextBlockContentChild = TextBlockContentTextChild | TextBlockContentBoxChild | TextBlockContentInsertionChild;
+import { BlockElement, TextBlockContentTextChild, TextBlockContentBoxChild, TextBlockContentInsertionChild, TextBlockContentChild } from '../../../types';
+export type { TextBlockContentTextChild, TextBlockContentBoxChild, TextBlockContentInsertionChild, TextBlockContentChild };
 export type TextBlockContentChildren = TextBlockContentChild[];
 export type TextBlockContentChildType = 'text' | 'box' | 'insertion';
 export declare function isTextBlockContentChild(elem: Element): boolean;

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

@@ -202,6 +202,7 @@ export interface OnesEditorDocServerMeta {
     serverId?: string;
     docId?: string;
     appId?: string;
+    apiServer?: string;
 }
 export interface RecognizeLinkResult {
     type?: 'iframe' | 'video' | 'audio' | 'image';

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

@@ -1,5 +1,11 @@
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { DocBlock, DocBlockAttributes, DocBlockDelta, DocBlocks, DocBlockText, DocBlockTextAttributes, DocBox, DocEmbedBlock, DocEmbedData, DocInsertion, DocObject, InsertBlockOptions, OnesEditorDoc, OnesEditorDocRange, UpdateBlockOptions } from './doc';
+export type TextBlockContentTextChild = HTMLSpanElement & {
+    __neverUse: 'TextBlockContentTextChild';
+};
+export type TextBlockContentInsertionChild = InsertionElement;
+export type TextBlockContentBoxChild = BoxElement;
+export type TextBlockContentChild = TextBlockContentTextChild | TextBlockContentBoxChild | TextBlockContentInsertionChild;
 export type ContainerElement = HTMLDivElement & {
     __neverUse: 'ContainerElement';
 };
@@ -52,6 +58,7 @@ export type BlockPosition = SimpleBlockPosition | ComplexBlockPosition;
 export interface BoxCommands {
     group: string;
     commands: CommandItem[];
+    startGroup?: boolean;
     executeCommand: (editor: OnesEditor, block: BlockElement, box: BoxElement, item: CommandItem) => unknown;
 }
 export interface BoxProperties {
@@ -174,9 +181,11 @@ export type BlockPathComponent = {
 };
 export type BlockPath = BlockPathComponent[];
 export interface BlockCommands {
+    element?: HTMLElement;
     group: string;
     commands: CommandItem[];
-    executeCommand: (editor: OnesEditor, block: BlockElement, item: CommandItem) => unknown;
+    startGroup?: boolean;
+    executeCommand: (editor: OnesEditor, block: BlockElement, item: CommandItem, child: TextBlockContentChild | null) => unknown;
 }
 export interface BlockProperties {
     blockCommands?: Record<string, BlockCommands>;
@@ -753,5 +762,5 @@ export interface OnesEditorBlockHook {
     create?: (editor: OnesEditor, path: BlockPath, container: ContainerElement, blockElement: BlockElement, blockData: DocBlock) => void;
     update?: (editor: OnesEditor, path: BlockPath, container: ContainerElement, blockElement: BlockElement, blockData: DocBlock) => void;
     writable?: (editor: OnesEditor, blockElement: BlockElement | BlockElement[]) => boolean | undefined;
-    commands?: (editor: OnesEditor, blockElement: BlockElement) => BlockCommands;
+    commands?: (editor: OnesEditor, blockElement: BlockElement, child: TextBlockContentChild | null) => BlockCommands | undefined;
 }

package/@ones-editor/sharedb-doc/src/doc/sharedb-client-base.d.ts

@@ -0,0 +1,24 @@
+import { AxiosResponse } from 'axios';
+import { BuildResourceUrlOptions } from '../../../../@ones-editor/core';
+import { OnProgress } from '../types';
+export default abstract class ShareDBClientBase {
+    abstract apiServer(): string;
+    abstract request<T = unknown>(url: string, opt?: any): Promise<AxiosResponse<any, T>>;
+    abstract token(): string;
+    abstract resourceToken(): string;
+    abstract docId(): string;
+    getFileUrlByHash(uploadFileUrl: string, hash: string, name: string, size: number, headers: {
+        [index: string]: string;
+    }): Promise<any>;
+    getFileUrlsByHashes(resourceHashes: string[]): Promise<any[]>;
+    uploadFile(url: string, file: File, headers: {
+        [index: string]: string;
+    }, onProgress: OnProgress, options?: {
+        thumbnail?: boolean;
+    }): Promise<string>;
+    uploadResource(file: File, onProgress?: OnProgress, options?: {
+        thumbnail?: boolean;
+    }): Promise<string>;
+    getResourceId(url: string): string;
+    buildResourceUrl(resourceId: string, options?: BuildResourceUrlOptions): string;
+}

package/@ones-editor/sharedb-doc/src/doc/sharedb-client.d.ts

@@ -11,6 +11,9 @@ export default class ShareDBClient {
     private reauthFunc?;
     clientId: string;
     constructor(auth: AuthMessage, serverUrl: string, reauthFunc?: ReauthFunc);
+    token(): string;
+    resourceToken(): string;
+    docId(): string;
     editorServer(): string;
     close(logout: boolean): void;
     on(event: 'open' | 'close' | 'error', callback: (event: Event | Error) => void): void;
@@ -52,7 +55,7 @@ export default class ShareDBClient {
     revertVersion(ver: number): Promise<void>;
     createVersion(tag: string, publish: boolean): Promise<any>;
     recognizeLink(url: string): Promise<LinkDetails>;
-    private getResourceId;
+    getResourceId(url: string): string;
     buildResourceUrl(resourceId: string, options?: BuildResourceUrlOptions): string;
     reAuth(auto?: boolean): void;
 }

package/@ones-editor/sharedb-doc/src/doc/sharedb-local-doc.d.ts

@@ -0,0 +1,17 @@
+import { DocObject, LocalDoc, OnesEditorUser, UploadResourceOptions, UploadResourceResult } from '../../../../@ones-editor/core';
+export interface ShareDBLocalDocOptions {
+    serverUrl: string;
+    token: string;
+    resourceToken?: string;
+    user: OnesEditorUser;
+    docId: string;
+}
+export default class ShareDBLocalDoc extends LocalDoc {
+    private _options;
+    private _client;
+    constructor(docObject: DocObject, _options: ShareDBLocalDocOptions);
+    buildResourceUrl(src: string): string;
+    getUser(): OnesEditorUser;
+    request<T>(url: string, opt?: any): Promise<T>;
+    uploadResource(file: File, options?: UploadResourceOptions | undefined): Promise<UploadResourceResult>;
+}

package/@ones-editor/sharedb-doc/src/index.d.ts

@@ -1,6 +1,13 @@
+import axios from 'axios';
 import ShareDBDoc from './doc/sharedb-doc';
 import { RemoteCarets, RemoteCaretsDecorator } from './remote-carets';
-export { ShareDBDoc, RemoteCarets, RemoteCaretsDecorator };
+import ShareDBClientBase from './doc/sharedb-client-base';
+import ShareDBLocalDoc from './doc/sharedb-local-doc';
+import type { ShareDBLocalDocOptions } from './doc/sharedb-local-doc';
+export { ShareDBDoc, RemoteCarets, RemoteCaretsDecorator, ShareDBClientBase, ShareDBLocalDoc };
+export type { ShareDBLocalDocOptions };
 export * from './doc/comments';
 export * from './types';
 export * from './versions';
+export * from './utils/converter';
+export { axios };