craft-native 0.0.134 → 0.0.136

package/dist/android/templates/CraftBridge.kt.template

@@ -418,6 +418,7 @@ class CraftBridge(
                     appReview: true,
                     flashlight: {{ENABLE_CAMERA}} && ${hasFlashlight()},
                     speech: true,
+                    brightness: true,
                     openURL: true,
                     vibrationPattern: true,
                     appState: true,
@@ -687,6 +688,18 @@ class CraftBridge(
                     return CraftAndroid.setKeepAwake(enabled);
                 },
 
+                // Screen brightness, 0 to 1. resetBrightness hands the screen
+                // back to the system setting (auto-brightness included).
+                getBrightness: function() {
+                    return Promise.resolve().then(function() { return CraftAndroid.getBrightness(); });
+                },
+                setBrightness: function(level) {
+                    return Promise.resolve().then(function() { return CraftAndroid.setBrightness(Number(level)); });
+                },
+                resetBrightness: function() {
+                    return Promise.resolve().then(function() { return CraftAndroid.resetBrightness(); });
+                },
+
                 // Orientation Lock
                 lockOrientation: function(orientation) {
                     return CraftAndroid.lockOrientation(orientation);
@@ -3628,6 +3641,49 @@ class CraftBridge(
         )
     }
 
+    // ==================== Screen Brightness ====================
+    //
+    // The window's own brightness override (WindowManager.LayoutParams
+    // .screenBrightness): no permission, and it lasts only while this window
+    // is in front, so leaving the app hands the screen back by itself.
+    // resetBrightness releases it, which also gives auto-brightness back -
+    // setting the old system level instead would freeze it there.
+    @Volatile private var brightnessOverride: Float? = null
+
+    @JavascriptInterface
+    fun getBrightness(): Double {
+        brightnessOverride?.let { return it.toDouble() }
+        return try {
+            Settings.System.getInt(activity.contentResolver, Settings.System.SCREEN_BRIGHTNESS) / 255.0
+        } catch (e: Exception) {
+            0.5
+        }
+    }
+
+    @JavascriptInterface
+    fun setBrightness(level: Double): Double {
+        if (!level.isFinite()) return getBrightness()
+        val clamped = level.coerceIn(0.0, 1.0).toFloat()
+        brightnessOverride = clamped
+        activity.runOnUiThread {
+            val params = activity.window.attributes
+            params.screenBrightness = clamped
+            activity.window.attributes = params
+        }
+        return clamped.toDouble()
+    }
+
+    @JavascriptInterface
+    fun resetBrightness(): Double {
+        brightnessOverride = null
+        activity.runOnUiThread {
+            val params = activity.window.attributes
+            params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
+            activity.window.attributes = params
+        }
+        return getBrightness()
+    }
+
     // ==================== Keep Awake ====================
 
     @JavascriptInterface

package/dist/api/mobile.d.ts

@@ -738,15 +738,19 @@ export interface SpeechOptions {
     /** Stop whatever is being said first. Defaults to true; false queues behind it. */
     interrupt?: boolean;
 }
-/**
- * Short spoken cues: "Rest, 15 seconds. Up next: Dead Bug".
- *
- * Inside a Craft app this is native text-to-speech, which ducks the person's
- * music rather than stopping it and, on iOS, plays with the silent switch on.
- * In a browser it falls back to the Web Speech API, which does neither, and
- * where there is no speech at all it answers `false` rather than throwing, so
- * a cue never breaks the flow around it.
- */
+export declare const brightness: {
+    isAvailable(): boolean;
+    /** The screen's brightness, 0 to 1, or null where there is none to read. */
+    get(): Promise<number | null>;
+    /**
+     * Set the brightness, 0 to 1 (clamped). The first call since the last
+     * `restore()` remembers the person's own level to go back to. Resolves with
+     * the level the screen reports, or null off a phone.
+     */
+    set(level: number): Promise<number | null>;
+    /** Put the person's own brightness back. Safe to call when nothing was set. */
+    restore(): Promise<void>;
+};
 export declare const speech: {
     isAvailable(): boolean;
     /**
@@ -1184,6 +1188,7 @@ declare const mobile: {
     lifecycle: typeof lifecycle;
     notifications: typeof notifications;
     keepAwake: typeof keepAwake;
+    brightness: typeof brightness;
     speech: typeof speech;
     deepLinks: typeof deepLinks;
     network: typeof network;

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.134";
+var version = "0.0.136";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -310,7 +310,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.134";
+var version = "0.0.136";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -58,7 +58,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.134";
+var version = "0.0.136";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftApp.swift

@@ -535,8 +535,25 @@ final class CraftChrome: ObservableObject {
     private var occupied: CGFloat = 0
     private var pendingHide: DispatchWorkItem?
     private var splashDeadline: DispatchWorkItem?
+    /// The keyboard is up and covers the tab bar, so the page need not leave
+    /// room for it: the web view ends at the keyboard (CraftHybrid's webHost).
+    private var keyboardUp = false
 
-    private init() {}
+    private init() {
+        let center = NotificationCenter.default
+        center.addObserver(forName: UIResponder.keyboardWillShowNotification, object: nil, queue: .main) { [weak self] _ in
+            self?.keyboardChanged(up: true)
+        }
+        center.addObserver(forName: UIResponder.keyboardWillHideNotification, object: nil, queue: .main) { [weak self] _ in
+            self?.keyboardChanged(up: false)
+        }
+    }
+
+    private func keyboardChanged(up: Bool) {
+        guard up != keyboardUp else { return }
+        keyboardUp = up
+        publishLayout()
+    }
 
     /// The tab bar from `tabs` in craft.config.json, there before the page
     /// loads; the page's own `tabBar` message replaces it later. `splash`
@@ -685,7 +702,7 @@ final class CraftChrome: ObservableObject {
     /// The bar's height as `--craft-tab-bar-height`, so the page leaves room
     /// for it, and as an event for anything that measures.
     func publishLayout() {
-        let height = tabBarVisible ? Int(occupied) : 0
+        let height = tabBarVisible && !keyboardUp ? Int(occupied) : 0
         CraftHybrid.shared.tabBarCovers(CGFloat(height))
         let script = "document.documentElement.style.setProperty('--craft-tab-bar-height','\(height)px');window.dispatchEvent(new CustomEvent('craftTabBarLayout',{detail:{height:\(height)}}));"
         DispatchQueue.main.async { [weak self] in self?.webView?.evaluateJavaScript(script, completionHandler: nil) }
@@ -2140,6 +2157,15 @@ struct CraftWebView: UIViewRepresentable {
                 } else {
                     rejectCallback(callbackId, error: "Keep awake is disabled", code: "CAPABILITY_DISABLED")
                 }
+            // MARK: - Screen Brightness
+            case "getBrightness":
+                getBrightness(callbackId: callbackId)
+            case "setBrightness":
+                if let level = (body["level"] as? NSNumber)?.doubleValue, level.isFinite {
+                    setBrightness(level, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "setBrightness was called without the values it needs", code: "INVALID_ARGUMENT")
+                }
             // MARK: - Orientation Lock
             case "lockOrientation":
                 if config.enableOrientationLock {
@@ -3102,6 +3128,7 @@ struct CraftWebView: UIViewRepresentable {
                     orientationLock: \(config.enableOrientationLock),
                     deepLinks: \(config.enableDeepLinks),
                     flashlight: true,
+                    brightness: true,
                     speech: true,
                     network: true,
                     deviceInfo: true,
@@ -4041,6 +4068,25 @@ struct CraftWebView: UIViewRepresentable {
                     });
                 },
 
+                // Screen brightness, 0 to 1. Each resolves with the level the
+                // screen then reports.
+                getBrightness: function() {
+                    var self = this;
+                    var id = 'cb_' + (++this._callbackId);
+                    window.webkit.messageHandlers.craft.postMessage({action: 'getBrightness', callbackId: id});
+                    return new Promise(function(resolve, reject) {
+                        self._callbacks[id] = {resolve: resolve, reject: reject};
+                    });
+                },
+                setBrightness: function(level) {
+                    var self = this;
+                    var id = 'cb_' + (++this._callbackId);
+                    window.webkit.messageHandlers.craft.postMessage({action: 'setBrightness', level: level, callbackId: id});
+                    return new Promise(function(resolve, reject) {
+                        self._callbacks[id] = {resolve: resolve, reject: reject};
+                    });
+                },
+
                 // Speech synthesis. speak() settles when the utterance ends:
                 // true when it was spoken, false when something stopped it.
                 // No timeout, because a long sentence at a slow rate can
@@ -6236,6 +6282,25 @@ struct CraftWebView: UIViewRepresentable {
             }
         }
 
+        // MARK: - Screen Brightness
+        //
+        // The device's backlight, 0 to 1. It is system-wide, not the app's:
+        // a page that dims it reads it first and puts it back - when it is
+        // done, and when the app leaves the foreground (@stacksjs/mobile's
+        // screen API does both off the page's visibility).
+        private func getBrightness(callbackId: String?) {
+            DispatchQueue.main.async {
+                self.resolveCallback(callbackId, result: Double(UIScreen.main.brightness))
+            }
+        }
+
+        private func setBrightness(_ level: Double, callbackId: String?) {
+            DispatchQueue.main.async {
+                UIScreen.main.brightness = CGFloat(min(max(level, 0), 1))
+                self.resolveCallback(callbackId, result: Double(UIScreen.main.brightness))
+            }
+        }
+
         // MARK: - Speech Synthesis
         //
         // Native rather than the page's own `speechSynthesis`, which in a

package/dist/ios/templates/CraftHybrid.swift

@@ -539,6 +539,14 @@ final class CraftHybrid: NSObject {
             }, function () { arriving = null; finish(); });
           });
         },
+        // Put the page at `path` in place of where it is, without a step in
+        // its history: the shell is back at a native screen and the page
+        // behind it had no history left to go back through (it reloaded).
+        reset: function (path) {
+          if (!(navigate && current && current.__craftHybrid)) { location.replace(path); return Promise.resolve(false); }
+          hostNav = path;
+          return Promise.resolve(navigate(path, { instant: true, replace: true }));
+        },
         setBase: function (value) { base = typeof value === 'number' ? value : null; },
         // Back to `target` in the page's stack, after the shell popped the
         // entries above it.
@@ -667,6 +675,11 @@ final class CraftHybrid: NSObject {
         webView?.evaluateJavaScript("window.__craftHybrid && window.__craftHybrid.setBase(\(value))", completionHandler: nil)
     }
 
+    func pageReset(to path: String) {
+        guard let data = try? JSONSerialization.data(withJSONObject: [path]), let json = String(data: data, encoding: .utf8) else { return }
+        webView?.evaluateJavaScript("window.__craftHybrid && window.__craftHybrid.reset && window.__craftHybrid.reset(\(json)[0])", completionHandler: nil)
+    }
+
     func pageBack(to depth: Int) {
         webView?.evaluateJavaScript("window.__craftHybrid && window.__craftHybrid.backTo(\(max(0, depth)))", completionHandler: nil)
     }
@@ -752,7 +765,10 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     init(config: CraftConfig) {
         self.config = config
-        webHost = UIHostingController(rootView: AnyView(CraftWebView(config: config).ignoresSafeArea()))
+        // Edge to edge, but not under the keyboard: the web view ends at its
+        // top. Under it, WebKit scrolled the page's layout viewport to show a
+        // focused field and carried every sticky header off the screen.
+        webHost = UIHostingController(rootView: AnyView(CraftWebView(config: config).ignoresSafeArea(.container)))
         super.init(nibName: nil, bundle: nil)
         hybrid.controller = self
     }
@@ -784,7 +800,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard !webAttached else { return }
         webAttached = true
         webHost.view.backgroundColor = config.resolvedBackgroundColor
-        if #available(iOS 16.4, *) { webHost.safeAreaRegions = [] }
+        if #available(iOS 16.4, *) { webHost.safeAreaRegions = [.keyboard] }
         if let slot = visibleStack?.topViewController as? CraftHybridWebSlot, slot.isViewLoaded {
             moveWeb(to: slot, in: slot.view)
         } else {
@@ -1109,6 +1125,16 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         if let depth = removed.compactMap({ ($0 as? CraftHybridWebSlot)?.depth }).min() {
             hybrid.pageBack(to: depth - 1)
         }
+        // Back at a tab's native root while the page, with no history left
+        // to go back through (it reloaded on the screen just popped), still
+        // shows that screen: it moves to the root's path. Left there, the
+        // next screen opened from the root was pushed on top of it and named
+        // it in its Back button ("Me" instead of "Today").
+        if !removed.isEmpty, !(viewController is CraftHybridWebSlot), navigationController.viewControllers.first === viewController,
+           let rootPath = nativePaths[ObjectIdentifier(viewController)], !rootPath.contains(":"), hybrid.pageDepth == 0,
+           let pagePath = hybrid.pagePath, CraftHybridRoutes.normalize(pagePath) != CraftHybridRoutes.normalize(rootPath) {
+            hybrid.pageReset(to: rootPath)
+        }
         guard navigationController === visibleStack else { return }
         if let slot = viewController as? CraftHybridWebSlot { adoptWeb(into: slot) } else { parkWeb() }
     }

package/dist/mobile.js

@@ -610,6 +610,64 @@ var speakingOnTheWeb = new Set;
 function speechRate(rate) {
   return typeof rate === "number" && Number.isFinite(rate) ? Math.min(Math.max(rate, 0.5), 2) : 1;
 }
+var brightnessState = { original: null, wanted: null, unwatch: null };
+function brightnessLevel(level) {
+  const value = Number(level);
+  return Number.isFinite(value) ? Math.min(1, Math.max(0, value)) : null;
+}
+async function putBrightnessBack(craft) {
+  if (typeof craft?.resetBrightness === "function")
+    await craft.resetBrightness();
+  else if (brightnessState.original !== null)
+    await craft.setBrightness(brightnessState.original);
+}
+function watchBrightnessVisibility() {
+  if (brightnessState.unwatch || typeof document === "undefined")
+    return;
+  const onVisibility = () => {
+    const craft = getCraftRoot();
+    if (!craft?.setBrightness || brightnessState.wanted === null)
+      return;
+    if (document.visibilityState === "hidden")
+      putBrightnessBack(craft).catch(() => {});
+    else
+      craft.setBrightness(brightnessState.wanted).catch(() => {});
+  };
+  document.addEventListener("visibilitychange", onVisibility);
+  brightnessState.unwatch = () => document.removeEventListener("visibilitychange", onVisibility);
+}
+var brightness = {
+  isAvailable() {
+    return typeof getCraftRoot()?.setBrightness === "function";
+  },
+  async get() {
+    const craft = getCraftRoot();
+    if (typeof craft?.getBrightness !== "function")
+      return null;
+    return brightnessLevel(await craft.getBrightness());
+  },
+  async set(level) {
+    const craft = getCraftRoot();
+    const wanted = brightnessLevel(level);
+    if (typeof craft?.setBrightness !== "function" || wanted === null)
+      return null;
+    if (brightnessState.wanted === null && typeof craft.getBrightness === "function")
+      brightnessState.original = brightnessLevel(await craft.getBrightness());
+    brightnessState.wanted = wanted;
+    watchBrightnessVisibility();
+    return brightnessLevel(await craft.setBrightness(wanted));
+  },
+  async restore() {
+    const craft = getCraftRoot();
+    const held = brightnessState.wanted !== null;
+    brightnessState.wanted = null;
+    brightnessState.unwatch?.();
+    brightnessState.unwatch = null;
+    if (held && typeof craft?.setBrightness === "function")
+      await putBrightnessBack(craft);
+    brightnessState.original = null;
+  }
+};
 var speech = {
   isAvailable() {
     return Boolean(getCraftRoot()?.speech?.speak) || getWebSpeech() !== undefined;
@@ -1147,6 +1205,7 @@ export {
   chrome,
   camera,
   browser,
+  brightness,
   bridgeNotification,
   biometrics,
   background,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.134",
+  "version": "0.0.136",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",