From 3c8fd871aa788f918f6bd879c153929b4c63e7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rge=20N=C3=A6ss?= <bjoerge@gmail.com>
Date: Fri, 16 Dec 2022 13:38:41 +0100
Subject: [PATCH] fix(form): set sorting strategy for list axis

---
 .../List/ListArrayInput.tsx                   |  1 +
 .../core/form/inputs/arrays/common/list.tsx   | 28 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/sanity/src/core/form/inputs/arrays/ArrayOfObjectsInput/List/ListArrayInput.tsx b/packages/sanity/src/core/form/inputs/arrays/ArrayOfObjectsInput/List/ListArrayInput.tsx
index c1def187c73..204ab3f8b7b 100644
--- a/packages/sanity/src/core/form/inputs/arrays/ArrayOfObjectsInput/List/ListArrayInput.tsx
+++ b/packages/sanity/src/core/form/inputs/arrays/ArrayOfObjectsInput/List/ListArrayInput.tsx
@@ -66,6 +66,7 @@ export function ListArrayInput<Item extends ObjectItem>(props: ArrayOfObjectsInp
           ) : (
             <Card border radius={1}>
               <List
+                axis="y"
                 gap={1}
                 paddingY={1}
                 items={memberKeys}
diff --git a/packages/sanity/src/core/form/inputs/arrays/common/list.tsx b/packages/sanity/src/core/form/inputs/arrays/common/list.tsx
index a92a30552e3..bfd1e6f8229 100644
--- a/packages/sanity/src/core/form/inputs/arrays/common/list.tsx
+++ b/packages/sanity/src/core/form/inputs/arrays/common/list.tsx
@@ -10,7 +10,13 @@ import {
   useSensor,
   useSensors,
 } from '@dnd-kit/core'
-import {SortableContext, sortableKeyboardCoordinates, useSortable} from '@dnd-kit/sortable'
+import {
+  horizontalListSortingStrategy,
+  SortableContext,
+  sortableKeyboardCoordinates,
+  useSortable,
+  verticalListSortingStrategy,
+} from '@dnd-kit/sortable'
 import {CSS} from '@dnd-kit/utilities'
 import {restrictToHorizontalAxis, restrictToVerticalAxis} from '@dnd-kit/modifiers'
 import {SortableItemIdContext} from './DragHandle'
@@ -43,12 +49,17 @@ const TRANSITION = {
   easing: 'linear',
 }
 
-function restrictToAxis(axis: 'x' | 'y') {
+type Axis = 'x' | 'y'
+
+function restrictToAxis(axis: Axis) {
   return axis === 'x' ? restrictToHorizontalAxis : restrictToVerticalAxis
 }
+function sortingStrategy(axis: Axis) {
+  return axis === 'x' ? horizontalListSortingStrategy : verticalListSortingStrategy
+}
 
 function SortableList(props: ListProps) {
-  const {items, lockAxis, onItemMove, children, ...rest} = props
+  const {items, axis, onItemMove, children, ...rest} = props
 
   const sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, SENSOR_OPTIONS))
 
@@ -66,11 +77,8 @@ function SortableList(props: ListProps) {
     [items, onItemMove]
   )
   const modifiers = useMemo(
-    () => [
-      restrictToParentElementWithMargins({y: 4}),
-      ...(lockAxis ? [restrictToAxis(lockAxis)] : []),
-    ],
-    [lockAxis]
+    () => [restrictToParentElementWithMargins({y: 4}), ...(axis ? [restrictToAxis(axis)] : [])],
+    [axis]
   )
 
   return (
@@ -81,7 +89,7 @@ function SortableList(props: ListProps) {
       collisionDetection={closestCenter}
       onDragEnd={handleDragEnd}
     >
-      <SortableContext items={items}>
+      <SortableContext items={items} strategy={axis ? sortingStrategy(axis) : undefined}>
         <Grid {...rest}>{children}</Grid>
       </SortableContext>
     </DndContext>
@@ -120,7 +128,7 @@ function SortableListItem(props: ItemProps) {
 
 interface ListProps extends ComponentProps<typeof Grid> {
   sortable?: boolean
-  lockAxis?: 'x' | 'y'
+  axis?: Axis
   items: string[]
   onItemMove?: (event: {fromIndex: number; toIndex: number}) => void
   children?: React.ReactNode