From c99a130fdce90fccecc80071409082d01e414d3a Mon Sep 17 00:00:00 2001
From: David Matejka <matej21@matej21.cz>
Date: Fri, 24 Nov 2023 13:50:35 +0100
Subject: [PATCH 1/3] fix(react-choice-field): do not send onMove when
 sortableBy is empty

---
 .../hooks/useDynamicMultipleChoiceWithConnectingEntityField.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-choice-field/src/hooks/useDynamicMultipleChoiceWithConnectingEntityField.ts b/packages/react-choice-field/src/hooks/useDynamicMultipleChoiceWithConnectingEntityField.ts
index 472bd0905e..5dedbde6be 100644
--- a/packages/react-choice-field/src/hooks/useDynamicMultipleChoiceWithConnectingEntityField.ts
+++ b/packages/react-choice-field/src/hooks/useDynamicMultipleChoiceWithConnectingEntityField.ts
@@ -69,7 +69,7 @@ export const useDynamicMultipleChoiceWithConnectingEntityField = (
 		onRemove: useCallback(value => {
 			optionIdToConnectingEntityMap.get(value.id)?.deleteEntity()
 		}, [optionIdToConnectingEntityMap]),
-		onMove: sortedConnectingEntities.moveEntity,
+		onMove: props.sortableBy ? sortedConnectingEntities.moveEntity : undefined,
 		onSearch,
 		isLoading,
 	}

From 4b4759c97d72b1ea872045935fe5ddd04cedde19 Mon Sep 17 00:00:00 2001
From: David Matejka <matej21@matej21.cz>
Date: Fri, 24 Nov 2023 13:51:17 +0100
Subject: [PATCH 2/3] fix(react-choice-field-ui): remove portal provider and
 fixed position, the scroll was broken

---
 .../src/components/rendering/MultiSelectFieldRenderer.tsx       | 2 +-
 .../src/components/rendering/SelectFieldRenderer.tsx            | 1 -
 .../src/hooks/useCommonReactSelectProps.ts                      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/react-choice-field-ui/src/components/rendering/MultiSelectFieldRenderer.tsx b/packages/react-choice-field-ui/src/components/rendering/MultiSelectFieldRenderer.tsx
index 45b6d6dc64..d32a8f8f43 100644
--- a/packages/react-choice-field-ui/src/components/rendering/MultiSelectFieldRenderer.tsx
+++ b/packages/react-choice-field-ui/src/components/rendering/MultiSelectFieldRenderer.tsx
@@ -140,7 +140,7 @@ export const MultiSelectFieldInner = memo(({
 							MultiValueLabel: SortableMultiValueLabel,
 						} as any}
 					/>
-					: <Select menuPortalTarget={portalProvider} {...allSelectProps} />
+					: <Select {...allSelectProps} />
 				}
 			</SelectCreateNewWrapper>
 		</FieldContainer>
diff --git a/packages/react-choice-field-ui/src/components/rendering/SelectFieldRenderer.tsx b/packages/react-choice-field-ui/src/components/rendering/SelectFieldRenderer.tsx
index 13b94b19b1..bdf1ecb6f4 100644
--- a/packages/react-choice-field-ui/src/components/rendering/SelectFieldRenderer.tsx
+++ b/packages/react-choice-field-ui/src/components/rendering/SelectFieldRenderer.tsx
@@ -98,7 +98,6 @@ export const SelectFieldInner = typedMemo(<T = unknown>({
 				<Select
 					{...selectProps}
 					menuPlacement="auto"
-					menuPortalTarget={usePortalProvider()}
 					isClearable={allowNull === true}
 					value={currentValue}
 					isLoading={isLoading}
diff --git a/packages/react-choice-field-ui/src/hooks/useCommonReactSelectProps.ts b/packages/react-choice-field-ui/src/hooks/useCommonReactSelectProps.ts
index 2b287a7c53..13898eabf4 100644
--- a/packages/react-choice-field-ui/src/hooks/useCommonReactSelectProps.ts
+++ b/packages/react-choice-field-ui/src/hooks/useCommonReactSelectProps.ts
@@ -41,6 +41,5 @@ export const useCommonReactSelectProps = <T>({
 			Input: SearchInput,
 		},
 		filterOption: () => true,
-		menuPosition: 'fixed',
 	}
 }

From 93736b6b65216dc509de77f38ce38c4c111ef3eb Mon Sep 17 00:00:00 2001
From: David Matejka <matej21@matej21.cz>
Date: Fri, 24 Nov 2023 13:51:51 +0100
Subject: [PATCH 3/3] fix(react-choice-field-ui): set tree root id in open
 create form dialog

---
 .../src/hooks/useOpenCreateNewDialog.tsx                   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/react-choice-field-ui/src/hooks/useOpenCreateNewDialog.tsx b/packages/react-choice-field-ui/src/hooks/useOpenCreateNewDialog.tsx
index f62c2292b4..78d726fd51 100644
--- a/packages/react-choice-field-ui/src/hooks/useOpenCreateNewDialog.tsx
+++ b/packages/react-choice-field-ui/src/hooks/useOpenCreateNewDialog.tsx
@@ -3,6 +3,7 @@ import {
 	Entity,
 	EntityAccessor,
 	EntitySubTree,
+	TreeRootIdProvider,
 	useAccessorTreeState,
 	useEnvironment,
 	useExtendTree,
@@ -60,7 +61,11 @@ export const useOpenCreateNewDialog = ({ createNewForm, connect, ...props }: Bas
 					content: contentProps => (
 						<Stack>
 							<AccessorTree state={accessorTreeState}>
-								<Entity accessor={entity}>{createNewForm}</Entity>
+								<TreeRootIdProvider treeRootId={treeRootId}>
+									<Entity accessor={entity}>
+										{createNewForm}
+									</Entity>
+								</TreeRootIdProvider>
 							</AccessorTree>
 							<Stack horizontal evenly>
 							</Stack>