@ucloud-fe/react-components 1.2.20 → 1.3.3

package/lib/components/Input/Input.js

@@ -29,8 +29,6 @@ var _ControllerContext = _interopRequireDefault(require("../../components/Form/C
 
 var _deprecatedLog = _interopRequireDefault(require("../../utils/deprecatedLog"));
 
-var _once = _interopRequireDefault(require("../../utils/once"));
-
 var _noop = _interopRequireDefault(require("../../utils/noop"));
 
 var _useUncontrolled3 = _interopRequireDefault(require("../../hooks/useUncontrolled"));
@@ -45,10 +43,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var deprecatedLogForIcon = (0, _once.default)(function () {
-  (0, _newArrowCheck2.default)(this, _this);
-  return (0, _deprecatedLog.default)('Input icon', 'suffix');
-}.bind(void 0));
+var deprecatedLogForIcon = (0, _deprecatedLog.default)('Input icon', 'suffix');
 var Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _this2 = this;
 
@@ -114,14 +109,15 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     setFocused(false);
     onBlur(e);
   }.bind(this), [onBlur]);
-  var onMouseDown = (0, _react.useCallback)(function (e) {
+  var handleClearMouseDown = (0, _react.useCallback)(function (e) {
     (0, _newArrowCheck2.default)(this, _this2);
     e.preventDefault();
-    focus();
-  }.bind(this), [focus]);
+    e.stopPropagation();
+  }.bind(this), []);
   var handleClear = (0, _react.useCallback)(function (e) {
     (0, _newArrowCheck2.default)(this, _this2);
     if (disabled) return;
+    e.stopPropagation();
     onClear();
     var input = inputRef.current;
     if (!input) return;
@@ -131,7 +127,17 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     input.value = '';
     onChange(e);
     input.value = cacheV;
+    input.focus();
   }.bind(this), [disabled, onChange, onClear]);
+  var handleWrapMouseDown = (0, _react.useCallback)(function (e) {
+    var _inputRef$current;
+
+    (0, _newArrowCheck2.default)(this, _this2);
+    // 避免影响输入框的选中、移动光标等操作
+    if (e.target === inputRef.current) return;
+    e.preventDefault();
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+  }.bind(this), []);
   var renderClear = (0, _react.useMemo)(function () {
     (0, _newArrowCheck2.default)(this, _this2);
 
@@ -139,19 +145,18 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       return /*#__PURE__*/_react.default.createElement("span", {
         className: _style.clearCls,
         onClick: handleClear,
-        onMouseDown: onMouseDown
+        onMouseDown: handleClearMouseDown
       }, /*#__PURE__*/_react.default.createElement(_SvgIcon.default, {
         type: "cross-circle-filled"
       }));
     }
-  }.bind(this), [clearable, handleClear, onMouseDown]);
+  }.bind(this), [clearable, handleClear, handleClearMouseDown]);
   var renderPrefix = (0, _react.useMemo)(function () {
     (0, _newArrowCheck2.default)(this, _this2);
     return prefix && /*#__PURE__*/_react.default.createElement("span", {
-      className: _style.inputPrefixCls,
-      onMouseDown: onMouseDown
+      className: _style.inputPrefixCls
     }, prefix);
-  }.bind(this), [onMouseDown, prefix]);
+  }.bind(this), [prefix]);
   var renderSuffix = (0, _react.useMemo)(function () {
     (0, _newArrowCheck2.default)(this, _this2);
 
@@ -173,11 +178,10 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
 
     if (renderSuffix) {
       return /*#__PURE__*/_react.default.createElement("span", {
-        className: _style.inputSuffixCls,
-        onMouseDown: onMouseDown
+        className: _style.inputSuffixCls
       }, renderSuffix);
     }
-  }.bind(this), [icon, onMouseDown, suffix]);
+  }.bind(this), [icon, suffix]);
 
   var _useContext = (0, _react.useContext)(_ControllerContext.default),
       status = _useContext.status;
@@ -190,7 +194,8 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     disabled: disabled,
     status: _status || status,
     customStyle: customStyle,
