@ng-native/expo 0.16.0 → 0.17.0

package/android/src/main/java/dev/ngnative/expo/KeyboardModule.kt

@@ -0,0 +1,187 @@
+package dev.ngnative.expo
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import android.view.ViewTreeObserver
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import expo.modules.kotlin.viewevent.EventDispatcher
+import expo.modules.kotlin.views.ExpoView
+
+/**
+ * The keyboard's motion on Android, which React Native reports only as a `keyboardDidShow` once
+ * the window's insets have changed, so a layout that waits for it jumps while the keyboard slides.
+ *
+ * `onKeyboardChange` is the motion starting: where the keyboard is going and how long it takes,
+ * what iOS's `keyboardWillShow` carries. `onKeyboardMove` is where the keyboard is at each frame:
+ * before the motion, through it, and `end` after it, for a layout to move with it, since Android
+ * animates no layout alongside the keyboard by default. The view,
+ * `<keyboard-motion-view>`, reports every frame of the motion as how far the keyboard covers the
+ * view's own bottom edge, for a native animation to follow it.
+ */
+class KeyboardModule : Module() {
+  private var watcher: KeyboardWatcher? = null
+  /** Whether JavaScript is listening: set on its thread, read on the main one. */
+  @Volatile private var observing = false
+  private val main = Handler(Looper.getMainLooper())
+
+  private val listener = object : KeyboardWatcher.Listener {
+    override fun onKeyboardStart(target: Int, duration: Long) {
+      val watcher = watcher ?: return
+      // Where it is starting from first, so a layout following the frames is not handed the
+      // destination before the motion has begun.
+      sendEvent("onKeyboardMove", position(watcher, watcher.inset))
+      sendEvent("onKeyboardChange", change(watcher, target, duration))
+    }
+
+    override fun onKeyboardProgress(inset: Int) {
+      val watcher = watcher ?: return
+      sendEvent("onKeyboardMove", position(watcher, inset))
+    }
+
+    override fun onKeyboardEnd(inset: Int) {
+      sendEvent("onKeyboardMove", mapOf("end" to true))
+    }
+  }
+
+  override fun definition() = ModuleDefinition {
+    Name("NgNativeKeyboard")
+
+    Events("onKeyboardChange", "onKeyboardMove")
+
+    OnStartObserving {
+      observing = true
+      watchActivity()
+    }
+
+    OnStopObserving {
+      observing = false
+      main.post { unwatch() }
+    }
+
+    // An activity Android recreates, after the font size changes for one, is a new window while
+    // the app's listeners stay: the watcher moves to it rather than keep the old one alive.
+    OnActivityEntersForeground {
+      if (observing) watchActivity()
+    }
+
+    OnActivityDestroys {
+      unwatch()
+    }
+
+    View(KeyboardMotionView::class) {
+      Events("onKeyboardMoveStart", "onKeyboardMove", "onKeyboardMoveEnd")
+    }
+  }
+
+  /** Watch the keyboard of the activity in front, once. On the main thread. */
+  private fun watchActivity() {
+    val activity = appContext.currentActivity ?: return
+    activity.runOnUiThread {
+      if (watcher == null && observing) {
+        watcher = KeyboardWatcher.watch(activity.window.decorView, listener)
+      }
+    }
+  }
+
+  private fun unwatch() {
+    KeyboardWatcher.unwatch(watcher, listener)
+    watcher = null
+  }
+
+  /** Where the motion is going and how long it takes. */
+  private fun change(watcher: KeyboardWatcher, target: Int, duration: Long): Map<String, Any> =
+    position(watcher, target) + mapOf(
+      "duration" to duration.toDouble(),
+      // Android's own curve decelerates, as `easeOut` does.
+      "easing" to "easeOut",
+    )
+
+  /**
+   * A keyboard `inset` pixels tall as React Native's keyboard events describe one, in points: its
+   * height above the system bars, and its top edge on the screen. Zero, and no edge, for none.
+   */
+  private fun position(watcher: KeyboardWatcher, inset: Int): Map<String, Any> {
+    if (inset == 0) return mapOf("height" to 0.0)
+    val density = appContext.reactContext?.resources?.displayMetrics?.density ?: 1f
+    val bars = appContext.currentActivity?.window?.decorView?.let { decor ->
+      ViewCompat.getRootWindowInsets(decor)?.getInsets(WindowInsetsCompat.Type.systemBars())?.bottom
+    } ?: 0
+    return mapOf(
+      "height" to maxOf(0, inset - bars) / density.toDouble(),
+      "screenY" to (watcher.bottomOnScreen - inset) / density.toDouble(),
+    )
+  }
+}
+
+/**
+ * How far the keyboard covers this view's bottom edge, in points, at every frame of its motion.
+ *
+ * Laid out over the element it reports for, it moves with whatever moves that element: a sheet
+ * that react-native-screens raises with the keyboard covers less of it, so what follows the
+ * keyboard by this rises only as far as it still must.
+ */
+class KeyboardMotionView(context: Context, appContext: AppContext) :
+  ExpoView(context, appContext),
+  KeyboardWatcher.Listener {
+  private val onKeyboardMoveStart by EventDispatcher()
+  private val onKeyboardMove by EventDispatcher()
+  private val onKeyboardMoveEnd by EventDispatcher()
+
+  private var watcher: KeyboardWatcher? = null
+  /** The last height reported once the keyboard stopped, so a layout reports only a change. */
+  private var settled = -1.0
+
+  private val laidOut = ViewTreeObserver.OnGlobalLayoutListener {
+    val watcher = watcher ?: return@OnGlobalLayoutListener
+    if (watcher.moving) return@OnGlobalLayoutListener
+    val height = covered(watcher.inset)
+    if (height != settled) {
+      settled = height
+      onKeyboardMoveEnd(mapOf("height" to height))
+    }
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    watcher = KeyboardWatcher.watch(this, this)
+    viewTreeObserver.addOnGlobalLayoutListener(laidOut)
+  }
+
+  override fun onDetachedFromWindow() {
+    viewTreeObserver.removeOnGlobalLayoutListener(laidOut)
+    KeyboardWatcher.unwatch(watcher, this)
+    watcher = null
+    settled = -1.0
+    super.onDetachedFromWindow()
+  }
+
+  override fun onKeyboardStart(target: Int, duration: Long) {
+    onKeyboardMoveStart(mapOf("height" to covered(target)))
+  }
+
+  override fun onKeyboardProgress(inset: Int) {
+    onKeyboardMove(mapOf("height" to covered(inset)))
+  }
+
+  override fun onKeyboardEnd(inset: Int) {
+    settled = covered(inset)
+    onKeyboardMoveEnd(mapOf("height" to settled))
+  }
+
+  /** How far a keyboard `inset` pixels tall covers this view's bottom edge, in points. */
+  private fun covered(inset: Int): Double {
+    val watcher = watcher ?: return 0.0
+    if (inset == 0) return 0.0
+    val location = IntArray(2)
+    getLocationOnScreen(location)
+    val bottom = location[1] + height
+    val top = watcher.bottomOnScreen - inset
+    return maxOf(0, bottom - top) / resources.displayMetrics.density.toDouble()
+  }
+}

