strapi-plugin-hubspot 0.16.0 → 0.16.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 0.16.1 — 2026-09-22
+
+### Changed
+- Fields in the builder can be dragged from one step to another (the grip
+  handle is no longer limited to reordering inside the current step). Arrow
+  buttons still move a field into the neighbouring step.
+
 ## 0.16.0 — 2026-09-22
 
 ### Added — submission policies

package/dist/_chunks/{Forms-BW_zGc1P.js → Forms-D0QXkYAN.js}

@@ -7,12 +7,12 @@ const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-CodpLKZx.js");
+const index$1 = require("./index-ciliGv0E.js");
 const core = require("@dnd-kit/core");
 const sortable = require("@dnd-kit/sortable");
 const utilities = require("@dnd-kit/utilities");
-const objectLabels = require("./objectLabels-CSWGIgNb.js");
-const useHubspotSchema = require("./useHubspotSchema-DiRN3HrN.js");
+const objectLabels = require("./objectLabels-BjYfdhRB.js");
+const useHubspotSchema = require("./useHubspotSchema-KKVppjC2.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -173,32 +173,107 @@ const ConditionEditor = ({ condition, candidates, onChange }) => {
     ] })
   ] });
 };
-function SortableList({
-  ids,
-  onReorder,
-  children
+function relocateField(steps, fieldId, overId) {
+  const next = steps.map((step) => ({ ...step, fields: [...step.fields] }));
+  let fromStep = -1;
+  let fromIndex = -1;
+  for (let i = 0; i < next.length; i += 1) {
+    const index2 = next[i].fields.findIndex((field2) => field2.id === fieldId);
+    if (index2 !== -1) {
+      fromStep = i;
+      fromIndex = index2;
+      break;
+    }
+  }
+  if (fromStep === -1) return steps;
+  let toStep = -1;
+  let toIndex = -1;
+  const containerId = overId.startsWith("container:") ? overId.slice("container:".length) : "";
+  if (containerId) {
+    toStep = next.findIndex((step) => step.id === containerId);
+    toIndex = toStep === -1 ? -1 : next[toStep].fields.length;
+  } else {
+    for (let i = 0; i < next.length; i += 1) {
+      const index2 = next[i].fields.findIndex((field2) => field2.id === overId);
+      if (index2 !== -1) {
+        toStep = i;
+        toIndex = index2;
+        break;
+      }
+    }
+    if (toStep === -1) {
+      toStep = next.findIndex((step) => step.id === overId);
+      toIndex = toStep === -1 ? -1 : next[toStep].fields.length;
+    }
+  }
+  if (toStep === -1 || toIndex === -1) return steps;
+  if (fromStep === toStep) {
+    if (fromIndex === toIndex) return steps;
+    next[fromStep].fields = sortable.arrayMove(next[fromStep].fields, fromIndex, toIndex);
+    return next;
+  }
+  const [field] = next[fromStep].fields.splice(fromIndex, 1);
+  if (!field) return steps;
+  next[toStep].fields.splice(toIndex, 0, field);
+  return next;
+}
+const collisionDetection = (args) => {
+  const type = args.active.data.current?.type;
+  const droppableContainers = args.droppableContainers.filter((container) => {
+    const other = container.data.current?.type;
+    if (type === "step") return other === "step";
+    if (type === "field") return other === "field" || other === "container";
+    return true;
+  });
+  return core.closestCorners({ ...args, droppableContainers });
+};
+function SortableBoard({
+  children,
+  onDragEnd
 }) {
   const sensors = core.useSensors(
     // An 8px activation distance keeps clicks (selection!) from starting drags.
     core.useSensor(core.PointerSensor, { activationConstraint: { distance: 8 } }),
     core.useSensor(core.KeyboardSensor, { coordinateGetter: sortable.sortableKeyboardCoordinates })
   );
-  const handleDragEnd = (event) => {
-    const { active, over } = event;
-    if (!over || active.id === over.id) return;
-    const from = ids.indexOf(String(active.id));
-    const to = ids.indexOf(String(over.id));
-    if (from === -1 || to === -1) return;
-    onReorder(sortable.arrayMove(ids, from, to));
-  };
-  return /* @__PURE__ */ jsxRuntime.jsx(core.DndContext, { sensors, collisionDetection: core.closestCenter, onDragEnd: handleDragEnd, children: /* @__PURE__ */ jsxRuntime.jsx(sortable.SortableContext, { items: ids, strategy: sortable.verticalListSortingStrategy, children }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(core.DndContext, { sensors, collisionDetection, onDragEnd, children });
+}
+function SortableGroup({
+  ids,
+  children
+}) {
+  return /* @__PURE__ */ jsxRuntime.jsx(sortable.SortableContext, { items: ids, strategy: sortable.verticalListSortingStrategy, children });
+}
+function SortableContainer({
+  stepId,
+  children
+}) {
+  const { setNodeRef, isOver } = core.useDroppable({
+    id: `container:${stepId}`,
+    data: { type: "container", stepId }
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      ref: setNodeRef,
+      style: {
+        minHeight: 8,
+        borderRadius: 4,
+        outline: isOver ? "2px dashed currentColor" : void 0,
+        outlineOffset: 4
+      },
+      children
+    }
+  );
 }
 function SortableItem({
   id,
+  data,
   children
 }) {
   const { attributes, listeners, setNodeRef, transform, transition, isDragging } = sortable.useSortable({
-    id
+    id,
+    data
   });
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
@@ -889,14 +964,28 @@ const FormEditor = () => {
     /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 6, alignItems: "flex-start", children: [
       /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { flex: "1", children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "stretch", gap: 4, children: [
         /* @__PURE__ */ jsxRuntime.jsx(
-          SortableList,
+          SortableBoard,
           {
-            ids: definition.steps.map((s) => s.id),
-            onReorder: (ids) => patchDefinition((steps) => reorderByIds(steps, ids)),
-            children: definition.steps.map((step, stepIndex) => /* @__PURE__ */ jsxRuntime.jsx(
+            onDragEnd: ({ active, over }) => {
+              if (!over || active.id === over.id) return;
+              const kind = active.data.current?.type;
+              if (kind === "step") {
+                const ids = definition.steps.map((s) => s.id);
+                const from = ids.indexOf(String(active.id));
+                const to = ids.indexOf(String(over.id));
+                if (from === -1 || to === -1) return;
+                patchDefinition((steps) => reorderByIds(steps, sortable.arrayMove(ids, from, to)));
+                return;
+              }
+              if (kind === "field") {
+                patchDefinition((steps) => relocateField(steps, String(active.id), String(over.id)));
+              }
+            },
+            children: /* @__PURE__ */ jsxRuntime.jsx(SortableGroup, { ids: definition.steps.map((s) => s.id), children: definition.steps.map((step, stepIndex) => /* @__PURE__ */ jsxRuntime.jsx(
               SortableItem,
               {
                 id: step.id,
+                data: { type: "step" },
                 children: (stepHandle) => /* @__PURE__ */ jsxRuntime.jsxs(
                   designSystem.Box,
                   {
@@ -972,95 +1061,89 @@ const FormEditor = () => {
                         ] })
                       ] }),
                       /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "stretch", gap: 2, children: [
-                        /* @__PURE__ */ jsxRuntime.jsx(
-                          SortableList,
-                          {
-                            ids: step.fields.map((f) => f.id),
-                            onReorder: (ids) => patchStep(step.id, { fields: reorderByIds(step.fields, ids) }),
-                            children: step.fields.map((field, fieldIndex) => {
-                              const flags = fieldFlags(field.id);
-                              const isSelected = selection.kind === "field" && selection.fieldId === field.id;
-                              return /* @__PURE__ */ jsxRuntime.jsx(
-                                SortableItem,
+                        /* @__PURE__ */ jsxRuntime.jsx(SortableContainer, { stepId: step.id, children: /* @__PURE__ */ jsxRuntime.jsx(SortableGroup, { ids: step.fields.map((f) => f.id), children: step.fields.map((field, fieldIndex) => {
+                          const flags = fieldFlags(field.id);
+                          const isSelected = selection.kind === "field" && selection.fieldId === field.id;
+                          return /* @__PURE__ */ jsxRuntime.jsx(
+                            SortableItem,
+                            {
+                              id: field.id,
+                              data: { type: "field", stepId: step.id },
+                              children: (fieldHandle) => /* @__PURE__ */ jsxRuntime.jsx(
+                                designSystem.Box,
                                 {
-                                  id: field.id,
-                                  children: (fieldHandle) => /* @__PURE__ */ jsxRuntime.jsx(
-                                    designSystem.Box,
-                                    {
-                                      background: isSelected ? "primary100" : "neutral100",
-                                      hasRadius: true,
-                                      padding: 3,
-                                      onClick: (e) => {
-                                        e.stopPropagation();
-                                        setSelection({ kind: "field", fieldId: field.id });
-                                      },
-                                      style: { cursor: "pointer" },
-                                      children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { justifyContent: "space-between", alignItems: "center", children: [
-                                        /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                                          /* @__PURE__ */ jsxRuntime.jsx(
-                                            "span",
-                                            {
-                                              ...fieldHandle.attributes,
-                                              ...fieldHandle.listeners,
-                                              onClick: (e) => e.stopPropagation(),
-                                              style: { cursor: "grab", display: "inline-flex" },
-                                              "aria-label": t("editor.drag-field", "Drag to reorder the field"),
-                                              children: /* @__PURE__ */ jsxRuntime.jsx(icons.Drag, {})
-                                            }
-                                          ),
-                                          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { fontWeight: "semiBold", children: field.label || field.name || "—" }),
-                                          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { children: field.type }),
-                                          field.required && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "neutral150", textColor: "neutral600", children: t("editor.required", "required") }),
-                                          field.hubspot?.property && /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
-                                            field.hubspot.object ?? "contact",
-                                            ".",
-                                            field.hubspot.property
-                                          ] }),
-                                          field.visibleIf?.rules?.length ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "alternative100", textColor: "alternative700", children: t("editor.conditional", "Conditional") }) : null,
-                                          (flags.error || flags.problem) && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "danger100", textColor: "danger700", children: flags.error?.code ?? flags.problem?.code })
-                                        ] }),
-                                        /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 1, onClick: (e) => e.stopPropagation(), children: [
-                                          /* @__PURE__ */ jsxRuntime.jsx(
-                                            designSystem.IconButton,
-                                            {
-                                              label: t("editor.field-up", "Move up"),
-                                              onClick: () => moveField(stepIndex, fieldIndex, -1),
-                                              disabled: stepIndex === 0 && fieldIndex === 0,
-                                              children: /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowUp, {})
-                                            }
-                                          ),
-                                          /* @__PURE__ */ jsxRuntime.jsx(
-                                            designSystem.IconButton,
-                                            {
-                                              label: t("editor.field-down", "Move down"),
-                                              onClick: () => moveField(stepIndex, fieldIndex, 1),
-                                              disabled: stepIndex === definition.steps.length - 1 && fieldIndex === step.fields.length - 1,
-                                              children: /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowDown, {})
-                                            }
-                                          ),
-                                          /* @__PURE__ */ jsxRuntime.jsx(
-                                            designSystem.IconButton,
-                                            {
-                                              label: t("editor.field-delete", "Delete the field"),
-                                              onClick: () => {
-                                                setSelection({ kind: "form" });
-                                                patchStep(step.id, {
-                                                  fields: step.fields.filter((f) => f.id !== field.id)
-                                                });
-                                              },
-                                              children: /* @__PURE__ */ jsxRuntime.jsx(icons.Trash, {})
-                                            }
-                                          )
-                                        ] })
-                                      ] })
-                                    }
-                                  )
-                                },
-                                field.id
-                              );
-                            })
-                          }
-                        ),
+                                  background: isSelected ? "primary100" : "neutral100",
+                                  hasRadius: true,
+                                  padding: 3,
+                                  onClick: (e) => {
+                                    e.stopPropagation();
+                                    setSelection({ kind: "field", fieldId: field.id });
+                                  },
+                                  style: { cursor: "pointer" },
+                                  children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { justifyContent: "space-between", alignItems: "center", children: [
+                                    /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
+                                      /* @__PURE__ */ jsxRuntime.jsx(
+                                        "span",
+                                        {
+                                          ...fieldHandle.attributes,
+                                          ...fieldHandle.listeners,
+                                          onClick: (e) => e.stopPropagation(),
+                                          style: { cursor: "grab", display: "inline-flex" },
+                                          "aria-label": t("editor.drag-field", "Drag to move the field, including to another step"),
+                                          children: /* @__PURE__ */ jsxRuntime.jsx(icons.Drag, {})
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { fontWeight: "semiBold", children: field.label || field.name || "—" }),
+                                      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { children: field.type }),
+                                      field.required && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "neutral150", textColor: "neutral600", children: t("editor.required", "required") }),
+                                      field.hubspot?.property && /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                                        field.hubspot.object ?? "contact",
+                                        ".",
+                                        field.hubspot.property
+                                      ] }),
+                                      field.visibleIf?.rules?.length ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "alternative100", textColor: "alternative700", children: t("editor.conditional", "Conditional") }) : null,
+                                      (flags.error || flags.problem) && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "danger100", textColor: "danger700", children: flags.error?.code ?? flags.problem?.code })
+                                    ] }),
+                                    /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 1, onClick: (e) => e.stopPropagation(), children: [
+                                      /* @__PURE__ */ jsxRuntime.jsx(
+                                        designSystem.IconButton,
+                                        {
+                                          label: t("editor.field-up", "Move up"),
+                                          onClick: () => moveField(stepIndex, fieldIndex, -1),
+                                          disabled: stepIndex === 0 && fieldIndex === 0,
+                                          children: /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowUp, {})
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsxRuntime.jsx(
+                                        designSystem.IconButton,
+                                        {
+                                          label: t("editor.field-down", "Move down"),
+                                          onClick: () => moveField(stepIndex, fieldIndex, 1),
+                                          disabled: stepIndex === definition.steps.length - 1 && fieldIndex === step.fields.length - 1,
+                                          children: /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowDown, {})
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsxRuntime.jsx(
+                                        designSystem.IconButton,
+                                        {
+                                          label: t("editor.field-delete", "Delete the field"),
+                                          onClick: () => {
+                                            setSelection({ kind: "form" });
+                                            patchStep(step.id, {
+                                              fields: step.fields.filter((f) => f.id !== field.id)
+                                            });
+                                          },
+                                          children: /* @__PURE__ */ jsxRuntime.jsx(icons.Trash, {})
+                                        }
+                                      )
+                                    ] })
+                                  ] })
+                                }
+                              )
+                            },
+                            field.id
+                          );
+                        }) }) }),
                         /* @__PURE__ */ jsxRuntime.jsx(
                           designSystem.Button,
                           {
@@ -1081,7 +1164,7 @@ const FormEditor = () => {
                 )
               },
               step.id
-            ))
+            )) })
           }
         ),
         /* @__PURE__ */ jsxRuntime.jsx(

package/dist/_chunks/{Forms-6EoEYzAc.mjs → Forms-DEoZGrEt.mjs}

@@ -5,12 +5,12 @@ import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Typography, Flex, Box, SingleSelect, SingleSelectOption, MultiSelect, MultiSelectOption, TextInput, IconButton, Button, Combobox, ComboboxOption, Field, Textarea, Checkbox, Divider, Loader, Badge, Table, Thead, Tr, Th, Tbody, Td, Modal } from "@strapi/design-system";
 import { Trash, Plus, ArrowClockwise, ArrowLeft, Drag, ArrowUp, ArrowDown, List, Duplicate, Download } from "@strapi/icons";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation, P as PLUGIN_ID } from "./index-7cL9PRh1.mjs";
