From e1dece05952a60845413d0fec110853d7d2494f5 Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Fri, 19 Aug 2022 20:41:09 +0800 Subject: [PATCH] refactor: change activatable to editable in BaseVeiw --- .../editor-blocks/src/blocks/code/index.ts | 2 +- .../src/blocks/embed-link/index.ts | 2 +- .../editor-blocks/src/blocks/figma/index.ts | 2 +- .../editor-blocks/src/blocks/file/index.ts | 2 +- .../src/blocks/grid-item/index.ts | 2 +- .../editor-blocks/src/blocks/grid/index.ts | 2 +- .../editor-blocks/src/blocks/group/Group.tsx | 2 +- .../editor-blocks/src/blocks/image/index.ts | 2 +- .../editor-blocks/src/blocks/youtube/index.ts | 2 +- .../src/editor/selection/selection.ts | 24 +++++++++---------- .../editor-core/src/editor/views/base-view.ts | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libs/components/editor-blocks/src/blocks/code/index.ts b/libs/components/editor-blocks/src/blocks/code/index.ts index 9b089d6db5..ce8d7badfb 100644 --- a/libs/components/editor-blocks/src/blocks/code/index.ts +++ b/libs/components/editor-blocks/src/blocks/code/index.ts @@ -16,7 +16,7 @@ import { ComponentType } from 'react'; export class CodeBlock extends BaseView { type = Protocol.Block.Type.code; public override selectable = true; - public override activatable = false; + public override editable = false; // View = CodeView; View = CodeView; override async onCreate(block: AsyncBlock): Promise { diff --git a/libs/components/editor-blocks/src/blocks/embed-link/index.ts b/libs/components/editor-blocks/src/blocks/embed-link/index.ts index 731ae801d6..947763ee16 100644 --- a/libs/components/editor-blocks/src/blocks/embed-link/index.ts +++ b/libs/components/editor-blocks/src/blocks/embed-link/index.ts @@ -8,7 +8,7 @@ import { EmbedLinkView } from './EmbedLinkView'; export class EmbedLinkBlock extends BaseView { public override selectable = true; - public override activatable = false; + public override editable = false; type = Protocol.Block.Type.embedLink; View = EmbedLinkView; diff --git a/libs/components/editor-blocks/src/blocks/figma/index.ts b/libs/components/editor-blocks/src/blocks/figma/index.ts index 3ed44c9c85..4eb9d6047f 100644 --- a/libs/components/editor-blocks/src/blocks/figma/index.ts +++ b/libs/components/editor-blocks/src/blocks/figma/index.ts @@ -8,7 +8,7 @@ import { FigmaView } from './FigmaView'; export class FigmaBlock extends BaseView { public override selectable = true; - public override activatable = false; + public override editable = false; type = Protocol.Block.Type.figma; View = FigmaView; diff --git a/libs/components/editor-blocks/src/blocks/file/index.ts b/libs/components/editor-blocks/src/blocks/file/index.ts index e55eed7721..e3119e9a16 100644 --- a/libs/components/editor-blocks/src/blocks/file/index.ts +++ b/libs/components/editor-blocks/src/blocks/file/index.ts @@ -12,7 +12,7 @@ import { FileView } from './FileView'; export class FileBlock extends BaseView { public override selectable = true; - public override activatable = false; + public override editable = false; type = Protocol.Block.Type.file; View = FileView; diff --git a/libs/components/editor-blocks/src/blocks/grid-item/index.ts b/libs/components/editor-blocks/src/blocks/grid-item/index.ts index 7f51c47a05..2c6598d18d 100644 --- a/libs/components/editor-blocks/src/blocks/grid-item/index.ts +++ b/libs/components/editor-blocks/src/blocks/grid-item/index.ts @@ -6,7 +6,7 @@ import { GridItemRender } from './GridItemRender'; export class GridItemBlock extends BaseView { public override selectable = false; - public override activatable = false; + public override editable = false; public override allowPendant = false; public override layoutOnly = true; diff --git a/libs/components/editor-blocks/src/blocks/grid/index.ts b/libs/components/editor-blocks/src/blocks/grid/index.ts index 582014376f..a74bb130f9 100644 --- a/libs/components/editor-blocks/src/blocks/grid/index.ts +++ b/libs/components/editor-blocks/src/blocks/grid/index.ts @@ -7,7 +7,7 @@ export { GRID_PROPERTY_KEY, removePercent } from './Grid'; export class GridBlock extends BaseView { public override selectable = false; - public override activatable = false; + public override editable = false; public override allowPendant = false; public override layoutOnly = true; diff --git a/libs/components/editor-blocks/src/blocks/group/Group.tsx b/libs/components/editor-blocks/src/blocks/group/Group.tsx index ac194d7eab..787c537f18 100644 --- a/libs/components/editor-blocks/src/blocks/group/Group.tsx +++ b/libs/components/editor-blocks/src/blocks/group/Group.tsx @@ -9,7 +9,7 @@ import { GroupView } from './GroupView'; export class Group extends BaseView { public override selectable = true; - public override activatable = false; + public override editable = false; public override allowPendant = false; type = Protocol.Block.Type.group; diff --git a/libs/components/editor-blocks/src/blocks/image/index.ts b/libs/components/editor-blocks/src/blocks/image/index.ts index 8f56468b41..e5c33514e2 100644 --- a/libs/components/editor-blocks/src/blocks/image/index.ts +++ b/libs/components/editor-blocks/src/blocks/image/index.ts @@ -8,7 +8,7 @@ import { ImageView } from './ImageView'; export class ImageBlock extends BaseView { public override selectable = true; - public override activatable = false; + public override editable = false; type = Protocol.Block.Type.image; View = ImageView; diff --git a/libs/components/editor-blocks/src/blocks/youtube/index.ts b/libs/components/editor-blocks/src/blocks/youtube/index.ts index 42f22bcda4..f04e241d88 100644 --- a/libs/components/editor-blocks/src/blocks/youtube/index.ts +++ b/libs/components/editor-blocks/src/blocks/youtube/index.ts @@ -8,7 +8,7 @@ import { YoutubeView } from './YoutubeView'; export class YoutubeBlock extends BaseView { public override selectable = true; - public override activatable = false; + public override editable = false; type = Protocol.Block.Type.youtube; View = YoutubeView; diff --git a/libs/components/editor-core/src/editor/selection/selection.ts b/libs/components/editor-core/src/editor/selection/selection.ts index e6c1f94c83..c33eb6d64c 100644 --- a/libs/components/editor-core/src/editor/selection/selection.ts +++ b/libs/components/editor-core/src/editor/selection/selection.ts @@ -408,13 +408,13 @@ export class SelectionManager implements VirgoSelection { /** * - * get previous activatable blockNode + * get previous editable blockNode * @private * @param {AsyncBlock} node * @return {*} {(Promise)} * @memberof SelectionManager */ - private async _getPreviousActivatableBlockNode( + private async _getPreviousEditableBlockNode( node: AsyncBlock ): Promise { const preNode = await node.physicallyPerviousSibling(); @@ -422,8 +422,8 @@ export class SelectionManager implements VirgoSelection { if (!preNode) { return null; } - const { activatable, selectable } = this._editor.getView(preNode.type); - if (activatable) { + const { editable, selectable } = this._editor.getView(preNode.type); + if (editable) { this.setSelectedNodesIds([]); return preNode; } @@ -432,18 +432,18 @@ export class SelectionManager implements VirgoSelection { (document.activeElement as HTMLInputElement)?.blur(); return null; } - return this._getPreviousActivatableBlockNode(preNode); + return this._getPreviousEditableBlockNode(preNode); } /** * - * get next activatable blockNode + * get next editable blockNode * @private * @param {AsyncBlock} node * @return {*} {(Promise)} * @memberof SelectionManager */ - private async _getNextActivatableBlockNode( + private async _getNextEditableBlockNode( node: AsyncBlock, ignoreSelf = true ): Promise { @@ -482,8 +482,8 @@ export class SelectionManager implements VirgoSelection { } } - const { activatable, selectable } = this._editor.getView(nextNode.type); - if (activatable) { + const { editable, selectable } = this._editor.getView(nextNode.type); + if (editable) { this.setSelectedNodesIds([]); return nextNode; } @@ -492,7 +492,7 @@ export class SelectionManager implements VirgoSelection { (document.activeElement as HTMLInputElement)?.blur(); return null; } - return this._getNextActivatableBlockNode(nextNode); + return this._getNextEditableBlockNode(nextNode); } /** @@ -513,7 +513,7 @@ export class SelectionManager implements VirgoSelection { return; } } - preNode = await this._getPreviousActivatableBlockNode(node); + preNode = await this._getPreviousEditableBlockNode(node); if (preNode) { this.activeNodeByNodeId(preNode.id, position); } @@ -622,7 +622,7 @@ export class SelectionManager implements VirgoSelection { } } - nextNode = await this._getNextActivatableBlockNode(node); + nextNode = await this._getNextEditableBlockNode(node); if (nextNode) { this.activeNodeByNodeId(nextNode.id, position); } diff --git a/libs/components/editor-core/src/editor/views/base-view.ts b/libs/components/editor-core/src/editor/views/base-view.ts index eb5c293243..2b3002f500 100644 --- a/libs/components/editor-core/src/editor/views/base-view.ts +++ b/libs/components/editor-core/src/editor/views/base-view.ts @@ -36,10 +36,10 @@ export abstract class BaseView { abstract type: string; /** - * activatable means can be focused + * editable means can be focused * @memberof BaseView */ - public activatable = true; + public editable = true; public selectable = true;