toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-12-19 20:21:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #223 from toeverything/fix/clipboard

Browse Source 
feat: update paste behavior
This commit is contained in:
Qi 2022-08-12 19:44:35 +08:00 committed by GitHub
commit 2c865132d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/components/editor-core/src/editor/clipboard/paste.ts
View File

@ -177,10 +177,12 @@ export class Paste {
const selectedBlock = await this._editor.getBlockById( const selectedBlock = await this._editor.getBlockById(
currentSelectInfo.blocks[0].blockId currentSelectInfo.blocks[0].blockId
); );
const isSelectedBlockEdit = Paste._isTextEditBlock( const isSelectedBlockCanEdit = Paste._isTextEditBlock(
selectedBlock.type selectedBlock.type
); );
if (isSelectedBlockEdit) { const blockView = this._editor.getView(selectedBlock.type);
const isSelectedBlockEmpty = blockView.isEmpty(selectedBlock);
if (isSelectedBlockCanEdit && !isSelectedBlockEmpty) {
const shouldSplitBlock = const shouldSplitBlock =
blocks.length > 1 || blocks.length > 1 ||
!Paste._isTextEditBlock(blocks[0].type); !Paste._isTextEditBlock(blocks[0].type);
@ -245,9 +247,10 @@ export class Paste {
}, },
}); });
const pasteBlocks = await this._createBlocks(blocks); const pasteBlocks = await this._createBlocks(blocks);
pasteBlocks.forEach(block => { await Promise.all(
selectedBlock.after(block); pasteBlocks.map(block => selectedBlock.after(block))
}); );
const nextBlock = await this._editor.createBlock( const nextBlock = await this._editor.createBlock(
selectedBlock?.type selectedBlock?.type
); );
@ -351,9 +354,15 @@ export class Paste {
} }
} else { } else {
const pasteBlocks = await this._createBlocks(blocks); const pasteBlocks = await this._createBlocks(blocks);
pasteBlocks.forEach(block => {
selectedBlock.after(block); await Promise.all(
}); pasteBlocks.map(block => selectedBlock.after(block))
);
if (isSelectedBlockEmpty) {
selectedBlock?.remove();
}
this._setEndSelectToBlock( this._setEndSelectToBlock(
pasteBlocks[pasteBlocks.length - 1].id pasteBlocks[pasteBlocks.length - 1].id
); );
@ -373,20 +382,25 @@ export class Paste {
selectedBlock?.type === 'page' selectedBlock?.type === 'page'
) { ) {
groupBlock = await this._editor.createBlock('group'); groupBlock = await this._editor.createBlock('group');
pasteBlocks.forEach(block => { await Promise.all(
groupBlock.append(block); pasteBlocks.map(block => groupBlock.append(block))
}); );
await selectedBlock.after(groupBlock); await selectedBlock.after(groupBlock);
} else { } else {
pasteBlocks.forEach(block => { await Promise.all(
selectedBlock.after(block); pasteBlocks.map(block => selectedBlock.after(block))
}); );
} }
this._setEndSelectToBlock(pasteBlocks[pasteBlocks.length - 1].id); this._setEndSelectToBlock(pasteBlocks[pasteBlocks.length - 1].id);
} }
} }
private _setEndSelectToBlock(blockId: string) { private async _setEndSelectToBlock(blockId: string) {
const block = await this._editor.getBlockById(blockId);
const isBlockCanEdit = Paste._isTextEditBlock(block.type);
if (!isBlockCanEdit) {
return;
}
setTimeout(() => { setTimeout(() => {
this._editor.selectionManager.activeNodeByNodeId(blockId, 'end'); this._editor.selectionManager.activeNodeByNodeId(blockId, 'end');
}, 100); }, 100);