shineout 1.12.13-beta.1 → 1.12.13-beta.2

package/css/Select/Result.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.default = exports.IS_NOT_MATCHED_VALUE = void 0;
 
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
@@ -41,14 +41,16 @@ var _classname = require("../utils/classname");
 
 var _shallowEqual = _interopRequireDefault(require("../utils/shallowEqual"));
 
-var _ResultItem = _interopRequireDefault(require("./ResultItem"));
-
+var IS_NOT_MATCHED_VALUE = 'IS_NOT_MATCHED_VALUE';
 /**
  * get result className from resultClassName attr
  * @param {function | string} f props => resultClassName
  * @param {any} value result value
  * @returns {string | null}
  */
+
+exports.IS_NOT_MATCHED_VALUE = IS_NOT_MATCHED_VALUE;
+
 var getResultClassName = function getResultClassName(f, value) {
   if ((0, _is.isFunc)(f)) {
     return f((0, _is.isObject)(value) && value.IS_NOT_MATCHED_VALUE ? value.value : value);
@@ -68,7 +70,37 @@ var getResultContent = function getResultContent(data, renderResult, renderUnmat
   }
 
   return renderResult(data);
-};
+}; // eslint-disable-next-line
+
+
+function Item(props) {
+  // eslint-disable-next-line react/prop-types
+  var value = props.value,
+      onClick = props.onClick,
+      resultClassName = props.resultClassName,
+      _props$title = props.title,
+      title = _props$title === void 0 ? false : _props$title,
+      only = props.only,
+      getDataByValue = props.getDataByValue,
+      getContent = props.getContent,
+      isDisabled = props.isDisabled;
+  var data = getDataByValue(value);
+  var disabled = isDisabled(data);
+  var content = getContent(data);
+  if (data === null) return null;
+  var click = disabled || !onClick ? undefined : function () {
+    return onClick(data);
+  };
+  var synDisabled = disabled || !click;
+  return _react.default.createElement("a", {
+    title: title && (0, _is.isString)(content) ? content : null,
+    tabIndex: -1,
+    className: (0, _classnames.default)((0, _styles.selectClass)((0, _classname.getDirectionClass)('item'), disabled && (0, _classname.getDirectionClass)('disabled'), synDisabled && (0, _classname.getDirectionClass)('ban'), only && 'item-only'), getResultClassName(resultClassName, data))
+  }, content, !synDisabled && _react.default.createElement("span", {
+    className: (0, _styles.selectClass)('indicator', 'close'),
+    onClick: click
+  }));
+}
 
 var Result =
 /*#__PURE__*/
@@ -132,11 +164,12 @@ function (_PureComponent) {
     var _this$props = this.props,
         compressed = _this$props.compressed,
         onFilter = _this$props.onFilter,
-        values = _this$props.values;
+        values = _this$props.values,
+        data = _this$props.data;
 
     if (compressed) {
       if (this.isCompressedBound()) return;
-      var shouldRest = !(0, _shallowEqual.default)(preProps.values, values);
+      var shouldRest = !(0, _shallowEqual.default)(preProps.values, values) || (data || []).length !== (preProps.data || []).length;
 
       if (shouldRest) {
         this.resetMore();
@@ -196,7 +229,7 @@ function (_PureComponent) {
         getResultByValue = _this$props3.getResultByValue;
     if (value === null) return null;
     var more = this.getCompressedBound();
-    return _react.default.createElement(_ResultItem.default, {
+    return _react.default.createElement(Item, {
       key: index,
       only: more === 1,
       value: value,
@@ -419,6 +452,7 @@ Result.propTypes = {
   setInputReset: _propTypes.default.func,
   bindFocusInputFunc: _propTypes.default.func,
   // collapse: PropTypes.func,
+  data: _propTypes.default.array,
   compressed: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.string]),
   compressedBound: _propTypes.default.number,
   trim: _propTypes.default.bool,

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.13-beta.1'
+  version: '1.12.13-beta.2'
 }
 
 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.13-beta.1'
+  version: '1.12.13-beta.2'
 };
 exports.default = _default;