@pisell/date-picker 1.0.78 → 1.0.80

package/es/PisellDateRangePicker/index.js

@@ -114,7 +114,7 @@ var PisellDateRangePicker = function PisellDateRangePicker(props) {
   var getVal = function getVal() {
     var val = _value;
     if (returnShortcutString) {
-      val = currentShortcut;
+      val = currentShortcut || val;
     } else if (currentShortcut) {
       val = getShortcutValue(currentShortcut, _presets);
     }

package/es/Toolbar/index.js

@@ -88,7 +88,7 @@ var Toolbar = function Toolbar(props) {
       }]);
     }
     return presetItems;
-  }, [presetItems]);
+  }, [presetItems, currentShortcut]);
   return /*#__PURE__*/React.createElement("div", {
     className: "date-picker-toolbar"
   }, /*#__PURE__*/React.createElement("div", {

package/es/internals/utils/date-fields-utils.d.ts

@@ -5,7 +5,7 @@ export declare const splitDateRangeSections: (sections: RangeFieldSection[]) =>
 };
 export declare const removeLastSeparator: (dateSections: RangeFieldSection[]) => (RangeFieldSection | {
     separator: null;
-    dateName: "start" | "end";
+    dateName: "end" | "start";
     value: string;
     format: string;
     maxLength: number | null;

package/es/utils/index.d.ts

@@ -33,10 +33,10 @@ export declare const getShortcutValue: (value: string, preset: any[]) => any;
  * @param value
  * @param preset
  */
-export declare const getDatePickerValueByShortcut: (value: string, preset: any[]) => any;
+export declare const getDatePickerValueByShortcut: (value: string, preset?: any[]) => any;
 /**
  * 获取datePicker 时间值 [dayjs,dayjs]
  * @param value
  * @param preset
  */
-export declare const getDatePickerValue: (value: string | Dayjs[], preset: any[]) => any;
+export declare const getDatePickerValue: (value: string | Dayjs[], preset?: any[]) => any;

package/es/utils/index.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { isFunction, isMobile as isMobileUtils, isString } from "@pisell/utils";
-import { presetDetailMap, presetValueArr } from "../constants";
+import { defaultPresets, presetDetailMap, presetValueArr } from "../constants";
 export var getCurrentLocale = function getCurrentLocale() {
   var locale = localStorage.getItem("umi_locale") || "en-US";
   //@ts-ignore
@@ -91,7 +91,7 @@ export var getShortcutValue = function getShortcutValue(value, preset) {
  * @param preset
  */
 export var getDatePickerValueByShortcut = function getDatePickerValueByShortcut(value, preset) {
-  var p = formatPresets(preset);
+  var p = formatPresets(preset || defaultPresets);
   return getShortcutValue(value, p);
 };
 

package/lib/PisellDateRangePicker/index.js

@@ -120,7 +120,7 @@ var PisellDateRangePicker = (props) => {
   const getVal = () => {
     let val = _value;
     if (returnShortcutString) {
-      val = currentShortcut;
+      val = currentShortcut || val;
     } else if (currentShortcut) {
       val = (0, import_utils2.getShortcutValue)(currentShortcut, _presets);
     }

package/lib/Toolbar/index.js

@@ -108,7 +108,7 @@ var Toolbar = (props) => {
       ]);
     }
     return presetItems;
-  }, [presetItems]);
+  }, [presetItems, currentShortcut]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "date-picker-toolbar" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "date-picker-content-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_locales.getText)("toolbar-date-range-shortcut-date-range")), /* @__PURE__ */ import_react.default.createElement(
     import_browserSelect.default,
     {

package/lib/internals/utils/date-fields-utils.d.ts

@@ -5,7 +5,7 @@ export declare const splitDateRangeSections: (sections: RangeFieldSection[]) =>
 };
 export declare const removeLastSeparator: (dateSections: RangeFieldSection[]) => (RangeFieldSection | {
     separator: null;
-    dateName: "start" | "end";
+    dateName: "end" | "start";
     value: string;
     format: string;
     maxLength: number | null;

package/lib/utils/index.d.ts

@@ -33,10 +33,10 @@ export declare const getShortcutValue: (value: string, preset: any[]) => any;
  * @param value
  * @param preset
  */
-export declare const getDatePickerValueByShortcut: (value: string, preset: any[]) => any;
+export declare const getDatePickerValueByShortcut: (value: string, preset?: any[]) => any;
 /**
  * 获取datePicker 时间值 [dayjs,dayjs]
  * @param value
  * @param preset
  */
-export declare const getDatePickerValue: (value: string | Dayjs[], preset: any[]) => any;
+export declare const getDatePickerValue: (value: string | Dayjs[], preset?: any[]) => any;

package/lib/utils/index.js

@@ -88,7 +88,7 @@ var getShortcutValue = (value, preset) => {
   return ((_a = preset.find((item) => item.value === value || item.label === value)) == null ? void 0 : _a.getValue()) || [];
 };
 var getDatePickerValueByShortcut = (value, preset) => {
-  const p = formatPresets(preset);
+  const p = formatPresets(preset || import_constants.defaultPresets);
   return getShortcutValue(value, p);
 };
 var getDatePickerValue = (value, preset) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/date-picker",
-  "version": "1.0.78",
+  "version": "1.0.80",
   "sideEffects": [
     "*.less"
   ],