Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent to copy the style in some cases when pressing the enter key in the front of the text

Browse Source
This commit is contained in:
Lucas.Xu
2022-09-26 16:55:06 +08:00
parent 49fb0470ab
commit ec97735e94
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dart
View File

@ -117,12 +117,17 @@ ShortcutEventHandler enterWithoutShiftInTextNodesHandler =
makeFollowingNodesIncremental(editorState, insertPath, afterSelection, makeFollowingNodesIncremental(editorState, insertPath, afterSelection,
beginNum: prevNumber); beginNum: prevNumber);
} else { } else {
bool needCopyAttributes = ![
BuiltInAttributeKey.heading,
BuiltInAttributeKey.quote,
].contains(subtype);
TransactionBuilder(editorState) TransactionBuilder(editorState)
..insertNode( ..insertNode(
textNode.path, textNode.path,
textNode.copyWith( textNode.copyWith(
children: LinkedList(), children: LinkedList(),
delta: Delta(), delta: Delta(),
attributes: needCopyAttributes ? null : {},
), ),
) )
..afterSelection = afterSelection ..afterSelection = afterSelection
@ -173,7 +178,9 @@ ShortcutEventHandler enterWithoutShiftInTextNodesHandler =
Attributes _attributesFromPreviousLine(TextNode textNode) { Attributes _attributesFromPreviousLine(TextNode textNode) {
final prevAttributes = textNode.attributes; final prevAttributes = textNode.attributes;
final subType = textNode.subtype; final subType = textNode.subtype;
if (subType == null || subType == BuiltInAttributeKey.heading) { if (subType == null ||
subType == BuiltInAttributeKey.heading ||
subType == BuiltInAttributeKey.quote) {
return {}; return {};
} }

2
frontend/app_flowy/packages/appflowy_editor/lib/src/service/keyboard_service.dart
View File

@ -124,6 +124,8 @@ class _AppFlowyKeyboardState extends State<AppFlowyKeyboard>
final result = shortcutEvent.handler(widget.editorState, event); final result = shortcutEvent.handler(widget.editorState, event);
if (result == KeyEventResult.handled) { if (result == KeyEventResult.handled) {
return KeyEventResult.handled; return KeyEventResult.handled;
} else if (result == KeyEventResult.skipRemainingHandlers) {
return KeyEventResult.skipRemainingHandlers;
} }
continue; continue;
} }