Merge pull request #644 from contember/fix/select

select fixes
contember · Dec 28, 2023 · a515c2d · a515c2d
2 parents 7d49770 + 93736b6
commit a515c2d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 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
@@ -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
@@ -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
@@ -41,6 +41,5 @@ export const useCommonReactSelectProps = <T>({
 			Input: SearchInput,
 		},
 		filterOption: () => true,
-		menuPosition: 'fixed',
 	}
 }
diff --git 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>

diff --git 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,
 	}