@asaleh37/ui-base 25.9.5-2 → 25.9.5-4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.9.5-2",
+  "version": "25.9.5-4",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormElementField.tsx

@@ -30,7 +30,7 @@ const FormElementField: React.FC<FormElementFieldProps> = (
         return element?.fieldInfo?.fieldLabel;
       }
     };
-    return (
+    return !element.hiddenFields.includes(fieldName) ? (
       <Grid2
         size={
           props?.formProps?.fieldSize || {
@@ -223,6 +223,8 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           />
         ) : null}
       </Grid2>
+    ) : (
+      <></>
     );
   } else {
     return <></>;

package/src/components/templates/DataEntryTemplates/TemplateDataForm/TemplateForm.tsx

@@ -45,23 +45,10 @@ const TemplateForm: React.FC<TemplateFormProps> = (
   const [attachmentPanelEnabledForRecord, setAttachmentPanelEnabledForRecord] =
     useState<boolean>(true);
   const { t } = useTranslation();
-  const fields = getAllFields(props.elements);  
-  const initiallyHiddenFields = [];
-  const initiallyDisabledFields = [];
-  for (const field of fields) {
-    if (field?.hidden) {
-      initiallyHiddenFields.push(field.fieldName);
-    }
-    if (field?.disabled) {
-      initiallyDisabledFields.push(field.fieldName);
-    }
-  }
-  const [disabledFields, setDisabledFields] = useState<string[]>(
-    initiallyDisabledFields
-  );
-  const [hiddenFields, setHiddenFields] = useState<string[]>(
-    initiallyHiddenFields
-  );
+  const fields = getAllFields(props.elements);
+
+  const [disabledFields, setDisabledFields] = useState<string[]>([]);
+  const [hiddenFields, setHiddenFields] = useState<string[]>([]);
   const initialValues: any = {};
   for (const element of props.elements) {
     if (
@@ -186,6 +173,20 @@ const TemplateForm: React.FC<TemplateFormProps> = (
     },
   };
 
+  useEffect(() => {
+    const initiallyHiddenFields = [];
+    const initiallyDisabledFields = [];
+    for (const field of fields) {
+      if (field?.hidden) {
+        initiallyHiddenFields.push(field.fieldName);
+      }
+      if (field?.disabled) {
+        initiallyDisabledFields.push(field.fieldName);
+      }
+    }
+    setHiddenFields(initiallyHiddenFields);
+    setDisabledFields(initiallyDisabledFields);
+  }, [props.elements]);
   useEffect(() => {
     loadRecord();
   }, [props?.recordIdToEdit]);