Sync: Community Changes #4822

packages/editor/src/core/components/editors/document/editor.tsx

@@ -89,14 +89,14 @@ function DocumentEditor(props: IDocumentEditorProps) {
 
   return (
     <PageRenderer
-      extendedEditorProps={extendedEditorProps}
       bubbleMenuEnabled={bubbleMenuEnabled}
       disabledExtensions={disabledExtensions}
       displayConfig={displayConfig}
       editor={editor}
       editorContainerClassName={cn(editorContainerClassName, "document-editor")}
-      flaggedExtensions={flaggedExtensions}
+      extendedEditorProps={extendedEditorProps}
       id={id}
+      flaggedExtensions={flaggedExtensions}
       isTouchDevice={!!isTouchDevice}
     />
   );

packages/editor/src/core/components/editors/document/page-renderer.tsx

@@ -18,19 +18,19 @@ import type {
 type Props = {
   aiHandler?: TAIHandler;
   bubbleMenuEnabled: boolean;
+  disabledExtensions: IEditorProps["disabledExtensions"];
   displayConfig: TDisplayConfig;
   documentLoaderClassName?: string;
   editor: Editor;
   titleEditor?: Editor;
   editorContainerClassName: string;
   extendedDocumentEditorProps?: ICollaborativeDocumentEditorPropsExtended;
+  extendedEditorProps: IEditorPropsExtended;
+  flaggedExtensions: IEditorProps["flaggedExtensions"];
   id: string;
   isLoading?: boolean;
   isTouchDevice: boolean;
   tabIndex?: number;
-  extendedEditorProps?: IEditorPropsExtended;
-  flaggedExtensions: IEditorProps["flaggedExtensions"];
-  disabledExtensions: IEditorProps["disabledExtensions"];
   provider?: HocuspocusProvider;
   state?: TCollabValue["state"];
 };
@@ -39,19 +39,19 @@ export function PageRenderer(props: Props) {
   const {
     aiHandler,
     bubbleMenuEnabled,
+    disabledExtensions,
     displayConfig,
     documentLoaderClassName,
     editor,
     editorContainerClassName,
-    extendedDocumentEditorProps,
-    id,
-    isLoading,
-    isTouchDevice,
-    tabIndex,
-    titleEditor,
     extendedEditorProps,
     flaggedExtensions,
-    disabledExtensions,
+    extendedDocumentEditorProps,
+    isLoading,
+    isTouchDevice,
+    id,
+    tabIndex,
+    titleEditor,
     provider,
     state,
   } = props;
@@ -103,9 +103,9 @@ export function PageRenderer(props: Props) {
                 {bubbleMenuEnabled && (
                   <EditorBubbleMenu
                     disabledExtensions={disabledExtensions}
-                    flaggedExtensions={flaggedExtensions}
                     editor={editor}
                     extendedEditorProps={extendedEditorProps}
+                    flaggedExtensions={flaggedExtensions}
                   />
                 )}
                 <BlockMenu

packages/editor/src/core/components/editors/rich-text/editor.tsx

@@ -45,8 +45,9 @@ function RichTextEditor(props: IRichTextEditorProps) {
           {editor && bubbleMenuEnabled && (
             <EditorBubbleMenu
               disabledExtensions={disabledExtensions}
-              flaggedExtensions={flaggedExtensions}
               editor={editor}
+              extendedEditorProps={extendedEditorProps}
+              flaggedExtensions={flaggedExtensions}
             />
           )}
           <BlockMenu

packages/editor/src/core/components/menus/bubble-menu/root.tsx

@@ -66,9 +66,9 @@ export type EditorStateType = {
 };
 
 type Props = {
-  editor: Editor;
-  extendedEditorProps?: IEditorPropsExtended;
   disabledExtensions: TExtensions[];
+  editor: Editor;
+  extendedEditorProps: IEditorPropsExtended;
   flaggedExtensions: TExtensions[];
 };