From 0d9dabb13533912231edac43945b4ebb8fd68200 Mon Sep 17 00:00:00 2001
From: Adam <67035612+damzobridge@users.noreply.github.com>
Date: Thu, 1 May 2025 15:58:37 -0700
Subject: [PATCH] fix: use default view model if none provide in
 useViewModelInstance and useViewModel

---
 src/hooks/useViewModel.ts         | 11 +++++------
 src/hooks/useViewModelInstance.ts | 15 ++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/hooks/useViewModel.ts b/src/hooks/useViewModel.ts
index 02f4ff0..f5c0059 100644
--- a/src/hooks/useViewModel.ts
+++ b/src/hooks/useViewModel.ts
@@ -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);
diff --git a/src/hooks/useViewModelInstance.ts b/src/hooks/useViewModelInstance.ts
index e230a03..b6ecb89 100644
--- a/src/hooks/useViewModelInstance.ts
+++ b/src/hooks/useViewModelInstance.ts
@@ -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;
         }