@aatulwork/customform-renderer 1.5.0 → 1.7.0

package/dist/index.js

@@ -659,14 +659,31 @@ var CKEditorField = ({ field, control, defaultValue, rules, errors, setValue, fo
   const theme = material.useTheme();
   const formColors = useFormColors(colors);
   const editorContainerRef = react.useRef(null);
+  const editorInstanceRef = react.useRef(null);
+  const isUserTypingRef = react.useRef(false);
   const fileUploadService = services?.fileUpload || defaultFileUploadService;
   const fileBaseUrl = services?.fileBaseUrl || "";
-  const licenseKey = services?.ckEditorLicenseKey || "";
+  const licenseKey = services?.ckEditorLicenseKey || "GPL";
   const ckEditorScriptPath = services?.ckEditorScriptPath || "/lib/ckeditor/ckeditor.js";
   const { isReady: isCKEditorReady, isLoading: isCKEditorLoading, error: ckEditorError } = useCKEditor({
     scriptPath: ckEditorScriptPath,
     autoLoad: true
   });
+  const watchedValue = reactHookForm.useWatch({
+    control,
+    name: field.name,
+    defaultValue: defaultValue || ""
+  });
+  react.useEffect(() => {
+    if (editorInstanceRef.current && isCKEditorReady && !isUserTypingRef.current) {
+      const currentEditorData = editorInstanceRef.current.getData();
+      const formValue = watchedValue || "";
+      if (currentEditorData !== formValue) {
+        editorInstanceRef.current.setData(formValue);
+      }
+    }
+    isUserTypingRef.current = false;
+  }, [watchedValue, isCKEditorReady]);
   const createCustomUploadAdapter = react.useCallback((loader) => {
     return {
       upload: async () => {
@@ -780,6 +797,7 @@ var CKEditorField = ({ field, control, defaultValue, rules, errors, setValue, fo
                 },
                 data: formField.value || "",
                 onReady: (editor) => {
+                  editorInstanceRef.current = editor;
                   if (formSchema?.name) {
                     try {
                       const fileRepository = editor.plugins.get("FileRepository");
@@ -803,6 +821,7 @@ var CKEditorField = ({ field, control, defaultValue, rules, errors, setValue, fo
                 },
                 onChange: (_event, editor) => {
                   const data = editor.getData();
+                  isUserTypingRef.current = true;
                   formField.onChange(data);
                 },
                 onBlur: () => {
@@ -1602,10 +1621,15 @@ var FormRenderer = ({
     if (onSubmit) {
       try {
         await onSubmit(transformedData);
-        if (onSuccess) {
-          reset(initialValues || {});
-          onSuccess();
-        }
+        clearErrors();
+        reset(initialValues || {}, {
+          keepErrors: false,
+          keepDirty: false,
+          keepTouched: false,
+          keepIsSubmitted: false,
+          keepSubmitCount: false
+        });
+        if (onSuccess) onSuccess();
       } catch (error) {
         console.error("Form submission error:", error);
         let errorMessage = "Form submission failed. Please try again.";