-import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, closestCenter } from "@dnd-kit/core";
-import { sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable, arrayMove } from "@dnd-kit/sortable";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-gKM4jVf8.mjs";
+import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, useDroppable, closestCorners } from "@dnd-kit/core";
+import { arrayMove, sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-BsmQgJgx.mjs";
+import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-CE7tJgOM.mjs";
 const OPERATORS = [
   "eq",
   "neq",
@@ -153,32 +153,107 @@ const ConditionEditor = ({ condition, candidates, onChange }) => {
     ] })
   ] });
 };
-function SortableList({
-  ids,
-  onReorder,
-  children
+function relocateField(steps, fieldId, overId) {
+  const next = steps.map((step) => ({ ...step, fields: [...step.fields] }));
+  let fromStep = -1;
+  let fromIndex = -1;
+  for (let i = 0; i < next.length; i += 1) {
+    const index = next[i].fields.findIndex((field2) => field2.id === fieldId);
+    if (index !== -1) {
+      fromStep = i;
+      fromIndex = index;
+      break;
+    }
+  }
+  if (fromStep === -1) return steps;
+  let toStep = -1;
+  let toIndex = -1;
+  const containerId = overId.startsWith("container:") ? overId.slice("container:".length) : "";
+  if (containerId) {
+    toStep = next.findIndex((step) => step.id === containerId);
+    toIndex = toStep === -1 ? -1 : next[toStep].fields.length;
+  } else {
+    for (let i = 0; i < next.length; i += 1) {
+      const index = next[i].fields.findIndex((field2) => field2.id === overId);
+      if (index !== -1) {
+        toStep = i;
+        toIndex = index;
+        break;
+      }
+    }
+    if (toStep === -1) {
+      toStep = next.findIndex((step) => step.id === overId);
+      toIndex = toStep === -1 ? -1 : next[toStep].fields.length;
+    }
+  }
+  if (toStep === -1 || toIndex === -1) return steps;
+  if (fromStep === toStep) {
+    if (fromIndex === toIndex) return steps;
+    next[fromStep].fields = arrayMove(next[fromStep].fields, fromIndex, toIndex);
+    return next;
+  }
+  const [field] = next[fromStep].fields.splice(fromIndex, 1);
+  if (!field) return steps;
+  next[toStep].fields.splice(toIndex, 0, field);
+  return next;
+}
+const collisionDetection = (args) => {
+  const type = args.active.data.current?.type;
+  const droppableContainers = args.droppableContainers.filter((container) => {
+    const other = container.data.current?.type;
+    if (type === "step") return other === "step";
+    if (type === "field") return other === "field" || other === "container";
+    return true;
+  });
+  return closestCorners({ ...args, droppableContainers });
+};
+function SortableBoard({
+  children,
+  onDragEnd
 }) {
   const sensors = useSensors(
     // An 8px activation distance keeps clicks (selection!) from starting drags.
     useSensor(PointerSensor, { activationConstraint: { distance: 8 } }),
     useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates })
   );
-  const handleDragEnd = (event) => {
-    const { active, over } = event;
-    if (!over || active.id === over.id) return;
-    const from = ids.indexOf(String(active.id));
-    const to = ids.indexOf(String(over.id));
-    if (from === -1 || to === -1) return;
-    onReorder(arrayMove(ids, from, to));
-  };
-  return /* @__PURE__ */ jsx(DndContext, { sensors, collisionDetection: closestCenter, onDragEnd: handleDragEnd, children: /* @__PURE__ */ jsx(SortableContext, { items: ids, strategy: verticalListSortingStrategy, children }) });
+  return /* @__PURE__ */ jsx(DndContext, { sensors, collisionDetection, onDragEnd, children });
+}
+function SortableGroup({
+  ids,
+  children
+}) {
+  return /* @__PURE__ */ jsx(SortableContext, { items: ids, strategy: verticalListSortingStrategy, children });
+}
+function SortableContainer({
+  stepId,
+  children
+}) {
+  const { setNodeRef, isOver } = useDroppable({
+    id: `container:${stepId}`,
+    data: { type: "container", stepId }
+  });
+  return /* @__PURE__ */ jsx(
+    "div",
+    {
+      ref: setNodeRef,
+      style: {
+        minHeight: 8,
+        borderRadius: 4,
+        outline: isOver ? "2px dashed currentColor" : void 0,
+        outlineOffset: 4
+      },
+      children
+    }
+  );
 }
 function SortableItem({
   id,
+  data,
   children
 }) {
   const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
-    id
+    id,
+    data
   });
   return /* @__PURE__ */ jsx(
     "div",
@@ -869,14 +944,28 @@ const FormEditor = () => {
     /* @__PURE__ */ jsxs(Flex, { gap: 6, alignItems: "flex-start", children: [
       /* @__PURE__ */ jsx(Box, { flex: "1", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 4, children: [
         /* @__PURE__ */ jsx(
-          SortableList,
+          SortableBoard,
           {
-            ids: definition.steps.map((s) => s.id),
-            onReorder: (ids) => patchDefinition((steps) => reorderByIds(steps, ids)),
-            children: definition.steps.map((step, stepIndex) => /* @__PURE__ */ jsx(
+            onDragEnd: ({ active, over }) => {
+              if (!over || active.id === over.id) return;
+              const kind = active.data.current?.type;
+              if (kind === "step") {
+                const ids = definition.steps.map((s) => s.id);
+                const from = ids.indexOf(String(active.id));
+                const to = ids.indexOf(String(over.id));
+                if (from === -1 || to === -1) return;
+                patchDefinition((steps) => reorderByIds(steps, arrayMove(ids, from, to)));
+                return;
+              }
+              if (kind === "field") {
+                patchDefinition((steps) => relocateField(steps, String(active.id), String(over.id)));
+              }
+            },
+            children: /* @__PURE__ */ jsx(SortableGroup, { ids: definition.steps.map((s) => s.id), children: definition.steps.map((step, stepIndex) => /* @__PURE__ */ jsx(
               SortableItem,
               {
                 id: step.id,
+                data: { type: "step" },
                 children: (stepHandle) => /* @__PURE__ */ jsxs(
                   Box,
                   {
@@ -952,95 +1041,89 @@ const FormEditor = () => {
                         ] })
                       ] }),
                       /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 2, children: [
-                        /* @__PURE__ */ jsx(
-                          SortableList,
-                          {
-                            ids: step.fields.map((f) => f.id),
-                            onReorder: (ids) => patchStep(step.id, { fields: reorderByIds(step.fields, ids) }),
-                            children: step.fields.map((field, fieldIndex) => {
-                              const flags = fieldFlags(field.id);
-                              const isSelected = selection.kind === "field" && selection.fieldId === field.id;
-                              return /* @__PURE__ */ jsx(
-                                SortableItem,
+                        /* @__PURE__ */ jsx(SortableContainer, { stepId: step.id, children: /* @__PURE__ */ jsx(SortableGroup, { ids: step.fields.map((f) => f.id), children: step.fields.map((field, fieldIndex) => {
+                          const flags = fieldFlags(field.id);
+                          const isSelected = selection.kind === "field" && selection.fieldId === field.id;
+                          return /* @__PURE__ */ jsx(
+                            SortableItem,
+                            {
+                              id: field.id,
+                              data: { type: "field", stepId: step.id },
+                              children: (fieldHandle) => /* @__PURE__ */ jsx(
+                                Box,
                                 {
-                                  id: field.id,
-                                  children: (fieldHandle) => /* @__PURE__ */ jsx(
-                                    Box,
-                                    {
-                                      background: isSelected ? "primary100" : "neutral100",
-                                      hasRadius: true,
-                                      padding: 3,
-                                      onClick: (e) => {
-                                        e.stopPropagation();
-                                        setSelection({ kind: "field", fieldId: field.id });
-                                      },
-                                      style: { cursor: "pointer" },
-                                      children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", children: [
-                                        /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                                          /* @__PURE__ */ jsx(
-                                            "span",
-                                            {
-                                              ...fieldHandle.attributes,
-                                              ...fieldHandle.listeners,
-                                              onClick: (e) => e.stopPropagation(),
-                                              style: { cursor: "grab", display: "inline-flex" },
-                                              "aria-label": t("editor.drag-field", "Drag to reorder the field"),
-                                              children: /* @__PURE__ */ jsx(Drag, {})
-                                            }
-                                          ),
-                                          /* @__PURE__ */ jsx(Typography, { fontWeight: "semiBold", children: field.label || field.name || "—" }),
-                                          /* @__PURE__ */ jsx(Badge, { children: field.type }),
-                                          field.required && /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral150", textColor: "neutral600", children: t("editor.required", "required") }),
-                                          field.hubspot?.property && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
-                                            field.hubspot.object ?? "contact",
-                                            ".",
-                                            field.hubspot.property
-                                          ] }),
-                                          field.visibleIf?.rules?.length ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "alternative100", textColor: "alternative700", children: t("editor.conditional", "Conditional") }) : null,
-                                          (flags.error || flags.problem) && /* @__PURE__ */ jsx(Badge, { backgroundColor: "danger100", textColor: "danger700", children: flags.error?.code ?? flags.problem?.code })
-                                        ] }),
-                                        /* @__PURE__ */ jsxs(Flex, { gap: 1, onClick: (e) => e.stopPropagation(), children: [
-                                          /* @__PURE__ */ jsx(
-                                            IconButton,
-                                            {
-                                              label: t("editor.field-up", "Move up"),
-                                              onClick: () => moveField(stepIndex, fieldIndex, -1),
-                                              disabled: stepIndex === 0 && fieldIndex === 0,
-                                              children: /* @__PURE__ */ jsx(ArrowUp, {})
-                                            }
-                                          ),
-                                          /* @__PURE__ */ jsx(
-                                            IconButton,
-                                            {
-                                              label: t("editor.field-down", "Move down"),
-                                              onClick: () => moveField(stepIndex, fieldIndex, 1),
-                                              disabled: stepIndex === definition.steps.length - 1 && fieldIndex === step.fields.length - 1,
-                                              children: /* @__PURE__ */ jsx(ArrowDown, {})
-                                            }
-                                          ),
-                                          /* @__PURE__ */ jsx(
-                                            IconButton,
-                                            {
-                                              label: t("editor.field-delete", "Delete the field"),
-                                              onClick: () => {
-                                                setSelection({ kind: "form" });
-                                                patchStep(step.id, {
-                                                  fields: step.fields.filter((f) => f.id !== field.id)
-                                                });
-                                              },
-                                              children: /* @__PURE__ */ jsx(Trash, {})
-                                            }
-                                          )
-                                        ] })
-                                      ] })
-                                    }
-                                  )
-                                },
-                                field.id
-                              );
-                            })
-                          }
-                        ),
+                                  background: isSelected ? "primary100" : "neutral100",
+                                  hasRadius: true,
+                                  padding: 3,
+                                  onClick: (e) => {
+                                    e.stopPropagation();
+                                    setSelection({ kind: "field", fieldId: field.id });
+                                  },
+                                  style: { cursor: "pointer" },
+                                  children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", children: [
+                                    /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
+                                      /* @__PURE__ */ jsx(
+                                        "span",
+                                        {
+                                          ...fieldHandle.attributes,
+                                          ...fieldHandle.listeners,
+                                          onClick: (e) => e.stopPropagation(),
+                                          style: { cursor: "grab", display: "inline-flex" },
+                                          "aria-label": t("editor.drag-field", "Drag to move the field, including to another step"),
+                                          children: /* @__PURE__ */ jsx(Drag, {})
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsx(Typography, { fontWeight: "semiBold", children: field.label || field.name || "—" }),
+                                      /* @__PURE__ */ jsx(Badge, { children: field.type }),
+                                      field.required && /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral150", textColor: "neutral600", children: t("editor.required", "required") }),
+                                      field.hubspot?.property && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                                        field.hubspot.object ?? "contact",
+                                        ".",
+                                        field.hubspot.property
+                                      ] }),
+                                      field.visibleIf?.rules?.length ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "alternative100", textColor: "alternative700", children: t("editor.conditional", "Conditional") }) : null,
+                                      (flags.error || flags.problem) && /* @__PURE__ */ jsx(Badge, { backgroundColor: "danger100", textColor: "danger700", children: flags.error?.code ?? flags.problem?.code })
+                                    ] }),
+                                    /* @__PURE__ */ jsxs(Flex, { gap: 1, onClick: (e) => e.stopPropagation(), children: [
+                                      /* @__PURE__ */ jsx(
+                                        IconButton,
+                                        {
+                                          label: t("editor.field-up", "Move up"),
+                                          onClick: () => moveField(stepIndex, fieldIndex, -1),
+                                          disabled: stepIndex === 0 && fieldIndex === 0,
+                                          children: /* @__PURE__ */ jsx(ArrowUp, {})
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsx(
+                                        IconButton,
+                                        {
+                                          label: t("editor.field-down", "Move down"),
+                                          onClick: () => moveField(stepIndex, fieldIndex, 1),
+                                          disabled: stepIndex === definition.steps.length - 1 && fieldIndex === step.fields.length - 1,
+                                          children: /* @__PURE__ */ jsx(ArrowDown, {})
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsx(
+                                        IconButton,
+                                        {
+                                          label: t("editor.field-delete", "Delete the field"),
+                                          onClick: () => {
+                                            setSelection({ kind: "form" });
+                                            patchStep(step.id, {
+                                              fields: step.fields.filter((f) => f.id !== field.id)
+                                            });
+                                          },
+                                          children: /* @__PURE__ */ jsx(Trash, {})
+                                        }
+                                      )
+                                    ] })
+                                  ] })
+                                }
+                              )
+                            },
+                            field.id
+                          );
+                        }) }) }),
                         /* @__PURE__ */ jsx(
                           Button,
                           {
@@ -1061,7 +1144,7 @@ const FormEditor = () => {
                 )
               },
               step.id
-            ))
+            )) })
           }
         ),
         /* @__PURE__ */ jsx(

package/dist/_chunks/{HubspotFormInput-oMhm1UJm.js → HubspotFormInput-4ZMYXWM_.js}

@@ -5,7 +5,7 @@ const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-CodpLKZx.js");
+const index$1 = require("./index-ciliGv0E.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotFormInput-V5w4y1fb.mjs → HubspotFormInput-CPep55GL.mjs}

@@ -3,7 +3,7 @@ import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, Combobox, ComboboxOption } from "@strapi/design-system";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID, g as getTranslation } from "./index-7cL9PRh1.mjs";
+import { P as PLUGIN_ID, g as getTranslation } from "./index-gKM4jVf8.mjs";
 const HubspotFormInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const { formatMessage } = useIntl();

