@5stones/react-native-audio-browser 0.2.0 → 0.3.0

package/nitrogen/generated/shared/c++/TransformableRequestConfig.hpp

@@ -2,7 +2,7 @@
 /// TransformableRequestConfig.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `RequestConfig` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct RequestConfig; }
@@ -41,7 +46,7 @@ namespace margelo::nitro::audiobrowser {
   /**
    * A struct which can be represented as a JavaScript object (TransformableRequestConfig).
    */
-  struct TransformableRequestConfig {
+  struct TransformableRequestConfig final {
   public:
     std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<RequestConfig>>>>(const RequestConfig& /* request */, const std::optional<std::unordered_map<std::string, std::string>>& /* routeParams */)>> transform     SWIFT_PRIVATE;
     std::optional<HttpMethod> method     SWIFT_PRIVATE;
@@ -56,6 +61,9 @@ namespace margelo::nitro::audiobrowser {
   public:
     TransformableRequestConfig() = default;
     explicit TransformableRequestConfig(std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<RequestConfig>>>>(const RequestConfig& /* request */, const std::optional<std::unordered_map<std::string, std::string>>& /* routeParams */)>> transform, std::optional<HttpMethod> method, std::optional<std::string> path, std::optional<std::string> baseUrl, std::optional<std::unordered_map<std::string, std::string>> headers, std::optional<std::unordered_map<std::string, std::string>> query, std::optional<std::string> body, std::optional<std::string> contentType, std::optional<std::string> userAgent): transform(transform), method(method), path(path), baseUrl(baseUrl), headers(headers), query(query), body(body), contentType(contentType), userAgent(userAgent) {}
+
+  public:
+    // TransformableRequestConfig is not equatable because these properties are not equatable: transform
   };
 
 } // namespace margelo::nitro::audiobrowser
@@ -68,28 +76,28 @@ namespace margelo::nitro {
     static inline margelo::nitro::audiobrowser::TransformableRequestConfig fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::audiobrowser::TransformableRequestConfig(
-        JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<margelo::nitro::audiobrowser::RequestConfig>>>>(const margelo::nitro::audiobrowser::RequestConfig&, const std::optional<std::unordered_map<std::string, std::string>>&)>>>::fromJSI(runtime, obj.getProperty(runtime, "transform")),
-        JSIConverter<std::optional<margelo::nitro::audiobrowser::HttpMethod>>::fromJSI(runtime, obj.getProperty(runtime, "method")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "path")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "baseUrl")),
-        JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "headers")),
-        JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "query")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "body")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "contentType")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "userAgent"))
+        JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<margelo::nitro::audiobrowser::RequestConfig>>>>(const margelo::nitro::audiobrowser::RequestConfig&, const std::optional<std::unordered_map<std::string, std::string>>&)>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "transform"))),
+        JSIConverter<std::optional<margelo::nitro::audiobrowser::HttpMethod>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "method"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "path"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "baseUrl"))),
+        JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "headers"))),
+        JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "query"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "body"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "contentType"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "userAgent")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::TransformableRequestConfig& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "transform", JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<margelo::nitro::audiobrowser::RequestConfig>>>>(const margelo::nitro::audiobrowser::RequestConfig&, const std::optional<std::unordered_map<std::string, std::string>>&)>>>::toJSI(runtime, arg.transform));
-      obj.setProperty(runtime, "method", JSIConverter<std::optional<margelo::nitro::audiobrowser::HttpMethod>>::toJSI(runtime, arg.method));
-      obj.setProperty(runtime, "path", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.path));
-      obj.setProperty(runtime, "baseUrl", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.baseUrl));
-      obj.setProperty(runtime, "headers", JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::toJSI(runtime, arg.headers));
-      obj.setProperty(runtime, "query", JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::toJSI(runtime, arg.query));
-      obj.setProperty(runtime, "body", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.body));
-      obj.setProperty(runtime, "contentType", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.contentType));
-      obj.setProperty(runtime, "userAgent", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.userAgent));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "transform"), JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<margelo::nitro::audiobrowser::RequestConfig>>>>(const margelo::nitro::audiobrowser::RequestConfig&, const std::optional<std::unordered_map<std::string, std::string>>&)>>>::toJSI(runtime, arg.transform));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "method"), JSIConverter<std::optional<margelo::nitro::audiobrowser::HttpMethod>>::toJSI(runtime, arg.method));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "path"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.path));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "baseUrl"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.baseUrl));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "headers"), JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::toJSI(runtime, arg.headers));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "query"), JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::toJSI(runtime, arg.query));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "body"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.body));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "contentType"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.contentType));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "userAgent"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.userAgent));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -100,15 +108,15 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<margelo::nitro::audiobrowser::RequestConfig>>>>(const margelo::nitro::audiobrowser::RequestConfig&, const std::optional<std::unordered_map<std::string, std::string>>&)>>>::canConvert(runtime, obj.getProperty(runtime, "transform"))) return false;
-      if (!JSIConverter<std::optional<margelo::nitro::audiobrowser::HttpMethod>>::canConvert(runtime, obj.getProperty(runtime, "method"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "path"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "baseUrl"))) return false;
-      if (!JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::canConvert(runtime, obj.getProperty(runtime, "headers"))) return false;
-      if (!JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::canConvert(runtime, obj.getProperty(runtime, "query"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "body"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "contentType"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "userAgent"))) return false;
+      if (!JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<margelo::nitro::audiobrowser::RequestConfig>>>>(const margelo::nitro::audiobrowser::RequestConfig&, const std::optional<std::unordered_map<std::string, std::string>>&)>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "transform")))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::audiobrowser::HttpMethod>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "method")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "path")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "baseUrl")))) return false;
+      if (!JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "headers")))) return false;
+      if (!JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "query")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "body")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "contentType")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "userAgent")))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/UpdateOptions.hpp

