@octane-xplat/date-picker 0.14.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octane-xplat/date-picker",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Platform-specific date and time selection controls for Octane xplat",
   "repository": {
     "type": "git",
@@ -8,26 +8,27 @@
     "directory": "packages/date-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"
     },
     "./macos": {
       "types": "./types/macos/index.d.ts",
@@ -42,11 +43,12 @@
     "@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.60",
-    "octane": "0.5.0",
-    "tsrx-typegen": "0.2.2",
+    "@octane-xplat/macos-renderer": "0.16.0",
+    "@octanejs/vite-plugin": "0.1.61",
+    "octane": "0.11.0",
+    "tsrx-typegen": "0.3.1",
     "typescript": "5.9.3",
     "vite": "8.3.0"
   },
@@ -73,8 +75,8 @@
     }
   },
   "scripts": {
-    "build": "vite build --mode native && tsc -p tsconfig.types.json",
     "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/android/java/com/octanexplat/datepicker/XplatDatePickerProvider.kt

@@ -21,6 +21,8 @@ import androidx.compose.material3.TimePicker
 import androidx.compose.material3.TimePickerDefaults
 import androidx.compose.material3.TimePickerLayoutType
 import androidx.compose.material3.TimePickerState
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -32,6 +34,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.foundation.isSystemInDarkTheme
 import org.json.JSONObject
 import java.util.Calendar
 import java.util.Date
@@ -47,8 +50,18 @@ private fun Any?.asLong(): Long? = when (this) {
 	else -> null
 }
 
+// android.graphics.Color.parseColor only accepts #RRGGBB/#AARRGGBB (and
+// named colors); the elementColors doc also advertises the CSS-style #rgb
+// shorthand — expand it so a documented value doesn't silently fall back.
+private fun expandShortHex(value: String): String =
+	if (value.length == 4 && value.startsWith('#')) {
+		"#" + value.substring(1).map { "$it$it" }.joinToString("")
+	} else {
+		value
+	}
+
 private fun Any?.asColor(): Color? = when (this) {
-	is String -> runCatching { Color(android.graphics.Color.parseColor(this)) }.getOrNull()
+	is String -> runCatching { Color(android.graphics.Color.parseColor(expandShortHex(this))) }.getOrNull()
 	else -> null
 }
 

package/platforms/ios/src/XplatDatePickerProvider.swift

@@ -116,12 +116,16 @@ public final class XplatDatePickerProvider: UIViewController, SwiftUIProvider {
 	}
 
 	public func updateData(data: NSDictionary) {
-		if let title = data["title"] as? String {
-			model.title = title.isEmpty ? nil : title
-		}
-		if let selection = data["selection"] as? NSNumber {
-			model.selection = Date(timeIntervalSince1970: selection.doubleValue / 1000)
+		// dataSerialize drops undefined keys — an absent key is a revert to
+		// the unset state, not "leave the previous value".
+		if data.object(forKey: "title") == nil {
+			model.title = nil
+		} else {
+			let title = data["title"] as? String
+			model.title = title?.isEmpty == false ? title : nil
 		}
+		model.selection = Self.millisToDate(data["selection"])
+
 		if let range = data["range"] as? [String: Any] {
 			model.rangeStart = Self.millisToDate(range["start"])
 			model.rangeEnd = Self.millisToDate(range["end"])

package/src/AppKitDatePicker.macos.tsrx

@@ -15,9 +15,9 @@ export function AppKitDatePicker(props: AppKitDatePickerProps) @{
 	const handle = useRef<any>(null)
 
 	const options = () => ({
-		mode: props.components === 'time' ? 'time' : 'date',
+		mode: props.components,
 		style: props.pickerStyle,
-		selectionMillis: (props.selection ?? props.defaultSelection)?.getTime?.(),
+		selectionMillis: props.selection?.getTime?.(),
 		minimumMillis: props.minimumDate?.getTime?.(),
 		maximumMillis: props.maximumDate?.getTime?.(),
 		enabled: !props.disabled,
@@ -27,9 +27,15 @@ export function AppKitDatePicker(props: AppKitDatePickerProps) @{
 		const view = anchor.current
 		const attach = host().attachDatePicker
 		if (!view || typeof attach !== 'function') return
-		handle.current = attach(view, options(), (millis: number) => {
-			props.onSelectionChange?.(new Date(millis))
-		})
+		// defaultSelection seeds the initial date; after that the user's
+		// pick owns the value — only the controlled `selection` is pushed.
+		handle.current = attach(
+			view,
+			{ ...options(), selectionMillis: (props.selection ?? props.defaultSelection)?.getTime?.() },
+			(millis: number) => {
+				props.onSelectionChange?.(new Date(millis))
+			},
+		)
 
 		return () => {
 			handle.current?.detach()
@@ -43,14 +49,9 @@ export function AppKitDatePicker(props: AppKitDatePickerProps) @{
 		handle.current?.update(options())
 	})
 
-	<flexboxlayout
-		ref={(v: any) => { anchor.current = v }}
-		id={props.id}
-		className={props.className}
-		style={{
+	<masonview ref={(v: any) => { anchor.current = v }} id={props.id} className={props.className} style={{display: "flex", ...({
 			minWidth: 240,
 			minHeight: props.pickerStyle === 'graphical' ? 300 : 26,
 			...props.style,
-		}}
-	/>;
+		})}}/>;
 }

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

@@ -1,46 +0,0 @@
-import { defineUniversalComponent, registerElement, universalPlan, universalValue } from "@nativescript-community/octane";
-import { ComposeDataDriver, JetpackCompose, registerJetpackCompose } from "@nativescript/jetpack-compose";
-//#region src/MaterialDatePicker.android.tsrx
-var __octaneUniversalPlan0 = universalPlan("nativescript", {
-	"kind": "host",
-	"type": "xplatandroiddatepicker",
-	"props": { "composeId": "xplat-material-datepicker" },
-	"bindings": [
-		["id", 0],
-		["className", 1],
-		["style", 2],
-		["accessibilityLabel", 3],
-		["data", 4],
-		["onComposeEvent", 5]
-	]
-});
-registerElement("xplatandroiddatepicker", JetpackCompose);
-registerJetpackCompose("xplat-material-datepicker", (owner) => new ComposeDataDriver(new com.octanexplat.datepicker.XplatDatePickerProvider(), owner));
-var MaterialDatePicker = defineUniversalComponent("nativescript", function MaterialDatePicker(props) {
-	const data = {
-		initialDate: props.initialDate?.getTime() ?? null,
-		variant: props.variant ?? "picker",
-		displayedComponents: props.displayedComponents ?? "date",
-		showVariantToggle: props.showVariantToggle ?? true ? 1 : 0,
-		is24Hour: props.is24Hour ?? true ? 1 : 0,
-		color: props.color,
-		elementColors: props.elementColors,
-		selectableDates: {
-			start: props.selectableDates?.start?.getTime() ?? null,
-			end: props.selectableDates?.end?.getTime() ?? null
-		}
-	};
-	return universalValue(__octaneUniversalPlan0, [
-		props.id,
-		props.className,
-		props.style,
-		props.accessibilityLabel,
-		data,
-		(event) => {
-			const millis = event.data?.date;
-			props.onDateSelected?.(typeof millis === "number" ? new Date(millis) : null);
-		}
-	]);
-}, { "module": "@nativescript-community/octane" });
-//#endregion
-export { MaterialDatePicker };

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

@@ -1,48 +0,0 @@
-import { defineUniversalComponent, hookSlots, registerElement, universalPlan, universalValue, useState } from "@nativescript-community/octane";
-import { SwiftUI, UIDataDriver, registerSwiftUI } from "@nativescript/swift-ui";
-//#region src/SwiftUIDatePicker.ios.tsrx
-var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots(1));
-var __octaneUniversalPlan0 = universalPlan("nativescript", {
-	"kind": "host",
-	"type": "xplatiosdatepicker",
-	"props": { "swiftId": "xplat-swiftui-datepicker" },
-	"bindings": [
-		["id", 0],
-		["className", 1],
-		["style", 2],
-		["data", 3],
-		["onSwiftUIEvent", 4]
-	]
-});
-registerElement("xplatiosdatepicker", SwiftUI);
-registerSwiftUI("xplat-swiftui-datepicker", (owner) => new UIDataDriver(new XplatDatePickerProvider(), owner));
-var SwiftUIDatePicker = defineUniversalComponent("nativescript", function SwiftUIDatePicker(props) {
-	const controlled = props.selection !== void 0;
-	const [internalSelection, setInternalSelection] = useState(props.defaultSelection, _h$0);
-	const selection = controlled ? props.selection : internalSelection;
-	return universalValue(__octaneUniversalPlan0, [
-		props.id,
-		props.className,
-		props.style,
-		{
-			title: props.title,
-			selection: selection?.getTime(),
-			range: {
-				start: props.minimumDate?.getTime(),
-				end: props.maximumDate?.getTime()
-			},
-			displayedComponents: props.displayedComponents ?? ["date"],
-			pickerStyle: props.pickerStyle ?? "automatic",
-			disabled: props.disabled ?? false
-		},
-		(event) => {
-			const millis = event.data?.date;
-			if (typeof millis !== "number") return;
-			const next = new Date(millis);
-			if (!controlled) setInternalSelection(next);
-			props.onSelectionChange?.(next);
-		}
-	]);
-}, { "module": "@nativescript-community/octane" });
-//#endregion
-export { SwiftUIDatePicker };

package/dist/native/android/index.js

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

package/dist/native/ios/index.js

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

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

@@ -1,8 +0,0 @@
-{
-  "version": 1,
-  "buildId": "8d8fb4a1-69e7-4d76-9401-ad577ac00c0d",
-  "mode": "production",
-  "capabilities": {
-    "independentHydration": false
-  }
-}