react-native-tvos 0.64.2-3 → 0.64.2-4

package/React/Base/RCTRootView.m

@@ -98,15 +98,6 @@ NSString *const RCTTVDisableMenuKeyNotification = @"RCTTVDisableMenuKeyNotificat
                                                object:self];
 
 #if TARGET_OS_TV
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(enableTVMenuKey)
-                                                   name:RCTTVEnableMenuKeyNotification
-                                                 object:nil];
-
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(disableTVMenuKey)
-                                                   name:RCTTVDisableMenuKeyNotification
-                                                 object:nil];
 
 #if RCT_DEV
       [[NSNotificationCenter defaultCenter] addObserver:self
@@ -115,11 +106,7 @@ NSString *const RCTTVDisableMenuKeyNotification = @"RCTTVDisableMenuKeyNotificat
                                                  object:nil];
 #endif
       
-    self.tvRemoteHandler = [RCTTVRemoteHandler new];
-    for (NSString *key in [self.tvRemoteHandler.tvRemoteGestureRecognizers allKeys]) {
-      [self addGestureRecognizer:self.tvRemoteHandler.tvRemoteGestureRecognizers[key]];
-    }
-    // [self addGestureRecognizer:self.tvRemoteHandler.tvMenuKeyRecognizer];
+    self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:self];
 #endif
 
     [self showLoadingView];
@@ -134,32 +121,12 @@ NSString *const RCTTVDisableMenuKeyNotification = @"RCTTVDisableMenuKeyNotificat
   return self;
 }
 
-#if TARGET_OS_TV
-
-- (void)enableTVMenuKey {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if (![[self gestureRecognizers] containsObject:self.tvRemoteHandler.tvMenuKeyRecognizer]) {
-            [self addGestureRecognizer:self.tvRemoteHandler.tvMenuKeyRecognizer];
-        }
-    });
-}
-
-- (void)disableTVMenuKey {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if ([[self gestureRecognizers] containsObject:self.tvRemoteHandler.tvMenuKeyRecognizer]) {
-            [self removeGestureRecognizer:self.tvRemoteHandler.tvMenuKeyRecognizer];
-        }
-    });
-}
-
-#if RCT_DEV
+#if TARGET_OS_TV && RCT_DEV
 - (void)showDevMenu {
     dispatch_async(dispatch_get_main_queue(), ^{
         [[self->_bridge devMenu] show];
     });
 }
-#endif
-
 #endif // TARGET_OS_TV
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
@@ -443,6 +410,9 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 - (void)dealloc
 {
+#if TARGET_OS_TV
+  self.tvRemoteHandler = nil;
+#endif
   [_contentView invalidate];
 }
 

package/React/Base/RCTTVRemoteHandler.h

@@ -26,7 +26,10 @@ extern NSString *const RCTTVRemoteEventSwipeDown;
 
 @interface RCTTVRemoteHandler : NSObject
 
-@property (nonatomic, copy, readonly) NSDictionary *tvRemoteGestureRecognizers;
-@property (nonatomic, strong) UITapGestureRecognizer *tvMenuKeyRecognizer;
+- (instancetype _Nonnull )initWithView:(UIView * _Nonnull)view;
+- (instancetype _Nonnull )init __attribute__((unavailable("init not available, use initWithView:")));
+
++ (BOOL)useMenuKey;
++ (void)setUseMenuKey:(BOOL)useMenuKey;
 
 @end

package/React/Base/RCTTVRemoteHandler.m

@@ -37,87 +37,189 @@ NSString *const RCTTVRemoteEventSwipeRight = @"swipeRight";
 NSString *const RCTTVRemoteEventSwipeUp = @"swipeUp";
 NSString *const RCTTVRemoteEventSwipeDown = @"swipeDown";
 
+@interface RCTTVRemoteHandler()
+
+@property (nonatomic, copy, readonly) NSDictionary *tvRemoteGestureRecognizers;
+@property (nonatomic, strong) UITapGestureRecognizer *tvMenuKeyRecognizer;
+@property (nonatomic, weak) UIView *view;
+
+@end
+
 @implementation RCTTVRemoteHandler {
   NSMutableDictionary<NSString *, UIGestureRecognizer *> *_tvRemoteGestureRecognizers;
 }
 
