@almadar/ui 4.6.3 → 4.6.5

package/dist/avl/index.cjs

@@ -19215,6 +19215,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -19245,6 +19246,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -21989,6 +21991,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: action.icon, size: "xs" }),
@@ -22032,6 +22035,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -22299,6 +22303,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -22388,6 +22393,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -30774,6 +30780,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -31753,6 +31760,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 +31915,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 +31957,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

@@ -19169,6 +19169,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -19199,6 +19200,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -21943,6 +21945,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs" }),
@@ -21986,6 +21989,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -22253,6 +22257,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -22342,6 +22347,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -30728,6 +30734,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -31707,6 +31714,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 +31869,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 +31911,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

@@ -14507,6 +14507,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -14537,6 +14538,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -17512,6 +17514,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsxRuntime.jsx(exports.Icon, { name: action.icon, size: "xs" }),
@@ -17555,6 +17558,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsxRuntime.jsx(exports.Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -17822,6 +17826,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -17911,6 +17916,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -26567,6 +26573,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -27641,6 +27648,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 +27803,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 +27845,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

@@ -14462,6 +14462,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -14492,6 +14493,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -17467,6 +17469,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs" }),
@@ -17510,6 +17513,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -17777,6 +17781,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -17866,6 +17871,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -26522,6 +26528,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -27596,6 +27603,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 +27758,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 +27800,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

@@ -16050,6 +16050,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -16080,6 +16081,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -18824,6 +18826,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: action.icon, size: "xs" }),
@@ -18867,6 +18870,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -19134,6 +19138,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -19223,6 +19228,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -27609,6 +27615,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -28588,6 +28595,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 +28750,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 +28792,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

@@ -16005,6 +16005,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -16035,6 +16036,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -18779,6 +18781,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs" }),
@@ -18822,6 +18825,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -19089,6 +19093,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -19178,6 +19183,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -27564,6 +27570,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -28543,6 +28550,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 +28705,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 +28747,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

@@ -15873,6 +15873,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -15903,6 +15904,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -18633,6 +18635,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: action.icon, size: "xs" }),
@@ -18676,6 +18679,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -18943,6 +18947,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -19032,6 +19037,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -27216,6 +27222,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -28195,6 +28202,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 +28357,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 +28399,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

@@ -15828,6 +15828,7 @@ var init_CardGrid = __esm({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": action.event ? `action-${action.event}` : void 0,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: action.label
                     },
@@ -15858,6 +15859,7 @@ var init_CardGrid = __esm({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": action.event ? `action-${action.event}` : void 0,
+                    "data-row-id": String(itemData.id),
                     children: action.label
                   },
                   actionIdx
@@ -18588,6 +18590,7 @@ function DataGrid({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: "text-error hover:bg-error/10 px-2",
                       children: [
                         action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs" }),
@@ -18631,6 +18634,7 @@ function DataGrid({
                     size: "sm",
                     onClick: handleActionClick(action, itemData),
                     "data-testid": `action-${action.event}`,
+                    "data-row-id": String(itemData.id),
                     children: [
                       action.icon && /* @__PURE__ */ jsx(Icon, { name: action.icon, size: "xs", className: "mr-1" }),
                       action.label
@@ -18898,6 +18902,7 @@ function DataList({
                       size: "sm",
                       onClick: handleActionClick(action, itemData),
                       "data-testid": `action-${action.event}`,
+                      "data-row-id": String(itemData.id),
                       className: cn(
                         action.variant === "danger" && "text-error hover:bg-error/10"
                       ),
@@ -18987,6 +18992,7 @@ function DataList({
                 size: "sm",
                 onClick: handleActionClick(action, itemData),
                 "data-testid": `action-${action.event}`,
+                "data-row-id": String(itemData.id),
                 className: cn(
                   action.variant === "danger" && "text-error hover:bg-error/10"
                 ),
@@ -27171,6 +27177,7 @@ var init_DetailPanel = __esm({
               actionPayload: { row: normalizedData },
               icon: action.icon,
               "data-testid": action.event ? `action-${action.event}` : void 0,
+              "data-row-id": normalizedData?.id !== void 0 ? String(normalizedData.id) : void 0,
               children: action.label
             },
             idx
@@ -28150,6 +28157,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 +28312,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 +28354,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.5",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",