Merge pull request #29 from LibraStack/develop

Bug fixes.

Author: ChebanovDD

samples/Unity.Mvvm.Calc/Packages/manifest.json

@@ -3,12 +3,12 @@
     "com.chebanovdd.unitymvvmtoolkit": "file:../../../src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit",
     "com.unity.collab-proxy": "2.0.4",
     "com.unity.feature.2d": "1.0.0",
-    "com.unity.ide.rider": "3.0.21",
+    "com.unity.ide.rider": "3.0.22",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.6.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "com.unity.modules.ai": "1.0.0",

samples/Unity.Mvvm.Calc/Packages/packages-lock.json

@@ -129,7 +129,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.21",
+      "version": "3.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -181,7 +181,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.6.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {

samples/Unity.Mvvm.Counter/Packages/manifest.json

@@ -4,12 +4,12 @@
     "com.cysharp.unitask": "2.3.3",
     "com.unity.collab-proxy": "2.0.4",
     "com.unity.feature.2d": "1.0.0",
-    "com.unity.ide.rider": "3.0.21",
+    "com.unity.ide.rider": "3.0.22",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.6.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "com.unity.modules.ai": "1.0.0",

samples/Unity.Mvvm.Counter/Packages/packages-lock.json

@@ -136,7 +136,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.21",
+      "version": "3.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -188,7 +188,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.6.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {

samples/Unity.Mvvm.CounterLegacy/Packages/manifest.json

@@ -3,12 +3,12 @@
     "com.chebanovdd.unitymvvmtoolkit": "file:../../../src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit",
     "com.unity.collab-proxy": "2.0.4",
     "com.unity.feature.2d": "1.0.0",
-    "com.unity.ide.rider": "3.0.21",
+    "com.unity.ide.rider": "3.0.22",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.6.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "com.unity.modules.ai": "1.0.0",

samples/Unity.Mvvm.CounterLegacy/Packages/packages-lock.json

@@ -129,7 +129,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.21",
+      "version": "3.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -181,7 +181,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.6.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {

samples/Unity.Mvvm.ToDoList/Assets/UI Toolkit/Styles/main-view.uss

@@ -40,8 +40,8 @@
 }
 
 .add-task-button--animation {
-    transition-property: rotate background-color;
-    transition-duration: 150ms 150ms;
+    transition-property: rotate, background-color;
+    transition-duration: 150ms, 150ms;
 }
 
 .add-task-button__icon {

samples/Unity.Mvvm.ToDoList/Packages/manifest.json

@@ -4,13 +4,13 @@
     "com.cysharp.unitask": "2.3.3",
     "com.unity.collab-proxy": "2.0.4",
     "com.unity.feature.2d": "1.0.0",
-    "com.unity.ide.rider": "3.0.21",
+    "com.unity.ide.rider": "3.0.22",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.nuget.newtonsoft-json": "3.1.0",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.6.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "com.unity.modules.ai": "1.0.0",

samples/Unity.Mvvm.ToDoList/Packages/packages-lock.json

@@ -136,7 +136,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.21",
+      "version": "3.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -195,7 +195,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.6.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {

src/UnityMvvmToolkit.Core/BindingContextObjectProvider.cs

@@ -114,15 +114,7 @@ public TCommand GetCommand<TCommand>(IBindingContext context, string propertyNam
                 throw new InvalidOperationException($"Command '{propertyName}' not found.");
             }
 
-            var propertyInfo = (PropertyInfo) memberInfo;
-
-            if (typeof(TCommand).IsAssignableFrom(propertyInfo.PropertyType))
-            {
-                return (TCommand) propertyInfo.GetValue(context);
-            }
-
-            throw new InvalidCastException(
-                $"Can not cast the {propertyInfo.PropertyType} command to the {typeof(TCommand)} command.");
+            return _objectWrapperHandler.GetCommand<TCommand>(context, memberInfo);
         }
 
         public IBaseCommand RentCommandWrapper(IBindingContext context, CommandBindingData bindingData)