@almadar/ui 4.6.3 → 4.6.4

package/dist/avl/index.cjs

@@ -31753,6 +31753,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -31898,9 +31908,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React126__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -31937,11 +31950,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React126__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React126__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/avl/index.js

@@ -31707,6 +31707,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -31852,9 +31862,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React126__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -31891,11 +31904,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React126__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React126__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/components/index.cjs

@@ -27641,6 +27641,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -27786,9 +27796,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React110__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -27825,11 +27838,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React110__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React110__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/components/index.js

@@ -27596,6 +27596,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -27741,9 +27751,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React110__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -27780,11 +27793,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React110__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React110__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/providers/index.cjs

@@ -28588,6 +28588,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28733,9 +28743,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28772,11 +28785,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/providers/index.js

@@ -28543,6 +28543,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28688,9 +28698,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28727,11 +28740,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/runtime/index.cjs

@@ -28195,6 +28195,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28340,9 +28350,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28379,11 +28392,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/dist/runtime/index.js

@@ -28150,6 +28150,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28295,9 +28305,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28334,11 +28347,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.6.3",
+  "version": "4.6.4",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",