From 29c013f826a0469c5fa90c41e1c6b940b67d19e4 Mon Sep 17 00:00:00 2001 From: Abhishek Thory <76877003+abhithory@users.noreply.github.com> Date: Tue, 10 Oct 2023 02:07:26 +0530 Subject: [PATCH] 1584/fix/dropdown item width not correct (#1950) * added full width to new button * removed scrollbar width in dropdown item * Fix dropdown width issue * Fix lint --------- Co-authored-by: Charles Bochet --- .../components/CompanyProgressPicker.tsx | 6 +- .../modules/people/components/PeopleCard.tsx | 8 +-- .../components/MatchColumnSelect.tsx | 6 +- .../components/BoardColumnEditTitleMenu.tsx | 6 +- .../ui/board/components/BoardColumnMenu.tsx | 6 +- .../BoardOptionsDropdownContent.tsx | 10 ++-- .../context-menu/components/ContextMenu.tsx | 6 +- .../DataTableColumnDropdownMenu.tsx | 6 +- .../components/DataTableHeaderPlusButton.tsx | 6 +- .../TableOptionsDropdownContent.tsx | 6 +- .../components/DropdownMenuItemsContainer.tsx | 55 +++++++++++++++++++ .../StyledDropdownMenuItemsContainer.tsx | 20 ------- .../__stories__/DropdownMenu.stories.tsx | 26 ++++----- .../ui/input/components/IconPicker.tsx | 4 +- .../components/MultipleEntitySelect.tsx | 6 +- .../components/SingleEntitySelectBase.tsx | 14 ++--- .../components/ShowPageAddButton.tsx | 8 +-- .../components/StyledMenuItemBase.tsx | 3 +- .../components/FilterDropdownFilterSelect.tsx | 6 +- .../FilterDropdownOperandSelect.tsx | 6 +- .../components/SortDropdownButton.tsx | 10 ++-- .../components/UpdateViewButtonGroup.tsx | 6 +- .../ViewFieldsVisibilityDropdownSection.tsx | 6 +- .../components/ViewsDropdownButton.tsx | 10 ++-- 24 files changed, 137 insertions(+), 109 deletions(-) create mode 100644 front/src/modules/ui/dropdown/components/DropdownMenuItemsContainer.tsx delete mode 100644 front/src/modules/ui/dropdown/components/StyledDropdownMenuItemsContainer.tsx diff --git a/front/src/modules/companies/components/CompanyProgressPicker.tsx b/front/src/modules/companies/components/CompanyProgressPicker.tsx index 4ec9c9a3b..4264fa15a 100644 --- a/front/src/modules/companies/components/CompanyProgressPicker.tsx +++ b/front/src/modules/companies/components/CompanyProgressPicker.tsx @@ -3,9 +3,9 @@ import { useRecoilState } from 'recoil'; import { currentPipelineState } from '@/pipeline/states/currentPipelineState'; import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { IconChevronDown } from '@/ui/icon'; import { SingleEntitySelectBase } from '@/ui/input/relation-picker/components/SingleEntitySelectBase'; @@ -84,7 +84,7 @@ export const CompanyProgressPicker = ({ data-testid={`company-progress-dropdown-menu`} > {isProgressSelectionUnfolded ? ( - + {currentPipelineStages.map((pipelineStage, index) => ( ))} - + ) : ( <> - e.stopPropagation()} - > + - + )} diff --git a/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx b/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx index 4ef0119d7..18bf6f629 100644 --- a/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx +++ b/front/src/modules/spreadsheet-import/components/MatchColumnSelect.tsx @@ -13,9 +13,9 @@ import debounce from 'lodash.debounce'; import { ReadonlyDeep } from 'type-fest'; import { SelectOption } from '@/spreadsheet-import/types'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; import { MenuItemSelect } from '@/ui/menu-item/components/MenuItemSelect'; @@ -127,7 +127,7 @@ export const MatchColumnSelect = ({ autoFocus /> - + {options?.map((option) => ( <> ))} {options?.length === 0 && } - + , document.body, diff --git a/front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx b/front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx index c62040ede..f7696ad4e 100644 --- a/front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx +++ b/front/src/modules/ui/board/components/BoardColumnEditTitleMenu.tsx @@ -2,7 +2,7 @@ import { ChangeEvent, useCallback, useState } from 'react'; import styled from '@emotion/styled'; import { useRecoilState } from 'recoil'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { IconTrash } from '@/ui/icon'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; @@ -114,7 +114,7 @@ export const BoardColumnEditTitleMenu = ({ }, [onClose, onDelete, setBoardColumns, stageId]); return ( - + - + ); }; diff --git a/front/src/modules/ui/board/components/BoardColumnMenu.tsx b/front/src/modules/ui/board/components/BoardColumnMenu.tsx index 524a00a1c..495b5ce13 100644 --- a/front/src/modules/ui/board/components/BoardColumnMenu.tsx +++ b/front/src/modules/ui/board/components/BoardColumnMenu.tsx @@ -4,8 +4,8 @@ import { Key } from 'ts-key-enum'; import { useCreateCompanyProgress } from '@/companies/hooks/useCreateCompanyProgress'; import { useFilteredSearchCompanyQuery } from '@/companies/hooks/useFilteredSearchCompanyQuery'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { IconArrowLeft, IconArrowRight, IconPencil, IconPlus } from '@/ui/icon'; import { SingleEntitySelect } from '@/ui/input/relation-picker/components/SingleEntitySelect'; import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picker/states/relationPickerSearchFilterScopedState'; @@ -135,7 +135,7 @@ export const BoardColumnMenu = ({ {currentMenu === 'actions' && ( - + setMenu('title')} LeftIcon={IconPencil} @@ -156,7 +156,7 @@ export const BoardColumnMenu = ({ LeftIcon={IconPlus} text="New opportunity" /> - + )} {currentMenu === 'title' && ( - + handleMenuNavigate('fields')} LeftIcon={IconTag} @@ -202,7 +202,7 @@ export const BoardOptionsDropdownContent = ({ LeftIcon={IconLayoutKanban} text="Stages" /> - + )} {currentMenu === 'stages' && ( @@ -211,13 +211,13 @@ export const BoardOptionsDropdownContent = ({ Stages - + setCurrentMenu('stage-creation')} LeftIcon={IconPlus} text="Add stage" /> - + )} {currentMenu === 'stage-creation' && ( diff --git a/front/src/modules/ui/context-menu/components/ContextMenu.tsx b/front/src/modules/ui/context-menu/components/ContextMenu.tsx index e96958a3c..d4807687b 100644 --- a/front/src/modules/ui/context-menu/components/ContextMenu.tsx +++ b/front/src/modules/ui/context-menu/components/ContextMenu.tsx @@ -4,8 +4,8 @@ import { useRecoilValue, useSetRecoilState } from 'recoil'; import { actionBarOpenState } from '@/ui/action-bar/states/actionBarIsOpenState'; import { contextMenuPositionState } from '@/ui/context-menu/states/contextMenuPositionState'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { contextMenuEntriesState } from '../states/contextMenuEntriesState'; @@ -74,7 +74,7 @@ export const ContextMenu = ({ selectedIds }: ContextMenuProps) => { position={contextMenuPosition} > - + {contextMenuEntries.map((item) => ( { key={item.label} /> ))} - + ); diff --git a/front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx b/front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx index 812730dcb..215d83f4d 100644 --- a/front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx +++ b/front/src/modules/ui/data-table/components/DataTableColumnDropdownMenu.tsx @@ -1,5 +1,5 @@ +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; import { IconArrowLeft, IconArrowRight, IconEyeOff } from '@/ui/icon'; @@ -53,7 +53,7 @@ export const DataTableColumnDropdownMenu = ({ <> ) : ( - + {!isFirstColumn && ( - + ); }; diff --git a/front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx b/front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx index 804c7a610..fd090356d 100644 --- a/front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx +++ b/front/src/modules/ui/data-table/components/DataTableHeaderPlusButton.tsx @@ -1,8 +1,8 @@ import { ComponentProps, useCallback, useRef } from 'react'; import styled from '@emotion/styled'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { FieldMetadata } from '@/ui/field/types/FieldMetadata'; import { IconPlus } from '@/ui/icon'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; @@ -53,7 +53,7 @@ export const DataTableHeaderPlusButton = ({ return ( // eslint-disable-next-line twenty/no-spread-props - + {hiddenTableColumns.map((column) => ( ))} - + ); }; diff --git a/front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx b/front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx index 5479edb28..7f7e4ebf8 100644 --- a/front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx +++ b/front/src/modules/ui/data-table/options/components/TableOptionsDropdownContent.tsx @@ -6,8 +6,8 @@ import { Key } from 'ts-key-enum'; import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; import { DropdownMenuInput } from '@/ui/dropdown/components/DropdownMenuInput'; import { DropdownMenuInputContainer } from '@/ui/dropdown/components/DropdownMenuInputContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; import { IconChevronLeft, IconFileImport, IconTag } from '@/ui/icon'; @@ -153,7 +153,7 @@ export const TableOptionsDropdownContent = () => { /> - + handleSelectMenu('fields')} LeftIcon={IconTag} @@ -166,7 +166,7 @@ export const TableOptionsDropdownContent = () => { text="Import" /> )} - + )} {currentMenu === 'fields' && ( diff --git a/front/src/modules/ui/dropdown/components/DropdownMenuItemsContainer.tsx b/front/src/modules/ui/dropdown/components/DropdownMenuItemsContainer.tsx new file mode 100644 index 000000000..43da12e60 --- /dev/null +++ b/front/src/modules/ui/dropdown/components/DropdownMenuItemsContainer.tsx @@ -0,0 +1,55 @@ +import styled from '@emotion/styled'; + +import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper'; + +const StyledDropdownMenuItemsExternalContainer = styled.div<{ + hasMaxHeight?: boolean; +}>` + --padding: ${({ theme }) => theme.spacing(1)}; + + align-items: flex-start; + display: flex; + + flex-direction: column; + gap: 2px; + height: 100%; + max-height: ${({ hasMaxHeight }) => (hasMaxHeight ? '180px' : 'none')}; + overflow-y: auto; + + padding: var(--padding); + padding-right: 0; + + width: calc(100% - 1 * var(--padding)); +`; + +const StyledScrollWrapper = styled(ScrollWrapper)` + width: 100%; +`; + +const StyledDropdownMenuItemsInternalContainer = styled.div` + align-items: flex-start; + display: flex; + + flex-direction: column; + gap: 2px; + height: 100%; + width: 100%; +`; + +export const DropdownMenuItemsContainer = ({ + children, + hasMaxHeight, +}: { + children: React.ReactNode; + hasMaxHeight?: boolean; +}) => { + return ( + + + + {children} + + + + ); +}; diff --git a/front/src/modules/ui/dropdown/components/StyledDropdownMenuItemsContainer.tsx b/front/src/modules/ui/dropdown/components/StyledDropdownMenuItemsContainer.tsx deleted file mode 100644 index 9bc9b6e7c..000000000 --- a/front/src/modules/ui/dropdown/components/StyledDropdownMenuItemsContainer.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import styled from '@emotion/styled'; - -export const StyledDropdownMenuItemsContainer = styled.div<{ - hasMaxHeight?: boolean; -}>` - --padding: ${({ theme }) => theme.spacing(1)}; - - align-items: flex-start; - display: flex; - - flex-direction: column; - gap: 2px; - height: 100%; - max-height: ${({ hasMaxHeight }) => (hasMaxHeight ? '180px' : 'none')}; - overflow-y: auto; - - padding: var(--padding); - padding-right: var(--padding); - width: calc(100% - 2 * var(--padding)); -`; diff --git a/front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx b/front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx index 70e7757aa..9a7a86cd5 100644 --- a/front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx +++ b/front/src/modules/ui/dropdown/components/__stories__/DropdownMenu.stories.tsx @@ -12,9 +12,9 @@ import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; import { DropdownMenuHeader } from '../DropdownMenuHeader'; import { DropdownMenuInput } from '../DropdownMenuInput'; import { DropdownMenuInputContainer } from '../DropdownMenuInputContainer'; +import { DropdownMenuItemsContainer } from '../DropdownMenuItemsContainer'; import { DropdownMenuSearchInput } from '../DropdownMenuSearchInput'; import { StyledDropdownMenu } from '../StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '../StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '../StyledDropdownMenuSeparator'; import { StyledDropdownMenuSubheader } from '../StyledDropdownMenuSubheader'; @@ -179,18 +179,18 @@ export const WithHeaders: Story = { Header Subheader 1 - + {mockSelectArray.slice(0, 3).map(({ name }) => ( ))} - + Subheader 2 - + {mockSelectArray.slice(3).map(({ name }) => ( ))} - + ), }, @@ -203,9 +203,9 @@ export const SearchWithLoadingMenu: Story = { <> - + - + ), }, @@ -220,11 +220,11 @@ export const WithInput: Story = { - + {mockSelectArray.map(({ name }) => ( ))} - + ), }, @@ -234,9 +234,9 @@ export const SelectableMenuItemWithAvatar: Story = { decorators: [WithContentBelowDecorator], args: { children: ( - + - + ), }, }; @@ -245,9 +245,9 @@ export const CheckableMenuItemWithAvatar: Story = { decorators: [WithContentBelowDecorator], args: { children: ( - + - + ), }, }; diff --git a/front/src/modules/ui/input/components/IconPicker.tsx b/front/src/modules/ui/input/components/IconPicker.tsx index 9f0710bb0..860739bd0 100644 --- a/front/src/modules/ui/input/components/IconPicker.tsx +++ b/front/src/modules/ui/input/components/IconPicker.tsx @@ -2,9 +2,9 @@ import { useEffect, useMemo, useState } from 'react'; import styled from '@emotion/styled'; import { LightIconButton } from '@/ui/button/components/LightIconButton'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { IconComponent } from '@/ui/icon/types/IconComponent'; @@ -19,7 +19,7 @@ const StyledIconPickerDropdownMenu = styled(StyledDropdownMenu)` width: 176px; `; -const StyledMenuIconItemsContainer = styled(StyledDropdownMenuItemsContainer)` +const StyledMenuIconItemsContainer = styled(DropdownMenuItemsContainer)` flex-direction: row; flex-wrap: wrap; height: auto; 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 a42251925..4edc10c19 100644 --- a/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx +++ b/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx @@ -1,9 +1,9 @@ import { useRef } from 'react'; import debounce from 'lodash.debounce'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { DropdownMenuSearchInput } from '@/ui/dropdown/components/DropdownMenuSearchInput'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; import { MenuItemMultiSelectAvatar } from '@/ui/menu-item/components/MenuItemMultiSelectAvatar'; @@ -79,7 +79,7 @@ export const MultipleEntitySelect = < autoFocus /> - + {entitiesInDropdown?.map((entity) => ( ))} {entitiesInDropdown?.length === 0 && } - + ); }; diff --git a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx index fc659d972..5079ef1e4 100644 --- a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx +++ b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx @@ -1,7 +1,7 @@ import { useRef } from 'react'; import { Key } from 'ts-key-enum'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { IconPlus } from '@/ui/icon'; import { IconComponent } from '@/ui/icon/types/IconComponent'; @@ -102,8 +102,8 @@ export const SingleEntitySelectBase = < ); return ( - <> - +
+ {loading ? ( ) : entitiesInDropdown.length === 0 && !isAllEntitySelectShown ? ( @@ -151,10 +151,10 @@ export const SingleEntitySelectBase = < ))} )} - + {showCreateButton && ( <> - + - + )} - +
); }; diff --git a/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx b/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx index 63505ce0c..3ab821f94 100644 --- a/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx +++ b/front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx @@ -4,8 +4,8 @@ import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateAct import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity'; import { PageHotkeyScope } from '@/types/PageHotkeyScope'; import { IconButton } from '@/ui/button/components/IconButton'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; import { IconCheckbox, IconNotes, IconPlus } from '@/ui/icon/index'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; @@ -47,9 +47,7 @@ export const ShowPageAddButton = ({ } dropdownComponents={ - e.stopPropagation()} - > + handleSelect(ActivityType.Note)} accent="default" @@ -62,7 +60,7 @@ export const ShowPageAddButton = ({ LeftIcon={IconCheckbox} text="Task" /> - + } dropdownHotkeyScope={{ diff --git a/front/src/modules/ui/menu-item/internals/components/StyledMenuItemBase.tsx b/front/src/modules/ui/menu-item/internals/components/StyledMenuItemBase.tsx index f897a5c64..1d9729d3d 100644 --- a/front/src/modules/ui/menu-item/internals/components/StyledMenuItemBase.tsx +++ b/front/src/modules/ui/menu-item/internals/components/StyledMenuItemBase.tsx @@ -28,6 +28,7 @@ export const StyledMenuItemBase = styled.li` height: calc(32px - 2 * var(--vertical-padding)); justify-content: space-between; + padding: var(--vertical-padding) var(--horizontal-padding); ${hoverBackground}; @@ -55,9 +56,7 @@ export const StyledMenuItemBase = styled.li` } }} - padding: var(--vertical-padding) var(--horizontal-padding); position: relative; - user-select: none; width: calc(100% - 2 * var(--horizontal-padding)); diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx b/front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx index 2dfb9f42a..4463fbc8e 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx +++ b/front/src/modules/ui/view-bar/components/FilterDropdownFilterSelect.tsx @@ -1,4 +1,4 @@ -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope'; @@ -38,7 +38,7 @@ export const FilterDropdownFilterSelect = () => { const setHotkeyScope = useSetHotkeyScope(); return ( - + {availableFilters.map((availableFilter, index) => ( { text={availableFilter.label} /> ))} - + ); }; diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx b/front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx index 81aa19477..fc375b184 100644 --- a/front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx +++ b/front/src/modules/ui/view-bar/components/FilterDropdownOperandSelect.tsx @@ -1,4 +1,4 @@ -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; @@ -61,7 +61,7 @@ export const FilterDropdownOperandSelect = () => { } return ( - + {operandsForFilterType.map((filterOperand, index) => ( { text={getOperandLabel(filterOperand)} /> ))} - + ); }; diff --git a/front/src/modules/ui/view-bar/components/SortDropdownButton.tsx b/front/src/modules/ui/view-bar/components/SortDropdownButton.tsx index ecde95e1c..0a92b0e16 100644 --- a/front/src/modules/ui/view-bar/components/SortDropdownButton.tsx +++ b/front/src/modules/ui/view-bar/components/SortDropdownButton.tsx @@ -3,8 +3,8 @@ import { produce } from 'immer'; import { LightButton } from '@/ui/button/components/LightButton'; import { DropdownMenuHeader } from '@/ui/dropdown/components/DropdownMenuHeader'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenu } from '@/ui/dropdown/components/StyledDropdownMenu'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; import { StyledDropdownMenuSeparator } from '@/ui/dropdown/components/StyledDropdownMenuSeparator'; import { useDropdown } from '@/ui/dropdown/hooks/useDropdown'; import { IconChevronDown } from '@/ui/icon'; @@ -104,7 +104,7 @@ export const SortDropdownButton = ({ dropdownComponents={ {isSortDirectionMenuUnfolded ? ( - + {SORT_DIRECTIONS.map((sortOrder, index) => ( ))} - + ) : ( <> - + {availableSorts.map((availableSort, index) => ( ))} - + )} diff --git a/front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx b/front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx index 0b6e06bbf..7bb27a506 100644 --- a/front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx +++ b/front/src/modules/ui/view-bar/components/UpdateViewButtonGroup.tsx @@ -6,7 +6,7 @@ import { Key } from 'ts-key-enum'; import { Button } from '@/ui/button/components/Button'; import { ButtonGroup } from '@/ui/button/components/ButtonGroup'; import { DropdownMenuContainer } from '@/ui/dropdown/components/DropdownMenuContainer'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { IconChevronDown, IconPlus } from '@/ui/icon'; import { MenuItem } from '@/ui/menu-item/components/MenuItem'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; @@ -127,13 +127,13 @@ export const UpdateViewButtonGroup = ({ {isDropdownOpen && ( - + - + )} diff --git a/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx b/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx index 83ff28ea5..f3e8e2d7c 100644 --- a/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx +++ b/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx @@ -8,7 +8,7 @@ import { import { DraggableItem } from '@/ui/draggable-list/components/DraggableItem'; import { DraggableList } from '@/ui/draggable-list/components/DraggableList'; -import { StyledDropdownMenuItemsContainer } from '@/ui/dropdown/components/StyledDropdownMenuItemsContainer'; +import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMenuItemsContainer'; import { StyledDropdownMenuSubheader } from '@/ui/dropdown/components/StyledDropdownMenuSubheader'; import { IconMinus, IconPlus } from '@/ui/icon'; import { IconInfoCircle } from '@/ui/input/constants/icons'; @@ -82,7 +82,7 @@ export const ViewFieldsVisibilityDropdownSection = ({ return (
{title} - + {isDraggable ? ( )) )} - + {isDefined(openToolTipIndex) && createPortal( theme.font.weight.regular}; `; @@ -177,7 +175,7 @@ export const ViewsDropdownButton = ({ } dropdownComponents={ - + {views.map((view) => ( ))} - +