@octane-xplat/ui 0.7.2 → 0.7.3

package/dist/native/CommandPalette.tsrx.js

@@ -3,6 +3,7 @@ import { Icon } from "./Icon.tsrx.js";
 import { TextInput } from "./TextInput.tsrx.js";
 import { Overlay } from "./Overlay.tsrx.js";
 import { defineUniversalComponent, hookSlots, universalChildren, universalComponent, universalFor, universalPlan, universalProps, universalValue, useState } from "@nativescript-community/octane";
+import { Screen } from "@nativescript/core";
 //#region src/CommandPalette.tsrx
 var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots(1));
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
@@ -31,6 +32,7 @@ var __octaneUniversalPlan3 = universalPlan("nativescript", {
 	"kind": "host",
 	"type": "flexboxlayout",
 	"props": {
+		"flexDirection": "column",
 		"horizontalAlignment": "center",
 		"verticalAlignment": "top",
 		"marginTop": 80
@@ -64,6 +66,10 @@ var CommandPalette = defineUniversalComponent("nativescript", function CommandPa
 		props.onOpenChange?.(next);
 	};
 	const shown = query ? props.items.filter((i) => (i.label ?? i.key).toLowerCase().includes(query.toLowerCase())) : props.items;
+	const panelStyle = {
+		...props.style,
+		maxWidth: props.style?.maxWidth ?? Screen.mainScreen.widthDIPs * .9
+	};
 	const select = (item) => {
 		if (item.disabled) return;
 		setOpen(false);
@@ -93,7 +99,7 @@ var CommandPalette = defineUniversalComponent("nativescript", function CommandPa
 	], universalChildren("nativescript", () => {
 		return universalValue(__octaneUniversalPlan3, [
 			cx("vx-commandpalette", props.className),
-			props.style,
+			panelStyle,
 			props.id,
 			universalComponent("nativescript", TextInput, universalProps([
 				[

package/dist/native/Grid.tsrx.js

@@ -1,7 +1,12 @@
 import { cx } from "./cx.js";
+import { gridChildPlacement } from "./grid-placement.js";
 import { applyEscapeProps, nativeAccessibilityRole, nativeAccessibilityState } from "./escape-props.js";
-import { defineUniversalComponent, universalPlan, universalValue } from "@nativescript-community/octane";
+import { autoPlaceGridChildren, ensureGridTracks } from "./grid-auto-placement.js";
+import { defineUniversalComponent, hookSlots, universalPlan, universalValue, useEffect, useRef } from "@nativescript-community/octane";
 //#region src/Grid.tsrx
+var _hs$ = /* @__PURE__ */ hookSlots(2);
+var _h$0 = /* @__PURE__ */ Symbol(_hs$);
+var _h$1 = /* @__PURE__ */ Symbol(_hs$ + 1);
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
 	"kind": "host",
 	"type": "gridlayout",
@@ -27,13 +32,37 @@ var __octaneUniversalPlan0 = universalPlan("nativescript", {
 });
 var warnedAboutGap = false;
 var Grid = defineUniversalComponent("nativescript", function Grid(props) {
+	const grid = useRef(null, _h$0);
 	if (props.gap != null && !warnedAboutGap) {
 		warnedAboutGap = true;
 		console.warn("[Grid] gap was removed; use child margins");
 	}
+	useEffect(() => {
+		const host = grid.current;
+		if (!host) return;
+		const views = [];
+		host.eachChildView((child) => {
+			views.push(child);
+			return true;
+		});
+		const placement = autoPlaceGridChildren(views.map(gridChildPlacement), props.rows, props.columns);
+		host.rows = ensureGridTracks(props.rows, placement.rowCount);
+		host.columns = ensureGridTracks(props.columns, placement.columnCount);
+		for (let index = 0; index < views.length; index++) {
+			views[index].row = placement.cells[index].row;
+			views[index].col = placement.cells[index].col;
+		}
+	}, [
+		props.children,
+		props.rows,
+		props.columns
+	], _h$1);
 	return universalValue(__octaneUniversalPlan0, [
 		props.id,
-		(view) => applyEscapeProps(view, props),
+		(view) => {
+			grid.current = view;
+			applyEscapeProps(view, props);
+		},
 		props.rows,
 		props.columns,
 		cx("vx-grid", props.className),

package/dist/native/Pagination.tsrx.js

@@ -1,12 +1,8 @@
 import { cx } from "./cx.js";
 import { applyEscapeProps } from "./escape-props.js";
-import { defineUniversalComponent, universalFor, universalPlan, universalValue } from "@nativescript-community/octane";
+import { defineUniversalComponent, universalFor, universalIf, universalPlan, universalValue } from "@nativescript-community/octane";
 //#region src/Pagination.tsrx
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
-	"kind": "range",
-	"children": []
-});
-var __octaneUniversalPlan1 = universalPlan("nativescript", {
 	"kind": "host",
 	"type": "label",
 	"props": {
@@ -14,7 +10,7 @@ var __octaneUniversalPlan1 = universalPlan("nativescript", {
 		"text": "…"
 	}
 });
-var __octaneUniversalPlan2 = universalPlan("nativescript", {
+var __octaneUniversalPlan1 = universalPlan("nativescript", {
 	"kind": "host",
 	"type": "flexboxlayout",
 	"bindings": [["className", 0], ["onTap", 1]],
@@ -24,6 +20,10 @@ var __octaneUniversalPlan2 = universalPlan("nativescript", {
 		"bindings": [["text", 2]]
 	}]
 });
+var __octaneUniversalPlan2 = universalPlan("nativescript", {
+	"kind": "slot",
+	"slot": 0
+});
 var __octaneUniversalPlan3 = universalPlan("nativescript", {
 	"kind": "host",
 	"type": "flexboxlayout",
@@ -93,12 +93,15 @@ var Pagination = defineUniversalComponent("nativescript", function Pagination(pr
 		props.style,
 		() => go(current - 1),
 		universalFor(pages, (e, __octaneUniversalIndex) => e.key, (e, __octaneUniversalIndex) => {
-			e.page == null ? universalValue(__octaneUniversalPlan1, []) : universalValue(__octaneUniversalPlan2, [
-				cx("vx-page-btn", e.page === current && "vx-page-btn--on"),
-				() => go(e.page),
-				String(e.page)
-			]);
-			return universalValue(__octaneUniversalPlan0, []);
+			return universalValue(__octaneUniversalPlan2, [universalIf(e.page == null, () => {
+				return universalValue(__octaneUniversalPlan0, []);
+			}, () => {
+				return universalValue(__octaneUniversalPlan1, [
+					cx("vx-page-btn", e.page === current && "vx-page-btn--on"),
+					() => go(e.page),
+					String(e.page)
+				]);
+			})]);
 		}),
 		() => go(current + 1)
 	]);

package/dist/native/Popover.tsrx.js

@@ -4,9 +4,9 @@ import { positionPopover } from "./popover-position.js";
 import { applyThemeClasses, useThemeScheme } from "./theme/theme-scheme.js";
 import { rootLayoutFor } from "./root-layout.mobile.js";
 import { createNativeScriptRoot, defineUniversalComponent, hookSlots, universalPlan, universalValue, useEffect, useRef, useState, withSlot } from "@nativescript-community/octane";
-import { GridLayout } from "@nativescript/core";
+import { GridLayout, Screen, isIOS } from "@nativescript/core";
 //#region src/Popover.tsrx
-var _hs$ = /* @__PURE__ */ hookSlots(8);
+var _hs$ = /* @__PURE__ */ hookSlots(9);
 var _h$0 = /* @__PURE__ */ Symbol(_hs$);
 var _h$1 = /* @__PURE__ */ Symbol(_hs$ + 1);
 var _h$2 = /* @__PURE__ */ Symbol(_hs$ + 2);
@@ -15,6 +15,7 @@ var _h$4 = /* @__PURE__ */ Symbol(_hs$ + 4);
 var _h$5 = /* @__PURE__ */ Symbol(_hs$ + 5);
 var _h$6 = /* @__PURE__ */ Symbol(_hs$ + 6);
 var _h$7 = /* @__PURE__ */ Symbol(_hs$ + 7);
+var _h$8 = /* @__PURE__ */ Symbol(_hs$ + 8);
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
 	"kind": "host",
 	"type": "gridlayout",
@@ -85,7 +86,14 @@ var PopoverLayer = defineUniversalComponent("nativescript", function PopoverLaye
 			width: coordinateRoot.getActualSize().width,
 			height: coordinateRoot.getActualSize().height
 		}, props.placement ?? "bottom");
-		setPosition((current) => current?.left === next.left && current?.top === next.top && current?.placement === next.placement ? current : next);
+		const insets = isIOS ? panelRef.current?.parent?.getSafeAreaInsets?.() : void 0;
+		const scale = isIOS ? Number(Screen.mainScreen.scale) || 1 : 1;
+		const panelPosition = {
+			...next,
+			left: next.left - Number(insets?.left ?? 0) / scale,
+			top: next.top - Number(insets?.top ?? 0) / scale
+		};
+		setPosition((current) => current?.left === panelPosition.left && current?.top === panelPosition.top && current?.placement === panelPosition.placement ? current : panelPosition);
 		if (panelSize?.width > 0 && panelSize?.height > 0) setSettled(true);
 	};
 	useEffect(() => {
@@ -116,16 +124,19 @@ var PopoverLayer = defineUniversalComponent("nativescript", function PopoverLaye
 		props.children,
 		props.style
 	], _h$3);
+	useEffect(() => {
+		if (position) (panelRef.current?.parent)?.requestLayout?.();
+	}, [position], _h$4);
 	useEffect(() => {
 		applyNativeProps(panelRef.current, props);
 	}, [
 		props.ios,
 		props.android,
 		settled
-	], _h$4);
+	], _h$5);
 	const dismiss = () => props.onDismiss?.();
 	return universalValue(__octaneUniversalPlan1, [
-		cx("vx-popover-layer", withSlot(_h$5, useThemeScheme) === "dark" && "ns-dark"),
+		cx("vx-popover-layer", withSlot(_h$6, useThemeScheme) === "dark" && "ns-dark"),
 		(props.dismissOnOutsideTap ?? true) && universalValue(__octaneUniversalPlan0, ["transparent", dismiss]),
 		panelRef,
 		position?.left ?? 0,
@@ -139,7 +150,7 @@ var PopoverLayer = defineUniversalComponent("nativescript", function PopoverLaye
 	]);
 }, { "module": "@nativescript-community/octane" });
 var Popover = defineUniversalComponent("nativescript", function Popover(props) {
-	const shown = useRef(null, _h$6);
+	const shown = useRef(null, _h$7);
 	useEffect(() => {
 		const cur = shown.current;
 		if (!props.open) {
@@ -190,7 +201,7 @@ var Popover = defineUniversalComponent("nativescript", function Popover(props) {
 		props.className,
 		props.style,
 		props.dismissOnOutsideTap
-	], _h$7);
+	], _h$8);
 	return universalValue(__octaneUniversalPlan2, []);
 }, { "module": "@nativescript-community/octane" });
 //#endregion

package/dist/native/Screen.tsrx.js

@@ -1,7 +1,7 @@
 import { cx } from "./cx.js";
 import { applyEscapeProps } from "./escape-props.js";
 import { registerRootLayout, unregisterRootLayout } from "./root-layout.mobile.js";
-import { attachTapToBlur } from "./tap-to-blur.mobile.js";
+import { attachTapToBlur } from "./tap-to-blur.ios.js";
 import { defineUniversalComponent, universalPlan, universalValue } from "@nativescript-community/octane";
 //#region src/Screen.tsrx
 var __octaneUniversalPlan0 = universalPlan("nativescript", {

package/dist/native/Sheet.tsrx.js

@@ -1,7 +1,7 @@
 import { cx } from "./cx.js";
 import { applyThemeClasses } from "./theme/theme-scheme.js";
 import { rootLayoutFor } from "./root-layout.mobile.js";
-import { attachTapToBlur } from "./tap-to-blur.mobile.js";
+import { attachTapToBlur } from "./tap-to-blur.ios.js";
 import { attachSheetDetents } from "./sheet-detents.js";
 import { bindBottomInsetToKeyboard } from "./keyboard-inset.mobile.js";
 import { createNativeScriptRoot, defineUniversalComponent, hookSlots, universalPlan, universalValue, useEffect, useRef } from "@nativescript-community/octane";

package/dist/native/Slider.tsrx.js

@@ -15,7 +15,7 @@ var _h$5 = /* @__PURE__ */ Symbol(_hs$ + 5);
 var _h$6 = /* @__PURE__ */ Symbol(_hs$ + 6);
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
 	"kind": "host",
-	"type": "gridlayout",
+	"type": "absolutelayout",
 	"bindings": [
 		["id", 0],
 		["className", 1],
@@ -28,25 +28,20 @@ var __octaneUniversalPlan0 = universalPlan("nativescript", {
 		{
 			"kind": "host",
 			"type": "flexboxlayout",
-			"props": { "className": "vx-slider-track" }
+			"props": { "className": "vx-slider-track" },
+			"bindings": [["style", 6]]
 		},
 		{
 			"kind": "host",
 			"type": "flexboxlayout",
-			"props": {
-				"className": "vx-slider-fill",
-				"horizontalAlignment": "left"
-			},
-			"bindings": [["style", 6]]
+			"props": { "className": "vx-slider-fill" },
+			"bindings": [["style", 7]]
 		},
 		{
 			"kind": "host",
 			"type": "flexboxlayout",
-			"props": {
-				"className": "vx-slider-thumb",
-				"horizontalAlignment": "left"
-			},
-			"bindings": [["style", 7]]
+			"props": { "className": "vx-slider-thumb" },
+			"bindings": [["style", 8]]
 		}
 	]
 });
@@ -64,6 +59,10 @@ var Slider = defineUniversalComponent("nativescript", function Slider(props) {
 		host.current = el;
 		measure.bind(el);
 	}, [], _h$4);
+	const thumbSize = 20;
+	const trackTop = 12;
+	const thumbTop = 4;
+	const thumbLeft = Math.min(Math.max(ratio * width - thumbSize / 2, 0), Math.max(width - thumbSize, 0));
 	useEffect(() => {
 		applyNativeProps(host.current, props);
 	}, [props], _h$5);
@@ -90,8 +89,18 @@ var Slider = defineUniversalComponent("nativescript", function Slider(props) {
 		nativeAccessibilityRole("adjustable"),
 		onPan,
 		bindHost,
-		{ width: ratio * width },
-		{ marginLeft: Math.min(Math.max(ratio * width - 10, 0), Math.max(width - 20, 0)) }
+		{
+			width,
+			translateY: trackTop
+		},
+		{
+			width: ratio * width,
+			translateY: trackTop
+		},
+		{
+			translateX: thumbLeft,
+			translateY: thumbTop
+		}
 	]);
 }, { "module": "@nativescript-community/octane" });
 //#endregion

package/dist/native/Text.tsrx.js

@@ -2,6 +2,7 @@ import { cx } from "./cx.js";
 import { applyEscapeProps, nativeAccessibilityRole, nativeAccessibilityState } from "./escape-props.js";
 import { layoutChildProps } from "./layout-child.js";
 import { createContext, defineUniversalComponent, universalComponent, universalIf, universalPlan, universalProps, universalValue, useContext } from "@nativescript-community/octane";
+import { Application } from "@nativescript/core";
 //#region src/Text.tsrx
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
 	"kind": "host",
@@ -34,8 +35,23 @@ var TextScope = defineUniversalComponent("nativescript", function TextScope(prop
 }, { "module": "@nativescript-community/octane" });
 var Text = defineUniversalComponent("nativescript", function Text(props) {
 	const inText = useContext(InText);
+	const fontWeightValue = String(props.style?.fontWeight ?? "").toLowerCase();
+	const fontWeight = /^\d+$/.test(fontWeightValue) ? Number(fontWeightValue) : {
+		normal: 400,
+		bold: 700,
+		thin: 100,
+		"extra-light": 200,
+		light: 300,
+		medium: 500,
+		"semi-bold": 600,
+		"extra-bold": 800,
+		black: 900
+	}[fontWeightValue];
+	const lineHeight = props.style?.lineHeight;
 	const textStyle = {
 		...props.style,
+		...(Application.ios || Application.android) && typeof lineHeight === "number" && Number.isFinite(lineHeight) && lineHeight > 0 && props.style?.height == null && props.style?.minHeight == null ? { minHeight: lineHeight } : {},
+		...Application.ios && props.style?.fontVariationSettings == null && fontWeight !== void 0 && fontWeight >= 100 && fontWeight <= 900 ? { fontVariationSettings: `'wght' ${fontWeight}` } : {},
 		...props.ellipsize || props.numberOfLines ? { flexShrink: 1 } : {},
 		...props.ellipsize ? {
 			whiteSpace: "nowrap",

package/dist/native/WebView.tsrx.js

@@ -31,14 +31,23 @@ function reportContentLayout(view, props) {
 		view.style.height = height;
 	}
 }
+function applyNativeScrollEnabled(view, enabled) {
+	if (isIOS) {
+		const scrollView = view?.ios?.scrollView;
+		if (scrollView) scrollView.scrollEnabled = enabled !== false;
+	} else if (isAndroid) {
+		const nativeView = view?.android;
+		if (!nativeView?.setOnTouchListener) return;
+		nativeView.setOnTouchListener(enabled === false ? new android.view.View.OnTouchListener({ onTouch: (_view, event) => event.getActionMasked() === android.view.MotionEvent.ACTION_MOVE }) : null);
+	}
+}
 var WebView = defineUniversalComponent("nativescript", function WebView(props) {
 	const el = useRef(null, _h$0);
 	const loaded = useRef(false, _h$1);
 	useEffect(() => {
 		const v = el.current;
 		if (!v) return;
-		if (isIOS) v.ios.scrollView.scrollEnabled = props.scrollEnabled !== false;
-		else if (isAndroid) v.android.setOnTouchListener(props.scrollEnabled === false ? new android.view.View.OnTouchListener({ onTouch: (_view, event) => event.getActionMasked() === android.view.MotionEvent.ACTION_MOVE }) : null);
+		applyNativeScrollEnabled(v, props.scrollEnabled);
 		if (props.matchContents && loaded.current) reportContentLayout(v, props);
 	}, [props.scrollEnabled, props.matchContents], _h$2);
 	return universalValue(__octaneUniversalPlan0, [universalProps([
@@ -79,10 +88,16 @@ var WebView = defineUniversalComponent("nativescript", function WebView(props) {
 			"src",
 			props.html !== void 0 ? props.html : props.src
 		],
+		[
+			"set",
+			"onLoaded",
+			() => applyNativeScrollEnabled(el.current, props.scrollEnabled)
+		],
 		[
 			"set",
 			"onLoadFinished",
 			(e) => {
+				applyNativeScrollEnabled(e.object ?? el.current, props.scrollEnabled);
 				if (e.error) props.onError?.({
 					url: e.url,
 					error: e.error

package/dist/native/_virtual/_@oxc-project_runtime@0.150.0/helpers/esm/decorate.js

@@ -0,0 +1,9 @@
+//#region \0@oxc-project+runtime@0.150.0/helpers/esm/decorate.js
+function __decorate(decorators, target, key, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+	return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+//#endregion
+export { __decorate as default };

package/dist/native/escape-props.js

@@ -1,9 +1,11 @@
 import { applyNativeModifiers } from "./apply-native-modifiers.native.js";
+import { rememberGridChildPlacement } from "./grid-placement.js";
 import { isAndroid, isIOS } from "@nativescript/core";
 //#region src/escape-props.ts
 /** Apply only the active device's escape bag after the primitive's own props. */
 function applyEscapeProps(view, props) {
 	if (!view) return;
+	rememberGridChildPlacement(view, props);
 	const bag = isIOS ? props.ios : isAndroid ? props.android : void 0;
 	if (bag) Object.assign(view, bag);
 	applyNativeModifiers(view, props.modifiers);

package/dist/native/grid-auto-placement.js

@@ -0,0 +1,83 @@
+//#region src/grid-auto-placement.ts
+function gridIndex(value) {
+	if (value == null || value === "") return null;
+	const index = Number(value);
+	return Number.isInteger(index) && index >= 0 ? index : null;
+}
+function gridSpan(value) {
+	const span = Number(value);
+	return Number.isInteger(span) && span > 0 ? span : 1;
+}
+function trackCount(spec) {
+	return spec?.split(",").filter((track) => track.trim().length > 0).length ?? 0;
+}
+/** Match CSS Grid's row-flow placement for NativeScript GridLayout children. */
+function autoPlaceGridChildren(items, rowTracks, columnTracks) {
+	const placements = items.map((item) => ({
+		row: gridIndex(item.row),
+		col: gridIndex(item.col),
+		rowSpan: gridSpan(item.rowSpan),
+		colSpan: gridSpan(item.colSpan)
+	}));
+	const columnCount = Math.max(1, trackCount(columnTracks), ...placements.filter((placement) => placement.col != null).map((placement) => placement.col + placement.colSpan), ...placements.map((placement) => placement.colSpan));
+	const occupied = /* @__PURE__ */ new Set();
+	const isFree = (row, col, rowSpan, colSpan) => {
+		for (let y = row; y < row + rowSpan; y++) for (let x = col; x < col + colSpan; x++) if (occupied.has(`${y},${x}`)) return false;
+		return true;
+	};
+	const occupy = (row, col, rowSpan, colSpan) => {
+		for (let y = row; y < row + rowSpan; y++) for (let x = col; x < col + colSpan; x++) occupied.add(`${y},${x}`);
+	};
+	for (const placement of placements) if (placement.row != null && placement.col != null) occupy(placement.row, placement.col, placement.rowSpan, placement.colSpan);
+	for (const placement of placements) {
+		if (placement.row == null || placement.col != null) continue;
+		let col = 0;
+		while (!isFree(placement.row, col, placement.rowSpan, placement.colSpan)) col++;
+		placement.col = col;
+		occupy(placement.row, col, placement.rowSpan, placement.colSpan);
+	}
+	for (const placement of placements) {
+		if (placement.col == null || placement.row != null) continue;
+		let row = 0;
+		while (!isFree(row, placement.col, placement.rowSpan, placement.colSpan)) row++;
+		placement.row = row;
+		occupy(row, placement.col, placement.rowSpan, placement.colSpan);
+	}
+	let cursorRow = 0;
+	let cursorCol = 0;
+	for (const placement of placements) {
+		if (placement.row != null && placement.col != null) continue;
+		while (true) {
+			if (cursorCol + placement.colSpan > columnCount) {
+				cursorRow++;
+				cursorCol = 0;
+				continue;
+			}
+			if (isFree(cursorRow, cursorCol, placement.rowSpan, placement.colSpan)) break;
+			cursorCol++;
+		}
+		placement.row = cursorRow;
+		placement.col = cursorCol;
+		occupy(cursorRow, cursorCol, placement.rowSpan, placement.colSpan);
+		cursorCol += placement.colSpan;
+		if (cursorCol >= columnCount) {
+			cursorRow++;
+			cursorCol = 0;
+		}
+	}
+	return {
+		cells: placements.map(({ row, col }) => ({
+			row,
+			col
+		})),
+		rowCount: Math.max(trackCount(rowTracks), ...placements.map((item) => item.row + item.rowSpan)),
+		columnCount: Math.max(columnCount, ...placements.map((item) => item.col + item.colSpan))
+	};
+}
+function ensureGridTracks(spec, requiredCount) {
+	const tracks = spec?.split(",").map((track) => track.trim()).filter(Boolean) ?? [];
+	while (tracks.length < requiredCount) tracks.push("auto");
+	return tracks.join(",");
+}
+//#endregion
+export { autoPlaceGridChildren, ensureGridTracks };

package/dist/native/grid-placement.js

@@ -0,0 +1,20 @@
+//#region src/grid-placement.ts
+var placements = /* @__PURE__ */ new WeakMap();
+/** Keep the authored Grid placement next to its mounted NativeScript view. */
+function rememberGridChildPlacement(view, props) {
+	if ((typeof view !== "object" || view === null) && typeof view !== "function") return;
+	const placement = {};
+	for (const key of [
+		"row",
+		"col",
+		"rowSpan",
+		"colSpan"
+	]) if (props[key] !== void 0) placement[key] = props[key];
+	if (Object.keys(placement).length) placements.set(view, placement);
+	else placements.delete(view);
+}
+function gridChildPlacement(view) {
+	return typeof view === "object" && view !== null ? placements.get(view) ?? {} : {};
+}
+//#endregion
+export { gridChildPlacement, rememberGridChildPlacement };

package/dist/native/octane-client-build.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "buildId": "397eabd3-87de-49d4-adf0-133ab9697510",
+  "buildId": "f5c4c58c-23aa-430f-84c7-e26b75109c60",
   "mode": "production",
   "capabilities": {
     "independentHydration": false

package/dist/native/sheet-service.js

@@ -1,6 +1,6 @@
 import { applyThemeClasses } from "./theme/theme-scheme.js";
 import { topRootLayout } from "./root-layout.mobile.js";
-import { attachTapToBlur } from "./tap-to-blur.mobile.js";
+import { attachTapToBlur } from "./tap-to-blur.ios.js";
 import { attachSheetDetents } from "./sheet-detents.js";
 import { bindBottomInsetToKeyboard } from "./keyboard-inset.mobile.js";
 import { createNativeScriptRoot } from "@nativescript-community/octane";

package/dist/native/{tap-to-blur.mobile.js → tap-to-blur.ios.js}

@@ -1,5 +1,5 @@
-import { Application } from "@nativescript/core";
-//#region src/tap-to-blur.mobile.ts
+import __decorate from "./_virtual/_@oxc-project_runtime@0.150.0/helpers/esm/decorate.js";
+//#region src/tap-to-blur.ios.ts
 /** Tap-outside-to-blur: iOS keeps a focused UITextField/UITextView as first
 *  responder until something else takes it, so a tap on blank chrome never
 *  dismisses the keyboard on its own.
@@ -11,36 +11,15 @@ import { Application } from "@nativescript/core";
 *  editable text view (otherwise the field would focus-then-blur in the same
 *  tap — recognizers fire on touch-up, after the field's touch-down focus).
 *  Keyboard taps live in a separate UIWindow, so they never reach it.
-*  `cancelsTouchesInView` stays false so taps still reach buttons.
-*
-*  Android: hides the soft keyboard from the currently focused view when a
-*  tap lands on the attached container. */
+*  `cancelsTouchesInView` stays false so taps still reach buttons. */
 function attachTapToBlur(view) {
 	const marker = "__xplatTapToBlur";
 	if (!view || view[marker]) return () => {};
 	view[marker] = true;
-	if (Application.ios) {
-		iosAttach();
-		return () => {
-			view[marker] = false;
-			iosDetach();
-		};
-	}
-	if (Application.android) {
-		const handler = (_args) => {
-			const activity = Application.android.foregroundActivity;
-			const focused = activity?.currentFocus;
-			if (!focused) return;
-			activity.getSystemService(android.content.Context.INPUT_METHOD_SERVICE)?.hideSoftInputFromWindow(focused.getWindowToken(), 0);
-		};
-		view.on("tap", handler);
-		return () => {
-			view[marker] = false;
-			view.off("tap", handler);
-		};
-	}
+	iosAttach();
 	return () => {
 		view[marker] = false;
+		iosDetach();
 	};
 }
 var iosCount = 0;
@@ -53,25 +32,34 @@ function iosAttach() {
 	const appWin = appWindow();
 	if (!appWin) return;
 	iosWindow = appWin;
-	const Owner = class extends NSObject {
+	let TapToBlurRecognizerTarget = class TapToBlurRecognizerTarget extends NSObject {
+		static {
+			this.ObjCProtocols = [UIGestureRecognizerDelegate];
+		}
 		static {
 			this.ObjCExposedMethods = { tap: {
 				returns: interop.types.void,
 				params: [UITapGestureRecognizer]
 			} };
 		}
-		tap(recognizer) {
-			const point = recognizer.locationInView(iosWindow);
-			let hit = iosWindow.hitTest(point, null);
+		gestureRecognizerShouldReceiveTouch(_recognizer, touch) {
+			let hit = touch.view;
 			while (hit) {
-				if (hit instanceof UITextField || hit instanceof UITextView) return;
+				const textField = hit.isKindOfClass(UITextField.class());
+				const textView = hit.isKindOfClass(UITextView.class());
+				if (textField || textView) return false;
 				hit = hit.superview;
 			}
+			return true;
+		}
+		tap(_recognizer) {
 			iosWindow.endEditing(true);
 		}
 	};
-	iosTarget = Owner.new();
+	TapToBlurRecognizerTarget = __decorate([NativeClass], TapToBlurRecognizerTarget);
+	iosTarget = TapToBlurRecognizerTarget.new();
 	iosRecognizer = UITapGestureRecognizer.alloc().initWithTargetAction(iosTarget, "tap");
+	iosRecognizer.delegate = iosTarget;
 	iosRecognizer.cancelsTouchesInView = false;
 	appWin.addGestureRecognizer(iosRecognizer);
 }