@mezzanine-ui/react 0.14.5 → 0.14.6

package/DateRangePicker/DateRangePicker.js

@@ -63,6 +63,7 @@ const DateRangePicker = forwardRef(function DateRangePicker(props, ref) {
         value: valueProp,
         inputFromRef,
         inputToRef,
+        mode,
         onChange: onChangeProp,
     });
     useEffect(() => {

package/DateRangePicker/useDateRangePickerValue.d.ts

@@ -2,16 +2,21 @@ import { DateType } from '@mezzanine-ui/core/calendar';
 import { RangePickerPickingValue, RangePickerValue } from '@mezzanine-ui/core/picker';
 import { ChangeEventHandler, KeyboardEventHandler } from 'react';
 import { UseRangePickerValueProps } from '../Picker/useRangePickerValue';
+import { DateRangePickerCalendarProps } from './DateRangePickerCalendar';
 export interface UseDateRangePickerValueProps extends Omit<UseRangePickerValueProps, 'onChange'> {
+    mode?: DateRangePickerCalendarProps['mode'];
     onChange?: (value?: RangePickerValue) => void;
 }
-export declare function useDateRangePickerValue({ format, formats, inputFromRef, inputToRef, onChange: onChangeProp, value: valueProp, }: UseDateRangePickerValueProps): {
+export declare function useDateRangePickerValue({ format, formats, inputFromRef, inputToRef, mode, onChange: onChangeProp, value: valueProp, }: UseDateRangePickerValueProps): {
     calendarValue: string[] | undefined;
     inputFromValue: string;
     inputToValue: string;
     onCalendarChange: (val?: DateType) => void;
     onCalendarHover: import("react").Dispatch<import("react").SetStateAction<string | undefined>> | undefined;
-    onChange: (target?: RangePickerPickingValue | undefined) => RangePickerPickingValue | undefined;
+    onChange: (target?: RangePickerPickingValue | undefined, callback?: {
+        from: (date?: string | undefined) => string | undefined;
+        to: (date?: string | undefined) => string | undefined;
+    }) => RangePickerPickingValue | undefined;
     onClear: () => void;
     onFromBlur: import("react").FocusEventHandler<HTMLInputElement>;
     onFromKeyDown: KeyboardEventHandler<HTMLInputElement>;

package/DateRangePicker/useDateRangePickerValue.js

@@ -1,7 +1,9 @@
 import { useState, useMemo } from 'react';
 import { useRangePickerValue } from '../Picker/useRangePickerValue.js';
+import { useCalendarContext } from '../Calendar/CalendarContext.js';
 
-function useDateRangePickerValue({ format, formats, inputFromRef, inputToRef, onChange: onChangeProp, value: valueProp, }) {
+function useDateRangePickerValue({ format, formats, inputFromRef, inputToRef, mode, onChange: onChangeProp, value: valueProp, }) {
+    const { addDay, } = useCalendarContext();
     const { inputFromValue, inputToValue, onChange, onFromBlur, onFromKeyDown, onInputFromChange, onInputToChange, onToBlur, onToKeyDown, value, } = useRangePickerValue({
         format,
         formats,
@@ -25,7 +27,15 @@ function useDateRangePickerValue({ format, formats, inputFromRef, inputToRef, on
             ? [val, undefined]
             : [firstVal, val];
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const [sortedFrom, sortedTo] = onChange(newValue);
+        const [sortedFrom, sortedTo] = onChange(newValue, {
+            from: (nextFrom) => nextFrom,
+            to: (nextTo) => {
+                if (!nextTo)
+                    return nextTo;
+                /** week mode should use the last day of the week (default is the first day) */
+                return mode === 'week' ? addDay(nextTo, 6) : nextTo;
+            },
+        });
         if (sortedFrom && sortedTo) {
             onChangeProp === null || onChangeProp === void 0 ? void 0 : onChangeProp([sortedFrom, sortedTo]);
         }

package/Picker/useRangePickerValue.d.ts

@@ -9,7 +9,10 @@ export interface UseRangePickerValueProps extends Pick<UsePickerValueProps, 'for
 export declare function useRangePickerValue({ format, formats, inputFromRef, inputToRef, value: valueProp, }: UseRangePickerValueProps): {
     inputFromValue: string;
     inputToValue: string;
-    onChange: (target?: RangePickerPickingValue) => RangePickerPickingValue | undefined;
+    onChange: (target?: RangePickerPickingValue, callback?: {
+        from: (date?: string) => string | undefined;
+        to: (date?: string) => string | undefined;
+    }) => RangePickerPickingValue | undefined;
     onFromBlur: import("react").FocusEventHandler<HTMLInputElement>;
     onFromKeyDown: KeyboardEventHandler<HTMLInputElement>;
     onInputFromChange: ChangeEventHandler<HTMLInputElement>;

package/Picker/useRangePickerValue.js

@@ -23,16 +23,21 @@ function useRangePickerValue({ format, formats, inputFromRef, inputToRef, value:
         inputRef: inputToRef,
     });
     const value = [from, to];
-    const onChange = (target) => {
+    const onChange = (target, callback = {
+        from: (date) => date,
+        to: (date) => date,
+    }) => {
         const [newFrom, newTo] = target || [];
         if (newFrom && newTo) {
             const sortedVal = sortValues([newFrom, newTo]);
-            onFromChange(sortedVal[0]);
-            onToChange(sortedVal[1]);
-            return sortedVal;
+            const resolvedFrom = callback.from(sortedVal[0]);
+            const resolvedTo = callback.to(sortedVal[1]);
+            onFromChange(resolvedFrom);
+            onToChange(resolvedTo);
+            return [resolvedFrom, resolvedTo];
         }
-        onFromChange(target === null || target === void 0 ? void 0 : target[0]);
-        onToChange(target === null || target === void 0 ? void 0 : target[1]);
+        onFromChange(callback.from(target === null || target === void 0 ? void 0 : target[0]));
+        onToChange(callback.to(target === null || target === void 0 ? void 0 : target[1]));
         return target;
     };
     const onOrderGuardedInputFromChange = (event) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezzanine-ui/react",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "description": "React components for mezzanine-ui",
   "author": "Mezzanine",
   "repository": {
@@ -28,9 +28,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@mezzanine-ui/core": "^0.14.5",
-    "@mezzanine-ui/icons": "^0.14.5",
-    "@mezzanine-ui/system": "^0.14.5",
+    "@mezzanine-ui/core": "^0.14.6",
+    "@mezzanine-ui/icons": "^0.14.6",
+    "@mezzanine-ui/system": "^0.14.6",
     "@popperjs/core": "^2.11.6",
     "@types/react-transition-group": "^4.4.8",
     "clsx": "^2.0.0",