package/dist/_chunks/{HubspotObjectInput-Bmo6YQgs.js → HubspotObjectInput-BTqYXJIa.js}

@@ -4,9 +4,9 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
-const index$1 = require("./index-CodpLKZx.js");
-const objectLabels = require("./objectLabels-CSWGIgNb.js");
-const useHubspotSchema = require("./useHubspotSchema-DiRN3HrN.js");
+const index$1 = require("./index-ciliGv0E.js");
+const objectLabels = require("./objectLabels-BjYfdhRB.js");
+const useHubspotSchema = require("./useHubspotSchema-KKVppjC2.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotObjectInput-DhsnSguG.mjs → HubspotObjectInput-CQszIx1W.mjs}

@@ -2,9 +2,9 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, SingleSelect, SingleSelectOption } from "@strapi/design-system";
-import { g as getTranslation } from "./index-7cL9PRh1.mjs";
-import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-BsmQgJgx.mjs";
+import { g as getTranslation } from "./index-gKM4jVf8.mjs";
+import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-CE7tJgOM.mjs";
 const HubspotObjectInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const intl = useIntl();

package/dist/_chunks/{HubspotPropertyInput-luFfnxqy.js → HubspotPropertyInput-2MgIKlR_.js}

@@ -6,9 +6,9 @@ const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-CodpLKZx.js");
-const objectLabels = require("./objectLabels-CSWGIgNb.js");
-const useHubspotSchema = require("./useHubspotSchema-DiRN3HrN.js");
+const index$1 = require("./index-ciliGv0E.js");
+const objectLabels = require("./objectLabels-BjYfdhRB.js");
+const useHubspotSchema = require("./useHubspotSchema-KKVppjC2.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotPropertyInput-CrYP4pc0.mjs → HubspotPropertyInput-ClNph0f1.mjs}

@@ -4,9 +4,9 @@ import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, Combobox, ComboboxOption, IconButton, Button, Typography, Link } from "@strapi/design-system";
 import { ArrowClockwise } from "@strapi/icons";
 import { useField } from "@strapi/strapi/admin";
