forty-cdk 0.35.0 → 0.36.0

package/fesm2022/forty-cdk-core-overlay.mjs

@@ -1,7 +1,7 @@
 import * as i0 from "@angular/core";
 import { ApplicationRef, DOCUMENT, DestroyRef, Directive, ElementRef, EnvironmentInjector, Injectable, InjectionToken, Injector, PLATFORM_ID, afterNextRender, booleanAttribute, computed, effect, inject, input, isDevMode, linkedSignal, numberAttribute, output, signal, untracked } from "@angular/core";
 import { isPlatformBrowser } from "@angular/common";
-import { Collection, FormUiControlBase, IdGenerator, MODAL_EXEMPT_ATTRIBUTE, MODAL_PEER_ATTRIBUTE, accessibleTextContent, adoptHostId, afterNextRenderCancellable, composedClosest, composedContains, composedParentElement, createSingleSlot, createVetoableEvent, createVetoableNativeEvent, emitVetoableNativeEvent, findFirstFocusable, findTabbableEdges, firstEnabledHandle, firstEnabledHost, fortyError, fortyWarn, hostAriaLabel, hostDescribedBy, hostLabelledBy, injectFieldAnchor, injectFocusTrap, injectPortal, injectTypeahead, injectVetoableEmitter, isHoverCapablePointer, isImeComposing, isInitialFocusTarget, isNonTouchPointer, lastEnabledHandle, lastEnabledHost, leavesTabSequence, nextEnabledHandle, orphanContextError, resolveActiveElement, resolveEventTarget, resolveListTypeahead } from "forty-cdk/core";
+import { Collection, FOR_FIELD_ANCHOR_CONTEXT, FOR_FIELD_CONTEXT, FormUiControlBase, IdGenerator, MODAL_EXEMPT_ATTRIBUTE, MODAL_PEER_ATTRIBUTE, accessibleTextContent, adoptHostId, afterNextRenderCancellable, composedClosest, composedContains, composedParentElement, createSingleSlot, createVetoableEvent, createVetoableNativeEvent, emitVetoableNativeEvent, findFirstFocusable, findTabbableEdges, firstEnabledHandle, firstEnabledHost, fortyError, fortyWarn, hostAriaLabel, hostDescribedBy, hostLabelledBy, injectFieldAnchor, injectFocusTrap, injectPortal, injectTypeahead, injectVetoableEmitter, isHoverCapablePointer, isImeComposing, isInitialFocusTarget, isNonTouchPointer, lastEnabledHandle, lastEnabledHost, leavesTabSequence, nextEnabledHandle, orphanContextError, resolveActiveElement, resolveEventTarget, resolveListTypeahead } from "forty-cdk/core";
 import { arrow, autoUpdate, computePosition, flip, hide, offset, shift, size } from "@floating-ui/dom";
 import { CssVarNamespacer } from "@angular/platform-browser";
 var BodyScrollLock = class BodyScrollLock {
@@ -3159,22 +3159,26 @@ var OverlayManagerCore = class {
 		});
 	}
 	createInjectorFactory(providers, scope) {
-		let cachedInjector = null;
-		let cachedParent = null;
+		let cached = null;
 		return (parent) => {
-			if (cachedInjector && cachedParent === parent) return cachedInjector;
-			cachedParent = parent;
-			cachedInjector = scope ? Injector.create({
+			if (cached?.parent === parent) return cached.injector;
+			cached?.release();
+			const injector = scope ? Injector.create({
 				parent: scope.injector,
-				providers: [{
-					provide: scope.contextToken,
-					useValue: parent.get(scope.contextToken)
-				}, ...providers]
+				providers: [...[scope.contextToken, ...FIELD_BOUNDARY_TOKENS].map((token) => ({
+					provide: token,
+					useValue: parent.get(token)
+				})), ...providers]
 			}) : Injector.create({
 				parent,
 				providers: [...providers]
 			});
-			return cachedInjector;
+			cached = {
+				parent,
+				injector,
+				release: bindInjectorLifetime(injector, parent)
+			};
+			return injector;
 		};
 	}
 	register(entry) {
@@ -3221,6 +3225,21 @@ var OverlayManagerCore = class {
 		this.#outletRef = outletRef;
 	}
 };
+const FIELD_BOUNDARY_TOKENS = [FOR_FIELD_CONTEXT, FOR_FIELD_ANCHOR_CONTEXT];
+function bindInjectorLifetime(injector, parent) {
+	let destroyed = false;
+	const destroy = () => {
+		if (!destroyed) {
+			destroyed = true;
+			injector.destroy();
+		}
+	};
+	const unregister = parent.get(DestroyRef).onDestroy(destroy);
+	return () => {
+		unregister();
+		destroy();
+	};
+}
 function isRecursiveTickError(error) {
 	if (error === null || typeof error !== "object") return false;
 	const { code, message } = error;