package/android/src/main/java/dev/ngnative/expo/KeyboardWatcher.kt

@@ -0,0 +1,190 @@
+package dev.ngnative.expo
+
+import android.os.Build
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsCompat
+import java.util.WeakHashMap
+
+/**
+ * The keyboard as one window sees it, frame by frame: the inset the keyboard takes from the bottom
+ * of the window, in pixels, as Android animates it.
+ *
+ * Android tells a view about the keyboard's motion through `WindowInsetsAnimationCompat`, but only
+ * a view the window dispatches to: react-native-screens stops the dispatch at a sheet's screen, to
+ * move the sheet itself. So the callback is on a view of its own, appended to the window's content
+ * after the app, which the dispatch reaches past every screen. A window of its own, as a modal is,
+ * has a watcher of its own.
+ *
+ * Nothing here applies or consumes an inset: the app lays itself out as it did without it.
+ */
+internal class KeyboardWatcher private constructor(private val root: ViewGroup) {
+  interface Listener {
+    /** The keyboard starts to move to `target`, over `duration` milliseconds. */
+    fun onKeyboardStart(target: Int, duration: Long)
+    /** One frame of the motion. */
+    fun onKeyboardProgress(inset: Int)
+    /** The keyboard has stopped at `inset`. */
+    fun onKeyboardEnd(inset: Int)
+  }
+
+  private val listeners = LinkedHashSet<Listener>()
+  private val probe = View(root.context)
+
+  /** Where the keyboard is now, as the last frame left it. */
+  var inset = keyboardInset(ViewCompat.getRootWindowInsets(root))
+    private set
+
+  /**
+   * Set from the moment Android prepares a motion, which comes before the insets it ends at, until
+   * its end is reported.
+   */
+  var moving = false
+    private set
+
+  /** How many motions Android has prepared, which tells an end whether another has begun. */
+  private var motions = 0
+
+  /** Whether the motion prepared last has started. */
+  private var started = false
+
+  /** The window's bottom edge on the screen, which the keyboard's top is measured up from. */
+  val bottomOnScreen: Int
+    get() {
+      val window = root.rootView
+      val location = IntArray(2)
+      window.getLocationOnScreen(location)
+      return location[1] + window.height
+    }
+
+  init {
+    root.addView(probe, ViewGroup.LayoutParams(0, 0))
+    ViewCompat.setWindowInsetsAnimationCallback(
+      probe,
+      object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_CONTINUE_ON_SUBTREE) {
+        override fun onPrepare(animation: WindowInsetsAnimationCompat) {
+          if (!animation.isKeyboard) return
+          moving = true
+          started = false
+          val prepared = ++motions
+          // Android 11 sends no end for a motion cancelled before it starts, which would leave
+          // `moving` set and every later change ignored until another motion ends. One that has
+          // not started by now never will; the keyboard is then wherever the window says.
+          // ponytail: a fixed wait, so a first frame slower than it reads as a cancel.
+          probe.postDelayed({ if (motions == prepared && !started) settle() }, CANCELLED_MS)
+        }
+
+        override fun onStart(
+          animation: WindowInsetsAnimationCompat,
+          bounds: WindowInsetsAnimationCompat.BoundsCompat,
+        ): WindowInsetsAnimationCompat.BoundsCompat {
+          if (animation.isKeyboard) {
+            moving = true
+            started = true
+            // The window's insets are the ones the motion ends at by now.
+            val target = keyboardInset(ViewCompat.getRootWindowInsets(probe))
+            listeners.toList().forEach { it.onKeyboardStart(target, animation.durationMillis) }
+          }
+          return bounds
+        }
+
+        override fun onProgress(
+          insets: WindowInsetsCompat,
+          running: MutableList<WindowInsetsAnimationCompat>,
+        ): WindowInsetsCompat {
+          if (running.any { it.isKeyboard }) {
+            inset = keyboardInset(insets)
+            listeners.toList().forEach { it.onKeyboardProgress(inset) }
+          }
+          return insets
+        }
+
+        override fun onEnd(animation: WindowInsetsAnimationCompat) {
+          if (!animation.isKeyboard) return
+          // A keyboard that turns back part way ends its motion before the one that replaces it
+          // is prepared, in the same call, and by then the window's insets are the cancelled
+          // motion's destination. So the end waits a turn, and is dropped when a motion has begun
+          // since: reported, it would land what follows the keyboard there for a frame.
+          val ending = motions
+          probe.post {
+            if (motions != ending) return@post
+            moving = false
+            inset = keyboardInset(ViewCompat.getRootWindowInsets(probe))
+            listeners.toList().forEach { it.onKeyboardEnd(inset) }
+          }
+        }
+      },
+    )
+    // A keyboard that changes without a motion: with animations turned off, or a height that
+    // changes in place. Below Android 11 the compat callback animates every change itself, and
+    // owns the view's insets listener to do it.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      ViewCompat.setOnApplyWindowInsetsListener(probe) { _, insets ->
+        if (!moving) jump(keyboardInset(insets))
+        insets
+      }
+    }
+  }
+
+  /** A motion that will not start is over: report a keyboard it left elsewhere as one jump. */
+  private fun settle() {
+    moving = false
+    jump(keyboardInset(ViewCompat.getRootWindowInsets(probe)))
+  }
+
+  /** The keyboard at `now` with no motion, reported as one that starts and ends at once. */
+  private fun jump(now: Int) {
+    if (now == inset) return
+    inset = now
+    listeners.toList().forEach {
+      it.onKeyboardStart(now, 0)
+      it.onKeyboardEnd(now)
+    }
+  }
+
+  private fun add(listener: Listener) {
+    listeners.add(listener)
+  }
+
+  private fun remove(listener: Listener) {
+    listeners.remove(listener)
+    if (listeners.isNotEmpty()) return
+    ViewCompat.setWindowInsetsAnimationCallback(probe, null)
+    ViewCompat.setOnApplyWindowInsetsListener(probe, null)
+    root.removeView(probe)
+    watchers.remove(root)
+  }
+
+  companion object {
+    /** How long a prepared motion has to start before it counts as cancelled, in ms. */
+    private const val CANCELLED_MS = 500L
+
+    private val watchers = WeakHashMap<ViewGroup, KeyboardWatcher>()
+
+    /** The window content `view` is in, which its watcher's view joins. */
+    private fun rootOf(view: View): ViewGroup? =
+      view.rootView.findViewById(android.R.id.content) ?: view.rootView as? ViewGroup
+
+    /**
+     * Start telling `listener` about the keyboard of the window `view` is in. Answers the watcher,
+     * or null when the view is in no window. On the main thread.
+     */
+    fun watch(view: View, listener: Listener): KeyboardWatcher? {
+      val root = rootOf(view) ?: return null
+      return watchers.getOrPut(root) { KeyboardWatcher(root) }.also { it.add(listener) }
+    }
+
+    /** Stop telling `listener`, and take the watcher's view away with the last one. */
+    fun unwatch(watcher: KeyboardWatcher?, listener: Listener) {
+      watcher?.remove(listener)
+    }
+
+    private val WindowInsetsAnimationCompat.isKeyboard: Boolean
+      get() = typeMask and WindowInsetsCompat.Type.ime() != 0
+
+    private fun keyboardInset(insets: WindowInsetsCompat?): Int =
+      insets?.getInsets(WindowInsetsCompat.Type.ime())?.bottom ?: 0
+  }
+}

