refactor(editor): merge get surface util (#9371)

This commit is contained in:
Saul-Mirone
2024-12-27 09:42:13 +00:00
parent 6977b0a948
commit 6da10f9a93
15 changed files with 47 additions and 54 deletions

View File

@@ -1,3 +1,4 @@
import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
import type { FrameBlockModel, NoteBlockModel } from '@blocksuite/affine-model';
import { NoteDisplayMode } from '@blocksuite/affine-model';
import { DocModeProvider } from '@blocksuite/affine-shared/services';
@@ -15,7 +16,6 @@ import {
isFrameBlock,
isNoteBlock,
} from '../../root-block/edgeless/utils/query.js';
import { getSurfaceBlock } from '../../surface-ref-block/utils.js';
export function addBlocksToDoc(
targetDoc: Doc,

View File

@@ -1,10 +1,12 @@
import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
import {
EdgelessCRUDIdentifier,
getSurfaceBlock,
} from '@blocksuite/affine-block-surface';
import { focusTextModel } from '@blocksuite/affine-components/rich-text';
import type { Command } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { Bound } from '@blocksuite/global/utils';
import { getSurfaceBlock } from '../../surface-ref-block/utils.js';
import {
EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
EDGELESS_TEXT_BLOCK_MIN_WIDTH,

View File

@@ -3,6 +3,7 @@ import {
EdgelessLegacySlotIdentifier,
type ElementRenderer,
elementRenderers,
getSurfaceBlock,
type SurfaceBlockModel,
type SurfaceContext,
} from '@blocksuite/affine-block-surface';
@@ -30,7 +31,6 @@ import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
import { Bound, getCommonBound } from '@blocksuite/global/utils';
import { effect } from '@preact/signals-core';
import { getSurfaceBlock } from '../../surface-ref-block/utils.js';
import { RootService } from '../root-service.js';
import { GfxBlockModel } from './block-model.js';
import type { EdgelessFrameManager } from './frame-manager.js';

View File

@@ -2,9 +2,10 @@ import type {
SurfaceBlockComponent,
SurfaceBlockModel,
} from '@blocksuite/affine-block-surface';
import { Overlay } from '@blocksuite/affine-block-surface';
import { getSurfaceBlock, Overlay } from '@blocksuite/affine-block-surface';
import type { ConnectorElementModel } from '@blocksuite/affine-model';
import type { GfxController } from '@blocksuite/block-std/gfx';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
import { Bound, Point } from '@blocksuite/global/utils';
import { isConnectable } from '../utils/query.js';
@@ -52,9 +53,13 @@ export class EdgelessSnapManager extends Overlay {
};
private get _surface() {
const surfaceModel = this.gfx.doc.getBlockByFlavour(
'affine:surface'
)[0] as SurfaceBlockModel;
const surfaceModel = getSurfaceBlock(this.gfx.doc);
if (!surfaceModel) {
throw new BlockSuiteError(
ErrorCode.ValueNotExists,
'Surface block not found in doc when creating snap manager'
);
}
return this.gfx.std.view.getBlock(surfaceModel.id) as SurfaceBlockComponent;
}

View File

@@ -1,4 +1,5 @@
import { addSiblingAttachmentBlocks } from '@blocksuite/affine-block-attachment';
import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
import {
getInlineEditorByModel,
insertContent,
@@ -61,7 +62,6 @@ import { cssVarV2 } from '@toeverything/theme/v2';
import type { TemplateResult } from 'lit';
import { toggleEmbedCardCreateModal } from '../../../_common/components/embed-card/modal/embed-card-create-modal.js';
import { getSurfaceBlock } from '../../../surface-ref-block/utils.js';
import type { PageRootBlockComponent } from '../../page/page-root-block.js';
import { formatDate, formatTime } from '../../utils/misc.js';
import type { AffineLinkedDocWidget } from '../linked-doc/index.js';

View File

@@ -5,6 +5,7 @@ import {
LoomIcon,
YoutubeIcon,
} from '@blocksuite/affine-block-embed';
import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
import {
ArrowDownBigIcon,
ArrowUpBigIcon,
@@ -51,7 +52,6 @@ import type { TemplateResult } from 'lit';
import { toggleEmbedCardCreateModal } from '../../../_common/components/embed-card/modal/embed-card-create-modal.js';
import type { DataViewBlockComponent } from '../../../data-view-block/index.js';
import { getSurfaceBlock } from '../../../surface-ref-block/utils.js';
import type { RootBlockComponent } from '../../types.js';
import { formatDate, formatTime } from '../../utils/misc.js';
import type { AffineLinkedDocWidget } from '../linked-doc/index.js';

View File

@@ -1,9 +1,8 @@
import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
import type { SurfaceRefProps } from '@blocksuite/affine-model';
import { matchFlavours } from '@blocksuite/affine-shared/utils';
import type { BlockCommands, Command } from '@blocksuite/block-std';
import { getSurfaceBlock } from './utils.js';
export const insertSurfaceRefBlockCommand: Command<
'selectedModels',
'insertedSurfaceRefBlockId',

View File

@@ -1,4 +1,5 @@
import {
getSurfaceBlock,
type SurfaceBlockModel,
SurfaceElementModel,
} from '@blocksuite/affine-block-surface';
@@ -306,10 +307,7 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
}
private _initReferencedModel() {
const surfaceModel: SurfaceBlockModel | null =
(this.doc.getBlocksByFlavour('affine:surface')[0]?.model as
| SurfaceBlockModel
| undefined) ?? null;
const surfaceModel = getSurfaceBlock(this.doc);
this._surfaceModel = surfaceModel;
const findReferencedModel = (): [
@@ -338,15 +336,11 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
.find(
doc =>
doc.getBlock(this.model.reference) ||
(
doc.getBlocksByFlavour('affine:surface')[0]
.model as SurfaceBlockModel
).getElementById(this.model.reference)
getSurfaceBlock(doc)!.getElementById(this.model.reference)
);
if (doc) {
this._surfaceModel = doc.getBlocksByFlavour('affine:surface')[0]
.model as SurfaceBlockModel;
this._surfaceModel = getSurfaceBlock(doc);
}
if (doc && doc.getBlock(this.model.reference)) {
@@ -356,12 +350,9 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
];
}
if (doc && doc.getBlocksByFlavour('affine:surface')[0]) {
if (doc && getSurfaceBlock(doc)) {
return [
(
doc.getBlocksByFlavour('affine:surface')[0]
.model as SurfaceBlockModel
).getElementById(this.model.reference),
getSurfaceBlock(doc)!.getElementById(this.model.reference),
doc.id,
];
}

View File

@@ -1,12 +1,5 @@
import type { SurfaceBlockModel } from '@blocksuite/affine-block-surface';
import type { Doc } from '@blocksuite/store';
import { html } from 'lit';
export function getSurfaceBlock(doc: Doc) {
const blocks = doc.getBlocksByFlavour('affine:surface');
return blocks.length !== 0 ? (blocks[0].model as SurfaceBlockModel) : null;
}
export const noContentPlaceholder = html`
<svg
width="182"