@@ -2,7 +2,7 @@
 /// UpdateOptions.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
 
 // Forward declaration of `AndroidUpdateOptions` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct AndroidUpdateOptions; }
@@ -40,7 +45,7 @@ namespace margelo::nitro::audiobrowser {
   /**
    * A struct which can be represented as a JavaScript object (UpdateOptions).
    */
-  struct UpdateOptions {
+  struct UpdateOptions final {
   public:
     std::optional<AndroidUpdateOptions> android     SWIFT_PRIVATE;
     std::optional<double> forwardJumpInterval     SWIFT_PRIVATE;
@@ -52,6 +57,9 @@ namespace margelo::nitro::audiobrowser {
   public:
     UpdateOptions() = default;
     explicit UpdateOptions(std::optional<AndroidUpdateOptions> android, std::optional<double> forwardJumpInterval, std::optional<double> backwardJumpInterval, std::optional<std::variant<nitro::NullType, double>> progressUpdateEventInterval, std::optional<PlayerCapabilities> capabilities, std::optional<std::vector<double>> iosPlaybackRates): android(android), forwardJumpInterval(forwardJumpInterval), backwardJumpInterval(backwardJumpInterval), progressUpdateEventInterval(progressUpdateEventInterval), capabilities(capabilities), iosPlaybackRates(iosPlaybackRates) {}
+
+  public:
+    friend bool operator==(const UpdateOptions& lhs, const UpdateOptions& rhs) = default;
   };
 
 } // namespace margelo::nitro::audiobrowser
@@ -64,22 +72,22 @@ namespace margelo::nitro {
     static inline margelo::nitro::audiobrowser::UpdateOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::audiobrowser::UpdateOptions(
-        JSIConverter<std::optional<margelo::nitro::audiobrowser::AndroidUpdateOptions>>::fromJSI(runtime, obj.getProperty(runtime, "android")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "forwardJumpInterval")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "backwardJumpInterval")),
-        JSIConverter<std::optional<std::variant<nitro::NullType, double>>>::fromJSI(runtime, obj.getProperty(runtime, "progressUpdateEventInterval")),
-        JSIConverter<std::optional<margelo::nitro::audiobrowser::PlayerCapabilities>>::fromJSI(runtime, obj.getProperty(runtime, "capabilities")),
-        JSIConverter<std::optional<std::vector<double>>>::fromJSI(runtime, obj.getProperty(runtime, "iosPlaybackRates"))
+        JSIConverter<std::optional<margelo::nitro::audiobrowser::AndroidUpdateOptions>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "android"))),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "forwardJumpInterval"))),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "backwardJumpInterval"))),
+        JSIConverter<std::optional<std::variant<nitro::NullType, double>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "progressUpdateEventInterval"))),
+        JSIConverter<std::optional<margelo::nitro::audiobrowser::PlayerCapabilities>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "capabilities"))),
+        JSIConverter<std::optional<std::vector<double>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "iosPlaybackRates")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::UpdateOptions& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "android", JSIConverter<std::optional<margelo::nitro::audiobrowser::AndroidUpdateOptions>>::toJSI(runtime, arg.android));
-      obj.setProperty(runtime, "forwardJumpInterval", JSIConverter<std::optional<double>>::toJSI(runtime, arg.forwardJumpInterval));
-      obj.setProperty(runtime, "backwardJumpInterval", JSIConverter<std::optional<double>>::toJSI(runtime, arg.backwardJumpInterval));
-      obj.setProperty(runtime, "progressUpdateEventInterval", JSIConverter<std::optional<std::variant<nitro::NullType, double>>>::toJSI(runtime, arg.progressUpdateEventInterval));
-      obj.setProperty(runtime, "capabilities", JSIConverter<std::optional<margelo::nitro::audiobrowser::PlayerCapabilities>>::toJSI(runtime, arg.capabilities));
-      obj.setProperty(runtime, "iosPlaybackRates", JSIConverter<std::optional<std::vector<double>>>::toJSI(runtime, arg.iosPlaybackRates));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "android"), JSIConverter<std::optional<margelo::nitro::audiobrowser::AndroidUpdateOptions>>::toJSI(runtime, arg.android));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "forwardJumpInterval"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.forwardJumpInterval));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "backwardJumpInterval"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.backwardJumpInterval));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "progressUpdateEventInterval"), JSIConverter<std::optional<std::variant<nitro::NullType, double>>>::toJSI(runtime, arg.progressUpdateEventInterval));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "capabilities"), JSIConverter<std::optional<margelo::nitro::audiobrowser::PlayerCapabilities>>::toJSI(runtime, arg.capabilities));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "iosPlaybackRates"), JSIConverter<std::optional<std::vector<double>>>::toJSI(runtime, arg.iosPlaybackRates));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -90,12 +98,12 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::optional<margelo::nitro::audiobrowser::AndroidUpdateOptions>>::canConvert(runtime, obj.getProperty(runtime, "android"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "forwardJumpInterval"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "backwardJumpInterval"))) return false;
-      if (!JSIConverter<std::optional<std::variant<nitro::NullType, double>>>::canConvert(runtime, obj.getProperty(runtime, "progressUpdateEventInterval"))) return false;
-      if (!JSIConverter<std::optional<margelo::nitro::audiobrowser::PlayerCapabilities>>::canConvert(runtime, obj.getProperty(runtime, "capabilities"))) return false;
-      if (!JSIConverter<std::optional<std::vector<double>>>::canConvert(runtime, obj.getProperty(runtime, "iosPlaybackRates"))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::audiobrowser::AndroidUpdateOptions>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "android")))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "forwardJumpInterval")))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "backwardJumpInterval")))) return false;
+      if (!JSIConverter<std::optional<std::variant<nitro::NullType, double>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "progressUpdateEventInterval")))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::audiobrowser::PlayerCapabilities>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "capabilities")))) return false;
+      if (!JSIConverter<std::optional<std::vector<double>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "iosPlaybackRates")))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@5stones/react-native-audio-browser",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "react-native-audio-browser is a react native package built with Nitro",
   "keywords": [
     "react-native",
@@ -64,19 +64,17 @@
     "ios:rebuild": "yarn workspace example-native ios:rebuild",
     "lint": "oxlint --fix",
     "release": "semantic-release",
-    "test": "jest",
+    "test": "vitest run",
     "types": "tsc --noEmit"
   },
   "devDependencies": {
     "@react-native-community/cli": "15.0.0-alpha.2",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/jest": "^29.5.12",
     "@types/react": "19.1.1",
     "conventional-changelog-conventionalcommits": "^9.1.0",
     "del-cli": "^5.1.0",
-    "jest": "^29.7.0",
-    "nitrogen": "^0.33.3",
+    "nitrogen": "0.35.0",
     "oxfmt": "^0.27.0",
     "oxlint": "^1.42.0",
     "oxlint-tsgolint": "^0.11.2",
@@ -85,11 +83,12 @@
     "react-native": "0.83.0",
     "react-native-builder-bob": "^0.37.0",
     "react-native-monorepo-config": "^0.3.1",
-    "react-native-nitro-modules": "0.33.3",
+    "react-native-nitro-modules": "0.35.0",
     "semantic-release": "^24.2.9",
     "shaka-player": "^4.15.4",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.46.0"
+    "typescript-eslint": "^8.46.0",
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "react": "*",

package/src/features/browser.ts

@@ -195,6 +195,7 @@ function toNativeConfig(
       config.search
     ),
     singleTrack: config.singleTrack,
+    handleTrackLoad: config.handleTrackLoad,
     androidControllerOfflineError: config.androidControllerOfflineError,
     carPlayUpNextButton: config.carPlayUpNextButton,
     carPlayNowPlayingButtons: config.carPlayNowPlayingButtons,

package/src/features/remoteControls.ts

@@ -4,7 +4,6 @@ import type {
   StarRating,
   ThumbsRating
 } from './rating'
-import type { Track } from '../types'
 import { nativeBrowser } from '../native'
 import { LazyNativeEmitter } from '../utils/LazyNativeEmitter'
 
@@ -67,18 +66,6 @@ export interface RemoteSkipEvent {
   index: number
 }
 
-/**
- * Remote load event, fired when a track is about to be loaded via navigateTrack.
- */
-export interface RemoteLoadEvent {
-  /** The track that will be loaded */
-  track: Track
-  /** The resolved queue of tracks */
-  queue: Track[]
-  /** The index of the track in the queue */
-  startIndex: number
-}
-
 // MARK: - Default Handlers
 
 // Install remote control handlers with default behavior immediately when module loads
@@ -234,17 +221,6 @@ export function handleRemoteJumpBackward(
   nativeBrowser.handleRemoteJumpBackward = callback
 }
 
-/**
- * Sets a custom handler for remote load events, overriding the default track loading behavior.
- * When set, navigateTrack() will call this handler instead of auto-loading/playing the track.
- * @param callback - Called with the track, queue, and startIndex. Pass undefined to restore default behavior.
- */
-export function handleRemoteLoad(
-  callback: ((event: RemoteLoadEvent) => void) | undefined
-) {
-  nativeBrowser.handleRemoteLoad = callback
-}
-
 // MARK: - Event Callbacks (for listening/debugging only)
 //
 // Use these functions when you want to LISTEN to remote control events without overriding
@@ -272,17 +248,6 @@ export const onRemoteJumpForward =
     (cb) => (nativeBrowser.onRemoteJumpForward = cb)
   )
 
