intelicoreact 1.1.76 → 1.1.78

package/dist/Atomic/FormElements/DropdownLiveSearch/DropdownLiveSearch.js

@@ -23,6 +23,8 @@ var _useDebounce = require("../../../Functions/useDebounce");
 
 var _fieldValueFormatters = require("../../../Functions/fieldValueFormatters");
 
+var _utils = require("../../../Functions/utils");
+
 var _Spinner = _interopRequireDefault(require("../../Layout/Spinner/Spinner"));
 
 require("./DropdownLiveSearch.scss");
@@ -32,9 +34,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var RC = 'dropdown-live-search';
-var notReact = {
-  searchValue: ''
-};
 
 var DropdownLiveSearch = function DropdownLiveSearch(_ref) {
   var value = _ref.value,
@@ -80,20 +79,26 @@ var DropdownLiveSearch = function DropdownLiveSearch(_ref) {
       searchValue = _useState6[0],
       setSV = _useState6[1];
 
-  var setSearchValue = function setSearchValue(val) {
-    setSV(val);
-    notReact.searchValue = val;
-  };
+  var _useState7 = (0, _react.useState)(options),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      previousOptions = _useState8[0],
+      setPreviousOptions = _useState8[1];
 
   var dropdownLiveSearchRef = (0, _react.useRef)(null);
   var dropdownListBoxRef = (0, _react.useRef)(null);
   var dropdownListRef = (0, _react.useRef)(null);
   var searchInputRef = (0, _react.useRef)(null);
+  var searchValueRef = (0, _react.useRef)(labelByValue);
 
-  var _useState7 = (0, _react.useState)(false),
-      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      isFocusedByClick = _useState8[0],
-      setIsFocusedByClick = _useState8[1];
+  var setSearchValue = function setSearchValue(val) {
+    setSV(val);
+    searchValueRef.current = val;
+  };
+
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      isFocusedByClick = _useState10[0],
+      setIsFocusedByClick = _useState10[1];
 
   var debouncedSearchTerm = (0, _useDebounce.useDebounce)({
     searchValue: searchValue,
@@ -245,8 +250,8 @@ var DropdownLiveSearch = function DropdownLiveSearch(_ref) {
   }, [dropdownLiveSearchRef, isOpen]);
   var doScrollCallback = (0, _react.useCallback)(function (e) {
     if (doRequest && typeof doRequest === 'function') {
-      if (Math.round(e.target.clientHeight + e.target.scrollTop) == e.target.scrollHeight) {
-        doRequest(notReact.searchValue, true);
+      if (Math.round(e.target.clientHeight + e.target.scrollTop) == e.target.scrollHeight && (0, _utils.compare)(options, previousOptions)) {
+        doRequest(searchValueRef.current, true);
       }
     }
   }, [options]);
@@ -261,6 +266,9 @@ var DropdownLiveSearch = function DropdownLiveSearch(_ref) {
       removeEventListener('scroll', doScrollCallback);
     };
   }, [isOpen, dropdownListRef]);
+  (0, _react.useEffect)(function () {
+    setPreviousOptions(options);
+  }, [options]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(RC, className, disabled),
     ref: dropdownLiveSearchRef

package/dist/Atomic/UI/Modal/Modal.js

@@ -50,6 +50,7 @@ var Modal = function Modal(_ref2) {
       zIndex = _ref2$zIndex === void 0 ? 100 : _ref2$zIndex,
       isOpen = _ref2.isOpen,
       onConfirm = _ref2.onConfirm,
+      onDecline = _ref2.onDecline,
       closeModal = _ref2.closeModal,
       children = _ref2.children,
       className = _ref2.className,
@@ -91,6 +92,11 @@ var Modal = function Modal(_ref2) {
     confirm: function confirm() {
       onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
     },
+    decline: function decline() {
+      //? closeModal используется для ESC и оверлея, давно хотелось иметь возможность разделить
+      //? Теперь можно не передавать closeModal, а для cancel-кнопки передать отдельный обработчик
+      if (typeof onDecline === 'function') onDecline();else closeModal === null || closeModal === void 0 ? void 0 : closeModal();
+    },
     pressEnter: function pressEnter(event) {
       if (event.keyCode === KEY_CODE.ENTER && !event.repeat) handle.confirm();
     },
@@ -124,7 +130,7 @@ var Modal = function Modal(_ref2) {
   }, !noHeader && /*#__PURE__*/_react.default.createElement(_ModalTitle.default, {
     variant: variant,
     isForced: forced,
-    onClose: closeModal,
+    onClose: handle.decline,
     noHeaderCloseBtn: noHeaderCloseBtn
   }, /*#__PURE__*/_react.default.createElement("span", null, renderModalTitle({
     mode: mode,
@@ -142,7 +148,9 @@ var Modal = function Modal(_ref2) {
     testId: "modal",
     className: (0, _classnames.default)(closeBtnClassName, btnClassNames),
     variant: closeBtnVariant || 'dark-outline',
-    onClick: closeModal,
+    onClick: function onClick() {
+      return handle.decline();
+    },
     label: closeBtnText || 'Cancel',
     disabled: closeBtnDisable,
     icon: closeBtnIcon,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "1.1.76",
+  "version": "1.1.78",
   "description": "",
   "main": "dist/index.js",
   "files": [