fix: infinite loop when injected with module federation

TouK · Aug 11, 2024 · b8fd128 · b8fd128
1 parent 1673d92
commit b8fd128
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/components/codeEditor.tsx b/src/components/codeEditor.tsx
@@ -29,25 +29,25 @@ const CodeBox = styled("div")(({ theme: t }) => ({
     },
 }));
 
-export const CodeEditor = forwardRef<
-    HTMLDivElement,
-    {
-        value: string;
-        onChange: (code: string) => void;
-        rows: number | string;
-        disabled?: boolean;
-        autoFocus?: boolean;
-        formatter?: (code: string) => string;
-    }
->(function CodeEditor(props, forwardedRef) {
+export type CodeEditorProps = {
+    className?: string;
+    value: string;
+    onChange: (code: string) => void;
+    rows: number | string;
+    disabled?: boolean;
+    autoFocus?: boolean;
+    formatter?: (code: string) => string;
+};
+
+export const CodeEditor = forwardRef<HTMLDivElement, CodeEditorProps>(function CodeEditor(props, forwardedRef) {
     const { value, onChange, rows, disabled, autoFocus, formatter, ...passProps } = props;
 
     const editorRef = useRef<HTMLDivElement>(null);
     const ref = useForkRef(forwardedRef, editorRef);
 
     const jarRef = useRef<CodeJar>(null);
     const positionRef = useRef<Position>(null);
-    const [code, setCode] = useState<string>(null);
+    const [code, setCode] = useState<string>(value);
 
     //init CodeJar
     useEffect(() => {
@@ -96,7 +96,7 @@ export const CodeEditor = forwardRef<
             sx={{
                 maxHeight: rows && `${parseInt(rows.toString()) * 1.45}em`,
             }}
-            onBlurCapture={formatter && (() => jarRef.current?.updateCode(formatter(value)))}
+            onBlurCapture={formatter && (() => jarRef.current?.updateCode(formatter(code)))}
         >
             {value}
         </CodeBox>

diff --git a/src/components/jsonTextField.tsx b/src/components/jsonTextField.tsx
@@ -1,7 +1,8 @@
+import { useField } from "formik";
 import { TextField } from "formik-mui";
 import { TextFieldProps } from "formik-mui/dist/TextField";
 import React, { useMemo } from "react";
-import { CodeEditor } from "./codeEditor";
+import { CodeEditor, CodeEditorProps } from "./codeEditor";
 
 function formatJson(value: string): string {
     try {
@@ -11,18 +12,21 @@ function formatJson(value: string): string {
     }
 }
 
+const FieldCodeEditor = ({ name, ...props }: CodeEditorProps & { name: string }) => {
+    const [{ value, onChange }] = useField(name);
+    return <CodeEditor {...props} value={value} onChange={onChange} />;
+};
+
 export function JsonTextField(props: TextFieldProps) {
     const {
         field: { name },
-        form: { setFieldValue },
     } = props;
 
     const inputProps = useMemo(
         () => ({
-            inputComponent: CodeEditor as any,
-            onChange: (code) => setFieldValue(name, code),
+            inputComponent: (props) => <FieldCodeEditor name={name} {...props} />,
         }),
-        [name, setFieldValue],
+        [name],
     );
 
     const inputLabelProps = useMemo(() => ({ shrink: true }), []);