shineout 2.0.0-rc.2 → 2.0.0-rc.3

package/css/Carousel/Props.d.ts

@@ -25,7 +25,7 @@ export interface CarouselProps extends StandardProps {
      *
      * default: 'circle'
      */
-    indicatorType?: ((current: number, moveTo: (index: number) => void) => ReactNode) | string;
+    indicatorType?: ((current: number, moveTo: (index: number) => void) => ReactNode) | 'circle' | 'number' | 'line';
     /**
      * the interval of animation, When it is not 0, play automatically
      *

package/css/Cascader/Cascader.d.ts

@@ -2,20 +2,20 @@
 import { PureComponent } from '../component';
 import DatumTree from '../Datum/Tree';
 import Input from './Input';
-import { OriginCascaderProps } from './Props';
+import { CascaderBaseValue, OriginCascaderProps } from './Props';
 interface State {
     focus: boolean;
     path: string[];
     position: 'drop-down' | 'drop-up';
 }
-declare class Cascader<DataItem, Value extends (string | number)[]> extends PureComponent<OriginCascaderProps<DataItem, Value>, State> {
+declare class Cascader<DataItem, Value extends CascaderBaseValue> extends PureComponent<OriginCascaderProps<DataItem, Value>, State> {
     static defaultProps: {
         data: never[];
         height: number;
         clearable: boolean;
         showArrow: boolean;
         expandTrigger: string;
-        childrenKey: any;
+        childrenKey: string;
     };
     datum: DatumTree<DataItem>;
     selectId: string;

package/css/Cascader/Cascader.js

@@ -131,7 +131,6 @@ function (_PureComponent) {
       if ((0, _is.isFunc)(props.getComponentRef)) {
         props.getComponentRef((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       } else {
-        ;
         props.getComponentRef.current = (0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this));
       }
     }

package/css/Cascader/List.d.ts

@@ -1,5 +1,6 @@
 import { Component } from 'react';
 import { CascaderListProps } from './Props';
+import { KeygenResult } from '../@types/common';
 declare class List<U, T extends any[]> extends Component<CascaderListProps<U, T>> {
     static defaultProps: {
         id: string;
@@ -7,7 +8,7 @@ declare class List<U, T extends any[]> extends Component<CascaderListProps<U, T>
         text: {};
     };
     constructor(props: CascaderListProps<U, T>);
-    getKey(data: U, index: number): string | number;
+    getKey(data: U, index: number): KeygenResult;
     getText(key: string): any;
     render(): JSX.Element;
 }

package/css/Cascader/List.js

@@ -54,7 +54,17 @@ function (_Component) {
         keygen = _this$props.keygen,
         parentId = _this$props.parentId;
     if (typeof keygen === 'function') return keygen(data, parentId);
-    if (keygen && typeof keygen === 'string') return data[keygen];
+
+    if (keygen && typeof keygen === 'string') {
+      var key = data[keygen];
+
+      if (typeof key === 'string' || typeof key === 'number') {
+        return key;
+      }
+
+      console.error('key must be number or string but get', key);
+    }
+
     return parentId + (parentId ? ',' : '') + index;
   };
 

package/css/Cascader/Node.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
-import { NodeProps } from './Props';
+import { CascaderBaseValue, NodeProps } from './Props';
 import { PureComponent } from '../component';
 interface NodeState {
     loading: boolean;
 }
-declare class Node<U, T extends any[]> extends PureComponent<NodeProps<U, T>, NodeState> {
+declare class Node<U, T extends CascaderBaseValue> extends PureComponent<NodeProps<U, T>, NodeState> {
     handleUpdate: Function;
     constructor(props: NodeProps<U, T>);
     componentWillUnmount(): void;

package/css/Cascader/Props.d.ts

@@ -26,6 +26,7 @@ export declare type GetFilterProps<Props, DataItem> = Omit<Props, 'filterText' |
 };
 /** ------ Cascader ------ * */
 export interface OriginCascaderProps<DataItem, Value extends CascaderBaseValue> extends Pick<AbsoluteProps, 'absolute' | 'zIndex'>, Pick<InputTitleProps, 'innerTitle'>, Pick<TreeDatumOptions<DataItem>, 'mode'>, Pick<StandardProps, 'style'> {
+    renderUnmatched?: (data: any) => ReactNode;
     inputFocus: boolean;
     /**
      * Set visible of cascader popup
@@ -212,8 +213,8 @@ export interface OriginCascaderProps<DataItem, Value extends CascaderBaseValue>
      *  default: -
      *
      */
-    getComponentRef?: (comp: componentRef) => void | {
-        current?: componentRef;
+    getComponentRef?: ((comp: componentRef) => void) | {
+        current: componentRef | undefined;
     };
     /**
      * When it is a string, return d[string]. When it is a function, return the result of the function.

package/css/Cascader/Result.js

@@ -252,8 +252,22 @@ function (_PureComponent) {
         raw = _ref3.raw,
         className = _ref3.className,
         options = (0, _objectWithoutPropertiesLoose2.default)(_ref3, ["index", "render", "data", "raw", "className"]);
-    var singleRemove = this.props.singleRemove;
-    var res = data && render(data, raw);
+    var _this$props3 = this.props,
+        singleRemove = _this$props3.singleRemove,
+        datum = _this$props3.datum,
+        renderUnmatched = _this$props3.renderUnmatched;
+    var res;
+
+    if (datum.isUnMatch(data)) {
+      if (renderUnmatched) {
+        res = renderUnmatched(data.value);
+      } else {
+        res = typeof data.value === 'string' ? data.value : null;
+      }
+    } else {
+      res = data && render(data, raw);
+    }
+
     if (!res) return null;
     var more = this.getCompressedBound();
     return _react.default.createElement(Item, (0, _extends2.default)({
@@ -270,10 +284,10 @@ function (_PureComponent) {
   };
 
   _proto.renderMore = function renderMore(list) {
-    var _this$props3 = this.props,
-        selectId = _this$props3.selectId,
-        size = _this$props3.size,
-        compressed = _this$props3.compressed;
+    var _this$props4 = this.props,
+        selectId = _this$props4.selectId,
+        size = _this$props4.size,
+        compressed = _this$props4.compressed;
     var more = this.getCompressedBound();
     return [_react.default.createElement(_More.default, {
       key: "more",
@@ -288,12 +302,12 @@ function (_PureComponent) {
   };
 
   _proto.renderInput = function renderInput() {
-    var _this$props4 = this.props,
-        onFilter = _this$props4.onFilter,
-        focus = _this$props4.focus,
-        trim = _this$props4.trim,
-        bindInput = _this$props4.bindInput,
-        filterText = _this$props4.filterText;
+    var _this$props5 = this.props,
+        onFilter = _this$props5.onFilter,
+        focus = _this$props5.focus,
+        trim = _this$props5.trim,
+        bindInput = _this$props5.bindInput,
+        filterText = _this$props5.filterText;
     return _react.default.createElement(_Input.default, {
       filterText: filterText,
       ref: bindInput,
@@ -305,10 +319,10 @@ function (_PureComponent) {
   };
 
   _proto.renderPlaceholder = function renderPlaceholder() {
-    var _this$props5 = this.props,
-        focus = _this$props5.focus,
-        onFilter = _this$props5.onFilter,
-        innerTitle = _this$props5.innerTitle;
+    var _this$props6 = this.props,
+        focus = _this$props6.focus,
+        onFilter = _this$props6.onFilter,
+        innerTitle = _this$props6.innerTitle;
 
     if (focus && onFilter) {
       return this.renderInput();
@@ -321,10 +335,10 @@ function (_PureComponent) {
   };
 
   _proto.renderIndicator = function renderIndicator() {
-    var _this$props6 = this.props,
-        multiple = _this$props6.multiple,
-        showArrow = _this$props6.showArrow,
-        compressed = _this$props6.compressed;
+    var _this$props7 = this.props,
+        multiple = _this$props7.multiple,
+        showArrow = _this$props7.showArrow,
+        compressed = _this$props7.compressed;
     if (!showArrow || multiple && !compressed) return null;
     var showCaret = !multiple; // eslint-disable-next-line
 
@@ -336,15 +350,15 @@ function (_PureComponent) {
   };
 
   _proto.renderResult = function renderResult() {
-    var _this$props7 = this.props,
-        datum = _this$props7.datum,
-        _this$props7$value = _this$props7.value,
-        value = _this$props7$value === void 0 ? [] : _this$props7$value,
-        renderItem = _this$props7.renderItem,
-        renderResult = _this$props7.renderResult,
-        compressed = _this$props7.compressed,
-        focus = _this$props7.focus,
-        onFilter = _this$props7.onFilter;
+    var _this$props8 = this.props,
+        datum = _this$props8.datum,
+        _this$props8$value = _this$props8.value,
+        value = _this$props8$value === void 0 ? [] : _this$props8$value,
+        renderItem = _this$props8.renderItem,
+        renderResult = _this$props8.renderResult,
+        compressed = _this$props8.compressed,
+        focus = _this$props8.focus,
+        onFilter = _this$props8.onFilter;
     var nodes = value.map(function (v) {
       return datum.getDataById(v);
     });
@@ -374,15 +388,15 @@ function (_PureComponent) {
   };
 
   _proto.render = function render() {
-    var _this$props8 = this.props,
-        style = _this$props8.style,
-        _this$props8$value = _this$props8.value,
-        value = _this$props8$value === void 0 ? [] : _this$props8$value,
-        compressed = _this$props8.compressed,
-        multiple = _this$props8.multiple,
-        innerTitle = _this$props8.innerTitle,
-        onFilter = _this$props8.onFilter,
-        focus = _this$props8.focus;
+    var _this$props9 = this.props,
+        style = _this$props9.style,
+        _this$props9$value = _this$props9.value,
+        value = _this$props9$value === void 0 ? [] : _this$props9$value,
+        compressed = _this$props9.compressed,
+        multiple = _this$props9.multiple,
+        innerTitle = _this$props9.innerTitle,
+        onFilter = _this$props9.onFilter,
+        focus = _this$props9.focus;
     var empty = value.length === 0;
     var result = empty ? this.renderPlaceholder() : this.renderResult();
     var clearEl = this.renderClear();

package/css/DatePicker/Props.d.ts

@@ -64,7 +64,7 @@ export interface BaseProps<T = DatePickerValue> extends StandardProps, Pick<Abso
      *
      * default: false
      */
-    disabled?: ((date: Date, type?: DisabledType, value?: DatePickerValue) => boolean) | boolean;
+    disabled?: ((date: Date, type?: DisabledType, value0?: Date, value1?: Date) => boolean) | boolean;
     /**
      * default values for different types: 'date': 'yyyy-MM-dd'. 'time': 'HH:mm:ss'. 'week': 'RRRR II'. 'month': 'yyyy-MM'. 'week': 'RRRR II'. 'quarter': 'yyyy-[Q]Q'. 'year': 'yyyy'. 'datetime': 'yyyy-MM-dd HH:mm:ss'
      *

package/css/Datum/Tree.d.ts

@@ -1,4 +1,4 @@
-import { KeygenResult, ObjectType, KeygenType } from '../@types/common';
+import { KeygenResult, ObjectType, KeygenType, UnMatchedValue } from '../@types/common';
 export declare const CheckedMode: {
     Full: number;
     Half: number;
@@ -54,7 +54,7 @@ export default class<Item> {
     bind(id: number | string, update: Function): void;
     unbind(id: KeygenResult): void;
     setUnmatedValue(): void;
-    isUnMatch(data: ObjectType | null): boolean;
+    isUnMatch(data: ObjectType | null): data is UnMatchedValue;
     setValue(value?: Value): void;
     getValue(): Value;
     setValueMap(id: KeygenResult, checked: CheckedStatus): void;

package/css/Modal/Modal.js

@@ -51,8 +51,6 @@ function (_Component) {
   var _proto = Modal.prototype;
 
   _proto.componentDidMount = function componentDidMount() {
-    console.log(this.props.visible);
-
     if (this.props.visible && !this.props.usePortal) {
       (0, _events.open)(this.getOption(), false);
     }

package/css/Modal/events.js

@@ -287,9 +287,13 @@ exports.method = method;
 
 var closeAll = function closeAll() {
   Object.keys(containers).filter(function (id) {
-    return containers[id].visible;
+    return containers[id].props.from === 'method' && containers[id].visible;
   }).forEach(function (id) {
-    close(containers[id].props);
+    var _containers$id$props = containers[id].props,
+        onClose = _containers$id$props.onClose,
+        usePortal = _containers$id$props.usePortal;
+    if (onClose) onClose();
+    if (!usePortal) close(containers[id].props);
   });
 };
 
@@ -302,11 +306,10 @@ exports.closeAll = closeAll;
       return containers[id].visible && containers[id].props.esc;
     });
     if (!opened) return;
-    var props = containers[opened].props; // @ts-ignore may be always true
-
+    var props = containers[opened].props;
     var onClose = props.onClose,
-        isPortal = props.isPortal;
+        usePortal = props.usePortal;
     if (onClose) onClose();
-    if (!isPortal) close(props);
+    if (!usePortal) close(props);
   });
 });

package/css/index.js

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