twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-11-22 21:50:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Default View Font Color and Reordering (#7940)

Browse Source 
This PR fixes issue #6114 
I removed the separate check for default item and add it into the
draggable list.
This commit is contained in:
Ngan Phan 2024-10-23 06:44:17 -07:00 committed by GitHub
parent 5b6487979c
commit 45b3992784
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
View File

@ -60,8 +60,6 @@ export const ViewPickerListContent = () => {
const { getIcon } = useIcons();
const indexView = viewsOnCurrentObject.find((view) => view.key === 'INDEX');
const handleDragEnd = useCallback(
(result: DropResult) => {
if (!result.destination) return;
@ -81,33 +79,29 @@ export const ViewPickerListContent = () => {
return (
<>
<DropdownMenuItemsContainer>
{indexView && (
<MenuItemDraggable
key={indexView.id}
iconButtons={[
{
Icon: IconLock,
},
].filter(isDefined)}
isIconDisplayedOnHoverOnly={false}
onClick={() => handleViewSelect(indexView.id)}
LeftIcon={getIcon(indexView.icon)}
text={indexView.name}
accent="placeholder"
isDragDisabled
/>
)}
<DraggableList
onDragEnd={handleDragEnd}
draggableItems={viewsOnCurrentObject
.filter((view) => indexView?.id !== view.id)
.map((view, index) => (
<DraggableItem
key={view.id}
draggableId={view.id}
index={index}
isDragDisabled={viewsOnCurrentObject.length === 1}
itemComponent={
draggableItems={viewsOnCurrentObject.map((view, index) => (
<DraggableItem
key={view.id}
draggableId={view.id}
index={index}
isDragDisabled={viewsOnCurrentObject.length === 1}
itemComponent={
view.key === 'INDEX' ? (
<MenuItemDraggable
key={view.id}
iconButtons={[
{
Icon: IconLock,
},
].filter(isDefined)}
isIconDisplayedOnHoverOnly={false}
onClick={() => handleViewSelect(view.id)}
LeftIcon={getIcon(view.icon)}
text={view.name}
/>
) : (
<MenuItemDraggable
key={view.id}
iconButtons={[
@ -117,16 +111,15 @@ export const ViewPickerListContent = () => {
handleEditViewButtonClick(event, view.id),
},
].filter(isDefined)}
isIconDisplayedOnHoverOnly={
indexView?.id === view.id ? false : true
}
isIconDisplayedOnHoverOnly={true}
onClick={() => handleViewSelect(view.id)}
LeftIcon={getIcon(view.icon)}
text={view.name}
/>
}
/>
))}
)
}
/>
))}
/>
</DropdownMenuItemsContainer>
<DropdownMenuSeparator />