Handle key down events in content model only if was not handled by EditFeature #1972
Conversation
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
juliaroldi
requested review from
JiuqingSong,
ianeli1,
flyingbee2012,
BryanValverdeU and
Andres-CT98
and removed request for
JiuqingSong
juliaroldi
changed the title
JiuqingSong
reviewed
Jul 24, 2023
| @@ -599,6 +600,9 @@ const MergeListOnBackspaceAfterList: BuildInEditFeature<PluginKeyboardEvent> = { | |||
| return false; | |||
| }, | |||
| handleEvent: (event, editor) => { | |||
| if (event.eventType == PluginEventType.KeyDown) { | |||
| event.handledByEditFeature = true; | |||
There was a problem hiding this comment.
Instead of setting this flag here, you can set it in EditPlugin, when an edit feature is found and used, set this flag so the flag is common for all features.
| @@ -91,7 +91,9 @@ export default class ContentModelEditPlugin implements EditorPlugin { | |||
| break; | |||
|
|
|||
| case PluginEventType.KeyDown: | |||
| this.handleKeyDownEvent(this.editor, event.rawEvent); | |||
| if (!event.handledByEditFeature) { | |||
There was a problem hiding this comment.
Move this down to line 120 to merge with other checks
JiuqingSong
reviewed
Jul 24, 2023
| this.handleKeyDownEvent(this.editor, event.rawEvent); | ||
| this.handleKeyDownEvent( | ||
| this.editor, | ||
| event.rawEvent, |
There was a problem hiding this comment.
Let's pass the whole event object in, so no need to pass in two parameter separately.
JiuqingSong
reviewed
Jul 24, 2023
| editor: IContentModelEditor, | ||
| rawEvent: KeyboardEvent, | ||
| handledByEditFeature: boolean | ||
| ) { | ||
| const which = rawEvent.which; | ||
|
|
||
| if (!this.editWithContentModel || rawEvent.defaultPrevented) { |
There was a problem hiding this comment.
You can add the check to handledByEditFeature. We can treat handledByEditFeature in the same way with rawEvent.defaultPrevented
JiuqingSong
approved these changes
Jul 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To avoid conflicts between EditPlugin and ContentModelEditPlugin, the
handleByEditFeatureparameter was creates in PluginKeyDownEvent data. Therefore, if the event was already handle by a content edit feature, we sethandleByEditFeaturetotrue, thenContentModelEditPluginknow that it the event should not be handled again.