npm - @tmagic/stage - Versions diffs - 1.8.0-beta.22 → 1.8.0-beta.23 - Mend

@tmagic/stage 1.8.0-beta.22 → 1.8.0-beta.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/es/MoveableOptionsManager.js +4 -2
package/dist/es/StageCore.js +10 -0
package/dist/es/StageMask.js +11 -1
package/dist/tmagic-stage.umd.cjs +124 -104
package/package.json +5 -5
package/src/StageCore.ts +15 -0
package/src/StageMask.ts +15 -1
package/types/index.d.ts +7 -12

package/dist/es/MoveableOptionsManager.js CHANGED Viewed

@@ -81,7 +81,7 @@ var MoveableOptionsManager = class extends EventEmitter$1 {
 	*/
 	getDefaultOptions(isMultiSelect) {
 		const isSortable = this.mode === Mode.SORTABLE;
-		return merge({
+		const commonOptions = {
 			draggable: true,
 			resizable: true,
 			rootContainer: this.getRootContainer(),
@@ -97,7 +97,9 @@ var MoveableOptionsManager = class extends EventEmitter$1 {
 				right: this.container.clientWidth,
 				bottom: isSortable ? void 0 : this.container.clientHeight
 			}
-		}, isMultiSelect ? this.getMultiOptions() : this.getSingleOptions());
+		};
+		const differenceOptions = isMultiSelect ? this.getMultiOptions() : this.getSingleOptions();
+		return merge(commonOptions, differenceOptions);
 	}
 	/**
 	* 获取单选下的差异化参数

package/dist/es/StageCore.js CHANGED Viewed

@@ -243,6 +243,15 @@ var StageCore = class extends EventEmitter {
 			this.pageResizeObserver.observe(page);
 		}
 	}
+	/**
+	* page-el-update 后，若当前选中节点仍在新页面文档中且需要自动滚动，则重新触发 scrollIntoView
+	*/
+	scrollSelectedIntoViewAfterPageUpdate() {
+		const selected = this.actionManager?.getSelectedEl();
+		if (!selected?.isConnected) return;
+		if (!(this.autoScrollIntoView || selected.dataset.autoScrollIntoView)) return;
+		this.mask?.observerIntersection(selected);
+	}
 	getActionManagerConfig(config) {
 		return {
 			containerHighlightClassName: config.containerHighlightClassName,
@@ -271,6 +280,7 @@ var StageCore = class extends EventEmitter {
 		this.renderer?.on("page-el-update", (el) => {
 			this.mask?.observe(el);
 			this.observePageResize(el);
+			this.scrollSelectedIntoViewAfterPageUpdate();
 			this.emit("page-el-update", el);
 		});
 	}

package/dist/es/StageMask.js CHANGED Viewed

@@ -73,14 +73,24 @@ var StageMask = class extends Rule {
 	}
 	/**
 	* 初始化视窗和蒙层监听，监听元素是否在视窗区域、监听mask蒙层所在的wrapper大小变化
-	* @description 初始化视窗和蒙层监听
+	* @description 初始化视窗和蒙层监听；切换到新页面 DOM 时重置滚动
 	* @param page 页面Dom节点
 	*/
 	observe(page) {
 		if (!page) return;
+		const pageChanged = this.page !== page;
 		this.page = page;
 		this.initObserverIntersection();
 		this.initObserverWrapper();
+		if (pageChanged) {
+			this.pageScrollParent?.scrollTo({
+				top: 0,
+				left: 0
+			});
+			this.scrollTop = 0;
+			this.scrollLeft = 0;
+			this.scroll();
+		}
 		this.syncPageSize();
 	}
 	/**

package/dist/tmagic-stage.umd.cjs CHANGED Viewed

@@ -31,7 +31,7 @@
 		}
 		return to;
 	};
-	var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 		value: mod,
 		enumerable: true
 	}) : target, mod));
@@ -41,21 +41,21 @@
 	moveable_helper = __toESM(moveable_helper, 1);
 	moveable = __toESM(moveable, 1);
 	_scena_guides = __toESM(_scena_guides, 1);
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_freeGlobal.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_freeGlobal.js
 	/** Detect free variable `global` from Node.js. */
 	var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_root.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_root.js
 	/** Detect free variable `self`. */
 	var freeSelf = typeof self == "object" && self && self.Object === Object && self;
 	/** Used as a reference to the global object. */
 	var root = freeGlobal || freeSelf || Function("return this")();
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_Symbol.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_Symbol.js
 	/** Built-in value references. */
 	var Symbol$1 = root.Symbol;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getRawTag.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_getRawTag.js
 	/** Used for built-in method references. */
 	var objectProto$4 = Object.prototype;
 	/** Used to check objects for own properties. */
@@ -87,7 +87,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_objectToString.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_objectToString.js
 	/**
 	* Used to resolve the
 	* [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
@@ -105,7 +105,7 @@
 		return nativeObjectToString.call(value);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseGetTag.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseGetTag.js
 	/** `Object#toString` result references. */
 	var nullTag = "[object Null]";
 	var undefinedTag = "[object Undefined]";
@@ -123,7 +123,7 @@
 		return symToStringTag && symToStringTag in Object(value) ? getRawTag(value) : objectToString(value);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isObjectLike.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isObjectLike.js
 	/**
 	* Checks if `value` is object-like. A value is object-like if it's not `null`
 	* and has a `typeof` result of "object".
@@ -152,7 +152,7 @@
 		return value != null && typeof value == "object";
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isSymbol.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isSymbol.js
 	/** `Object#toString` result references. */
 	var symbolTag = "[object Symbol]";
 	/**
@@ -176,7 +176,7 @@
 		return typeof value == "symbol" || isObjectLike(value) && baseGetTag(value) == symbolTag;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isArray.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isArray.js
 	/**
 	* Checks if `value` is classified as an `Array` object.
 	*
@@ -202,7 +202,7 @@
 	*/
 	var isArray = Array.isArray;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_trimmedEndIndex.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_trimmedEndIndex.js
 	/** Used to match a single whitespace character. */
 	var reWhitespace = /\s/;
 	/**
@@ -219,7 +219,7 @@
 		return index;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseTrim.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseTrim.js
 	/** Used to match leading whitespace. */
 	var reTrimStart = /^\s+/;
 	/**
@@ -233,7 +233,7 @@
 		return string ? string.slice(0, trimmedEndIndex(string) + 1).replace(reTrimStart, "") : string;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isObject.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isObject.js
 	/**
 	* Checks if `value` is the
 	* [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
@@ -264,7 +264,7 @@
 		return value != null && (type == "object" || type == "function");
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/toNumber.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/toNumber.js
 	/** Used as references for various `Number` constants. */
 	var NAN = NaN;
 	/** Used to detect bad signed hexadecimal string values. */
@@ -311,7 +311,7 @@
 		return isBinary || reIsOctal.test(value) ? freeParseInt(value.slice(2), isBinary ? 2 : 8) : reIsBadHex.test(value) ? NAN : +value;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/identity.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/identity.js
 	/**
 	* This method returns the first argument it receives.
 	*
@@ -332,7 +332,7 @@
 		return value;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isFunction.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isFunction.js
 	/** `Object#toString` result references. */
 	var asyncTag = "[object AsyncFunction]";
 	var funcTag$1 = "[object Function]";
@@ -361,11 +361,11 @@
 		return tag == funcTag$1 || tag == genTag || tag == asyncTag || tag == proxyTag;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_coreJsData.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_coreJsData.js
 	/** Used to detect overreaching core-js shims. */
 	var coreJsData = root["__core-js_shared__"];
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_isMasked.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_isMasked.js
 	/** Used to detect methods masquerading as native. */
 	var maskSrcKey = function() {
 		var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || "");
@@ -382,7 +382,7 @@
 		return !!maskSrcKey && maskSrcKey in func;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_toSource.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_toSource.js
 	/** Used to resolve the decompiled source of functions. */
 	var funcToString$2 = Function.prototype.toString;
 	/**
@@ -404,7 +404,7 @@
 		return "";
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseIsNative.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseIsNative.js
 	/**
 	* Used to match `RegExp`
 	* [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
@@ -434,7 +434,7 @@
 		return (isFunction(value) ? reIsNative : reIsHostCtor).test(toSource(value));
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getValue.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_getValue.js
 	/**
 	* Gets the value at `key` of `object`.
 	*
@@ -447,7 +447,7 @@
 		return object == null ? void 0 : object[key];
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getNative.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_getNative.js
 	/**
 	* Gets the native function at `key` of `object`.
 	*
@@ -461,7 +461,7 @@
 		return baseIsNative(value) ? value : void 0;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseCreate.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseCreate.js
 	/** Built-in value references. */
 	var objectCreate = Object.create;
 	/**
@@ -484,7 +484,7 @@
 		};
 	}();
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_apply.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_apply.js
 	/**
 	* A faster alternative to `Function#apply`, this function invokes `func`
 	* with the `this` binding of `thisArg` and the arguments of `args`.
@@ -505,7 +505,7 @@
 		return func.apply(thisArg, args);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_copyArray.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_copyArray.js
 	/**
 	* Copies the values of `source` to `array`.
 	*
@@ -521,7 +521,7 @@
 		return array;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_shortOut.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_shortOut.js
 	/** Used to detect hot functions by number of calls within a span of milliseconds. */
 	var HOT_COUNT = 800;
 	var HOT_SPAN = 16;
@@ -547,7 +547,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/constant.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/constant.js
 	/**
 	* Creates a function that returns `value`.
 	*
@@ -573,7 +573,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_defineProperty.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_defineProperty.js
 	var defineProperty = function() {
 		try {
 			var func = getNative(Object, "defineProperty");
@@ -582,7 +582,7 @@
 		} catch (e) {}
 	}();
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_setToString.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_setToString.js
 	/**
 	* Sets the `toString` method of `func` to return `string`.
 	*
@@ -600,7 +600,7 @@
 		});
 	});
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_isIndex.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_isIndex.js
 	/** Used as references for various `Number` constants. */
 	var MAX_SAFE_INTEGER$1 = 9007199254740991;
 	/** Used to detect unsigned integer values. */
@@ -619,7 +619,7 @@
 		return !!length && (type == "number" || type != "symbol" && reIsUint.test(value)) && value > -1 && value % 1 == 0 && value < length;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseAssignValue.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseAssignValue.js
 	/**
 	* The base implementation of `assignValue` and `assignMergeValue` without
 	* value checks.
@@ -639,7 +639,7 @@
 		else object[key] = value;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/eq.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/eq.js
 	/**
 	* Performs a
 	* [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
@@ -676,7 +676,7 @@
 		return value === other || value !== value && other !== other;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_assignValue.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_assignValue.js
 	/** Used to check objects for own properties. */
 	var hasOwnProperty$6 = Object.prototype.hasOwnProperty;
 	/**
@@ -694,7 +694,7 @@
 		if (!(hasOwnProperty$6.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) baseAssignValue(object, key, value);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_copyObject.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_copyObject.js
 	/**
 	* Copies properties of `source` to `object`.
 	*
@@ -719,7 +719,7 @@
 		return object;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_overRest.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_overRest.js
 	var nativeMax$1 = Math.max;
 	/**
 	* A specialized version of `baseRest` which transforms the rest array.
@@ -743,7 +743,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseRest.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseRest.js
 	/**
 	* The base implementation of `_.rest` which doesn't validate or coerce arguments.
 	*
@@ -756,7 +756,7 @@
 		return setToString(overRest(func, start, identity), func + "");
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isLength.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isLength.js
 	/** Used as references for various `Number` constants. */
 	var MAX_SAFE_INTEGER = 9007199254740991;
 	/**
@@ -789,7 +789,7 @@
 		return typeof value == "number" && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isArrayLike.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isArrayLike.js
 	/**
 	* Checks if `value` is array-like. A value is considered array-like if it's
 	* not a function and has a `value.length` that's an integer greater than or
@@ -819,7 +819,7 @@
 		return value != null && isLength(value.length) && !isFunction(value);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_isIterateeCall.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_isIterateeCall.js
 	/**
 	* Checks if the given arguments are from an iteratee call.
 	*
@@ -837,7 +837,7 @@
 		return false;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_createAssigner.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_createAssigner.js
 	/**
 	* Creates a function like `_.assign`.
 	*
@@ -862,7 +862,7 @@
 		});
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_isPrototype.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_isPrototype.js
 	/** Used for built-in method references. */
 	var objectProto$2 = Object.prototype;
 	/**
@@ -877,7 +877,7 @@
 		return value === (typeof Ctor == "function" && Ctor.prototype || objectProto$2);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseTimes.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseTimes.js
 	/**
 	* The base implementation of `_.times` without support for iteratee shorthands
 	* or max array length checks.
@@ -893,7 +893,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseIsArguments.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseIsArguments.js
 	/** `Object#toString` result references. */
 	var argsTag$1 = "[object Arguments]";
 	/**
@@ -907,7 +907,7 @@
 		return isObjectLike(value) && baseGetTag(value) == argsTag$1;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isArguments.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isArguments.js
 	/** Used for built-in method references. */
 	var objectProto$1 = Object.prototype;
 	/** Used to check objects for own properties. */
@@ -938,7 +938,7 @@
 		return isObjectLike(value) && hasOwnProperty$5.call(value, "callee") && !propertyIsEnumerable.call(value, "callee");
 	};
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/stubFalse.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/stubFalse.js
 	/**
 	* This method returns `false`.
 	*
@@ -956,7 +956,7 @@
 		return false;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isBuffer.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isBuffer.js
 	/** Detect free variable `exports`. */
 	var freeExports$2 = typeof exports == "object" && exports && !exports.nodeType && exports;
 	/** Detect free variable `module`. */
@@ -982,7 +982,7 @@
 	*/
 	var isBuffer = (Buffer$2 ? Buffer$2.isBuffer : void 0) || stubFalse;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseIsTypedArray.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseIsTypedArray.js
 	/** `Object#toString` result references. */
 	var argsTag = "[object Arguments]";
 	var arrayTag = "[object Array]";
@@ -1023,7 +1023,7 @@
 		return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[baseGetTag(value)];
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseUnary.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseUnary.js
 	/**
 	* The base implementation of `_.unary` without support for storing metadata.
 	*
@@ -1037,7 +1037,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_nodeUtil.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_nodeUtil.js
 	/** Detect free variable `exports`. */
 	var freeExports$1 = typeof exports == "object" && exports && !exports.nodeType && exports;
 	/** Detect free variable `module`. */
@@ -1053,7 +1053,7 @@
 		} catch (e) {}
 	}();
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isTypedArray.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isTypedArray.js
 	var nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
 	/**
 	* Checks if `value` is classified as a typed array.
@@ -1074,7 +1074,7 @@
 	*/
 	var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_arrayLikeKeys.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_arrayLikeKeys.js
 	/** Used to check objects for own properties. */
 	var hasOwnProperty$4 = Object.prototype.hasOwnProperty;
 	/**
@@ -1091,7 +1091,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_overArg.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_overArg.js
 	/**
 	* Creates a unary function that invokes `func` with its argument transformed.
 	*
@@ -1106,7 +1106,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_nativeKeysIn.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_nativeKeysIn.js
 	/**
 	* This function is like
 	* [`Object.keys`](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
@@ -1122,7 +1122,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseKeysIn.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseKeysIn.js
 	/** Used to check objects for own properties. */
 	var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 	/**
@@ -1139,7 +1139,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/keysIn.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/keysIn.js
 	/**
 	* Creates an array of the own and inherited enumerable property names of `object`.
 	*
@@ -1167,10 +1167,10 @@
 		return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_nativeCreate.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_nativeCreate.js
 	var nativeCreate = getNative(Object, "create");
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_hashClear.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_hashClear.js
 	/**
 	* Removes all key-value entries from the hash.
 	*
@@ -1183,7 +1183,7 @@
 		this.size = 0;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_hashDelete.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_hashDelete.js
 	/**
 	* Removes `key` and its value from the hash.
 	*
@@ -1200,7 +1200,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_hashGet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_hashGet.js
 	/** Used to stand-in for `undefined` hash values. */
 	var HASH_UNDEFINED$1 = "__lodash_hash_undefined__";
 	/** Used to check objects for own properties. */
