feat(editor): rewrite definitions to context

easyblockshq · May 8, 2024 · d6eb96c · d6eb96c
1 parent 4a37ec9
commit d6eb96c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/core/src/compiler/builtins/$richText/$richText.editor.tsx b/packages/core/src/compiler/builtins/$richText/$richText.editor.tsx
@@ -803,9 +803,8 @@ function RichTextEditor(props: RichTextProps) {
       event.preventDefault();
 
       const nextSlateValue = convertRichTextElementsToEditorValue(
-        duplicateConfig(selectedRichTextComponentConfig, definitions).elements[
-          locale
-        ]
+        duplicateConfig(selectedRichTextComponentConfig, { definitions })
+          .elements[locale]
       );
 
       const temporaryEditor = createTemporaryEditor(editor);

diff --git a/packages/core/src/compiler/builtins/$richText/utils/getRichTextComponentConfigFragment.ts b/packages/core/src/compiler/builtins/$richText/utils/getRichTextComponentConfigFragment.ts
@@ -33,7 +33,7 @@ function getRichTextComponentConfigFragment(
 
     const { path, range } = parseFocusedRichTextPartConfigPath(focusedField);
 
-    const newTextPartConfig = duplicateConfig(textPartConfig, definitions);
+    const newTextPartConfig = duplicateConfig(textPartConfig, { definitions });
 
     if (range) {
       newTextPartConfig.value = textPartConfig.value.slice(...range);

diff --git a/packages/editor/src/useCanvasGlobalKeyboardShortcuts.ts b/packages/editor/src/useCanvasGlobalKeyboardShortcuts.ts
@@ -100,7 +100,9 @@ function useCanvasGlobalKeyboardShortcuts() {
       if (!canHandleCopyPaste(focussedField, event)) {
         return;
       }
-      const configs = getConfigsToCopy(focussedField, formValues, definitions);
+      const configs = getConfigsToCopy(focussedField, formValues, {
+        definitions,
+      });
 
       event.preventDefault();
       event.clipboardData?.setData(
@@ -114,7 +116,9 @@ function useCanvasGlobalKeyboardShortcuts() {
         return;
       }
 
-      const configs = getConfigsToCopy(focussedField, formValues, definitions);
+      const configs = getConfigsToCopy(focussedField, formValues, {
+        definitions,
+      });
 
       event.preventDefault();
       event.clipboardData?.setData(
@@ -180,12 +184,12 @@ function isTargetHtmlElement(
 function getConfigsToCopy(
   paths: string[],
   formValues: any,
-  definitions: AnyContextWithDefinitions
+  context: AnyContextWithDefinitions
 ) {
   const sortedPaths = [...paths].sort(preOrderPathComparator("ascending"));
   return sortedPaths.map((path) => {
     const config = dotNotationGet(formValues, path);
-    return duplicateConfig(config, definitions);
+    return duplicateConfig(config, context);
   });
 }