@tamagui/adapt 3.0.0-beta.924.1 → 3.0.1

package/dist/cjs/Adapt.cjs

@@ -36,6 +36,7 @@ __export(Adapt_exports, {
 	useAdaptContext: () => useAdaptContext,
 	useAdaptIsActive: () => useAdaptIsActive,
 	useAdaptTarget: () => useAdaptTarget,
+	useAdaptTargetScope: () => useAdaptTargetScope,
 	useAdaptedCapabilities: () => useAdaptedCapabilities
 });
 module.exports = __toCommonJS(Adapt_exports);
@@ -78,13 +79,8 @@ const adaptContextKeys = [
 	"Contents",
 	"scopeName",
 	"portalName",
-	"platform",
-	"setPlatform",
-	"when",
-	"setWhen",
 	"active",
-	"rawActive",
-	"setRawActive",
+	"setAdaptConfig",
 	"slot",
 	"handoff",
 	"targetFullyHidden",
@@ -99,13 +95,8 @@ const AdaptContext = (0, import_core.createStyledContext)({
 	Contents: null,
 	scopeName: "",
 	portalName: "",
-	platform: null,
-	setPlatform: (x) => {},
-	when: null,
-	setWhen: () => {},
 	active: false,
-	rawActive: false,
-	setRawActive: () => {},
+	setAdaptConfig: () => {},
 	slot: null,
 	handoff: {
 		hidden: true,
@@ -121,6 +112,8 @@ const AdaptContext = (0, import_core.createStyledContext)({
 }, { keys: adaptContextKeys });
 const AdaptCapabilitiesContext = (0, import_react.createContext)({});
 const LastAdaptContextScope = (0, import_react.createContext)("");
+const AdaptTargetScope = (0, import_react.createContext)(null);
+const useAdaptTargetScope = () => (0, import_react.useContext)(AdaptTargetScope);
 const ProvideAdaptContext = ({ children, ...context }) => {
 	const scope = context.scopeName || "";
 	const lastScope = (0, import_react.useContext)(LastAdaptContextScope);
@@ -139,16 +132,43 @@ const useAdaptContext = (scope) => {
 	const adaptScope = scope ?? lastScope;
 	return AdaptContext.useStyledContext(adaptScope);
 };
-const AdaptParent = ({ children, Contents, scope, open, onOpenChange, state }) => {
+function findAdaptConfig(children, scope) {
+	for (const child of import_react.default.Children.toArray(children)) {
+		if (!import_react.default.isValidElement(child)) continue;
+		if (child.type === import_react.default.Fragment) {
+			const found = findAdaptConfig(child.props.children, scope);
+			if (found) return found;
+			continue;
+		}
+		if (child.type === Adapt) {
+			const childProps = child.props;
+			if (childProps.scope == null || childProps.scope === scope) {
+				return childProps;
+			}
+		}
+	}
+	return null;
+}
+const AdaptParent = ({ children, adaptChildren, Contents, scope, open, onOpenChange, state }) => {
 	const id = (0, import_react.useId)();
 	const portalName = `AdaptPortal${scope}${id}`;
 	const slotRef = import_react.default.useRef(null);
 	if (!slotRef.current) {
 		slotRef.current = createAdaptSlotStore();
 	}
-	const [when, setWhen] = import_react.default.useState(null);
-	const [platform, setPlatform] = import_react.default.useState(null);
-	const [rawActive, setRawActive] = import_react.default.useState(false);
+	const staticConfig = import_react.default.useMemo(() => findAdaptConfig(adaptChildren, scope) ?? findAdaptConfig(children, scope), [
+		adaptChildren,
+		children,
+		scope
+	]);
+	const [publishedConfig, setPublishedConfig] = import_react.default.useState(null);
+	const rawActive = useAdaptIsActiveGiven(staticConfig ?? publishedConfig);
+	const staticConfigRef = import_react.default.useRef(staticConfig);
+	staticConfigRef.current = staticConfig;
+	const setAdaptConfig = import_react.default.useCallback((config) => {
+		if (staticConfigRef.current) return;
+		setPublishedConfig(config);
+	}, []);
 	const [exiting, setExiting] = import_react.default.useState(false);
 	const [present, setPresent] = import_react.default.useState(false);
 	const [targetFullyHidden, setTargetFullyHidden] = import_react.default.useState(!open);
@@ -163,12 +183,6 @@ const AdaptParent = ({ children, Contents, scope, open, onOpenChange, state }) =
 	const active = rawActive || exiting || shouldStartExit;
 	const targetHidden = !rawActive;
 	const skipNextAnimation = Boolean(rawActive && wasTargetHiddenRef.current && hasHadActiveTargetRef.current && open);
-	rawActiveRef.current = rawActive;
-	openRef.current = open;
-	if (rawActive) {
-		hasHadActiveTargetRef.current = true;
-	}
-	wasTargetHiddenRef.current = targetHidden;
 	const releasePresenceLatch = import_react.default.useCallback(() => {
 		setExiting(false);
 		if (!rawActiveRef.current) {
@@ -181,6 +195,12 @@ const AdaptParent = ({ children, Contents, scope, open, onOpenChange, state }) =
 		}
 	}, [shouldStartExit]);
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
+		rawActiveRef.current = rawActive;
+		openRef.current = open;
+		if (rawActive) {
+			hasHadActiveTargetRef.current = true;
+		}
+		wasTargetHiddenRef.current = targetHidden;
 		if (open && rawActive) {
 			setTargetFullyHidden(false);
 			return;
@@ -191,7 +211,8 @@ const AdaptParent = ({ children, Contents, scope, open, onOpenChange, state }) =
 	}, [
 		active,
 		open,
-		rawActive
+		rawActive,
+		targetHidden
 	]);
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
 		if (rawActive) {
@@ -264,13 +285,8 @@ const AdaptParent = ({ children, Contents, scope, open, onOpenChange, state }) =
 		value: scope,
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProvideAdaptContext, {
 			Contents: FinalContents,
-			when,
-			platform,
-			setPlatform,
-			setWhen,
 			active,
-			rawActive,
-			setRawActive,
+			setAdaptConfig,
 			portalName,
 			scopeName: scope,
 			slot: slotRef.current,
@@ -305,30 +321,32 @@ const AdaptContents = ({ scope, ...rest }) => {
 		context.registerContents,
 		context.unregisterContents
 	]);
-	return import_react.default.createElement(context.Contents, {
-		...rest,
-		scope,
-		key: `stable`
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdaptTargetScope.Provider, {
+		value: null,
+		children: import_react.default.createElement(context.Contents, {
+			...rest,
+			scope,
+			key: `stable`
+		})
 	});
 };
-AdaptContents.shouldForwardSpace = true;
 const Adapt = (0, import_helpers.withStaticProperties)(function Adapt2(props) {
-	const { platform, when, children, scope } = props;
+	const { children, platform, scope, when } = props;
 	const context = useAdaptContext(scope);
-	const rawEnabled = useAdaptIsActiveGiven(props);
-	const enabled = rawEnabled || context.active;
+	const enabled = context.active;
 	const isRenderCallback = typeof children === "function";
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
-		context?.setWhen?.(when || rawEnabled);
-		context?.setPlatform?.(platform || null);
-		context?.setRawActive?.(rawEnabled);
+		context.setAdaptConfig({
+			when,
+			platform
+		});
+		return () => {
+			context.setAdaptConfig(null);
+		};
 	}, [
 		when,
 		platform,
-		rawEnabled,
-		context.setWhen,
-		context.setPlatform,
-		context.setRawActive
+		context.setAdaptConfig
 	]);
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
 		if (!enabled || !isRenderCallback) return;
@@ -342,13 +360,6 @@ const Adapt = (0, import_helpers.withStaticProperties)(function Adapt2(props) {
 		context.registerRenderCallback,
 		context.unregisterRenderCallback
 	]);
-	(0, import_constants.useIsomorphicLayoutEffect)(() => {
-		return () => {
-			context?.setWhen?.(null);
-			context?.setPlatform?.(null);
-			context?.setRawActive?.(false);
-		};
-	}, []);
 	let output;
 	if (isRenderCallback) {
 		const Component = context?.Contents;
@@ -356,7 +367,10 @@ const Adapt = (0, import_helpers.withStaticProperties)(function Adapt2(props) {
 	} else {
 		output = children;
 	}
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, { children: !enabled ? null : output });
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdaptTargetScope.Provider, {
+		value: context.scopeName,
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, { children: !enabled ? null : output })
+	});
 }, { Contents: AdaptContents });
 const AdaptPortalContents = (props) => {
 	const isActive = useAdaptIsActive(props.scope);
@@ -373,39 +387,44 @@ function AdaptSlotContents({ scope }) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: slot?.element ?? null });
 }
 function AdaptSlotPublisher({ isActive, slot, children }) {
-	const publishedRef = import_react.default.useRef(false);
+	const publishedRef = import_react.default.useRef(null);
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
 		if (!slot) return;
+		const published = publishedRef.current;
+		if (published && published.isActive === isActive && published.element === children) {
+			return;
+		}
+		publishedRef.current = {
+			isActive,
+			element: children
+		};
 		if (isActive) {
 			slot.publish(children);
-			publishedRef.current = true;
 		} else {
 			slot.clear();
-			publishedRef.current = false;
 		}
 		slot.notify();
 	});
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
 		return () => {
-			if (publishedRef.current) {
+			if (publishedRef.current?.isActive) {
 				slot?.clear();
 				slot?.notify();
-				publishedRef.current = false;
 			}
+			publishedRef.current = null;
 		};
 	}, [slot]);
 	return isActive ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
 }
 const emptySubscribe = () => () => {};
 const emptySnapshot = () => 0;