-/**
- * Subscribes to remote load events.
- * Fires whenever a track is about to be loaded via navigateTrack(),
- * regardless of whether handleRemoteLoad is set.
- * @param callback - Called with the track, queue, and startIndex
- * @returns Cleanup function to unsubscribe
- */
-export const onRemoteLoad = LazyNativeEmitter.emitterize<RemoteLoadEvent>(
-  (cb) => (nativeBrowser.onRemoteLoad = cb)
-)
-
 /**
  * Subscribes to remote next events.
  * @param callback - Called when the user presses the next track button

package/src/specs/audio-browser.nitro.ts

@@ -43,7 +43,6 @@ import type {
   RemoteJumpForwardEvent,
   RemotePlayIdEvent,
   RemotePlaySearchEvent,
-  RemoteLoadEvent,
   RemoteSeekEvent,
   RemoteSetRatingEvent,
   RemoteSkipEvent
@@ -139,7 +138,6 @@ export interface AudioBrowser extends HybridObject<{
   onRemoteJumpBackward: (event: RemoteJumpBackwardEvent) => void
   onRemoteJumpForward: (event: RemoteJumpForwardEvent) => void
   onRemoteLike: () => void
-  onRemoteLoad: (event: RemoteLoadEvent) => void
   onRemoteNext: () => void
   onRemotePause: () => void
   onRemotePlay: () => void
@@ -162,7 +160,6 @@ export interface AudioBrowser extends HybridObject<{
     | undefined
   handleRemoteJumpForward: ((event: RemoteJumpForwardEvent) => void) | undefined
   handleRemoteLike: (() => void) | undefined
-  handleRemoteLoad: ((event: RemoteLoadEvent) => void) | undefined
   handleRemoteNext: (() => void) | undefined
   handleRemotePause: (() => void) | undefined
   handleRemotePlay: (() => void) | undefined

package/src/types/browser-native.ts

@@ -11,6 +11,7 @@ import type {
   BrowserSourceCallback,
   CarPlayNowPlayingButton,
   FormatNavigationErrorCallback,
+  HandleTrackLoadCallback,
   MediaRequestConfig,
   SearchSourceCallback,
   TransformableRequestConfig
@@ -57,6 +58,7 @@ export interface NativeBrowserConfiguration {
 
   // Behavior
   singleTrack?: boolean
+  handleTrackLoad?: HandleTrackLoadCallback
   androidControllerOfflineError?: boolean
 
   // CarPlay options

package/src/types/browser-nodes.ts

@@ -1,4 +1,4 @@
-import type { HttpMethod } from './browser'
+import type { CarPlaySiriListButtonPosition, HttpMethod } from './browser'
 
 export type TrackStyle = 'list' | 'grid'
 
@@ -29,6 +29,17 @@ export interface ImageSource {
 //   children: Track
 // }
 
+export interface ImageRowItem {
+  /** Navigation path. Tapping this thumbnail navigates to this URL. */
+  url?: string
+  /** Artwork URL for the thumbnail image. */
+  artwork?: string
+  /** Output only — populated by the artwork transform pipeline. */
+  readonly artworkSource?: ImageSource
+  /** Title of this item. Used for identification and accessibility. */
+  title: string
+}
+
 export interface Track {
   /**
    * Navigation path. When present, this track is a container (tab, album, playlist, folder)
@@ -55,6 +66,13 @@ export interface Track {
    * The artwork URL is also returned by native in the `artworkSource` property
    * for use in an `<Image>` component, which will contain the transformed version
    * if `artwork` configuration is set in `BrowserConfiguration` or a route.
+   *
+   * **iOS:** supports {@link https://developer.apple.com/sf-symbols/ | SF Symbols}
+   * with the `sf:` prefix and optional color params:
+   * `sf:heart.fill?bg=#FF0090&fg=#fff`. `bg` sets the background color
+   * (transparent if omitted), `fg` sets the symbol color (black if omitted).
+   * On CarPlay, SF Symbols without explicit colors automatically adapt to
+   * light/dark mode.
    */
   artwork?: string
 
@@ -144,6 +162,24 @@ export interface Track {
    * in iOS now playing interfaces.
    */
   live?: boolean
+
+  /**
+   * When present, renders this track as a horizontal row of tappable artwork
+   * thumbnails instead of a standard list item.
+   *
+   * - Track.title → row header text
+   * - Track.url → navigated when header is tapped (optional)
+   * - Each ImageRowItem → one thumbnail in the horizontal row
+   *
+   * On CarPlay: maps to CPListImageRowItem. Limits visible images by display
+   * width (~4-5). Excess silently truncated.
+   *
+   * On Android Auto: ignored; the parent Track renders as a regular
+   * browsable item using its own artwork/title/url.
+   *
+   * On app side: consumable by React Native UI for horizontal thumbnail layouts.
+   */
+  imageRow?: ImageRowItem[]
 }
 
 /**
@@ -171,4 +207,16 @@ export interface ResolvedTrack extends Track {
    * Undefined for leaf tracks (individual songs without children).
    */
   children?: Track[]
+
+  /**
+   * Shows the "Ask Siri to Play Audio" assistant cell on the CarPlay list template
+   * for this content. Requires an Intents Extension to be configured in the app.
+   *
+   * - `'top'`: Shows at the top of the list
+   * - `'bottom'`: Shows at the bottom of the list
+   *
+   * @see {@link https://audiobrowser.dev/guide/carplay#siri-voice-search | CarPlay Siri Voice Search guide}
+   * @platform ios
+   */
+  carPlaySiriListButton?: CarPlaySiriListButtonPosition
 }