-- (instancetype)init
+#pragma mark -
+#pragma mark Static setting for using menu key
+
+static __volatile BOOL __useMenuKey = NO;
+
++ (BOOL)useMenuKey
+{
+    return __useMenuKey;
+}
+
++ (void)setUseMenuKey:(BOOL)useMenuKey
+{
+    __useMenuKey = useMenuKey;
+}
+
+#pragma mark -
+#pragma mark Public methods
+
+- (instancetype)initWithView:(UIView *)view
 {
   if ((self = [super init])) {
+      _view = view;
+      [self setUpGestureRecognizers];
+      [self attachToView];
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+    [self detachFromView];
+}
+
+#pragma mark -
+#pragma mark Private methods
+
+- (void)setUpGestureRecognizers
+{
     _tvRemoteGestureRecognizers = [NSMutableDictionary dictionary];
+  // Recognizers for Apple TV remote buttons
+  // Menu recognizer
+  self.tvMenuKeyRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuPressed:)];
+  self.tvMenuKeyRecognizer.allowedPressTypes = @[@(UIPressTypeMenu)];
+
+  // Play/Pause
+  [self addTapGestureRecognizerWithSelector:@selector(playPausePressed:)
+                                  pressType:UIPressTypePlayPause
+                                       name:RCTTVRemoteEventPlayPause];
+
+  // Select
+  [self addTapGestureRecognizerWithSelector:@selector(selectPressed:)
+                                  pressType:UIPressTypeSelect
+                                       name:RCTTVRemoteEventSelect];
+
+  // Up
+  [self addTapGestureRecognizerWithSelector:@selector(tappedUp:)
+                                  pressType:UIPressTypeUpArrow
+                                       name:RCTTVRemoteEventUp];
+
+  // Down
+  [self addTapGestureRecognizerWithSelector:@selector(tappedDown:)
+                                  pressType:UIPressTypeDownArrow
+                                       name:RCTTVRemoteEventDown];
+
+  // Left
+  [self addTapGestureRecognizerWithSelector:@selector(tappedLeft:)
+                                  pressType:UIPressTypeLeftArrow
+                                       name:RCTTVRemoteEventLeft];
+
+  // Right
+  [self addTapGestureRecognizerWithSelector:@selector(tappedRight:)
+                                  pressType:UIPressTypeRightArrow
+                                       name:RCTTVRemoteEventRight];
+
+  // Recognizers for long button presses
+  // We don't intercept long menu press -- that's used by the system to go to the home screen
+
+  [self addLongPressGestureRecognizerWithSelector:@selector(longPlayPausePressed:)
+                                        pressType:UIPressTypePlayPause
+                                             name:RCTTVRemoteEventLongPlayPause];
+
+  [self addLongPressGestureRecognizerWithSelector:@selector(longSelectPressed:)
+                                        pressType:UIPressTypeSelect
+                                             name:RCTTVRemoteEventLongSelect];
+
+  // Recognizers for Apple TV remote trackpad swipes
+
+  // Up
+  [self addSwipeGestureRecognizerWithSelector:@selector(swipedUp:)
+                                    direction:UISwipeGestureRecognizerDirectionUp
+                                         name:RCTTVRemoteEventSwipeUp];
+
+  // Down
+  [self addSwipeGestureRecognizerWithSelector:@selector(swipedDown:)
+                                    direction:UISwipeGestureRecognizerDirectionDown
+                                         name:RCTTVRemoteEventSwipeDown];
+
+  // Left
+  [self addSwipeGestureRecognizerWithSelector:@selector(swipedLeft:)
+                                    direction:UISwipeGestureRecognizerDirectionLeft
+                                         name:RCTTVRemoteEventSwipeLeft];
+
+  // Right
+  [self addSwipeGestureRecognizerWithSelector:@selector(swipedRight:)
+                                    direction:UISwipeGestureRecognizerDirectionRight
+                                         name:RCTTVRemoteEventSwipeRight];
 