-const useAdaptIsActiveGiven = ({ when, platform }) => {
+const useAdaptIsActiveGiven = (config) => {
 	const media = (0, import_core.useMedia)();
+	const when = config?.when;
+	const platform = config?.platform;
 	if (when == null && platform == null) {
 		return false;
 	}
-	if (when === true) {
-		return true;
-	}
 	let enabled = false;
 	if (platform === "touch") enabled = import_constants.isTouchable;
 	else if (platform === "native") enabled = !import_constants.isWeb;
@@ -415,20 +434,23 @@ const useAdaptIsActiveGiven = ({ when, platform }) => {
 	if (platform && enabled == false) {
 		return false;
 	}
+	if (when === true) {
+		return true;
+	}
 	if (when && typeof when === "string") {
 		enabled = media[when];
 	}
 	return enabled;
 };
 const useAdaptIsActive = (scope) => {
-	const props = useAdaptContext(scope);
-	const isActiveGiven = useAdaptIsActiveGiven(props);
-	return props.active || isActiveGiven;
+	return useAdaptContext(scope).active;
 };
 function useAdaptTarget(scope) {
 	const context = useAdaptContext(scope);
+	const targetScope = useAdaptTargetScope();
+	const isTarget = scope !== void 0 || targetScope === context.scopeName;
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
-		if (!context.active) return;
+		if (!context.active || !isTarget) return;
 		context.registerTarget();
 		return () => {
 			context.unregisterTarget();
@@ -436,9 +458,10 @@ function useAdaptTarget(scope) {
 	}, [
 		context.active,
 		context.registerTarget,
-		context.unregisterTarget
+		context.unregisterTarget,
+		isTarget
 	]);
-	if (!context.active) {
+	if (!context.active || !isTarget) {
 		return null;
 	}
 	return {

package/dist/cjs/Adapt.native.cjs

@@ -38,6 +38,7 @@ __export(Adapt_exports, {
 	useAdaptContext: () => useAdaptContext,
 	useAdaptIsActive: () => useAdaptIsActive,
 	useAdaptTarget: () => useAdaptTarget,
+	useAdaptTargetScope: () => useAdaptTargetScope,
 	useAdaptedCapabilities: () => useAdaptedCapabilities
 });
 module.exports = __toCommonJS(Adapt_exports);
@@ -97,13 +98,8 @@ var adaptContextKeys = [
 	"Contents",
 	"scopeName",
 	"portalName",
-	"platform",
-	"setPlatform",
-	"when",
-	"setWhen",
 	"active",
-	"rawActive",
-	"setRawActive",
+	"setAdaptConfig",
 	"slot",
 	"handoff",
 	"targetFullyHidden",
@@ -118,13 +114,8 @@ var AdaptContext = (0, import_core.createStyledContext)({
 	Contents: null,
 	scopeName: "",
 	portalName: "",
-	platform: null,
-	setPlatform: function(x) {},
-	when: null,
-	setWhen: function() {},
 	active: false,
-	rawActive: false,
-	setRawActive: function() {},
+	setAdaptConfig: function() {},
 	slot: null,
 	handoff: {
 		hidden: true,
@@ -140,6 +131,10 @@ var AdaptContext = (0, import_core.createStyledContext)({
 }, { keys: adaptContextKeys });
 var AdaptCapabilitiesContext = /* @__PURE__ */ (0, import_react.createContext)({});
 var LastAdaptContextScope = /* @__PURE__ */ (0, import_react.createContext)("");
+var AdaptTargetScope = /* @__PURE__ */ (0, import_react.createContext)(null);
+var useAdaptTargetScope = function() {
+	return (0, import_react.useContext)(AdaptTargetScope);
+};
 var ProvideAdaptContext = function(param) {
 	var { children, ...context } = param;
 	var scope = context.scopeName || "";
@@ -159,17 +154,64 @@ var useAdaptContext = function(scope) {
 	var adaptScope = scope !== null && scope !== void 0 ? scope : lastScope;
 	return AdaptContext.useStyledContext(adaptScope);
 };
+function findAdaptConfig(children, scope) {
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = import_react.default.Children.toArray(children)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var child = _step.value;
+			if (!/* @__PURE__ */ import_react.default.isValidElement(child)) continue;
+			if (child.type === import_react.default.Fragment) {
+				var found = findAdaptConfig(child.props.children, scope);
+				if (found) return found;
+				continue;
+			}
+			if (child.type === Adapt) {
+				var childProps = child.props;
+				if (childProps.scope == null || childProps.scope === scope) {
+					return childProps;
+				}
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return null;
+}
 var AdaptParent = function(param) {
-	var { children, Contents, scope, open, onOpenChange, state } = param;
+	var { children, adaptChildren, Contents, scope, open, onOpenChange, state } = param;
 	var id = (0, import_react.useId)();
 	var portalName = `AdaptPortal${scope}${id}`;
 	var slotRef = import_react.default.useRef(null);
 	if (!slotRef.current) {
 		slotRef.current = createAdaptSlotStore();
 	}
-	var [when, setWhen] = import_react.default.useState(null);
-	var [platform, setPlatform] = import_react.default.useState(null);
-	var [rawActive, setRawActive] = import_react.default.useState(false);
+	var staticConfig = import_react.default.useMemo(function() {
+		var _findAdaptConfig;
+		return (_findAdaptConfig = findAdaptConfig(adaptChildren, scope)) !== null && _findAdaptConfig !== void 0 ? _findAdaptConfig : findAdaptConfig(children, scope);
+	}, [
+		adaptChildren,
+		children,
+		scope
+	]);
+	var [publishedConfig, setPublishedConfig] = import_react.default.useState(null);
+	var rawActive = useAdaptIsActiveGiven(staticConfig !== null && staticConfig !== void 0 ? staticConfig : publishedConfig);
+	var staticConfigRef = import_react.default.useRef(staticConfig);
+	staticConfigRef.current = staticConfig;
+	var setAdaptConfig = import_react.default.useCallback(function(config) {
+		if (staticConfigRef.current) return;
+		setPublishedConfig(config);
+	}, []);
 	var [exiting, setExiting] = import_react.default.useState(false);
 	var [present, setPresent] = import_react.default.useState(false);
 	var [targetFullyHidden, setTargetFullyHidden] = import_react.default.useState(!open);
@@ -184,12 +226,6 @@ var AdaptParent = function(param) {
 	var active = rawActive || exiting || shouldStartExit;
 	var targetHidden = !rawActive;
 	var skipNextAnimation = Boolean(rawActive && wasTargetHiddenRef.current && hasHadActiveTargetRef.current && open);
-	rawActiveRef.current = rawActive;
-	openRef.current = open;
-	if (rawActive) {
-		hasHadActiveTargetRef.current = true;
-	}
-	wasTargetHiddenRef.current = targetHidden;
 	var releasePresenceLatch = import_react.default.useCallback(function() {
 		setExiting(false);
 		if (!rawActiveRef.current) {
@@ -202,6 +238,12 @@ var AdaptParent = function(param) {
 		}
 	}, [shouldStartExit]);
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
+		rawActiveRef.current = rawActive;
+		openRef.current = open;
+		if (rawActive) {
+			hasHadActiveTargetRef.current = true;
+		}
+		wasTargetHiddenRef.current = targetHidden;
 		if (open && rawActive) {
 			setTargetFullyHidden(false);
 			return;
@@ -212,7 +254,8 @@ var AdaptParent = function(param) {
 	}, [
 		active,
 		open,
-		rawActive
+		rawActive,
+		targetHidden
 	]);
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
 		if (rawActive) {
@@ -289,13 +332,8 @@ var AdaptParent = function(param) {
 		value: scope,
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProvideAdaptContext, {
 			Contents: FinalContents,
-			when,
-			platform,
-			setPlatform,
-			setWhen,
 			active,
-			rawActive,
-			setRawActive,
+			setAdaptConfig,
 			portalName,
 			scopeName: scope,
 			slot: slotRef.current,
@@ -331,31 +369,32 @@ var AdaptContents = function(param) {
 		context.registerContents,
 		context.unregisterContents
 	]);
-	return /* @__PURE__ */ import_react.default.createElement(context.Contents, {
-		...rest,
-		scope,
-		key: `stable`
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdaptTargetScope.Provider, {
+		value: null,
+		children: /* @__PURE__ */ import_react.default.createElement(context.Contents, {
+			...rest,
+			scope,
+			key: `stable`
+		})
 	});
 };
-AdaptContents.shouldForwardSpace = true;
 var Adapt = (0, import_helpers.withStaticProperties)(function Adapt2(props) {
-	var { platform, when, children, scope } = props;
+	var { children, platform, scope, when } = props;
 	var context = useAdaptContext(scope);
-	var rawEnabled = useAdaptIsActiveGiven(props);
-	var enabled = rawEnabled || context.active;
+	var enabled = context.active;
 	var isRenderCallback = typeof children === "function";
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
-		var _context_setWhen, _context_setPlatform, _context_setRawActive;
-		context === null || context === void 0 ? void 0 : (_context_setWhen = context.setWhen) === null || _context_setWhen === void 0 ? void 0 : _context_setWhen.call(context, when || rawEnabled);
-		context === null || context === void 0 ? void 0 : (_context_setPlatform = context.setPlatform) === null || _context_setPlatform === void 0 ? void 0 : _context_setPlatform.call(context, platform || null);
-		context === null || context === void 0 ? void 0 : (_context_setRawActive = context.setRawActive) === null || _context_setRawActive === void 0 ? void 0 : _context_setRawActive.call(context, rawEnabled);
+		context.setAdaptConfig({
+			when,
+			platform
+		});
+		return function() {
+			context.setAdaptConfig(null);
+		};
 	}, [
 		when,
 		platform,
-		rawEnabled,
-		context.setWhen,
-		context.setPlatform,
-		context.setRawActive
+		context.setAdaptConfig
 	]);
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
 		if (!enabled || !isRenderCallback) return;
@@ -369,14 +408,6 @@ var Adapt = (0, import_helpers.withStaticProperties)(function Adapt2(props) {
 		context.registerRenderCallback,
 		context.unregisterRenderCallback
 	]);
-	(0, import_constants.useIsomorphicLayoutEffect)(function() {
-		return function() {
-			var _context_setWhen, _context_setPlatform, _context_setRawActive;
-			context === null || context === void 0 ? void 0 : (_context_setWhen = context.setWhen) === null || _context_setWhen === void 0 ? void 0 : _context_setWhen.call(context, null);
-			context === null || context === void 0 ? void 0 : (_context_setPlatform = context.setPlatform) === null || _context_setPlatform === void 0 ? void 0 : _context_setPlatform.call(context, null);
-			context === null || context === void 0 ? void 0 : (_context_setRawActive = context.setRawActive) === null || _context_setRawActive === void 0 ? void 0 : _context_setRawActive.call(context, false);
-		};
-	}, []);
 	var output;
 	if (isRenderCallback) {
 		var Component = context === null || context === void 0 ? void 0 : context.Contents;
@@ -384,7 +415,10 @@ var Adapt = (0, import_helpers.withStaticProperties)(function Adapt2(props) {
 	} else {
 		output = children;
 	}
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, { children: !enabled ? null : output });
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdaptTargetScope.Provider, {
+		value: context.scopeName,
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, { children: !enabled ? null : output })
+	});
 }, { Contents: AdaptContents });
 var AdaptPortalContents = function(props) {
 	var isActive = useAdaptIsActive(props.scope);
@@ -405,25 +439,32 @@ function AdaptSlotContents(param) {
 }
 function AdaptSlotPublisher(param) {
 	var { isActive, slot, children } = param;
-	var publishedRef = import_react.default.useRef(false);
+	var publishedRef = import_react.default.useRef(null);
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
 		if (!slot) return;
+		var published = publishedRef.current;
+		if (published && published.isActive === isActive && published.element === children) {
+			return;
+		}
+		publishedRef.current = {
+			isActive,
+			element: children
+		};
 		if (isActive) {
 			slot.publish(children);
-			publishedRef.current = true;
 		} else {
 			slot.clear();
-			publishedRef.current = false;
 		}
 		slot.notify();
 	});
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
 		return function() {
-			if (publishedRef.current) {
+			var _publishedRef_current;
+			if ((_publishedRef_current = publishedRef.current) === null || _publishedRef_current === void 0 ? void 0 : _publishedRef_current.isActive) {
 				slot === null || slot === void 0 ? void 0 : slot.clear();
 				slot === null || slot === void 0 ? void 0 : slot.notify();
-				publishedRef.current = false;
 			}
+			publishedRef.current = null;
 		};
 	}, [slot]);
 	return isActive ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
@@ -434,15 +475,13 @@ var emptySubscribe = function() {
 var emptySnapshot = function() {
 	return 0;
 };
-var useAdaptIsActiveGiven = function(param) {
-	var { when, platform } = param;
+var useAdaptIsActiveGiven = function(config) {
 	var media = (0, import_core.useMedia)();
+	var when = config === null || config === void 0 ? void 0 : config.when;
+	var platform = config === null || config === void 0 ? void 0 : config.platform;
 	if (when == null && platform == null) {
 		return false;
 	}
-	if (when === true) {
-		return true;
-	}
 	var enabled = false;
 	if (platform === "touch") enabled = import_constants.isTouchable;
 	else if (platform === "native") enabled = !import_constants.isWeb;
@@ -452,20 +491,23 @@ var useAdaptIsActiveGiven = function(param) {
 	if (platform && enabled == false) {
 		return false;
 	}
+	if (when === true) {
+		return true;
+	}
 	if (when && typeof when === "string") {
 		enabled = media[when];
 	}
 	return enabled;
 };
 var useAdaptIsActive = function(scope) {
-	var props = useAdaptContext(scope);
-	var isActiveGiven = useAdaptIsActiveGiven(props);
-	return props.active || isActiveGiven;
+	return useAdaptContext(scope).active;
 };
 function useAdaptTarget(scope) {
 	var context = useAdaptContext(scope);
+	var targetScope = useAdaptTargetScope();
+	var isTarget = scope !== void 0 || targetScope === context.scopeName;
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
-		if (!context.active) return;
+		if (!context.active || !isTarget) return;
 		context.registerTarget();
 		return function() {
 			context.unregisterTarget();
@@ -473,9 +515,10 @@ function useAdaptTarget(scope) {
 	}, [
 		context.active,
 		context.registerTarget,
-		context.unregisterTarget
+		context.unregisterTarget,
+		isTarget
 	]);
-	if (!context.active) {
+	if (!context.active || !isTarget) {
 		return null;
 	}
 	return {