shineout 2.0.0 → 2.0.2

package/es/Cascader/Cascader.js

@@ -181,12 +181,13 @@ function (_PureComponent) {
   };
 
   _proto.setOpenEvent = function setOpenEvent() {
-    if (this.lastFoucs !== this.focus) if (this.focus) {
+    var focus = this.focus || this.props.inputFocus;
+    if (this.lastFoucs !== focus) if (focus) {
       this.bindClickAway();
     } else if (this.lastFoucs !== undefined) {
       this.clearClickAway();
     }
-    this.lastFoucs = this.focus;
+    this.lastFoucs = focus;
   };
 
   _proto.bindRef = function bindRef(el) {

package/es/DatePicker/Container.js

@@ -135,12 +135,13 @@ function (_PureComponent) {
   };
 
   _proto.setOpenEvent = function setOpenEvent() {
-    if (this.lastFoucs !== this.focus) if (this.focus) {
+    var focus = this.focus || this.props.inputFocus;
+    if (this.lastFoucs !== focus) if (focus) {
       this.bindClickAway();
     } else if (this.lastFoucs !== undefined) {
       this.clearClickAway();
     }
-    this.lastFoucs = this.focus;
+    this.lastFoucs = focus;
   };
 
   _proto.getOptions = function getOptions() {

package/es/DatePicker/Props.d.ts

@@ -180,6 +180,10 @@ export interface BaseProps<Value = DatePickerValue> extends StandardProps, Pick<
     onCollapse?: (collapse: boolean) => void;
 }
 export interface ContainerProps<T = DatePickerValue> extends Pick<BaseProps, 'disabled' | 'format' | 'formatResult' | 'inputable' | 'placeholder' | 'position' | 'range' | 'size' | 'type' | 'allowSingle' | 'defaultTime' | 'absolute' | 'zIndex' | 'quickSelect' | 'min' | 'max' | 'defaultRangeMonth' | 'defaultPickerValue' | 'hourStep' | 'minuteStep' | 'secondStep' | 'onPickerChange' | 'disabledTime' | 'align' | 'clearable' | 'clearWithUndefined' | 'innerTitle' | 'timeZone' | 'open' | 'onCollapse'> {
+    /**
+     * @inner 内部属性
+     */
+    inputFocus: boolean;
     /**
      * @en When the value is string, it needs to match the format attribute.\n When the range property is true, the value is an array of length 2.
      * @cn 值为 string 时，需要和 format 属性匹配。\n 非 string 会格式化为 string。\n range 属性为 true 时，值为长度为2的数组

package/es/Form/Props.d.ts

@@ -476,7 +476,7 @@ export declare class Form<Value> extends React.Component<FormProps<Value>, any>
 export declare type FormCompType = typeof Form;
 export declare type FormItemWithFormConsumerKeys = 'formDatum' | 'labelWidth' | 'labelAlign' | 'labelVerticalAlign' | 'keepErrorHeight';
 /**
- * @title From.Item
+ * @title Form.Item
  * @cn 表单项，主要用来布局，显示标签，提示文案信息等
  * @en Used to layout, display labels, tips, errors, etc
  */

package/es/Form/inputable.js

@@ -375,8 +375,9 @@ export default (function (Origin) {
           unbindInputFromItem = _this$props10.unbindInputFromItem,
           scuSkip = _this$props10.scuSkip,
           defaultValue = _this$props10.defaultValue,
+          rules = _this$props10.rules,
           reserveAble = _this$props10.reserveAble,
-          other = _objectWithoutPropertiesLoose(_this$props10, ["formDatum", "value", "required", "bind", "onItemError", "bindInputToItem", "unbindInputFromItem", "scuSkip", "defaultValue", "reserveAble"]);
+          other = _objectWithoutPropertiesLoose(_this$props10, ["formDatum", "value", "required", "bind", "onItemError", "bindInputToItem", "unbindInputFromItem", "scuSkip", "defaultValue", "rules", "reserveAble"]);
 
       return React.createElement(Origin, _extends({}, other, {
         formDatum: formDatum,

package/es/Select/Props.d.ts

@@ -11,6 +11,10 @@ declare type ReactNode = React.ReactNode;
 declare type ReactElement = React.ReactElement;
 declare type ExpandTreeKeys = 'onExpand' | 'expanded' | 'defaultExpanded' | 'defaultExpandAll' | 'expandIcons' | 'loader' | 'childrenKey';
 export interface BaseSelectProps<DataItem, Value> extends StandardProps, Pick<AbsoluteProps, 'absolute' | 'zIndex'>, Pick<InputableProps<Value>, 'formDatum'>, Pick<TreeProps<DataItem, ValueArr<Value>>, ExpandTreeKeys> {
+    /**
+     * @inner 内部属性
+     */
+    inputFocus: boolean;
     /**
      * @en Form field, used with Form
      * @cn 表单字段, 配合 Form 使用
@@ -379,7 +383,7 @@ export interface UnMatchedValue<Value> {
 }
 export declare type ResultValue<Value> = Value | UnMatchedValue<Value>;
 /** ---------- result ---------- */
-export interface ResultProps<Item, Value> extends Omit<BaseSelectProps<Item, Value>, 'renderItem' | 'onChange' | 'onBlur' | 'onFocus' | 'groupKey' | 'innerData' | 'value'> {
+export interface ResultProps<Item, Value> extends Omit<BaseSelectProps<Item, Value>, 'renderItem' | 'onChange' | 'onBlur' | 'onFocus' | 'groupKey' | 'innerData' | 'value' | 'inputFocus'> {
     datum: List<Item, Value>;
     filterText?: string;
     focus: boolean;

package/es/Select/Select.js

@@ -175,12 +175,13 @@ function (_PureComponent) {
   };
 
   _proto.setOpenEvent = function setOpenEvent() {
-    if (this.lastFoucs !== this.focus) if (this.focus) {
+    var focus = this.focus || this.props.inputFocus;
+    if (this.lastFoucs !== focus) if (focus) {
       this.bindClickAway();
     } else if (this.lastFoucs !== undefined) {
       this.clearClickAway();
     }
-    this.lastFoucs = this.focus;
+    this.lastFoucs = focus;
   };
 
   _proto.getDisabledStatus = function getDisabledStatus() {
@@ -247,8 +248,7 @@ function (_PureComponent) {
     if (!desc) {
       if (!getParent(e.target, "[data-id=" + this.selectId + "]")) {
         this.blured = true;
-        this.props.onBlur(); // this.clearClickAway()
-
+        this.props.onBlur();
         if (this.element) this.element.blur();
       }
 
@@ -370,7 +370,6 @@ function (_PureComponent) {
   _proto.handleFocus = function handleFocus(e) {
     if (!this.shouldFocus(e.target)) return;
     this.props.onFocus(e);
-    this.bindClickAway();
   };
 
   _proto.handleInputFocus = function handleInputFocus() {

package/es/Textarea/Textarea.d.ts

@@ -1,6 +1,6 @@
 import { ChangeEvent, KeyboardEvent, FocusEvent } from 'react';
 import { PureComponent } from '../component';
-import { OriginTextareaProps } from './props';
+import { OriginTextareaProps } from './Props';
 interface TextareaState {
     height: number;
 }

package/es/Textarea/interface.d.ts

@@ -1 +1 @@
-export { TextareaProps as Props } from './props';
+export { TextareaProps as Props } from './Props';

package/es/index.js

@@ -2,7 +2,7 @@
 import * as utils from './utils';
 export default {
   utils: utils,
-  version: '2.0.0'
+  version: '2.0.2'
 };
 export { utils };
 export { setLocale } from './locale';

package/es/utils/expose.d.ts

@@ -1,10 +1,12 @@
 import { cleanCache } from './css-accessors';
-import { setInjectType, getInjectType, ThemeConfig } from './vars-inject';
+import { ThemeConfig } from './vars-inject';
 declare const types: string[];
 declare type ObjectProps = {
     [x: string]: any;
 };
 declare function getClassname(data: ObjectProps): string;
+declare function getInjectType(): "body" | "tag";
+declare function setInjectType(type: ThemeConfig['injectType']): void;
 declare function setStyle(options: ObjectProps, custom?: ObjectProps, config?: Partial<ThemeConfig>): () => void;
 declare const style: {
     getClassname: typeof getClassname;

package/es/utils/expose.js

@@ -1,9 +1,10 @@
+import _objectSpread from "@babel/runtime/helpers/objectSpread";
 import { isObject } from './is';
 import { exposeClass } from '../styles/expose';
 import cssAccessors, { cleanCache } from './css-accessors';
 import { capitalize } from './strings';
 import { entries } from './objects';
-import { setInjectType, injectTag, getInjectType, cleanStyleObj, setThemeConfig } from './vars-inject';
+import { injectTag, cleanStyleObj, setThemeConfig } from './vars-inject';
 var types = ['primary', 'warning', 'danger', 'success', 'secondary'];
 var attrs = ['background', 'color', 'border'];
 
@@ -50,12 +51,27 @@ function resetTheme() {
   });
 }
 
+var defaultInjectType;
+
+function getInjectType() {
+  return defaultInjectType;
+}
+
+function setInjectType(type) {
+  defaultInjectType = type;
+}
+
 function setStyle(options, custom, config) {
   if (config === void 0) {
-    config = {};
+    config = {
+      target: 'body'
+    };
   }
 
-  setThemeConfig(config);
+  var injectType = config.injectType || getInjectType() || 'body';
+  setThemeConfig(_objectSpread({}, config, {
+    injectType: injectType
+  }));
   cleanStyleObj();
 
   if (!options) {
@@ -82,7 +98,7 @@ function setStyle(options, custom, config) {
     }
   }
 
-  if (config.injectType === 'tag') {
+  if (injectType === 'tag') {
     var id = injectTag(custom);
     return function () {
       var target = document.getElementById(id);

package/es/utils/validate/range.js

@@ -20,10 +20,8 @@ export default (function (options) {
 
     if (typeof min === 'number' && val < min || typeof max === 'number' && val > max) {
       callback(new Error(message));
-      return;
     } else {
       callback(true);
-      return;
     }
   });
 });

package/es/utils/vars-inject.d.ts

@@ -8,8 +8,6 @@ export interface ThemeConfig {
      */
     target?: string | HTMLElement | (() => HTMLElement);
 }
-export declare function getInjectType(): "body" | "tag";
-export declare function setInjectType(type: ThemeConfig['injectType']): void;
 export declare function setThemeConfig(c: Partial<ThemeConfig>): void;
 export declare function getThemeConfig(name: keyof ThemeConfig): string | HTMLElement | (() => HTMLElement) | undefined;
 export declare function getThemeTarget(): HTMLElement;

package/es/utils/vars-inject.js

@@ -28,12 +28,6 @@ var config = {
 };
 var computedCache = {};
 var styleObj = {};
-export function getInjectType() {
-  return config.injectType;
-}
-export function setInjectType(type) {
-  config.injectType = type;
-}
 export function setThemeConfig(c) {
   Object.keys(c).forEach(function (key) {
     if (key in config) {

package/lib/Cascader/Cascader.js

@@ -193,12 +193,13 @@ function (_PureComponent) {
   };
 
   _proto.setOpenEvent = function setOpenEvent() {
-    if (this.lastFoucs !== this.focus) if (this.focus) {
+    var focus = this.focus || this.props.inputFocus;
+    if (this.lastFoucs !== focus) if (focus) {
       this.bindClickAway();
     } else if (this.lastFoucs !== undefined) {
       this.clearClickAway();
     }
-    this.lastFoucs = this.focus;
+    this.lastFoucs = focus;
   };
 
   _proto.bindRef = function bindRef(el) {

package/lib/DatePicker/Container.js

@@ -158,12 +158,13 @@ function (_PureComponent) {
   };
 
   _proto.setOpenEvent = function setOpenEvent() {
-    if (this.lastFoucs !== this.focus) if (this.focus) {
+    var focus = this.focus || this.props.inputFocus;
+    if (this.lastFoucs !== focus) if (focus) {
       this.bindClickAway();
     } else if (this.lastFoucs !== undefined) {
       this.clearClickAway();
     }
-    this.lastFoucs = this.focus;
+    this.lastFoucs = focus;
   };
 
   _proto.getOptions = function getOptions() {

package/lib/DatePicker/Props.d.ts

@@ -180,6 +180,10 @@ export interface BaseProps<Value = DatePickerValue> extends StandardProps, Pick<
     onCollapse?: (collapse: boolean) => void;
 }
 export interface ContainerProps<T = DatePickerValue> extends Pick<BaseProps, 'disabled' | 'format' | 'formatResult' | 'inputable' | 'placeholder' | 'position' | 'range' | 'size' | 'type' | 'allowSingle' | 'defaultTime' | 'absolute' | 'zIndex' | 'quickSelect' | 'min' | 'max' | 'defaultRangeMonth' | 'defaultPickerValue' | 'hourStep' | 'minuteStep' | 'secondStep' | 'onPickerChange' | 'disabledTime' | 'align' | 'clearable' | 'clearWithUndefined' | 'innerTitle' | 'timeZone' | 'open' | 'onCollapse'> {
+    /**
+     * @inner 内部属性
+     */
+    inputFocus: boolean;
     /**
      * @en When the value is string, it needs to match the format attribute.\n When the range property is true, the value is an array of length 2.
      * @cn 值为 string 时，需要和 format 属性匹配。\n 非 string 会格式化为 string。\n range 属性为 true 时，值为长度为2的数组

package/lib/Form/Props.d.ts

@@ -476,7 +476,7 @@ export declare class Form<Value> extends React.Component<FormProps<Value>, any>
 export declare type FormCompType = typeof Form;
 export declare type FormItemWithFormConsumerKeys = 'formDatum' | 'labelWidth' | 'labelAlign' | 'labelVerticalAlign' | 'keepErrorHeight';
 /**
- * @title From.Item
+ * @title Form.Item
  * @cn 表单项，主要用来布局，显示标签，提示文案信息等
  * @en Used to layout, display labels, tips, errors, etc
  */

package/lib/Form/inputable.js

@@ -393,8 +393,9 @@ var _default = function _default(Origin) {
           unbindInputFromItem = _this$props10.unbindInputFromItem,
           scuSkip = _this$props10.scuSkip,
           defaultValue = _this$props10.defaultValue,
+          rules = _this$props10.rules,
           reserveAble = _this$props10.reserveAble,
-          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props10, ["formDatum", "value", "required", "bind", "onItemError", "bindInputToItem", "unbindInputFromItem", "scuSkip", "defaultValue", "reserveAble"]);
+          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props10, ["formDatum", "value", "required", "bind", "onItemError", "bindInputToItem", "unbindInputFromItem", "scuSkip", "defaultValue", "rules", "reserveAble"]);
       return _react.default.createElement(Origin, (0, _extends2.default)({}, other, {
         formDatum: formDatum,
         error: this.getError(),

package/lib/Select/Props.d.ts

@@ -11,6 +11,10 @@ declare type ReactNode = React.ReactNode;
 declare type ReactElement = React.ReactElement;
 declare type ExpandTreeKeys = 'onExpand' | 'expanded' | 'defaultExpanded' | 'defaultExpandAll' | 'expandIcons' | 'loader' | 'childrenKey';
 export interface BaseSelectProps<DataItem, Value> extends StandardProps, Pick<AbsoluteProps, 'absolute' | 'zIndex'>, Pick<InputableProps<Value>, 'formDatum'>, Pick<TreeProps<DataItem, ValueArr<Value>>, ExpandTreeKeys> {
+    /**
+     * @inner 内部属性
+     */
+    inputFocus: boolean;
     /**
      * @en Form field, used with Form
      * @cn 表单字段, 配合 Form 使用
@@ -379,7 +383,7 @@ export interface UnMatchedValue<Value> {
 }
 export declare type ResultValue<Value> = Value | UnMatchedValue<Value>;
 /** ---------- result ---------- */
-export interface ResultProps<Item, Value> extends Omit<BaseSelectProps<Item, Value>, 'renderItem' | 'onChange' | 'onBlur' | 'onFocus' | 'groupKey' | 'innerData' | 'value'> {
+export interface ResultProps<Item, Value> extends Omit<BaseSelectProps<Item, Value>, 'renderItem' | 'onChange' | 'onBlur' | 'onFocus' | 'groupKey' | 'innerData' | 'value' | 'inputFocus'> {
     datum: List<Item, Value>;
     filterText?: string;
     focus: boolean;

package/lib/Select/Select.js

@@ -182,12 +182,13 @@ function (_PureComponent) {
   };
 
   _proto.setOpenEvent = function setOpenEvent() {
-    if (this.lastFoucs !== this.focus) if (this.focus) {
+    var focus = this.focus || this.props.inputFocus;
+    if (this.lastFoucs !== focus) if (focus) {
       this.bindClickAway();
     } else if (this.lastFoucs !== undefined) {
       this.clearClickAway();
     }
-    this.lastFoucs = this.focus;
+    this.lastFoucs = focus;
   };
 
   _proto.getDisabledStatus = function getDisabledStatus() {
@@ -254,8 +255,7 @@ function (_PureComponent) {
     if (!desc) {
       if (!(0, _element.getParent)(e.target, "[data-id=" + this.selectId + "]")) {
         this.blured = true;
-        this.props.onBlur(); // this.clearClickAway()
-
+        this.props.onBlur();
         if (this.element) this.element.blur();
       }
 
@@ -377,7 +377,6 @@ function (_PureComponent) {
   _proto.handleFocus = function handleFocus(e) {
     if (!this.shouldFocus(e.target)) return;
     this.props.onFocus(e);
-    this.bindClickAway();
   };
 
   _proto.handleInputFocus = function handleInputFocus() {

package/lib/Textarea/Textarea.d.ts

@@ -1,6 +1,6 @@
 import { ChangeEvent, KeyboardEvent, FocusEvent } from 'react';
 import { PureComponent } from '../component';
-import { OriginTextareaProps } from './props';
+import { OriginTextareaProps } from './Props';
 interface TextareaState {
     height: number;
 }

package/lib/Textarea/interface.d.ts

@@ -1 +1 @@
-export { TextareaProps as Props } from './props';
+export { TextareaProps as Props } from './Props';

package/lib/index.js

@@ -220,6 +220,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '2.0.0'
+  version: '2.0.2'
 };
 exports.default = _default;

package/lib/utils/expose.d.ts

@@ -1,10 +1,12 @@
 import { cleanCache } from './css-accessors';
-import { setInjectType, getInjectType, ThemeConfig } from './vars-inject';
+import { ThemeConfig } from './vars-inject';
 declare const types: string[];
 declare type ObjectProps = {
     [x: string]: any;
 };
 declare function getClassname(data: ObjectProps): string;
+declare function getInjectType(): "body" | "tag";
+declare function setInjectType(type: ThemeConfig['injectType']): void;
 declare function setStyle(options: ObjectProps, custom?: ObjectProps, config?: Partial<ThemeConfig>): () => void;
 declare const style: {
     getClassname: typeof getClassname;

package/lib/utils/expose.js

@@ -2,9 +2,13 @@
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports.types = exports.style = exports.color = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
 var _is = require("./is");
 
 var _expose = require("../styles/expose");
@@ -64,12 +68,27 @@ function resetTheme() {
   });
 }
 
+var defaultInjectType;
+
+function getInjectType() {
+  return defaultInjectType;
+}
+
+function setInjectType(type) {
+  defaultInjectType = type;
+}
+
 function setStyle(options, custom, config) {
   if (config === void 0) {
-    config = {};
+    config = {
+      target: 'body'
+    };
   }
 
-  (0, _varsInject.setThemeConfig)(config);
+  var injectType = config.injectType || getInjectType() || 'body';
+  (0, _varsInject.setThemeConfig)((0, _objectSpread2.default)({}, config, {
+    injectType: injectType
+  }));
   (0, _varsInject.cleanStyleObj)();
 
   if (!options) {
@@ -96,7 +115,7 @@ function setStyle(options, custom, config) {
     }
   }
 
-  if (config.injectType === 'tag') {
+  if (injectType === 'tag') {
     var id = (0, _varsInject.injectTag)(custom);
     return function () {
       var target = document.getElementById(id);
@@ -111,8 +130,8 @@ var style = {
   getClassname: getClassname,
   setStyle: setStyle,
   cleanCache: _cssAccessors.cleanCache,
-  setInjectType: _varsInject.setInjectType,
-  getInjectType: _varsInject.getInjectType
+  setInjectType: setInjectType,
+  getInjectType: getInjectType
 };
 exports.style = style;
 var color = _cssAccessors.default.color;

package/lib/utils/validate/range.js

@@ -28,10 +28,8 @@ var _default = function _default(options) {
 
     if (typeof min === 'number' && val < min || typeof max === 'number' && val > max) {
       callback(new Error(message));
-      return;
     } else {
       callback(true);
-      return;
     }
   });
 };

package/lib/utils/vars-inject.d.ts

@@ -8,8 +8,6 @@ export interface ThemeConfig {
      */
     target?: string | HTMLElement | (() => HTMLElement);
 }
-export declare function getInjectType(): "body" | "tag";
-export declare function setInjectType(type: ThemeConfig['injectType']): void;
 export declare function setThemeConfig(c: Partial<ThemeConfig>): void;
 export declare function getThemeConfig(name: keyof ThemeConfig): string | HTMLElement | (() => HTMLElement) | undefined;
 export declare function getThemeTarget(): HTMLElement;

package/lib/utils/vars-inject.js

@@ -3,8 +3,6 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.getInjectType = getInjectType;
-exports.setInjectType = setInjectType;
 exports.setThemeConfig = setThemeConfig;
 exports.getThemeConfig = getThemeConfig;
 exports.getThemeTarget = getThemeTarget;
@@ -67,14 +65,6 @@ var config = {
 var computedCache = {};
 var styleObj = {};
 
-function getInjectType() {
-  return config.injectType;
-}
-
-function setInjectType(type) {
-  config.injectType = type;
-}
-
 function setThemeConfig(c) {
   Object.keys(c).forEach(function (key) {
     if (key in config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shineout",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Shein 前端组件库",
   "main": "./lib/index.js",
   "module": "./es/index.js",