@@ -1223,7 +1223,7 @@
 		return hasOwnProperty$2.call(data, key) ? data[key] : void 0;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_hashHas.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_hashHas.js
 	/** Used to check objects for own properties. */
 	var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 	/**
@@ -1240,7 +1240,7 @@
 		return nativeCreate ? data[key] !== void 0 : hasOwnProperty$1.call(data, key);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_hashSet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_hashSet.js
 	/** Used to stand-in for `undefined` hash values. */
 	var HASH_UNDEFINED = "__lodash_hash_undefined__";
 	/**
@@ -1260,7 +1260,7 @@
 		return this;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_Hash.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_Hash.js
 	/**
 	* Creates a hash object.
 	*
@@ -1282,7 +1282,7 @@
 	Hash.prototype.has = hashHas;
 	Hash.prototype.set = hashSet;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_listCacheClear.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_listCacheClear.js
 	/**
 	* Removes all key-value entries from the list cache.
 	*
@@ -1295,7 +1295,7 @@
 		this.size = 0;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_assocIndexOf.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_assocIndexOf.js
 	/**
 	* Gets the index at which the `key` is found in `array` of key-value pairs.
 	*
@@ -1310,7 +1310,7 @@
 		return -1;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_listCacheDelete.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_listCacheDelete.js
 	/** Built-in value references. */
 	var splice = Array.prototype.splice;
 	/**
@@ -1331,7 +1331,7 @@
 		return true;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_listCacheGet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_listCacheGet.js
 	/**
 	* Gets the list cache value for `key`.
 	*
@@ -1346,7 +1346,7 @@
 		return index < 0 ? void 0 : data[index][1];
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_listCacheHas.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_listCacheHas.js
 	/**
 	* Checks if a list cache value for `key` exists.
 	*
@@ -1360,7 +1360,7 @@
 		return assocIndexOf(this.__data__, key) > -1;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_listCacheSet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_listCacheSet.js
 	/**
 	* Sets the list cache `key` to `value`.
 	*
@@ -1380,7 +1380,7 @@
 		return this;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_ListCache.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_ListCache.js
 	/**
 	* Creates an list cache object.
 	*
@@ -1402,10 +1402,10 @@
 	ListCache.prototype.has = listCacheHas;
 	ListCache.prototype.set = listCacheSet;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_Map.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_Map.js
 	var Map = getNative(root, "Map");
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_mapCacheClear.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_mapCacheClear.js
 	/**
 	* Removes all key-value entries from the map.
 	*
@@ -1422,7 +1422,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_isKeyable.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_isKeyable.js
 	/**
 	* Checks if `value` is suitable for use as unique object key.
 	*
@@ -1435,7 +1435,7 @@
 		return type == "string" || type == "number" || type == "symbol" || type == "boolean" ? value !== "__proto__" : value === null;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getMapData.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_getMapData.js
 	/**
 	* Gets the data for `map`.
 	*
@@ -1449,7 +1449,7 @@
 		return isKeyable(key) ? data[typeof key == "string" ? "string" : "hash"] : data.map;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_mapCacheDelete.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_mapCacheDelete.js
 	/**
 	* Removes `key` and its value from the map.
 	*
@@ -1465,7 +1465,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_mapCacheGet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_mapCacheGet.js
 	/**
 	* Gets the map value for `key`.
 	*
@@ -1479,7 +1479,7 @@
 		return getMapData(this, key).get(key);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_mapCacheHas.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_mapCacheHas.js
 	/**
 	* Checks if a map value for `key` exists.
 	*
@@ -1493,7 +1493,7 @@
 		return getMapData(this, key).has(key);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_mapCacheSet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_mapCacheSet.js
 	/**
 	* Sets the map `key` to `value`.
 	*
@@ -1511,7 +1511,7 @@
 		return this;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_MapCache.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_MapCache.js
 	/**
 	* Creates a map cache object to store key-value pairs.
 	*
@@ -1533,11 +1533,11 @@
 	MapCache.prototype.has = mapCacheHas;
 	MapCache.prototype.set = mapCacheSet;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getPrototype.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_getPrototype.js
 	/** Built-in value references. */
 	var getPrototype = overArg(Object.getPrototypeOf, Object);
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isPlainObject.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isPlainObject.js
 	/** `Object#toString` result references. */
 	var objectTag = "[object Object]";
 	/** Used for built-in method references. */
