admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Icon Lazy Loading (#2984)

Browse Source 
Fix Icon picker
This commit is contained in:
Charles Bochet
2023-12-14 12:13:02 +01:00
committed by GitHub
parent ed2cd408bf
commit 8916dee352
33 changed files with 4366 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
View File

@ -1,5 +1,5 @@
import { getOperandLabelShort } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
import { useIcons } from '@/ui/display/icon/hooks/useIcons';
import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
import { ViewFilter } from '@/views/types/ViewFilter';
@ -12,7 +12,7 @@ export const EditableFilterChip = ({
viewFilter,
onRemove,
}: EditableFilterChipProps) => {
const { icons } = useLazyLoadIcons();
const { getIcon } = useIcons();
return (
<SortOrFilterChip
key={viewFilter.fieldMetadataId}
@ -21,7 +21,7 @@ export const EditableFilterChip = ({
labelValue={`${getOperandLabelShort(viewFilter.operand)} ${
viewFilter.displayValue
}`}
Icon={icons[viewFilter.definition.iconName]}
Icon={getIcon(viewFilter.definition.iconName)}
onRemove={onRemove}
/>
);

10
packages/twenty-front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
View File

@ -9,9 +9,9 @@ import {
import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { IconMinus, IconPlus } from '@/ui/display/icon';
import { IconInfoCircle } from '@/ui/display/icon';
import { useIcons } from '@/ui/display/icon/hooks/useIcons';
import { AppTooltip } from '@/ui/display/tooltip/AppTooltip';
import { IconInfoCircle } from '@/ui/input/constants/icons';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@ -51,7 +51,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
else setOpenToolTipIndex(index);
};
const { icons } = useLazyLoadIcons();
const { getIcon } = useIcons();
const getIconButtons = (
index: number,
@ -108,7 +108,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
itemComponent={
<MenuItemDraggable
key={field.fieldMetadataId}
LeftIcon={icons[field.iconName]}
LeftIcon={getIcon(field.iconName)}
iconButtons={getIconButtons(index + 1, field)}
isTooltipOpen={openToolTipIndex === index + 1}
text={field.label}
@ -126,7 +126,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
fields.map((field, index) => (
<MenuItem
key={field.fieldMetadataId}
LeftIcon={icons[field.iconName]}
LeftIcon={getIcon(field.iconName)}
iconButtons={getIconButtons(index, field)}
isTooltipOpen={openToolTipIndex === index}
text={field.label}