-    empty: !value
+    empty: !value,
+    onMouseDown: handleWrapMouseDown
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: _style.inputWrapCls
   }, renderPrefix, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, rest, {

package/lib/components/LocaleProvider/LocaleProvider.js

@@ -13,7 +13,7 @@ var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/new
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _runtime = require("./locale/runtime");
+var _runtime = require("./runtime");
 
 var _LocaleContext = _interopRequireDefault(require("./LocaleContext"));
 

package/lib/components/LocaleProvider/locale/en_US.js

@@ -31,7 +31,9 @@ var _en_US11 = _interopRequireDefault(require("../../../components/EditableList/
 
 var _en_US12 = _interopRequireDefault(require("../../../components/Transfer/locale/en_US"));
 
-var _en_US13 = _interopRequireDefault(require("../../../sharedComponents/Search/locale/en_US"));
+var _en_US13 = _interopRequireDefault(require("../../../components/Cascader/locale/en_US"));
+
+var _en_US14 = _interopRequireDefault(require("../../../sharedComponents/Search/locale/en_US"));
 
 var _default = {
   locale: 'en',
@@ -47,6 +49,7 @@ var _default = {
   PopConfirm: _en_US10.default,
   EditableList: _en_US11.default,
   Transfer: _en_US12.default,
-  SharedSearch: _en_US13.default
+  Cascader: _en_US13.default,
+  SharedSearch: _en_US14.default
 };
 exports.default = _default;

package/lib/components/LocaleProvider/locale/zh_CN.js

@@ -31,7 +31,9 @@ var _zh_CN11 = _interopRequireDefault(require("../../../components/EditableList/
 
 var _zh_CN12 = _interopRequireDefault(require("../../../components/Transfer/locale/zh_CN"));
 
-var _zh_CN13 = _interopRequireDefault(require("../../../sharedComponents/Search/locale/zh_CN"));
+var _zh_CN13 = _interopRequireDefault(require("../../../components/Cascader/locale/zh_CN"));
+
+var _zh_CN14 = _interopRequireDefault(require("../../../sharedComponents/Search/locale/zh_CN"));
 
 var _default = {
   locale: 'zh-cn',
@@ -47,6 +49,7 @@ var _default = {
   PopConfirm: _zh_CN10.default,
   EditableList: _zh_CN11.default,
   Transfer: _zh_CN12.default,
-  SharedSearch: _zh_CN13.default
+  Cascader: _zh_CN13.default,
+  SharedSearch: _zh_CN14.default
 };
 exports.default = _default;

package/lib/components/LocaleProvider/localeConsumerDecorator.js

@@ -21,7 +21,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _hoistStatics = _interopRequireDefault(require("../../utils/hoistStatics"));
 
-var _runtime = require("./locale/runtime");
+var _runtime = require("./runtime");
 
 var _LocaleContext = _interopRequireDefault(require("./LocaleContext"));
 

package/lib/components/LocaleProvider/{locale/runtime.d.ts → runtime.d.ts}

@@ -1,4 +1,4 @@
-import { AllLocaleMap } from '../LocaleContext';
+import { AllLocaleMap } from './LocaleContext';
 declare const setRuntimeLocale: (_runtimeLocale: AllLocaleMap) => void;
 declare const getRuntimeLocale: () => AllLocaleMap;
 export { setRuntimeLocale, getRuntimeLocale };

package/lib/components/LocaleProvider/useLocale.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _LocaleContext = _interopRequireDefault(require("./LocaleContext"));
 
-var _runtime = require("./locale/runtime");
+var _runtime = require("./runtime");
 
 var _this = void 0;
 

package/lib/components/Message/Message.js

@@ -11,6 +11,8 @@ exports.default = exports.deprecatedLogForStyleTypeInfo = void 0;
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
+var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/newArrowCheck"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -21,10 +23,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/newArrowCheck"));
-
-var _once2 = _interopRequireDefault(require("lodash/once"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -37,8 +35,6 @@ var _style = require("./style");
 
 var _excluded = ["children", "styleType", "closable", "title", "footer"];
 
-var _this = void 0;
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -47,10 +43,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-var deprecatedLogForStyleTypeInfo = (0, _once2.default)(function () {
-  (0, _newArrowCheck2.default)(this, _this);
-  return (0, _deprecatedLog.default)('Message styleType "info"', '"success"');
-}.bind(void 0));
+var deprecatedLogForStyleTypeInfo = (0, _deprecatedLog.default)('Message styleType "info"', '"success"');
 exports.deprecatedLogForStyleTypeInfo = deprecatedLogForStyleTypeInfo;
 var StyleType = ['default', 'success', 'loading', 'warning', 'error'];
 var IconMap = {
@@ -64,9 +57,9 @@ var Message = /*#__PURE__*/function (_Component) {
   var _super = _createSuper(Message);
 
   function Message() {
-    var _this3 = this;
+    var _this2 = this;
 
-    var _this2;
+    var _this;
 
     (0, _classCallCheck2.default)(this, Message);
 
@@ -74,29 +67,29 @@ var Message = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    _this2 = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call.apply(_super, [this].concat(args));
 
-    _this2.componentWillMount = function () {
-      (0, _newArrowCheck2.default)(this, _this3);
-      var styleType = _this2.props.styleType;
+    _this.componentWillMount = function () {
+      (0, _newArrowCheck2.default)(this, _this2);
+      var styleType = _this.props.styleType;
 
       if (styleType === 'info') {
         deprecatedLogForStyleTypeInfo();
       }
     }.bind(this);
 
-    _this2.close = function () {
-      var _this4 = this;
+    _this.close = function () {
+      var _this3 = this;
 
-      (0, _newArrowCheck2.default)(this, _this3);
-      var _this2$props$onClose = _this2.props.onClose,
-          onClose = _this2$props$onClose === void 0 ? function () {
-        (0, _newArrowCheck2.default)(this, _this4);
-      }.bind(this) : _this2$props$onClose;
+      (0, _newArrowCheck2.default)(this, _this2);
+      var _this$props$onClose = _this.props.onClose,
+          onClose = _this$props$onClose === void 0 ? function () {
+        (0, _newArrowCheck2.default)(this, _this3);
+      }.bind(this) : _this$props$onClose;
       onClose();
     }.bind(this);
 
-    return _this2;
+    return _this;
   }
 
   (0, _createClass2.default)(Message, [{

package/lib/components/Message/method.js

@@ -17,10 +17,16 @@ var _react = _interopRequireDefault(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
-var _emotionTheming = require("emotion-theming");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _ThemeProvider = _interopRequireDefault(require("../../components/ThemeProvider"));
+
+var _LocaleProvider = _interopRequireDefault(require("../../components/LocaleProvider"));
 
 var _runtime = require("../../components/ThemeProvider/runtime");
 
+var _runtime2 = require("../../components/LocaleProvider/runtime");
+
 var _Message = _interopRequireDefault(require("./Message"));
 
 var _MessageContainer = _interopRequireDefault(require("./MessageContainer"));
@@ -54,6 +60,20 @@ _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_MessageCont
 
 mainContainerDom.appendChild(messageContainerDom);
 
+var ContextWrap = function ContextWrap(_ref) {
+  (0, _newArrowCheck2.default)(this, _this);
+  var children = _ref.children;
+  return /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
+    theme: (0, _runtime.getRuntimeTheme)()
+  }, /*#__PURE__*/_react.default.createElement(_LocaleProvider.default, {
+    locale: (0, _runtime2.getRuntimeLocale)()
+  }, children));
+}.bind(void 0);
+
+ContextWrap.propTypes = {
+  children: _propTypes.default.node
+};
+
 var popupMessage = function popupMessage(message) {
   var _this2 = this;
 
@@ -61,9 +81,7 @@ var popupMessage = function popupMessage(message) {
   var onClose = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
     (0, _newArrowCheck2.default)(this, _this2);
   }.bind(this);
-  var messageUid = containerRef.appendMessage( /*#__PURE__*/_react.default.createElement(_emotionTheming.ThemeProvider, {
-    theme: (0, _runtime.getRuntimeTheme)()
-  }, message));
+  var messageUid = containerRef.appendMessage( /*#__PURE__*/_react.default.createElement(ContextWrap, null, message));
 
   var destroy = function destroy() {
     (0, _newArrowCheck2.default)(this, _this2);

package/lib/components/Modal/Modal.js

@@ -110,20 +110,22 @@ var Modal = (_dec = (0, _localeConsumerDecorator.default)({
       var _this2$props = _this2.props,
           onOk = _this2$props.onOk,
           onClose = _this2$props.onClose,
-          locale = _this2$props.locale;
-      return [/*#__PURE__*/_react.default.createElement(_Button.default, {
+          locale = _this2$props.locale,
+          okButtonProps = _this2$props.okButtonProps,
+          cancelButtonProps = _this2$props.cancelButtonProps;
+      return [/*#__PURE__*/_react.default.createElement(_Button.default, (0, _extends2.default)({
         size: "lg",
         key: "cancel",
         onClick: onClose,
         style: {
           marginRight: 8
         }
-      }, locale.cancel), /*#__PURE__*/_react.default.createElement(_Button.default, {
+      }, okButtonProps), locale.cancel), /*#__PURE__*/_react.default.createElement(_Button.default, (0, _extends2.default)({
         size: "lg",
         key: "confirm",
         onClick: onOk,
         styleType: "primary"
-      }, locale.confirm)];
+      }, cancelButtonProps), locale.confirm)];
     }.bind(this);
 
     _this2.savePopupContainer = function (ref) {
@@ -231,6 +233,12 @@ var Modal = (_dec = (0, _localeConsumerDecorator.default)({
   /** 点击默认的确认按钮时的回调 */
   onOk: _propTypes.default.func,
 
+  /** 默认展示的确定按钮的自定义 props */
+  okButtonProps: _propTypes.default.object,
+
+  /** 默认展示的取消按钮的自定义 props */
+  cancelButtonProps: _propTypes.default.object,
+
   /** 关闭后的回调 */
   afterClose: _propTypes.default.func,