Skip to content

Commit c8fa092

Browse files
page renderer props
1 parent 625124d commit c8fa092

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ type Props = {
3131
isLoading?: boolean;
3232
isTouchDevice: boolean;
3333
tabIndex?: number;
34-
extendedEditorProps?: IEditorPropsExtended;
35-
flaggedExtensions: IEditorProps["flaggedExtensions"];
36-
disabledExtensions: IEditorProps["disabledExtensions"];
3734
provider?: HocuspocusProvider;
3835
state?: TCollabValue["state"];
3936
};
@@ -53,8 +50,6 @@ export function PageRenderer(props: Props) {
5350
isTouchDevice,
5451
tabIndex,
5552
titleEditor,
56-
flaggedExtensions,
57-
disabledExtensions,
5853
provider,
5954
state,
6055
} = props;
@@ -98,7 +93,14 @@ export function PageRenderer(props: Props) {
9893
<EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />
9994
{editor.isEditable && !isTouchDevice && (
10095
<div>
101-
{bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}
96+
{bubbleMenuEnabled && (
97+
<EditorBubbleMenu
98+
editor={editor}
99+
disabledExtensions={disabledExtensions}
100+
extendedEditorProps={extendedEditorProps}
101+
flaggedExtensions={flaggedExtensions}
102+
/>
103+
)}
102104
<BlockMenu
103105
editor={editor}
104106
flaggedExtensions={flaggedExtensions}

packages/editor/src/core/hooks/use-collaborative-editor.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type {
1515
TCollaborativeEditorHookProps,
1616
ICollaborativeDocumentEditorProps,
1717
IEditorPropsExtended,
18+
IEditorProps,
1819
TEditorHookProps,
1920
EditorTitleRefApi,
2021
} from "@/types";
@@ -124,7 +125,6 @@ export const useCollaborativeEditor = (props: UseCollaborativeEditorArgs) => {
124125
onEditorFocus,
125126
onTransaction,
126127
placeholder,
127-
showPlaceholderOnEmpty,
128128
provider,
129129
tabIndex,
130130
}),
@@ -150,6 +150,7 @@ export const useCollaborativeEditor = (props: UseCollaborativeEditorArgs) => {
150150
onTransaction,
151151
placeholder,
152152
showPlaceholderOnEmpty,
153+
provider,
153154
tabIndex,
154155
]
155156
);
@@ -175,6 +176,7 @@ export const useCollaborativeEditor = (props: UseCollaborativeEditorArgs) => {
175176
updatePageProperties?: ICollaborativeDocumentEditorProps["updatePageProperties"];
176177
extensions: Extensions;
177178
extendedEditorProps?: IEditorPropsExtended;
179+
getEditorMetaData?: IEditorProps["getEditorMetaData"];
178180
}>(
179181
() => ({
180182
id,
@@ -184,8 +186,9 @@ export const useCollaborativeEditor = (props: UseCollaborativeEditorArgs) => {
184186
updatePageProperties,
185187
extensions: titleExtensions,
186188
extendedEditorProps,
189+
getEditorMetaData,
187190
}),
188-
[provider, id, editable, titleRef, updatePageProperties, titleExtensions, extendedEditorProps]
191+
[provider, id, editable, titleRef, updatePageProperties, titleExtensions, extendedEditorProps, getEditorMetaData]
189192
);
190193

191194
const titleEditor = useTitleEditor(titleEditorConfig as Parameters<typeof useTitleEditor>[0]);

packages/editor/src/core/hooks/use-title-editor.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TitleExtensions } from "@/extensions/title-extension";
1010
// helpers
1111
import { getEditorRefHelpers } from "@/helpers/editor-ref";
1212
// types
13-
import type { IEditorPropsExtended } from "@/types";
13+
import type { IEditorPropsExtended, IEditorProps } from "@/types";
1414
import type { EditorTitleRefApi, ICollaborativeDocumentEditorProps } from "@/types/editor";
1515

1616
type Props = {
@@ -24,14 +24,15 @@ type Props = {
2424
updatePageProperties?: ICollaborativeDocumentEditorProps["updatePageProperties"];
2525
id: string;
2626
extendedEditorProps?: IEditorPropsExtended;
27+
getEditorMetaData?: IEditorProps["getEditorMetaData"];
2728
};
2829

2930
/**
3031
* A hook that creates a title editor with collaboration features
3132
* Uses the same Y.Doc as the main editor but a different field
3233
*/
3334
export const useTitleEditor = (props: Props) => {
34-
const { editable = true, id, initialValue = "", extensions, provider, updatePageProperties, titleRef } = props;
35+
const { editable = true, id, initialValue = "", extensions, provider, updatePageProperties, titleRef, getEditorMetaData } = props;
3536

3637
// Force editor recreation when Y.Doc changes (provider.document.guid)
3738
const docKey = provider?.document?.guid ?? id;
@@ -62,6 +63,7 @@ export const useTitleEditor = (props: Props) => {
6263
...getEditorRefHelpers({
6364
editor,
6465
provider,
66+
getEditorMetaData: getEditorMetaData ?? (() => ({ file_assets: [], user_mentions: [] })),
6567
}),
6668
clearEditor: (emitUpdate = false) => {
6769
editor

0 commit comments

Comments
 (0)