@open-mercato/ui 0.6.6-develop.6410.1.2ad881013e → 0.6.6-develop.6411.1.825382313f

package/dist/backend/CrudForm.js

@@ -96,6 +96,7 @@ import { CollapsibleGroup } from "./crud/CollapsibleGroup.js";
 import { SortableGroupHandleProvider } from "./crud/SortableGroupHandle.js";
 import { useGroupOrder } from "./crud/useGroupOrder.js";
 import { InjectedField } from "./injection/InjectedField.js";
+import { insertByInjectionPlacement } from "@open-mercato/shared/modules/widgets/injection-position";
 import { evaluateInjectedVisibility } from "./injection/visibility-utils.js";
 import { ComponentReplacementHandles } from "@open-mercato/shared/modules/widgets/component-registry";
 import { RichEditor } from "../primitives/rich-editor.js";
@@ -1295,22 +1296,25 @@ function CrudForm({
     [injectedFieldDefinitions]
   );
   const injectedCrudFields = React.useMemo(() => {
-    return injectedFieldDefinitions.map((definition) => ({
-      id: definition.id,
-      label: definition.label,
-      type: "custom",
-      readOnly: definition.readOnly,
-      component: ({ value, setValue: setValue2, values: formValues }) => /* @__PURE__ */ jsx(
-        InjectedField,
-        {
-          field: definition,
-          value,
-          onChange: (_, nextValue) => setValue2(nextValue),
-          context: injectedFieldContext,
-          formData: formValues ?? values
-        }
-      )
-    }));
+    return injectedFieldDefinitions.map((definition) => {
+      const injectedFieldRendersOwnLabel = !(definition.type === "custom" && definition.customComponent);
+      return {
+        id: definition.id,
+        label: injectedFieldRendersOwnLabel ? "" : definition.label,
+        type: "custom",
+        readOnly: definition.readOnly,
+        component: ({ value, setValue: setValue2, values: formValues }) => /* @__PURE__ */ jsx(
+          InjectedField,
+          {
+            field: definition,
+            value,
+            onChange: (_, nextValue) => setValue2(nextValue),
+            context: injectedFieldContext,
+            formData: formValues ?? values
+          }
+        )
+      };
+    });
   }, [injectedFieldContext, injectedFieldDefinitions, values]);
   const allFields = React.useMemo(() => {
     const base = [...fields, ...injectedCrudFields];
@@ -1480,10 +1484,16 @@ function CrudForm({
       }
       if (index < 0) continue;
       const fieldEntries = cloned[index].fields ?? [];
-      if (!fieldEntries.some((entry) => typeof entry === "string" && entry === definition.id)) {
-        fieldEntries.push(definition.id);
-      }
-      cloned[index].fields = fieldEntries;
+      const alreadyPresent = fieldEntries.some((entry) => {
+        const entryId = typeof entry === "string" ? entry : entry.id;
+        return entryId === definition.id;
+      });
+      cloned[index].fields = alreadyPresent ? fieldEntries : insertByInjectionPlacement(
+        fieldEntries,
+        definition.id,
+        definition.placement,
+        (entry) => typeof entry === "string" ? entry : entry.id
+      );
     }
     return cloned;
   }, [groups, injectedFieldDefinitions]);