refactor(editor): cleanup duplicated code (#11548)
This commit is contained in:
@@ -258,7 +258,7 @@ export const moreActions = [
|
|||||||
other: 'new doc',
|
other: 'new doc',
|
||||||
});
|
});
|
||||||
|
|
||||||
moveConnectors(model.id, cardId, edgeless.service);
|
moveConnectors(model.id, cardId, ctx.std);
|
||||||
|
|
||||||
// Deletes selected note
|
// Deletes selected note
|
||||||
ctx.store.transact(() => {
|
ctx.store.transact(() => {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {
|
|||||||
} from '@blocksuite/affine-gfx-mindmap';
|
} from '@blocksuite/affine-gfx-mindmap';
|
||||||
import { NoteTool } from '@blocksuite/affine-gfx-note';
|
import { NoteTool } from '@blocksuite/affine-gfx-note';
|
||||||
import { ShapeTool } from '@blocksuite/affine-gfx-shape';
|
import { ShapeTool } from '@blocksuite/affine-gfx-shape';
|
||||||
|
import { TemplateTool } from '@blocksuite/affine-gfx-template';
|
||||||
import { TextTool } from '@blocksuite/affine-gfx-text';
|
import { TextTool } from '@blocksuite/affine-gfx-text';
|
||||||
import { ElementTransformManager } from '@blocksuite/std/gfx';
|
import { ElementTransformManager } from '@blocksuite/std/gfx';
|
||||||
import type { ExtensionType } from '@blocksuite/store';
|
import type { ExtensionType } from '@blocksuite/store';
|
||||||
@@ -30,7 +31,6 @@ import { SnapExtension } from './element-transform/snap-manager.js';
|
|||||||
import { DefaultTool } from './gfx-tool/default-tool.js';
|
import { DefaultTool } from './gfx-tool/default-tool.js';
|
||||||
import { EmptyTool } from './gfx-tool/empty-tool.js';
|
import { EmptyTool } from './gfx-tool/empty-tool.js';
|
||||||
import { PanTool } from './gfx-tool/pan-tool.js';
|
import { PanTool } from './gfx-tool/pan-tool.js';
|
||||||
import { TemplateTool } from './gfx-tool/template-tool.js';
|
|
||||||
import { EditPropsMiddlewareBuilder } from './middlewares/base.js';
|
import { EditPropsMiddlewareBuilder } from './middlewares/base.js';
|
||||||
import { SnapOverlay } from './utils/snap-manager.js';
|
import { SnapOverlay } from './utils/snap-manager.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
export { DefaultTool } from './default-tool.js';
|
export { DefaultTool } from './default-tool.js';
|
||||||
export { EmptyTool } from './empty-tool.js';
|
export { EmptyTool } from './empty-tool.js';
|
||||||
export { PanTool, type PanToolOption } from './pan-tool.js';
|
export { PanTool, type PanToolOption } from './pan-tool.js';
|
||||||
export { TemplateTool } from './template-tool.js';
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
import { BaseTool } from '@blocksuite/std/gfx';
|
|
||||||
|
|
||||||
export class TemplateTool extends BaseTool {
|
|
||||||
static override toolName: string = 'template';
|
|
||||||
}
|
|
||||||
|
|
||||||
declare module '@blocksuite/std/gfx' {
|
|
||||||
interface GfxToolsMap {
|
|
||||||
template: TemplateTool;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
|
import {
|
||||||
|
EdgelessCRUDIdentifier,
|
||||||
import type { EdgelessRootService } from '../edgeless-root-service.js';
|
getSurfaceBlock,
|
||||||
|
} from '@blocksuite/affine-block-surface';
|
||||||
|
import type { BlockStdScope } from '@blocksuite/std';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* move connectors from origin to target
|
* move connectors from origin to target
|
||||||
@@ -11,10 +13,12 @@ import type { EdgelessRootService } from '../edgeless-root-service.js';
|
|||||||
export function moveConnectors(
|
export function moveConnectors(
|
||||||
originId: string,
|
originId: string,
|
||||||
targetId: string,
|
targetId: string,
|
||||||
service: EdgelessRootService
|
std: BlockStdScope
|
||||||
) {
|
) {
|
||||||
const connectors = service.surface.getConnectors(originId);
|
const model = getSurfaceBlock(std.store);
|
||||||
const crud = service.std.get(EdgelessCRUDIdentifier);
|
if (!model) return;
|
||||||
|
const connectors = model.getConnectors(originId);
|
||||||
|
const crud = std.get(EdgelessCRUDIdentifier);
|
||||||
connectors.forEach(connector => {
|
connectors.forEach(connector => {
|
||||||
if (connector.source.id === originId) {
|
if (connector.source.id === originId) {
|
||||||
crud.updateElement(connector.id, {
|
crud.updateElement(connector.id, {
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import { WidgetComponent } from '@blocksuite/std';
|
|||||||
import { effect, signal } from '@preact/signals-core';
|
import { effect, signal } from '@preact/signals-core';
|
||||||
import { html, nothing } from 'lit';
|
import { html, nothing } from 'lit';
|
||||||
|
|
||||||
import type { PageRootBlockComponent } from '../../page/page-root-block.js';
|
|
||||||
import { RootBlockConfigExtension } from '../../root-config.js';
|
import { RootBlockConfigExtension } from '../../root-config.js';
|
||||||
import { defaultKeyboardToolbarConfig } from './config.js';
|
import { defaultKeyboardToolbarConfig } from './config.js';
|
||||||
|
|
||||||
@@ -18,10 +17,7 @@ export * from './config.js';
|
|||||||
|
|
||||||
export const AFFINE_KEYBOARD_TOOLBAR_WIDGET = 'affine-keyboard-toolbar-widget';
|
export const AFFINE_KEYBOARD_TOOLBAR_WIDGET = 'affine-keyboard-toolbar-widget';
|
||||||
|
|
||||||
export class AffineKeyboardToolbarWidget extends WidgetComponent<
|
export class AffineKeyboardToolbarWidget extends WidgetComponent<RootBlockModel> {
|
||||||
RootBlockModel,
|
|
||||||
PageRootBlockComponent
|
|
||||||
> {
|
|
||||||
private readonly _close = (blur: boolean) => {
|
private readonly _close = (blur: boolean) => {
|
||||||
if (blur) {
|
if (blur) {
|
||||||
if (document.activeElement === this._docTitle?.inlineEditorContainer) {
|
if (document.activeElement === this._docTitle?.inlineEditorContainer) {
|
||||||
|
|||||||
Reference in New Issue
Block a user