@ucloud-fe/react-components 1.4.2 → 1.4.5

package/lib/components/DatePicker/Range.js

@@ -214,6 +214,13 @@ var Range = function Range(_ref2) {
       shortcutsS = _ref6[0],
       shortcutsE = _ref6[1];
 
+  var startRangeInputRef = (0, _react.useRef)(null);
+
+  var _useState7 = (0, _react.useState)(200),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      startRangeInputWidth = _useState8[0],
+      setStartRangeInputWidth = _useState8[1];
+
   (0, _useDidMount.default)(function () {
     (0, _newArrowCheck2.default)(this, _this3);
 
@@ -233,7 +240,7 @@ var Range = function Range(_ref2) {
     onInitialChange && onInitialChange(initialValue);
     updateValueWithoutCallOnChange(initialValue);
   }.bind(this));
-  var handleStartChange = (0, _react.useCallback)(function (value) {
+  var handleStartChange = (0, _react.useCallback)(function (value, isClear) {
     (0, _newArrowCheck2.default)(this, _this3);
 
     var _cacheValue = (0, _slicedToArray2.default)(cacheValue, 2),
@@ -243,15 +250,21 @@ var Range = function Range(_ref2) {
     var rangeDateValidResult = (0, _utils.isRangeDateValid)(newValue, rules, precision);
     setRangeError(undefined);
 
-    if (rangeDateValidResult !== true) {
+    if (isClear) {
+      var _actionRefS$current, _actionRefE$current;
+
+      onChange(newValue);
+      (_actionRefS$current = actionRefS.current) === null || _actionRefS$current === void 0 ? void 0 : _actionRefS$current.hide();
+      (_actionRefE$current = actionRefE.current) === null || _actionRefE$current === void 0 ? void 0 : _actionRefE$current.hide();
+    } else if (rangeDateValidResult !== true) {
       var _inputRefE$current;
 
       (_inputRefE$current = inputRefE.current) === null || _inputRefE$current === void 0 ? void 0 : _inputRefE$current.focus();
 
       if (rangeDateValidResult === 'startGreaterThanEnd') {
-        var _actionRefE$current;
+        var _actionRefE$current2;
 
-        (_actionRefE$current = actionRefE.current) === null || _actionRefE$current === void 0 ? void 0 : _actionRefE$current.clear();
+        (_actionRefE$current2 = actionRefE.current) === null || _actionRefE$current2 === void 0 ? void 0 : _actionRefE$current2.clear();
       } else {
         setRangeError(locale[rangeDateValidResult + 'Tip']);
       }
@@ -267,7 +280,7 @@ var Range = function Range(_ref2) {
 
     setCacheValue(newValue);
   }.bind(this), [cacheValue, rules, precision, isFirstEditing, locale, onChange]);
-  var handleEndChange = (0, _react.useCallback)(function (value) {
+  var handleEndChange = (0, _react.useCallback)(function (value, isClear) {
     (0, _newArrowCheck2.default)(this, _this3);
 
     var _cacheValue2 = (0, _slicedToArray2.default)(cacheValue, 1),
@@ -277,15 +290,21 @@ var Range = function Range(_ref2) {
     var rangeDateValidResult = (0, _utils.isRangeDateValid)(newValue, rules, precision);
     setRangeError(undefined);
 
-    if (rangeDateValidResult !== true) {
+    if (isClear) {
+      var _actionRefS$current2, _actionRefE$current3;
+
+      onChange(newValue);
+      (_actionRefS$current2 = actionRefS.current) === null || _actionRefS$current2 === void 0 ? void 0 : _actionRefS$current2.hide();
+      (_actionRefE$current3 = actionRefE.current) === null || _actionRefE$current3 === void 0 ? void 0 : _actionRefE$current3.hide();
+    } else if (rangeDateValidResult !== true) {
       var _inputRefS$current;
 
       (_inputRefS$current = inputRefS.current) === null || _inputRefS$current === void 0 ? void 0 : _inputRefS$current.focus();
 
       if (rangeDateValidResult === 'startGreaterThanEnd') {
-        var _actionRefS$current;
+        var _actionRefS$current3;
 
-        (_actionRefS$current = actionRefS.current) === null || _actionRefS$current === void 0 ? void 0 : _actionRefS$current.clear();
+        (_actionRefS$current3 = actionRefS.current) === null || _actionRefS$current3 === void 0 ? void 0 : _actionRefS$current3.clear();
       } else {
         setRangeError(locale[rangeDateValidResult + 'Tip']);
       }
@@ -301,6 +320,14 @@ var Range = function Range(_ref2) {
 
     setCacheValue(newValue);
   }.bind(this), [cacheValue, rules, precision, isFirstEditing, locale, onChange]);
+  var onClearS = (0, _react.useCallback)(function () {
+    (0, _newArrowCheck2.default)(this, _this3);
+    handleStartChange(null, true);
+  }.bind(this), [handleStartChange]);
+  var onClearE = (0, _react.useCallback)(function () {
+    (0, _newArrowCheck2.default)(this, _this3);
+    handleEndChange(null, true);
+  }.bind(this), [handleEndChange]);
   var handleOptionChange = (0, _react.useCallback)(function (value) {
     (0, _newArrowCheck2.default)(this, _this3);
     if (value !== 'custom') onChange(getValueFromOption(options, value));
@@ -339,7 +366,8 @@ var Range = function Range(_ref2) {
     nullable: nullableS,
     placeholder: placeholderS,
     shortcuts: shortcutsS,
-    actionRef: actionRefS
+    actionRef: actionRefS,
+    onClear: onClearS
   }, sharedPickerProps), {}, {
     rules: isFirstEditing === 2 ? _objectSpread(_objectSpread({}, rules), {}, {
       range: [(_rules$range = rules.range) === null || _rules$range === void 0 ? void 0 : _rules$range[0], cacheValue[1]]
@@ -367,7 +395,8 @@ var Range = function Range(_ref2) {
     nullable: nullableE,
     placeholder: placeholderE,
     shortcuts: shortcutsE,
-    actionRef: actionRefE
+    actionRef: actionRefE,
+    onClear: onClearE
   }, sharedPickerProps), {}, {
     rules: isFirstEditing === 2 ? _objectSpread(_objectSpread({}, rules), {}, {
       range: [cacheValue[0], (_rules$range2 = rules.range) === null || _rules$range2 === void 0 ? void 0 : _rules$range2[1]]
@@ -401,6 +430,15 @@ var Range = function Range(_ref2) {
       }.bind(this));
     }
   }.bind(this), [activeE, activeS]);
+  (0, _react.useEffect)(function () {
+    (0, _newArrowCheck2.default)(this, _this3);
+
+    if (activeE) {
+      var _startRangeInputRef$c;
+
+      setStartRangeInputWidth(((_startRangeInputRef$c = startRangeInputRef.current) === null || _startRangeInputRef$c === void 0 ? void 0 : _startRangeInputRef$c.offsetWidth) || 200);
+    }
+  }.bind(this), [activeE]);
   var CalendarComp = isMonth ? _Calendar.default.Month : hasTime ? _Calendar.default : _Calendar.TwoSide;
   return /*#__PURE__*/_react.default.createElement(_style.RangeContainer, (0, _extends2.default)({}, rest, {
     disabled: disabled
@@ -417,7 +455,11 @@ var Range = function Range(_ref2) {
     visible: activeS || activeE,
     popup: /*#__PURE__*/_react.default.createElement(_style.SPopup, (0, _extends2.default)({}, popupProps, {
       endInputHighlight: activeE
-    }, inputWrapPropsS), /*#__PURE__*/_react.default.createElement(_style.Arrow, null), /*#__PURE__*/_react.default.createElement(_style.RangeCalendarWrap, {
+    }), /*#__PURE__*/_react.default.createElement(_style.Arrow, {
+      style: {
+        left: activeE ? startRangeInputWidth + 'px' : '20px'
+      }
+    }), /*#__PURE__*/_react.default.createElement(_style.RangeCalendarWrap, {
       visible: activeS
     }, /*#__PURE__*/_react.default.createElement(CalendarComp, (0, _extends2.default)({}, calendarPropsS, {
       rangeValue: [calendarPropsS.value, cacheValue === null || cacheValue === void 0 ? void 0 : cacheValue[1]],
@@ -443,7 +485,9 @@ var Range = function Range(_ref2) {
     status: status || contextStatus
   }, readonly ? /*#__PURE__*/_react.default.createElement("span", {
     className: _style.readonlyInputCls
-  }, inputPropsS.value) : /*#__PURE__*/_react.default.createElement(_style.RangeInputWrap, inputWrapPropsS, /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({}, inputPropsS, {
+  }, inputPropsS.value) : /*#__PURE__*/_react.default.createElement(_style.RangeInputWrap, (0, _extends2.default)({}, inputWrapPropsS, {
+    ref: startRangeInputRef
+  }), /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({}, inputPropsS, {
     ref: inputRefS
   }))), readonly ? /*#__PURE__*/_react.default.createElement("span", {
     className: _style.readonlyInputCls

package/lib/components/DatePicker/style/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { InputProps } from '../../../components/Input';
-import { Theme, Size } from '../../../style';
+import { Size } from '../../../style';
 export declare const prefixCls: string;
 export declare const dateSeparatorCls: string;
 export declare const shortcutCls: string;
@@ -17,7 +17,7 @@ export declare const PickerContainer: import("react").ForwardRefExoticComponent<
     hasTime?: boolean | undefined;
     status?: InputProps['status'];
 } & import("react").HTMLAttributes<HTMLDivElement> & {
-    theme?: Theme | undefined;
+    theme?: import("../../../style").Theme | undefined;
 } & import("react").RefAttributes<HTMLDivElement>>;
 export declare const SPopup: import("react").ForwardRefExoticComponent<{
     endInputHighlight: boolean;
@@ -27,7 +27,7 @@ export declare const SPopup: import("react").ForwardRefExoticComponent<{
     hasSuffix?: boolean | undefined;
     clearable?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLElement> & {
-    theme?: Theme | undefined;
+    theme?: import("../../../style").Theme | undefined;
 } & import("react").RefAttributes<HTMLElement>>;
 export declare const SRangeInputWrap: import("react").ForwardRefExoticComponent<{
     size: Size;
@@ -36,12 +36,12 @@ export declare const SRangeInputWrap: import("react").ForwardRefExoticComponent<
     readonly?: boolean | undefined;
     status?: string | undefined;
 } & import("react").HTMLAttributes<HTMLElement> & {
-    theme?: Theme | undefined;
+    theme?: import("../../../style").Theme | undefined;
 } & import("react").RefAttributes<HTMLElement>>;
 export declare const RangeContainer: import("react").ForwardRefExoticComponent<{
     disabled?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLElement> & {
-    theme?: Theme | undefined;
+    theme?: import("../../../style").Theme | undefined;
 } & import("react").RefAttributes<HTMLElement>>;
 export declare const RangeInputWrap: import("react").ForwardRefExoticComponent<{
     isMonth?: boolean | undefined;
@@ -53,7 +53,7 @@ export declare const RangeInputWrap: import("react").ForwardRefExoticComponent<{
     status?: InputProps['status'];
     isEnd?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLElement> & {
-    theme?: Theme | undefined;
+    theme?: import("../../../style").Theme | undefined;
 } & import("react").RefAttributes<HTMLElement>>;
 export declare const RangeSelect: import("@emotion/styled-base").StyledComponent<import("../../Select/Select").SelectProps & Omit<import("react").HTMLAttributes<HTMLDivElement>, keyof import("../../Select/Select").SelectProps>, Pick<import("../../Select/Select").SelectProps & Omit<import("react").HTMLAttributes<HTMLDivElement>, keyof import("../../Select/Select").SelectProps>, "className" | "defaultChecked" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "css" | keyof import("../../Select/Select").SelectProps>, object>;
 export declare const Arrow: import("@emotion/styled-base").StyledComponent<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, Pick<import("react").ClassAttributes<HTMLSpanElement> & import("react").HTMLAttributes<HTMLSpanElement>, keyof import("react").HTMLAttributes<HTMLSpanElement>>, object>;