@v-c/util 1.0.11 → 1.0.13

package/dist/Dom/findDOMNode.d.ts

@@ -1,6 +1,6 @@
 import { ComponentPublicInstance, MaybeRef } from 'vue';
 export declare function isDOM(node: any): node is HTMLElement | SVGElement;
-export declare function getDOM(elementRef: MaybeRef): Element | Text;
+export declare function getDOM(elementRef: MaybeRef): any;
 /**
  * Return if a node is a DOM node. Else will return by `findDOMNode`
  */

package/dist/Dom/findDOMNode.js

@@ -1,15 +1,18 @@
+import canUseDom from "./canUseDom.js";
 import { unref } from "vue";
 function isDOM(node) {
 	return node instanceof HTMLElement || node instanceof SVGElement;
 }
 function getDOM(elementRef) {
 	const unrefElementRef = unref(elementRef);
+	if (!canUseDom()) return unrefElementRef;
 	const dom = findDOMNode(unrefElementRef) || (unrefElementRef && typeof unrefElementRef === "object" ? findDOMNode(unrefElementRef.nativeElement) : null);
 	if (dom && (dom.nodeType === 3 || dom.nodeType === 8) && dom.nextElementSibling) return dom.nextElementSibling;
 	return dom;
 }
 function findDOMNode(_node) {
 	const node = unref(_node);
+	if (!canUseDom()) return node;
 	if (isDOM(node)) return node;
 	else if (node && "$el" in node) return node.$el;
 	return null;

package/dist/Dom/focus.js

@@ -1,3 +1,4 @@
+import { getDOM } from "../dist/Dom/findDOMNode.js";
 import isVisible_default from "./isVisible.js";
 import { watch } from "vue";
 function focusable(node, includePositive = false) {
@@ -87,11 +88,12 @@ function lockFocus(element) {
 	};
 }
 function useLockFocus(lock, getElement) {
-	watch(lock, (_, _o, onCleanup) => {
-		if (lock.value) {
-			const element = getElement();
-			if (element) onCleanup(lockFocus(element));
-		}
+	watch([lock, () => getElement()], ([nextLock, element], _o, onCleanup) => {
+		element = getDOM(element);
+		if (nextLock && element) onCleanup(lockFocus(element));
+	}, {
+		flush: "post",
+		immediate: true
 	});
 }
 export { getFocusNodeList, lockFocus, triggerFocus, useLockFocus };

package/dist/dist/Dom/canUseDom.js

@@ -0,0 +1,4 @@
+function canUseDom() {
+	return !!(typeof window !== "undefined" && window.document && window.document.createElement);
+}
+export { canUseDom };

package/dist/dist/Dom/findDOMNode.js

@@ -0,0 +1,20 @@
+import { canUseDom } from "./canUseDom.js";
+import { unref } from "vue";
+function isDOM(node) {
+	return node instanceof HTMLElement || node instanceof SVGElement;
+}
+function getDOM(elementRef) {
+	const unrefElementRef = unref(elementRef);
+	if (!canUseDom()) return unrefElementRef;
+	const dom = findDOMNode(unrefElementRef) || (unrefElementRef && typeof unrefElementRef === "object" ? findDOMNode(unrefElementRef.nativeElement) : null);
+	if (dom && (dom.nodeType === 3 || dom.nodeType === 8) && dom.nextElementSibling) return dom.nextElementSibling;
+	return dom;
+}
+function findDOMNode(_node) {
+	const node = unref(_node);
+	if (!canUseDom()) return node;
+	if (isDOM(node)) return node;
+	else if (node && "$el" in node) return node.$el;
+	return null;
+}
+export { getDOM };

package/dist/utils/set.js

@@ -37,7 +37,7 @@ function mergeWith(sources, config = {}) {
 					if (isArr) clone = set(clone, path, finalPrepareArray(originValue, value));
 					else if (!originValue || typeof originValue !== "object") clone = set(clone, path, createEmpty(value));
 					keys(value).forEach((key) => {
-						if (Object.getOwnPropertyDescriptor(value, key).enumerable) internalMerge([...path, key], loopSet);
+						if (Object?.getOwnPropertyDescriptor?.(value, key)?.enumerable) internalMerge([...path, key], loopSet);
 					});
 				}
 			} else clone = set(clone, path, value);

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "@v-c/util",
   "type": "module",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Vue3 components utils",
   "publishConfig": {
     "access": "public"
   },
+  "author": {
+    "name": "aibayanyu20",
+    "email": "aibayanyu@qq.com",
+    "url": "https://yanyu.me"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -59,11 +64,6 @@
     },
     "./package.json": "./package.json"
   },
-  "author": {
-    "name": "aibayanyu20",
-    "email": "aibayanyu@qq.com",
-    "url": "https://yanyu.me"
-  },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [