New functionality and bug fixes.

samples/Unity.Mvvm.Calc/Assets/UI Toolkit/CalcView.uxml

@@ -7,8 +7,8 @@
     <ui:VisualElement name="BottomPanel" class="bottom-panel">
         <ui:VisualElement name="Row1" class="elements-row">
             <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="C" name="ButtonClear" command="ClearCommand" class="round-button round-button__clear-label" />
-            <UnityMvvmToolkit.UITK.BindableUIElements.ButtonUITK text="+/-" name="ButtonSign" enabled="false" class="round-button round-button__operation-label" />
-            <UnityMvvmToolkit.UITK.BindableUIElements.ButtonUITK text="%" name="ButtonPercentage" enabled="false" class="round-button round-button__operation-label" />
+            <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="+/-" name="ButtonSign" enabled="false" class="round-button round-button__operation-label" />
+            <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="%" name="ButtonPercentage" enabled="false" class="round-button round-button__operation-label" />
             <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="÷" name="ButtonDivision" command="OperationCommand, ÷" class="round-button round-button__operation-label" />
         </ui:VisualElement>
         <ui:VisualElement name="Row2" class="elements-row">
@@ -31,7 +31,7 @@
         </ui:VisualElement>
         <ui:VisualElement name="Row5" class="elements-row">
             <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="0" name="Button0" command="NumberCommand, 0" class="round-button round-button--wide" />
-            <UnityMvvmToolkit.UITK.BindableUIElements.ButtonUITK text="." name="ButtonDot" enabled="false" class="round-button" />
+            <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="." name="ButtonDot" enabled="false" class="round-button" />
             <UnityMvvmToolkit.UITK.BindableUIElements.BindableButton text="=" name="ButtonEqual" command="CalculateCommand" class="round-button round-button--highlighted" />
         </ui:VisualElement>
     </ui:VisualElement>

samples/Unity.Mvvm.ToDoList/Assets/UI Toolkit/Styles/check-box.uss

@@ -105,7 +105,7 @@
 }
 
 .check-box__tick--animation {
-    transition-property: width height;
+    transition-property: width, height;
     transition-duration: 150ms, 150ms;
     transition-timing-function: ease-out-back, ease-out-back;
 }

src/UnityMvvmToolkit.Core/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-stryker": {
-      "version": "3.7.1",
+      "version": "3.9.0",
       "commands": [
         "dotnet-stryker"
       ]

src/UnityMvvmToolkit.Core/Attributes/ObservableAttribute.cs

@@ -1,13 +1,8 @@
 using System;
 
