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

Fix bug opportunity new button company search

Browse Source
This commit is contained in:
Charles Bochet
2023-09-13 21:41:48 -07:00
parent ea7eeb2872
commit 8a27fd6ca5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/modules/companies/components/NewCompanyProgressButton.tsx
View File

@ -7,7 +7,6 @@ import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picke
import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
import { useCreateCompanyProgress } from '../hooks/useCreateCompanyProgress'; import { useCreateCompanyProgress } from '../hooks/useCreateCompanyProgress';
@ -56,12 +55,13 @@ export function NewCompanyProgressButton() {
const [relationPickerSearchFilter] = useRecoilScopedState( const [relationPickerSearchFilter] = useRecoilScopedState(
relationPickerSearchFilterScopedState, relationPickerSearchFilterScopedState,
); );
const companies = useFilteredSearchCompanyQuery({ const companies = useFilteredSearchCompanyQuery({
searchFilter: relationPickerSearchFilter, searchFilter: relationPickerSearchFilter,
}); });
return ( return (
<RecoilScope> <>
{isCreatingCard ? ( {isCreatingCard ? (
<SingleEntitySelect <SingleEntitySelect
disableBackgroundBlur disableBackgroundBlur
@ -74,6 +74,6 @@ export function NewCompanyProgressButton() {
) : ( ) : (
<NewButton onClick={handleNewClick} /> <NewButton onClick={handleNewClick} />
)} )}
</RecoilScope> </>
); );
} }

7
front/src/modules/ui/editable-field/components/EditableFieldEditMode.tsx
View File

@ -1,7 +1,5 @@
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { overlayBackground } from '@/ui/theme/constants/effects';
const StyledEditableFieldEditModeContainer = styled.div<OwnProps>` const StyledEditableFieldEditModeContainer = styled.div<OwnProps>`
align-items: center; align-items: center;
@ -15,15 +13,16 @@ const StyledEditableFieldEditModeContainer = styled.div<OwnProps>`
const StyledEditableFieldInput = styled.div` const StyledEditableFieldInput = styled.div`
align-items: center; align-items: center;
background: ${({ theme }) => theme.background.transparent.secondary};
border: 1px solid ${({ theme }) => theme.border.color.medium}; border: 1px solid ${({ theme }) => theme.border.color.medium};
border-radius: ${({ theme }) => theme.border.radius.sm}; border-radius: ${({ theme }) => theme.border.radius.sm};
box-shadow: ${({ theme }) => theme.boxShadow.strong};
display: flex; display: flex;
margin-left: -1px; margin-left: -1px;
min-height: 32px; min-height: 32px;
width: inherit; width: inherit;
${overlayBackground}
z-index: 10; z-index: 10;
`; `;