From f05da75bb5a84ec8e86944d72f042cfcad3b5a7b Mon Sep 17 00:00:00 2001 From: Thomas Trompette Date: Mon, 23 Jun 2025 19:08:40 +0200 Subject: [PATCH] Set error message not absolute (#12802) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before Capture d’écran 2025-06-23 à 18 52 50 After Capture d’écran 2025-06-23 à 18 48 01 Capture d’écran 2025-06-23 à 18 48 38 --- .../form-types/components/FormNumberFieldInput.tsx | 5 +++-- .../src/modules/ui/input/components/InputHint.tsx | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx index 38cc46839..e1d37c79d 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx @@ -4,7 +4,6 @@ import { FormFieldInputRowContainer } from '@/object-record/record-field/form-ty import { VariableChipStandalone } from '@/object-record/record-field/form-types/components/VariableChipStandalone'; import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent'; import { TextInput } from '@/ui/field/input/components/TextInput'; -import { InputErrorHelper } from '@/ui/input/components/InputErrorHelper'; import { InputHint } from '@/ui/input/components/InputHint'; import { InputLabel } from '@/ui/input/components/InputLabel'; import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString'; @@ -114,6 +113,8 @@ export const FormNumberFieldInput = ({ onChange(variableName); }; + const error = errorMessage ?? errorFromProps; + return ( {label ? {label} : null} @@ -154,7 +155,7 @@ export const FormNumberFieldInput = ({ {hint ? {hint} : null} - {errorMessage ?? errorFromProps} + {error && {error}} ); }; diff --git a/packages/twenty-front/src/modules/ui/input/components/InputHint.tsx b/packages/twenty-front/src/modules/ui/input/components/InputHint.tsx index 85633dc95..a910a5f4b 100644 --- a/packages/twenty-front/src/modules/ui/input/components/InputHint.tsx +++ b/packages/twenty-front/src/modules/ui/input/components/InputHint.tsx @@ -1,7 +1,10 @@ import styled from '@emotion/styled'; -const StyledInputHint = styled.div` - color: ${({ theme }) => theme.font.color.light}; +const StyledInputHint = styled.div<{ + danger?: boolean; +}>` + color: ${({ danger, theme }) => + danger ? theme.font.color.danger : theme.font.color.light}; font-size: ${({ theme }) => theme.font.size.xs}; font-weight: ${({ theme }) => theme.font.weight.regular}; margin-top: ${({ theme }) => theme.spacing(0.5)};