fix(richtext-lexical): allow any priority of FOCUS_COMMAND (#10128)

This revert patch behavior on indent in Firefox, in order to fix #10049
payloadcms · Jan 2, 2025 · 018c193 · 018c193
1 parent 510968f
commit 018c193
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 69 deletions.
diff --git a/packages/richtext-lexical/src/features/indent/client/index.tsx b/packages/richtext-lexical/src/features/indent/client/index.tsx
@@ -1,13 +1,13 @@
 'use client'
 
+import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin'
 import { INDENT_CONTENT_COMMAND, OUTDENT_CONTENT_COMMAND } from 'lexical'
 
 import type { ToolbarGroup } from '../../toolbars/types.js'
 
 import { IndentDecreaseIcon } from '../../../lexical/ui/icons/IndentDecrease/index.js'
 import { IndentIncreaseIcon } from '../../../lexical/ui/icons/IndentIncrease/index.js'
 import { createClientFeature } from '../../../utilities/createClientFeature.js'
-import { IndentPlugin } from './plugins/index.js'
 import { toolbarIndentGroupWithItems } from './toolbarIndentGroup.js'
 
 const toolbarGroups: ToolbarGroup[] = [
@@ -58,7 +58,7 @@ const toolbarGroups: ToolbarGroup[] = [
 export const IndentFeatureClient = createClientFeature({
   plugins: [
     {
-      Component: IndentPlugin,
+      Component: TabIndentationPlugin,
       position: 'normal',
     },
   ],

diff --git a/packages/richtext-lexical/src/features/indent/client/plugins/index.tsx b/packages/richtext-lexical/src/features/indent/client/plugins/index.tsx
diff --git a/packages/richtext-lexical/src/lexical/LexicalEditor.tsx b/packages/richtext-lexical/src/lexical/LexicalEditor.tsx
@@ -114,7 +114,7 @@ export const LexicalEditor: React.FC<
         <RichTextPlugin
           contentEditable={
             <div className="editor-scroller">
-              <div className="editor" ref={onRef} tabIndex={-1}>
+              <div className="editor" ref={onRef}>
                 <LexicalContentEditable editorConfig={editorConfig} />
               </div>
             </div>

diff --git a/test/fields/collections/Lexical/e2e/main/e2e.spec.ts b/test/fields/collections/Lexical/e2e/main/e2e.spec.ts
@@ -784,11 +784,8 @@ describe('lexicalMain', () => {
     })
   })
 
-  /**
-   * When the escape key is pressed, Firefox resets the active element to the beginning of the page instead of staying with the editor.
-   * By applying a keydown listener when the escape key is pressed, we can programatically focus the previous element if shift+tab is pressed.
-   */
-  test('ensure escape key can be used to move focus away from editor', async () => {
+  // NOTE: It's not worth it right now. Maybe later. See https://github.com/payloadcms/payload/issues/10049
+  test.skip('ensure escape key can be used to move focus away from editor', async () => {
     await navigateToLexicalFields()
 
     const richTextField = page.locator('.rich-text-lexical').first()