-import { g as getTranslation } from "./index-7cL9PRh1.mjs";
-import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-BsmQgJgx.mjs";
+import { g as getTranslation } from "./index-gKM4jVf8.mjs";
+import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-CE7tJgOM.mjs";
 const oneLine = {
   display: "block",
   whiteSpace: "nowrap",

package/dist/_chunks/{Settings-CjcWj9I6.mjs → Settings-CZ-qQSKT.mjs}

@@ -3,9 +3,9 @@ import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Flex, Divider, Typography, Button, Box, Link, Badge, Loader, Field, SingleSelect, SingleSelectOption, Checkbox } from "@strapi/design-system";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation, P as PLUGIN_ID } from "./index-7cL9PRh1.mjs";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-gKM4jVf8.mjs";
 import { Link as Link$1 } from "react-router-dom";
-import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
+import { o as objectLabel } from "./objectLabels-DQpSLUaJ.mjs";
 const AuditSection = ({ configured }) => {
   const intl = useIntl();
   const { formatMessage } = intl;

package/dist/_chunks/{Settings-B3A22i7Z.js → Settings-DhiHQC6U.js}

@@ -5,9 +5,9 @@ const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-CodpLKZx.js");
+const index$1 = require("./index-ciliGv0E.js");
 const reactRouterDom = require("react-router-dom");
-const objectLabels = require("./objectLabels-CSWGIgNb.js");
+const objectLabels = require("./objectLabels-BjYfdhRB.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{en-C7ls2EUl.js → en-CSgFmKmM.js}

@@ -297,6 +297,6 @@ const en = {
   "company.datum.nafLabel": "NAF label",
   "company.datum.headcount": "Headcount range",
   "editor.drag-step": "Drag to reorder the step",
-  "editor.drag-field": "Drag to reorder the field"
+  "editor.drag-field": "Drag to move the field, including to another step"
 };
 exports.default = en;

package/dist/_chunks/{en-D6GHgMOt.mjs → en-Dh3bMS6N.mjs}

@@ -295,7 +295,7 @@ const en = {
   "company.datum.nafLabel": "NAF label",
   "company.datum.headcount": "Headcount range",
   "editor.drag-step": "Drag to reorder the step",
-  "editor.drag-field": "Drag to reorder the field"
+  "editor.drag-field": "Drag to move the field, including to another step"
 };
 export {
   en as default

package/dist/_chunks/{fr-pOP8ZXqM.js → fr-D_EhZS0P.js}

@@ -297,6 +297,6 @@ const fr = {
   "company.datum.nafLabel": "Libellé NAF",
   "company.datum.headcount": "Tranche d'effectif",
   "editor.drag-step": "Glisser pour réordonner l'étape",
-  "editor.drag-field": "Glisser pour réordonner le champ"
+  "editor.drag-field": "Glisser pour déplacer le champ, y compris vers une autre étape"
 };
 exports.default = fr;

package/dist/_chunks/{fr-CfohMY8n.mjs → fr-aWOIOlS9.mjs}

@@ -295,7 +295,7 @@ const fr = {
   "company.datum.nafLabel": "Libellé NAF",
   "company.datum.headcount": "Tranche d'effectif",
   "editor.drag-step": "Glisser pour réordonner l'étape",
-  "editor.drag-field": "Glisser pour réordonner le champ"
+  "editor.drag-field": "Glisser pour déplacer le champ, y compris vers une autre étape"
 };
 export {
   fr as default

package/dist/_chunks/{index-CodpLKZx.js → index-ciliGv0E.js}

@@ -26,7 +26,7 @@ const index = {
       icon: icons.PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await Promise.resolve().then(() => require("./Forms-BW_zGc1P.js"))).default
+      Component: async () => (await Promise.resolve().then(() => require("./Forms-D0QXkYAN.js"))).default
     });
     app.customFields.register({
       name: "property",
@@ -41,7 +41,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-luFfnxqy.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-2MgIKlR_.js"))
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -104,7 +104,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-Bmo6YQgs.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-BTqYXJIa.js"))
       }
     });
     app.customFields.register({
@@ -120,7 +120,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-oMhm1UJm.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-4ZMYXWM_.js"))
       }
     });
     app.createSettingSection(
@@ -136,7 +136,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await Promise.resolve().then(() => require("./Settings-B3A22i7Z.js"))).default
+          Component: async () => (await Promise.resolve().then(() => require("./Settings-DhiHQC6U.js"))).default
         }
       ]
     );