@@ -1585,7 +1585,7 @@
 		return typeof Ctor == "function" && Ctor instanceof Ctor && funcToString.call(Ctor) == objectCtorString;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_stackClear.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_stackClear.js
 	/**
 	* Removes all key-value entries from the stack.
 	*
@@ -1598,7 +1598,7 @@
 		this.size = 0;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_stackDelete.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_stackDelete.js
 	/**
 	* Removes `key` and its value from the stack.
 	*
@@ -1614,7 +1614,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_stackGet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_stackGet.js
 	/**
 	* Gets the stack value for `key`.
 	*
@@ -1628,7 +1628,7 @@
 		return this.__data__.get(key);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_stackHas.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_stackHas.js
 	/**
 	* Checks if a stack value for `key` exists.
 	*
@@ -1642,7 +1642,7 @@
 		return this.__data__.has(key);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_stackSet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_stackSet.js
 	/** Used as the size to enable large array optimizations. */
 	var LARGE_ARRAY_SIZE = 200;
 	/**
@@ -1671,7 +1671,7 @@
 		return this;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_Stack.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_Stack.js
 	/**
 	* Creates a stack cache object to store key-value pairs.
 	*
@@ -1689,7 +1689,7 @@
 	Stack.prototype.has = stackHas;
 	Stack.prototype.set = stackSet;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_cloneBuffer.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_cloneBuffer.js
 	/** Detect free variable `exports`. */
 	var freeExports = typeof exports == "object" && exports && !exports.nodeType && exports;
 	/** Detect free variable `module`. */
