From 8a27fd6ca51fd16f8b733bf4f5b11be80ed923b1 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Wed, 13 Sep 2023 21:41:48 -0700 Subject: [PATCH] Fix bug opportunity new button company search --- .../companies/components/NewCompanyProgressButton.tsx | 6 +++--- .../ui/editable-field/components/EditableFieldEditMode.tsx | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/front/src/modules/companies/components/NewCompanyProgressButton.tsx b/front/src/modules/companies/components/NewCompanyProgressButton.tsx index ce8caed3e..d0255eabe 100644 --- a/front/src/modules/companies/components/NewCompanyProgressButton.tsx +++ b/front/src/modules/companies/components/NewCompanyProgressButton.tsx @@ -7,7 +7,6 @@ import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picke import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar'; 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 { useCreateCompanyProgress } from '../hooks/useCreateCompanyProgress'; @@ -56,12 +55,13 @@ export function NewCompanyProgressButton() { const [relationPickerSearchFilter] = useRecoilScopedState( relationPickerSearchFilterScopedState, ); + const companies = useFilteredSearchCompanyQuery({ searchFilter: relationPickerSearchFilter, }); return ( - + <> {isCreatingCard ? ( )} - + ); } diff --git a/front/src/modules/ui/editable-field/components/EditableFieldEditMode.tsx b/front/src/modules/ui/editable-field/components/EditableFieldEditMode.tsx index 8ab8683b2..361bc3819 100644 --- a/front/src/modules/ui/editable-field/components/EditableFieldEditMode.tsx +++ b/front/src/modules/ui/editable-field/components/EditableFieldEditMode.tsx @@ -1,7 +1,5 @@ import styled from '@emotion/styled'; -import { overlayBackground } from '@/ui/theme/constants/effects'; - const StyledEditableFieldEditModeContainer = styled.div` align-items: center; @@ -15,15 +13,16 @@ const StyledEditableFieldEditModeContainer = styled.div` const StyledEditableFieldInput = styled.div` align-items: center; + background: ${({ theme }) => theme.background.transparent.secondary}; border: 1px solid ${({ theme }) => theme.border.color.medium}; border-radius: ${({ theme }) => theme.border.radius.sm}; + box-shadow: ${({ theme }) => theme.boxShadow.strong}; display: flex; + margin-left: -1px; min-height: 32px; width: inherit; - ${overlayBackground} - z-index: 10; `;