vgapp 0.5.8 → 0.6.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# VEGAS-APP 0.6.0 (Август, 20, 2025)
+* Исправлены ошибки в разных модулях
+
+# VEGAS-APP 0.5.6 - 0.5.9 (Август, 08, 2025)
+* Разделение JS и CSS
+* Исправлены ошибки в разных модулях
+
 # VEGAS-APP 0.4.6 - 0.5.5 (Июнь, 21, 2025)
 * Исправлены ошибки в разных модулях
 

package/app/modules/base-module.js

@@ -96,6 +96,16 @@ class BaseModule {
 		new Animation(element, key, params);
 	}
 
+	isMobileDevice() {
+		const userAgent = navigator.userAgent;
+		const isMobileUA = /Android|iPhone|iPad|iPod/i.test(userAgent);
+		const isTouchDevice = "ontouchstart" in window || navigator.maxTouchPoints > 0;
+		const isSmallScreen = window.innerWidth < 768;
+		const isHighDPI = window.devicePixelRatio >= 2;
+
+		return isMobileUA || (isTouchDevice && isSmallScreen && isHighDPI);
+	}
+
 	static getInstance(element) {
 		return Data.get(Selectors.find(element), this.NAME_KEY)
 	}

package/app/modules/vgalert/index.js

@@ -1,5 +1,3 @@
-// alert
-import "./scss/vgalert.scss";
 import VGAlert from "./js/vgalert";
 
 export default VGAlert;

package/app/modules/vgdropdown/index.js

@@ -1,4 +1,3 @@
-import './scss/vgdropdown.scss';
 import VGDropdown from "./js/vgdropdown";
 
 export default VGDropdown;

package/app/modules/vgdropdown/js/vgdropdown.js

