Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-13 21:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(editor): remove selection global types (#9532)

Browse Source 
Closes: [BS-2217](https://linear.app/affine-design/issue/BS-2217/remove-global-types-in-selection)
This commit is contained in:
Saul-Mirone
2025-01-06 03:45:10 +00:00
parent 8669936f2f
commit fc863e484c
105 changed files with 501 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
blocksuite/affine/block-note/src/commands/block-type.ts
View File

@@ -8,7 +8,11 @@ import {
mergeToCodeModel,
transformModel,
} from '@blocksuite/affine-shared/utils';
import type { Command } from '@blocksuite/block-std';
import {
BlockSelection,
type Command,
TextSelection,
} from '@blocksuite/block-std';
import type { BlockModel } from '@blocksuite/store';
type UpdateBlockConfig = {
@@ -108,11 +112,11 @@ export const updateBlockType: Command<
onModelTextUpdated(host, model)
);
const selectionManager = host.selection;
const textSelection = selectionManager.find('text');
const textSelection = selectionManager.find(TextSelection);
if (!textSelection) {
return false;
}
const newTextSelection = selectionManager.create('text', {
const newTextSelection = selectionManager.create(TextSelection, {
from: {
blockId: firstNewModel.id,
index: textSelection.from.index,
@@ -143,13 +147,13 @@ export const updateBlockType: Command<
const selectionManager = host.selection;
const blockSelections = selectionManager.filter('block');
const blockSelections = selectionManager.filter(BlockSelection);
if (blockSelections.length === 0) {
return false;
}
requestAnimationFrame(() => {
const selections = updatedBlocks.map(model => {
return selectionManager.create('block', {
return selectionManager.create(BlockSelection, {
blockId: model.id,
});
});

4
blocksuite/affine/block-note/src/commands/dedent-blocks-to-root.ts
View File

@@ -1,5 +1,5 @@
import { matchFlavours } from '@blocksuite/affine-shared/utils';
import type { Command } from '@blocksuite/block-std';
import { type Command, TextSelection } from '@blocksuite/block-std';
export const dedentBlocksToRoot: Command<
never,
@@ -13,7 +13,7 @@ export const dedentBlocksToRoot: Command<
const { std, stopCapture = true } = ctx;
const { doc } = std;
if (!blockIds || !blockIds.length) {
const text = std.selection.find('text');
const text = std.selection.find(TextSelection);
if (text) {
// If the text selection is not at the beginning of the block, use default behavior
if (text.from.index !== 0) return;

4
blocksuite/affine/block-note/src/commands/dedent-blocks.ts
View File

@@ -2,7 +2,7 @@ import {
calculateCollapsedSiblings,
matchFlavours,
} from '@blocksuite/affine-shared/utils';
import type { Command } from '@blocksuite/block-std';
import { type Command, TextSelection } from '@blocksuite/block-std';
export const dedentBlocks: Command<
never,
@@ -75,7 +75,7 @@ export const dedentBlocks: Command<
std.command.exec('dedentBlock', { blockId: id, stopCapture: false });
});
const textSelection = selection.find('text');
const textSelection = selection.find(TextSelection);
if (textSelection) {
host.updateComplete
.then(() => {

4
blocksuite/affine/block-note/src/commands/focus-block-end.ts
View File

@@ -1,4 +1,4 @@
import type { Command } from '@blocksuite/block-std';
import { type Command, TextSelection } from '@blocksuite/block-std';
export const focusBlockEnd: Command<'focusBlock'> = (ctx, next) => {
const { focusBlock, std } = ctx;
@@ -7,7 +7,7 @@ export const focusBlockEnd: Command<'focusBlock'> = (ctx, next) => {
const { selection } = std;
selection.setGroup('note', [
selection.create('text', {
selection.create(TextSelection, {
from: {
blockId: focusBlock.blockId,
index: focusBlock.model.text.length,

4
blocksuite/affine/block-note/src/commands/focus-block-start.ts
View File

@@ -1,4 +1,4 @@
import type { Command } from '@blocksuite/block-std';
import { type Command, TextSelection } from '@blocksuite/block-std';
export const focusBlockStart: Command<'focusBlock'> = (ctx, next) => {
const { focusBlock, std } = ctx;
@@ -7,7 +7,7 @@ export const focusBlockStart: Command<'focusBlock'> = (ctx, next) => {
const { selection } = std;
selection.setGroup('note', [
selection.create('text', {
selection.create(TextSelection, {
from: { blockId: focusBlock.blockId, index: 0, length: 0 },
to: null,
}),

4
blocksuite/affine/block-note/src/commands/indent-blocks.ts
View File

@@ -3,7 +3,7 @@ import {
getNearestHeadingBefore,
matchFlavours,
} from '@blocksuite/affine-shared/utils';
import type { Command } from '@blocksuite/block-std';
import { type Command, TextSelection } from '@blocksuite/block-std';
export const indentBlocks: Command<
never,
@@ -117,7 +117,7 @@ export const indentBlocks: Command<
}
}
const textSelection = selection.find('text');
const textSelection = selection.find(TextSelection);
if (textSelection) {
host.updateComplete
.then(() => {

4
blocksuite/affine/block-note/src/commands/select-block.ts
View File

@@ -1,4 +1,4 @@
import type { Command } from '@blocksuite/block-std';
import { BlockSelection, type Command } from '@blocksuite/block-std';
export const selectBlock: Command<'focusBlock'> = (ctx, next) => {
const { focusBlock, std } = ctx;
@@ -9,7 +9,7 @@ export const selectBlock: Command<'focusBlock'> = (ctx, next) => {
const { selection } = std;
selection.setGroup('note', [
selection.create('block', { blockId: focusBlock.blockId }),
selection.create(BlockSelection, { blockId: focusBlock.blockId }),
]);
return next();

8
blocksuite/affine/block-note/src/commands/select-blocks-between.ts
View File

@@ -1,4 +1,4 @@
import type { Command } from '@blocksuite/block-std';
import { BlockSelection, type Command } from '@blocksuite/block-std';
export const selectBlocksBetween: Command<
'focusBlock' | 'anchorBlock',
@@ -14,7 +14,7 @@ export const selectBlocksBetween: Command<
// In same block
if (anchorBlock.blockId === focusBlock.blockId) {
const blockId = focusBlock.blockId;
selection.setGroup('note', [selection.create('block', { blockId })]);
selection.setGroup('note', [selection.create(BlockSelection, { blockId })]);
return next();
}
@@ -23,11 +23,11 @@ export const selectBlocksBetween: Command<
if (selections.every(sel => sel.blockId !== focusBlock.blockId)) {
if (tail) {
selections.push(
selection.create('block', { blockId: focusBlock.blockId })
selection.create(BlockSelection, { blockId: focusBlock.blockId })
);
} else {
selections.unshift(
selection.create('block', { blockId: focusBlock.blockId })
selection.create(BlockSelection, { blockId: focusBlock.blockId })
);
}
}

10
blocksuite/affine/block-note/src/move-block.ts
View File

@@ -1,17 +1,21 @@
import type { BlockSelection, BlockStdScope } from '@blocksuite/block-std';
import {
BlockSelection,
type BlockStdScope,
TextSelection,
} from '@blocksuite/block-std';
const getSelection = (std: BlockStdScope) => std.selection;
function getBlockSelectionBySide(std: BlockStdScope, tail: boolean) {
const selection = getSelection(std);
const selections = selection.filter('block');
const selections = selection.filter(BlockSelection);
const sel = selections.at(tail ? -1 : 0) as BlockSelection | undefined;
return sel ?? null;
}
function getTextSelection(std: BlockStdScope) {
const selection = getSelection(std);
return selection.find('text');
return selection.find(TextSelection);
}
const pathToBlock = (std: BlockStdScope, blockId: string) =>

8
blocksuite/affine/block-note/src/note-edgeless-block.ts
View File

@@ -15,7 +15,11 @@ import {
stopPropagation,
} from '@blocksuite/affine-shared/utils';
import type { BlockComponent, EditorHost } from '@blocksuite/block-std';
import { ShadowlessElement, toGfxBlockComponent } from '@blocksuite/block-std';
import {
ShadowlessElement,
TextSelection,
toGfxBlockComponent,
} from '@blocksuite/block-std';
import {
almostEqual,
Bound,
@@ -305,7 +309,7 @@ export class EdgelessNoteBlockComponent extends toGfxBlockComponent(
this.updateComplete
.then(() => {
this.std.selection.setGroup('note', [
this.std.selection.create('text', {
this.std.selection.create(TextSelection, {
from: {
blockId: pId,
index: 0,

15
blocksuite/affine/block-note/src/note-service.ts
View File

@@ -4,9 +4,10 @@ import { matchFlavours } from '@blocksuite/affine-shared/utils';
import {
type BaseSelection,
type BlockComponent,
type BlockSelection,
BlockSelection,
BlockService,
type BlockStdScope,
TextSelection,
type UIEventHandler,
type UIEventStateContext,
} from '@blocksuite/block-std';
@@ -95,7 +96,7 @@ export class NoteBlockService extends BlockService {
const [codeModel] = newModels;
onModelElementUpdated(ctx.std, codeModel, codeElement => {
this._std.selection.setGroup('note', [
this._std.selection.create('text', {
this._std.selection.create(TextSelection, {
from: {
blockId: codeElement.blockId,
index: 0,
@@ -439,7 +440,7 @@ export class NoteBlockService extends BlockService {
const blockId = doc.addBlock('affine:paragraph', {}, parent, index + 1);
const sel = selection.create('text', {
const sel = selection.create(TextSelection, {
from: {
blockId,
index: 0,
@@ -469,7 +470,7 @@ export class NoteBlockService extends BlockService {
}
ctx.std.selection.update(selList => {
return selList.filter(sel => !sel.is('block'));
return selList.filter(sel => !sel.is(BlockSelection));
});
return next();
@@ -481,7 +482,7 @@ export class NoteBlockService extends BlockService {
private readonly _onSelectAll: UIEventHandler = ctx => {
const selection = this._std.selection;
const block = selection.find('block');
const block = selection.find(BlockSelection);
if (!block) {
return;
}
@@ -492,13 +493,13 @@ export class NoteBlockService extends BlockService {
ctx.get('defaultState').event.preventDefault();
const children = note.children;
const blocks: BlockSelection[] = children.map(child => {
return selection.create('block', {
return selection.create(BlockSelection, {
blockId: child.id,
});
});
selection.update(selList => {
return selList
.filter<BaseSelection>(sel => !sel.is('block'))
.filter<BaseSelection>(sel => !sel.is(BlockSelection))
.concat(blocks);
});
};