@open-mercato/ui 0.8.1-develop.7237.1.635faf2c7a → 0.8.1-develop.7239.1.d90c352076

package/dist/backend/CrudForm.js

@@ -173,6 +173,12 @@ function buildResolvedEntityIdsKey(entityId, entityIds) {
   }
   return list.join("\0");
 }
+function mergeByKey(primary, legacy, keyOf) {
+  if (!legacy.length) return primary;
+  const seen = new Set(primary.map(keyOf));
+  const extra = legacy.filter((item) => !seen.has(keyOf(item)));
+  return extra.length ? [...primary, ...extra] : primary;
+}
 function readByDotPath(source, path) {
   if (!source || !path) return void 0;
   if (Object.prototype.hasOwnProperty.call(source, path)) return source[path];
@@ -393,6 +399,7 @@ function CrudForm({
   customFieldsetBindings,
   customFieldsManageMode = "inline",
   injectionSpotId,
+  legacyInjectionSpotId,
   replacementHandle,
   collapsibleGroups,
   sortableGroups,
@@ -480,6 +487,7 @@ function CrudForm({
     return ComponentReplacementHandles.crudForm("unknown");
   }, [replacementHandle, resolvedEntityIds]);
   const headerInjectionSpotId = resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, "header") : void 0;
+  const legacyHeaderInjectionSpotId = legacyInjectionSpotId ? extensionSpotChildId(legacyInjectionSpotId, "header") : void 0;
   const recordId = React.useMemo(() => {
     const raw = values.id;
     if (typeof raw === "string") return raw;
@@ -716,13 +724,28 @@ function CrudForm({
       window.history.replaceState = originalReplaceState;
     };
   }, [allowNextNavigation, clearDirtyState, confirmUnsavedChanges, embedded, hasUnsavedChanges, router, trackDirtyWhenEmbedded]);
-  const { widgets: injectionWidgets } = useInjectionWidgets(resolvedInjectionSpotId, {
+  const { widgets: primaryInjectionWidgets } = useInjectionWidgets(resolvedInjectionSpotId, {
+    context: injectionContext,
+    triggerOnLoad: true
+  });
+  const { widgets: legacyInjectionWidgets } = useInjectionWidgets(legacyInjectionSpotId, {
     context: injectionContext,
     triggerOnLoad: true
   });
-  const { widgets: injectedFieldWidgets } = useInjectionDataWidgets(
+  const injectionWidgets = React.useMemo(
+    () => mergeByKey(primaryInjectionWidgets, legacyInjectionWidgets, (w) => w.widgetId),
+    [primaryInjectionWidgets, legacyInjectionWidgets]
+  );
+  const { widgets: primaryFieldWidgets } = useInjectionDataWidgets(
     resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, "fields") : "__disabled__:fields"
   );
+  const { widgets: legacyFieldWidgets } = useInjectionDataWidgets(
+    legacyInjectionSpotId ? extensionSpotChildId(legacyInjectionSpotId, "fields") : "__disabled__:fields"
+  );
+  const injectedFieldWidgets = React.useMemo(
+    () => mergeByKey(primaryFieldWidgets, legacyFieldWidgets, (w) => w.metadata.id),
+    [primaryFieldWidgets, legacyFieldWidgets]
+  );
   const { triggerEvent: triggerInjectionEvent } = useInjectionSpotEvents(resolvedInjectionSpotId ?? "", injectionWidgets);
   const extendedInjectionEventsEnabled = CRUDFORM_EXTENDED_EVENTS_ENABLED && Boolean(resolvedInjectionSpotId);
   const widgetRequiredFieldIds = React.useMemo(() => {
@@ -1063,16 +1086,28 @@ function CrudForm({
       autoCheckAcl: versionHistory?.autoCheckAcl
     }
   );
-  const headerInjectionAction = headerInjectionSpotId ? /* @__PURE__ */ jsx(
-    InjectionSpot,
-    {
-      spotId: headerInjectionSpotId,
-      context: injectionContext,
-      data: values,
-      onDataChange: (newData) => setValues(newData),
-      disabled: pending
-    }
-  ) : null;
+  const headerInjectionAction = headerInjectionSpotId || legacyHeaderInjectionSpotId ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    headerInjectionSpotId ? /* @__PURE__ */ jsx(
+      InjectionSpot,
+      {
+        spotId: headerInjectionSpotId,
+        context: injectionContext,
+        data: values,
+        onDataChange: (newData) => setValues(newData),
+        disabled: pending
+      }
+    ) : null,
+    legacyHeaderInjectionSpotId ? /* @__PURE__ */ jsx(
+      InjectionSpot,
+      {
+        spotId: legacyHeaderInjectionSpotId,
+        context: injectionContext,
+        data: values,
+        onDataChange: (newData) => setValues(newData),
+        disabled: pending
+      }
+    ) : null
+  ] }) : null;
   const headerExtraActions = versionHistoryEnabled || headerInjectionAction || extraActions ? /* @__PURE__ */ jsxs(Fragment, { children: [
     versionHistoryEnabled ? versionHistoryAction : null,
     headerInjectionAction,