@@ -209,8 +209,9 @@ class VGDropdown extends BaseModule {
 	static init(element, params = {}) {
 		const instance = VGDropdown.getOrCreateInstance(element, params);
 
-		if (instance._params.hover) {
+		if (instance._params.hover && !instance.isMobileDevice()) {
 			let currentElem = null;
+
 			EventHandler.on(instance._parent, EVENT_MOUSEOVER_DATA_API, function (event) {
 				if (currentElem) return;
 				VGDropdown.hideOpenToggles(event);
@@ -236,16 +237,16 @@ class VGDropdown extends BaseModule {
 				currentElem = null;
 				instance._completeHide({relatedTarget: instance._element});
 			})
-		} else {
-			EventHandler.on(document, EVENT_KEYUP_DATA_API, SELECTOR_DATA_TOGGLE, VGDropdown.keydownHandler);
-			EventHandler.on(document, EVENT_KEYDOWN_DATA_API, '.' + TARGET_CONTAINER, VGDropdown.keydownHandler);
-			EventHandler.on(document, EVENT_KEYUP_DATA_API, VGDropdown.clearDrops);
-			EventHandler.on(document, EVENT_CLICK_DATA_API, VGDropdown.clearDrops);
-			EventHandler.on(element, EVENT_CLICK_DATA_API, function (event) {
-				event.preventDefault();
-				instance.toggle();
-			});
 		}
+
+		EventHandler.on(document, EVENT_KEYUP_DATA_API, SELECTOR_DATA_TOGGLE, VGDropdown.keydownHandler);
+		EventHandler.on(document, EVENT_KEYDOWN_DATA_API, '.' + TARGET_CONTAINER, VGDropdown.keydownHandler);
+		EventHandler.on(document, EVENT_KEYUP_DATA_API, VGDropdown.clearDrops);
+		EventHandler.on(document, EVENT_CLICK_DATA_API, VGDropdown.clearDrops);
+		EventHandler.on(element, EVENT_CLICK_DATA_API, function (event) {
+			event.preventDefault();
+			instance.toggle();
+		});
 	}
 
 	static hideOpenToggles(event) {

package/app/modules/vgformsender/index.js

@@ -1,4 +1,3 @@
-import './scss/vgformsender.scss';
 import VGFormSender from "./js/vgformsender";
 
 export default VGFormSender;

package/app/modules/vglawcookie/index.js

@@ -1,4 +1,3 @@
-import './scss/vglawcookie.scss';
 import VGLawCookie from "./js/vglawcookie";
 
 export default VGLawCookie;

package/app/modules/vgmodal/index.js

@@ -1,4 +1,3 @@
-import './scss/vgmodal.scss';
 import VGModal from "./js/vgmodal";
 
 export default VGModal;

package/app/modules/vgmodal/scss/vgmodal.scss

@@ -9,7 +9,6 @@
 @import "../../../utils/scss/functions";
 @import "../../../utils/scss/mixin";
 @import "../../../utils/scss/variables";
-@import "../../../utils/scss/animate";
 @import "variables";
 
 .vg-modal {

package/app/modules/vgnav/!old/!vgnav.js

@@ -0,0 +1,510 @@
+import BaseModule from "../../base-module";
+import Selectors from "../../../utils/js/dom/selectors";
+import Responsive from "../../../utils/js/components/responsive";
+import {getSVG} from "../../module-fn";
+import {execute, isDisabled, isVisible, mergeDeepObject, noop, normalizeData} from "../../../utils/js/functions";
+import EventHandler from "../../../utils/js/dom/event";
+import {Manipulator} from "../../../utils/js/dom/manipulator";
+
+/**
+ * Constants
+ */
+const NAME = 'nav';
+const NAME_KEY = 'vg.nav';
+
+/**
+ * Constants Classes
+ */
+const CLASS_NAME_SHOW   = 'show';
+const CLASS_NAME_FADE   = 'fade';
+const CLASS_NAME_ACTIVE = 'active';
+const SELECTOR_DATA_TOGGLE = '.vg-nav a';
+
+/**
+ * Constants Events
+ */
+const EVENT_KEY_HIDE   = `${NAME_KEY}.hide`;
+const EVENT_KEY_HIDDEN = `${NAME_KEY}.hidden`;
+const EVENT_KEY_SHOW   = `${NAME_KEY}.show`;
+const EVENT_KEY_SHOWN  = `${NAME_KEY}.shown`;
+
+const EVENT_MOUSEOVER_DATA_API = `mouseover.${NAME_KEY}.data.api`;
+const EVENT_MOUSEOUT_DATA_API  = `mouseout.${NAME_KEY}.data.api`;
+const EVENT_CLICK_DATA_API = `click.${NAME_KEY}.data.api`;
+const EVENT_KEYUP_DATA_API = `keyup.${NAME_KEY}.data.api`;
+const EVENT_RESIZE_DATA_API = `resize.${NAME_KEY}.data.api`;
+
+class VGNav extends BaseModule {
+	constructor(element, params = {}) {
+		super(element);
+
+		this._params = this._getParams(element, mergeDeepObject({
+			breakpoint: false,
+			placement: 'horizontal',
+			classes: {
+				hamburgerActive: 'vg-nav-hamburger-active',
+				hamburgerAlways: 'vg-nav-hamburger-always',
+				hamburger: 'vg-nav-hamburger',
+				container: 'vg-nav-container',
+				wrapper: 'vg-nav-wrapper',
+				active: 'vg-nav-active',
+				expand: 'vg-nav-expand',
+				cloned: 'vg-nav-cloned',
+				hover: 'vg-nav-hover',
+				flip: 'vg-nav-flip',
+				XXXL: 'vg-nav-xxxl',
+				XXL: 'vg-nav-xxl',
+				XL: 'vg-nav-xl',
+				LG: 'vg-nav-lg',
+				MD: 'vg-nav-md',
+				SM: 'vg-nav-sm',
+				XS: 'vg-nav-xs'
+			},
+			expand: true,
+			hover: false,
+			position: true,
+			collapse: true,
+			toggle: '<span class="default"></span>',
+			hamburger: {
+				enable: true,
+				always: false,
+				title: '',
+				body: null
+			},
+			callback: noop,
+			animation: true,
+			timeoutAnimation: 300,
+			ajax: {
+				route: '',
+				target: '',
+				method: 'get',
+				loader: false,
+				once: false,
+				output: true,
+			}
+		}, params));
+
+		this._navigation = null;
+		this.navigation = '.' + this._params.classes.wrapper;
+
+		this.movedLinks = [];
+		this.$links = Selectors.findAll('.' + this._params.classes.wrapper + ' > li', this.navigation)
+
+		if (this._params.animation === false) {
+			this._params.timeoutAnimation = 10
+		}
+	}
+
+	static get NAME() {
+		return NAME;
+	}
+
+	static get NAME_KEY() {
+		return NAME_KEY;
+	}
+
+	get navigation() {
+		return this._navigation;
+	}
+
+	set navigation(el) {
+		let elm = Selectors.find(el, this._element);
+		if (!elm) return;
+		this._navigation = elm;
+	}
+
+	build() {
+		if (!this.navigation) return;
+
+		let params = this._params;
+
+		// Вешаем основные классы
+		this._element.classList.add(params.classes.container);
+		this._element.classList.add('vg-nav-' + params.placement);
+
+		// Если нужно оставить список меню или установить медиа точку
+		if (!params.breakpoint) {
+			params.expand = false;
+		}
+
+		if (!params.hamburger.always) {
+			if (!params.breakpoint || !params.expand) {
+				this._element.classList.add(params.classes.expand);
+			} else if (params.breakpoint !== false) {
+				this._element.classList.add('vg-nav-' + params.breakpoint);
+			}
+		} else {
+			this._element.classList.add(params.classes.hamburgerAlways);
+		}
+
+		// Меню срабатывает при наведении, если это не мобильное устройство
+		if (params.hover) {
+			this._element.classList.add(params.classes.hover);
+
+			if (Responsive.checkMobileOrTablet()) {
+				this._element.classList.remove(params.classes.hover);
+			}
+		}
+
+		// Устанавливаем гамбургер, если его нет в разметке
+		if (params.expand && !params.hamburger.body && params.hamburger.enable) {
+			let isHamburger = Selectors.find('.' + params.classes.hamburger, this._element);
+
+			if (isHamburger === null) {
+				let mTitle = '',
+					hamburger = '<span class="' + params.classes.hamburger + '--lines"><span></span><span></span><span></span></span>';
+
+				if (params.hamburger.title) {
+					mTitle = '<span class="' + params.classes.hamburger + '--title">'+ params.hamburger.title +'</span>';
+				}
+
+				if (params.hamburger.body !== null) {
+					hamburger = params.hamburger.body;
+				}
+
+				this._element.insertAdjacentHTML('afterbegin','<a href="#sidebar-nav" class="' + params.classes.hamburger + '" data-vg-toggle="sidebar">' + mTitle + hamburger +'</a>');
+			}
+		}
+
+		// Устанавливаем указатель переключателя
+		if (params.toggle) {
+			let $dropdown_a = [...Selectors.findAll('.dropdown-mega > a, .dropdown > a', this._element)],
+				toggle = '<span class="toggle">' + params.toggle + '</span>';
+
+			if ($dropdown_a.length) {
+				$dropdown_a.forEach(function (elem) {
+					if (!elem.querySelector('.toggle') && !elem.closest('.dots')) {
+						elem.setAttribute('aria-expanded', 'false')
+						elem.insertAdjacentHTML('beforeend', toggle)
+					}
+				});
+			}
+		}
+
+		if (params.collapse && Responsive.check(this) && params.placement !== 'vertical') {
+			setCollapse(this);
+		}
+
+		if ('afterInit' in this._params.callback) {
+			execute(this._params.callback.afterInit, [this]);
+		}
+
+		/**
+		 * Функция сворачивания
+		 * TODO Придумать что то с мега меню, которое уходит в подменю
+		 * TODO Так же есть косяки при ресайзе
+		 */
+		function setCollapse(_this) {
+			let width_navigation_responsive = _this.navigation.clientWidth,
+				width_all_links_responsive = 0,
+				$dots = Selectors.find('.dots', _this.navigation),
+				_dots = getSVG('dots');
+
+			if (_this.$links.length) {
+				if ($dots) {
+					width_all_links_responsive = $dots.clientWidth
+				} else {
+					let $a = Selectors.find('a', _this.$links[0]),
+						$linkStyle = getComputedStyle($a),
+						paddingLeft = normalizeData($linkStyle.paddingLeft.slice(0, -2)),
+						paddingRight =  normalizeData($linkStyle.paddingRight.slice(0, -2)),
+						padding = paddingLeft + paddingRight;
+
+					// TODO не совсем верно, но мы точно знаем ширину точек в svg - 16px
+					width_all_links_responsive = padding + 16;
+				}
+
+				for (let $link of _this.$links) {
+					let width = $link.getBoundingClientRect().width;
+					width_all_links_responsive = width_all_links_responsive + width;
+
+					if ((width_navigation_responsive) < width_all_links_responsive) {
+						_this.movedLinks.push($link);
+						$link.remove();
+					} else {
+						if (_this.movedLinks.length) {
+							if ($dots) {
+								_this.navigation.insertBefore(_this.movedLinks[0], $dots)
+							} else {
+								_this.navigation.appendChild(_this.movedLinks[0])
+							}
+							_this.movedLinks.splice(0, 1);
+						}
+					}
+				}
+
+				if (_this.movedLinks.length) {
+					if (!$dots) {
+						_this.navigation.insertAdjacentHTML('beforeend','<li class="dropdown dots">' + '<a href="#" aria-expanded="false">'+ _dots +'</a></li>');
+					}
+				} else {
+					if ($dots) {
+						$dots.remove();
+					}
+				}
+
+				let $d = _this.navigation.querySelector('.dots');
+				if ($d && _this.movedLinks.length) {
+					let $dropdown = $d.querySelector('ul');
+					if ($dropdown) {
+						for (let link of _this.movedLinks) {
+							$dropdown.prepend(link);
+						}
+					} else {
+						let $dropdown = document.createElement('ul');
+						$dropdown.classList.add('dropdown-content');
+						$dropdown.classList.add('right');
+
+						for (let link of _this.movedLinks) {
+							$dropdown.prepend(link);
+						}
+
+						$d.appendChild($dropdown);
+					}
+				}
+			}
+		}
+	}
+
+	show(relatedTarget) {
+		let target = relatedTarget.relatedTarget;
+
+		if (!target || isDisabled(target)) {
+			return;
+		}
+
+		if (!target.closest('.dropdown-content')) {
+			target.classList.add('first');
+		}
+
+		const showEvent = EventHandler.trigger(target, EVENT_KEY_SHOW, { relatedTarget });
+		if (showEvent.defaultPrevented) return;
+
+		let drop = Selectors.find('.dropdown-content', target),
+			link = target.firstElementChild;
+
+		if (link) link.setAttribute('aria-expanded', 'true');
+		drop.classList.add(CLASS_NAME_SHOW);
+		target.classList.add(CLASS_NAME_ACTIVE);
+
+		setDropPosition(drop)
+
+		const completeCallBack = () => {
+			drop.classList.add(CLASS_NAME_FADE);
+			EventHandler.trigger(target, EVENT_KEY_SHOWN, relatedTarget)
+		}
+		this._queueCallback(completeCallBack, drop, true, 50);
+
+		/**
+		 *
+		 * @param $drop
+		 */
+		function setDropPosition($drop) {
+			let {width, right} = $drop.getBoundingClientRect(),
+				window_width = window.innerWidth;
+
+			let N_right = window_width - right - width;
+
+			$drop.classList.remove('right');
+			$drop.classList.remove('left');
+
+			let $parent = $drop.closest('li'),
+				$ul = $parent.querySelectorAll('ul');
+
+			if (N_right > width) {
+				for (const $el of $ul) {
+					$el.classList.add('left');
+				}
+			} else {
+				for (const $el of $ul) {
+					$el.classList.add('right');
+				}
+			}
+		}
+	}
+
+	hide(relatedTarget) {
+		const _this = this;
+		if ('ontouchstart' in document.documentElement) {
+			for (const element of [].concat(...document.body.children)) {
+				EventHandler.off(element, 'mouseover', noop);
+			}
+		}
+
+		let element = relatedTarget.relatedTarget;
+
+		if ('elm' in relatedTarget && relatedTarget.elm) {
+			element = relatedTarget.elm
+		}
+
+		if (element) {
+			const hideEvent = EventHandler.trigger(element, EVENT_KEY_HIDE);
+			if (hideEvent.defaultPrevented) return;
+
+			element.classList.remove(CLASS_NAME_ACTIVE);
+
+			if (element.classList.contains('first')) {
+				element.classList.remove('first');
+			}
+
+			[...Selectors.findAll('.' + CLASS_NAME_SHOW, element)].forEach(function (el, index) {
+				el.classList.remove(CLASS_NAME_FADE);
+
+				let parent = el.closest('.dropdown');
+				if (parent.classList.contains(CLASS_NAME_ACTIVE)) {
+					parent.classList.remove(CLASS_NAME_ACTIVE);
+				}
+
+				let link = el.previousElementSibling;
+				if (link) link.setAttribute('aria-expanded', 'false');
+
+				if (index === 0) {
+					const completeCallback = () => {
+						el.classList.remove(CLASS_NAME_SHOW);
+						EventHandler.trigger(el, EVENT_KEY_HIDDEN, relatedTarget)
+					}
+
+					_this._queueCallback(completeCallback, el, true, 500);
+				}
+			});
+		}
+	}
+
+	/**
+	 * TODO если на странице несколько навигаций, то есть косяки
+	 * @param element
+	 * @param params
+	 */
+	static init(element, params = {}) {
+		const instance = VGNav.getOrCreateInstance(element, params);
+		instance.build();
+
+		let drops = Selectors.findAll('.dropdown', instance._navigation)
+
+		if (instance._params.hover) {
+			[...drops].forEach(function (el) {
+				let currentElem = null;
+				EventHandler.on(el, EVENT_MOUSEOVER_DATA_API, function (event) {
+					if (currentElem) return;
+					VGNav.hideOpenDrops(event);
+
+					let target = event.target.closest('.dropdown');
+					if (!target) return;
+
+					if (!instance.navigation.contains(target)) return;
+					currentElem = target;
+
+					let relatedTarget = {
+						relatedTarget: target
+					}
+
+					instance.show(relatedTarget);
+				});
+				EventHandler.on(el, EVENT_MOUSEOUT_DATA_API, function (event) {
+					if (!currentElem) return;
+
+					let relatedTarget = event.relatedTarget.closest('.dropdown'),
+						elm = currentElem;
+
+					while (relatedTarget) {
+						if (relatedTarget === currentElem) return;
+						relatedTarget = relatedTarget.parentNode;
+					}
+
+					currentElem = null;
+					instance.hide({relatedTarget: relatedTarget, elm: elm});
+				})
+			})
+		} else {
+			EventHandler.on(document, EVENT_KEYUP_DATA_API, VGNav.clearDrops);
+			EventHandler.on(document, EVENT_CLICK_DATA_API, VGNav.clearDrops);
+			EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
+				if (!Manipulator.has(this, 'aria-expanded')) {
+					return;
+				}
+
+				if ('click' in instance._params.callback) {
+					execute(instance._params.callback.click, [this]);
+				}
+
+				event.preventDefault();
+
+				let self = this.closest('.vg-nav'),
+					isFirst = self.querySelector('.first');
+
+				let target = this.closest('.dropdown');
+				if (!target) return;
+
+				if (isDisabled(target) && !isVisible(target)) {
+					return;
+				}
+
+				if (isFirst && this.closest('.first')) {
+					if (target.classList.contains('active')) {
+						instance.hide({relatedTarget: target});
+						return;
+					}
+				} else {
+					[...Selectors.findAll('.active', self)].forEach(function (el) {
+						if (el && el !== target) {
+							instance.hide({relatedTarget: el})
+						}
+					});
+				}
+
+				instance.show({relatedTarget: target});
+			});
+		}
+
+		const vgNavSidebar = document.getElementById('sidebar-nav');
+		let hamburger = instance._element.querySelector('.' + instance._params.classes.hamburger);
+
+		if (vgNavSidebar && hamburger) {
+			vgNavSidebar.addEventListener('vg.sidebar.show', function () {
+				hamburger.classList.add(instance._params.classes.hamburgerActive);
+			});
+
+			vgNavSidebar.addEventListener('vg.sidebar.hide', function () {
+				hamburger.classList.remove(instance._params.classes.hamburgerActive);
+			});
+		}
+	}
+
+	static clearDrops(event) {
+		if (event.button === 2 || (event.type === 'keyup' && event.key !== 'Tab')) {
+			return
+		}
+
+		VGNav.hideOpenDrops(event)
+	}
+
+	static hideOpenDrops(event) {
+		const openToggles = Selectors.findAll('.dropdown:not(.disabled):not(:disabled).active');
+
+		for (const toggle of openToggles) {
+			const context = VGNav.getInstance(toggle.closest('.vg-nav'));
+			if (!context) continue;
+
+			if (event.target.closest('.first')) {
+				return;
+			}
+
+			const relatedTarget = { relatedTarget: toggle }
+
+			if (event.type === 'click') {
+				relatedTarget.clickEvent = event
+			}
+
+			context.hide(relatedTarget)
+		}
+	}
+}
+
+EventHandler.on(window, EVENT_RESIZE_DATA_API, function () {
+	if (Selectors.find('.vg-nav')) {
+		const instance = VGNav.getOrCreateInstance('.vg-nav', {});
+		instance.build();
+	}
+})
+
+export default VGNav;