javascript/rive-react
1
0
Fork 0
mirror of https://github.com/rive-app/rive-react.git synced 2026-03-13 08:22:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use default view model if none provide in useViewModelInstance and useViewModel

Browse Source
This commit is contained in:
Adam
2025-05-01 15:58:37 -07:00
parent ad12fe20d1
commit 0d9dabb135
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/hooks/useViewModel.ts
View File

@@ -64,13 +64,12 @@ export default function useViewModel(
let model: ViewModel | null = null;
if (currentParams && 'name' in currentParams && currentParams.name != null) {
if (currentParams?.name != null) {
model = currentRive.viewModelByName?.(currentParams.name) || null;
} else if (currentParams && currentParams.useDefault) {
const defaultViewModel = currentRive.defaultViewModel();
if (defaultViewModel) {
model = defaultViewModel;
}
} else if (currentParams?.useDefault) {
model = currentRive.defaultViewModel() || null;
} else {
model = currentRive.defaultViewModel() || null;
}
setViewModel(model);

15
src/hooks/useViewModelInstance.ts
View File

@@ -72,16 +72,13 @@ export default function useViewModelInstance(
let result: ViewModelInstance | null = null;
if (currentParams) {
if ('name' in currentParams && currentParams.name != null) {
result = currentViewModel.instanceByName?.(currentParams.name) || null;
} else if ('useDefault' in currentParams && currentParams.useDefault) {
result = currentViewModel.defaultInstance?.() || null;
} else if ('useNew' in currentParams && currentParams.useNew) {
result = currentViewModel.instance?.() || null;
}
if (currentParams?.name != null) {
result = currentViewModel.instanceByName(currentParams.name) || null;
} else if (currentParams?.useDefault) {
result = currentViewModel.defaultInstance?.() || null;
} else if (currentParams?.useNew) {
result = currentViewModel.instance?.() || null;
} else {
// Default to using default instance if no params provided
result = currentViewModel.defaultInstance?.() || null;
}