Skip to content

Commit 56d2832

Browse files
committed
refactor: rename assetsHandled
1 parent 0af9ec1 commit 56d2832

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

android/src/main/java/com/rivereactnative/RiveReactNativeView.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
8585
private var layoutScaleFactor: Float? = null
8686
private var alignment: Alignment = Alignment.CENTER
8787
private var autoplay: Boolean = false
88-
private var assetsHandled: ReadableMap? = null
88+
private var referencedAssets: ReadableMap? = null
8989
private var shouldBeReloaded = true
9090
private var exceptionManager: ExceptionsManagerModule? = null
9191
private var isUserHandlingErrors = false
@@ -190,7 +190,7 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
190190
private fun clearReferences() {
191191
riveAnimationView = null
192192
exceptionManager = null
193-
assetsHandled = null
193+
referencedAssets = null
194194
}
195195

196196
fun onPlay(animationName: String, isStateMachine: Boolean = false) {
@@ -476,7 +476,7 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
476476

477477
private fun reloadIfNeeded() {
478478
if (shouldBeReloaded) {
479-
val assetStore = assetsHandled?.let {
479+
val assetStore = referencedAssets?.let {
480480
RiveReactNativeAssetStore(
481481
it, loadAssetHandler = ::loadAsset
482482
)
@@ -549,8 +549,8 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
549549
shouldBeReloaded = true
550550
}
551551

552-
fun setAssetsHandled(assetsHandled: ReadableMap?) {
553-
this.assetsHandled = assetsHandled;
552+
fun setReferencedAssets(referencedAssets: ReadableMap?) {
553+
this.referencedAssets = referencedAssets;
554554
shouldBeReloaded = true;
555555
}
556556

@@ -777,10 +777,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
777777
typealias LoadAssetHandler = (source: ReadableMap, asset: FileAsset) -> Unit
778778

779779
private class RiveReactNativeAssetStore(
780-
private val assetsHandled: ReadableMap, private val loadAssetHandler: LoadAssetHandler
780+
private val referencedAssets: ReadableMap, private val loadAssetHandler: LoadAssetHandler
781781
) : FileAssetLoader() {
782782
override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean {
783-
val assetData = assetsHandled.getMap(asset.uniqueFilename.substringBeforeLast("."))
783+
val assetData = referencedAssets.getMap(asset.uniqueFilename.substringBeforeLast("."))
784784

785785
val source = assetData?.getMap("source") ?: return false // Do not handle the asset.
786786

android/src/main/java/com/rivereactnative/RiveReactNativeViewManager.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
219219
view.setAnimationName(animationName)
220220
}
221221

222-
@ReactProp(name = "assetsHandled")
223-
fun setAssetsHandled(view: RiveReactNativeView, source: ReadableMap?) {
224-
view.setAssetsHandled(source)
222+
@ReactProp(name = "referencedAssets")
223+
fun setReferencedAssets(view: RiveReactNativeView, source: ReadableMap?) {
224+
view.setReferencedAssets(source)
225225
}
226226

227227
@ReactProp(name = "stateMachineName")

example/src/OutOfBandAssets.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function StateMachine() {
1111
fit={Fit.Contain}
1212
style={styles.box}
1313
stateMachineName="State Machine 1"
14-
// You can use the `assetsHandled` prop to load in external assets from a URI
14+
// You can use the `referencedAssets` prop to load in external assets from a URI
1515
// or bundled asset on the native platform (iOS and Android)
1616
// or as a source loaded directly from JavaScript.
1717
//
@@ -22,7 +22,7 @@ export default function StateMachine() {
2222
//
2323
// The key of the map is the unique asset identifier (as exported in the Editor),
2424
// which is a combination of the asset name and its unique identifier.
25-
assetsHandled={{
25+
referencedAssets={{
2626
'Inter-594377': {
2727
source: require('./assets/Inter-594377.ttf'),
2828
// source: {

ios/RiveReactNativeView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
5656

5757
@objc var artboardName: String?
5858

59-
@objc var assetsHandled: NSDictionary?
59+
@objc var referencedAssets: NSDictionary?
6060
{
6161
didSet {
6262
requiresLocalResourceReconfigure = true;
@@ -108,7 +108,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
108108
}
109109

110110
override func didSetProps(_ changedProps: [String]!) {
111-
if (changedProps.contains("url") || changedProps.contains("resourceName") || changedProps.contains("artboardName") || changedProps.contains("animationName") || changedProps.contains("stateMachineName") || changedProps.contains("assetsHandled")) {
111+
if (changedProps.contains("url") || changedProps.contains("resourceName") || changedProps.contains("artboardName") || changedProps.contains("animationName") || changedProps.contains("stateMachineName") || changedProps.contains("referencedAssets")) {
112112
reloadView()
113113
}
114114

@@ -213,7 +213,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
213213
}
214214

215215
private func customLoader(asset: RiveFileAsset, data: Data, factory: RiveFactory) -> Bool {
216-
guard let assetData = assetsHandled?[asset.uniqueName()] as? NSDictionary else {
216+
guard let assetData = referencedAssets?[asset.uniqueName()] as? NSDictionary else {
217217
return false
218218
}
219219

ios/RiveReactNativeViewManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ @interface RCT_EXTERN_MODULE(RiveReactNativeViewManager, RCTViewManager)
1010
RCT_EXPORT_VIEW_PROPERTY(alignment, NSString)
1111
RCT_EXPORT_VIEW_PROPERTY(autoplay, BOOL)
1212
RCT_EXPORT_VIEW_PROPERTY(artboardName, NSString)
13-
RCT_EXPORT_VIEW_PROPERTY(assetsHandled, NSDictionary)
13+
RCT_EXPORT_VIEW_PROPERTY(referencedAssets, NSDictionary)
1414
RCT_EXPORT_VIEW_PROPERTY(animationName, NSString)
1515
RCT_EXPORT_VIEW_PROPERTY(stateMachineName, NSString)
1616
RCT_EXPORT_VIEW_PROPERTY(isUserHandlingErrors, BOOL)

src/Rive.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ type RiveProps = {
8282
layoutScaleFactor?: number;
8383
alignment: Alignment;
8484
artboardName?: string;
85-
assetsHandled?: FilesHandledMapping;
85+
referencedAssets?: FilesHandledMapping;
8686
animationName?: string;
8787
stateMachineName?: string;
8888
ref: any;
@@ -111,7 +111,7 @@ type Props = {
111111
/**
112112
* @experimental This is an experimental feature and may change without a major version update (breaking change).
113113
*/
114-
assetsHandled?: FilesHandledMapping;
114+
referencedAssets?: FilesHandledMapping;
115115
animationName?: string;
116116
stateMachineName?: string;
117117
autoplay?: boolean;
@@ -139,7 +139,7 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
139139
fit = Fit.Contain,
140140
layoutScaleFactor,
141141
artboardName,
142-
assetsHandled: assetsHandled,
142+
referencedAssets: referencedAssets,
143143
animationName,
144144
stateMachineName,
145145
testID,
@@ -445,7 +445,7 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
445445
}
446446

447447
const convertedAssetHandledSources =
448-
transformFilesHandledMapping(assetsHandled);
448+
transformFilesHandledMapping(referencedAssets);
449449

450450
return (
451451
<View style={[styles.container, style]} ref={ref as any} testID={testID}>
@@ -476,7 +476,7 @@ const RiveContainer = React.forwardRef<RiveRef, Props>(
476476
onError={onErrorHandler}
477477
alignment={alignment}
478478
artboardName={artboardName}
479-
assetsHandled={convertedAssetHandledSources}
479+
referencedAssets={convertedAssetHandledSources}
480480
animationName={animationName}
481481
stateMachineName={stateMachineName}
482482
/>

0 commit comments

Comments
 (0)