Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 46 additions & 5 deletions src/components/input-elements/BaseInput.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use client";
import React, { ReactNode, useCallback, useRef, useState } from "react";
import React, { ReactNode, useCallback, useMemo, useRef, useState } from "react";
import { ExclamationFilledIcon, EyeIcon, EyeOffIcon } from "assets";
import { getSelectButtonColors, hasValue } from "components/input-elements/selectUtils";
import { mergeRefs, tremorTwMerge } from "lib";
Expand All @@ -15,6 +15,7 @@ export interface BaseInputProps extends React.InputHTMLAttributes<HTMLInputEleme
stepper?: ReactNode;
onValueChange?: (value: any) => void;
makeInputClassName: (className: string) => string;
formatter?: Intl.NumberFormat;
}

const BaseInput = React.forwardRef<HTMLInputElement, BaseInputProps>((props, ref) => {
Expand All @@ -33,16 +34,44 @@ const BaseInput = React.forwardRef<HTMLInputElement, BaseInputProps>((props, ref
onChange,
onValueChange,
autoFocus,
formatter,
...other
} = props;

const [isFocused, setIsFocused] = useState(autoFocus || false);
const [isPasswordVisible, setIsPasswordVisible] = useState(false);

const [numberValue, setNumberValue] = useState<number | undefined>(() => {
if (type === "number" && (typeof defaultValue === "number" || typeof value === "number")) {
return Number(value) ?? Number(defaultValue);
}
});
const [formatedValue, setFormatedValue] = useState<string | undefined>(() => {
if (formatter && formatter instanceof Intl.NumberFormat && type === "number") {
return formatter.format(Number(value) ?? defaultValue);
}
});

const toggleIsPasswordVisible = useCallback(
() => setIsPasswordVisible(!isPasswordVisible),
[isPasswordVisible, setIsPasswordVisible],
);

const { resolvedType, resolvedValue } = useMemo(() => {
let resolvedType = isPasswordVisible ? "text" : type;
if (type === "number") {
resolvedType = isFocused ? "number" : "text";
}

let resolvedValue = value;
if (type === "number") {
const valueOrNumberValue = value ?? numberValue;
resolvedValue = isFocused ? valueOrNumberValue : formatedValue;
}

return { resolvedType, resolvedValue };
}, [isPasswordVisible, type, value, numberValue, formatedValue, isFocused]);

const Icon = icon;

const inputRef = useRef<HTMLInputElement>(null);
Expand Down Expand Up @@ -112,8 +141,8 @@ const BaseInput = React.forwardRef<HTMLInputElement, BaseInputProps>((props, ref
<input
ref={mergeRefs([inputRef, ref])}
defaultValue={defaultValue}
value={value}
type={isPasswordVisible ? "text" : type}
value={resolvedValue}
type={resolvedType}
className={tremorTwMerge(
makeInputClassName("input"),
// common
Expand All @@ -133,8 +162,20 @@ const BaseInput = React.forwardRef<HTMLInputElement, BaseInputProps>((props, ref
disabled={disabled}
data-testid="base-input"
onChange={(e) => {
onChange?.(e);
onValueChange?.(e.target.value);
if (type === "number") {
const value = Number(e.target.value);
onChange?.(e);
onValueChange?.(value);
setNumberValue(value);

if (formatter && formatter instanceof Intl.NumberFormat) {
const formattedValue = formatter.format(value);
setFormatedValue(formattedValue);
}
} else {
onChange?.(e);
onValueChange?.(e.target.value);
}
}}
{...other}
/>
Expand Down
5 changes: 5 additions & 0 deletions src/stories/input-elements/NumberInput.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,8 @@ export const ControlledWithOnChange: Story = {
render: SimpleNumberInputControlled,
args: {},
};

export const WithIntlNumberFormatter: Story = {
render: SimpleNumberInputControlled,
args: {},
};
19 changes: 15 additions & 4 deletions src/stories/input-elements/helpers/SimpleNumberInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,40 @@ export const SimpleNumberInput = (args: any) => {
};

export const SimpleNumberInputControlled = (args: any) => {
const [value, setValue] = React.useState(0);
const [value, setValue] = React.useState(333);
return (
<>
<form
onSubmit={(e) => {
e.preventDefault();
}}
onReset={() => setValue(0)}
>
<label htmlFor="a">
<p>Controlled with onChange</p>
<p>Controlled with Intl.NumberFormat ptBR</p>
</label>
<NumberInput
{...args}
id={"a"}
value={value}
onChange={(e) => setValue(Number(e.target.value))}
formatter={new Intl.NumberFormat("pt-BR", { style: "currency", currency: "BRL" })}
/>
<label htmlFor="a">
<p>Controlled with Intl.NumberFormat US</p>
</label>
<NumberInput
{...args}
id={"a"}
value={value}
onChange={(e) => setValue(Number(e.target.value))}
formatter={new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" })}
/>

<p>value: {value}</p>
<Button type="submit" className="mt-2">
Submit
</Button>
</form>
<p>value: {value}</p>
</>
);
};