@octane-xplat/picker 0.13.0 → 0.15.0

package/README.md

@@ -12,11 +12,11 @@ There is no shared picker API at the package root. Each platform entry exports
 its own component and types; import it from the platform subpath in a matching
 platform-suffixed file:
 
-| File suffix | Import | Component |
-| --- | --- | --- |
-| `*.ios.tsx` | `@octane-xplat/picker/ios` | `SwiftUIPicker` |
+| File suffix     | Import                         | Component          |
+| --------------- | ------------------------------ | ------------------ |
+| `*.ios.tsx`     | `@octane-xplat/picker/ios`     | `SwiftUIPicker`    |
 | `*.android.tsx` | `@octane-xplat/picker/android` | `MaterialDropdown` |
-| `*.web.tsx` | `@octane-xplat/picker/web` | `Select` |
+| `*.web.tsx`     | `@octane-xplat/picker/web`     | `Select`           |
 
 ```tsx
 /** @jsxImportSource @nativescript-community/octane */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octane-xplat/picker",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Select control for Octane xplat — web select + SwiftUI picker (iOS) / Material dropdown (Android)",
   "keywords": [
     "android",
@@ -23,30 +23,31 @@
     "directory": "packages/picker"
   },
   "files": [
-    "dist",
     "types",
     "src",
-    "platforms"
+    "platforms",
+    "!src/**/*.test.*",
+    "!src/**/*.spec.*"
   ],
   "type": "module",
   "exports": {
     ".": {
       "types": "./types/index.d.ts",
-      "web": "./dist/native/index.js",
-      "native": "./dist/native/index.js",
-      "default": "./dist/native/index.js"
+      "web": "./src/index.ts",
+      "native": "./src/index.ts",
+      "default": "./src/index.ts"
     },
     "./ios": {
       "types": "./types/ios/index.d.ts",
-      "native": "./dist/native/ios/index.js"
+      "native": "./src/ios/index.ts"
     },
     "./android": {
       "types": "./types/android/index.d.ts",
-      "native": "./dist/native/android/index.js"
+      "native": "./src/android/index.ts"
     },
     "./web": {
       "types": "./types/web/index.d.ts",
-      "web": "./dist/web/web/index.js"
+      "web": "./src/web/index.ts"
     }
   },
   "publishConfig": {
@@ -57,11 +58,11 @@
     "@nativescript/swift-ui": "4.0.2"
   },
   "devDependencies": {
-    "@nativescript-community/octane": "0.2.4",
+    "@nativescript-community/octane": "0.2.5",
     "@nativescript/core": "9.1.3",
     "@octanejs/vite-plugin": "0.1.61",
     "octane": "0.11.0",
-    "tsrx-typegen": "0.2.2",
+    "tsrx-typegen": "0.3.0",
     "typescript": "5.9.3",
     "vite": "8.3.0"
   },
@@ -88,8 +89,8 @@
     }
   },
   "scripts": {
-    "build": "vite build && vite build --mode native && tsc -p tsconfig.types.json && node ../../scripts/check-native-dist.mjs",
     "test:packed": "node tests/packed-consumer.mjs",
-    "pack:check": "tsrx-typegen --pack-check"
+    "pack:check": "tsrx-typegen --pack-check",
+    "typegen": "tsc -p tsconfig.types.json"
   }
 }

package/platforms/ios/src/XplatPickerProvider.swift

@@ -65,25 +65,26 @@ public final class XplatPickerProvider: UIViewController, SwiftUIProvider {
 	}
 
 	public func updateData(data: NSDictionary) {
-		if let label = data["label"] as? String { model.label = label }
-		if let accessibilityLabel = data["accessibilityLabel"] as? String {
-			model.accessibilityLabel = accessibilityLabel
-		}
-		if let value = data["value"] as? String { model.value = value }
-		if let disabled = data["disabled"] as? NSNumber { model.disabled = disabled.boolValue }
-		if let options = data["options"] as? [[String: Any]] {
-			model.options = options.compactMap { option in
-				guard let value = option["value"] as? String,
-					let label = option["label"] as? String
-				else { return nil }
+		let options = ((data["options"] as? [[String: Any]]) ?? []).compactMap { option -> PickerOption? in
+			guard let value = option["value"] as? String,
+				let label = option["label"] as? String
+			else { return nil }
 
-				return PickerOption(
-					value: value,
-					label: label,
-					disabled: (option["disabled"] as? NSNumber)?.boolValue ?? false,
-				)
-			}
+			return PickerOption(
+				value: value,
+				label: label,
+				disabled: (option["disabled"] as? NSNumber)?.boolValue ?? false,
+			)
 		}
+
+		// Full replace — matching the Kotlin provider: absent keys reset to
+		// defaults and a missing value falls back to the first option, so a
+		// partial payload cannot leave divergent state across platforms.
+		model.label = data["label"] as? String ?? ""
+		model.accessibilityLabel = data["accessibilityLabel"] as? String ?? ""
+		model.value = data["value"] as? String ?? options.first?.value ?? ""
+		model.disabled = (data["disabled"] as? NSNumber)?.boolValue ?? false
+		model.options = options
 	}
 
 	public var onEvent: ((NSDictionary) -> Void)?

package/src/MaterialDropdown.android.tsrx

@@ -22,7 +22,9 @@ registerJetpackCompose('xplat-material-dropdown', (owner: any) =>
 export function MaterialDropdown(props: MaterialDropdownProps) @{
 	const controlled = props.selectedKey !== undefined
 	const [internalKey, setInternalKey] = useState(props.defaultSelectedKey ?? props.items[0]?.key ?? '')
-	const selectedKey = controlled ? props.selectedKey! : internalKey
+	// Uncontrolled with a blank internal selection displays the first item
+	// once items arrive — matching the other leaves' auto-select-first.
+	const selectedKey = controlled ? props.selectedKey! : internalKey || (props.items[0]?.key ?? '')
 	const data = {
 		label: props.label,
 		accessibilityLabel: props.accessibilityLabel ?? props.label,

package/src/Select.web.tsrx

@@ -6,15 +6,17 @@ import type { SelectProps } from './web/types'
 export function Select(props: SelectProps) @{
 	const controlled = props.value !== undefined
 	const [internalValue, setInternalValue] = useState(props.defaultValue ?? props.options[0]?.value ?? '')
-	const value = controlled ? props.value! : internalValue
-	const labelId = props.id ? `${props.id}-label` : undefined
+	// Uncontrolled with a blank internal selection displays the first option
+	// once options exist — the default is auto-select-first.
+	const value = controlled ? props.value! : internalValue || (props.options[0]?.value ?? '')
 
 	<label className={props.className} style={props.style}>
-		<span id={labelId}>{props.label}</span>
+		{/* The wrapping <label> supplies the implicit accessible name;
+		    aria-label overrides it with accessibilityLabel when given. */}
+		<span>{props.label}</span>
 		<select
 			id={props.id}
 			aria-label={props.accessibilityLabel ?? props.label}
-			aria-labelledby={labelId}
 			value={value}
 			disabled={props.disabled}
 			onChange={(event: any) => {

package/src/SwiftUIPicker.ios.tsrx

@@ -22,7 +22,9 @@ registerSwiftUI('xplat-swiftui-picker', (owner: any) =>
 export function SwiftUIPicker(props: SwiftUIPickerProps) @{
 	const controlled = props.selection !== undefined
 	const [internalSelection, setInternalSelection] = useState(props.defaultSelection ?? props.options[0]?.id ?? '')
-	const selection = controlled ? props.selection! : internalSelection
+	// Uncontrolled with a blank internal selection displays the first option
+	// once options arrive — matching the other leaves' auto-select-first.
+	const selection = controlled ? props.selection! : internalSelection || (props.options[0]?.id ?? '')
 	const update = (nextSelection: string) => {
 		if (!controlled) setInternalSelection(nextSelection)
 		props.onSelectionChange?.(nextSelection)

package/dist/native/MaterialDropdown.android.tsrx.js

@@ -1,49 +0,0 @@
-import { defineUniversalComponent, hookSlots, registerElement, universalPlan, universalValue, useState } from "@nativescript-community/octane";
-import { ComposeDataDriver, JetpackCompose, registerJetpackCompose } from "@nativescript/jetpack-compose";
-//#region src/MaterialDropdown.android.tsrx
-var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots(1));
-var __octaneUniversalPlan0 = universalPlan("nativescript", {
-	"kind": "host",
-	"type": "xplatandroidpicker",
-	"props": { "composeId": "xplat-material-dropdown" },
-	"bindings": [
-		["id", 0],
-		["className", 1],
-		["style", 2],
-		["data", 3],
-		["onComposeEvent", 4]
-	]
-});
-registerElement("xplatandroidpicker", JetpackCompose);
-registerJetpackCompose("xplat-material-dropdown", (owner) => new ComposeDataDriver(new com.octanexplat.nativepicker.XplatPickerProvider(), owner));
-var MaterialDropdown = defineUniversalComponent("nativescript", function MaterialDropdown(props) {
-	const controlled = props.selectedKey !== void 0;
-	const [internalKey, setInternalKey] = useState(props.defaultSelectedKey ?? props.items[0]?.key ?? "", _h$0);
-	const selectedKey = controlled ? props.selectedKey : internalKey;
-	const data = {
-		label: props.label,
-		accessibilityLabel: props.accessibilityLabel ?? props.label,
-		options: props.items.map((item) => ({
-			value: item.key,
-			label: item.text,
-			disabled: item.enabled === false ? 1 : 0
-		})),
-		value: selectedKey,
-		disabled: props.enabled === false ? 1 : 0
-	};
-	const update = (nextKey) => {
-		if (!controlled) setInternalKey(nextKey);
-		props.onSelectedKeyChange?.(nextKey);
-	};
-	return universalValue(__octaneUniversalPlan0, [
-		props.id,
-		props.className,
-		props.style,
-		data,
-		(event) => {
-			if (typeof event.data === "string") update(event.data);
-		}
-	]);
-}, { "module": "@nativescript-community/octane" });
-//#endregion
-export { MaterialDropdown };

package/dist/native/SwiftUIPicker.ios.tsrx.js

@@ -1,49 +0,0 @@
-import { defineUniversalComponent, hookSlots, registerElement, universalPlan, universalValue, useState } from "@nativescript-community/octane";
-import { SwiftUI, UIDataDriver, registerSwiftUI } from "@nativescript/swift-ui";
-//#region src/SwiftUIPicker.ios.tsrx
-var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots(1));
-var __octaneUniversalPlan0 = universalPlan("nativescript", {
-	"kind": "host",
-	"type": "xplatiospicker",
-	"props": { "swiftId": "xplat-swiftui-picker" },
-	"bindings": [
-		["id", 0],
-		["className", 1],
-		["style", 2],
-		["data", 3],
-		["onSwiftUIEvent", 4]
-	]
-});
-registerElement("xplatiospicker", SwiftUI);
-registerSwiftUI("xplat-swiftui-picker", (owner) => new UIDataDriver(new XplatPickerProvider(), owner));
-var SwiftUIPicker = defineUniversalComponent("nativescript", function SwiftUIPicker(props) {
-	const controlled = props.selection !== void 0;
-	const [internalSelection, setInternalSelection] = useState(props.defaultSelection ?? props.options[0]?.id ?? "", _h$0);
-	const selection = controlled ? props.selection : internalSelection;
-	const update = (nextSelection) => {
-		if (!controlled) setInternalSelection(nextSelection);
-		props.onSelectionChange?.(nextSelection);
-	};
-	return universalValue(__octaneUniversalPlan0, [
-		props.id,
-		props.className,
-		props.style,
-		{
-			label: props.label,
-			accessibilityLabel: props.accessibilityLabel ?? props.label,
-			options: props.options.map((option) => ({
-				value: option.id,
-				label: option.title,
-				disabled: option.disabled ?? false
-			})),
-			value: selection,
-			disabled: props.disabled ?? false
-		},
-		(event) => {
-			const nextSelection = event.data?.value;
-			if (typeof nextSelection === "string") update(nextSelection);
-		}
-	]);
-}, { "module": "@nativescript-community/octane" });
-//#endregion
-export { SwiftUIPicker };

package/dist/native/android/index.js

@@ -1,2 +0,0 @@
-import { MaterialDropdown } from "../MaterialDropdown.android.tsrx.js";
-export { MaterialDropdown };

package/dist/native/ios/index.js

@@ -1,2 +0,0 @@
-import { SwiftUIPicker } from "../SwiftUIPicker.ios.tsrx.js";
-export { SwiftUIPicker };

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

@@ -1,8 +0,0 @@
-{
-  "version": 1,
-  "buildId": "9b2ddcdd-119c-4b67-a265-0026cd14470a",
-  "mode": "production",
-  "capabilities": {
-    "independentHydration": false
-  }
-}

package/dist/web/Select.web.tsrx.js

@@ -1,94 +0,0 @@
-import { __s, bag13, bag5, child, clone, createScopedElement, delegateEvents, hookSlots, mapSlot, setEventHandler, setSelectValue, setStyle, sibling, template, useState } from "octane";
-import { childTextHoleUpdate, compilerMemoRegion, hookMemoEqual, setAriaAttributeIfChanged, setAttributeIfChanged, setBooleanAttributeIfChanged, setClassNameIfChanged, setPlainAttributeIfChanged } from "octane/internal/client";
-//#region src/Select.web.tsrx
-delegateEvents(["change"]);
-var _t$0 = /* @__PURE__ */ template("<option></option>");
-var _t$1 = /* @__PURE__ */ template("<label><span></span><select><!></select></label>");
-var _hs$ = /* @__PURE__ */ hookSlots(2);
-var _key$1 = (option) => option.value;
-function __item$2(option, __s, __extra) {
-	let _b = __s.slots[0];
-	if (_b === void 0) {
-		const _root = clone(_t$0);
-		_b = bag5(__s, _root, void 0, _root, void 0, null, __s);
-	}
-	_b.a = setAttributeIfChanged(option.value, _b.a, _b.b, "value");
-	_b.c = setBooleanAttributeIfChanged(option.disabled, _b.c, _b.b, "disabled");
-	{
-		const _v = option.label;
-		_b.d = childTextHoleUpdate(__s, 1, _b.b, _v, _b.d, _b.e);
-		_b.e = _v;
-	}
-}
-var Select = /* @__PURE__ */ __s(function Select(props, __s, __extra) {
-	const __memoRegion = compilerMemoRegion(__s, _hs$ + 0);
-	const __memoCommitted = __memoRegion.auto;
-	let __memoCache = __memoCommitted === void 0 ? [] : __memoCommitted;
-	let __mapItems;
-	let __mapMethod;
-	const controlled = props.value !== void 0;
-	const [internalValue, setInternalValue] = useState(props.defaultValue ?? props.options[0]?.value ?? "", _hs$ + 0);
-	const value = controlled ? props.value : internalValue;
-	const labelId = props.id ? `${props.id}-label` : void 0;
-	if (__s.block.pending && !__s.block.crossRenderUpdate) return;
-	let _b = __s.slots[0];
-	if (_b === void 0) {
-		let _m10;
-		const _root = clone(_t$1);
-		const _el0 = child(_root);
-		const _el1 = sibling(_el0, 1);
-		setSelectValue(_el1, value);
-		setEventHandler(_el1, "$ochange", (event) => {
-			const nextValue = event.target.value;
-			if (!controlled) setInternalValue(nextValue);
-			props.onChange?.(nextValue);
-		});
-		_m10 = child(_el1);
-		_b = bag13(__s, _root, void 0, _root, void 0, void 0, _el0, void 0, _el1, void 0, void 0, void 0, _m10, null, __s);
-	} else {
-		setSelectValue(_b.g, value);
-		setEventHandler(_b.g, "$ochange", (event) => {
-			const nextValue = event.target.value;
-			if (!controlled) setInternalValue(nextValue);
-			props.onChange?.(nextValue);
-		});
-	}
-	_b.a = setClassNameIfChanged(props.className, _b.a, _b.b);
-	{
-		const _v = props.style;
-		if (_b.c !== _v) {
-			setStyle(_b.b, _v, _b.c);
-			_b.c = _v;
-		}
-	}
-	_b.d = setPlainAttributeIfChanged(labelId, _b.d, _b.e, "id");
-	_b.f = setPlainAttributeIfChanged(props.id, _b.f, _b.g, "id");
-	_b.h = setAriaAttributeIfChanged(props.accessibilityLabel ?? props.label, _b.h, _b.g, "aria-label");
-	_b.i = setAriaAttributeIfChanged(labelId, _b.i, _b.g, "aria-labelledby");
-	_b.j = setBooleanAttributeIfChanged(props.disabled, _b.j, _b.g, "disabled");
-	{
-		const _v = props.label;
-		_b.l = childTextHoleUpdate(__s, 1, _b.e, _v, _b.l, _b.m);
-		_b.m = _v;
-	}
-	{
-		const _v = (__mapItems = props.options, __mapMethod = __mapItems.map, __mapItems);
-		const __mapNative = mapSlot(_v, __mapMethod);
-		{
-			const __memoDep = _v;
-			if (__s.slots[2] === void 0 || !__mapNative || __memoCache[1] !== true || !hookMemoEqual(__memoCache[0], __memoDep)) {
-				mapSlot(__s, 2, _b.g, _v, __mapMethod, __mapNative, (option) => createScopedElement("option", {
-					key: option.value,
-					value: option.value,
-					disabled: option.disabled
-				}, () => option.label), _key$1, __item$2, 27, void 0, _b.k, 1);
-				if (__memoCache === __memoCommitted) __memoCache = __memoCache.slice();
-				__memoCache[0] = __memoDep;
-				__memoCache[1] = __mapNative;
-			}
-		}
-	}
-	if (__memoCache !== __memoCommitted) __memoRegion.auto = __memoCache;
-});
-//#endregion
-export { Select };

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

@@ -1,8 +0,0 @@
-{
-  "version": 1,
-  "buildId": "8679d795-c48b-472f-9c07-c4d34fd66238",
-  "mode": "production",
-  "capabilities": {
-    "independentHydration": false
-  }
-}

package/dist/web/web/index.js

@@ -1,2 +0,0 @@
-import { Select } from "../Select.web.tsrx.js";
-export { Select };