The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Show a blue border on keyboard focus in form inputs, pickers and selects (#28769)
Charles Bochete1b4d607303c
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsxindex 96f0742a064..c8c86edc8c6 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx@@ -1,4 +1,5 @@import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';+import { hasFullFormFieldBorder } from '@/ui/input/utils/hasFullFormFieldBorder';import { FormFieldInputInnerContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer';import { FormFieldInputRowContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputRowContainer';import { FormFieldPlaceholder } from '@/object-record/record-field/ui/form-types/components/FormFieldPlaceholder';@@ -52,7 +53,7 @@ const StyledDisplayModeReadonlyContainer = styled.div`width: 100%;`;-const StyledDisplayModeContainer = styled.div`+const StyledDisplayModeContainer = styled.div<{ hasOutline: boolean }>`align-items: center;background: transparent;border: none;@@ -61,6 +62,7 @@ const StyledDisplayModeContainer = styled.div`display: flex;font-family: inherit;height: 30px;+ outline: ${({ hasOutline }) => (hasOutline ? 'revert' : 'none')};padding-inline: ${themeCssVariables.spacing[2]};width: 100%;@@ -130,6 +132,8 @@ export const FormArrayFieldInput = ({const dropdownId = `dropdown-${instanceId}`;+ const hasRightElement = isDefined(VariablePicker) && !readonly;+const accessibleLabel = isNonEmptyString(label) ? label : t`Items`;const preventContainerFocusStackUpdate =@@ -355,7 +359,8 @@ export const FormArrayFieldInput = ({<FormFieldInputInnerContainerformFieldInputInstanceId={formFieldInputInstanceId}preventFocusStackUpdate={preventContainerFocusStackUpdate}- hasRightElement={isDefined(VariablePicker) && !readonly}+ hasRightElement={hasRightElement}+ shouldHighlightOnTriggerFocus>{draftValue.type === 'static' ? (readonly ? (@@ -383,7 +388,15 @@ export const FormArrayFieldInput = ({) : (<DropdownRoot dropdownId={dropdownId} type="panel"><Dropdown.Trigger- render={<StyledDisplayModeContainer />}+ render={+ <StyledDisplayModeContainer+ hasOutline={+ !hasFullFormFieldBorder({+ hasRightElement,+ })+ }+ />+ }nativeButton={false}aria-label={accessibleLabel}>diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsxindex 4dcdf396c49..86db8ab7342 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx@@ -3,8 +3,10 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushimport { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';import { useRemoveFocusItemFromFocusStackOnUnmount } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';+import { isFormFieldFocusShownForElement } from '@/object-record/record-field/ui/form-types/utils/isFormFieldFocusShownForElement';+import { getFormFieldBorderColor } from '@/ui/input/utils/getFormFieldBorderColor';import { styled } from '@linaria/react';-import { forwardRef, type HTMLAttributes, type Ref } from 'react';+import { forwardRef, type HTMLAttributes, type Ref, useState } from 'react';import { themeCssVariables } from 'twenty-ui/theme';type FormFieldInputInnerContainerProps = {@@ -16,10 +18,15 @@ type FormFieldInputInnerContainerProps = {enableGlobalEscapeHotkeysConflictingWithKeyboard?: boolean;formFieldInputInstanceId: string;variant?: FormFieldInputVariant;+ isFocused?: boolean;+ shouldHighlightOnTriggerFocus?: boolean;};const StyledFormFieldInputInnerContainer = styled.div<- Omit<FormFieldInputInnerContainerProps, 'formFieldInputInstanceId'> & {+ Omit<+ FormFieldInputInnerContainerProps,+ 'formFieldInputInstanceId' | 'shouldHighlightOnTriggerFocus'+ > & {$variant: FormFieldInputVariant;}>`@@ -40,11 +47,17 @@ const StyledFormFieldInputInnerContainer = styled.div<: multiline || !hasRightElement? themeCssVariables.border.radius.md: '0'};- border-right: ${({ multiline, hasRightElement, $variant }) =>+ border-color: ${({ isFocused, hasRightElement, $variant }) =>+ getFormFieldBorderColor({ isFocused, hasRightElement, variant: $variant })};+ border-right: ${({ multiline, isFocused, hasRightElement, $variant }) =>$variant === 'transparent'? 'none': multiline || !hasRightElement- ? `1px solid ${themeCssVariables.border.color.medium}`+ ? `1px solid ${getFormFieldBorderColor({+ isFocused,+ hasRightElement,+ variant: $variant,+ })}`: 'none'};border-top-left-radius: ${({ $variant }) =>$variant === 'transparent' ? '0' : themeCssVariables.border.radius.md};@@ -93,9 +106,13 @@ export const FormFieldInputInnerContainer = forwardRef(onClick,formFieldInputInstanceId,variant = 'default',+ isFocused = false,+ shouldHighlightOnTriggerFocus = false,}: HTMLAttributes<HTMLDivElement> & FormFieldInputInnerContainerProps,ref: Ref<HTMLDivElement>,) => {+ const [hasFocusedElement, setHasFocusedElement] = useState(false);+const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();const { removeFocusItemFromFocusStackById } =useRemoveFocusItemFromFocusStackById();@@ -107,6 +124,12 @@ export const FormFieldInputInnerContainer = forwardRef(const handleFocus = (e: React.FocusEvent<HTMLDivElement>) => {onFocus?.(e);+ setHasFocusedElement(+ isFormFieldFocusShownForElement({+ element: e.target,+ shouldHighlightOnTriggerFocus,+ }),+ );if (!preventFocusStackUpdate) {pushFocusItemToFocusStack({@@ -125,6 +148,7 @@ export const FormFieldInputInnerContainer = forwardRef(const handleBlur = (e: React.FocusEvent<HTMLDivElement>) => {onBlur?.(e);+ setHasFocusedElement(false);if (!preventFocusStackUpdate) {removeFocusItemFromFocusStackById({@@ -142,6 +166,7 @@ export const FormFieldInputInnerContainer = forwardRef(multiline={multiline}readonly={readonly}$variant={variant}+ isFocused={isFocused || hasFocusedElement}onFocus={handleFocus}onBlur={handleBlur}onClick={onClick}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsxindex efde180e956..18c1a7aa2d7 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx@@ -1,3 +1,4 @@+import { hasFullFormFieldBorder } from '@/ui/input/utils/hasFullFormFieldBorder';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';@@ -57,10 +58,11 @@ const StyledDisplayModeReadonlyContainer = styled.div`width: 100%;`;-const StyledDisplayModeContainer = styled.div`+const StyledDisplayModeContainer = styled.div<{ hasOutline: boolean }>`align-items: center;cursor: pointer;display: flex;+ outline: ${({ hasOutline }) => (hasOutline ? 'revert' : 'none')};padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]};width: 100%;`;@@ -162,6 +164,8 @@ export const FormMultiSelectFieldInput = ({: undefined;const placeholderText = placeholder ?? label;+ const hasRightElement = isDefined(VariablePicker) && !readonly;+const accessibleLabel =[label, placeholder].find(isNonEmptyString) ?? t`Select options`;@@ -172,7 +176,8 @@ export const FormMultiSelectFieldInput = ({<StyledFormFieldInputRowContainer><FormFieldInputInnerContainerformFieldInputInstanceId={instanceId}- hasRightElement={isDefined(VariablePicker) && !readonly}+ hasRightElement={hasRightElement}+ shouldHighlightOnTriggerFocushoverable={!readonly}preventFocusStackUpdate={draftValue.type === 'static' && !readonly}>@@ -202,7 +207,15 @@ export const FormMultiSelectFieldInput = ({onInteractOutside={preventDropdownDismissOnInputElement}><Dropdown.Trigger- render={<StyledDisplayModeContainer />}+ render={+ <StyledDisplayModeContainer+ hasOutline={+ !hasFullFormFieldBorder({+ hasRightElement,+ })+ }+ />+ }nativeButton={false}aria-label={accessibleLabel}>@@ -248,7 +261,7 @@ export const FormMultiSelectFieldInput = ({)}</FormFieldInputInnerContainer>- {isDefined(VariablePicker) && !readonly && (+ {hasRightElement && isDefined(VariablePicker) && (<VariablePickerinstanceId={instanceId}onVariableSelect={handleVariableTagInsert}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsxindex 40d2dc7bcde..bf92e194ff4 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx@@ -20,9 +20,10 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { isStandaloneVariableString } from 'twenty-shared/workflow';+import { hasFullFormFieldBorder } from '@/ui/input/utils/hasFullFormFieldBorder';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { type KeyboardEvent, useCallback, useId } from 'react';+import { type KeyboardEvent, useCallback, useId, useState } from 'react';import { CustomError, isDefined, isValidUuid } from 'twenty-shared/utils';import { Key } from 'ts-key-enum';import { doNotTranslate } from 'twenty-shared/i18n';@@ -31,6 +32,7 @@ import { useTheme, themeCssVariables } from 'twenty-ui/theme';const StyledFormSelectContainerWrapper = styled.div<{readonly?: boolean;+ hasOutline?: boolean;$variant?: FormFieldInputVariant;}>`cursor: ${({ readonly }) => (readonly ? 'default' : 'pointer')};@@ -38,6 +40,7 @@ const StyledFormSelectContainerWrapper = styled.div<{height: ${({ $variant }) =>$variant === 'transparent' ? themeCssVariables.spacing[6] : '32px'};min-width: 0;+ outline: ${({ hasOutline = true }) => (hasOutline ? 'revert' : 'none')};width: 100%;`;@@ -146,6 +149,8 @@ export const FormSingleRecordPicker = ({const dropdownId = dropdownIdFromProps ?? `form-record-picker-${componentId}`;const variablesDropdownId = `form-record-picker-${componentId}-variables`;const triggerId = `form-record-picker-${componentId}-trigger`;+ const hasRightElement = isDefined(VariablePicker) && !disabled;+ const [isTriggerFocused, setIsTriggerFocused] = useState(false);const { closeDropdown } = useCloseDropdown();const { openDropdown } = useOpenDropdown();@@ -269,12 +274,26 @@ export const FormSingleRecordPicker = ({<StyledFormSelectContainerWrapperid={triggerId}$variant={variant}+ hasOutline={+ !hasFullFormFieldBorder({+ hasRightElement,+ variant,+ })+ }tabIndex={0}onKeyDown={handleTriggerKeyDown}+ onFocus={(event) =>+ setIsTriggerFocused(+ event.target === event.currentTarget &&+ event.currentTarget.matches(':focus-visible'),+ )+ }+ onBlur={() => setIsTriggerFocused(false)}><FormFieldInputInnerContainerformFieldInputInstanceId={componentId}- hasRightElement={isDefined(VariablePicker) && !disabled}+ hasRightElement={hasRightElement}+ isFocused={isTriggerFocused}hoverablepreventFocusStackUpdate={true}variant={variant}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/utils/isFormFieldFocusShownForElement.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/utils/isFormFieldFocusShownForElement.tsnew file mode 100644index 00000000000..e9ac9acd04c--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/utils/isFormFieldFocusShownForElement.ts@@ -0,0 +1,22 @@+const isTextEntryElement = (element: Element) =>+ element instanceof HTMLInputElement ||+ element instanceof HTMLTextAreaElement ||+ (element instanceof HTMLElement && element.isContentEditable);++export const isFormFieldFocusShownForElement = ({+ element,+ shouldHighlightOnTriggerFocus,+}: {+ element: Element;+ shouldHighlightOnTriggerFocus: boolean;+}) => {+ if (element instanceof HTMLButtonElement) {+ return false;+ }++ if (isTextEntryElement(element)) {+ return true;+ }++ return shouldHighlightOnTriggerFocus && element.matches(':focus-visible');+};diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsxindex 2fa3ac1f19e..f9e0a27d305 100644--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx@@ -3,6 +3,7 @@ import { type SelectProps } from '@/ui/input/types/SelectProps';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { hasFullFormFieldBorder } from '@/ui/input/utils/hasFullFormFieldBorder';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { useMemo, useRef, useState } from 'react';@@ -23,6 +24,10 @@ const StyledContainer = styled.div<{ fullWidth?: boolean }>`width: ${({ fullWidth }) => (fullWidth ? '100%' : 'auto')};`;+const StyledSelectTrigger = styled.div<{ hasOutline: boolean }>`+ outline: ${({ hasOutline }) => (hasOutline ? 'revert' : 'none')};+`;+const StyledLabel = styled.span`color: ${themeCssVariables.font.color.light};display: block;@@ -65,6 +70,7 @@ export const Select = <TValue extends SelectValue>({const dropdownContentRef = useRef<HTMLDivElement>(null);const [searchInputValue, setSearchInputValue] = useState('');+ const [isTriggerFocused, setIsTriggerFocused] = useState(false);const selectedOption = useMemo(() => {if (isDefined(pinnedOption) && pinnedOption.value === value) {@@ -180,7 +186,23 @@ export const Select = <TValue extends SelectValue>({}}}>- <Dropdown.Trigger render={<div />} nativeButton={false}>+ <Dropdown.Trigger+ render={+ <StyledSelectTrigger+ hasOutline={+ !hasFullFormFieldBorder({ hasRightElement, variant })+ }+ />+ }+ nativeButton={false}+ onFocus={(event) =>+ setIsTriggerFocused(+ event.target === event.currentTarget &&+ event.currentTarget.matches(':focus-visible'),+ )+ }+ onBlur={() => setIsTriggerFocused(false)}+ ><SelectControlrenderAsTag={renderAsTag}selectedOption={controlSelectedOption}@@ -188,6 +210,7 @@ export const Select = <TValue extends SelectValue>({isDisabled={isDisabled}selectSizeVariant={selectSizeVariant}hasRightElement={hasRightElement}+ isFocused={isTriggerFocused}variant={variant}/></Dropdown.Trigger>diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsxindex cb1e87ae175..2cf1e8d3f92 100644--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx@@ -1,5 +1,6 @@import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';import { type SelectSizeVariant } from '@/ui/input/types/SelectSizeVariant';+import { getFormFieldBorderColor } from '@/ui/input/utils/getFormFieldBorderColor';import { styled } from '@linaria/react';import { type ReactNode } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -19,6 +20,7 @@ export const StyledControlContainer = styled.div<{selectSizeVariant?: SelectSizeVariant;textAccent: SelectControlTextAccent;hasRightElement?: boolean;+ isFocused?: boolean;$variant?: FormFieldInputVariant;}>`align-items: center;@@ -38,12 +40,18 @@ export const StyledControlContainer = styled.div<{: hasRightElement? '0': themeCssVariables.border.radius.md};- border-right: ${({ hasRightElement, $variant }) =>+ border-color: ${({ isFocused, hasRightElement, $variant }) =>+ getFormFieldBorderColor({ isFocused, hasRightElement, variant: $variant })};+ border-right: ${({ isFocused, hasRightElement, $variant }) =>$variant === 'transparent'? 'none': hasRightElement? 'none'- : `1px solid ${themeCssVariables.border.color.medium}`};+ : `1px solid ${getFormFieldBorderColor({+ isFocused,+ hasRightElement,+ variant: $variant,+ })}`};border-top-left-radius: ${({ $variant }) =>$variant === 'transparent' ? '0' : themeCssVariables.border.radius.md};border-top-right-radius: ${({ hasRightElement, $variant }) =>@@ -112,6 +120,7 @@ export type SelectControlProps = {selectSizeVariant?: SelectSizeVariant;textAccent?: SelectControlTextAccent;hasRightElement?: boolean;+ isFocused?: boolean;variant?: FormFieldInputVariant;};@@ -123,6 +132,7 @@ export const SelectControl = ({selectSizeVariant,textAccent = 'default',hasRightElement,+ isFocused = false,variant = 'default',}: SelectControlProps) => {const theme = useTheme();@@ -137,6 +147,7 @@ export const SelectControl = ({selectSizeVariant={selectSizeVariant}textAccent={textAccent}hasRightElement={hasRightElement}+ isFocused={isFocused}$variant={variant}title={selectedOption.fullLabel}>diff --git a/packages/twenty-front/src/modules/ui/input/utils/getFormFieldBorderColor.ts b/packages/twenty-front/src/modules/ui/input/utils/getFormFieldBorderColor.tsnew file mode 100644index 00000000000..4ab467056af--- /dev/null+++ b/packages/twenty-front/src/modules/ui/input/utils/getFormFieldBorderColor.ts@@ -0,0 +1,16 @@+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';+import { hasFullFormFieldBorder } from '@/ui/input/utils/hasFullFormFieldBorder';+import { themeCssVariables } from 'twenty-ui/theme';++export const getFormFieldBorderColor = ({+ isFocused = false,+ hasRightElement,+ variant,+}: {+ isFocused?: boolean;+ hasRightElement?: boolean;+ variant?: FormFieldInputVariant;+}) =>+ isFocused && hasFullFormFieldBorder({ hasRightElement, variant })+ ? themeCssVariables.color.blue+ : themeCssVariables.border.color.medium;diff --git a/packages/twenty-front/src/modules/ui/input/utils/hasFullFormFieldBorder.ts b/packages/twenty-front/src/modules/ui/input/utils/hasFullFormFieldBorder.tsnew file mode 100644index 00000000000..36821248038--- /dev/null+++ b/packages/twenty-front/src/modules/ui/input/utils/hasFullFormFieldBorder.ts@@ -0,0 +1,10 @@+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';++// A right element (the variable picker) draws the field's right side.+export const hasFullFormFieldBorder = ({+ hasRightElement = false,+ variant = 'default',+}: {+ hasRightElement?: boolean;+ variant?: FormFieldInputVariant;+}) => !hasRightElement && variant !== 'transparent';