vgapp 0.5.3 → 0.5.5

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+# VEGAS-APP 0.4.6 - 0.5.5 (Июнь, 21, 2025)
+* Исправлены ошибки в разных модулях
+
 # VEGAS-APP 0.4.3 - 0.4.6 (Июнь, 3, 2025)
 * Исправлены ошибки в разных модулях
 * Во все модули, где есть группа параметров ajax, добавлен параметр output (boolean), 

package/app/modules/vgrollup/js/vgrollup.js

@@ -49,10 +49,11 @@ class VGRollup  extends BaseModule {
 			transition: "vg-rollup-content--transition"
 		};
 
-		this.total    = 0;
-		this.count    = 0;
-		this.offset   = 0;
-		this.isOffset = false;
+		this.total       = 0;
+		this.count       = 0;
+		this.offset      = 0;
+		this.isOffset    = false;
+		this.isRemainder = false;
 
 		if (this._params.offset > 0) {
 			this.offset = this._params.offset || 0;
@@ -77,12 +78,15 @@ class VGRollup  extends BaseModule {
 		if (!isShown) {
 			instance._element.classList.add(CLASS_NAME_SHOW);
 			relatedTarget.innerHTML = instance._params.button.less;
+			relatedTarget.setAttribute("aria-expanded", true);
 
 			if (instance.offset > 0) {
 				if (instance.isOffset) {
 					relatedTarget.innerHTML = instance._params.button.more;
+					relatedTarget.setAttribute("aria-expanded", true);
 				} else {
 					relatedTarget.innerHTML = instance._params.button.less;
+					relatedTarget.setAttribute("aria-expanded", false);
 				}
 			}
 
@@ -101,7 +105,12 @@ class VGRollup  extends BaseModule {
 				}
 			}
 
-			relatedTarget.setAttribute("aria-expanded", false);
+			if (instance.isOffset) {
+				relatedTarget.setAttribute("aria-expanded", true);
+			} else {
+				relatedTarget.setAttribute("aria-expanded", false);
+			}
+
 			instance._element.classList.remove(CLASS_NAME_SHOW);
 			relatedTarget.innerHTML = instance._params.button.more + textShowNum;
 			instance.switch(instance._element, true);
@@ -208,14 +217,12 @@ class VGRollup  extends BaseModule {
 	}
 
 	switch(el, switcher = false) {
-		const _this = this;
-
-		if (switcher && !_this.isOffset) {
+		if (switcher && !this.isOffset) {
 			this.build(el, false);
 
 			if (this._params.offset > 0) {
-				_this.offset = this._params.offset;
-				if (_this.offset > 0) this.isOffset = true;
+				this.offset = this._params.offset;
+				if (this.offset > 0) this.isOffset = true;
 			}
 		} else {
 			el.classList.remove(this.classes.hidden);
@@ -224,19 +231,20 @@ class VGRollup  extends BaseModule {
 
 			el.removeAttribute("style");
 
-			if (_this._params.content === 'elements') {
-				let className = _this._params.elements;
+			if (this._params.content === 'elements') {
+				let className = this._params.elements;
 
 				let items = Selectors.findAll('.' + className, el);
 
 				if (items.length) {
-					if (_this.offset > 0) {
-						items.slice(_this.offset, _this.offset + _this.count).forEach(item => item.classList.remove(CLASS_NAME_HIDE));
-						_this.offset = _this.offset + _this._params.offset;
-
-						if (_this.offset >= (items.length - _this.count)) {
-							_this.isOffset = false;
-							_this.offset = 0;
+					if (this.offset > 0) {
+						items.slice(this.offset, this.offset + this.count).forEach(item => item.classList.remove(CLASS_NAME_HIDE));
+						this.offset = this.offset + this._params.offset;
+						this.isRemainder = (items.length - this.offset) > 0;
+
+						if (!this.isRemainder) {
+							this.isOffset = false;
+							this.offset = 0;
 						}
 					} else {
 						items.forEach((item) => item.classList.remove(CLASS_NAME_HIDE))
@@ -277,7 +285,6 @@ EventHandler.on(document, EVENT_KEY_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, functi
 		return
 	}
 
-	this.setAttribute('aria-expanded', true);
 	VGRollup.toggle(target, this);
 });
 

package/app/modules/vgselect/js/vgselect.js

@@ -1,7 +1,7 @@
 import BaseModule from "../../base-module";
 import {
 	isDisabled,
-	isEmptyObj, isObject,
+	isEmptyObj, isObject, isVisible,
 	mergeDeepObject,
 	noop,
 	normalizeData,
@@ -54,8 +54,6 @@ class VGSelect extends BaseModule {
 			placeholder: '',
 		}, params));
 
-		element.parentElement.style.position = 'relative';
-
 		this._drop = Selectors.find('.' + CLASS_NAME_DROPDOWN, this._element);
 		this.refresh();
 	}
@@ -148,19 +146,21 @@ class VGSelect extends BaseModule {
 		}
 	}
 
-	static build(selector, reBuild) {
+	static build(selector, reBuild = false) {
 		let option_selected,
 			placeholder = selector.dataset.placeholder || '',
 			isPlaceholder = !!placeholder,
 			isSearch = selector.dataset.search || false;
 
-		if (selector.dataset?.inited === 'true' && !reBuild) {
-			return;
-		} else if (reBuild) {
+		if (selector.dataset?.inited === 'true' || reBuild) {
 			VGSelect.destroy(selector);
 		}
 
-		let isSelectedOption = [...selector.options].filter(el => Manipulator.has(el, 'selected')).length > 0;
+		selector.parentElement.style.position = 'relative';
+
+		let isSelectedOption = [... selector.options].filter(el => {
+			return Manipulator.has(el, 'selected') && el.value !== ''
+		}).length > 0;
 
 		if (isPlaceholder && selector.selectedIndex === -1) {
 			option_selected = '<span class="' + CLASS_NAME_PLACEHOLDER + '">' + placeholder + '<span>';
@@ -325,7 +325,8 @@ class VGSelect extends BaseModule {
 	}
 
 	static destroy(select) {
-		let element = select.nextElementSibling;
+		let element = Selectors.next(select, '.' + CLASS_NAME_CONTAINER);
+		element = element.shift();
 
 		if (element) {
 			if (element.classList.contains(CLASS_NAME_CONTAINER)) {