Add Dropdown.OnValueChangedAsObservable neuecc#236

ese9 · Aug 19, 2018 · 9602cbb · 9602cbb
1 parent 2b42026
commit 9602cbb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.uGUI.cs b/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.uGUI.cs
@@ -104,6 +104,19 @@ public static async UniTask<string> OnEndEditAsync(this InputField inputField)
                 return await handler.OnEndEditAsync();
             }
         }
+
+        public static IAsyncValueChangedEventHandler<int> GetAsyncValueChangedEventHandler(this Dropdown dropdown)
+        {
+            return new AsyncUnityEventHandler<int>(dropdown.onValueChanged, dropdown.GetCancellationTokenOnDestroy());
+        }
+
+        public static async UniTask<int> OnValueChanged(this Dropdown dropdown)
+        {
+            using (var handler = dropdown.GetAsyncValueChangedEventHandler())
+            {
+                return await handler.OnValueChangedAsync();
+            }
+        }
     }
 
     public interface IAsyncClickEventHandler : IDisposable

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/UnityUIComponentExtensions.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/UnityUIComponentExtensions.cs
@@ -103,6 +103,16 @@ public static IObservable<string> OnValueChangedAsObservable(this InputField inp
             });
         }
 #endif
+
+        /// <summary>Observe onValueChanged with current `value` on subscribe.</summary>
+        public static IObservable<int> OnValueChangedAsObservable(this Dropdown dropdown)
+        {
+            return Observable.CreateWithState<int, Dropdown>(dropdown, (d, observer) =>
+            {
+                observer.OnNext(d.value);
+                return d.onValueChanged.AsObservable().Subscribe(observer);
+            });
+        }
     }
 }