@kaiheila/ui-components 1.0.4 → 1.0.5

package/dist/ui-components.js

@@ -2,14 +2,7 @@
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 326:
-/***/ ((module) => {
-
-module.exports = require("react-dom");
-
-/***/ }),
-
-/***/ 364:
+/***/ 295:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 var __webpack_unused_export__;
@@ -22,6 +15,13 @@ if (true) {
 } else // removed by dead control flow
 { var i; }
 
+/***/ }),
+
+/***/ 326:
+/***/ ((module) => {
+
+module.exports = require("react-dom");
+
 /***/ })
 
 /******/ 	});
@@ -1660,7 +1660,7 @@ radio_defineProperty(RadioForm, "propTypes", {
 var external_react_dom_ = __webpack_require__(326);
 var external_react_dom_default = /*#__PURE__*/__webpack_require__.n(external_react_dom_);
 // EXTERNAL MODULE: ./node_modules/.pnpm/react-dom@18.3.1_react@18.3.1/node_modules/react-dom/client.js
-var client = __webpack_require__(364);
+var client = __webpack_require__(295);
 ;// ./src/utils/htmlEncode.js
 //不转义 其他转义
 function htmlEncode() {
@@ -2196,7 +2196,7 @@ const logic_models_react_namespaceObject = require("@kookapp/logic-models-react"
 
 
 const OptionList = _ref => {
-  var _visibleRange$visible, _visibleRange$visible2;
+  var _visibleRange$visible;
   let {
     filterData,
     optionsStyle,
@@ -2205,9 +2205,7 @@ const OptionList = _ref => {
     labelKey = "label",
     valueKey = "value",
     loadComponent,
-    onSelect,
-    onReachBottom,
-    loading = false
+    onSelect
   } = _ref;
   const containerRef = (0,external_react_namespaceObject.useRef)(null);
   const ids = (0,external_react_namespaceObject.useMemo)(() => filterData.map(item => item[valueKey]), [filterData, valueKey]);
@@ -2215,18 +2213,10 @@ const OptionList = _ref => {
     visibleRange
   } = (0,logic_models_react_namespaceObject.useListVirtualScroll)({
     ids,
-    heightRender: id => {
-      if ((0,logic_models_react_namespaceObject.isSentinelId)(id)) {
-        // 所有元素必须有高度，否则滚动位置无法计算到该元素
-        return 1;
-      }
-      return 34;
-    } // 注意：这里需要手动维护跟样式上的高度一致，如果不能维护一致的话就需要写动态高度逻辑
+    heightRender: 34 // 注意：这里需要手动维护跟样式上的高度一致，如果不能维护一致的话就需要写动态高度逻辑
   }, {
-    containerRef,
-    onReachBottom
+    containerRef
   });
-  const empty = (visibleRange === null || visibleRange === void 0 || (_visibleRange$visible = visibleRange.visibleIds) === null || _visibleRange$visible === void 0 ? void 0 : _visibleRange$visible.length) == 0 || (visibleRange === null || visibleRange === void 0 || (_visibleRange$visible2 = visibleRange.visibleIds) === null || _visibleRange$visible2 === void 0 ? void 0 : _visibleRange$visible2.every(id => (0,logic_models_react_namespaceObject.isSentinelId)(id)));
   return /*#__PURE__*/external_react_default().createElement("ul", {
     className: "selector-search-option theme-scroll-bar",
     style: optionsStyle,
@@ -2244,10 +2234,7 @@ const OptionList = _ref => {
       padding: 8,
       transform: "translateY(".concat(visibleRange === null || visibleRange === void 0 ? void 0 : visibleRange.topSpace, "px)")
     }
-  }, !empty ? visibleRange === null || visibleRange === void 0 ? void 0 : visibleRange.visibleIds.map((id, i) => {
-    if ((0,logic_models_react_namespaceObject.isSentinelId)(id)) {
-      return null;
-    }
+  }, (visibleRange === null || visibleRange === void 0 || (_visibleRange$visible = visibleRange.visibleIds) === null || _visibleRange$visible === void 0 ? void 0 : _visibleRange$visible.length) > 0 ? visibleRange === null || visibleRange === void 0 ? void 0 : visibleRange.visibleIds.map((id, i) => {
     const item = filterData.find(item => item[valueKey] === id);
     const label = item === null || item === void 0 ? void 0 : item[labelKey];
     const value = item === null || item === void 0 ? void 0 : item[valueKey];
@@ -2265,9 +2252,7 @@ const OptionList = _ref => {
       key: value + i,
       title: label
     }, renderOption ? renderOption(item) : label);
-  }) : loading ? /*#__PURE__*/external_react_default().createElement("li", {
-    key: "none"
-  }, "\u52A0\u8F7D\u4E2D...") : /*#__PURE__*/external_react_default().createElement("li", {
+  }) : /*#__PURE__*/external_react_default().createElement("li", {
     key: "none"
   }, "\u6CA1\u6709\u4EFB\u4F55\u5185\u5BB9")));
 };
@@ -2294,9 +2279,7 @@ function selector_search_toPrimitive(t, r) { if ("object" != typeof t || !t) ret
 
 class SelectorSearch extends external_react_namespaceObject.Component {
   constructor(props) {
-    var _this;
     super(props);
-    _this = this;
     selector_search_defineProperty(this, "calcOptionsStyle", () => {
       const {
         current
@@ -2317,11 +2300,11 @@ class SelectorSearch extends external_react_namespaceObject.Component {
     selector_search_defineProperty(this, "hide", () => {
       this.setState({
         showList: false,
-        keyword: ""
+        keyword: ''
       }, () => {
-        this.changeFilterData(true);
+        this.changeFilterData();
       });
-      document.removeEventListener("click", this.hide);
+      document.removeEventListener('click', this.hide);
     });
     selector_search_defineProperty(this, "toggle", event => {
       if (this.props.disabled) {
@@ -2340,14 +2323,14 @@ class SelectorSearch extends external_react_namespaceObject.Component {
         showList
       });
       if (showList) {
-        document.addEventListener("click", this.hide);
+        document.addEventListener('click', this.hide);
       } else {
         this.setState({
-          keyword: ""
+          keyword: ''
         }, () => {
-          this.changeFilterData(true);
+          this.changeFilterData();
         });
-        document.removeEventListener("click", this.hide);
+        document.removeEventListener('click', this.hide);
       }
       if (this.props.allFocus) {
         this.setFocus();
@@ -2362,10 +2345,10 @@ class SelectorSearch extends external_react_namespaceObject.Component {
         event.nativeEvent.stopImmediatePropagation();
         return;
       }
+      this.hide();
       this.setState({
-        currentItem: this.props.data.find(item => item[this.props.valueKey] == value)
+        keyword: ''
       });
-      this.hide();
       const {
         onChange
       } = this.props;
@@ -2373,71 +2356,53 @@ class SelectorSearch extends external_react_namespaceObject.Component {
     });
     selector_search_defineProperty(this, "getLabel", () => {
       const {
-        valueKey = "value",
-        labelKey = "label",
+        valueKey = 'value',
+        labelKey = 'label',
         data = [],
         value
       } = this.props;
-      const {
-        currentItem
-      } = this.state;
-      if (currentItem && currentItem[valueKey] == value) {
-        return currentItem[labelKey] || "";
-      }
       return (data.find(item => {
         if (item[valueKey] === value) {
           return item;
         }
-      }) || {})[labelKey] || "";
+      }) || {})[labelKey] || '';
     });
     selector_search_defineProperty(this, "keywordChange", value => {
-      const {
-        maxLength
-      } = this.props;
-      const truncatedValue = maxLength !== undefined ? value.slice(0, maxLength) : value;
       this.setState({
-        keyword: truncatedValue
+        keyword: value
       }, () => {
-        this.changeFilterData(true);
+        this.changeFilterData();
       });
     });
-    selector_search_defineProperty(this, "changeFilterData", function () {
-      let updateFilterData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      const keyword = _this.state.keyword.trim().toLocaleLowerCase();
-
-      // 受控模式下，组件渲染后的状态变更由受控逻辑接管，直接调用 keywordChange 回调
-      if (_this.props.controlled && updateFilterData) {
-        var _this$props$keywordCh, _this$props;
-        (_this$props$keywordCh = (_this$props = _this.props).keywordChange) === null || _this$props$keywordCh === void 0 || _this$props$keywordCh.call(_this$props, keyword);
-        return;
-      }
+    selector_search_defineProperty(this, "changeFilterData", () => {
+      const keyword = this.state.keyword.trim().toLocaleLowerCase();
       let filterData = [];
       const {
         getData,
         onSearchResultChange
-      } = _this.props;
-      if (typeof getData == "function") {
+      } = this.props;
+      if (typeof getData == 'function') {
         getData({
           keyword
         }).then(_ref => {
           let {
             list
           } = _ref;
-          _this.setState({
+          this.setState({
             filterData: list
           });
         });
         return;
       }
-      if (keyword == "") {
-        filterData = _this.props.data || [];
+      if (keyword == '') {
+        filterData = this.props.data || [];
       } else {
-        filterData = (_this.props.data || []).filter(item => {
-          let label = item[_this.props.labelKey || "label"];
+        filterData = (this.props.data || []).filter(item => {
+          let label = item[this.props.labelKey || 'label'];
           return label.toLocaleLowerCase().includes(keyword);
         });
       }
-      _this.setState({
+      this.setState({
         filterData
       });
 
@@ -2470,10 +2435,9 @@ class SelectorSearch extends external_react_namespaceObject.Component {
     });
     this.state = {
       showList: false,
-      keyword: "",
+      keyword: '',
       filterData: [],
-      optionsStyle: {},
-      currentItem: null
+      optionsStyle: {}
     };
     this.selectRef = /*#__PURE__*/external_react_default().createRef();
   }
@@ -2482,15 +2446,15 @@ class SelectorSearch extends external_react_namespaceObject.Component {
     this.calcOptionsStyle();
     this.ancestors = getOverflowAncestors(this.selectRef.current);
     this.ancestors.forEach(item => {
-      item.addEventListener("scroll", this.calcOptionsStyle, {
+      item.addEventListener('scroll', this.calcOptionsStyle, {
         passive: true
       });
     });
   }
   componentWillUnmount() {
-    document.removeEventListener("click", this.hide);
+    document.removeEventListener('click', this.hide);
     this.ancestors.forEach(item => {
-      item.removeEventListener("scroll", this.calcOptionsStyle);
+      item.removeEventListener('scroll', this.calcOptionsStyle);
     });
   }
   componentDidUpdate(prevProps) {
@@ -2510,18 +2474,16 @@ class SelectorSearch extends external_react_namespaceObject.Component {
       placeholder,
       renderOption,
       disabledValues = [],
-      onReachBottom,
-      loading,
-      labelKey = "label",
-      valueKey = "value",
+      labelKey = 'label',
+      valueKey = 'value',
       loadComponent
     } = this.props;
     let label = this.getLabel();
     return /*#__PURE__*/external_react_default().createElement("div", {
       className: "selector-search-contain"
     }, /*#__PURE__*/external_react_default().createElement("div", {
-      className: external_classnames_default()("selector-search-select theme-input-bg-base", {
-        active: showList,
+      className: external_classnames_default()('selector-search-select theme-input-bg-base', {
+        'active': showList,
         disabled
       }),
       ref: this.selectRef,
@@ -2539,14 +2501,13 @@ class SelectorSearch extends external_react_namespaceObject.Component {
         event.stopPropagation();
         event.nativeEvent.stopImmediatePropagation();
       }
-    }), keyword == "" && (label == "" ? /*#__PURE__*/external_react_default().createElement("span", {
+    }), keyword == '' && (label == '' ? /*#__PURE__*/external_react_default().createElement("span", {
       className: "selector-search-label none"
-    }, placeholder ? placeholder : "请选择") : /*#__PURE__*/external_react_default().createElement("span", {
+    }, placeholder ? placeholder : '请选择') : /*#__PURE__*/external_react_default().createElement("span", {
       className: "selector-search-label"
     }, label)), /*#__PURE__*/external_react_default().createElement("span", {
       className: "dropdown-icon"
     }, /*#__PURE__*/external_react_default().createElement(IconDropDown, null))), showList ? /*#__PURE__*/external_react_default().createElement(selector_search_OptionList, {
-      loading: loading,
       filterData: filterData,
       optionsStyle: optionsStyle,
       renderOption: renderOption,
@@ -2554,8 +2515,7 @@ class SelectorSearch extends external_react_namespaceObject.Component {
       labelKey: labelKey,
       valueKey: valueKey,
       loadComponent: loadComponent,
-      onSelect: this.select,
-      onReachBottom: onReachBottom
+      onSelect: this.select
     }) : null);
   }
 }
@@ -2571,11 +2531,7 @@ selector_search_defineProperty(SelectorSearch, "propTypes", {
   onSearchResultChange: (external_prop_types_default()).func,
   // 搜索结果change
   onBlur: (external_prop_types_default()).func,
-  onFocus: (external_prop_types_default()).func,
-  controlled: (external_prop_types_default()).bool,
-  keywordChange: (external_prop_types_default()).func,
-  maxLength: (external_prop_types_default()).number
-  // loading: PropTypes.bool, // 如果是loading 则在filter面板显示 转圈
+  onFocus: (external_prop_types_default()).func
 });
 ;// ./src/components/selector-search/index.js
 
@@ -5659,7 +5615,7 @@ class TimeSelector extends external_react_namespaceObject.Component {
 
 /* harmony default export */ const time_selector = (TimeSelector);
 ;// ./package.json
-const package_namespaceObject = {"rE":"1.0.4"};
+const package_namespaceObject = {"rE":"1.0.5"};
 ;// ./src/index.js
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaiheila/ui-components",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "开黑啦 UI Components",
   "main": "dist/ui-components.js",
   "scripts": {
@@ -20,7 +20,7 @@
     "@babel/core": "^7.15.5",
     "@babel/preset-env": "^7.15.6",
     "@babel/preset-react": "^7.14.5",
-    "@kookapp/logic-models-react": "1.0.7",
+    "@kookapp/logic-models-react": "^1.0.1",
     "babel-loader": "^8.2.2",
     "classnames": "^2.3.1",
     "css-loader": "^6.7.1",
@@ -38,7 +38,7 @@
     "webpack-dev-server": "^4.11.1"
   },
   "peerDependencies": {
-    "@kookapp/logic-models-react": "^1.0.7",
+    "@kookapp/logic-models-react": "^1.0.1",
     "react": "^18",
     "react-dom": "^18"
   },