@onesy/ui-react 1.0.195 → 1.0.197

package/DatePicker/DatePicker.js

@@ -143,19 +143,19 @@ const DatePicker = props__ => {
       ref,
       tonal,
       color = 'primary',
-      version: version_ = 'auto',
+      version: versionProps = 'auto',
       size = 'regular',
-      value: value_,
+      value: valueProps,
       valueDefault,
       onChange,
-      calendar: calendar_,
+      calendar: calendarProps,
       calendarDefault,
       onChangeCalendar,
       range,
       now,
-      static: static_,
+      static: staticProps,
       openMobile = 'select',
-      placeholder: placeholder_,
+      placeholder: placeholderProps,
       calendars = props.range ? 2 : 1,
       min,
       max,
@@ -163,31 +163,31 @@ const DatePicker = props__ => {
       name,
       nameFrom,
       nameTo,
-      label: label_,
-      labelFrom: labelFrom_ = l('Date from'),
-      labelTo: labelTo_ = l('Date to'),
+      label: labelProps,
+      labelFrom: labelFromProps = l('Date from'),
+      labelTo: labelToProps = l('Date to'),
       modeModalSubHeadingText = l('Select date'),
       modeModalSubHeadingTextRange = `${l('Date from')}${SEPARATOR}${l('Date to')}`,
       selectModeHeadingText = l('Select date'),
       inputModeHeadingText = l('Enter date'),
-      useHelperText: useHelperText_,
+      useHelperText: useHelperTextProps,
       weekStartDay = 'Monday',
-      switch: switch__,
+      switch: switchProps,
       fullScreen,
       today,
       clear = true,
-      heading: heading_ = true,
-      actions: actions_ = true,
+      heading: headingProps = true,
+      actions: actionsProps = true,
       fullWidth,
       readOnly,
       disabled,
-      valid: valid_,
-      onClick: onClick_,
-      onClose: onClose_,
-      onToday: onToday_,
-      onClear: onClear_,
-      onCancel: onCancel_,
-      onOk: onOk_,
+      valid: validProps,
+      onClick: onClickProps,
+      onClose: onCloseProps,
+      onToday: onTodayProps,
+      onClear: onClearProps,
+      onCancel: onCancelProps,
+      onOk: onOkProps,
       Icon: Icon_ = _IconMaterialCalendarTodayW100Filled.default,
       IconEnter = _IconMaterialEditW.default,
       IconClose = _IconMaterialCloseW.default,
@@ -213,21 +213,21 @@ const DatePicker = props__ => {
   };
   const keys = _react.default.useMemo(() => {
     const result = [];
-    const items = [switch__, useHelperText_];
+    const items = [switchProps, useHelperTextProps];
     items.forEach(item => {
       if ((0, _utils.is)('object', item)) Object.keys(item).filter(key => theme.breakpoints.media[key]).forEach(key_0 => result.push(key_0));
     });
     return (0, _utils.unique)(result);
-  }, [switch__, useHelperText_]);
+  }, [switchProps, useHelperTextProps]);
   const breakpoints = {};
   keys.forEach(key_1 => {
     breakpoints[key_1] = (0, _useMediaQuery.default)(theme.breakpoints.media[key_1], {
       element: refs.root.current
     });
   });
-  const label = name !== undefined ? name : label_;
-  const switch_ = (0, _utils2.valueBreakpoints)(switch__, true, breakpoints, theme);
-  const useHelperText = (0, _utils2.valueBreakpoints)(useHelperText_, undefined, breakpoints, theme);
+  const label = name !== undefined ? name : labelProps;
+  const switch_ = (0, _utils2.valueBreakpoints)(switchProps, true, breakpoints, theme);
+  const useHelperText = (0, _utils2.valueBreakpoints)(useHelperTextProps, undefined, breakpoints, theme);
   const touch = (0, _useMediaQuery.default)('(pointer: coarse)', {
     element: refs.root.current
   });
