diff --git a/front/src/modules/people/components/PeopleCard.tsx b/front/src/modules/people/components/PeopleCard.tsx index dbe225f4e..6f25f26e4 100644 --- a/front/src/modules/people/components/PeopleCard.tsx +++ b/front/src/modules/people/components/PeopleCard.tsx @@ -164,7 +164,11 @@ export const PeopleCard = ({ Icon={IconDotsVertical} /> {isOptionsOpen && ( - + e.stopPropagation()} > diff --git a/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx b/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx index 12ba89e10..541b6b7b1 100644 --- a/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx +++ b/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx @@ -117,6 +117,7 @@ export const MatchColumnSelect = ({ createPortal( diff --git a/front/src/modules/ui/action-bar/components/ActionBar.tsx b/front/src/modules/ui/action-bar/components/ActionBar.tsx index 21f9101e1..3ab70228f 100644 --- a/front/src/modules/ui/action-bar/components/ActionBar.tsx +++ b/front/src/modules/ui/action-bar/components/ActionBar.tsx @@ -43,7 +43,11 @@ export const ActionBar = ({ selectedIds }: OwnProps) => { return null; } return ( - + {actionBarEntries.map((item) => ( - + {currentMenu === 'actions' && ( { ref={wrapperRef} position={contextMenuPosition} > - + {contextMenuEntries.map((item) => ( {buttonComponents} )} {isDropdownButtonOpen && ( -
+
{dropdownComponents}
)} diff --git a/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx b/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx index 00fddc91b..a42251925 100644 --- a/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx +++ b/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx @@ -72,7 +72,7 @@ export const MultipleEntitySelect = < }); return ( - + { const tableBodyRef = useRef(null); - const isDraggingAndSelecting = useRecoilValue(isDraggingAndSelectingState); const setRowSelectedState = useSetRowSelectedState(); const resetTableRowSelection = useResetTableRowSelection(); @@ -135,13 +132,11 @@ export const EntityTable = ({ updateEntityMutation }: OwnProps) => {
- {isDraggingAndSelecting && ( - - )} + diff --git a/front/src/modules/ui/table/options/components/TableOptionsDropdown.tsx b/front/src/modules/ui/table/options/components/TableOptionsDropdown.tsx index c0420dc5b..35bb7a9fa 100644 --- a/front/src/modules/ui/table/options/components/TableOptionsDropdown.tsx +++ b/front/src/modules/ui/table/options/components/TableOptionsDropdown.tsx @@ -1,11 +1,10 @@ -import { useRecoilState, useResetRecoilState } from 'recoil'; +import { useResetRecoilState } from 'recoil'; import { DropdownButton } from '@/ui/dropdown/components/DropdownButton'; import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { viewEditModeState } from '@/ui/view-bar/states/viewEditModeState'; import { TableOptionsDropdownId } from '../../constants/TableOptionsDropdownId'; -import { isDraggingAndSelectingState } from '../../states/isDraggingAndSelectingState'; import { TableOptionsDropdownButton } from './TableOptionsDropdownButton'; import { TableOptionsDropdownContent } from './TableOptionsDropdownContent'; @@ -19,14 +18,6 @@ export const TableOptionsDropdown = ({ }: TableOptionsDropdownProps) => { const resetViewEditMode = useResetRecoilState(viewEditModeState); - const [, setIsDraggingAndSelecting] = useRecoilState( - isDraggingAndSelectingState, - ); - - const handleClose = () => setIsDraggingAndSelecting(true); - - const handleOpen = () => setIsDraggingAndSelecting(false); - return ( } @@ -34,8 +25,6 @@ export const TableOptionsDropdown = ({ dropdownId={TableOptionsDropdownId} dropdownComponents={} onClickOutside={resetViewEditMode} - onClose={handleClose} - onOpen={handleOpen} /> ); }; diff --git a/front/src/modules/ui/table/states/isDraggingAndSelectingState.ts b/front/src/modules/ui/table/states/isDraggingAndSelectingState.ts deleted file mode 100644 index f3677fa38..000000000 --- a/front/src/modules/ui/table/states/isDraggingAndSelectingState.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { atom } from 'recoil'; - -export const isDraggingAndSelectingState = atom({ - key: 'isDraggingAndSelectingState', - default: true, -}); diff --git a/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx b/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx index 544d1950c..185ce624d 100644 --- a/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx +++ b/front/src/modules/ui/view-bar/components/SingleEntityFilterDropdownButton.tsx @@ -94,7 +94,7 @@ export const SingleEntityFilterDropdownButton = ({ }; return ( - + handleIsUnfoldedChange(!isFilterDropdownUnfolded)}