@@ -1712,11 +1712,11 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_Uint8Array.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_Uint8Array.js
 	/** Built-in value references. */
 	var Uint8Array$1 = root.Uint8Array;
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_cloneArrayBuffer.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_cloneArrayBuffer.js
 	/**
 	* Creates a clone of `arrayBuffer`.
 	*
@@ -1730,7 +1730,7 @@
 		return result;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_cloneTypedArray.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_cloneTypedArray.js
 	/**
 	* Creates a clone of `typedArray`.
 	*
@@ -1744,7 +1744,7 @@
 		return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_initCloneObject.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_initCloneObject.js
 	/**
 	* Initializes an object clone.
 	*
@@ -1756,7 +1756,7 @@
 		return typeof object.constructor == "function" && !isPrototype(object) ? baseCreate(getPrototype(object)) : {};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_createBaseFor.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_createBaseFor.js
 	/**
 	* Creates a base function for methods like `_.forIn` and `_.forOwn`.
 	*
@@ -1775,7 +1775,7 @@
 		};
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseFor.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseFor.js
 	/**
 	* The base implementation of `baseForOwn` which iterates over `object`
 	* properties returned by `keysFunc` and invokes `iteratee` for each property.
@@ -1789,7 +1789,7 @@
 	*/
 	var baseFor = createBaseFor();
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/now.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/now.js
 	/**
 	* Gets the timestamp of the number of milliseconds that have elapsed since
 	* the Unix epoch (1 January 1970 00:00:00 UTC).
@@ -1810,7 +1810,7 @@
 		return root.Date.now();
 	};
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/debounce.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/debounce.js
 	/** Error message constants. */
 	var FUNC_ERROR_TEXT$1 = "Expected a function";
 	var nativeMax = Math.max;