-namespace System.Runtime.CompilerServices
-{
-    internal static class IsExternalInit {}
-}
-
 namespace UnityMvvmToolkit.Core.Attributes
 {
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
     public sealed class ObservableAttribute : Attribute
     {
         /// <summary>

src/UnityMvvmToolkit.Core/BindingContextObjectProvider.cs

@@ -109,8 +109,7 @@ public TCommand GetCommand<TCommand>(IBindingContext context, string propertyNam
         {
             EnsureIsNotNullOrWhiteSpace(propertyName, nameof(propertyName));
 
-            if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false ||
-                memberInfo.MemberType != MemberTypes.Property)
+            if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false)
             {
                 throw new InvalidOperationException($"Command '{propertyName}' not found.");
             }
@@ -131,8 +130,7 @@ public IBaseCommand RentCommandWrapper(IBindingContext context, CommandBindingDa
             EnsureIsNotNullOrWhiteSpace(bindingData.ParameterValue,
                 $"Command '{bindingData.PropertyName}' has no parameter. Use {nameof(GetCommand)} instead.");
 
-            if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false ||
-                memberInfo.MemberType != MemberTypes.Property)
+            if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false)
             {
                 throw new InvalidOperationException($"Command '{bindingData.PropertyName}' not found.");
             }

src/UnityMvvmToolkit.Core/Internal/BindingContextMemberProvider.cs

@@ -58,32 +58,39 @@ private static bool TryGetFieldHashCode(Type contextType, FieldInfo fieldInfo, o
                 return false;
             }
 
-            if (fieldInfo.IsPublic)
+            if (HasObservableAttribute(fieldInfo, out var propertyName))
             {
-                return TryGetHashCode(contextType, fieldInfo.Name, fieldInfo.FieldType, out hashCode);
+                return string.IsNullOrWhiteSpace(propertyName)
+                    ? TryGetHashCode(contextType, GetBindableName(fieldInfo.Name), fieldInfo.FieldType, out hashCode)
+                    : TryGetHashCode(contextType, propertyName, fieldInfo.FieldType, out hashCode);
             }
 
-            if (HasObservableAttribute(fieldInfo, out var propertyName) == false)
+            if (fieldInfo.IsPublic)
             {
-                hashCode = default;
-                return false;
+                return TryGetHashCode(contextType, fieldInfo.Name, fieldInfo.FieldType, out hashCode);
             }
 
-            return string.IsNullOrWhiteSpace(propertyName)
-                ? TryGetHashCode(contextType, GetFieldName(fieldInfo.Name), fieldInfo.FieldType, out hashCode)
-                : TryGetHashCode(contextType, propertyName, fieldInfo.FieldType, out hashCode);
+            hashCode = default;
+            return false;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static bool TryGetPropertyHashCode(Type contextType, PropertyInfo propertyInfo, out int hashCode)
         {
-            if (propertyInfo.GetMethod.IsPrivate)
+            if (HasObservableAttribute(propertyInfo, out var propertyName))
             {
-                hashCode = default;
-                return false;
+                return string.IsNullOrWhiteSpace(propertyName)
+                    ? TryGetHashCode(contextType, GetBindableName(propertyInfo.Name), propertyInfo.PropertyType, out hashCode)
+                    : TryGetHashCode(contextType, propertyName, propertyInfo.PropertyType, out hashCode);
             }
 
-            return TryGetHashCode(contextType, propertyInfo.Name, propertyInfo.PropertyType, out hashCode);
+            if (propertyInfo.GetMethod.IsPublic)
+            {
+                return TryGetHashCode(contextType, propertyInfo.Name, propertyInfo.PropertyType, out hashCode);
+            }
+
+            hashCode = default;
+            return false;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -116,9 +123,9 @@ private static bool HasObservableAttribute(MemberInfo fieldInfo, out string prop
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static string GetFieldName(string fieldName)
+        private static string GetBindableName(string memberName)
         {
-            var resultName = fieldName;
+            var resultName = memberName;
 
             if (resultName.Length > 1)
             {

src/UnityMvvmToolkit.Core/System.Runtime.CompilerServices/IsExternalInit.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel;
+
+// ReSharper disable CheckNamespace
+// ReSharper disable UnusedType.Global
+
+namespace System.Runtime.CompilerServices
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    internal static class IsExternalInit
+    {
+    }
+}

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/Interfaces/IBindableCollection.cs

@@ -0,0 +1,8 @@
+using UnityMvvmToolkit.Core.Interfaces;
+
+namespace UnityMvvmToolkit.Common.Interfaces
+{
+    public interface IBindableCollection : IBindableElement
+    {
+    }
+}

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/Interfaces/IBindingContextProvider.cs

@@ -0,0 +1,10 @@
+using UnityMvvmToolkit.Core.Interfaces;
+
+namespace UnityMvvmToolkit.Common.Interfaces
+{
+    public interface IBindingContextProvider
+    {
+        bool IsValid { get; }
+        IBindingContext BindingContext { get;}
+    }
+}

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/MonoBehaviourView.cs

@@ -31,11 +31,12 @@ private void Awake()
         private void OnDestroy()
         {
             ResetBindingContext();
+            OnDispose();
         }
 
         public void SetBindingContext(IBindingContext context, IObjectProvider objectProvider)
         {
-            if (_bindingContext != null)
+            if (_bindingContext is not null)
             {
                 throw new InvalidOperationException(
                     $"{GetType().Name} - binding context was not reset. Reset the binding context first.");
@@ -53,11 +54,12 @@ public void ResetBindingContext(IObjectProvider objectProvider)
         }
 
         protected abstract void OnInit();
-        protected abstract IBindableElement[] GetBindableElements();
+        protected abstract void OnDispose();
+        protected abstract IReadOnlyList<IBindableElement> GetBindableElements();
 
         protected virtual TBindingContext GetBindingContext()
         {
-            if (typeof(TBindingContext).GetConstructor(Type.EmptyTypes) == null)
+            if (typeof(TBindingContext).GetConstructor(Type.EmptyTypes) is null)
             {
                 throw new InvalidOperationException(
                     $"Cannot create an instance of the type parameter {typeof(TBindingContext)} because it does not have a parameterless constructor.");
@@ -109,13 +111,13 @@ private void ResetBindingContext()
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void SetBindingContext(ReadOnlySpan<IBindableElement> bindableElements, IBindingContext context,
+        private void SetBindingContext(IReadOnlyList<IBindableElement> bindableElements, IBindingContext context,
             IObjectProvider objectProvider, bool initialize)
         {
             _bindingContext = (TBindingContext) context;
             _objectProvider = objectProvider;
 
-            for (var i = 0; i < bindableElements.Length; i++)
+            for (var i = 0; i < bindableElements.Count; i++)
             {
                 var bindableElement = bindableElements[i];
 
@@ -129,10 +131,10 @@ private void SetBindingContext(ReadOnlySpan<IBindableElement> bindableElements,
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ResetBindingContext(ReadOnlySpan<IBindableElement> bindableElements,
+        private void ResetBindingContext(IReadOnlyList<IBindableElement> bindableElements,
             IObjectProvider objectProvider, bool dispose)
         {
-            for (var i = 0; i < bindableElements.Length; i++)
+            for (var i = 0; i < bindableElements.Count; i++)
             {
                 var bindableElement = bindableElements[i];
 

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/UnityMvvmToolkit.Common.asmdef

@@ -1,6 +1,5 @@
 {
     "name": "UnityMvvmToolkit.Common",
-    "rootNamespace": "",
     "references": [
         "GUID:5c4878a33f8e8b04cb2f76d30bb7b0b0"
     ],

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Attributes/ObservableAttribute.cs

@@ -1,13 +1,8 @@
 using System;
 
-namespace System.Runtime.CompilerServices
-{
-    internal static class IsExternalInit {}
-}
-
 namespace UnityMvvmToolkit.Core.Attributes
 {
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
     public sealed class ObservableAttribute : Attribute
     {
         /// <summary>

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/BindingContextObjectProvider.cs

@@ -109,8 +109,7 @@ public TCommand GetCommand<TCommand>(IBindingContext context, string propertyNam
         {
             EnsureIsNotNullOrWhiteSpace(propertyName, nameof(propertyName));
 
-            if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false ||
-                memberInfo.MemberType != MemberTypes.Property)
+            if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false)
             {
                 throw new InvalidOperationException($"Command '{propertyName}' not found.");
             }
@@ -131,8 +130,7 @@ public IBaseCommand RentCommandWrapper(IBindingContext context, CommandBindingDa
             EnsureIsNotNullOrWhiteSpace(bindingData.ParameterValue,
                 $"Command '{bindingData.PropertyName}' has no parameter. Use {nameof(GetCommand)} instead.");
 
-            if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false ||
-                memberInfo.MemberType != MemberTypes.Property)
+            if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false)
             {
                 throw new InvalidOperationException($"Command '{bindingData.PropertyName}' not found.");
             }