Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.4.5 #67

Merged
merged 4 commits into from
Apr 25, 2022
Merged
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@euk-labs/componentz",
"version": "0.4.4",
"version": "0.4.5",
"main": "./cjs/index.js",
"module": "./index.js",
"types": "./index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default {
} as ComponentMeta<typeof NumericField>;

const Template: ComponentStory<typeof NumericField> = (args) => {
const [value, setValue] = useState<number | string | null>(null);
const [value, setValue] = useState<number | string>('');
return (
<NumericField
{...args}
Expand Down
25 changes: 14 additions & 11 deletions src/components/Inputs/NumericField/index.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import type { TextFieldProps } from '@mui/material';
import { TextField } from '@mui/material';
import React, { useMemo } from 'react';
import { useMemo } from 'react';

export interface HTMLNumericElement
extends Omit<HTMLInputElement, 'value' | 'name'> {
value: number | null | '';
value: number | '';
name?: string;
}

export type NumericInputProps = Omit<TextFieldProps, 'onChange'> & {
value?: number | string | null;
value?: number | string;
onChange?(e: React.ChangeEvent<HTMLNumericElement>): void;

precision: number;
Expand All @@ -31,7 +31,7 @@ function verifyNumber(string: string) {
// TODO: support negative numbers
function NumericField(props: NumericInputProps) {
const { value, precision, thousandChar, decimalChar, ...inputProps } = props;
const defaultValue = value === null ? NaN : Number(value);
const defaultValue = value === '' ? NaN : Number(value);

const formatter = useMemo(
() =>
Expand All @@ -40,7 +40,7 @@ function NumericField(props: NumericInputProps) {
maximumFractionDigits: precision,
}),

[thousandChar, decimalChar]
[thousandChar, decimalChar, precision]
);

if (!decimalChar) {
Expand All @@ -67,7 +67,10 @@ function NumericField(props: NumericInputProps) {
e.shiftKey ||
e.key === 'Backspace' ||
e.key === 'Enter' ||
e.key === 'Tab'
e.key === 'Tab' ||
e.key === 'ArrowRight' ||
e.key === 'ArrowLeft' ||
e.key === 'Delete'
)
return;
if (!verifyNumber(e.key).isNumber) e.preventDefault();
Expand All @@ -94,15 +97,15 @@ function NumericField(props: NumericInputProps) {

if (numericRepresentation === '') {
e.target.value = '';
newEvent.target.value = null;
newEvent.currentTarget.value = null;
newEvent.target.value = '';
newEvent.currentTarget.value = '';
return props.onChange && props.onChange(newEvent);
}

const { isNumber, numberFomart } = verifyNumber(numericRepresentation);
if (isNumber && numberFomart) {
const withPrecision = numberFomart / 10 ** precision;

if (isNumber && numberFomart !== null && numberFomart >= 0) {
const withPrecision = numberFomart / 10 ** precision;
const formattedNumber = format(withPrecision);

newEvent.target.value = withPrecision;
Expand All @@ -120,7 +123,7 @@ function NumericField(props: NumericInputProps) {

if (hasValue) {
if (isNaN(defaultValue) || value === '') {
inputValue = null;
inputValue = '';
} else {
inputValue = format(defaultValue);
}
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8963,9 +8963,9 @@ minimist-options@4.1.0:
kind-of "^6.0.3"

minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

minipass-collect@^1.0.2:
version "1.0.2"
Expand Down