@ucloud-fe/react-components 1.3.0 → 1.3.4

package/lib/components/Modal/method.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.openModal = exports.open = exports.confirm = exports.alert = void 0;
+exports.destroyAll = exports.openModal = exports.open = exports.confirm = exports.alert = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -15,8 +15,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/newArrowCheck"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -27,6 +25,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/newArrowCheck"));
+
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -35,21 +35,27 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _emotionTheming = require("emotion-theming");
-
 var _Button = _interopRequireDefault(require("../../components/Button"));
 
+var _ThemeProvider = _interopRequireDefault(require("../../components/ThemeProvider"));
+
+var _LocaleProvider = _interopRequireDefault(require("../../components/LocaleProvider"));
+
 var _runtime = require("../../components/ThemeProvider/runtime");
 
-var _Modal = _interopRequireDefault(require("./Modal"));
+var _runtime2 = require("../../components/LocaleProvider/runtime");
+
+var _warning = _interopRequireDefault(require("../../utils/warning"));
 
-var _this3 = void 0;
+var _Modal = _interopRequireDefault(require("./Modal"));
 
 var _excluded = ["reportUpdate"],
     _excluded2 = ["onOk", "onClose"],
     _excluded3 = ["onOk", "onClose"],
     _excluded4 = ["onOk", "onClose"];
 