@@ -237,10 +237,10 @@ const DatePicker = props__ => {
     return sorted;
   };
   const [value, setValue] = _react.default.useState(() => {
-    const valueResult = (valueDefault !== undefined ? valueDefault : value_) || now && (range ? [new _date.OnesyDate(), new _date.OnesyDate()] : [new _date.OnesyDate()]);
+    const valueResult = (valueDefault !== undefined ? valueDefault : valueProps) || now && (range ? [new _date.OnesyDate(), new _date.OnesyDate()] : [new _date.OnesyDate()]);
     return onResolveValue(valueResult);
   });
-  const [calendar, setCalendar] = _react.default.useState((calendarDefault !== undefined ? calendarDefault : calendar_) || new _date.OnesyDate());
+  const [calendar, setCalendar] = _react.default.useState((calendarDefault !== undefined ? calendarDefault : calendarProps) || new _date.OnesyDate());
   const [open, setOpen] = _react.default.useState(false);
   const [mode, setMode] = _react.default.useState((touch ? openMobile : 'select') || 'select');
   const [error, setError] = _react.default.useState(false);
@@ -261,7 +261,7 @@ const DatePicker = props__ => {
   };
   const [input, setInput] = _react.default.useState(valueToInput());
   const [inputModal, setInputModal] = _react.default.useState(valueToInput());
-  let version = version_;
+  let version = versionProps;
   if (version === 'auto') {
     if (touch) version = 'mobile';else version = 'desktop';
   }
@@ -294,21 +294,21 @@ const DatePicker = props__ => {
 
   // Value
   _react.default.useEffect(() => {
-    if (value_ !== undefined && value_ !== value) onUpdateValue(value_);
-  }, [value_]);
+    if (valueProps !== undefined && valueProps !== value) onUpdateValue(valueProps);
+  }, [valueProps]);
 
   // Calendar
   _react.default.useEffect(() => {
-    if (calendar_ !== undefined && calendar_ !== calendar) setCalendar(calendar_);
-  }, [calendar_]);
+    if (calendarProps !== undefined && calendarProps !== calendar) setCalendar(calendarProps);
+  }, [calendarProps]);
   const onUpdate = (valueNew_3, triggerOnChange = true) => {
     // Inner update
-    if (!props.hasOwnProperty('value')) setValue(valueNew_3);
+    if (!props.hasOwnProperty('value') || !triggerOnChange) setValue(valueNew_3);
     if (triggerOnChange && (0, _utils.is)('function', onChange)) onChange(!range ? valueNew_3[0] : valueNew_3);
   };
   const onUpdateCalendar = (valueNew_4, triggerOnChange_0 = true) => {
     // Inner update
-    if (!props.hasOwnProperty('calendar')) setCalendar(valueNew_4);
+    if (!props.hasOwnProperty('calendar') || !triggerOnChange_0) setCalendar(valueNew_4);
     if (triggerOnChange_0 && (0, _utils.is)('function', onChangeCalendar)) onChangeCalendar(valueNew_4);
   };
 
