@open-mercato/ui 0.9.1-develop.7498.1.08d233a6cc → 0.9.1-develop.7513.1.ae2715553f

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
 Generated lucide registry with 182 icons -> /home/runner/work/open-mercato/open-mercato/packages/ui/src/backend/icons/lucideRegistry.generated.tsx
-[build:ui] found 454 entry points
+[build:ui] found 456 entry points
 [build:ui] built successfully

package/dist/backend/CrudForm.js

@@ -98,7 +98,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 { placeInjectedFieldsInGroups } from "./crud/injectedFieldGroups.js";
 import { evaluateInjectedVisibility } from "./injection/visibility-utils.js";
 import { ComponentReplacementHandles } from "@open-mercato/shared/modules/widgets/component-registry";
 import { crudFormExtensionSpotId, extensionSpotChildId } from "@open-mercato/shared/modules/widgets/extension-points";
@@ -173,6 +173,21 @@ function buildResolvedEntityIdsKey(entityId, entityIds) {
   }
   return list.join("\0");
 }
+function renderNoInjectedFieldWidget() {
+  return null;
+}
+async function skipInjectedFieldDeleteEvent() {
+}
+const INJECTED_FIELD_DELETE_EVENT_DEFAULTS = {
+  onBeforeDelete: skipInjectedFieldDeleteEvent,
+  onDelete: skipInjectedFieldDeleteEvent,
+  onAfterDelete: skipInjectedFieldDeleteEvent
+};
+function injectionWidgetPriority(widget) {
+  const placementPriority = widget.placement?.priority;
+  if (typeof placementPriority === "number") return placementPriority;
+  return typeof widget.module.metadata.priority === "number" ? widget.module.metadata.priority : 0;
+}
 function mergeByKey(primary, legacy, keyOf) {
   if (!legacy.length) return primary;
   const seen = new Set(primary.map(keyOf));
@@ -754,7 +769,26 @@ function CrudForm({
     () => mergeByKey(primaryFieldWidgets, legacyFieldWidgets, (w) => w.metadata.id),
     [primaryFieldWidgets, legacyFieldWidgets]
   );
-  const { triggerEvent: triggerInjectionEvent } = useInjectionSpotEvents(resolvedInjectionSpotId ?? "", injectionWidgets);
+  const injectionEventWidgets = React.useMemo(() => {
+    const fieldEventWidgets = [];
+    for (const widget of injectedFieldWidgets) {
+      if (!("fields" in widget) || !widget.eventHandlers) continue;
+      fieldEventWidgets.push({
+        widgetId: widget.metadata.id,
+        module: {
+          metadata: widget.metadata,
+          eventHandlers: { ...INJECTED_FIELD_DELETE_EVENT_DEFAULTS, ...widget.eventHandlers },
+          Widget: renderNoInjectedFieldWidget
+        },
+        moduleId: widget.moduleId,
+        key: widget.key,
+        placement: widget.placement
+      });
+    }
+    if (!fieldEventWidgets.length) return injectionWidgets;
+    return mergeByKey(injectionWidgets, fieldEventWidgets, (widget) => widget.widgetId).map((widget, index) => ({ widget, index })).sort((left, right) => injectionWidgetPriority(right.widget) - injectionWidgetPriority(left.widget) || left.index - right.index).map((entry) => entry.widget);
+  }, [injectionWidgets, injectedFieldWidgets]);
+  const { triggerEvent: triggerInjectionEvent } = useInjectionSpotEvents(resolvedInjectionSpotId ?? "", injectionEventWidgets);
   const extendedInjectionEventsEnabled = CRUDFORM_EXTENDED_EVENTS_ENABLED && Boolean(resolvedInjectionSpotId);
   const widgetRequiredFieldIds = React.useMemo(() => {
     const ids = /* @__PURE__ */ new Set();
@@ -1360,6 +1394,24 @@ function CrudForm({
     }
     return definitions;
   }, [injectedFieldWidgets]);
+  const injectedFieldPlacements = React.useMemo(() => {
+    const placements = /* @__PURE__ */ new Map();
+    for (const widget of injectedFieldWidgets) {
+      if (!("fields" in widget)) continue;
+      for (const field of widget.fields ?? []) {
+        placements.set(field.id, widget.placement);
+      }
+    }
+    return placements;
+  }, [injectedFieldWidgets]);
+  const groupsWithInjectedFields = React.useMemo(() => {
+    if (!groups || groups.length === 0 || injectedFieldDefinitions.length === 0) return groups;
+    return placeInjectedFieldsInGroups(groups, injectedFieldDefinitions, injectedFieldPlacements, (definition) => {
+      if (process.env.NODE_ENV !== "production") {
+        logger.warn("Injected field targets a group that does not exist; appended to the last plain-field group", { fieldId: definition.id, group: definition.group });
+      }
+    });
+  }, [groups, injectedFieldDefinitions, injectedFieldPlacements]);
   const injectedFieldContext = React.useMemo(() => {
     const recordValues = values;
     const organizationId = typeof recordValues.organizationId === "string" ? recordValues.organizationId : null;
@@ -1406,22 +1458,15 @@ function CrudForm({
       }
       return (group.fields ?? []).map((entry) => typeof entry === "string" ? entry : entry.id);
     };
-    const declaredGroups = groups ?? [];
     const hidden = /* @__PURE__ */ new Set();
     const visible = /* @__PURE__ */ new Set();
-    for (const group of declaredGroups) {
+    for (const group of groupsWithInjectedFields ?? []) {
       const target = hiddenGroupIdSet.has(group.id) ? hidden : visible;
       for (const fieldId of groupFieldIds(group)) target.add(fieldId);
     }
-    const declaredGroupIds = new Set(declaredGroups.map((group) => group.id));
-    const fallbackGroupId = declaredGroups[declaredGroups.length - 1]?.id;
-    for (const definition of injectedFieldDefinitions) {
-      const targetGroupId = definition.group && declaredGroupIds.has(definition.group) ? definition.group : fallbackGroupId;
-      if (targetGroupId && hiddenGroupIdSet.has(targetGroupId)) hidden.add(definition.id);
-    }
     for (const fieldId of visible) hidden.delete(fieldId);
     return hidden;
-  }, [cfFields, groups, hiddenGroupIdSet, injectedFieldDefinitions, placedCustomFieldIds]);
+  }, [cfFields, groupsWithInjectedFields, hiddenGroupIdSet, placedCustomFieldIds]);
   const hiddenInjectedFieldIds = React.useMemo(() => {
     const hidden = /* @__PURE__ */ new Set();
     for (const definition of injectedFieldDefinitions) {
@@ -1628,31 +1673,6 @@ function CrudForm({
     pairs.sort((a, b) => b.priority - a.priority);
     return pairs.map((p) => p.group);
   }, [injectionWidgets, injectionContext, pending, setValues, values]);
-  const groupsWithInjectedFields = React.useMemo(() => {
-    if (!groups || groups.length === 0 || injectedFieldDefinitions.length === 0) return groups;
-    const cloned = groups.map((group) => ({ ...group, fields: [...group.fields ?? []] }));
-    const fallbackIndex = cloned.length - 1;
-    for (const definition of injectedFieldDefinitions) {
-      const targetIndex = cloned.findIndex((group) => group.id === definition.group);
-      const index = targetIndex >= 0 ? targetIndex : fallbackIndex;
-      if (targetIndex < 0 && process.env.NODE_ENV !== "production") {
-        logger.warn("Injected field targets a group that does not exist; appended to last group", { fieldId: definition.id, group: definition.group });
-      }
-      if (index < 0) continue;
-      const fieldEntries = cloned[index].fields ?? [];
-      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]);
   const shouldAutoGroup = (!groupsWithInjectedFields || groupsWithInjectedFields.length === 0) && injectionGroupCards.length > 0;
   const declaredGroupsForLayout = React.useMemo(() => {
     const baseGroups = groupsWithInjectedFields && groupsWithInjectedFields.length ? groupsWithInjectedFields : [];