Improve BindableCommand

Autarkysoft · Dec 23, 2024 · fec203e · fec203e
1 parent 89b359a
commit fec203e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Src/Denovo/MVVM/BindableCommand.cs b/Src/Denovo/MVVM/BindableCommand.cs
@@ -14,24 +14,24 @@ public BindableCommand(Action executeMethod) : this(executeMethod, null)
         {
         }
 
-        public BindableCommand(Action executeMethod, Func<bool> canExecuteMethod)
+        public BindableCommand(Action executeMethod, Func<bool>? canExecuteMethod)
         {
             ExecuteMethod = executeMethod;
             CanExecuteMethod = canExecuteMethod;
         }
 
 
         private readonly Action ExecuteMethod;
-        private readonly Func<bool> CanExecuteMethod;
+        private readonly Func<bool>? CanExecuteMethod;
 
-        public event EventHandler CanExecuteChanged = delegate { };
+        public event EventHandler? CanExecuteChanged;
 
 
-        public void RaiseCanExecuteChanged() => CanExecuteChanged(this, EventArgs.Empty);
+        public void RaiseCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
 
-        public bool CanExecute(object parameter) => CanExecuteMethod is null || CanExecuteMethod();
+        public bool CanExecute(object? parameter) => CanExecuteMethod is null || CanExecuteMethod();
 
-        public void Execute(object parameter) => ExecuteMethod?.Invoke();
+        public void Execute(object? parameter) => ExecuteMethod?.Invoke();
     }
 
 
@@ -41,23 +41,23 @@ public BindableCommand(Action<T> executeMethod) : this(executeMethod, null)
         {
         }
 
-        public BindableCommand(Action<T> executeMethod, Func<bool> canExecuteMethod)
+        public BindableCommand(Action<T> executeMethod, Func<bool>? canExecuteMethod)
         {
             ExecuteMethod = executeMethod;
             CanExecuteMethod = canExecuteMethod;
         }
 
 
         private readonly Action<T> ExecuteMethod;
-        private readonly Func<bool> CanExecuteMethod;
+        private readonly Func<bool>? CanExecuteMethod;
 
-        public event EventHandler CanExecuteChanged = delegate { };
+        public event EventHandler? CanExecuteChanged;
 
 
-        public void RaiseCanExecuteChanged() => CanExecuteChanged(this, EventArgs.Empty);
+        public void RaiseCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
 
-        public bool CanExecute(object parameter) => !(CanExecuteMethod is null) && CanExecuteMethod();
+        public bool CanExecute(object? parameter) => CanExecuteMethod is null || CanExecuteMethod();
 
-        public void Execute(object parameter) => ExecuteMethod?.Invoke((T)parameter);
+        public void Execute(object? parameter) => ExecuteMethod?.Invoke((T)parameter);
     }
 }