Clean-up some issues with WeakEventListener Usage, make OnEventAction lambda's static

michael-hawker · michael-hawker · commit 60d61ad62a22 · 2022-10-18T01:08:38.000-07:00
See #3029 (comment) and MicrosoftDocs/WindowsCommunityToolkitDocs#262 (comment)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs
@@ -440,7 +440,7 @@ private void OnCollectionChanged(object oldValue, object newValue)
                     var incc = (INotifyCollectionChanged)newValue;
                     _inccWeakEventListener = new WeakEventListener<RotatorTile, object, NotifyCollectionChangedEventArgs>(this)
                     {
-                        OnEventAction = (instance, source, eventArgs) => instance.Incc_CollectionChanged(source, eventArgs),
+                        OnEventAction = static (instance, source, eventArgs) => instance.Incc_CollectionChanged(source, eventArgs),
                         OnDetachAction = (listener) => incc.CollectionChanged -= listener.OnEvent
                     };
                     incc.CollectionChanged += _inccWeakEventListener.OnEvent;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs
@@ -62,7 +62,7 @@ public InterspersedObservableCollection(object itemsSource)
             {
                 var weakPropertyChangedListener = new WeakEventListener<InterspersedObservableCollection, object, NotifyCollectionChangedEventArgs>(this)
                 {
-                    OnEventAction = (instance, source, eventArgs) => instance.ItemsSource_CollectionChanged(source, eventArgs),
+                    OnEventAction = static (instance, source, eventArgs) => instance.ItemsSource_CollectionChanged(source, eventArgs),
                     OnDetachAction = (weakEventListener) => notifier.CollectionChanged -= weakEventListener.OnEvent // Use Local Reference Only
                 };
                 notifier.CollectionChanged += weakPropertyChangedListener.OnEvent;
diff --git a/Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs b/Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs
@@ -97,7 +97,7 @@ public IList Source
                         new WeakEventListener<AdvancedCollectionView, object, NotifyCollectionChangedEventArgs>(this)
                         {
                             // Call the actual collection changed event
-                            OnEventAction = (source, changed, arg3) => SourceNcc_CollectionChanged(source, arg3),
+                            OnEventAction = static (instance, source, arg3) => instance.SourceNcc_CollectionChanged(source, arg3),
 
                             // The source doesn't exist anymore
                             OnDetachAction = (listener) => sourceNcc.CollectionChanged -= _sourceWeakEventListener.OnEvent
diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/FullScreenModeStateTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/FullScreenModeStateTrigger.cs
@@ -23,7 +23,7 @@ public FullScreenModeStateTrigger()
                 var weakEvent =
                     new WeakEventListener<FullScreenModeStateTrigger, ApplicationView, object>(this)
                     {
-                        OnEventAction = (instance, source, eventArgs) => instance.FullScreenModeTrigger_VisibleBoundsChanged(source, eventArgs),
+                        OnEventAction = static (instance, source, eventArgs) => instance.FullScreenModeTrigger_VisibleBoundsChanged(source, eventArgs),
                         OnDetachAction = (weakEventListener) => ApplicationView.GetForCurrentView().VisibleBoundsChanged -= weakEventListener.OnEvent
                     };
                 ApplicationView.GetForCurrentView().VisibleBoundsChanged += weakEvent.OnEvent;
diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/IsNullOrEmptyStateTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/IsNullOrEmptyStateTrigger.cs
@@ -47,9 +47,9 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert
             var valNotifyCollection = val as INotifyCollectionChanged;
             if (valNotifyCollection != null)
             {
-                var weakEvent = new WeakEventListener<INotifyCollectionChanged, object, NotifyCollectionChangedEventArgs>(valNotifyCollection)
+                var weakEvent = new WeakEventListener<IsNullOrEmptyStateTrigger, object, NotifyCollectionChangedEventArgs>(obj)
                 {
-                    OnEventAction = (instance, source, args) => obj.SetActive(IsNullOrEmpty(instance)),
+                    OnEventAction = static (instance, source, args) => instance.SetActive(IsNullOrEmpty(source)),
                     OnDetachAction = (weakEventListener) => valNotifyCollection.CollectionChanged -= weakEventListener.OnEvent
                 };
 
@@ -61,9 +61,9 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert
             var valObservableVector = val as IObservableVector<object>;
             if (valObservableVector != null)
             {
-                var weakEvent = new WeakEventListener<IObservableVector<object>, object, IVectorChangedEventArgs>(valObservableVector)
+                var weakEvent = new WeakEventListener<IsNullOrEmptyStateTrigger, object, IVectorChangedEventArgs>(obj)
                 {
-                    OnEventAction = (instance, source, args) => obj.SetActive(IsNullOrEmpty(instance)),
+                    OnEventAction = static (instance, source, args) => instance.SetActive(IsNullOrEmpty(source)),
                     OnDetachAction = (weakEventListener) => valObservableVector.VectorChanged -= weakEventListener.OnEvent
                 };
 
@@ -75,9 +75,9 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert
             var valObservableMap = val as IObservableMap<object, object>;
             if (valObservableMap != null)
             {
-                var weakEvent = new WeakEventListener<IObservableMap<object, object>, object, IMapChangedEventArgs<object>>(valObservableMap)
+                var weakEvent = new WeakEventListener<IsNullOrEmptyStateTrigger, object, IMapChangedEventArgs<object>>(obj)
                 {
-                    OnEventAction = (instance, source, args) => obj.SetActive(IsNullOrEmpty(instance)),
+                    OnEventAction = static (instance, source, args) => instance.SetActive(IsNullOrEmpty(source)),
                     OnDetachAction = (weakEventListener) => valObservableMap.MapChanged -= weakEventListener.OnEvent
                 };
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/NetworkConnectionStateTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/NetworkConnectionStateTrigger.cs
@@ -25,7 +25,7 @@ public NetworkConnectionStateTrigger()
             var weakEvent =
                 new WeakEventListener<NetworkConnectionStateTrigger, object>(this)
                 {
-                    OnEventAction = (instance, source) => NetworkInformation_NetworkStatusChanged(source),
+                    OnEventAction = static (instance, source) => instance.NetworkInformation_NetworkStatusChanged(source),
                     OnDetachAction = (weakEventListener) => NetworkInformation.NetworkStatusChanged -= weakEventListener.OnEvent
                 };
             NetworkInformation.NetworkStatusChanged += weakEvent.OnEvent;
diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/UserInteractionModeStateTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/UserInteractionModeStateTrigger.cs
@@ -24,7 +24,7 @@ public UserInteractionModeStateTrigger()
                 var weakEvent =
                     new WeakEventListener<UserInteractionModeStateTrigger, object, WindowSizeChangedEventArgs>(this)
                     {
-                        OnEventAction = (instance, source, eventArgs) => UserInteractionModeTrigger_SizeChanged(source, eventArgs),
+                        OnEventAction = static (instance, source, eventArgs) => instance.UserInteractionModeTrigger_SizeChanged(source, eventArgs),
                         OnDetachAction = (weakEventListener) => Window.Current.SizeChanged -= weakEventListener.OnEvent
                     };
                 Window.Current.SizeChanged += weakEvent.OnEvent;

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ private void OnCollectionChanged(object oldValue, object newValue)`
`440`	`440`	`var incc = (INotifyCollectionChanged)newValue;`
`441`	`441`	`_inccWeakEventListener = new WeakEventListener<RotatorTile, object, NotifyCollectionChangedEventArgs>(this)`
`442`	`442`	`{`
`443`		`- OnEventAction = (instance, source, eventArgs) => instance.Incc_CollectionChanged(source, eventArgs),`
	`443`	`+ OnEventAction = static (instance, source, eventArgs) => instance.Incc_CollectionChanged(source, eventArgs),`
`444`	`444`	`OnDetachAction = (listener) => incc.CollectionChanged -= listener.OnEvent`
`445`	`445`	`};`
`446`	`446`	`incc.CollectionChanged += _inccWeakEventListener.OnEvent;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public InterspersedObservableCollection(object itemsSource)`
`62`	`62`	`{`
`63`	`63`	`var weakPropertyChangedListener = new WeakEventListener<InterspersedObservableCollection, object, NotifyCollectionChangedEventArgs>(this)`
`64`	`64`	`{`
`65`		`- OnEventAction = (instance, source, eventArgs) => instance.ItemsSource_CollectionChanged(source, eventArgs),`
	`65`	`+ OnEventAction = static (instance, source, eventArgs) => instance.ItemsSource_CollectionChanged(source, eventArgs),`
`66`	`66`	`OnDetachAction = (weakEventListener) => notifier.CollectionChanged -= weakEventListener.OnEvent // Use Local Reference Only`
`67`	`67`	`};`
`68`	`68`	`notifier.CollectionChanged += weakPropertyChangedListener.OnEvent;`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public IList Source`
`97`	`97`	`new WeakEventListener<AdvancedCollectionView, object, NotifyCollectionChangedEventArgs>(this)`
`98`	`98`	`{`
`99`	`99`	`// Call the actual collection changed event`
`100`		`- OnEventAction = (source, changed, arg3) => SourceNcc_CollectionChanged(source, arg3),`
	`100`	`+ OnEventAction = static (instance, source, arg3) => instance.SourceNcc_CollectionChanged(source, arg3),`
`101`	`101`
`102`	`102`	`// The source doesn't exist anymore`
`103`	`103`	`OnDetachAction = (listener) => sourceNcc.CollectionChanged -= _sourceWeakEventListener.OnEvent`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public FullScreenModeStateTrigger()`
`23`	`23`	`var weakEvent =`
`24`	`24`	`new WeakEventListener<FullScreenModeStateTrigger, ApplicationView, object>(this)`
`25`	`25`	`{`
`26`		`- OnEventAction = (instance, source, eventArgs) => instance.FullScreenModeTrigger_VisibleBoundsChanged(source, eventArgs),`
	`26`	`+ OnEventAction = static (instance, source, eventArgs) => instance.FullScreenModeTrigger_VisibleBoundsChanged(source, eventArgs),`
`27`	`27`	`OnDetachAction = (weakEventListener) => ApplicationView.GetForCurrentView().VisibleBoundsChanged -= weakEventListener.OnEvent`
`28`	`28`	`};`
`29`	`29`	`ApplicationView.GetForCurrentView().VisibleBoundsChanged += weakEvent.OnEvent;`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert`
`47`	`47`	`var valNotifyCollection = val as INotifyCollectionChanged;`
`48`	`48`	`if (valNotifyCollection != null)`
`49`	`49`	`{`
`50`		`- var weakEvent = new WeakEventListener<INotifyCollectionChanged, object, NotifyCollectionChangedEventArgs>(valNotifyCollection)`
	`50`	`+ var weakEvent = new WeakEventListener<IsNullOrEmptyStateTrigger, object, NotifyCollectionChangedEventArgs>(obj)`
`51`	`51`	`{`
`52`		`- OnEventAction = (instance, source, args) => obj.SetActive(IsNullOrEmpty(instance)),`
	`52`	`+ OnEventAction = static (instance, source, args) => instance.SetActive(IsNullOrEmpty(source)),`
`53`	`53`	`OnDetachAction = (weakEventListener) => valNotifyCollection.CollectionChanged -= weakEventListener.OnEvent`
`54`	`54`	`};`
`55`	`55`
`@@ -61,9 +61,9 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert`
`61`	`61`	`var valObservableVector = val as IObservableVector<object>;`
`62`	`62`	`if (valObservableVector != null)`
`63`	`63`	`{`
`64`		`- var weakEvent = new WeakEventListener<IObservableVector<object>, object, IVectorChangedEventArgs>(valObservableVector)`
	`64`	`+ var weakEvent = new WeakEventListener<IsNullOrEmptyStateTrigger, object, IVectorChangedEventArgs>(obj)`
`65`	`65`	`{`
`66`		`- OnEventAction = (instance, source, args) => obj.SetActive(IsNullOrEmpty(instance)),`
	`66`	`+ OnEventAction = static (instance, source, args) => instance.SetActive(IsNullOrEmpty(source)),`
`67`	`67`	`OnDetachAction = (weakEventListener) => valObservableVector.VectorChanged -= weakEventListener.OnEvent`
`68`	`68`	`};`
`69`	`69`
`@@ -75,9 +75,9 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert`
`75`	`75`	`var valObservableMap = val as IObservableMap<object, object>;`
`76`	`76`	`if (valObservableMap != null)`
`77`	`77`	`{`
`78`		`- var weakEvent = new WeakEventListener<IObservableMap<object, object>, object, IMapChangedEventArgs<object>>(valObservableMap)`
	`78`	`+ var weakEvent = new WeakEventListener<IsNullOrEmptyStateTrigger, object, IMapChangedEventArgs<object>>(obj)`
`79`	`79`	`{`
`80`		`- OnEventAction = (instance, source, args) => obj.SetActive(IsNullOrEmpty(instance)),`
	`80`	`+ OnEventAction = static (instance, source, args) => instance.SetActive(IsNullOrEmpty(source)),`
`81`	`81`	`OnDetachAction = (weakEventListener) => valObservableMap.MapChanged -= weakEventListener.OnEvent`
`82`	`82`	`};`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public NetworkConnectionStateTrigger()`
`25`	`25`	`var weakEvent =`
`26`	`26`	`new WeakEventListener<NetworkConnectionStateTrigger, object>(this)`
`27`	`27`	`{`
`28`		`- OnEventAction = (instance, source) => NetworkInformation_NetworkStatusChanged(source),`
	`28`	`+ OnEventAction = static (instance, source) => instance.NetworkInformation_NetworkStatusChanged(source),`
`29`	`29`	`OnDetachAction = (weakEventListener) => NetworkInformation.NetworkStatusChanged -= weakEventListener.OnEvent`
`30`	`30`	`};`
`31`	`31`	`NetworkInformation.NetworkStatusChanged += weakEvent.OnEvent;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public UserInteractionModeStateTrigger()`
`24`	`24`	`var weakEvent =`
`25`	`25`	`new WeakEventListener<UserInteractionModeStateTrigger, object, WindowSizeChangedEventArgs>(this)`
`26`	`26`	`{`
`27`		`- OnEventAction = (instance, source, eventArgs) => UserInteractionModeTrigger_SizeChanged(source, eventArgs),`
	`27`	`+ OnEventAction = static (instance, source, eventArgs) => instance.UserInteractionModeTrigger_SizeChanged(source, eventArgs),`
`28`	`28`	`OnDetachAction = (weakEventListener) => Window.Current.SizeChanged -= weakEventListener.OnEvent`
`29`	`29`	`};`
`30`	`30`	`Window.Current.SizeChanged += weakEvent.OnEvent;`