@@ -146,7 +146,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-C7ls2EUl.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-pOP8ZXqM.js")) }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-CSgFmKmM.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-D_EhZS0P.js")) }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{index-7cL9PRh1.mjs → index-gKM4jVf8.mjs}

@@ -25,7 +25,7 @@ const index = {
       icon: PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await import("./Forms-6EoEYzAc.mjs")).default
+      Component: async () => (await import("./Forms-DEoZGrEt.mjs")).default
     });
     app.customFields.register({
       name: "property",
@@ -40,7 +40,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => import("./HubspotPropertyInput-CrYP4pc0.mjs")
+        Input: async () => import("./HubspotPropertyInput-ClNph0f1.mjs")
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -103,7 +103,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => import("./HubspotObjectInput-DhsnSguG.mjs")
+        Input: async () => import("./HubspotObjectInput-CQszIx1W.mjs")
       }
     });
     app.customFields.register({
@@ -119,7 +119,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => import("./HubspotFormInput-V5w4y1fb.mjs")
+        Input: async () => import("./HubspotFormInput-CPep55GL.mjs")
       }
     });
     app.createSettingSection(
@@ -135,7 +135,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await import("./Settings-CjcWj9I6.mjs")).default
+          Component: async () => (await import("./Settings-CZ-qQSKT.mjs")).default
         }
       ]
     );