package/dist/brightness.d.ts

@@ -13,12 +13,18 @@ export interface NativeBrightness {
     get(): Promise<number>;
     set(level: number): Promise<void>;
     restore(): Promise<void>;
+    /** Calls `listener` when a window comes to the front, to be given the level again. */
+    onWindowFront?(listener: () => void): () => void;
 }
 export declare class Brightness {
     /** Overridden in a test to watch the level without changing a screen. */
     static readonly SOURCE: InjectionToken<NativeBrightness | null>;
     private readonly native;
+    /** Every app's levels: the screen is the runtime's, not an app's. */
+    private readonly window;
     private readonly current;
+    /** This app, among the apps setting the level. */
+    private readonly owner;
     /** Nought to one. One until the platform answers, since that is what a screen already shows. */
     readonly level: Signal<number>;
     constructor();
@@ -29,9 +35,6 @@ export declare class Brightness {
      * after the boarding pass has been shown - which the user experiences as a battery fault.
      */
     set(level: number): () => void;
-    /** Every level set and not yet put back, the one in force last. */
-    private readonly levels;
-    private apply;
     restore(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<Brightness, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<any>;

package/dist/brightness.js

@@ -7,7 +7,8 @@
  * after it is gone, and needs a permission on Android - a decision to make deliberately against
  * Expo's own API rather than to reach through a convenience here.
  */
-import { InjectionToken, Service, inject, signal } from '@angular/core';
+import { DestroyRef, InjectionToken, Service, inject, signal, untracked, } from '@angular/core';
+import { TopClaim, onWindowFront, sharedBySource } from '@ng-native/device';
 import { expoModule, present } from "./native.js";
 import * as i0 from "@angular/core";
 export class Brightness {
@@ -20,22 +21,29 @@ export class Brightness {
             // Missing from the build: the stand-in, to say so when it is used.
             if (!present(expo))
                 return expo;
-            return {
+            // One per module, so every app the runtime mounts sets the same screen.
+            return sharedBySource(expo, () => ({
                 get: () => expo.getBrightnessAsync(),
                 set: (level) => expo.setBrightnessAsync(level),
                 restore: () => expo.restoreSystemBrightnessAsync(),
-            };
+                onWindowFront,
+            }));
         },
     });
     native = inject(Brightness.SOURCE);
-    current = signal(1, /* @ts-ignore */
-    ...(ngDevMode ? [{ debugName: "current" }] : /* istanbul ignore next */ []));
+    /** Every app's levels: the screen is the runtime's, not an app's. */
+    window = sharedBySource(this.native, () => new BrightnessWindow(this.native));
+    current = this.window.current;
+    /** This app, among the apps setting the level. */
+    owner = {};
     /** Nought to one. One until the platform answers, since that is what a screen already shows. */
     level = this.current.asReadonly();
     constructor() {
-        void present(this.native)
-            ?.get()
-            .then((level) => this.current.set(level), () => { });
+        inject(DestroyRef).onDestroy(() => {
+            // An app that goes takes its levels with it, and leaves the screen to the apps still here.
+            this.window.levels.claims.drop(this.owner);
+            this.window.levels.apply();
+        });
     }
     /**
      * Set it, and return the function that puts it back.
@@ -47,35 +55,23 @@ export class Brightness {
         const clamped = Math.min(1, Math.max(0, level));
         // A stack, as the status bar's is: a screen pushed over one that set a level of its own puts
         // back the level beneath it, not the system's, when it goes.
-        const entry = { level: clamped };
-        this.levels.push(entry);
-        this.apply(clamped);
+        const drop = this.window.levels.claims.push(this.owner, clamped);
+        this.window.levels.apply();
         return () => {
-            const at = this.levels.indexOf(entry);
-            if (at === -1)
-                return;
-            this.levels.splice(at, 1);
-            if (at < this.levels.length)
-                return;
-            const below = this.levels.at(-1);
-            if (below)
-                this.apply(below.level);
-            else
-                this.restore();
+            drop();
+            this.window.levels.apply();
         };
     }
-    /** Every level set and not yet put back, the one in force last. */
-    levels = [];
-    apply(level) {
-        this.current.set(level);
-        void this.native?.set(level);
-    }
     restore() {
-        // Everything set so far is put back, so a release still to come has nothing left to undo.
-        this.levels.length = 0;
-        void this.native
-            ?.restore()
-            .then(() => this.native?.get().then((level) => this.current.set(level)));
+        // This app's levels are put back, so a release still to come has nothing left to undo. Another
+        // app's stay: the screen is the runtime's.
+        this.window.levels.claims.drop(this.owner);
+        if (untracked(this.window.levels.claims.all).length > 0) {
+            this.window.levels.apply();
+            return;
+        }
+        this.window.levels.clear();
+        this.window.restore();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.2.0", ngImport: i0, type: Brightness, deps: [], target: i0.ɵɵFactoryTarget.Service });
     static ɵprov = i0.ɵɵngDeclareService({ minVersion: "22.0.0", version: "22.2.0", ngImport: i0, type: Brightness });
@@ -83,4 +79,30 @@ export class Brightness {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.2.0", ngImport: i0, type: Brightness, decorators: [{
             type: Service
         }], ctorParameters: () => [] });