@@ -1939,7 +1939,7 @@
 		return debounced;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_assignMergeValue.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_assignMergeValue.js
 	/**
 	* This function is like `assignValue` except that it doesn't assign
 	* `undefined` values.
@@ -1953,7 +1953,7 @@
 		if (value !== void 0 && !eq(object[key], value) || value === void 0 && !(key in object)) baseAssignValue(object, key, value);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isArrayLikeObject.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/isArrayLikeObject.js
 	/**
 	* This method is like `_.isArrayLike` except that it also checks if `value`
 	* is an object.
@@ -1983,7 +1983,7 @@
 		return isObjectLike(value) && isArrayLike(value);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_safeGet.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_safeGet.js
 	/**
 	* Gets the value at `key`, unless `key` is "__proto__" or "constructor".
 	*
@@ -1998,7 +1998,7 @@
 		return object[key];
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/toPlainObject.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/toPlainObject.js
 	/**
 	* Converts `value` to a plain object flattening inherited enumerable string
 	* keyed properties of `value` to own properties of the plain object.
@@ -2027,7 +2027,7 @@
 		return copyObject(value, keysIn(value));
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseMergeDeep.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseMergeDeep.js
 	/**
 	* A specialized version of `baseMerge` for arrays and objects which performs
 	* deep merges and tracks traversed objects enabling objects with circular
@@ -2077,7 +2077,7 @@
 		assignMergeValue(object, key, newValue);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseMerge.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseMerge.js
 	/**
 	* The base implementation of `_.merge` without support for multiple sources.
 	*
@@ -2102,7 +2102,7 @@
 		}, keysIn);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/merge.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/merge.js
 	/**
 	* This method is like `_.assign` except that it recursively merges own and
 	* inherited enumerable string keyed properties of source objects into the
@@ -2138,7 +2138,7 @@
 		baseMerge(object, source, srcIndex);
 	});
 	//#endregion
-	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/throttle.js
+	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/throttle.js
 	/** Error message constants. */
 	var FUNC_ERROR_TEXT = "Expected a function";
 	/**
@@ -4365,14 +4365,24 @@
 		}
 		/**
 		* 初始化视窗和蒙层监听，监听元素是否在视窗区域、监听mask蒙层所在的wrapper大小变化
-		* @description 初始化视窗和蒙层监听
+		* @description 初始化视窗和蒙层监听；切换到新页面 DOM 时重置滚动
 		* @param page 页面Dom节点
 		*/
 		observe(page) {
 			if (!page) return;
+			const pageChanged = this.page !== page;
 			this.page = page;
 			this.initObserverIntersection();
 			this.initObserverWrapper();
+			if (pageChanged) {
+				this.pageScrollParent?.scrollTo({
+					top: 0,
+					left: 0
+				});
+				this.scrollTop = 0;
+				this.scrollLeft = 0;
+				this.scroll();
+			}
 			this.syncPageSize();
 		}
 		/**
@@ -5001,6 +5011,15 @@
 				this.pageResizeObserver.observe(page);
 			}
 		}
+		/**
+		* page-el-update 后，若当前选中节点仍在新页面文档中且需要自动滚动，则重新触发 scrollIntoView
+		*/
+		scrollSelectedIntoViewAfterPageUpdate() {
+			const selected = this.actionManager?.getSelectedEl();
+			if (!selected?.isConnected) return;
+			if (!(this.autoScrollIntoView || selected.dataset.autoScrollIntoView)) return;
+			this.mask?.observerIntersection(selected);
+		}
 		getActionManagerConfig(config) {
 			return {
 				containerHighlightClassName: config.containerHighlightClassName,
@@ -5029,6 +5048,7 @@
 			this.renderer?.on("page-el-update", (el) => {
 				this.mask?.observe(el);
 				this.observePageResize(el);
+				this.scrollSelectedIntoViewAfterPageUpdate();
 				this.emit("page-el-update", el);
 			});
 		}

package/package.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.22",
+  "version": "1.8.0-beta.23",
   "name": "@tmagic/stage",
   "type": "module",
   "sideEffects": false,
@@ -30,21 +30,21 @@
   },
   "dependencies": {
     "@scena/guides": "^0.29.2",
+    "@zumer/snapdom": "^2.23.2",
     "events": "^3.3.0",
-    "@zumer/snapdom": "^2.8.0",
     "keycon": "^1.4.0",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "^4.18.1",
     "moveable": "^0.53.0",
     "moveable-helper": "^0.4.0",
     "scenejs": "^1.10.3"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
-    "@types/lodash-es": "^4.17.4"
+    "@types/lodash-es": "^4.17.12"
   },
   "peerDependencies": {
     "typescript": "^6.0.3",
-    "@tmagic/core": "1.8.0-beta.22"
+    "@tmagic/core": "1.8.0-beta.23"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/StageCore.ts CHANGED Viewed

@@ -368,6 +368,17 @@ export default class StageCore extends EventEmitter {
     }
   }
