@formixru/b2b-ui 1.0.3 → 1.0.5

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.0.5
+
+- Доработки по коду и документации
+- Функция __FORMIX__DIALOG__INIT_JSON переименована в __FORMIX__DIALOG__INTERCEPT_DATA
+- Обновлена требуемая версия @advdominion/tooltip
+- Доработки по работе по .tabs
+
+## v1.0.4
+
+- Добавлены новые переменные для .slider-nav
+- Исправлены ошибки в работе FileInput
+
 ## v1.0.3
 
 - Исправлены ошибки в работе SuggestInput

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@formixru/b2b-ui",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "type": "module",
     "repository": {
         "type": "git",
@@ -28,7 +28,7 @@
         "@advdominion/is": "^1.0.1",
         "@advdominion/lightningcss-loader": "^1.0.0",
         "@advdominion/pluralize": "^1.0.1",
-        "@advdominion/tooltip": "^1.0.0",
+        "@advdominion/tooltip": "^3.0.0",
         "@eslint/eslintrc": "^3.2.0",
         "@eslint/js": "^9.18.0",
         "@floating-ui/dom": "^1.6.13",

package/src/components/dialog/index.js

@@ -125,7 +125,7 @@ export const get = async (id, url) => {
             try {
                 data = JSON.parse(data);
                 if (is(data.redirect, 'String')) {
-                    if (data.redirect.length > 0) {
+                    if (data.redirect) {
                         location.assign(data.redirect);
                         clearLoaderTimeout();
                     } else {
@@ -133,9 +133,9 @@ export const get = async (id, url) => {
                     }
                 } else {
                     try {
-                        await window.__FORMIX__DIALOG__INIT_JSON();
+                        await window.__FORMIX__DIALOG__INTERCEPT_DATA(data);
                     } catch {
-                        console.warn('Функция __FORMIX__DIALOG__INIT_JSON не установлена');
+                        console.warn('Функция __FORMIX__DIALOG__INTERCEPT_DATA не установлена');
                     }
                     data = data.content || '';
                 }

package/src/components/file-input/index.vue

@@ -48,7 +48,7 @@
 
 import { pluralize } from '@advdominion/pluralize';
 import mime from 'mime';
-import { computed, onMounted, ref, toRefs } from 'vue';
+import { computed, nextTick, onMounted, ref, toRefs } from 'vue';
 
 const ICONS_PATH = window.ICONS_PATH;
 
@@ -265,6 +265,7 @@ const uploadFile = async (file) => {
             throw response;
         }
         files.value[index].uploaded = true;
+        await nextTick();
         emit('upload');
     } catch (error) {
         if (error.status === 401) {

package/src/components/form/index.js

@@ -44,49 +44,7 @@ export const send = async ($b, url, method, data) => {
             console.warn('Ошибка при попытке преобразования ответа в JSON.');
             return {};
         });
-        if (data.success) {
-            $b.dispatchEvent(new CustomEvent('form-success', { bubbles: true }));
-        }
-        if (data.dialog) {
-            const $dialog = document.querySelector(data.dialog.id);
-            $dialog.querySelector('.dialog__container').innerHTML = data.dialog.content;
-            showDialog($dialog);
-        }
-        if (data.reloadOnHideDialog) {
-            $b.closest('.dialog').addEventListener('dialog-hide', () => {
-                location.reload();
-            });
-        }
-        if (data.hideDialog) {
-            hideDialog($b.closest('.dialog'));
-        }
-        try {
-            await window.__FORMIX__FORM__INTERCEPT_DATA(data);
-        } catch {
-            console.warn('Функция __FORMIX__FORM__INTERCEPT_DATA не установлена');
-        }
-        if (data.content) {
-            hideLoader();
-            const $dialog = $b.closest('.dialog');
-            if ($dialog) {
-                $dialog.querySelector('.dialog__container').innerHTML = data.content;
-                initDialogContent($dialog);
-                setTimeout(() => {
-                    scrollToError($dialog);
-                });
-            } else {
-                const $parent = $b.parentElement;
-                $b.outerHTML = data.content;
-                const $form = $parent.querySelector('.form');
-                if ($form) {
-                    init($form);
-                    initFormContent($form);
-                    setTimeout(() => {
-                        scrollToError($form);
-                    });
-                }
-            }
-        } else if (is(data.redirect, 'String')) {
+        if (is(data.redirect, 'String')) {
             if (data.redirect) {
                 location.assign(data.redirect);
                 if (data.redirect.startsWith('tg:')) {
@@ -98,7 +56,51 @@ export const send = async ($b, url, method, data) => {
                 location.reload();
             }
         } else {
-            hideLoader();
+            if (!(data.reloadOnHideDialog && data.hideDialog)) {
+                hideLoader();
+            }
+            try {
+                await window.__FORMIX__FORM__INTERCEPT_DATA(data);
+            } catch {
+                console.warn('Функция __FORMIX__FORM__INTERCEPT_DATA не установлена');
+            }
+            if (data.success) {
+                $b.dispatchEvent(new CustomEvent('form-success', { bubbles: true }));
+            }
+            if (data.dialog) {
+                const $dialog = document.querySelector(data.dialog.id);
+                $dialog.querySelector('.dialog__container').innerHTML = data.dialog.content;
+                showDialog($dialog);
+            }
+            if (data.reloadOnHideDialog) {
+                $b.closest('.dialog').addEventListener('dialog-hide', () => {
+                    location.reload();
+                });
+            }
+            if (data.hideDialog) {
+                hideDialog($b.closest('.dialog'));
+            }
+            if (data.content) {
+                const $dialog = $b.closest('.dialog');
+                if ($dialog) {
+                    $dialog.querySelector('.dialog__container').innerHTML = data.content;
+                    initDialogContent($dialog);
+                    setTimeout(() => {
+                        scrollToError($dialog);
+                    });
+                } else {
+                    const $parent = $b.parentElement;
+                    $b.outerHTML = data.content;
+                    const $form = $parent.querySelector('.form');
+                    if ($form) {
+                        init($form);
+                        initFormContent($form);
+                        setTimeout(() => {
+                            scrollToError($form);
+                        });
+                    }
+                }
+            }
         }
     } catch (error) {
         if (error.status === 401) {

package/src/components/sidebar/index.js

@@ -88,10 +88,9 @@ export const get = async (id, url, showLoaderDelay) => {
             if (data.length > 0) {
                 const $b = document.querySelector(id);
                 $b.innerHTML = data;
-                show($b).then(() => {
-                    hideLoader();
-                    initSidebarContent($b);
-                });
+                await show($b)
+                hideLoader();
+                initSidebarContent($b);
             } else {
                 hideLoader();
             }

package/src/components/slider-nav/index.scss

@@ -56,6 +56,8 @@ $b: '.slider-nav';
 
             &:not(#{$b}__button_disabled):hover,
             &:not(#{$b}__button_disabled):focus-visible {
+                background-color: $slider-nav-button-fill-white-active-bg;
+                border-color: $slider-nav-button-fill-white-active-border-color;
                 color: $slider-nav-button-fill-white-active-color;
             }
         }

package/src/components/tabs/index.js

@@ -10,7 +10,7 @@ const setLeftWidth = async ($line, $el) => {
     const $label = $el.querySelector('.tabs__label');
     const styles = {
         width: $label.getBoundingClientRect().width,
-        left: $label.offsetLeft,
+        left: $el.offsetLeft + $label.offsetLeft,
     };
     await $line.animate([{ transform: `translateX(${styles.left}px)`, width: `${styles.width}px` }], {
         duration: cssVar('--duration-effect-s'),

package/src/variables.scss

@@ -1049,7 +1049,10 @@ $slider-nav-button-fill-white-bg: $color-white !default;
 $slider-nav-button-fill-white-border-color: $color-white !default;
 $slider-nav-button-fill-white-shadow: $shadow !default;
 $slider-nav-button-fill-white-color: $color-grey-70 !default;
+
+$slider-nav-button-fill-white-active-bg: $slider-nav-button-fill-white-bg !default;
 $slider-nav-button-fill-white-active-color: $color-grey-40 !default;
+$slider-nav-button-fill-white-active-border-color: $slider-nav-button-fill-white-border-color !default;
 
 /********** Пагинация слайдеров (.slider-pagination) **********/