+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; }
@@ -62,15 +68,73 @@ 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 methodWarning = function methodWarning() {
+  (0, _newArrowCheck2.default)(this, _this);
+  return (0, _warning.default)("You're using a method to call a Modal, this may cause a lot of problems.");
+}.bind(void 0);
+
+var destroyWarning = function destroyWarning() {
+  (0, _newArrowCheck2.default)(this, _this);
+  return (0, _warning.default)("Wrong name of destory, please use destroy to instead");
+}.bind(void 0);
+
+var i = 0;
+
+var getCallUID = function getCallUID() {
+  (0, _newArrowCheck2.default)(this, _this);
+  return '_modal_id_' + i++;
+}.bind(void 0);
+
+var queueMap = {};
+
+var cleanModal = function cleanModal(id) {
+  (0, _newArrowCheck2.default)(this, _this);
+  var modal = queueMap[id];
+
+  if (modal && modal.destroy) {
+    modal.destroy();
+  }
+
+  delete queueMap[id];
+}.bind(void 0);
+
+var addModal = function addModal(modal) {
+  (0, _newArrowCheck2.default)(this, _this);
+  var id = getCallUID();
+  queueMap[id] = modal;
+  return id;
+}.bind(void 0);
+
+var cleanAllModal = function cleanAllModal() {
+  (0, _newArrowCheck2.default)(this, _this);
+  Object.keys(queueMap).forEach(cleanModal);
+}.bind(void 0);
+
+exports.destroyAll = cleanAllModal;
+
+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 ModalWrap = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(ModalWrap, _PureComponent);
 
   var _super = _createSuper(ModalWrap);
 
   function ModalWrap() {
-    var _this2 = this;
+    var _this3 = this;
 
-    var _this;
+    var _this2;
 
     (0, _classCallCheck2.default)(this, ModalWrap);
 
@@ -78,15 +142,15 @@ var ModalWrap = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this2 = _super.call.apply(_super, [this].concat(args));
 
-    _this.update = function (props) {
-      (0, _newArrowCheck2.default)(this, _this2);
+    _this2.update = function (props) {
+      (0, _newArrowCheck2.default)(this, _this3);
 
-      _this.setState(_objectSpread({}, props));
+      _this2.setState(_objectSpread({}, props));
     }.bind(this);
 
-    return _this;
+    return _this2;
   }
 
   (0, _createClass2.default)(ModalWrap, [{
@@ -101,9 +165,7 @@ var ModalWrap = /*#__PURE__*/function (_PureComponent) {
       var _this$props = this.props,
           reportUpdate = _this$props.reportUpdate,
           rest = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
-      return /*#__PURE__*/_react.default.createElement(_emotionTheming.ThemeProvider, {
-        theme: (0, _runtime.getRuntimeTheme)()
-      }, /*#__PURE__*/_react.default.createElement(_Modal.default, (0, _extends2.default)({}, rest, {
+      return /*#__PURE__*/_react.default.createElement(ContextWrap, null, /*#__PURE__*/_react.default.createElement(_Modal.default, (0, _extends2.default)({}, rest, {
         visible: true
       }, this.state)));
     }
@@ -118,7 +180,7 @@ ModalWrap.propTypes = {
 var pop = function pop(props) {
   var _this4 = this;
 
-  (0, _newArrowCheck2.default)(this, _this3);
+  (0, _newArrowCheck2.default)(this, _this);
   var container = document.createElement('div');
   document.body.appendChild(container);
 
@@ -141,13 +203,20 @@ var pop = function pop(props) {
     }.bind(this)
   })), container);
 
+  methodWarning();
+  var callID = addModal({
+    destroy: destroy
+  });
   return {
     destory: function destory() {
       (0, _newArrowCheck2.default)(this, _this4);
-      console.error("Warning: wrong name of destory, please use destroy to instead");
-      destroy();
+      cleanModal(callID);
+      destroyWarning();
+    }.bind(this),
+    destroy: function destroy() {
+      (0, _newArrowCheck2.default)(this, _this4);
+      return cleanModal(callID);
     }.bind(this),
-    destroy: destroy,
     update: update
   };
 }.bind(void 0);
@@ -155,7 +224,7 @@ var pop = function pop(props) {
 var openModal = function openModal(modal) {
   var _this5 = this;
 
-  (0, _newArrowCheck2.default)(this, _this3);
+  (0, _newArrowCheck2.default)(this, _this);
   var container = document.createElement('div');
   document.body.appendChild(container);
 
@@ -169,26 +238,31 @@ var openModal = function openModal(modal) {
     }
   }.bind(this);
 
-  _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_emotionTheming.ThemeProvider, {
-    theme: (0, _runtime.getRuntimeTheme)()
-  }, modal), container);
+  _reactDom.default.render( /*#__PURE__*/_react.default.createElement(ContextWrap, null, modal), container);
 
-  return {
+  methodWarning();
+  var callID = addModal({
     destroy: destroy
+  });
+  return {
+    destroy: function destroy() {
+      (0, _newArrowCheck2.default)(this, _this5);
+      return cleanModal(callID);
+    }.bind(this)
   };
 }.bind(void 0);
 
 exports.openModal = openModal;
 
 var isPromise = function isPromise(promiseLike) {
-  (0, _newArrowCheck2.default)(this, _this3);
+  (0, _newArrowCheck2.default)(this, _this);
   return promiseLike && promiseLike.then && (0, _isFunction2.default)(promiseLike.then);
 }.bind(void 0);
 
 var promiseJudgeHandle = function promiseJudgeHandle(promiseLike, handle) {
   var _this6 = this;
 
-  (0, _newArrowCheck2.default)(this, _this3);
+  (0, _newArrowCheck2.default)(this, _this);
 
   if (isPromise(promiseLike)) {
     promiseLike.then(function (res) {
@@ -201,19 +275,19 @@ var promiseJudgeHandle = function promiseJudgeHandle(promiseLike, handle) {
   }
 }.bind(void 0);
 
-var alert = function alert(_ref, content) {
+var alert = function alert(_ref2, content) {
   var _this7 = this;
 
-  (0, _newArrowCheck2.default)(this, _this3);
-  var _ref$onOk = _ref.onOk,
-      onOk = _ref$onOk === void 0 ? function () {
+  (0, _newArrowCheck2.default)(this, _this);
+  var _ref2$onOk = _ref2.onOk,
+      onOk = _ref2$onOk === void 0 ? function () {
     (0, _newArrowCheck2.default)(this, _this7);
-  }.bind(this) : _ref$onOk,
-      _ref$onClose = _ref.onClose,
-      onClose = _ref$onClose === void 0 ? function () {
+  }.bind(this) : _ref2$onOk,
+      _ref2$onClose = _ref2.onClose,
+      onClose = _ref2$onClose === void 0 ? function () {
     (0, _newArrowCheck2.default)(this, _this7);
-  }.bind(this) : _ref$onClose,
-      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
+  }.bind(this) : _ref2$onClose,
+      rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
 
   var _onClose = function _onClose() {
     var _this8 = this;
@@ -235,9 +309,9 @@ var alert = function alert(_ref, content) {
     }.bind(this));
   }.bind(this);
 
-  var AlertFooter = function AlertFooter(_ref2) {
+  var AlertFooter = function AlertFooter(_ref3) {
     (0, _newArrowCheck2.default)(this, _this7);
-    var locale = _ref2.locale;
+    var locale = _ref3.locale;
     return /*#__PURE__*/_react.default.createElement(_Button.default, {
       size: "lg",
       styleType: "primary",
@@ -262,19 +336,19 @@ var alert = function alert(_ref, content) {
 
 exports.alert = alert;
 
-var confirm = function confirm(_ref3, content) {
+var confirm = function confirm(_ref4, content) {
   var _this10 = this;
 
-  (0, _newArrowCheck2.default)(this, _this3);
-  var _ref3$onOk = _ref3.onOk,
-      onOk = _ref3$onOk === void 0 ? function () {
+  (0, _newArrowCheck2.default)(this, _this);
+  var _ref4$onOk = _ref4.onOk,
+      onOk = _ref4$onOk === void 0 ? function () {
     (0, _newArrowCheck2.default)(this, _this10);
-  }.bind(this) : _ref3$onOk,
-      _ref3$onClose = _ref3.onClose,
-      onClose = _ref3$onClose === void 0 ? function () {
+  }.bind(this) : _ref4$onOk,
+      _ref4$onClose = _ref4.onClose,
+      onClose = _ref4$onClose === void 0 ? function () {
     (0, _newArrowCheck2.default)(this, _this10);
-  }.bind(this) : _ref3$onClose,
-      rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded3);
+  }.bind(this) : _ref4$onClose,
+      rest = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
 
   var _onClose = function _onClose() {
     var _this11 = this;
@@ -310,19 +384,19 @@ var confirm = function confirm(_ref3, content) {
 
 exports.confirm = confirm;
 
-var open = function open(_ref4, content) {
+var open = function open(_ref5, content) {
   var _this13 = this;
 
-  (0, _newArrowCheck2.default)(this, _this3);
-  var _ref4$onOk = _ref4.onOk,
-      onOk = _ref4$onOk === void 0 ? function () {
+  (0, _newArrowCheck2.default)(this, _this);
+  var _ref5$onOk = _ref5.onOk,
+      onOk = _ref5$onOk === void 0 ? function () {
     (0, _newArrowCheck2.default)(this, _this13);
-  }.bind(this) : _ref4$onOk,
-      _ref4$onClose = _ref4.onClose,
-      onClose = _ref4$onClose === void 0 ? function () {
+  }.bind(this) : _ref5$onOk,
+      _ref5$onClose = _ref5.onClose,
+      onClose = _ref5$onClose === void 0 ? function () {
     (0, _newArrowCheck2.default)(this, _this13);
-  }.bind(this) : _ref4$onClose,
-      rest = (0, _objectWithoutProperties2.default)(_ref4, _excluded4);
+  }.bind(this) : _ref5$onClose,
+      rest = (0, _objectWithoutProperties2.default)(_ref5, _excluded4);
 
   var _onClose = function _onClose() {
     var _this14 = this;

package/lib/components/Notice/Notice.js

@@ -13,6 +13,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 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"));
@@ -23,12 +25,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-var _newArrowCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/newArrowCheck"));
-
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 
-var _once2 = _interopRequireDefault(require("lodash/once"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -41,9 +39,9 @@ var _deprecatedLog = _interopRequireDefault(require("../../utils/deprecatedLog")
 
 var _style = require("./style");
 
-var _excluded = ["closable", "icon", "children", "onClose", "styleType", "action"];
+var _this3 = void 0;
 
-var _this = void 0;
+var _excluded = ["closable", "icon", "children", "onClose", "styleType", "action"];
 
 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); }
 
@@ -53,10 +51,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)('Notice styleType "info"', '"success"');
-}.bind(void 0));
+var deprecatedLogForStyleTypeInfo = (0, _deprecatedLog.default)('Notice styleType "info"', '"success"');
 var StyleType = ['default', 'success', 'warning', 'error', 'disabled'];
 
 var Notice = /*#__PURE__*/function (_Component) {
@@ -65,9 +60,9 @@ var Notice = /*#__PURE__*/function (_Component) {
   var _super = _createSuper(Notice);
 
   function Notice() {
-    var _this3 = this;
+    var _this2 = this;
 
-    var _this2;
+    var _this;
 
     (0, _classCallCheck2.default)(this, Notice);
 
@@ -75,23 +70,23 @@ var Notice = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    _this2 = _super.call.apply(_super, [this].concat(args));
-    _this2.state = {
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.state = {
       closed: false
     };
 
-    _this2.onClose = function (e) {
-      (0, _newArrowCheck2.default)(this, _this3);
-      var onClose = _this2.props.onClose;
+    _this.onClose = function (e) {
+      (0, _newArrowCheck2.default)(this, _this2);
+      var onClose = _this.props.onClose;
 
-      _this2.setState({
+      _this.setState({
         closed: true
       });
 
       onClose(e);
     }.bind(this);
 
-    return _this2;
+    return _this;
   }
 
   (0, _createClass2.default)(Notice, [{
@@ -172,7 +167,7 @@ Notice.defaultProps = {
   closable: true,
   styleType: StyleType[0],
   onClose: function onClose() {
-    (0, _newArrowCheck2.default)(this, _this);
+    (0, _newArrowCheck2.default)(this, _this3);
   }.bind(void 0)
 };
 Notice.StyleType = StyleType;