+  /**
+   * page-el-update 后，若当前选中节点仍在新页面文档中且需要自动滚动，则重新触发 scrollIntoView
+   */
+  private scrollSelectedIntoViewAfterPageUpdate(): void {
+    const selected = this.actionManager?.getSelectedEl();
+    if (!selected?.isConnected) return;
+    if (!(this.autoScrollIntoView || selected.dataset.autoScrollIntoView)) return;
+    this.mask?.observerIntersection(selected);
+  }
   private getActionManagerConfig(config: StageCoreConfig): ActionManagerConfig {
     const actionManagerConfig: ActionManagerConfig = {
       containerHighlightClassName: config.containerHighlightClassName,
@@ -400,6 +411,10 @@ export default class StageCore extends EventEmitter {
       this.mask?.observe(el);
       this.observePageResize(el);
+      // observe 切页时会重置滚动；若 select + scrollIntoView 已先完成，这里对仍挂载的选中节点
+      // 重新触发一次，避免滚动被打回顶部
+      this.scrollSelectedIntoViewAfterPageUpdate();
       this.emit('page-el-update', el);
     });
   }

package/src/StageMask.ts CHANGED Viewed

@@ -108,15 +108,29 @@ export default class StageMask extends Rule {
   /**
    * 初始化视窗和蒙层监听，监听元素是否在视窗区域、监听mask蒙层所在的wrapper大小变化
-   * @description 初始化视窗和蒙层监听
+   * @description 初始化视窗和蒙层监听；切换到新页面 DOM 时重置滚动
    * @param page 页面Dom节点
    */
   public observe(page: HTMLElement): void {
     if (!page) return;
+    const pageChanged = this.page !== page;
     this.page = page;
     this.initObserverIntersection();
     this.initObserverWrapper();
+    if (pageChanged) {
+      // runtime 按 pageId 重挂载后，滚动容器（多为 documentElement）可能仍残留上一页偏移；
+      // 新页默认从顶部展示：重置页面与 mask 滚动，并立刻 scroll() 刷新 transform/标尺。
+      // syncPageSize 在宽高为 0 时会提前返回，不能依赖它刷新视觉状态。
+      // 若 select 已先 scrollIntoView，由 StageCore 在 page-el-update 后重新触发一次补回。
+      this.pageScrollParent?.scrollTo({ top: 0, left: 0 });
+      this.scrollTop = 0;
+      this.scrollLeft = 0;
+      this.scroll();
+    }
     // 页面切换后立即同步一次；ResizeObserver 首次回调可能仍上报旧页/0 尺寸
     this.syncPageSize();
   }

package/types/index.d.ts CHANGED Viewed

@@ -5,7 +5,6 @@ import Core, { Id, MApp, MContainer, MNode } from "@tmagic/core";
 import Guides, { GuidesOptions, GuidesOptions as GuidesOptions$1 } from "@scena/guides";
 import MoveableHelper from "moveable-helper";
 export * from "moveable";
 //#region temp/packages/stage/src/const.d.ts
 /** 流式布局下拖动时需要clone一个镜像节点，镜像节点的id前缀 */
 declare const GHOST_EL_ID_PREFIX = "ghost_el_";
@@ -705,7 +704,7 @@ declare class StageMask extends Rule {
   setMode(mode: Mode): void;
   /**
    * 初始化视窗和蒙层监听，监听元素是否在视窗区域、监听mask蒙层所在的wrapper大小变化
-   * @description 初始化视窗和蒙层监听
+   * @description 初始化视窗和蒙层监听；切换到新页面 DOM 时重置滚动
    * @param page 页面Dom节点
    */
   observe(page: HTMLElement): void;
@@ -788,12 +787,7 @@ declare class StageRender extends EventEmitter {
   private zoom;
   private renderType;
   private customizedRender?;
-  constructor({
-    runtimeUrl,
-    zoom,
-    customizedRender,
-    renderType
-  }: StageRenderConfig);
+  constructor({ runtimeUrl, zoom, customizedRender, renderType }: StageRenderConfig);
   getMagicApi: () => {
     id: string;
     onPageElUpdate: (el: HTMLElement) => void;
@@ -940,6 +934,10 @@ declare class StageCore extends EventEmitter {
    * 监听页面大小变化
    */
   private observePageResize;
+  /**
+   * page-el-update 后，若当前选中节点仍在新页面文档中且需要自动滚动，则重新触发 scrollIntoView
+   */
+  private scrollSelectedIntoViewAfterPageUpdate;
   private getActionManagerConfig;
   private initRenderEvent;
   private initMaskEvent;
@@ -1104,10 +1102,7 @@ declare class StageDragResize extends MoveableOptionsManager {
 //#region temp/packages/stage/src/util.d.ts
 declare const getOffset: (el: Element) => Offset;
 declare const getTargetElStyle: (el: TargetElement, zIndex?: ZIndex) => string;
-declare const getAbsolutePosition: (el: HTMLElement, {
-  top,
-  left
-}: Offset) => {
+declare const getAbsolutePosition: (el: HTMLElement, { top, left }: Offset) => {
   left: number;
   top: number;
 };