@rc-component/picker 1.9.0 → 1.9.1

package/es/PickerInput/RangePicker.js

@@ -355,6 +355,7 @@ function RangePicker(props, ref) {
   var onPresetSubmit = function onPresetSubmit(nextValues) {
     var passed = triggerSubmitChange(nextValues);
     if (passed) {
+      lastOperation('preset-click');
       triggerOpen(false, {
         force: true
       });

package/es/PickerInput/Selector/Input.js

@@ -98,6 +98,8 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // ========================= Refs =========================
   var holderRef = React.useRef(null);
   var inputRef = React.useRef(null);
+  // When mousedown get focus, defer selection to mouseUp so click position is used
+  var mouseDownRef = React.useRef(false);
   React.useImperativeHandle(ref, function () {
     return {
       nativeElement: holderRef.current,
@@ -156,6 +158,12 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   };
   var onFormatPaste = function onFormatPaste(event) {
+    // Block paste until selection is set (after mouseUp when focus was by mousedown)
+    if (mouseDownRef.current) {
+      event.preventDefault();
+      return;
+    }
+
     // Get paste text
     var pasteText = event.clipboardData.getData('text');
     if (validateFormat(pasteText)) {
@@ -166,7 +174,6 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // ======================== Mouse =========================
   // When `mouseDown` get focus, it's better to not to change the selection
   // Since the up position maybe not is the first cell
-  var mouseDownRef = React.useRef(false);
   var onFormatMouseDown = function onFormatMouseDown() {
     mouseDownRef.current = true;
   };
@@ -213,6 +220,11 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onKeyDown === null || onKeyDown === void 0 || onKeyDown(event);
   };
   var onFormatKeyDown = function onFormatKeyDown(event) {
+    // Block key input until selection is set (after mouseUp when focus was by mousedown)
+    if (mouseDownRef.current) {
+      event.preventDefault();
+      return;
+    }
     onSharedKeyDown(event);
     var key = event.key;
 

package/es/PickerInput/Selector/hooks/useClearIcon.d.ts

@@ -5,4 +5,4 @@ import * as React from 'react';
  */
 export declare function fillClearIcon(prefixCls: string, allowClear?: boolean | {
     clearIcon?: ReactNode;
-}, clearIcon?: ReactNode): string | number | true | Iterable<ReactNode> | React.JSX.Element;
+}, clearIcon?: ReactNode): string | number | true | React.JSX.Element | Iterable<ReactNode>;

package/es/PickerInput/hooks/useDisabledBoundary.d.ts

@@ -4,7 +4,4 @@ export type IsInvalidBoundary<DateType> = (currentDate: DateType, type: Internal
 /**
  * Merge `disabledDate` with `minDate` & `maxDate`.
  */
-export default function useDisabledBoundary<DateType extends object = any>(generateConfig: GenerateConfig<DateType>, locale: Locale, disabledDate?: DisabledDate<DateType>, minDate?: DateType, maxDate?: DateType): (date: DateType, info: {
-    type: import("../../interface").PanelMode;
-    from?: DateType;
-}) => boolean;
+export default function useDisabledBoundary<DateType extends object = any>(generateConfig: GenerateConfig<DateType>, locale: Locale, disabledDate?: DisabledDate<DateType>, minDate?: DateType, maxDate?: DateType): DisabledDate<DateType>;

package/es/PickerInput/hooks/useRangeActive.d.ts

@@ -1,5 +1,5 @@
 import type { RangeValueType } from '../RangePicker';
-export type OperationType = 'input' | 'panel';
+export type OperationType = 'input' | 'panel' | 'preset-click';
 export type NextActive<DateType> = (nextValue: RangeValueType<DateType>) => number | null;
 /**
  * When user first focus one input, any submit will trigger focus another one.

package/es/generate/dayjs.js

@@ -101,6 +101,14 @@ var parseNoMatchNotice = function parseNoMatchNotice() {
   // https://github.com/ant-design/ant-design/issues/51839
   // noteOnce(false, 'Not match any format. Please help to fire a issue about this.');
 };
+
+// Use internal dayjs instance to avoid implicit dependency on plugins extended by external dayjs versions
+var getUDayjs = function getUDayjs(value) {
+  if (!dayjs.isDayjs(value) || value instanceof dayjs) {
+    return value;
+  }
+  return dayjs(value.valueOf());
+};
 var generateConfig = {
   // get
   getNow: function getNow() {
@@ -115,80 +123,80 @@ var generateConfig = {
     return dayjs(string, ['YYYY-M-DD', 'YYYY-MM-DD']);
   },
   getEndDate: function getEndDate(date) {
-    return date.endOf('month');
+    return getUDayjs(date).endOf('month');
   },
   getWeekDay: function getWeekDay(date) {
-    var clone = date.locale('en');
+    var clone = getUDayjs(date).locale('en');
     return clone.weekday() + clone.localeData().firstDayOfWeek();
   },
   getYear: function getYear(date) {
-    return date.year();
+    return getUDayjs(date).year();
   },
   getMonth: function getMonth(date) {
-    return date.month();
+    return getUDayjs(date).month();
   },
   getDate: function getDate(date) {
-    return date.date();
+    return getUDayjs(date).date();
   },
   getHour: function getHour(date) {
-    return date.hour();
+    return getUDayjs(date).hour();
   },
   getMinute: function getMinute(date) {
-    return date.minute();
+    return getUDayjs(date).minute();
   },
   getSecond: function getSecond(date) {
-    return date.second();
+    return getUDayjs(date).second();
   },
   getMillisecond: function getMillisecond(date) {
-    return date.millisecond();
+    return getUDayjs(date).millisecond();
   },
   // set
   addYear: function addYear(date, diff) {
-    return date.add(diff, 'year');
+    return getUDayjs(date).add(diff, 'year');
   },
   addMonth: function addMonth(date, diff) {
-    return date.add(diff, 'month');
+    return getUDayjs(date).add(diff, 'month');
   },
   addDate: function addDate(date, diff) {
-    return date.add(diff, 'day');
+    return getUDayjs(date).add(diff, 'day');
   },
   setYear: function setYear(date, year) {
-    return date.year(year);
+    return getUDayjs(date).year(year);
   },
   setMonth: function setMonth(date, month) {
-    return date.month(month);
+    return getUDayjs(date).month(month);
   },
   setDate: function setDate(date, num) {
-    return date.date(num);
+    return getUDayjs(date).date(num);
   },
   setHour: function setHour(date, hour) {
-    return date.hour(hour);
+    return getUDayjs(date).hour(hour);
   },
   setMinute: function setMinute(date, minute) {
-    return date.minute(minute);
+    return getUDayjs(date).minute(minute);
   },
   setSecond: function setSecond(date, second) {
-    return date.second(second);
+    return getUDayjs(date).second(second);
   },
   setMillisecond: function setMillisecond(date, milliseconds) {
-    return date.millisecond(milliseconds);
+    return getUDayjs(date).millisecond(milliseconds);
   },
   // Compare
   isAfter: function isAfter(date1, date2) {
-    return date1.isAfter(date2);
+    return getUDayjs(date1).isAfter(getUDayjs(date2));
   },
   isValidate: function isValidate(date) {
-    return date.isValid();
+    return getUDayjs(date).isValid();
   },
   locale: {
     getWeekFirstDay: function getWeekFirstDay(locale) {
       return dayjs().locale(parseLocale(locale)).localeData().firstDayOfWeek();
     },
     getWeekFirstDate: function getWeekFirstDate(locale, date) {
-      return date.locale(parseLocale(locale)).weekday(0);
+      return getUDayjs(date).locale(parseLocale(locale)).weekday(0);
     },
     getWeek: function getWeek(locale, date) {
-      return date.locale(parseLocale(locale)).week();
+      return getUDayjs(date).locale(parseLocale(locale)).week();
     },
     getShortWeekDays: function getShortWeekDays(locale) {
       return dayjs().locale(parseLocale(locale)).localeData().weekdaysMin();
@@ -197,7 +205,7 @@ var generateConfig = {
       return dayjs().locale(parseLocale(locale)).localeData().monthsShort();
     },
     format: function format(locale, date, _format) {
-      return date.locale(parseLocale(locale)).format(_format);
+      return getUDayjs(date).locale(parseLocale(locale)).format(_format);
     },
     parse: function parse(locale, text, formats) {
       var localeStr = parseLocale(locale);

package/es/utils/getClearIcon.d.ts

@@ -2,4 +2,4 @@ import type { ReactNode } from "react";
 import React from "react";
 export declare function getClearIcon(prefixCls: string, allowClear?: boolean | {
     clearIcon?: ReactNode;
-}, clearIcon?: ReactNode): string | number | true | Iterable<ReactNode> | React.JSX.Element;
+}, clearIcon?: ReactNode): string | number | true | React.JSX.Element | Iterable<ReactNode>;

package/lib/PickerInput/RangePicker.js

@@ -364,6 +364,7 @@ function RangePicker(props, ref) {
   var onPresetSubmit = function onPresetSubmit(nextValues) {
     var passed = triggerSubmitChange(nextValues);
     if (passed) {
+      lastOperation('preset-click');
       triggerOpen(false, {
         force: true
       });

package/lib/PickerInput/Selector/Input.js

@@ -106,6 +106,8 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // ========================= Refs =========================
   var holderRef = React.useRef(null);
   var inputRef = React.useRef(null);
+  // When mousedown get focus, defer selection to mouseUp so click position is used
+  var mouseDownRef = React.useRef(false);
   React.useImperativeHandle(ref, function () {
     return {
       nativeElement: holderRef.current,
@@ -164,6 +166,12 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   };
   var onFormatPaste = function onFormatPaste(event) {
+    // Block paste until selection is set (after mouseUp when focus was by mousedown)
+    if (mouseDownRef.current) {
+      event.preventDefault();
+      return;
+    }
+
     // Get paste text
     var pasteText = event.clipboardData.getData('text');
     if (validateFormat(pasteText)) {
@@ -174,7 +182,6 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // ======================== Mouse =========================
   // When `mouseDown` get focus, it's better to not to change the selection
   // Since the up position maybe not is the first cell
-  var mouseDownRef = React.useRef(false);
   var onFormatMouseDown = function onFormatMouseDown() {
     mouseDownRef.current = true;
   };
@@ -221,6 +228,11 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onKeyDown === null || onKeyDown === void 0 || onKeyDown(event);
   };
   var onFormatKeyDown = function onFormatKeyDown(event) {
+    // Block key input until selection is set (after mouseUp when focus was by mousedown)
+    if (mouseDownRef.current) {
+      event.preventDefault();
+      return;
+    }
     onSharedKeyDown(event);
     var key = event.key;
 

package/lib/PickerInput/Selector/hooks/useClearIcon.d.ts

@@ -5,4 +5,4 @@ import * as React from 'react';
  */
 export declare function fillClearIcon(prefixCls: string, allowClear?: boolean | {
     clearIcon?: ReactNode;
-}, clearIcon?: ReactNode): string | number | true | Iterable<ReactNode> | React.JSX.Element;
+}, clearIcon?: ReactNode): string | number | true | React.JSX.Element | Iterable<ReactNode>;

package/lib/PickerInput/hooks/useDisabledBoundary.d.ts

@@ -4,7 +4,4 @@ export type IsInvalidBoundary<DateType> = (currentDate: DateType, type: Internal
 /**
  * Merge `disabledDate` with `minDate` & `maxDate`.
  */
-export default function useDisabledBoundary<DateType extends object = any>(generateConfig: GenerateConfig<DateType>, locale: Locale, disabledDate?: DisabledDate<DateType>, minDate?: DateType, maxDate?: DateType): (date: DateType, info: {
-    type: import("../../interface").PanelMode;
-    from?: DateType;
-}) => boolean;
+export default function useDisabledBoundary<DateType extends object = any>(generateConfig: GenerateConfig<DateType>, locale: Locale, disabledDate?: DisabledDate<DateType>, minDate?: DateType, maxDate?: DateType): DisabledDate<DateType>;

package/lib/PickerInput/hooks/useRangeActive.d.ts

@@ -1,5 +1,5 @@
 import type { RangeValueType } from '../RangePicker';
-export type OperationType = 'input' | 'panel';
+export type OperationType = 'input' | 'panel' | 'preset-click';
 export type NextActive<DateType> = (nextValue: RangeValueType<DateType>) => number | null;
 /**
  * When user first focus one input, any submit will trigger focus another one.

package/lib/generate/dayjs.js

@@ -108,6 +108,14 @@ var parseNoMatchNotice = function parseNoMatchNotice() {
   // https://github.com/ant-design/ant-design/issues/51839
   // noteOnce(false, 'Not match any format. Please help to fire a issue about this.');
 };
+
+// Use internal dayjs instance to avoid implicit dependency on plugins extended by external dayjs versions
+var getUDayjs = function getUDayjs(value) {
+  if (!_dayjs.default.isDayjs(value) || value instanceof _dayjs.default) {
+    return value;
+  }
+  return (0, _dayjs.default)(value.valueOf());
+};
 var generateConfig = {
   // get
   getNow: function getNow() {
@@ -122,80 +130,80 @@ var generateConfig = {
     return (0, _dayjs.default)(string, ['YYYY-M-DD', 'YYYY-MM-DD']);
   },
   getEndDate: function getEndDate(date) {
-    return date.endOf('month');
+    return getUDayjs(date).endOf('month');
   },
   getWeekDay: function getWeekDay(date) {
-    var clone = date.locale('en');
+    var clone = getUDayjs(date).locale('en');
     return clone.weekday() + clone.localeData().firstDayOfWeek();
   },
   getYear: function getYear(date) {
-    return date.year();
+    return getUDayjs(date).year();
   },
   getMonth: function getMonth(date) {
-    return date.month();
+    return getUDayjs(date).month();
   },
   getDate: function getDate(date) {
-    return date.date();
+    return getUDayjs(date).date();
   },
   getHour: function getHour(date) {
-    return date.hour();
+    return getUDayjs(date).hour();
   },
   getMinute: function getMinute(date) {
-    return date.minute();
+    return getUDayjs(date).minute();
   },
   getSecond: function getSecond(date) {
-    return date.second();
+    return getUDayjs(date).second();
   },
   getMillisecond: function getMillisecond(date) {
-    return date.millisecond();
+    return getUDayjs(date).millisecond();
   },
   // set
   addYear: function addYear(date, diff) {
-    return date.add(diff, 'year');
+    return getUDayjs(date).add(diff, 'year');
   },
   addMonth: function addMonth(date, diff) {
-    return date.add(diff, 'month');
+    return getUDayjs(date).add(diff, 'month');
   },
   addDate: function addDate(date, diff) {
-    return date.add(diff, 'day');
+    return getUDayjs(date).add(diff, 'day');
   },
   setYear: function setYear(date, year) {
-    return date.year(year);
+    return getUDayjs(date).year(year);
   },
   setMonth: function setMonth(date, month) {
-    return date.month(month);
+    return getUDayjs(date).month(month);
   },
   setDate: function setDate(date, num) {
-    return date.date(num);
+    return getUDayjs(date).date(num);
   },
   setHour: function setHour(date, hour) {
-    return date.hour(hour);
+    return getUDayjs(date).hour(hour);
   },
   setMinute: function setMinute(date, minute) {
-    return date.minute(minute);
+    return getUDayjs(date).minute(minute);
   },
   setSecond: function setSecond(date, second) {
-    return date.second(second);
+    return getUDayjs(date).second(second);
   },
   setMillisecond: function setMillisecond(date, milliseconds) {
-    return date.millisecond(milliseconds);
+    return getUDayjs(date).millisecond(milliseconds);
   },
   // Compare
   isAfter: function isAfter(date1, date2) {
-    return date1.isAfter(date2);
+    return getUDayjs(date1).isAfter(getUDayjs(date2));
   },
   isValidate: function isValidate(date) {
-    return date.isValid();
+    return getUDayjs(date).isValid();
   },
   locale: {
     getWeekFirstDay: function getWeekFirstDay(locale) {
       return (0, _dayjs.default)().locale(parseLocale(locale)).localeData().firstDayOfWeek();
     },
     getWeekFirstDate: function getWeekFirstDate(locale, date) {
-      return date.locale(parseLocale(locale)).weekday(0);
+      return getUDayjs(date).locale(parseLocale(locale)).weekday(0);
     },
     getWeek: function getWeek(locale, date) {
-      return date.locale(parseLocale(locale)).week();
+      return getUDayjs(date).locale(parseLocale(locale)).week();
     },
     getShortWeekDays: function getShortWeekDays(locale) {
       return (0, _dayjs.default)().locale(parseLocale(locale)).localeData().weekdaysMin();
@@ -204,7 +212,7 @@ var generateConfig = {
       return (0, _dayjs.default)().locale(parseLocale(locale)).localeData().monthsShort();
     },
     format: function format(locale, date, _format) {
-      return date.locale(parseLocale(locale)).format(_format);
+      return getUDayjs(date).locale(parseLocale(locale)).format(_format);
     },
     parse: function parse(locale, text, formats) {
       var localeStr = parseLocale(locale);

package/lib/utils/getClearIcon.d.ts

@@ -2,4 +2,4 @@ import type { ReactNode } from "react";
 import React from "react";
 export declare function getClearIcon(prefixCls: string, allowClear?: boolean | {
     clearIcon?: ReactNode;
-}, clearIcon?: ReactNode): string | number | true | Iterable<ReactNode> | React.JSX.Element;
+}, clearIcon?: ReactNode): string | number | true | React.JSX.Element | Iterable<ReactNode>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/picker",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "React date & time picker",
   "keywords": [
     "react",