@@ -319,7 +319,7 @@ const DatePicker = props__ => {
   const onCalendarChange = valueNew__0 => {
     const valueNew_5 = onResolveValue(valueNew__0);
     if (valueNew_5 !== value) {
-      (!actions_ ? onUpdate : setValue)(valueNew_5);
+      (!actionsProps ? onUpdate : setValue)(valueNew_5);
 
       // Update input modal
       setInputModal(valueToInput(valueNew_5));
@@ -342,7 +342,7 @@ const DatePicker = props__ => {
   };
   const onClose = event => {
     setOpen(false);
-    if ((0, _utils.is)('function', onClose_)) onClose_(event);
+    if ((0, _utils.is)('function', onCloseProps)) onCloseProps(event);
   };
   const onReset = () => {
     var _valueNew_;
@@ -390,7 +390,7 @@ const DatePicker = props__ => {
     // Update input modal
     setInputModal(valueToInput(valueNew_9));
     onClose(event_0);
-    if ((0, _utils.is)('function', onToday_)) onToday_(event_0);
+    if ((0, _utils.is)('function', onTodayProps)) onTodayProps(event_0);
   };
   const onClear = event_1 => {
     const dateNow_1 = new _date.OnesyDate();
@@ -408,7 +408,7 @@ const DatePicker = props__ => {
     // Update input modal
     setInputModal(valueToInput(valueNew_10));
     onClose(event_1);
-    if ((0, _utils.is)('function', onClear_)) onClear_(event_1);
+    if ((0, _utils.is)('function', onClearProps)) onClearProps(event_1);
   };
   const onOk = event_2 => {
     // Error
@@ -423,15 +423,15 @@ const DatePicker = props__ => {
     // Update input modal
     setInputModal(valueToInput(value));
     onClose(event_2);
-    if ((0, _utils.is)('function', onOk_)) onOk_(event_2);
+    if ((0, _utils.is)('function', onOkProps)) onOkProps(event_2);
   };
   const onCancel = event_3 => {
     onReset();
     onClose(event_3);
-    if ((0, _utils.is)('function', onCancel_)) onCancel_(event_3);
+    if ((0, _utils.is)('function', onCancelProps)) onCancelProps(event_3);
   };
   const valid = (...args) => {
-    if ((0, _utils.is)('function', valid_)) return valid_(...args);
+    if ((0, _utils.is)('function', validProps)) return validProps(...args);
     const onesyDate = args[0];
     if (min || max || validate) {
       let response = true;
@@ -513,7 +513,7 @@ const DatePicker = props__ => {
     mask.push(' ', SEPARATOR_SYMBOL, ' ', ...mask);
     placeholder += `${SEPARATOR}${placeholder}`;
   }
-  placeholder = placeholder_ || placeholder;
+  placeholder = placeholderProps || placeholder;
   const buttonProps = _objectSpread({
     color: 'inherit',
     version: 'text',
@@ -602,7 +602,7 @@ const DatePicker = props__ => {
       gap: 0,
       direction: "column",
       className: (0, _styleReact.classNames)([(0, _utils2.staticClassName)('DatePicker', theme) && ['onesy-DatePicker-header'], classes.header, fullScreen && classes.header_fullScreen]),
-      children: [actions_ && fullScreen && /*#__PURE__*/(0, _jsxRuntime.jsxs)(Line, {
+      children: [actionsProps && fullScreen && /*#__PURE__*/(0, _jsxRuntime.jsxs)(Line, {
         gap: 0,
         direction: "row",
         align: "center",
@@ -624,7 +624,7 @@ const DatePicker = props__ => {
         }, buttonProps), {}, {
           children: l('Save')
         }))]
-      }), heading_ && /*#__PURE__*/(0, _jsxRuntime.jsx)(Type, {
+      }), headingProps && /*#__PURE__*/(0, _jsxRuntime.jsx)(Type, {
         version: "l2",
         className: (0, _styleReact.classNames)([(0, _utils2.staticClassName)('DatePicker', theme) && ['onesy-DatePicker-subheading'], classes.subheading, fullScreen && classes.subheading_fullScreen]),
         children: !range ? modeModalSubHeadingText : modeModalSubHeadingTextRange
@@ -735,7 +735,7 @@ const DatePicker = props__ => {
     }), fullScreen && /*#__PURE__*/(0, _jsxRuntime.jsx)(Divider, {
       tonal: false,
       className: (0, _styleReact.classNames)([(0, _utils2.staticClassName)('DatePicker', theme) && ['onesy-DatePicker-divider'], classes.divider])
-    }), actions_ && /*#__PURE__*/_react.default.cloneElement(actions, {
+    }), actionsProps && /*#__PURE__*/_react.default.cloneElement(actions, {
       style: {
         paddingTop: theme.methods.space.value(1, 'px')
       }
@@ -756,11 +756,11 @@ const DatePicker = props__ => {
     min: min,
     max: max,
     validate: validate,
-    belowCalendars: actions_ ? actions : undefined
+    belowCalendars: actionsProps ? actions : undefined
   }, CalendarProps), CalendarPropsDesktop), {}, {
     className: (0, _styleReact.classNames)([(0, _utils2.staticClassName)('DatePicker', theme) && ['onesy-DatePicker-calendar', 'onesy-DatePicker-version-desktop'], CalendarProps === null || CalendarProps === void 0 ? void 0 : CalendarProps.className, CalendarPropsDesktop === null || CalendarPropsDesktop === void 0 ? void 0 : CalendarPropsDesktop.className, classes.calendar, classes.calendar_desktop])
   }));
-  if (static_) {
+  if (staticProps) {
     if (version === 'mobile') return mobile;
     if (version === 'desktop') return desktop;
   }

package/DateTimePicker/DateTimePicker.js

@@ -77,14 +77,14 @@ const DateTimePicker = props__ => {
       ref,
       tonal,
       color = 'primary',
-      version: version_ = 'auto',
-      value: value_,
+      version: versionProps = 'auto',
+      value: valueProps,
       valueDefault,
       onChange,
       label,
       range,
       now,
-      static: static_,
+      static: staticProps,
       min,
       max,
       validate,
@@ -93,7 +93,7 @@ const DateTimePicker = props__ => {
       headingTextTimeRange,
       headingTextDate,
       headingTextDateRange,
-      useHelperText: useHelperText_,
+      useHelperText: useHelperTextProps,
       format = '12',
       hour = true,
       minute = true,
@@ -101,16 +101,16 @@ const DateTimePicker = props__ => {
       today,
       clear = true,
       size,
-      placeholder: placeholder_,
+      placeholder: placeholderProps,
       fullWidth,
       readOnly,
       disabled,
-      valid: valid_,
-      onClose: onClose_,
-      onToday: onToday_,
-      onClear: onClear_,
-      onCancel: onCancel_,
-      onOk: onOk_,
+      valid: validProps,
+      onClose: onCloseProps,
+      onToday: onTodayProps,
+      onClear: onClearProps,
+      onCancel: onCancelProps,
+      onOk: onOkProps,
       Icon: Icon_ = _IconMaterialDateRangeW100Filled.default,
       IconDate = _IconMaterialCalendarTodayW100Filled.default,
       IconTime = _IconMaterialScheduleW.default,
@@ -124,7 +124,7 @@ const DateTimePicker = props__ => {
       ModeDesktopProps,
       ModeMobileProps,
       ButtonProps,
-      PickerProps: PickerProps_,
+      PickerProps: PickerPropsProps,
       MiddleProps,
       MainProps,
       IconProps,
@@ -140,19 +140,19 @@ const DateTimePicker = props__ => {
   };
   const keys = _react.default.useMemo(() => {
     const result = [];
-    const items = [useHelperText_];
+    const items = [useHelperTextProps];
     items.forEach(item => {
       if ((0, _utils.is)('object', item)) Object.keys(item).filter(key => theme.breakpoints.media[key]).forEach(key_0 => result.push(key_0));
     });
     return (0, _utils.unique)(result);
-  }, [useHelperText_]);
+  }, [useHelperTextProps]);
   const breakpoints = {};
   keys.forEach(key_1 => {
     breakpoints[key_1] = (0, _useMediaQuery.default)(theme.breakpoints.media[key_1], {
       element: refs.root.current
     });
   });
-  const useHelperText = (0, _utils2.valueBreakpoints)(useHelperText_, undefined, breakpoints, theme);
+  const useHelperText = (0, _utils2.valueBreakpoints)(useHelperTextProps, undefined, breakpoints, theme);
   const touch = (0, _useMediaQuery.default)('(pointer: coarse)', {
     element: refs.root.current
   });
@@ -162,7 +162,7 @@ const DateTimePicker = props__ => {
     return sorted;
   };
   const [value, setValue] = _react.default.useState(() => {
-    const valueResult = (valueDefault !== undefined ? valueDefault : value_) || now && (range ? [new _date.OnesyDate(), new _date.OnesyDate()] : [new _date.OnesyDate()]);
+    const valueResult = (valueDefault !== undefined ? valueDefault : valueProps) || now && (range ? [new _date.OnesyDate(), new _date.OnesyDate()] : [new _date.OnesyDate()]);
     return onResolveValue(valueResult);
   });
   const [calendar, setCalendar] = _react.default.useState(value[0]);
@@ -194,7 +194,7 @@ const DateTimePicker = props__ => {
     return result_0;
   };
   const [input, setInput] = _react.default.useState(valueToInput());
-  let version = version_;
+  let version = versionProps;
   if (version === 'auto') {
     if (touch) version = 'mobile';else version = 'desktop';
   }
@@ -218,11 +218,11 @@ const DateTimePicker = props__ => {
 
   // Value
   _react.default.useEffect(() => {
-    if (value_ !== undefined && value_ !== value) onUpdateValue(value_);
-  }, [value_]);
+    if (valueProps !== undefined && valueProps !== value) onUpdateValue(valueProps);
+  }, [valueProps]);
   const onUpdate = (valueNew_3, triggerOnChange = true) => {
     // Inner update
-    if (!props.hasOwnProperty('value')) setValue(valueNew_3);
+    if (!props.hasOwnProperty('value') || !triggerOnChange) setValue(valueNew_3);
     if (triggerOnChange && (0, _utils.is)('function', onChange)) onChange(!range ? valueNew_3[0] : valueNew_3);
   };
   const onPickSwitch = () => {
@@ -327,7 +327,7 @@ const DateTimePicker = props__ => {
     // Update input
     setInput(valueToInput(valueNew_10));
     onClose(event);
-    if ((0, _utils.is)('function', onToday_)) onToday_(event);
+    if ((0, _utils.is)('function', onTodayProps)) onTodayProps(event);
   };
   const onClear = event_0 => {
     const valueNew_11 = [];
@@ -338,7 +338,7 @@ const DateTimePicker = props__ => {
     // Update input
     setInput(valueToInput(valueNew_11));
     onClose(event_0);
-    if ((0, _utils.is)('function', onClear_)) onClear_(event_0);
+    if ((0, _utils.is)('function', onClearProps)) onClearProps(event_0);
   };
   const onOk = event_1 => {
     // Error
@@ -350,22 +350,22 @@ const DateTimePicker = props__ => {
     // Update input
     setInput(valueToInput(value));
     onClose(event_1);
-    if ((0, _utils.is)('function', onOk_)) onOk_(event_1);
+    if ((0, _utils.is)('function', onOkProps)) onOkProps(event_1);
   };
   const onCancel = event_2 => {
     onReset();
     onClose(event_2);
-    if ((0, _utils.is)('function', onCancel_)) onCancel_(event_2);
+    if ((0, _utils.is)('function', onCancelProps)) onCancelProps(event_2);
   };
   const onOpen = () => {
     setOpen(previous_0 => !previous_0);
   };
   const onClose = event_3 => {
     setOpen(false);
-    if ((0, _utils.is)('function', onClose_)) onClose_(event_3);
+    if ((0, _utils.is)('function', onCloseProps)) onCloseProps(event_3);
   };
   const valid = (...args) => {
-    if ((0, _utils.is)('function', valid_)) return valid_(...args);
+    if ((0, _utils.is)('function', validProps)) return validProps(...args);
     const onesyDate_0 = args[0];
     if (min || max || validate) {
       let response = true;
@@ -505,7 +505,7 @@ const DateTimePicker = props__ => {
     }
     placeholder += `${_DatePicker2.SEPARATOR}${placeholder}`;
   }
-  placeholder = placeholder_ || placeholder;
+  placeholder = placeholderProps || placeholder;
   const buttonProps = _objectSpread({
     tonal,
     color,
@@ -580,7 +580,7 @@ const DateTimePicker = props__ => {
     heading: false,
     readOnly,
     disabled
-  }, PickerProps_), tab === 'date' && DatePickerProps), tab === 'time' && TimePickerProps);
+  }, PickerPropsProps), tab === 'date' && DatePickerProps), tab === 'time' && TimePickerProps);
   const element = /*#__PURE__*/(0, _jsxRuntime.jsxs)(Surface, {
     gap: 0,
     direction: "column",
@@ -623,7 +623,7 @@ const DateTimePicker = props__ => {
   if (version === 'mobile') {
     if (!(readOnly || disabled)) moreProps.onClick = onOpen;
   }
-  if (static_) return element;
+  if (staticProps) return element;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Line, _objectSpread(_objectSpread({
     gap: 0,
     direction: "column",