@king-design/react 3.6.0-beta.0 → 3.6.1

package/components/datepicker/index.d.ts

@@ -1,14 +1,13 @@
 import { TypeDefs } from 'intact-react';
 import dayjs from './dayjs';
-import { State } from '../../hooks/useState';
 import { Shortcut } from './shortcuts';
-import { BasePicker, BasePickerProps, BasePickerEvents, BasePickerBlocks, Value } from './basepicker';
+import { BasePicker, BasePickerProps, BasePickerEvents, BasePickerBlocks } from './basepicker';
+import { Value } from './useValueBase';
 export * as shortcuts from './shortcuts';
 export { dayjs };
 export interface DatepickerProps<V extends Value = Value, M extends boolean = boolean, R extends boolean = boolean> extends BasePickerProps<V extends string ? V : V | string, M, R> {
     type?: 'date' | 'datetime' | 'year' | 'month' | 'week' | 'quarter';
     shortcuts?: Shortcut[];
-    isMerge?: boolean;
 }
 export interface DatepickerEvents extends BasePickerEvents {
 }
@@ -28,52 +27,45 @@ export declare class Datepicker<V extends Value = Value, M extends boolean = fal
     };
     disabled: {
         isDisabled: (value: dayjs.Dayjs, type?: "h" | "s" | "y" | "date" | "month" | "week" | "millisecond" | "second" | "minute" | "hour" | "day" | "year" | "milliseconds" | "seconds" | "minutes" | "hours" | "days" | "months" | "years" | "dates" | "d" | "D" | "M" | "m" | "ms" | "weeks" | "w" | "quarter" | "quarters" | "Q") => boolean;
-        isDisabledTime: (value: dayjs.Dayjs, flag: import("./usePanel").PanelFlags) => boolean;
+        isDisabledTime: (value: dayjs.Dayjs) => boolean;
         isDisabledConfirm: () => boolean;
-        maxDate: State<dayjs.Dayjs | null>;
-        minDate: State<dayjs.Dayjs | null>;
+        isDisabledValue: (value: import("./useValueBase").StateValueItem) => boolean;
+        maxDate: import("../../hooks/useState").State<dayjs.Dayjs | null>;
+        minDate: import("../../hooks/useState").State<dayjs.Dayjs | null>;
     };
     panel: {
-        startPanel: State<import("./usePanel").PanelTypes>;
-        endPanel: State<import("./usePanel").PanelTypes>;
-        changePanel: (type: import("./usePanel").PanelTypes, flag?: import("./usePanel").PanelFlags) => void;
-        getPanel: (flag: import("./usePanel").PanelFlags) => State<import("./usePanel").PanelTypes>;
-        reset: () => void;
         startRef: import('intact-react').RefObject<import("./calendar").DatepickerCalendar>;
         endRef: import('intact-react').RefObject<import("./calendar").DatepickerCalendar>;
     };
     focusDate: {
-        focusDate: State<dayjs.Dayjs | null>;
+        focusDate: import("../../hooks/useState").State<dayjs.Dayjs | null>;
         reset: () => void;
     };
     value: {
         format: () => string | string[];
-        onConfirm: () => void;
+        formatSingleValue: (value: import("./useValueBase").StateValueItem) => string;
         onChangeTime: (date: dayjs.Dayjs, flag: import("./usePanel").PanelFlags) => void;
         getTimeValue: (flag: import("./usePanel").PanelFlags) => dayjs.Dayjs | null | undefined;
-        convertToDayjs: (v: Value | [Value, Value] | Value[] | [Value, Value][] | null | undefined) => import("./basepicker").DayjsValue;
-        getDayjsValue: () => import("./basepicker").DayjsValue;
+        convertToDayjs: (v: Value | [Value, Value] | Value[] | [Value, Value][] | null | undefined) => import("./useValueBase").DayjsValue;
+        unique: () => void;
         setMoment: () => void;
-        value: State<import("./basepicker").StateValue>;
-        setValue: (v: import("./basepicker").StateValueItem, fromInput: boolean) => void;
+        updateValue: () => void;
+        value: import("../../hooks/useState").State<import("./useValueBase").StateValue>;
+        setValue: (v: import("./useValueBase").StateValueItem, fromInput: boolean) => void;
         onChangeDate: (v: dayjs.Dayjs, flag: import("./usePanel").PanelFlags) => void;
+        getDayjsValue: () => import("./useValueBase").DayjsValue;
+        allValuesUpdatedInMultipleMode: () => boolean | undefined;
     };
-    activePosition: {
-        position: State<"end" | "start">;
-        charLength: State<number>;
-        startTextLength: State<number>;
-        handleInputClick: (e: MouseEvent) => void;
-        resetPosition: (pos?: "end" | "start") => void;
+    highlight: {
+        position: import("../../hooks/useState").State<import("./useHighlight").Position>;
+        handleInputClick: () => void;
         togglePosition: () => void;
-        setupEventListeners: () => void;
-        resetToStart: () => void;
-    };
-    mergeRange: {
-        formatMultipleValues: (dayjsValue: import("./basepicker").DayjsValue, results: string[]) => string[];
+        highlightWidth: import("../../hooks/useState").State<number>;
+        highlightLeft: import("../../hooks/useState").State<number>;
     };
+    private confirm;
     init(): void;
     protected getPlaceholder(): string | number | boolean | import("misstime/dist/utils/types").VNode<any> | import('intact-react').Children[];
     protected getLabel(): string | string[];
-    protected clear(e: MouseEvent): void;
     private setByShortcut;
 }

