Skip to content

Commit 9f14167

Browse files
authored
refactor: editor code splitting (#6102)
* fix: merge conflicts resolved from preview * fix: space app build errors * fix: product updates modal * fix: build errors * fix: lite text read only editor * refactor: additional options push logic
1 parent 11bfbe5 commit 9f14167

37 files changed

+218
-46
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Extensions } from "@tiptap/core";
2+
// types
3+
import { TExtensions } from "@/types";
4+
5+
type Props = {
6+
disabledExtensions: TExtensions[];
7+
};
8+
9+
export const CoreEditorAdditionalExtensions = (props: Props): Extensions => {
10+
const {} = props;
11+
return [];
12+
};
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from "./extensions";
2+
export * from "./read-only-extensions";
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Extensions } from "@tiptap/core";
2+
// types
3+
import { TExtensions } from "@/types";
4+
5+
type Props = {
6+
disabledExtensions: TExtensions[];
7+
};
8+
9+
export const CoreReadOnlyEditorAdditionalExtensions = (props: Props): Extensions => {
10+
const {} = props;
11+
return [];
12+
};
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { Extensions } from "@tiptap/core";
2+
3+
export const CoreEditorAdditionalExtensionsWithoutProps: Extensions = [];

packages/editor/src/ce/extensions/document-extensions.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ type Props = {
1515

1616
export const DocumentEditorAdditionalExtensions = (_props: Props) => {
1717
const { disabledExtensions } = _props;
18-
const extensions: Extensions = disabledExtensions?.includes("slash-commands") ? [] : [SlashCommands()];
18+
const extensions: Extensions = disabledExtensions?.includes("slash-commands")
19+
? []
20+
: [
21+
SlashCommands({
22+
disabledExtensions,
23+
}),
24+
];
1925

2026
return extensions;
2127
};
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
export * from "./core";
12
export * from "./document-extensions";
3+
export * from "./slash-commands";
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// extensions
2+
import { TSlashCommandAdditionalOption } from "@/extensions";
3+
// types
4+
import { TExtensions } from "@/types";
5+
6+
type Props = {
7+
disabledExtensions: TExtensions[];
8+
};
9+
10+
export const coreEditorAdditionalSlashCommandOptions = (props: Props): TSlashCommandAdditionalOption[] => {
11+
const {} = props;
12+
const options: TSlashCommandAdditionalOption[] = [];
13+
return options;
14+
};

packages/editor/src/core/components/editors/document/collaborative-read-only-editor.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { EditorReadOnlyRefApi, ICollaborativeDocumentReadOnlyEditor } from "@/ty
1515
const CollaborativeDocumentReadOnlyEditor = (props: ICollaborativeDocumentReadOnlyEditor) => {
1616
const {
1717
containerClassName,
18+
disabledExtensions,
1819
displayConfig = DEFAULT_DISPLAY_CONFIG,
1920
editorClassName = "",
2021
embedHandler,
@@ -37,6 +38,7 @@ const CollaborativeDocumentReadOnlyEditor = (props: ICollaborativeDocumentReadOn
3738
}
3839

3940
const { editor, hasServerConnectionFailed, hasServerSynced } = useReadOnlyCollaborativeEditor({
41+
disabledExtensions,
4042
editorClassName,
4143
extensions,
4244
fileHandler,

packages/editor/src/core/components/editors/document/read-only-editor.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import { getEditorClassNames } from "@/helpers/common";
1010
// hooks
1111
import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
1212
// types
13-
import { EditorReadOnlyRefApi, IMentionHighlight, TDisplayConfig, TFileHandler } from "@/types";
13+
import { EditorReadOnlyRefApi, IMentionHighlight, TDisplayConfig, TExtensions, TFileHandler } from "@/types";
1414

1515
interface IDocumentReadOnlyEditor {
16+
disabledExtensions: TExtensions[];
1617
id: string;
1718
initialValue: string;
1819
containerClassName: string;
@@ -31,6 +32,7 @@ interface IDocumentReadOnlyEditor {
3132
const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
3233
const {
3334
containerClassName,
35+
disabledExtensions,
3436
displayConfig = DEFAULT_DISPLAY_CONFIG,
3537
editorClassName = "",
3638
embedHandler,
@@ -51,6 +53,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
5153
}
5254

5355
const editor = useReadOnlyEditor({
56+
disabledExtensions,
5457
editorClassName,
5558
extensions,
5659
fileHandler,

packages/editor/src/core/components/editors/editor-wrapper.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {
1919
const {
2020
children,
2121
containerClassName,
22+
disabledExtensions,
2223
displayConfig = DEFAULT_DISPLAY_CONFIG,
2324
editorClassName = "",
2425
extensions,
@@ -37,6 +38,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {
3738
} = props;
3839

3940
const editor = useEditor({
41+
disabledExtensions,
4042
editorClassName,
4143
enableHistory: true,
4244
extensions,

0 commit comments

Comments
 (0)