diff --git a/.rive_head b/.rive_head index c6a865a5..12e1c9ed 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -eccfca52894894d158761f902f46ed48b0794991 +eed8230f84e2894d0436dd1d94566c59f4dfcb6f diff --git a/lib/src/rive_core/artboard.dart b/lib/src/rive_core/artboard.dart index a86fa6f5..74a598b7 100644 --- a/lib/src/rive_core/artboard.dart +++ b/lib/src/rive_core/artboard.dart @@ -824,7 +824,7 @@ class Artboard extends ArtboardBase with ShapePaintContainer { ViewModelInstance? nestedViewModelInstance = dataContext!.getViewModelInstance(nestedArtboard.dataBindPath); if (nestedViewModelInstance != null) { - mountedArtboard.dataContextFromInstance( + mountedArtboard.setDataContextFromInstance( nestedViewModelInstance, dataContext, false); } else { mountedArtboard.internalDataContext( @@ -835,7 +835,7 @@ class Artboard extends ArtboardBase with ShapePaintContainer { computeBindings(isRoot); } - void dataContextFromInstance( + void setDataContextFromInstance( ViewModelInstance viewModelInstance, DataContext? parent, bool isRoot) { final dataContext = DataContext(viewModelInstance); internalDataContext(dataContext, parent, isRoot); diff --git a/lib/src/rive_core/nested_artboard.dart b/lib/src/rive_core/nested_artboard.dart index 4ef753a5..a9c2de35 100644 --- a/lib/src/rive_core/nested_artboard.dart +++ b/lib/src/rive_core/nested_artboard.dart @@ -63,7 +63,7 @@ abstract class MountedArtboard { void artboardWidthIntrinsicallySizeOverride(bool intrinsic); void artboardHeightIntrinsicallySizeOverride(bool intrinsic); void dispose(); - void dataContextFromInstance(ViewModelInstance viewModelInstance, + void setDataContextFromInstance(ViewModelInstance viewModelInstance, DataContext? dataContextValue, bool isRoot); void internalDataContext(DataContext dataContextValue, DataContext? parentDataContext, bool isRoot); diff --git a/lib/src/runtime_mounted_artboard.dart b/lib/src/runtime_mounted_artboard.dart index ac7d3a95..fc77a8d1 100644 --- a/lib/src/runtime_mounted_artboard.dart +++ b/lib/src/runtime_mounted_artboard.dart @@ -150,9 +150,9 @@ class RuntimeMountedArtboard extends MountedArtboard { } @override - void dataContextFromInstance(ViewModelInstance viewModelInstance, + void setDataContextFromInstance(ViewModelInstance viewModelInstance, DataContext? dataContextValue, bool isRoot) { - artboardInstance.dataContextFromInstance( + artboardInstance.setDataContextFromInstance( viewModelInstance, dataContextValue, isRoot); }