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

Fixed button icon bug (#5670)

Browse Source 
There was a bug with the isEmpty variable actually being a function from
lodash instead of the result of `isFieldEmpty()`.
This commit is contained in:
Lucas Bordeau
2024-05-29 21:29:33 +02:00
committed by GitHub
parent 008813f194
commit bcb582ffa0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
View File

@ -1,5 +1,4 @@
import { ReactElement, useContext, useEffect, useRef } from 'react'; import { ReactElement, useContext, useEffect, useRef } from 'react';
import isEmpty from 'lodash.isempty';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { Key } from 'ts-key-enum'; import { Key } from 'ts-key-enum';
import { IconArrowUpRight } from 'twenty-ui'; import { IconArrowUpRight } from 'twenty-ui';
@ -7,6 +6,7 @@ import { IconArrowUpRight } from 'twenty-ui';
import { useClearField } from '@/object-record/record-field/hooks/useClearField'; import { useClearField } from '@/object-record/record-field/hooks/useClearField';
import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButtonIcon'; import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButtonIcon';
import { useIsFieldClearable } from '@/object-record/record-field/hooks/useIsFieldClearable'; import { useIsFieldClearable } from '@/object-record/record-field/hooks/useIsFieldClearable';
import { useIsFieldEmpty } from '@/object-record/record-field/hooks/useIsFieldEmpty';
import { useIsFieldInputOnly } from '@/object-record/record-field/hooks/useIsFieldInputOnly'; import { useIsFieldInputOnly } from '@/object-record/record-field/hooks/useIsFieldInputOnly';
import { useToggleEditOnlyInput } from '@/object-record/record-field/hooks/useToggleEditOnlyInput'; import { useToggleEditOnlyInput } from '@/object-record/record-field/hooks/useToggleEditOnlyInput';
import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext'; import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
@ -16,6 +16,7 @@ import { useOpenRecordTableCellFromCell } from '@/object-record/record-table/rec
import { isSoftFocusUsingMouseState } from '@/object-record/record-table/states/isSoftFocusUsingMouseState'; import { isSoftFocusUsingMouseState } from '@/object-record/record-table/states/isSoftFocusUsingMouseState';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { isNonTextWritingKey } from '@/ui/utilities/hotkey/utils/isNonTextWritingKey'; import { isNonTextWritingKey } from '@/ui/utilities/hotkey/utils/isNonTextWritingKey';
import { isDefined } from '~/utils/isDefined';
import { TableHotkeyScope } from '../../types/TableHotkeyScope'; import { TableHotkeyScope } from '../../types/TableHotkeyScope';
@ -40,6 +41,8 @@ export const RecordTableCellSoftFocusMode = ({
const isFieldInputOnly = useIsFieldInputOnly(); const isFieldInputOnly = useIsFieldInputOnly();
const isEmpty = useIsFieldEmpty();
const isFieldClearable = useIsFieldClearable(); const isFieldClearable = useIsFieldClearable();
const toggleEditOnlyInput = useToggleEditOnlyInput(); const toggleEditOnlyInput = useToggleEditOnlyInput();
@ -119,7 +122,7 @@ export const RecordTableCellSoftFocusMode = ({
const buttonIcon = isFirstColumn ? IconArrowUpRight : customButtonIcon; const buttonIcon = isFirstColumn ? IconArrowUpRight : customButtonIcon;
const showButton = const showButton =
!!buttonIcon && isDefined(buttonIcon) &&
!editModeContentOnly && !editModeContentOnly &&
(!isFirstColumn || !isEmpty) && (!isFirstColumn || !isEmpty) &&
!isReadOnly; !isReadOnly;