@@ -145,7 +145,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-D6GHgMOt.mjs"), "./translations/fr.json": () => import("./fr-CfohMY8n.mjs") }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-Dh3bMS6N.mjs"), "./translations/fr.json": () => import("./fr-aWOIOlS9.mjs") }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{objectLabels-CSWGIgNb.js → objectLabels-BjYfdhRB.js}

@@ -1,5 +1,5 @@
 "use strict";
-const index = require("./index-CodpLKZx.js");
+const index = require("./index-ciliGv0E.js");
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{objectLabels-Dnj14fsp.mjs → objectLabels-DQpSLUaJ.mjs}

@@ -1,4 +1,4 @@
-import { g as getTranslation } from "./index-7cL9PRh1.mjs";
+import { g as getTranslation } from "./index-gKM4jVf8.mjs";
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{useHubspotSchema-BsmQgJgx.mjs → useHubspotSchema-CE7tJgOM.mjs}

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID } from "./index-7cL9PRh1.mjs";
+import { P as PLUGIN_ID } from "./index-gKM4jVf8.mjs";
 let cached = null;
 let inFlight = null;
 const listeners = /* @__PURE__ */ new Set();

package/dist/_chunks/{useHubspotSchema-DiRN3HrN.js → useHubspotSchema-KKVppjC2.js}

