@integry/sdk 4.7.28 → 4.7.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@integry/sdk",
-  "version": "4.7.28",
+  "version": "4.7.30",
   "description": "Integry SDK",
   "main": "dist/umd/index.umd.js",
   "module": "dist/esm/index.csm.js",

package/src/components/MultipurposeField/index.tsx

@@ -636,7 +636,10 @@ const MultipurposeField = (props: MultipurposeFieldProps) => {
     const vallueToUse = Array.isArray(currentValue)
       ? currentValue[0]
       : currentValue;
-    const isTag = vallueToUse?.startsWith('{') && vallueToUse?.endsWith('}');
+    const isTag =
+      typeof vallueToUse === 'string'
+        ? vallueToUse?.startsWith('{') && vallueToUse?.endsWith('}')
+        : false;
     if (isEditable && !allowTagsInText && isMappable && isTag) {
       setTempPlaceholder(vallueToUse || '');
     }
@@ -651,7 +654,7 @@ const MultipurposeField = (props: MultipurposeFieldProps) => {
   const getStringFromEnd = (str: string): string => {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     const regex = /\{([^{}]+)$/;
-    const matches = (str || '').match(regex);
+    const matches = typeof str === 'string' ? (str || '').match(regex) : [];
 
     if (matches && matches.length > 1) {
       const capturedString = matches[0];

package/src/components/form/ObjectField/index.ts

@@ -115,11 +115,67 @@ const ObjectField = (props: ObjectFieldProps) => {
     tagsTree = null,
     showMenuOnLeft = false, // Default to false
   } = props;
+
+  // Calculate initial state based on field properties
+  const calculateInitialObjectHasFields = (f: any) => {
+    // Special case for the Blocks field or similar fields
+    if (
+      field.type === 'TEXTAREA' &&
+      (field.data_type === 'OBJECT[]' || field.data_type === 'OBJECT') &&
+      (!field.template_fields || field.template_fields.length === 0)
+    ) {
+      return false;
+    }
+
+    // For other cases, use the original logic
+    if (Array.isArray(field.template_fields)) {
+      if (field.template_fields.length > 0) {
+        return true;
+      }
+      if (field.type === 'TEXTAREA' || field.type === 'DYNAMIC') {
+        return false;
+      }
+    } else if (field.properties && Object.keys(field.properties).length === 0) {
+      return false;
+    }
+
+    return true;
+  };
+
+  const calculateInitialShowAddMoreOption = (f: any) => {
+    // Special case for the Blocks field or similar fields
+    if (
+      field.type === 'TEXTAREA' &&
+      (field.data_type === 'OBJECT[]' || field.data_type === 'OBJECT') &&
+      (!field.template_fields || field.template_fields.length === 0)
+    ) {
+      return false;
+    }
+
+    // For other cases, use the original logic
+    if (Array.isArray(field.template_fields)) {
+      if (field.template_fields.length > 0) {
+        return true;
+      }
+      if (field.type === 'TEXTAREA' || field.type === 'DYNAMIC') {
+        return false;
+      }
+    } else if (field.properties && Object.keys(field.properties).length === 0) {
+      return false;
+    }
+
+    return true;
+  };
+
   const [objectArray, setObjectArray] = useState<FieldObject[]>(
     Array.isArray(objectValue) ? objectValue : [{}],
   ); // Start with one empty object in the array
-  const [showAddMoreOption, setShowAddMoreOption] = useState(true);
-  const [objectHasFields, setObjectHasFields] = useState(true);
+  const [showAddMoreOption, setShowAddMoreOption] = useState(() =>
+    calculateInitialShowAddMoreOption(field),
+  );
+  const [objectHasFields, setObjectHasFields] = useState(() =>
+    calculateInitialObjectHasFields(field),
+  );
 
   let templateFields = [];