@v-c/util 1.0.18-beta.1 → 1.0.19

package/dist/Dom/focus.d.ts

@@ -16,4 +16,7 @@ export declare function lockFocus(element: HTMLElement, id: string): VoidFunctio
  * If multiple elements are locked, only the last locked element will be effective.
  * @returns A function to mark an element as ignored, which will temporarily allow focus on that element even if it's outside the locked area.
  */
-export declare function useLockFocus(lock: Ref<boolean>, getElement: () => HTMLElement | null): [ignoreElement: (ele: HTMLElement) => void];
+export declare function useLockFocus(lock: Ref<boolean>, getElement: () => HTMLElement | null): [
+    ignoreElement: (ele: HTMLElement) => void,
+    registerAllowedElement: (ele: HTMLElement) => VoidFunction
+];

package/dist/Dom/focus.js

@@ -49,21 +49,27 @@ var lastFocusElement = null;
 var focusElements = [];
 var idToElementMap = /* @__PURE__ */ new Map();
 var ignoredElementMap = /* @__PURE__ */ new Map();
+var allowedElementMap = /* @__PURE__ */ new Map();
 function getLastElement() {
 	return focusElements[focusElements.length - 1];
 }
-function isIgnoredElement(element) {
+function getLastLockId() {
 	const lastElement = getLastElement();
-	if (element && lastElement) {
-		let lockId;
-		for (const [id, ele] of idToElementMap.entries()) if (ele === lastElement) {
-			lockId = id;
-			break;
-		}
-		if (!lockId) return false;
-		const ignoredEle = ignoredElementMap.get(lockId);
-		return !!ignoredEle && (ignoredEle === element || ignoredEle.contains(element));
-	}
+	if (!lastElement) return void 0;
+	for (const [id, ele] of idToElementMap.entries()) if (ele === lastElement) return id;
+}
+function isIgnoredElement(element) {
+	const lockId = getLastLockId();
+	if (!lockId || !element) return false;
+	const ignoredEle = ignoredElementMap.get(lockId);
+	return !!ignoredEle && (ignoredEle === element || ignoredEle.contains(element));
+}
+function isAllowedElement(element) {
+	const lockId = getLastLockId();
+	if (!lockId || !element) return false;
+	const allowedElements = allowedElementMap.get(lockId);
+	if (!allowedElements?.size) return false;
+	for (const allowedElement of allowedElements) if (allowedElement === element || allowedElement.contains(element)) return true;
 	return false;
 }
 function hasFocus(element) {
@@ -73,7 +79,7 @@ function hasFocus(element) {
 function syncFocus() {
 	const lastElement = getLastElement();
 	const { activeElement } = document;
-	if (isIgnoredElement(activeElement)) return;
+	if (isIgnoredElement(activeElement) || isAllowedElement(activeElement)) return;
 	if (lastElement && !hasFocus(lastElement)) {
 		const focusableList = getFocusNodeList(lastElement);
 		(focusableList.includes(lastFocusElement) ? lastFocusElement : focusableList[0])?.focus({ preventScroll: true });
@@ -102,6 +108,7 @@ function lockFocus(element, id) {
 		focusElements = focusElements.filter((ele) => ele !== element);
 		idToElementMap.delete(id);
 		ignoredElementMap.delete(id);
+		allowedElementMap.delete(id);
 		if (focusElements.length === 0) {
 			window.removeEventListener("focusin", syncFocus);
 			window.removeEventListener("keydown", onWindowKeyDown, true);
@@ -120,6 +127,20 @@ function useLockFocus(lock, getElement) {
 	const ignoreElement = (ele) => {
 		if (ele) ignoredElementMap.set(id, ele);
 	};
-	return [ignoreElement];
+	const registerAllowedElement = (ele) => {
+		if (!ele) return () => {};
+		let allowedElements = allowedElementMap.get(id);
+		if (!allowedElements) {
+			allowedElements = /* @__PURE__ */ new Set();
+			allowedElementMap.set(id, allowedElements);
+		}
+		allowedElements.add(ele);
+		return () => {
+			const nextAllowedElements = allowedElementMap.get(id);
+			nextAllowedElements?.delete(ele);
+			if (!nextAllowedElements?.size) allowedElementMap.delete(id);
+		};
+	};
+	return [ignoreElement, registerAllowedElement];
 }
 export { getFocusNodeList, lockFocus, triggerFocus, useLockFocus };

package/dist/Dom/focusBoundary.d.ts

@@ -0,0 +1,5 @@
+export interface FocusBoundaryContextProps {
+    registerAllowedElement: (element: HTMLElement) => VoidFunction;
+}
+export declare function useFocusBoundaryProvider(props: FocusBoundaryContextProps): void;
+export declare function useFocusBoundary(): FocusBoundaryContextProps;

package/dist/Dom/focusBoundary.js

@@ -0,0 +1,9 @@
+import { inject, provide } from "vue";
+var FocusBoundaryContextKey = Symbol("FocusBoundaryContext");
+function useFocusBoundaryProvider(props) {
+	provide(FocusBoundaryContextKey, props);
+}
+function useFocusBoundary() {
+	return inject(FocusBoundaryContextKey, null);
+}
+export { useFocusBoundary, useFocusBoundaryProvider };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/util",
   "type": "module",
-  "version": "1.0.18-beta.1",
+  "version": "1.0.19",
   "description": "Vue3 components utils",
   "publishConfig": {
     "access": "public"