+/** The screen's level, as every app on one module sets it. */
+class BrightnessWindow {
+    current = signal(1, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "current" }] : /* istanbul ignore next */ []));
+    levels;
+    native;
+    constructor(native) {
+        this.native = native;
+        this.levels = new TopClaim((level) => {
+            this.current.set(level);
+            void this.native?.set(level);
+        }, () => this.restore(), present(native)?.onWindowFront);
+        // What the screen shows, unless a level was set before the platform answered.
+        void present(native)
+            ?.get()
+            .then((level) => {
+            if (untracked(this.levels.claims.all).length === 0)
+                this.current.set(level);
+        }, () => { });
+    }
+    restore() {
+        void this.native
+            ?.restore()
+            .then(() => this.native?.get().then((level) => this.current.set(level)));
+    }
+}
 //# sourceMappingURL=brightness.js.map

package/dist/brightness.js.map

@@ -1 +1 @@
-{"version":3,"file":"brightness.js","sourceRoot":"","sources":["../src/brightness.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `Brightness`, bound to `expo-brightness`.\n *\n * For the screens that have a reason to change it: a boarding pass, a QR code.\n *\n * The app's own brightness only. The system one is a global setting an app can leave changed\n * after it is gone, and needs a permission on Android - a decision to make deliberately against\n * Expo's own API rather than to reach through a convenience here.\n */\nimport { InjectionToken, Service, inject, signal, type Signal } from '@angular/core';\nimport { expoModule, present } from './native.ts';\n\nexport interface NativeBrightness {\n  get(): Promise<number>;\n  set(level: number): Promise<void>;\n  restore(): Promise<void>;\n}\n\n@Service()\nexport class Brightness {\n  /** Overridden in a test to watch the level without changing a screen. */\n  static readonly SOURCE = new InjectionToken<NativeBrightness | null>(\n    'angular-native.brightnessSource',\n    {\n      factory: () => {\n        const expo = expoModule(\n          'expo-brightness',\n          () => require('expo-brightness') as typeof import('expo-brightness'),\n        );\n        if (!expo) return null;\n        // Missing from the build: the stand-in, to say so when it is used.\n        if (!present(expo)) return expo as never;\n        return {\n          get: () => expo.getBrightnessAsync(),\n          set: (level) => expo.setBrightnessAsync(level),\n          restore: () => expo.restoreSystemBrightnessAsync(),\n        };\n      },\n    },\n  );\n\n  private readonly native = inject(Brightness.SOURCE);\n  private readonly current = signal(1);\n\n  /** Nought to one. One until the platform answers, since that is what a screen already shows. */\n  readonly level: Signal<number> = this.current.asReadonly();\n\n  constructor() {\n    void present(this.native)\n      ?.get()\n      .then(\n        (level) => this.current.set(level),\n        () => {},\n      );\n  }\n\n  /**\n   * Set it, and return the function that puts it back.\n   *\n   * Always paired, because the alternative is an app that leaves the screen at full brightness\n   * after the boarding pass has been shown - which the user experiences as a battery fault.\n   */\n  set(level: number): () => void {\n    const clamped = Math.min(1, Math.max(0, level));\n    // A stack, as the status bar's is: a screen pushed over one that set a level of its own puts\n    // back the level beneath it, not the system's, when it goes.\n    const entry = { level: clamped };\n    this.levels.push(entry);\n    this.apply(clamped);\n    return () => {\n      const at = this.levels.indexOf(entry);\n      if (at === -1) return;\n      this.levels.splice(at, 1);\n      if (at < this.levels.length) return;\n      const below = this.levels.at(-1);\n      if (below) this.apply(below.level);\n      else this.restore();\n    };\n  }\n\n  /** Every level set and not yet put back, the one in force last. */\n  private readonly levels: { readonly level: number }[] = [];\n\n  private apply(level: number): void {\n    this.current.set(level);\n    void this.native?.set(level);\n  }\n\n  restore(): void {\n    // Everything set so far is put back, so a release still to come has nothing left to undo.\n    this.levels.length = 0;\n    void this.native\n      ?.restore()\n      .then(() => this.native?.get().then((level) => this.current.set(level)));\n  }\n}\n"]}
+{"version":3,"file":"brightness.js","sourceRoot":"","sources":["../src/brightness.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EACL,UAAU,EACV,cAAc,EACd,OAAO,EACP,MAAM,EACN,MAAM,EAEN,SAAS,GAEV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;;AAWlD,MAAM,OAAO,UAAU;IACrB,yEAAyE;IACzE,MAAM,CAAU,MAAM,GAAG,IAAI,cAAc,CACzC,iCAAiC,EACjC;QACE,OAAO,EAAE,GAAG,EAAE;YACZ,MAAM,IAAI,GAAG,UAAU,CACrB,iBAAiB,EACjB,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAqC,CACrE,CAAC;YACF,IAAI,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC;YACvB,mEAAmE;YACnE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAa,CAAC;YACzC,wEAAwE;YACxE,OAAO,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;gBACjC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBACpC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;gBAC9C,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,4BAA4B,EAAE;gBAClD,aAAa;aACd,CAAC,CAAC,CAAC;QACN,CAAC;KACF,CACF,CAAC;IAEe,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACpD,qEAAqE;IACpD,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/C,kDAAkD;IACjC,KAAK,GAAG,EAAE,CAAC;IAE5B,gGAAgG;IACvF,KAAK,GAAmB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;IAE3D;QACE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;YAChC,2FAA2F;YAC3F,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,KAAa;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAChD,6FAA6F;QAC7F,6DAA6D;QAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC3B,OAAO,GAAG,EAAE;YACV,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,+FAA+F;QAC/F,2CAA2C;QAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;uGAtEU,UAAU;wGAAV,UAAU;;2FAAV,UAAU;kBADtB,OAAO;;AA0ER,8DAA8D;AAC9D,MAAM,gBAAgB;IACX,OAAO,GAA2B,MAAM,CAAC,CAAC;gFAAC,CAAC;IAC5C,MAAM,CAAmB;IACjB,MAAM,CAA0B;IAEjD,YAAY,MAA+B;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,CACxB,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACxB,KAAK,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,EACD,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EACpB,OAAO,CAAC,MAAM,CAAC,EAAE,aAAa,CAC/B,CAAC;QACF,8EAA8E;QAC9E,KAAK,OAAO,CAAC,MAAM,CAAC;YAClB,EAAE,GAAG,EAAE;aACN,IAAI,CACH,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC;gBAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9E,CAAC,EACD,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;IACN,CAAC;IAED,OAAO;QACL,KAAK,IAAI,CAAC,MAAM;YACd,EAAE,OAAO,EAAE;aACV,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF","sourcesContent":["/**\n * `Brightness`, bound to `expo-brightness`.\n *\n * For the screens that have a reason to change it: a boarding pass, a QR code.\n *\n * The app's own brightness only. The system one is a global setting an app can leave changed\n * after it is gone, and needs a permission on Android - a decision to make deliberately against\n * Expo's own API rather than to reach through a convenience here.\n */\nimport {\n  DestroyRef,\n  InjectionToken,\n  Service,\n  inject,\n  signal,\n  type Signal,\n  untracked,\n  type WritableSignal,\n} from '@angular/core';\nimport { TopClaim, onWindowFront, sharedBySource } from '@ng-native/device';\nimport { expoModule, present } from './native.ts';\n\nexport interface NativeBrightness {\n  get(): Promise<number>;\n  set(level: number): Promise<void>;\n  restore(): Promise<void>;\n  /** Calls `listener` when a window comes to the front, to be given the level again. */\n  onWindowFront?(listener: () => void): () => void;\n}\n\n@Service()\nexport class Brightness {\n  /** Overridden in a test to watch the level without changing a screen. */\n  static readonly SOURCE = new InjectionToken<NativeBrightness | null>(\n    'angular-native.brightnessSource',\n    {\n      factory: () => {\n        const expo = expoModule(\n          'expo-brightness',\n          () => require('expo-brightness') as typeof import('expo-brightness'),\n        );\n        if (!expo) return null;\n        // Missing from the build: the stand-in, to say so when it is used.\n        if (!present(expo)) return expo as never;\n        // One per module, so every app the runtime mounts sets the same screen.\n        return sharedBySource(expo, () => ({\n          get: () => expo.getBrightnessAsync(),\n          set: (level) => expo.setBrightnessAsync(level),\n          restore: () => expo.restoreSystemBrightnessAsync(),\n          onWindowFront,\n        }));\n      },\n    },\n  );\n\n  private readonly native = inject(Brightness.SOURCE);\n  /** Every app's levels: the screen is the runtime's, not an app's. */\n  private readonly window = sharedBySource(this.native, () => new BrightnessWindow(this.native));\n  private readonly current = this.window.current;\n  /** This app, among the apps setting the level. */\n  private readonly owner = {};\n\n  /** Nought to one. One until the platform answers, since that is what a screen already shows. */\n  readonly level: Signal<number> = this.current.asReadonly();\n\n  constructor() {\n    inject(DestroyRef).onDestroy(() => {\n      // An app that goes takes its levels with it, and leaves the screen to the apps still here.\n      this.window.levels.claims.drop(this.owner);\n      this.window.levels.apply();\n    });\n  }\n\n  /**\n   * Set it, and return the function that puts it back.\n   *\n   * Always paired, because the alternative is an app that leaves the screen at full brightness\n   * after the boarding pass has been shown - which the user experiences as a battery fault.\n   */\n  set(level: number): () => void {\n    const clamped = Math.min(1, Math.max(0, level));\n    // A stack, as the status bar's is: a screen pushed over one that set a level of its own puts\n    // back the level beneath it, not the system's, when it goes.\n    const drop = this.window.levels.claims.push(this.owner, clamped);\n    this.window.levels.apply();\n    return () => {\n      drop();\n      this.window.levels.apply();\n    };\n  }\n\n  restore(): void {\n    // This app's levels are put back, so a release still to come has nothing left to undo. Another\n    // app's stay: the screen is the runtime's.\n    this.window.levels.claims.drop(this.owner);\n    if (untracked(this.window.levels.claims.all).length > 0) {\n      this.window.levels.apply();\n      return;\n    }\n    this.window.levels.clear();\n    this.window.restore();\n  }\n}\n\n/** The screen's level, as every app on one module sets it. */\nclass BrightnessWindow {\n  readonly current: WritableSignal<number> = signal(1);\n  readonly levels: TopClaim<number>;\n  private readonly native: NativeBrightness | null;\n\n  constructor(native: NativeBrightness | null) {\n    this.native = native;\n    this.levels = new TopClaim(\n      (level) => {\n        this.current.set(level);\n        void this.native?.set(level);\n      },\n      () => this.restore(),\n      present(native)?.onWindowFront,\n    );\n    // What the screen shows, unless a level was set before the platform answered.\n    void present(native)\n      ?.get()\n      .then(\n        (level) => {\n          if (untracked(this.levels.claims.all).length === 0) this.current.set(level);\n        },\n        () => {},\n      );\n  }\n\n  restore(): void {\n    void this.native\n      ?.restore()\n      .then(() => this.native?.get().then((level) => this.current.set(level)));\n  }\n}\n"]}

package/dist/expo-ui-components.js

@@ -503,7 +503,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.2.0", ngImpor
  */
 function listen(event, handle) {
     const node = inject(ElementRef).nativeElement;
-    const engine = node.host ?? inject(HostEngine);
+    const engine = node.engine ?? inject(HostEngine);
     const stop = engine.setEventListener(node, event, (raw) => handle(raw?.nativeEvent ?? {}));
     inject(DestroyRef).onDestroy(stop);
 }
@@ -1686,7 +1686,7 @@ const HALF_AND_FULL = ['medium', 'large'];
 /** The window's width as the engine knows it, or undefined before the platform has said. */
 function windowWidth() {
     const node = inject(ElementRef).nativeElement;
-    const engine = (node.host ?? inject(HostEngine));
+    const engine = (node.engine ?? inject(HostEngine));
     const read = () => engine.viewport?.width || undefined;
     const width = signal(read(), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "width" }] : /* istanbul ignore next */ []));