fix(app-admin): improve Lexical prop types

webiny · Nov 18, 2024 · 8990f00 · 8990f00
1 parent cc16ecc
commit 8990f00
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/packages/app-admin/package.json b/packages/app-admin/package.json
@@ -26,6 +26,7 @@
     "@webiny/app-wcp": "0.0.0",
     "@webiny/form": "0.0.0",
     "@webiny/lexical-editor": "0.0.0",
+    "@webiny/lexical-theme": "0.0.0",
     "@webiny/plugins": "0.0.0",
     "@webiny/react-composition": "0.0.0",
     "@webiny/react-router": "0.0.0",

diff --git a/packages/app-admin/src/components/LexicalEditor/LexicalEditor.tsx b/packages/app-admin/src/components/LexicalEditor/LexicalEditor.tsx
@@ -3,23 +3,30 @@ import { FileManager } from "~/components";
 import { RichTextEditor as BaseEditor } from "@webiny/lexical-editor";
 import { RichTextEditorProps } from "@webiny/lexical-editor/types";
 import { useTheme } from "@webiny/app-theme";
-import { Theme } from "@webiny/app-theme/types";
+import { EditorTheme } from "@webiny/lexical-theme";
 
 interface LexicalEditorProps extends Omit<RichTextEditorProps, "theme"> {
-    theme?: Theme;
+    theme?: Partial<EditorTheme>;
 }
 
 const imagesOnly = ["image/*"];
 
 export const LexicalEditor = (props: LexicalEditorProps) => {
     const { theme } = useTheme();
 
+    const editorTheme: EditorTheme = {
+        styles: {},
+        emotionMap: {},
+        ...theme,
+        ...(props.theme || {})
+    };
+
     return (
         <FileManager accept={imagesOnly}>
             {({ showFileManager }) => (
                 <BaseEditor
                     {...props}
-                    theme={{ ...theme, ...props?.theme }}
+                    theme={editorTheme}
                     toolbarActionPlugins={[
                         ...(props.toolbarActionPlugins || []),
                         { targetAction: "image-action", plugin: showFileManager }

diff --git a/packages/app-admin/tsconfig.build.json b/packages/app-admin/tsconfig.build.json
@@ -8,6 +8,7 @@
     { "path": "../app-wcp/tsconfig.build.json" },
     { "path": "../form/tsconfig.build.json" },
     { "path": "../lexical-editor/tsconfig.build.json" },
+    { "path": "../lexical-theme/tsconfig.build.json" },
     { "path": "../plugins/tsconfig.build.json" },
     { "path": "../react-composition/tsconfig.build.json" },
     { "path": "../react-router/tsconfig.build.json" },

diff --git a/packages/app-admin/tsconfig.json b/packages/app-admin/tsconfig.json
@@ -8,6 +8,7 @@
     { "path": "../app-wcp" },
     { "path": "../form" },
     { "path": "../lexical-editor" },
+    { "path": "../lexical-theme" },
     { "path": "../plugins" },
     { "path": "../react-composition" },
     { "path": "../react-router" },
@@ -35,6 +36,8 @@
       "@webiny/form": ["../form/src"],
       "@webiny/lexical-editor/*": ["../lexical-editor/src/*"],
       "@webiny/lexical-editor": ["../lexical-editor/src"],
+      "@webiny/lexical-theme/*": ["../lexical-theme/src/*"],
+      "@webiny/lexical-theme": ["../lexical-theme/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/react-composition/*": ["../react-composition/src/*"],

diff --git a/yarn.lock b/yarn.lock
@@ -15540,6 +15540,7 @@ __metadata:
     "@webiny/cli": 0.0.0
     "@webiny/form": 0.0.0
     "@webiny/lexical-editor": 0.0.0
+    "@webiny/lexical-theme": 0.0.0
     "@webiny/plugins": 0.0.0
     "@webiny/project-utils": 0.0.0
     "@webiny/react-composition": 0.0.0