shineout 1.12.6-beta.4 → 1.12.6-beta.6

package/css/Cascader/index.d.ts

@@ -223,8 +223,7 @@ export interface CascaderProps<Item, Value> extends StandardProps, FormItemStand
 }
 
 interface componentRef  {
-  close: () => void;
-  [propName: string]: any;
+  close: () => void
 }
 
 declare class Cascader<Item = any, Value = string[]> extends React.Component<CascaderProps<Item, Value>, {}> {

package/css/Popover/Panel.js

@@ -317,10 +317,11 @@ function (_Component) {
         type = _this$props3.type,
         visible = _this$props3.visible,
         showArrow = _this$props3.showArrow,
-        useTextStyle = _this$props3.useTextStyle;
+        useTextStyle = _this$props3.useTextStyle,
+        destroy = _this$props3.destroy;
     var show = typeof visible === 'boolean' ? visible : this.state.show;
 
-    if (!this.isRendered && !show || !this.parentElement || !children) {
+    if ((!this.isRendered || destroy) && !show || !this.parentElement || !children) {
       return _react.default.createElement("noscript", {
         ref: this.placeholderRef
       });
@@ -396,7 +397,8 @@ Panel.propTypes = {
   bindChain: _propTypes.default.func,
   zIndex: _propTypes.default.number,
   clickToCancelDelay: _propTypes.default.bool,
-  useTextStyle: _propTypes.default.bool
+  useTextStyle: _propTypes.default.bool,
+  destroy: _propTypes.default.bool
 };
 Panel.defaultProps = {
   background: '',

package/css/Popover/events.js

@@ -29,8 +29,11 @@ function hide(delay) {
   }
 
   timer = setTimeout(function () {
-    div.style.display = 'none';
-    div.className = '';
+    if (div) {
+      div.style.display = 'none';
+      div.className = '';
+    }
+
     currentId = undefined;
   }, delay);
 }

package/css/Popover/index.d.ts

@@ -235,6 +235,14 @@ export interface PopoverConfirmProps extends PopoverProps{
    * default: -
    */
    useTextStyle?: boolean;
+  /**
+   * delete dom when close
+   *
+   * 关闭 Popover 后销毁 dom
+   *
+   * default: -
+   */
+  destroy?: boolean;
 }
 
 declare class PopoverConfirm extends React.Component<PopoverConfirmProps, {}> {

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.6-beta.4'
+  version: '1.12.6-beta.6'
 }
 
 export default __default

package/css/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.12.6-beta.4'
+  version: '1.12.6-beta.6'
 };
 exports.default = _default;

package/css/utils/expose.js

@@ -64,7 +64,12 @@ function resetTheme() {
   });
 }
 
-function setStyleWithTag(options, custom) {
+function setStyle(options, custom, config) {
+  if (config === void 0) {
+    config = {};
+  }
+
+  (0, _varsInject.setThemeConfig)(config);
   (0, _varsInject.cleanStyleObj)();
 
   if (!options) {
@@ -90,45 +95,19 @@ function setStyleWithTag(options, custom) {
     }
   }
 
-  (0, _varsInject.injectTag)(custom);
+  if (config.injectType === 'tag') {
+    var id = (0, _varsInject.injectTag)(custom);
+    return function () {
+      document.getElementById(id).remove();
+    };
+  }
+
+  return function () {};
 }
 
 var style = {
   getClassname: getClassname,
-  setStyle: function setStyle(options, custom) {
-    if (custom === void 0) {
-      custom = {};
-    }
-
-    if ((0, _varsInject.getInjectType)() === 'tag') {
-      setStyleWithTag(options, custom);
-      return;
-    }
-
-    if (!options) {
-      resetTheme();
-      return;
-    }
-
-    for (var _iterator2 = (0, _objects.entries)(options), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref3 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref3 = _i2.value;
-      }
-
-      var _ref4 = _ref3,
-          key = _ref4[0],
-          values = _ref4[1];
-      var setterName = "set" + (0, _strings.capitalize)(key);
-      if (_cssAccessors.default[key] && _cssAccessors.default[key][setterName]) _cssAccessors.default[key][setterName](values);
-    }
-  },
+  setStyle: setStyle,
   cleanCache: _cssAccessors.cleanCache,
   setInjectType: _varsInject.setInjectType,
   getInjectType: _varsInject.getInjectType

package/css/utils/vars-inject.js

@@ -5,6 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.getInjectType = getInjectType;
 exports.setInjectType = setInjectType;
+exports.setThemeConfig = setThemeConfig;
+exports.getThemeConfig = getThemeConfig;
+exports.getThemeTarget = getThemeTarget;
 exports.cleanStyleObj = cleanStyleObj;
 exports.injectTag = injectTag;
 exports.default = void 0;
@@ -17,6 +20,10 @@ var _config = require("../config");
 
 var _objects = require("./objects");
 
+var _is = require("./is");
+
+var _hash = _interopRequireDefault(require("./hash"));
+
 var _styles = require("../Pagination/styles");
 
 var _styles2 = require("../Checkbox/styles");
@@ -53,16 +60,50 @@ var _styles17 = require("../Tag/styles");
 
 var _expose = require("../styles/expose");
 
+var config = {
+  injectType: 'body',
+  target: undefined
+};
 var computedCache = {};
-var injectType = 'body';
 var styleObj = {};
 
 function getInjectType() {
-  return injectType;
+  return config.injectType;
 }
 
 function setInjectType(type) {
-  injectType = type;
+  config.injectType = type;
+}
+
+function setThemeConfig(c) {
+  if (c === void 0) {
+    c = {};
+  }
+
+  Object.keys(c).forEach(function (key) {
+    if (key in config) {
+      config[key] = c[key];
+    }
+  });
+}
+
+function getThemeConfig(name) {
+  return config[name];
+}
+
+function getThemeTarget() {
+  var target = config.target;
+  if (!target) return document.body;
+
+  if ((0, _is.isFunc)(target)) {
+    target = config.target();
+  } else if (typeof target === 'string') {
+    target = document.querySelector(target);
+  }
+
+  if (target instanceof HTMLElement) return target;
+  console.error("can not find theme target dom from \"" + config.target + "\"");
+  return document.body;
 }
 
 function cleanStyleObj() {
@@ -74,9 +115,15 @@ function injectTag(custom) {
     custom = {};
   }
 
-  var id = '__shineoutThemeStyleContainer__';
-  var styleText = "body{" + Object.keys((0, _objectSpread2.default)({}, styleObj, custom)).map(function (key) {
-    return key + ": " + styleObj[key];
+  if (config.target && typeof config.target !== 'string') {
+    console.error('The target of themeConfig must use string when injectType = "tag"');
+  }
+
+  var selector = config.target || 'body';
+  var id = "__shineoutThemeStyleContainer__" + (0, _hash.default)(selector);
+  var varObj = (0, _objectSpread2.default)({}, styleObj, custom);
+  var styleText = selector + "{" + Object.keys(varObj).map(function (key) {
+    return key + ": " + varObj[key];
   }).join(';') + "}";
   var el = document.getElementById(id);
 
@@ -89,6 +136,8 @@ function injectTag(custom) {
     stylee.innerText = styleText;
     document.head.appendChild(stylee);
   }
+
+  return id;
 }
 
 function getProperty(name, cache) {
@@ -122,15 +171,17 @@ function setBodyProperty(colors, value) {
         cssVar = _ref2[0],
         cssValue = _ref2[1];
 
-    if (injectType === 'body') {
+    if (config.injectType === 'body') {
+      var target = getThemeTarget();
+
       if (value === undefined) {
-        document.body.style.removeProperty(cssVar);
+        target.style.removeProperty(cssVar);
       } else {
-        document.body.style.setProperty(cssVar, cssValue);
+        target.style.setProperty(cssVar, cssValue);
       }
     }
 
-    if (injectType === 'tag') {
+    if (config.injectType === 'tag') {
       if (value === undefined) {
         delete styleObj[cssVar];
       } else {