fix: instantiate remotehandler only for tv platforms

flexn-io · Jun 27, 2023 · de4113f · de4113f
1 parent 34ef59e
commit de4113f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/packages/create/src/remoteHandler/index.android.tsx b/packages/create/src/remoteHandler/index.android.tsx
@@ -1,4 +1,4 @@
-import { DeviceEventEmitter, EmitterSubscription } from 'react-native';
+import { DeviceEventEmitter, EmitterSubscription, Platform } from 'react-native';
 import { useEffect, useCallback } from 'react';
 import throttle from 'lodash.throttle';
 
@@ -60,16 +60,17 @@ function useTVRemoteHandler(callback: RemoteHandlerCallbackAndroid) {
     const handler = useCallback(throttle(callback, 100), []);
 
     useEffect(() => {
-        const listener: EmitterSubscription = DeviceEventEmitter.addListener(
-            EVENT_NAME,
-            ({ eventKeyAction, eventType }) => {
+        let listener: EmitterSubscription;
+
+        if (Platform.isTV) {
+            listener = DeviceEventEmitter.addListener(EVENT_NAME, ({ eventKeyAction, eventType }) => {
                 return handler({
                     eventType,
                     eventKeyAction,
                     velocity: 0,
                 });
-            }
-        );
+            });
+        }
 
         return () => {
             if (listener) listener.remove();

diff --git a/packages/create/src/remoteHandler/index.ios.tsx b/packages/create/src/remoteHandler/index.ios.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useCallback } from 'react';
-import { NativeModules, NativeEventEmitter, EmitterSubscription } from 'react-native';
+import { NativeModules, NativeEventEmitter, EmitterSubscription, Platform } from 'react-native';
 import throttle from 'lodash.throttle';
 
 const EVENT_NAME = 'onTVRemoteKey';
@@ -54,18 +54,21 @@ const useTVRemoteHandler = (callback: RemoteHandlerCallbackAppleTV) => {
     const cb = useCallback(throttle(callback, 100), []);
 
     useEffect(() => {
-        const { TvRemoteHandler } = NativeModules;
-        const eventEmitter = new NativeEventEmitter(TvRemoteHandler);
-        const listener: EmitterSubscription = eventEmitter.addListener(
-            EVENT_NAME,
-            (eventData: {
-                eventType: RemoteHandlerEventTypesAppleTV;
-                eventKeyAction: RemoteHandlerEventKeyActions;
-                velocity: number;
-            }) => {
-                cb(eventData);
-            }
-        );
+        let listener: EmitterSubscription;
+        if (Platform.isTV) {
+            const { TvRemoteHandler } = NativeModules;
+            const eventEmitter = new NativeEventEmitter(TvRemoteHandler);
+            listener = eventEmitter.addListener(
+                EVENT_NAME,
+                (eventData: {
+                    eventType: RemoteHandlerEventTypesAppleTV;
+                    eventKeyAction: RemoteHandlerEventKeyActions;
+                    velocity: number;
+                }) => {
+                    cb(eventData);
+                }
+            );
+        }
 
         return () => {
             if (listener) {