package/components/datepicker/index.js

@@ -15,21 +15,22 @@ import { useFormats } from './useFormats';
 import { usePanel } from './usePanel';
 import { useFocusDate } from './useFocusDate';
 import { useKeyboards } from './useKeyboards';
-import { usePosition } from './usePosition';
-import { useMergeRange } from './useMergeRange';
+import { useHighlight } from './useHighlight';
+// import {useMergeRange} from './useMergeRange';
 import { BasePicker } from './basepicker';
+import { useConfirm } from './useConfirm';
 import * as _shortcuts from './shortcuts';
 export { _shortcuts as shortcuts };
 export { dayjs };
 var typeDefs = _extends({}, BasePicker.typeDefs, {
   type: ['date', 'datetime', 'year', 'month', 'week', 'quarter'],
-  shortcuts: Array,
-  isMerge: Boolean
+  shortcuts: Array
+  // isMerge: Boolean
 });
 var defaults = function defaults() {
   return _extends({}, BasePicker.defaults(), {
-    type: 'date',
-    isMerge: false
+    type: 'date'
+    // isMerge: false
   });
 };
 export var Datepicker = /*#__PURE__*/function (_BasePicker) {
@@ -42,12 +43,17 @@ export var Datepicker = /*#__PURE__*/function (_BasePicker) {
     }
     _this = _BasePicker.call.apply(_BasePicker, _concatInstanceProperty(_context = [this]).call(_context, args)) || this;
     _this.formats = useFormats();
-    _this.disabled = useDisabled(_this.formats);
+    _this.disabled = useDisabled(_this.formats, function () {
+      return _this.highlight.position;
+    });
     _this.panel = usePanel();
     _this.focusDate = useFocusDate();
-    _this.value = useValue(_this.formats, _this.disabled, _this.panel);
-    _this.activePosition = usePosition();
-    _this.mergeRange = useMergeRange(_this.formats);
+    _this.value = useValue(_this.formats, _this.disabled, _this.panel, function () {
+      return _this.highlight.position;
+    });
+    _this.highlight = useHighlight(_this.value.value, _this.formats.getShowString, _this.input.keywords);
+    // public mergeRange = useMergeRange(this.formats);
+    _this.confirm = useConfirm(_this.highlight, _this.value, _this.formats.getValueString);
     return _this;
   }
   var _proto = Datepicker.prototype;
@@ -55,7 +61,6 @@ export var Datepicker = /*#__PURE__*/function (_BasePicker) {
     _BasePicker.prototype.init.call(this);
     provide(DATEPICKER, this);
     useKeyboards(this.panel.startRef, this.focusDate.focusDate);
-    this.activePosition.setupEventListeners();
   };
   _proto.getPlaceholder = function getPlaceholder() {
     var _this$get = this.get(),
@@ -67,40 +72,26 @@ export var Datepicker = /*#__PURE__*/function (_BasePicker) {
       case 'datetime':
         return range ? _$('开始时间 ~ 结束时间') : _$('请选择日期和时间');
       case 'year':
-        return _$('请选择年份');
+        return range ? _$('开始年份 ~ 结束年份') : _$('请选择年份');
       case 'month':
-        return _$('请选择月份');
+        return range ? _$('开始月份 ~ 结束月份') : _$('请选择月份');
       case 'week':
-        return _$('请选择周');
+        return range ? _$('开始周 ~ 结束周') : _$('请选择周');
       case 'quarter':
-        return _$('请选择季度');
+        return range ? _$('开始季度 ~ 结束季度') : _$('请选择季度');
       default:
         return range ? _$('开始日期 ~ 结束日期') : _$('请选择日期');
     }
   };
   _proto.getLabel = function getLabel() {
-    var _this$get2 = this.get(),
-      multiple = _this$get2.multiple;
-    if (multiple) {
-      var results = this.value.format();
-      var dayjsValue = this.value.getDayjsValue();
-      return this.mergeRange.formatMultipleValues(dayjsValue, results);
-    }
     return this.value.format();
   };
-  _proto.clear = function clear(e) {
-    _BasePicker.prototype.clear.call(this, e);
-    if (this.get('type') === 'datetime') {
-      // reset the state to let user re-select
-      this.panel.reset();
-    }
-  };
   _proto.setByShortcut = function setByShortcut(shortcut) {
     var _this$value = this.value,
       setValue = _this$value.setValue,
       convertToDayjs = _this$value.convertToDayjs;
-    var _this$get3 = this.get(),
-      multiple = _this$get3.multiple;
+    var _this$get2 = this.get(),
+      multiple = _this$get2.multiple;
     setValue(convertToDayjs(shortcut.value())[0], true);
     if (!multiple) {
       this.hide();
@@ -111,5 +102,4 @@ export var Datepicker = /*#__PURE__*/function (_BasePicker) {
 Datepicker.template = template;
 Datepicker.typeDefs = typeDefs;
 Datepicker.defaults = defaults;
-__decorate([bind], Datepicker.prototype, "clear", null);
 __decorate([bind], Datepicker.prototype, "setByShortcut", null);