package/src/types/browser.ts

@@ -1,6 +1,26 @@
 import type { NavigationError } from '../features/errors'
 import type { ResolvedTrack, Track } from './browser-nodes.ts'
 
+/**
+ * Event fired when a track is about to be loaded via navigateTrack.
+ */
+export interface TrackLoadEvent {
+  /** The track that will be loaded */
+  track: Track
+  /** The resolved queue of tracks */
+  queue: Track[]
+  /** The index of the track in the queue */
+  startIndex: number
+}
+
+/**
+ * Callback for handling track load events.
+ * When set on BrowserConfiguration, navigateTrack() will call this handler
+ * instead of auto-loading/playing the track. The native side awaits completion
+ * before proceeding (e.g., showing Now Playing in CarPlay).
+ */
+export type HandleTrackLoadCallback = (event: TrackLoadEvent) => Promise<void>
+
 export type BrowserSourceCallbackParam = {
   path: string
   routeParams?: Record<string, string>
@@ -650,6 +670,15 @@ export type BrowserConfiguration = {
    */
   singleTrack?: boolean
 
+  /**
+   * Custom handler for track load events.
+   * When set, navigateTrack() will call this handler instead of auto-loading/playing the track.
+   * Pass undefined to restore default behavior.
+   *
+   * @param event - The track load event containing the track, queue, and startIndex
+   */
+  handleTrackLoad?: HandleTrackLoadCallback
+
   /**
    * Show an offline error message in external controllers (Android Auto, Wear OS, Automotive)
    * when network connectivity is lost.
@@ -728,6 +757,13 @@ export type CarPlayNowPlayingButton =
   | 'favorite'
   | 'playback-rate'
 
+/**
+ * Position of the "Ask Siri to Play Audio" assistant cell on a CarPlay list template.
+ *
+ * @platform ios
+ */
+export type CarPlaySiriListButtonPosition = 'top' | 'bottom'
+
 /**
  * Formatted navigation error for display in UI.
  * Used by CarPlay/Android Auto and available via `useFormattedNavigationError()` for app UI.

package/src/web/NativeAudioBrowser.ts

@@ -17,7 +17,6 @@ import type {
   PlaybackPlayWhenReadyChangedEvent,
   RemoteJumpBackwardEvent,
   RemoteJumpForwardEvent,
-  RemoteLoadEvent,
   RemotePlayIdEvent,
   RemotePlaySearchEvent,
   RemoteSeekEvent,
@@ -41,7 +40,7 @@ import type {
   AudioBrowser as AudioBrowserSpec,
   IosOutput
 } from '../specs/audio-browser.nitro'
-import type { ResolvedTrack, Track } from '../types'
+import type { ResolvedTrack, Track, TrackLoadEvent } from '../types'
 import type { NativeBrowserConfiguration } from '../types/browser-native'
 import { BrowserManager } from './browser/BrowserManager'
 import { FavoriteManager } from './browser/FavoriteManager'
@@ -163,7 +162,6 @@ export class NativeAudioBrowser
   onRemoteJumpBackward: (event: RemoteJumpBackwardEvent) => void = () => {}
   onRemoteJumpForward: (event: RemoteJumpForwardEvent) => void = () => {}
   onRemoteLike: () => void = () => {}
-  onRemoteLoad: (event: RemoteLoadEvent) => void = () => {}
   onRemoteNext: () => void = () => {}
   onRemotePause: () => void = () => {}
   onRemotePlay: () => void = () => {}
@@ -198,7 +196,6 @@ export class NativeAudioBrowser
     | ((event: RemoteJumpForwardEvent) => void)
     | undefined = undefined
   handleRemoteLike: (() => void) | undefined = undefined
-  handleRemoteLoad: ((event: RemoteLoadEvent) => void) | undefined = undefined
   handleRemoteNext: (() => void) | undefined = undefined
   handleRemotePause: (() => void) | undefined = undefined
   handleRemotePlay: (() => void) | undefined = undefined
@@ -353,25 +350,23 @@ export class NativeAudioBrowser
   }
 
   /**
-   * Centralizes handleRemoteLoad interception logic.
-   * If handleRemoteLoad is set, calls it (intercepted). Otherwise runs defaultBehavior.
-   * Always fires onRemoteLoad afterward.
+   * Centralizes handleTrackLoad interception logic.
+   * If handleTrackLoad is set on configuration, calls it (intercepted). Otherwise runs defaultBehavior.
    *
    * @returns true if the handler intercepted, false if defaultBehavior ran
    */
-  private handleLoad(
+  private async handleLoad(
     track: Track, queue: Track[], startIndex: number,
     defaultBehavior: () => void
-  ): boolean {
-    const event: RemoteLoadEvent = { track, queue, startIndex }
-    const handled = !!this.handleRemoteLoad
-    if (this.handleRemoteLoad) {
-      this.handleRemoteLoad(event)
-    } else {
-      defaultBehavior()
+  ): Promise<boolean> {
+    const handler = this.configuration.handleTrackLoad
+    if (handler) {
+      const event: TrackLoadEvent = { track, queue, startIndex }
+      await handler(event)
+      return true
     }
-    this.onRemoteLoad(event)
-    return handled
+    defaultBehavior()
+    return false
   }
 
   /**
@@ -382,10 +377,10 @@ export class NativeAudioBrowser
    * @param parentPath The parent path to check against queueSourcePath
    * @returns true if successfully skipped to existing track, false otherwise
    */
-  private trySkipToExistingQueueTrack(
+  private async trySkipToExistingQueueTrack(
     trackId: string,
     parentPath: string
-  ): boolean {
+  ): Promise<boolean> {
     if (parentPath !== this.browserManager.queueSourcePath) {
       return false
     }
@@ -397,7 +392,7 @@ export class NativeAudioBrowser
       return false
     }
 
-    this.handleLoad(queue[index]!, queue, index, () => {
+    await this.handleLoad(queue[index]!, queue, index, () => {
       this.skip(index)
       this.play()
     })
@@ -421,7 +416,7 @@ export class NativeAudioBrowser
       return false
     }
 
-    this.handleLoad(track, result.tracks, result.startIndex, () => {
+    await this.handleLoad(track, result.tracks, result.startIndex, () => {
       this.setQueue(result.tracks, result.startIndex)
     })
     return true
@@ -442,7 +437,7 @@ export class NativeAudioBrowser
         const trackId = BrowserPathHelper.extractTrackId(url)
 
         // Optimization: skip to track if already in current queue
-        if (trackId && this.trySkipToExistingQueueTrack(trackId, parentPath)) {
+        if (trackId && await this.trySkipToExistingQueueTrack(trackId, parentPath)) {
           return
         }
 
@@ -452,7 +447,7 @@ export class NativeAudioBrowser
         }
 
         // Fallback: load single track if expansion fails
-        this.handleLoad(track, [track], 0, () => this.load(track))
+        await this.handleLoad(track, [track], 0, () => this.load(track))
         return
       }
 
@@ -466,7 +461,7 @@ export class NativeAudioBrowser
 
       // Handle playable track (has src but no URL)
       if (track.src) {
-        this.handleLoad(track, [track], 0, () => this.load(track))
+        await this.handleLoad(track, [track], 0, () => this.load(track))
         return
       }