Fixes #160 - Adds keyboard shortcuts to open the dev options menu.

microsoft · May 16, 2016 · bdcc33d · bdcc33d
1 parent f8f2317
commit bdcc33d
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 10 deletions.
diff --git a/ReactWindows/ReactNative/DevSupport/DevSupportManager.cs b/ReactWindows/ReactNative/DevSupport/DevSupportManager.cs
@@ -14,11 +14,11 @@ class DevSupportManager : IDevSupportManager
     {
         private const int NativeErrorCookie = -1;
 
+        private readonly ShakeAccelerometer _accelerometer = ShakeAccelerometer.GetDefault();
+
         private readonly IReactInstanceDevCommandsHandler _reactInstanceCommandsHandler;
         private readonly string _jsBundleFile;
         private readonly string _jsAppBundleName;
-
-        private readonly ShakeAccelerometer _accelerometer;
 
         private RedBoxDialog _redBoxDialog;
         private Action _dismissRedBoxDialog;
@@ -34,14 +34,7 @@ public DevSupportManager(
             _jsBundleFile = jsBundleFile;
             _jsAppBundleName = jsAppBundleName;
 
-            _accelerometer = ShakeAccelerometer.GetDefault();
-            if (_accelerometer != null)
-            {
-                _accelerometer.Shaken += (sender, args) =>
-                {
-                    ShowDevOptionsDialog();
-                };
-            }
+            RegisterDevOptionsMenuTriggers();
         }
 
         public bool IsEnabled { get; set; } = true;
@@ -217,6 +210,18 @@ private Task ReloadJavaScriptFromFileAsync(CancellationToken token)
             return Task.FromResult(true);
         }
 
+        private void RegisterDevOptionsMenuTriggers()
+        {
+            if (_accelerometer != null)
+            {
+                _accelerometer.Shaken += (sender, args) =>
+                {
+                    ShowDevOptionsDialog();
+                };
+            }
+        }
+
+
         class DevOptionHandler
         {
             private readonly Action _onSelect;

diff --git a/ReactWindows/ReactNative/DevSupport/DisabledDevSupportManager.cs b/ReactWindows/ReactNative/DevSupport/DisabledDevSupportManager.cs
@@ -39,6 +39,14 @@ public void HandleException(Exception exception)
         {
         }
 
+        public void HandleReloadJavaScript()
+        {
+        }
+
+        public void ShowDevOptionsDialog()
+        {
+        }
+
         public void ShowNewJavaScriptError(string title, JArray details, int exceptionId)
         {
         }

diff --git a/ReactWindows/ReactNative/DevSupport/IDevSupportManager.cs b/ReactWindows/ReactNative/DevSupport/IDevSupportManager.cs
@@ -36,6 +36,17 @@ public interface IDevSupportManager
         /// <param name="exception">The exception.</param>
         void HandleException(Exception exception);
 
+        /// <summary>
+        /// Handles reloading the JavaScript bundle.
+        /// </summary>
+        void HandleReloadJavaScript();
+
+
+        /// <summary>
+        /// Show the developer options dialog.
+        /// </summary>
+        void ShowDevOptionsDialog();
+
         /// <summary>
         /// Display a JavaScript error.
         /// </summary>

diff --git a/ReactWindows/ReactNative/ReactPage.cs b/ReactWindows/ReactNative/ReactPage.cs
@@ -4,6 +4,8 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Input;
+using Windows.System;
 
 namespace ReactNative
 {
@@ -16,6 +18,8 @@ public class ReactPage : Page
         private readonly string _mainComponentName;
         private readonly Action _onBackPressed;
 
+        private bool _isShiftKeyDown;
+
         /// <summary>
         /// Instantiates the <see cref="ReactPage"/>.
         /// </summary>
@@ -90,6 +94,51 @@ protected virtual ReactRootView CreateRootView()
             return new ReactRootView();
         }
 
+        /// <summary>
+        /// Captures the key down events to 
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyDown(KeyRoutedEventArgs e)
+        {
+            if (_reactInstanceManager.DevSupportManager.IsEnabled)
+            {
+                if (e.Key == VirtualKey.Shift)
+                {
+                    _isShiftKeyDown = true;
+                }
+                else if (_isShiftKeyDown && e.Key == VirtualKey.F11)
+                {
+                    _reactInstanceManager.DevSupportManager.ShowDevOptionsDialog();
+                    e.Handled = true;
+                }
+                else if (_isShiftKeyDown && e.Key == VirtualKey.F12)
+                {
+                    _reactInstanceManager.DevSupportManager.HandleReloadJavaScript();
+                    e.Handled = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Captures the key up event to potentially launch the dev options menu.
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyUp(KeyRoutedEventArgs e)
+        {
+            if (_reactInstanceManager.DevSupportManager.IsEnabled)
+            {
+                if (e.Key == VirtualKey.Menu)
+                {
+                    _reactInstanceManager.DevSupportManager.ShowDevOptionsDialog();
+                    e.Handled = true;
+                }
+                else if (e.Key == VirtualKey.Shift)
+                {
+                    _isShiftKeyDown = false;
+                }
+            }
+        }
+
         private IReactInstanceManager CreateReactInstanceManager(string jsBundleFile, IReadOnlyList<IReactPackage> packages)
         {
             var builder = new ReactInstanceManager.Builder