@lumx/react 3.9.2-alpha.9 → 3.9.2

package/package.json

@@ -6,8 +6,8 @@
         "url": "https://github.com/lumapps/design-system/issues"
     },
     "dependencies": {
-        "@lumx/core": "^3.9.2-alpha.9",
-        "@lumx/icons": "^3.9.2-alpha.9",
+        "@lumx/core": "^3.9.2",
+        "@lumx/icons": "^3.9.2",
         "@popperjs/core": "^2.5.4",
         "body-scroll-lock": "^3.1.5",
         "classnames": "^2.3.2",
@@ -110,5 +110,5 @@
         "build:storybook": "storybook build"
     },
     "sideEffects": false,
-    "version": "3.9.2-alpha.9"
+    "version": "3.9.2"
 }

package/src/components/date-picker/DatePickerControlled.tsx

@@ -1,6 +1,6 @@
 import React, { KeyboardEventHandler, forwardRef } from 'react';
 import classNames from 'classnames';
-import { DatePickerProps, Emphasis, FlexBox, IconButton, Text, TextField, Toolbar } from '@lumx/react';
+import { DatePickerProps, Emphasis, FlexBox, IconButton, Text, TextField, TextFieldProps, Toolbar } from '@lumx/react';
 import { mdiChevronLeft, mdiChevronRight } from '@lumx/icons';
 import { Comp } from '@lumx/react/utils/type';
 import { getMonthCalendar } from '@lumx/react/utils/date/getMonthCalendar';
@@ -61,36 +61,58 @@ export const DatePickerControlled: Comp<DatePickerControlledProps, HTMLDivElemen
         return getMonthCalendar(localeObj, selectedMonth, minDate, maxDate);
     }, [locale, minDate, maxDate, selectedMonth]);
 
-    const selectedYear = selectedMonth.toLocaleDateString(locale, { year: 'numeric' }).slice(0, 4);
-    const [textFieldYearValue, setTextFieldYearValue] = React.useState(selectedYear);
-    const isYearValid = Number(textFieldYearValue) > 0 && Number(textFieldYearValue) <= 9999;
+    const selectedYear = selectedMonth.getFullYear();
+    const formattedYear = selectedMonth.toLocaleDateString(locale, { year: 'numeric' }).slice(0, 4);
+    const [currentYear, setCurrentYear] = React.useState(String(selectedYear));
 
     // Updates month offset when validating year. Adds or removes 12 months per year when updating year value.
-    const updateMonthOffset = React.useCallback(() => {
-        if (isYearValid) {
-            const yearNumber = selectedMonth.getFullYear();
-            const offset = (Number(textFieldYearValue) - yearNumber) * 12;
-            if (onMonthChange) {
-                onMonthChange(addMonthResetDay(selectedMonth, offset));
+    const updateMonthOffset = React.useCallback(
+        (newYearValue: string) => {
+            const yearNumber = Number(newYearValue);
+            if (yearNumber < 0 && yearNumber >= 9999) {
+                return;
             }
-        }
-    }, [isYearValid, selectedMonth, textFieldYearValue, onMonthChange]);
 
-    const monthYear = selectedMonth.toLocaleDateString(locale, { year: 'numeric', month: 'long' });
+            const previousYearNumber = selectedMonth.getFullYear();
+            const offset = (yearNumber - previousYearNumber) * 12;
+            onMonthChange?.(addMonthResetDay(selectedMonth, offset));
+        },
+        [selectedMonth, onMonthChange],
+    );
+
+    const onYearChange = React.useCallback<TextFieldProps['onChange']>(
+        (newYearValue, _, event) => {
+            setCurrentYear(newYearValue);
 
-    // Year can only be validated by pressing Enter key or on Blur. The below handles the press Enter key case
-    const handleKeyPress: KeyboardEventHandler = React.useMemo(
-        () => onEnterPressed(updateMonthOffset),
+            // Detect if change is coming from the spin up/down arrows
+            const inputType = (event?.nativeEvent as any)?.inputType;
+            if (
+                // Chrome/Safari
+                !inputType ||
+                // Firefox
+                inputType === 'insertReplacementText'
+            ) {
+                updateMonthOffset(newYearValue);
+            }
+        },
         [updateMonthOffset],
     );
 
-    // Required to update year in the TextField when the user changes year by using prev next month arrows
+    const updateYear = React.useCallback(() => {
+        updateMonthOffset(currentYear);
+    }, [updateMonthOffset, currentYear]);
+
+    const updateYearOnEnterPressed: KeyboardEventHandler = React.useMemo(
+        () => onEnterPressed(updateYear),
+        [updateYear],
+    );
+
+    const monthYear = selectedMonth.toLocaleDateString(locale, { year: 'numeric', month: 'long' });
+
+    // Update current year when selected year changes
     React.useEffect(() => {
-        if (Number(textFieldYearValue) !== selectedMonth.getFullYear()) {
-            setTextFieldYearValue(selectedMonth.getFullYear().toString());
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [selectedMonth]);
+        setCurrentYear(String(selectedYear));
+    }, [selectedYear]);
 
     const prevSelectedMonth = usePreviousValue(selectedMonth);
     const monthHasChanged = prevSelectedMonth && !isSameDay(selectedMonth, prevSelectedMonth);
@@ -101,7 +123,7 @@ export const DatePickerControlled: Comp<DatePickerControlledProps, HTMLDivElemen
         if (monthHasChanged) setLabelAriaLive('polite');
     }, [monthHasChanged]);
 
-    const label = getYearDisplayName(locale);
+    const yearLabel = getYearDisplayName(locale);
 
     return (
         <div ref={ref} className={`${CLASSNAME}`}>
@@ -137,21 +159,21 @@ export const DatePickerControlled: Comp<DatePickerControlledProps, HTMLDivElemen
                                 vAlign="center"
                                 dir="auto"
                             >
-                                {RegExp(`(.*)(${selectedYear})(.*)`)
+                                {RegExp(`(.*)(${formattedYear})(.*)`)
                                     .exec(monthYear)
                                     ?.slice(1)
                                     .filter((part) => part !== '')
                                     .map((part) =>
-                                        part === selectedYear ? (
+                                        part === formattedYear ? (
                                             <TextField
-                                                value={textFieldYearValue}
-                                                aria-label={label}
-                                                onChange={setTextFieldYearValue}
+                                                value={currentYear}
+                                                aria-label={yearLabel}
+                                                onChange={onYearChange}
                                                 type="number"
                                                 max={9999}
                                                 min={0}
-                                                onBlur={updateMonthOffset}
-                                                onKeyPress={handleKeyPress}
+                                                onBlur={updateYear}
+                                                onKeyPress={updateYearOnEnterPressed}
                                                 key="year"
                                                 className={`${CLASSNAME}__year`}
                                             />

package/src/components/text-field/TextField.tsx

@@ -68,6 +68,8 @@ export interface TextFieldProps extends GenericProps, HasTheme {
     placeholder?: string;
     /** Reference to the wrapper. */
     textFieldRef?: Ref<HTMLDivElement>;
+    /** Native input type (only when `multiline` is disabled). */
+    type?: React.ComponentProps<'input'>['type'];
     /** Value. */
     value?: string;
     /** On blur callback. */
@@ -160,7 +162,7 @@ interface InputNativeProps {
     maxLength?: number;
     placeholder?: string;
     rows: number;
-    type: string;
+    type: TextFieldProps['type'];
     name?: string;
     value?: string;
     setFocus(focus: boolean): void;