@@ -1,7 +1,7 @@
 "use strict";
 const React = require("react");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-CodpLKZx.js");
+const index = require("./index-ciliGv0E.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-CodpLKZx.js");
+const index = require("../_chunks/index-ciliGv0E.js");
 require("@strapi/icons");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-7cL9PRh1.mjs";
+import { i } from "../_chunks/index-gKM4jVf8.mjs";
 import "@strapi/icons";
 export {
   i as default

package/dist/admin/src/builder/Sortable.d.ts

@@ -1,25 +1,38 @@
 import * as React from "react";
-import { arrayMove } from "@dnd-kit/sortable";
-export { arrayMove };
+import { type DragEndEvent } from "@dnd-kit/core";
+import { arrayMove, relocateField } from "./relocateField";
+export { arrayMove, relocateField };
+export type { DragEndEvent };
 /** The drag-handle props to spread on the grip element. */
 export interface HandleProps {
     attributes: React.HTMLAttributes<HTMLElement>;
     listeners: Record<string, unknown> | undefined;
 }
-/**
- * One vertical sortable list. Each list gets its OWN DndContext: steps sort
- * among steps, a step's fields sort among themselves — no cross-container
- * ambiguity, and the arrow buttons keep covering cross-step moves (they also
- * stay the accessible path).
- */
-export declare function SortableList({ ids, onReorder, children, }: {
+export type SortableData = {
+    type: "step";
+} | {
+    type: "field";
+    stepId: string;
+} | {
+    type: "container";
+    stepId: string;
+};
+export declare function SortableBoard({ children, onDragEnd, }: {
+    children: React.ReactNode;
+    onDragEnd: (event: DragEndEvent) => void;
+}): React.JSX.Element;
+export declare function SortableGroup({ ids, children, }: {
     ids: string[];
-    /** Called with the reordered ids after a completed drag. */
-    onReorder: (ids: string[]) => void;
+    children: React.ReactNode;
+}): React.JSX.Element;
+/** Drop target for a step's field list — including when the list is empty. */
+export declare function SortableContainer({ stepId, children, }: {
+    stepId: string;
     children: React.ReactNode;
 }): React.JSX.Element;
 /** A sortable row: wraps the card, hands the grip props to its children. */
-export declare function SortableItem({ id, children, }: {
+export declare function SortableItem({ id, data, children, }: {
     id: string;
+    data?: SortableData;
     children: (handle: HandleProps) => React.ReactNode;
 }): React.JSX.Element;

package/dist/admin/src/builder/__tests__/relocateField.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/admin/src/builder/relocateField.d.ts

@@ -0,0 +1,14 @@
+import { arrayMove } from "@dnd-kit/sortable";
+export { arrayMove };
+/**
+ * Move `fieldId` onto `overId` across steps.
+ *
+ * `overId` is another field (insert at that index), a step id (append),
+ * or `container:${stepId}` (the empty-area droppable of that step).
+ */
+export declare function relocateField<S extends {
+    id: string;
+    fields: F[];
+}, F extends {
+    id: string;
+}>(steps: S[], fieldId: string, overId: string): S[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-hubspot",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "The form builder for HubSpot in Strapi — multi-step forms with conditional fields mapped to real CRM properties, a public submit pipeline with retries, and save-time mapping validation.",
   "keywords": [
     "strapi",