npm - intelicoreact - Versions diffs - 1.4.67 → 1.4.69 - Mend

intelicoreact 1.4.67 → 1.4.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/Atomic/FormElements/TagsDropdown/TagsDropdown.js CHANGED Viewed

@@ -25,7 +25,7 @@ const RC = "tags-dropdown";
 const MIN_ITEMS_FOR_SHOW_MOBILE_SEARCH = 10;
 const COLORS = ["#F1F0F0", "#E3E2E0", "#EEDFDA", "#F9DEC9", "#FDECC8", "#DBECDB", "#D3E4EF", "#E8DEEE", "#F4E0E9", "#FFE2DD", "#D3EFED", "#ECEEDE"];
 const TagsDropdown = _ref => {
-  var _Object$keys, _dropdownListWrapperR2, _dropdownListRef$curr7, _dropdownListRef$curr8;
+  var _Object$keys, _dropdownListWrapperR2, _dropdownListRef$curr8, _dropdownListRef$curr9;
   let {
     options: optionsProp,
     chosenOptions = [],
@@ -91,6 +91,7 @@ const TagsDropdown = _ref => {
   const isMobile = isMobileProp && withMobileLogic && window.screen.width <= 768;
   const [dropdownId] = (0, _react.useState)(id || fieldKey || Math.random().toString(16).slice(2));
   const [isOpen, setIsOpen] = (0, _react.useState)(false);
+  const [windowScrollTop, setWindowScrollTop] = (0, _react.useState)(0);
   const [listPos, setListPos] = (0, _react.useState)(null);
   const [initListHeight, setInitListHeight] = (0, _react.useState)(null);
   const [isScrollableList, setIsScrollableList] = (0, _react.useState)(null);
@@ -559,6 +560,7 @@ const TagsDropdown = _ref => {
   }, [options]);
   // --- RENDER FUNCTIONS BEGIN --- //
   const getMarkupForElement = item => {
     var _item$customMobileIco;
     const {
@@ -630,13 +632,15 @@ const TagsDropdown = _ref => {
     const filteredOptions = getFilteredOptions(options);
     const arrToPrint = [];
     for (const option of filteredOptions) {
-      var _option$groupName, _option$list2;
-      if (option.groupName) arrToPrint.push( /*#__PURE__*/_react.default.createElement("div", {
-        key: (_option$groupName = option.groupName) === null || _option$groupName === void 0 || (_option$groupName = _option$groupName.toString()) === null || _option$groupName === void 0 ? void 0 : _option$groupName.replace(/ /g, "_").concat(Date.now()),
-        className: (0, _classnames.default)("".concat(RC, "-group"), option.className)
-      }, /*#__PURE__*/_react.default.createElement("span", {
-        className: "".concat(RC, "-group__name")
-      }, option.groupName), (_option$list2 = option.list) === null || _option$list2 === void 0 ? void 0 : _option$list2.map(item => getMarkupForElement(item))));else arrToPrint.push(getMarkupForElement(option));
+      if (option.groupName) {
+        var _option$groupName, _option$list2;
+        arrToPrint.push( /*#__PURE__*/_react.default.createElement("div", {
+          key: (_option$groupName = option.groupName) === null || _option$groupName === void 0 || (_option$groupName = _option$groupName.toString()) === null || _option$groupName === void 0 ? void 0 : _option$groupName.replace(/ /g, "_").concat(Date.now()),
+          className: (0, _classnames.default)("".concat(RC, "-group"), option.className)
+        }, /*#__PURE__*/_react.default.createElement("span", {
+          className: "".concat(RC, "-group__name")
+        }, option.groupName), (_option$list2 = option.list) === null || _option$list2 === void 0 ? void 0 : _option$list2.map(item => getMarkupForElement(item))));
+      } else arrToPrint.push(getMarkupForElement(option));
     }
     return /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)("".concat(RC, "__container-wrapper")),
@@ -879,11 +883,15 @@ const TagsDropdown = _ref => {
   }, [chosenOptions, isUseLocalOptionsStore]);
   (0, _react.useEffect)(() => {
     var _selectAllButtonRef$c, _unselectAllButtonRef;
+    const windowScrollEventHandler = e => {
+      setWindowScrollTop(window.scrollY);
+    };
     const fn = isOpen ? "addEventListener" : "removeEventListener";
     selectAllButtonRef === null || selectAllButtonRef === void 0 || (_selectAllButtonRef$c = selectAllButtonRef.current) === null || _selectAllButtonRef$c === void 0 || _selectAllButtonRef$c[fn]("click", selectAllItems, true);
     unselectAllButtonRef === null || unselectAllButtonRef === void 0 || (_unselectAllButtonRef = unselectAllButtonRef.current) === null || _unselectAllButtonRef === void 0 || _unselectAllButtonRef[fn]("click", unselectAllItems, true);
     if (isOpen) {
       var _getListContainer5;
+      if (!isMobile || !withMobileLogic) window.removeEventListener("scroll", windowScrollEventHandler);
       if (customTriggerRef !== null && customTriggerRef !== void 0 && customTriggerRef.current) {
         customTriggerRef.current.style.pointerEvents = "none";
       }
@@ -897,6 +905,7 @@ const TagsDropdown = _ref => {
       }
     } else {
       var _getListContainer6;
+      if (!isMobile || !withMobileLogic) window.addEventListener("scroll", windowScrollEventHandler);
       if (customTriggerRef !== null && customTriggerRef !== void 0 && customTriggerRef.current) {
         customTriggerRef.current.style.pointerEvents = "auto";
       }
@@ -910,6 +919,12 @@ const TagsDropdown = _ref => {
     const setScrollTopValue = e => {
       setScrollTop(parseInt(e.target.scrollTop, 10));
     };
+    const preventWindowScrolling = e => {
+      e.preventDefault();
+      window.scrollTo({
+        top: windowScrollTop
+      });
+    };
     if (isOpen && isMobile && dropdownListRef !== null && dropdownListRef !== void 0 && dropdownListRef.current) {
       var _dropdownListRef$curr, _dropdownListRef$curr2, _dropdownListRef$curr3;
       dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr = dropdownListRef.current) === null || _dropdownListRef$curr === void 0 || _dropdownListRef$curr.addEventListener("scroll", setScrollTopValue);
@@ -921,17 +936,19 @@ const TagsDropdown = _ref => {
     }
     if (isOpen && dropdownListRef && dropdownListRef.current) {
       dropdownListRef.current.addEventListener("scroll", doScrollCallback);
+      if (!isMobile || !withMobileLogic) window.addEventListener("scroll", preventWindowScrolling);
     }
     return () => {
-      var _dropdownListRef$curr6;
-      removeEventListener("scroll", doScrollCallback);
-      dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr6 = dropdownListRef.current) === null || _dropdownListRef$curr6 === void 0 || _dropdownListRef$curr6.removeEventListener("scroll", setScrollTopValue);
+      var _dropdownListRef$curr6, _dropdownListRef$curr7;
+      if (!isMobile || !withMobileLogic) window.removeEventListener("scroll", preventWindowScrolling);
+      dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr6 = dropdownListRef.current) === null || _dropdownListRef$curr6 === void 0 || _dropdownListRef$curr6.removeEventListener("scroll", doScrollCallback);
+      dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr7 = dropdownListRef.current) === null || _dropdownListRef$curr7 === void 0 || _dropdownListRef$curr7.removeEventListener("scroll", setScrollTopValue);
     };
-  }, [isOpen, isMobile, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current, dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr7 = dropdownListRef.current) === null || _dropdownListRef$curr7 === void 0 ? void 0 : _dropdownListRef$curr7.scrollHeight, dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr8 = dropdownListRef.current) === null || _dropdownListRef$curr8 === void 0 ? void 0 : _dropdownListRef$curr8.clientHeight]);
+  }, [isOpen, isMobile, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current, dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr8 = dropdownListRef.current) === null || _dropdownListRef$curr8 === void 0 ? void 0 : _dropdownListRef$curr8.scrollHeight, dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr9 = dropdownListRef.current) === null || _dropdownListRef$curr9 === void 0 ? void 0 : _dropdownListRef$curr9.clientHeight]);
   (0, _react.useEffect)(() => {
     if (dropdownListRef !== null && dropdownListRef !== void 0 && dropdownListRef.current) {
-      var _dropdownListRef$curr9, _dropdownListRef$curr10;
-      setScrollHeight(parseInt((dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr9 = dropdownListRef.current) === null || _dropdownListRef$curr9 === void 0 ? void 0 : _dropdownListRef$curr9.scrollHeight) - (dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr10 = dropdownListRef.current) === null || _dropdownListRef$curr10 === void 0 ? void 0 : _dropdownListRef$curr10.clientHeight), 10));
+      var _dropdownListRef$curr10, _dropdownListRef$curr11;
+      setScrollHeight(parseInt((dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr10 = dropdownListRef.current) === null || _dropdownListRef$curr10 === void 0 ? void 0 : _dropdownListRef$curr10.scrollHeight) - (dropdownListRef === null || dropdownListRef === void 0 || (_dropdownListRef$curr11 = dropdownListRef.current) === null || _dropdownListRef$curr11 === void 0 ? void 0 : _dropdownListRef$curr11.clientHeight), 10));
     }
   }, [scrollTop, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current]);
   (0, _react.useEffect)(() => {

package/dist/Classes/RESTAPI/index.js CHANGED Viewed

@@ -65,6 +65,10 @@ class RESTAPI extends _ApiBase.default {
     //? При вызове getRequestInstance передадим контекст API
     //? В результате вызова получим экземпляр класса AbortableFetch...
     const instance = await _utils.getInstanceOfFetchSystem.call(this);
+    if (!instance) {
+      throw new Error('It is impossible to make a request!');
+    }
     //? ... который еще немного донастроим сеттерами экзепляра
     instance.setIsResponseAsObject(isResponseAsObject !== null && isResponseAsObject !== void 0 ? isResponseAsObject : true);
     if (callback) instance.setCallback(callback);

package/dist/Classes/RESTAPI/partials/CredentialsProcessing.js CHANGED Viewed

@@ -201,9 +201,14 @@ class CredentialsProcessing {
     return CONTEXT.refreshCredentials(cred, response => CONTEXT.saveCredentials(response)).then(() => {
       return new Promise(resolve => {
         setTimeout(async () => {
-          var _CONTEXT$callbackAfte;
           const newCredentials = await CONTEXT.getCredentials();
-          if (!(newCredentials !== null && newCredentials !== void 0 && newCredentials.token)) await (CONTEXT === null || CONTEXT === void 0 || (_CONTEXT$callbackAfte = CONTEXT.callbackAfterRejectRefresh) === null || _CONTEXT$callbackAfte === void 0 ? void 0 : _CONTEXT$callbackAfte.call(CONTEXT));
+          if (!(newCredentials !== null && newCredentials !== void 0 && newCredentials.token)) {
+            newCredentials.isRefreshFailed = true;
+            setTimeout(() => {
+              var _CONTEXT$callbackAfte;
+              CONTEXT === null || CONTEXT === void 0 || (_CONTEXT$callbackAfte = CONTEXT.callbackAfterRejectRefresh) === null || _CONTEXT$callbackAfte === void 0 || _CONTEXT$callbackAfte.call(CONTEXT);
+            }, 0);
+          }
           resolve(newCredentials);
         }, 0);
       });

package/dist/Classes/RESTAPI/partials/_utils.js CHANGED Viewed

@@ -41,6 +41,10 @@ async function getInstanceOfFetchSystem(isGetBody) {
     const cred = await CREDENTIALS_CONTEXT.getCredentials();
     credentials = CREDENTIALS_CONTEXT.isUseRefreshTokensPropcessing ? await CREDENTIALS_CONTEXT.waitRefresh(cred.isNeedRefresh && !CREDENTIALS_CONTEXT.getIsTokenStartRefresh()).then(async () => CREDENTIALS_CONTEXT.processCredentials(await CREDENTIALS_CONTEXT.getCredentials())) : cred;
   }
+  //? На уровне получения instance может уже сложиться ситуация, что сходили на рефреш и он неудачный.
+  //? Прерываем получение instance, даем возможность отработать callbackAfterRejectRefresh (смотри class CredentialsProcessing)
+  if (credentials.isRefreshFailed) return null;
   if (API_CONTEXT.addAsCommon && typeof API_CONTEXT.addAsCommon !== "function") {
     throw new Error("addAsCommon must be function [getInstanceOfFetchSystem]");
   }
@@ -104,11 +108,10 @@ async function getInstanceOfFetchSystem(isGetBody) {
           const isDoRefresh = !(CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && (_CREDENTIALS_CONTEXT$6 = CREDENTIALS_CONTEXT.getIsTokenStartRefresh) !== null && _CREDENTIALS_CONTEXT$6 !== void 0 && _CREDENTIALS_CONTEXT$6.call(CREDENTIALS_CONTEXT));
           return CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.waitRefresh(isDoRefresh).then(async () => {
             //? Пробуем зарефрешить
-            await (CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.processCredentials({
+            const newCredentials = await (CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.processCredentials({
               ...(await (CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.getCredentials(true))),
               isCatchCallbackProcess: isDoRefresh
             }));
-            const newCredentials = await CREDENTIALS_CONTEXT.getCredentials();
             ABORTABLE_FETCH_INSTANCE.setHeaders({
               ...ABORTABLE_FETCH_INSTANCE.getHeaders(),
               ...(newCredentials !== null && newCredentials !== void 0 && newCredentials.token ? {

package/package.json CHANGED Viewed

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