Skip to content

Bring back and refactor keymap, add focus trap to plain text editor#7204

Merged
max-nextcloud merged 12 commits intomainfrom
fix/keymap
May 21, 2025
Merged

Bring back and refactor keymap, add focus trap to plain text editor#7204
max-nextcloud merged 12 commits intomainfrom
fix/keymap

Conversation

@mejo-
Copy link
Member

@mejo- mejo- commented May 8, 2025

📝 Summary

  • Bring back our custom Keymap extension
  • Move all keymap adjustments into either their respective plugin or the Keymap extension
  • Use FocusTrap also in plain text editor
  • Resolves: Keymap code cleanup #989

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits

@mejo- mejo- requested a review from juliusknorr May 8, 2025 13:23
@mejo- mejo- self-assigned this May 8, 2025
@mejo- mejo- requested a review from max-nextcloud as a code owner May 8, 2025 13:23
@mejo- mejo- added bug Something isn't working 3. to review technical debt labels May 8, 2025
@github-project-automation github-project-automation bot moved this to 🧭 Planning evaluation (don't pick) in 📝 Office team May 8, 2025
@mejo- mejo- moved this from 🧭 Planning evaluation (don't pick) to 👀 In review in 📝 Office team May 8, 2025
@codecov
Copy link

codecov bot commented May 8, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 86.04651% with 24 lines in your changes missing coverage. Please review.

Project coverage is 59.05%. Comparing base (e8eef56) to head (51962c7).
Report is 30 commits behind head on main.

Files with missing lines Patch % Lines
src/nodes/CodeBlock/codeBlockShortcuts.js 62.50% 15 Missing ⚠️
src/extensions/Keymap.js 82.22% 8 Missing ⚠️
src/components/PlainTextReader.vue 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #7204      +/-   ##
==========================================
+ Coverage   52.18%   59.05%   +6.87%     
==========================================
  Files         479      480       +1     
  Lines       41767    37075    -4692     
  Branches     1024     1043      +19     
==========================================
+ Hits        21795    21896     +101     
+ Misses      19870    15078    -4792     
+ Partials      102      101       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mejo- mejo- moved this from 👀 In review to 🏗️ In progress in 📝 Office team May 8, 2025
mejo- added 10 commits May 12, 2025 18:12
@mejo-
fix(editor): bring back our custom keymap extension
cd8973a 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(keymap): Remove obsolete <Mod>-<F> overwrite
1ccb176 
The keymap extension was not in use for quite some time and I'm now
longer able to reproduce issues with <Mod>-<F> without the overwrite
either.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
refactor(keymap): Move Esc key overwrite to Keymap.js
b9d62ff 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
refactor(keymap): Move Mod-S handling to Keymap.js
02b129f 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
refactor(outline): Move Mod-Alt-H handling to Keymap.js
4b1187f 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(LinkBubbleView): Replace deprecated keypress with keyup
c656439 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(MenuBar): Use keyup instead of keydown event
187dfd4 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore: Add description to keyboard shortcut configurations
ab4f288 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix: Use FocusTrap also in plain text editor
afaf66d 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(editor): Streamline Tab key handling
36b0241 
Signed-off-by: Jonas <jonas@freesources.org>
mejo- added 2 commits May 12, 2025 20:56
@mejo-
fix(keymap): Add additional checks for modifier keys in handleKeyDown
f00ce6e 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
test(cy): Ignore error thrown by cypress when imitating tab key
51962c7 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo- mejo- moved this from 🏗️ In progress to 👀 In review in 📝 Office team May 13, 2025
max-nextcloud
max-nextcloud approved these changes May 21, 2025
View reviewed changes
Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for tackling this. Looks really good.

Now if we could also stop handling ctrl+shift+i... then i could enable the browser dev tools even when focus is on the text.

I'll look into that and create a PR either against this PR or against main if this has already been merged.

@max-nextcloud max-nextcloud merged commit 8214678 into main May 21, 2025
66 checks passed
@max-nextcloud max-nextcloud deleted the fix/keymap branch May 21, 2025 09:32
@github-project-automation github-project-automation bot moved this from 👀 In review to ☑️ Done in 📝 Office team May 21, 2025
@mejo-
Copy link
Member Author

mejo- commented May 21, 2025

/backport to stable31

@backportbot backportbot bot mentioned this pull request May 21, 2025
Merged
@skjnldsv skjnldsv mentioned this pull request Aug 19, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees

@mejo- mejo-

Labels

3. to review bug Something isn't working technical debt

Projects

📝 Office team
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Keymap code cleanup

2 participants

@mejo- @max-nextcloud