@formixru/b2b-ui 3.6.0 → 3.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@formixru/b2b-ui",
-    "version": "3.6.0",
+    "version": "3.6.1",
     "type": "module",
     "repository": {
         "type": "git",

package/src/components/request/index.js

@@ -4,7 +4,7 @@ import { isString } from 'es-toolkit';
 
 import { errorHandler } from '../../utils/error-handler.js';
 import { hide as hideDialog, show as showDialog } from '../dialog/index.js';
-import { clearLoaderTimeout, hide as hideLoader, show as showLoader } from '../loader/index.js';
+import { hide as hideLoader, show as showLoader } from '../loader/index.js';
 import { hide as hideSidebar, show as showSidebar } from '../sidebar/index.js';
 
 export const initRequestContent = ($b) => {
@@ -78,16 +78,12 @@ export const request = async ({
             data = { content: raw };
         }
 
+        const shouldHideLoader = loader && hideLoaderOnSuccess;
+        let isLoaderHidden = false;
+
         if (isString(data.redirect)) {
             if (data.redirect) {
                 location.assign(data.redirect);
-                if (data.redirect.startsWith('tg:')) {
-                    if (loader) {
-                        hideLoader();
-                    }
-                } else {
-                    clearLoaderTimeout();
-                }
             } else {
                 location.reload();
             }
@@ -100,13 +96,6 @@ export const request = async ({
                 }
             }
 
-            const isReloadPending =
-                (data.reloadOnHideDialog && data.hideDialog) || (data.reloadOnHideSidebar && data.hideSidebar);
-            const isUIComponentClosing = data.hideDialog || data.hideSidebar;
-            const shouldSkipLoaderClose = isReloadPending || (data.trigger && !isUIComponentClosing);
-            const shouldHideLoader = loader && hideLoaderOnSuccess && !shouldSkipLoaderClose;
-            let isLoaderHidden = false;
-
             if (data.dialog) {
                 const elementId = getElementId(data.dialog.id);
                 const $dialog = document.querySelector(elementId);
@@ -204,10 +193,10 @@ export const request = async ({
                     }
                 }
             }
+        }
 
-            if (shouldHideLoader && !isLoaderHidden) {
-                hideLoader();
-            }
+        if (shouldHideLoader && !isLoaderHidden) {
+            hideLoader(isString(data.redirect) ? 3000 : undefined);
         }
 
         return data;
@@ -215,9 +204,18 @@ export const request = async ({
         if (error.status === 401) {
             location.reload();
         } else {
+            if (
+                error.name === 'AbortError' ||
+                error.message?.includes('NetworkError') ||
+                error.message?.includes('Failed to fetch')
+            ) {
+                return;
+            }
+
             if (loader) {
                 hideLoader();
             }
+
             errorHandler(error);
         }
     }