refactor: rename assetsHandled

rive-app · Feb 4, 2025 · 56d2832 · 56d2832
1 parent 0af9ec1
commit 56d2832
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/android/src/main/java/com/rivereactnative/RiveReactNativeView.kt b/android/src/main/java/com/rivereactnative/RiveReactNativeView.kt
@@ -85,7 +85,7 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
   private var layoutScaleFactor: Float? = null
   private var alignment: Alignment = Alignment.CENTER
   private var autoplay: Boolean = false
-  private var assetsHandled: ReadableMap? = null
+  private var referencedAssets: ReadableMap? = null
   private var shouldBeReloaded = true
   private var exceptionManager: ExceptionsManagerModule? = null
   private var isUserHandlingErrors = false
@@ -190,7 +190,7 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
   private fun clearReferences() {
     riveAnimationView = null
     exceptionManager = null
-    assetsHandled = null
+    referencedAssets = null
   }
 
   fun onPlay(animationName: String, isStateMachine: Boolean = false) {
@@ -476,7 +476,7 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
 
   private fun reloadIfNeeded() {
     if (shouldBeReloaded) {
-      val assetStore = assetsHandled?.let {
+      val assetStore = referencedAssets?.let {
         RiveReactNativeAssetStore(
           it, loadAssetHandler = ::loadAsset
         )
@@ -549,8 +549,8 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
     shouldBeReloaded = true
   }
 
-  fun setAssetsHandled(assetsHandled: ReadableMap?) {
-    this.assetsHandled = assetsHandled;
+  fun setReferencedAssets(referencedAssets: ReadableMap?) {
+    this.referencedAssets = referencedAssets;
     shouldBeReloaded = true;
   }
 
@@ -777,10 +777,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
 typealias LoadAssetHandler = (source: ReadableMap, asset: FileAsset) -> Unit
 
 private class RiveReactNativeAssetStore(
-  private val assetsHandled: ReadableMap, private val loadAssetHandler: LoadAssetHandler
+  private val referencedAssets: ReadableMap, private val loadAssetHandler: LoadAssetHandler
 ) : FileAssetLoader() {
   override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean {
-    val assetData = assetsHandled.getMap(asset.uniqueFilename.substringBeforeLast("."))
+    val assetData = referencedAssets.getMap(asset.uniqueFilename.substringBeforeLast("."))
 
     val source = assetData?.getMap("source") ?: return false // Do not handle the asset.
 

diff --git a/android/src/main/java/com/rivereactnative/RiveReactNativeViewManager.kt b/android/src/main/java/com/rivereactnative/RiveReactNativeViewManager.kt
@@ -219,9 +219,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
     view.setAnimationName(animationName)
   }
 
-  @ReactProp(name = "assetsHandled")
-  fun setAssetsHandled(view: RiveReactNativeView, source: ReadableMap?) {
-    view.setAssetsHandled(source)
+  @ReactProp(name = "referencedAssets")
+  fun setReferencedAssets(view: RiveReactNativeView, source: ReadableMap?) {
+    view.setReferencedAssets(source)
   }
 
   @ReactProp(name = "stateMachineName")

diff --git a/example/src/OutOfBandAssets.tsx b/example/src/OutOfBandAssets.tsx
@@ -11,7 +11,7 @@ export default function StateMachine() {
           fit={Fit.Contain}
           style={styles.box}
           stateMachineName="State Machine 1"
-          // You can use the `assetsHandled` prop to load in external assets from a URI
+          // You can use the `referencedAssets` prop to load in external assets from a URI
           // or bundled asset on the native platform (iOS and Android)
           // or as a source loaded directly from JavaScript.
           //
@@ -22,7 +22,7 @@ export default function StateMachine() {
           //
           // The key of the map is the unique asset identifier (as exported in the Editor),
           // which is a combination of the asset name and its unique identifier.
-          assetsHandled={{
+          referencedAssets={{
             'Inter-594377': {
               source: require('./assets/Inter-594377.ttf'),
               // source: {

diff --git a/ios/RiveReactNativeView.swift b/ios/RiveReactNativeView.swift
@@ -56,7 +56,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
 
     @objc var artboardName: String?
 
-    @objc var assetsHandled: NSDictionary?
+    @objc var referencedAssets: NSDictionary?
     {
         didSet {
             requiresLocalResourceReconfigure = true;
@@ -108,7 +108,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
     }
 
     override func didSetProps(_ changedProps: [String]!) {
-        if (changedProps.contains("url") || changedProps.contains("resourceName") || changedProps.contains("artboardName") || changedProps.contains("animationName") || changedProps.contains("stateMachineName") || changedProps.contains("assetsHandled")) {
+        if (changedProps.contains("url") || changedProps.contains("resourceName") || changedProps.contains("artboardName") || changedProps.contains("animationName") || changedProps.contains("stateMachineName") || changedProps.contains("referencedAssets")) {
             reloadView()
         }
 
@@ -213,7 +213,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
     }
 
     private func customLoader(asset: RiveFileAsset, data: Data, factory: RiveFactory) -> Bool {
-        guard let assetData = assetsHandled?[asset.uniqueName()] as? NSDictionary else {
+        guard let assetData = referencedAssets?[asset.uniqueName()] as? NSDictionary else {
             return false
         }
 

diff --git a/ios/RiveReactNativeViewManager.m b/ios/RiveReactNativeViewManager.m
@@ -10,7 +10,7 @@ @interface RCT_EXTERN_MODULE(RiveReactNativeViewManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(alignment, NSString)
 RCT_EXPORT_VIEW_PROPERTY(autoplay, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(artboardName, NSString)
-RCT_EXPORT_VIEW_PROPERTY(assetsHandled, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(referencedAssets, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(animationName, NSString)
 RCT_EXPORT_VIEW_PROPERTY(stateMachineName, NSString)
 RCT_EXPORT_VIEW_PROPERTY(isUserHandlingErrors, BOOL)

diff --git a/src/Rive.tsx b/src/Rive.tsx
@@ -82,7 +82,7 @@ type RiveProps = {
   layoutScaleFactor?: number;
   alignment: Alignment;
   artboardName?: string;
-  assetsHandled?: FilesHandledMapping;
+  referencedAssets?: FilesHandledMapping;
   animationName?: string;
   stateMachineName?: string;
   ref: any;
@@ -111,7 +111,7 @@ type Props = {
   /**
    * @experimental This is an experimental feature and may change without a major version update (breaking change).
    */
-  assetsHandled?: FilesHandledMapping;
+  referencedAssets?: FilesHandledMapping;
   animationName?: string;
   stateMachineName?: string;
   autoplay?: boolean;
@@ -139,7 +139,7 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
       fit = Fit.Contain,
       layoutScaleFactor,
       artboardName,
-      assetsHandled: assetsHandled,
+      referencedAssets: referencedAssets,
       animationName,
       stateMachineName,
       testID,
@@ -445,7 +445,7 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
     }
 
     const convertedAssetHandledSources =
-      transformFilesHandledMapping(assetsHandled);
+      transformFilesHandledMapping(referencedAssets);
 
     return (
       <View style={[styles.container, style]} ref={ref as any} testID={testID}>
@@ -476,7 +476,7 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
             onError={onErrorHandler}
             alignment={alignment}
             artboardName={artboardName}
-            assetsHandled={convertedAssetHandledSources}
+            referencedAssets={convertedAssetHandledSources}
             animationName={animationName}
             stateMachineName={stateMachineName}
           />