@aatulwork/customform-renderer 1.5.0 → 1.6.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { useMemo, useState, useEffect, useRef, useCallback } from 'react';
-import { Controller, useForm } from 'react-hook-form';
+import { Controller, useWatch, useForm } from 'react-hook-form';
 import { FormControl, FormLabel, TextField as TextField$1, InputLabel, Select, MenuItem, Box, Chip, CircularProgress, OutlinedInput, FormHelperText, FormControlLabel, Checkbox, RadioGroup, Radio, Typography, Switch, Input, useTheme, alpha, useMediaQuery, Tooltip, IconButton, Accordion, AccordionSummary, AccordionDetails, Alert, Stepper, Step, StepLabel, Button, Stack } from '@mui/material';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import DoubleArrowOutlinedIcon from '@mui/icons-material/DoubleArrowOutlined';
@@ -646,14 +646,31 @@ var CKEditorField = ({ field, control, defaultValue, rules, errors, setValue, fo
   const theme = useTheme();
   const formColors = useFormColors(colors);
   const editorContainerRef = useRef(null);
+  const editorInstanceRef = useRef(null);
+  const isUserTypingRef = 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 = useWatch({
+    control,
+    name: field.name,
+    defaultValue: defaultValue || ""
+  });
+  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 = useCallback((loader) => {
     return {
       upload: async () => {
@@ -767,6 +784,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");
@@ -790,6 +808,7 @@ var CKEditorField = ({ field, control, defaultValue, rules, errors, setValue, fo
                 },
                 onChange: (_event, editor) => {
                   const data = editor.getData();
+                  isUserTypingRef.current = true;
                   formField.onChange(data);
                 },
                 onBlur: () => {
@@ -1590,8 +1609,9 @@ var FormRenderer = ({
       try {
         await onSubmit(transformedData);
         if (onSuccess) {
-          reset(initialValues || {});
           onSuccess();
+          clearErrors();
+          reset(initialValues || {}, { keepErrors: false });
         }
       } catch (error) {
         console.error("Form submission error:", error);