vgapp 1.0.7 → 1.0.8

package/app/modules/vgnestable/js/vgnestable.js

@@ -101,8 +101,6 @@ class VGNestable extends BaseModule {
 		this._isDragging = false;
 		this._startSnapshot = "";
 		this._sourceInstance = this;
-		this._sourceRoot = null;
-		this._currentTargetInstance = this;
 		this._lastDropInstance = this;
 		this._activeDropList = null;
 
@@ -317,11 +315,14 @@ class VGNestable extends BaseModule {
 			childList.id = `vg-nestable-collapse-${Math.random().toString(36).slice(2, 10)}`;
 		}
 
+		const hasCollapseClass = childList.classList.contains("vg-collapse");
 		childList.classList.add("vg-collapse");
-		if (this._params.collapse.open) {
-			childList.classList.add("show");
-		} else {
-			childList.classList.remove("show");
+		if (!hasCollapseClass) {
+			if (this._params.collapse.open) {
+				childList.classList.add("show");
+			} else {
+				childList.classList.remove("show");
+			}
 		}
 
 		if (!toggle) {

package/app/modules/vgtoast/js/vgtoast.js

@@ -279,27 +279,29 @@ class VGToast extends BaseModule {
 	 * Скрывает тост
 	 * @returns {void}
 	 */
-	hide() {
-		if (isDisabled(this._element)) return;
-
-		const hideEvent = EventHandler.trigger(this._element, EVENT_KEY_HIDE);
+	hide() {
+		if (isDisabled(this._element)) return;
+		this._clearTimeout();
+
+		const hideEvent = EventHandler.trigger(this._element, EVENT_KEY_HIDE);
 		if (hideEvent.defaultPrevented) return;
 
 		this._element.classList.remove(CLASS_NAME_SHOWN);
 
-		setTimeout(() => {
-			this._element.classList.remove(CLASS_NAME_SHOW);
-
-			const completeCallback = () => {
-				document.body.classList.remove(CLASS_NAME_OPEN);
-				EventHandler.trigger(this._element, EVENT_KEY_HIDDEN);
-
-				if (this._params.stack.enable) {
-					this._setPlacement();
-				}
-
-				if (!this._params.static) {
-					this.dispose();
+		setTimeout(() => {
+			this._element.classList.remove(CLASS_NAME_SHOW);
+			if (this._params.stack.enable) {
+				this._setPlacement();
+			}
+
+			const completeCallback = () => {
+				if (!Selectors.findOne('.vg-toast.show')) {
+					document.body.classList.remove(CLASS_NAME_OPEN);
+				}
+				EventHandler.trigger(this._element, EVENT_KEY_HIDDEN);
+
+				if (!this._params.static) {
+					this.dispose();
 				}
 			};
 
@@ -346,7 +348,6 @@ class VGToast extends BaseModule {
 	 */
 	_enableStack() {
 		const placement = this._params.placement;
-		const isVerticalCenter = placement.includes('center');
 		const isTop = placement.includes('top');
 		const isBottom = !isTop; // по умолчанию снизу
 
@@ -388,16 +389,25 @@ class VGToast extends BaseModule {
 	 * Устанавливает позицию тостов с учётом стека
 	 * @private
 	 */
-	_setPlacement() {
-		const elms = this._enableStack();
-		const isCenter = this._params.placement.includes('center');
-		const isLeft = this._params.placement.includes('left');
-		const isRight = this._params.placement.includes('right');
-		const isTop = this._params.placement.includes('top');
-
-		const stackClass = isTop ? 'top' : 'bottom';
-
-		elms.forEach(({ el, top }) => {
+	_setPlacement() {
+		const stackItems = this._enableStack();
+		const isTop = this._params.placement.includes('top');
+
+		const stackClass = isTop ? 'top' : 'bottom';
+		const visibleStack = Selectors.findAll(`.vg-toast.show.${stackClass}`)
+			.filter(el => {
+				const instance = VGToast.getInstance(el);
+				return instance?._params.stack.enable;
+			});
+		const elms = visibleStack.length ? visibleStack : stackItems.map(item => item.el);
+		let offset = 0;
+
+		elms.forEach((el) => {
+			const instance = VGToast.getInstance(el);
+			const placement = instance?._params.placement || this._params.placement;
+			const isCenter = placement.includes('center');
+			const isLeft = placement.includes('left');
+			const isRight = placement.includes('right');
 			const style = el.style;
 			style.left = '';
 			style.right = '';
@@ -419,13 +429,15 @@ class VGToast extends BaseModule {
 				style.translate = '-50% 0';
 			}
 
-			if (isTop) {
-				style.top = top + 'px';
-			} else {
-				style.bottom = top + 'px';
-			}
-		});
-	}
+			if (isTop) {
+				style.top = offset + 'px';
+			} else {
+				style.bottom = offset + 'px';
+			}
+
+			offset += el.offsetHeight;
+		});
+	}
 
 	/**
 	 * Очищает таймер
@@ -484,4 +496,4 @@ EventHandler.on(document, EVENT_KEY_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, functi
 	data.toggle(this);
 });
 
-export default VGToast;
+export default VGToast;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vgapp",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"description": "",
 	"author": {
 		"name": "Vegas Studio",