-    // Recognizers for Apple TV remote buttons
-    // Menu recognizer
-    self.tvMenuKeyRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuPressed:)];
-    self.tvMenuKeyRecognizer.allowedPressTypes = @[@(UIPressTypeMenu)];
-
-    // Play/Pause
-    [self addTapGestureRecognizerWithSelector:@selector(playPausePressed:)
-                                    pressType:UIPressTypePlayPause
-                                         name:RCTTVRemoteEventPlayPause];
-
-    // Select
-    [self addTapGestureRecognizerWithSelector:@selector(selectPressed:)
-                                    pressType:UIPressTypeSelect
-                                         name:RCTTVRemoteEventSelect];
-
-    // Up
-    [self addTapGestureRecognizerWithSelector:@selector(tappedUp:)
-                                    pressType:UIPressTypeUpArrow
-                                         name:RCTTVRemoteEventUp];
-
-    // Down
-    [self addTapGestureRecognizerWithSelector:@selector(tappedDown:)
-                                    pressType:UIPressTypeDownArrow
-                                         name:RCTTVRemoteEventDown];
-
-    // Left
-    [self addTapGestureRecognizerWithSelector:@selector(tappedLeft:)
-                                    pressType:UIPressTypeLeftArrow
-                                         name:RCTTVRemoteEventLeft];
-
-    // Right
-    [self addTapGestureRecognizerWithSelector:@selector(tappedRight:)
-                                    pressType:UIPressTypeRightArrow
-                                         name:RCTTVRemoteEventRight];
-
-    // Recognizers for long button presses
-    // We don't intercept long menu press -- that's used by the system to go to the home screen
-
-    [self addLongPressGestureRecognizerWithSelector:@selector(longPlayPausePressed:)
-                                          pressType:UIPressTypePlayPause
-                                               name:RCTTVRemoteEventLongPlayPause];
-
-    [self addLongPressGestureRecognizerWithSelector:@selector(longSelectPressed:)
-                                          pressType:UIPressTypeSelect
-                                               name:RCTTVRemoteEventLongSelect];
-
-    // Recognizers for Apple TV remote trackpad swipes
-
-    // Up
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedUp:)
-                                      direction:UISwipeGestureRecognizerDirectionUp
-                                           name:RCTTVRemoteEventSwipeUp];
-
-    // Down
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedDown:)
-                                      direction:UISwipeGestureRecognizerDirectionDown
-                                           name:RCTTVRemoteEventSwipeDown];
-
-    // Left
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedLeft:)
-                                      direction:UISwipeGestureRecognizerDirectionLeft
-                                           name:RCTTVRemoteEventSwipeLeft];
-
-    // Right
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedRight:)
-                                      direction:UISwipeGestureRecognizerDirectionRight
-                                           name:RCTTVRemoteEventSwipeRight];
-  }
+}
 
-  return self;
+- (void)attachToView
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(enableTVMenuKey)
+                                                 name:RCTTVEnableMenuKeyNotification
+                                               object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(disableTVMenuKey)
+                                                 name:RCTTVDisableMenuKeyNotification
+                                               object:nil];
+    for (NSString *key in [self.tvRemoteGestureRecognizers allKeys]) {
+      [_view addGestureRecognizer:self.tvRemoteGestureRecognizers[key]];
+    }
+    if ([RCTTVRemoteHandler useMenuKey]) {
+        [self enableTVMenuKey];
+    } else {
+        [self disableTVMenuKey];
+    }
+}
+
+- (void)detachFromView
+{
+    if ([[self.view gestureRecognizers] containsObject:self.tvMenuKeyRecognizer]) {
+        [self.view removeGestureRecognizer:self.tvMenuKeyRecognizer];
+    }
+    for (NSString *key in [self.tvRemoteGestureRecognizers allKeys]) {
+      [_view removeGestureRecognizer:self.tvRemoteGestureRecognizers[key]];
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:RCTTVEnableMenuKeyNotification
+                                                  object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:RCTTVDisableMenuKeyNotification
+                                                  object:nil];
+    
+}
+
+# pragma mark -
+# pragma mark Notification handlers
+
+- (void)enableTVMenuKey
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (![[self.view gestureRecognizers] containsObject:self.tvMenuKeyRecognizer]) {
+            [self.view addGestureRecognizer:self.tvMenuKeyRecognizer];
+        }
+    });
 }
 
+- (void)disableTVMenuKey
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([[self.view gestureRecognizers] containsObject:self.tvMenuKeyRecognizer]) {
+            [self.view removeGestureRecognizer:self.tvMenuKeyRecognizer];
+        }
+    });
+}
+
+# pragma mark -
+# pragma mark Gesture handlers
+
 - (void)playPausePressed:(UIGestureRecognizer *)r
 {
   [self sendAppleTVEvent:RCTTVRemoteEventPlayPause toView:r.view];
@@ -189,6 +291,7 @@ NSString *const RCTTVRemoteEventSwipeDown = @"swipeDown";
 }
 
 #pragma mark -
+#pragma mark Convenience methods for adding gesture recognizers
 
 - (void)addLongPressGestureRecognizerWithSelector:(nonnull SEL)selector
                                         pressType:(UIPressType)pressType

package/React/Modules/RCTTVMenuBridge.m

@@ -6,6 +6,7 @@
 
 #import "RCTTVMenuBridge.h"
 #import <React/RCTRootView.h>
+#import <React/RCTTVRemoteHandler.h>
 
 @implementation RCTTVMenuBridge
 
