-
-
Notifications
You must be signed in to change notification settings - Fork 416
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: remove rich text container keymap (#8004)
- Loading branch information
1 parent
af2519b
commit e4dc535
Showing
17 changed files
with
309 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
import type { BlockStdScope, UIEventHandler } from '@blocksuite/block-std'; | ||
|
||
import { | ||
focusTextModel, | ||
getInlineEditorByModel, | ||
selectTextModel, | ||
} from '../dom.js'; | ||
|
||
export const textCommonKeymap = ( | ||
std: BlockStdScope | ||
): Record<string, UIEventHandler> => { | ||
return { | ||
ArrowUp: () => { | ||
const text = std.selection.find('text'); | ||
if (!text) return; | ||
const inline = getInlineEditorByModel(std.host, text.from.blockId); | ||
if (!inline) return; | ||
return !inline.isFirstLine(inline.getInlineRange()); | ||
}, | ||
ArrowDown: () => { | ||
const text = std.selection.find('text'); | ||
if (!text) return; | ||
const inline = getInlineEditorByModel(std.host, text.from.blockId); | ||
if (!inline) return; | ||
return !inline.isLastLine(inline.getInlineRange()); | ||
}, | ||
Escape: ctx => { | ||
const text = std.selection.find('text'); | ||
if (!text) return; | ||
|
||
selectBlock(std, text.from.blockId); | ||
ctx.get('keyboardState').raw.stopPropagation(); | ||
return true; | ||
}, | ||
'Mod-a': ctx => { | ||
const text = std.selection.find('text'); | ||
if (!text) return; | ||
|
||
const model = std.doc.getBlock(text.from.blockId)?.model; | ||
if (!model || !model.text) return; | ||
|
||
ctx.get('keyboardState').raw.preventDefault(); | ||
|
||
if ( | ||
text.from.index === 0 && | ||
text.from.length === model.text.yText.length | ||
) { | ||
selectBlock(std, text.from.blockId); | ||
return true; | ||
} | ||
|
||
selectTextModel(std, text.from.blockId, 0, model.text.yText.length); | ||
return true; | ||
}, | ||
Enter: ctx => { | ||
const blocks = std.selection.filter('block'); | ||
const blockId = blocks.at(-1)?.blockId; | ||
|
||
if (!blockId) return; | ||
const model = std.doc.getBlock(blockId)?.model; | ||
if (!model || !model.text) return; | ||
|
||
ctx.get('keyboardState').raw.preventDefault(); | ||
focusTextModel(std, blockId, model.text.yText.length); | ||
return true; | ||
}, | ||
}; | ||
}; | ||
|
||
function selectBlock(std: BlockStdScope, blockId: string) { | ||
std.selection.setGroup('note', [std.selection.create('block', { blockId })]); | ||
} |
162 changes: 162 additions & 0 deletions
162
packages/affine/components/src/rich-text/keymap/bracket.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
import type { BlockStdScope, UIEventHandler } from '@blocksuite/block-std'; | ||
import type { InlineEditor } from '@blocksuite/inline'; | ||
|
||
import { BRACKET_PAIRS } from '@blocksuite/affine-shared/consts'; | ||
import { | ||
createDefaultDoc, | ||
matchFlavours, | ||
} from '@blocksuite/affine-shared/utils'; | ||
|
||
import { getInlineEditorByModel } from '../dom.js'; | ||
import { insertLinkedNode } from '../linked-node.js'; | ||
|
||
export const bracketKeymap = ( | ||
std: BlockStdScope | ||
): Record<string, UIEventHandler> => { | ||
const keymap = BRACKET_PAIRS.reduce( | ||
(acc, pair) => { | ||
return { | ||
...acc, | ||
[pair.right]: ctx => { | ||
const { doc, selection } = std; | ||
if (doc.readonly) return; | ||
|
||
const textSelection = selection.find('text'); | ||
if (!textSelection) return; | ||
const model = doc.getBlock(textSelection.from.blockId)?.model; | ||
if (!model) return; | ||
if (!matchFlavours(model, ['affine:code'])) return; | ||
const inlineEditor = getInlineEditorByModel( | ||
std.host, | ||
textSelection.from.blockId | ||
); | ||
if (!inlineEditor) return; | ||
const inlineRange = inlineEditor.getInlineRange(); | ||
if (!inlineRange) return; | ||
const left = inlineEditor.yText.toString()[inlineRange.index - 1]; | ||
const right = inlineEditor.yText.toString()[inlineRange.index]; | ||
if (pair.left === left && pair.right === right) { | ||
inlineEditor.setInlineRange({ | ||
index: inlineRange.index + 1, | ||
length: 0, | ||
}); | ||
ctx.get('keyboardState').raw.preventDefault(); | ||
} | ||
}, | ||
[pair.left]: ctx => { | ||
const { doc, selection } = std; | ||
if (doc.readonly) return; | ||
|
||
const textSelection = selection.find('text'); | ||
if (!textSelection) return; | ||
const model = doc.getBlock(textSelection.from.blockId)?.model; | ||
if (!model) return; | ||
|
||
const isCodeBlock = matchFlavours(model, ['affine:code']); | ||
// When selection is collapsed, only trigger auto complete in code block | ||
if (textSelection.isCollapsed() && !isCodeBlock) return; | ||
if (!textSelection.isInSameBlock()) return; | ||
|
||
ctx.get('keyboardState').raw.preventDefault(); | ||
|
||
const inlineEditor = getInlineEditorByModel( | ||
std.host, | ||
textSelection.from.blockId | ||
); | ||
if (!inlineEditor) return; | ||
const inlineRange = inlineEditor.getInlineRange(); | ||
if (!inlineRange) return; | ||
const selectedText = inlineEditor.yText | ||
.toString() | ||
.slice(inlineRange.index, inlineRange.index + inlineRange.length); | ||
if (!isCodeBlock && pair.name === 'square bracket') { | ||
// [[Selected text]] should automatically be converted to a Linked doc with the title "Selected text". | ||
// See https://github.com/toeverything/blocksuite/issues/2730 | ||
const success = tryConvertToLinkedDoc(std, inlineEditor); | ||
if (success) return true; | ||
} | ||
inlineEditor.insertText( | ||
inlineRange, | ||
pair.left + selectedText + pair.right | ||
); | ||
|
||
inlineEditor.setInlineRange({ | ||
index: inlineRange.index + 1, | ||
length: inlineRange.length, | ||
}); | ||
|
||
return true; | ||
}, | ||
}; | ||
}, | ||
{} as Record<string, UIEventHandler> | ||
); | ||
|
||
return { | ||
...keymap, | ||
'`': ctx => { | ||
const { doc, selection } = std; | ||
if (doc.readonly) return; | ||
|
||
const textSelection = selection.find('text'); | ||
if (!textSelection || textSelection.isCollapsed()) return; | ||
if (!textSelection.isInSameBlock()) return; | ||
const model = doc.getBlock(textSelection.from.blockId)?.model; | ||
if (!model) return; | ||
|
||
ctx.get('keyboardState').raw.preventDefault(); | ||
const inlineEditor = getInlineEditorByModel( | ||
std.host, | ||
textSelection.from.blockId | ||
); | ||
if (!inlineEditor) return; | ||
const inlineRange = inlineEditor.getInlineRange(); | ||
if (!inlineRange) return; | ||
inlineEditor.formatText(inlineRange, { code: true }); | ||
|
||
inlineEditor.setInlineRange({ | ||
index: inlineRange.index, | ||
length: inlineRange.length, | ||
}); | ||
|
||
return true; | ||
}, | ||
}; | ||
}; | ||
|
||
function tryConvertToLinkedDoc(std: BlockStdScope, inlineEditor: InlineEditor) { | ||
const root = std.doc.root; | ||
if (!root) return false; | ||
const linkedDocWidgetEle = std.view.getWidget( | ||
'affine-linked-doc-widget', | ||
root.id | ||
); | ||
if (!linkedDocWidgetEle) return false; | ||
|
||
const inlineRange = inlineEditor.getInlineRange(); | ||
if (!inlineRange) return false; | ||
const text = inlineEditor.yText.toString(); | ||
const left = text[inlineRange.index - 1]; | ||
const right = text[inlineRange.index + inlineRange.length]; | ||
const needConvert = left === '[' && right === ']'; | ||
if (!needConvert) return false; | ||
|
||
const docName = text.slice( | ||
inlineRange.index, | ||
inlineRange.index + inlineRange.length | ||
); | ||
inlineEditor.deleteText({ | ||
index: inlineRange.index - 1, | ||
length: inlineRange.length + 2, | ||
}); | ||
inlineEditor.setInlineRange({ index: inlineRange.index - 1, length: 0 }); | ||
|
||
const doc = createDefaultDoc(std.doc.collection, { | ||
title: docName, | ||
}); | ||
insertLinkedNode({ | ||
inlineEditor, | ||
docId: doc.id, | ||
}); | ||
return true; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import type { BlockStdScope, UIEventHandler } from '@blocksuite/block-std'; | ||
|
||
import { textFormatConfigs } from '../format/index.js'; | ||
|
||
export const textFormatKeymap = (std: BlockStdScope) => | ||
textFormatConfigs | ||
.filter(config => config.hotkey) | ||
.reduce( | ||
(acc, config) => { | ||
return { | ||
...acc, | ||
[config.hotkey as string]: ctx => { | ||
const { doc, selection } = std; | ||
if (doc.readonly) return; | ||
|
||
const textSelection = selection.find('text'); | ||
if (!textSelection) return; | ||
|
||
config.action(std.host); | ||
ctx.get('keyboardState').raw.preventDefault(); | ||
return true; | ||
}, | ||
}; | ||
}, | ||
{} as Record<string, UIEventHandler> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import type { BlockStdScope, UIEventHandler } from '@blocksuite/block-std'; | ||
|
||
import { textCommonKeymap } from './basic.js'; | ||
import { bracketKeymap } from './bracket.js'; | ||
import { textFormatKeymap } from './format.js'; | ||
|
||
export const textKeymap = ( | ||
std: BlockStdScope | ||
): Record<string, UIEventHandler> => { | ||
return { | ||
...textCommonKeymap(std), | ||
...textFormatKeymap(std), | ||
...bracketKeymap(std), | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.