# ISSUE - Closes #6734 - Closes #6633 - Closes #6733 - Closes #6816 # Description - [x] Don't allow Empty (whitespaces) Objects to Create, all the keyboard shortcuts are also handled for this. https://github.com/user-attachments/assets/1c9add4e-f13f-458b-8f76-63bd868413a2 https://github.com/user-attachments/assets/e72b6ee3-74e4-4517-a230-3eb10db80dc7 Note: we do have one other issue with FullName field #6740 Inorder to test use **shift**. - [x] Api Keys Input Name Field -> New and Detail View Name field shouldn't be empty or string with whitespaces, we won't able to have whitespaces in both. **Try Entering just spaces** https://github.com/user-attachments/assets/b521b49f-648c-4585-9d15-8ff4faed3c3a - [x] Similar to above, Empty webhook endpoint url under **/settings/developers/webhooks/new** won't be created. **Try Entering just spaces** - [x] New Functions or Updating Functions will not able to have whitespaces, empty string as Name. **Try Entering just spaces** https://github.com/user-attachments/assets/09fcf394-c6d9-4080-8efd-462b054a22d0 - [x] under **settings/workspace-members** changes will lead and solve that user won't be able to enter Invite by email as just whitespaces + button is now getting disabled when there is no correct email. **Try Entering just spaces** https://github.com/user-attachments/assets/b352edfa-113b-4645-80fd-db6f120ab5db - [x] Text Input Field, will not allow to start entering with whitespaces and won't take just whitespaces as value spaces between words will work. https://github.com/user-attachments/assets/8c1a0812-45be-4ed2-bd3d-bb4f92147976 - [x] Similarly Number works as per above including shortcuts. https://github.com/user-attachments/assets/9f69cc87-5c3c-43ee-93c4-fa887bc0d7ee - [x] Similarly FullName field works as per above including shortcuts https://github.com/user-attachments/assets/7bb006b2-abf7-44cd-a214-7a2fc68df169 - [x] Pasting fullName is been Improved. - Case 1 (Two Words): If there are exactly two words, return them as is. - Case 2 (More than Two Words): If there are more than two words, return the first two words only. - Case 3 (One Word): If there is only one word, return it as the first name, with an empty string as the last name. - WhiteSpaces have been handled. ``` console.log(splitFullName("John Doe")); // ["John", "Doe"] console.log(splitFullName(" ")); // ["", ""] console.log(splitFullName("John")); // ["John", ""] console.log(splitFullName(" John Doe ")); // ["John", "Doe"] console.log(splitFullName("John Michael Andrew Doe")); // ["John", "Michael"] ``` --------- Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
236 lines
6.9 KiB
TypeScript
236 lines
6.9 KiB
TypeScript
import { useTheme } from '@emotion/react';
|
|
import styled from '@emotion/styled';
|
|
import {
|
|
ChangeEvent,
|
|
FocusEventHandler,
|
|
ForwardedRef,
|
|
InputHTMLAttributes,
|
|
forwardRef,
|
|
useRef,
|
|
useState,
|
|
} from 'react';
|
|
import { IconComponent, IconEye, IconEyeOff } from 'twenty-ui';
|
|
import { useCombinedRefs } from '~/hooks/useCombinedRefs';
|
|
import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
|
|
|
|
const StyledContainer = styled.div<
|
|
Pick<TextInputV2ComponentProps, 'fullWidth'>
|
|
>`
|
|
display: inline-flex;
|
|
flex-direction: column;
|
|
width: ${({ fullWidth }) => (fullWidth ? `100%` : 'auto')};
|
|
`;
|
|
|
|
const StyledLabel = styled.span`
|
|
color: ${({ theme }) => theme.font.color.light};
|
|
font-size: ${({ theme }) => theme.font.size.xs};
|
|
font-weight: ${({ theme }) => theme.font.weight.semiBold};
|
|
margin-bottom: ${({ theme }) => theme.spacing(1)};
|
|
`;
|
|
|
|
const StyledInputContainer = styled.div`
|
|
display: flex;
|
|
flex-direction: row;
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledInput = styled.input<
|
|
Pick<TextInputV2ComponentProps, 'fullWidth' | 'LeftIcon' | 'error'>
|
|
>`
|
|
background-color: ${({ theme }) => theme.background.transparent.lighter};
|
|
border: 1px solid
|
|
${({ theme, error }) =>
|
|
error ? theme.border.color.danger : theme.border.color.medium};
|
|
border-bottom-left-radius: ${({ theme, LeftIcon }) =>
|
|
!LeftIcon && theme.border.radius.sm};
|
|
border-right: none;
|
|
border-left: ${({ LeftIcon }) => LeftIcon && 'none'};
|
|
border-top-left-radius: ${({ theme, LeftIcon }) =>
|
|
!LeftIcon && theme.border.radius.sm};
|
|
box-sizing: border-box;
|
|
color: ${({ theme }) => theme.font.color.primary};
|
|
display: flex;
|
|
flex-grow: 1;
|
|
font-family: ${({ theme }) => theme.font.family};
|
|
font-weight: ${({ theme }) => theme.font.weight.regular};
|
|
height: 32px;
|
|
outline: none;
|
|
padding: ${({ theme }) => theme.spacing(2)};
|
|
width: 100%;
|
|
|
|
&::placeholder,
|
|
&::-webkit-input-placeholder {
|
|
color: ${({ theme }) => theme.font.color.light};
|
|
font-family: ${({ theme }) => theme.font.family};
|
|
font-weight: ${({ theme }) => theme.font.weight.medium};
|
|
}
|
|
|
|
&:disabled {
|
|
color: ${({ theme }) => theme.font.color.tertiary};
|
|
}
|
|
`;
|
|
|
|
const StyledErrorHelper = styled.div`
|
|
color: ${({ theme }) => theme.color.red};
|
|
font-size: ${({ theme }) => theme.font.size.xs};
|
|
padding: ${({ theme }) => theme.spacing(1)};
|
|
`;
|
|
|
|
const StyledLeftIconContainer = styled.div`
|
|
align-items: center;
|
|
background-color: ${({ theme }) => theme.background.transparent.lighter};
|
|
border: 1px solid ${({ theme }) => theme.border.color.medium};
|
|
border-bottom-left-radius: ${({ theme }) => theme.border.radius.sm};
|
|
border-right: none;
|
|
border-top-left-radius: ${({ theme }) => theme.border.radius.sm};
|
|
display: flex;
|
|
justify-content: center;
|
|
padding-left: ${({ theme }) => theme.spacing(2)};
|
|
`;
|
|
|
|
const StyledTrailingIconContainer = styled.div<
|
|
Pick<TextInputV2ComponentProps, 'error'>
|
|
>`
|
|
align-items: center;
|
|
background-color: ${({ theme }) => theme.background.transparent.lighter};
|
|
border: 1px solid
|
|
${({ theme, error }) =>
|
|
error ? theme.border.color.danger : theme.border.color.medium};
|
|
border-bottom-right-radius: ${({ theme }) => theme.border.radius.sm};
|
|
border-left: none;
|
|
border-top-right-radius: ${({ theme }) => theme.border.radius.sm};
|
|
display: flex;
|
|
justify-content: center;
|
|
padding-right: ${({ theme }) => theme.spacing(1)};
|
|
`;
|
|
|
|
const StyledTrailingIcon = styled.div`
|
|
align-items: center;
|
|
color: ${({ theme }) => theme.font.color.light};
|
|
cursor: ${({ onClick }) => (onClick ? 'pointer' : 'default')};
|
|
display: flex;
|
|
justify-content: center;
|
|
`;
|
|
|
|
const INPUT_TYPE_PASSWORD = 'password';
|
|
|
|
export type TextInputV2ComponentProps = Omit<
|
|
InputHTMLAttributes<HTMLInputElement>,
|
|
'onChange' | 'onKeyDown'
|
|
> & {
|
|
className?: string;
|
|
label?: string;
|
|
onChange?: (text: string) => void;
|
|
fullWidth?: boolean;
|
|
error?: string;
|
|
noErrorHelper?: boolean;
|
|
RightIcon?: IconComponent;
|
|
LeftIcon?: IconComponent;
|
|
onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
|
|
onBlur?: FocusEventHandler<HTMLInputElement>;
|
|
dataTestId?: string;
|
|
};
|
|
|
|
const TextInputV2Component = (
|
|
{
|
|
className,
|
|
label,
|
|
value,
|
|
onChange,
|
|
onFocus,
|
|
onBlur,
|
|
onKeyDown,
|
|
fullWidth,
|
|
error,
|
|
noErrorHelper = false,
|
|
required,
|
|
type,
|
|
autoFocus,
|
|
placeholder,
|
|
disabled,
|
|
tabIndex,
|
|
RightIcon,
|
|
LeftIcon,
|
|
autoComplete,
|
|
maxLength,
|
|
dataTestId,
|
|
}: TextInputV2ComponentProps,
|
|
// eslint-disable-next-line @nx/workspace-component-props-naming
|
|
ref: ForwardedRef<HTMLInputElement>,
|
|
): JSX.Element => {
|
|
const theme = useTheme();
|
|
|
|
const inputRef = useRef<HTMLInputElement>(null);
|
|
const combinedRef = useCombinedRefs(ref, inputRef);
|
|
|
|
const [passwordVisible, setPasswordVisible] = useState(false);
|
|
|
|
const handleTogglePasswordVisibility = () => {
|
|
setPasswordVisible(!passwordVisible);
|
|
};
|
|
|
|
return (
|
|
<StyledContainer className={className} fullWidth={fullWidth ?? false}>
|
|
{label && <StyledLabel>{label + (required ? '*' : '')}</StyledLabel>}
|
|
<StyledInputContainer>
|
|
{!!LeftIcon && (
|
|
<StyledLeftIconContainer>
|
|
<StyledTrailingIcon>
|
|
<LeftIcon size={theme.icon.size.md} />
|
|
</StyledTrailingIcon>
|
|
</StyledLeftIconContainer>
|
|
)}
|
|
<StyledInput
|
|
data-testid={dataTestId}
|
|
autoComplete={autoComplete || 'off'}
|
|
ref={combinedRef}
|
|
tabIndex={tabIndex ?? 0}
|
|
onFocus={onFocus}
|
|
onBlur={onBlur}
|
|
type={passwordVisible ? 'text' : type}
|
|
onChange={(event: ChangeEvent<HTMLInputElement>) => {
|
|
onChange?.(
|
|
turnIntoEmptyStringIfWhitespacesOnly(event.target.value),
|
|
);
|
|
}}
|
|
onKeyDown={onKeyDown}
|
|
{...{
|
|
autoFocus,
|
|
disabled,
|
|
placeholder,
|
|
required,
|
|
value,
|
|
LeftIcon,
|
|
maxLength,
|
|
error,
|
|
}}
|
|
/>
|
|
<StyledTrailingIconContainer {...{ error }}>
|
|
{!error && type === INPUT_TYPE_PASSWORD && (
|
|
<StyledTrailingIcon
|
|
onClick={handleTogglePasswordVisibility}
|
|
data-testid="reveal-password-button"
|
|
>
|
|
{passwordVisible ? (
|
|
<IconEyeOff size={theme.icon.size.md} />
|
|
) : (
|
|
<IconEye size={theme.icon.size.md} />
|
|
)}
|
|
</StyledTrailingIcon>
|
|
)}
|
|
{!error && type !== INPUT_TYPE_PASSWORD && !!RightIcon && (
|
|
<StyledTrailingIcon>
|
|
<RightIcon size={theme.icon.size.md} />
|
|
</StyledTrailingIcon>
|
|
)}
|
|
</StyledTrailingIconContainer>
|
|
</StyledInputContainer>
|
|
{error && !noErrorHelper && (
|
|
<StyledErrorHelper>{error}</StyledErrorHelper>
|
|
)}
|
|
</StyledContainer>
|
|
);
|
|
};
|
|
|
|
export const TextInputV2 = forwardRef(TextInputV2Component);
|