@@ -13,11 +14,13 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(enableTVMenuKey)
 {
+    [RCTTVRemoteHandler setUseMenuKey:YES];
     [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnableMenuKeyNotification object:nil];
 }
 
 RCT_EXPORT_METHOD(disableTVMenuKey)
 {
+    [RCTTVRemoteHandler setUseMenuKey:NO];
     [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisableMenuKeyNotification object:nil];
 }
 

package/React/Views/RCTModalHostView.m

@@ -49,7 +49,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
     _menuButtonGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
                                                                            action:@selector(menuButtonPressed:)];
     _menuButtonGestureRecognizer.allowedPressTypes = @[ @(UIPressTypeMenu) ];
-    self.tvRemoteHandler = [RCTTVRemoteHandler new];
+    self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:self];
 #endif
     _isPresented = NO;
 
@@ -63,6 +63,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
 }
 
 #if TARGET_OS_TV
+- (void)dealloc
+{
+    self.tvRemoteHandler = nil;
+}
+
 - (void)menuButtonPressed:(__unused UIGestureRecognizer *)gestureRecognizer
 {
   if (_onRequestClose) {
@@ -119,11 +124,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
   [super insertReactSubview:subview atIndex:atIndex];
   [_touchHandler attachToView:subview];
 #if TARGET_OS_TV
-  for (NSString *key in [self.tvRemoteHandler.tvRemoteGestureRecognizers allKeys]) {
-    if (![key isEqualToString:RCTTVRemoteEventMenu]) {
-      [subview addGestureRecognizer:self.tvRemoteHandler.tvRemoteGestureRecognizers[key]];
-    }
-  }
   if (_onRequestClose) {
     [subview addGestureRecognizer:_menuButtonGestureRecognizer];
   }
@@ -143,9 +143,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
   if (_menuButtonGestureRecognizer) {
     [subview removeGestureRecognizer:_menuButtonGestureRecognizer];
   }
-  for (UIGestureRecognizer *gr in self.tvRemoteHandler.tvRemoteGestureRecognizers) {
-    [subview removeGestureRecognizer:gr];
-  }
 #endif
   _reactSubview = nil;
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.64.2-3
+VERSION_NAME=0.64.2-4
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/android/com/facebook/react/react-native/0.64.2-4/react-native-0.64.2-4-sources.jar.md5

@@ -0,0 +1 @@
+5af97ab5916e36594287142cf6d5b4e7

package/android/com/facebook/react/react-native/0.64.2-4/react-native-0.64.2-4-sources.jar.sha1

@@ -0,0 +1 @@
+b6f3146f2cc0274f0c89ac592866f171400dacc4

package/android/com/facebook/react/react-native/{0.64.2-3/react-native-0.64.2-3.pom → 0.64.2-4/react-native-0.64.2-4.pom}

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.64.2-3</version>
+  <version>0.64.2-4</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.64.2-4/react-native-0.64.2-4.pom.md5

@@ -0,0 +1 @@
+0add7dd5b03a43bbf55520514e47b9ac

package/android/com/facebook/react/react-native/0.64.2-4/react-native-0.64.2-4.pom.sha1

@@ -0,0 +1 @@
+6ce251aa47b824176c70dd334d5fb32925028766

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <release>0.64.2-3</release>
+    <release>0.64.2-4</release>
     <versions>
-      <version>0.64.2-3</version>
+      <version>0.64.2-4</version>
     </versions>
-    <lastUpdated>20210908203041</lastUpdated>
+    <lastUpdated>20210918182424</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-a6b993c1610d8c6b22703e60b3253b95
+58c4fe738dc622d3975f141139831785

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-494ecd3499ac11b70b67400c66d8d63441c86f4a
+addb4371d384064a4aaadfc4770f8c24a398ba53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.64.2-3",
+  "version": "0.64.2-4",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.1",
-    "react-native": "npm:react-native-tvos@0.64.2-3"
+    "react-native": "npm:react-native-tvos@0.64.2-4"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

package/android/com/facebook/react/react-native/0.64.2-3/react-native-0.64.2-3-sources.jar.md5

@@ -1 +0,0 @@
-d6eafef921c1d6bb980df5ff65589919

package/android/com/facebook/react/react-native/0.64.2-3/react-native-0.64.2-3-sources.jar.sha1

@@ -1 +0,0 @@
-49d62471142ef0c5bfeea4ee2f7b511985540825

package/android/com/facebook/react/react-native/0.64.2-3/react-native-0.64.2-3.pom.md5

@@ -1 +0,0 @@
-760a5560f5e65c09433111bf4e0b35bd

package/android/com/facebook/react/react-native/0.64.2-3/react-native-0.64.2-3.pom.sha1

@@ -1 +0,0 @@
-5c40ce01d1c57f828430185b980d2a1c7f94828a