fix: 🐛 don't throw in useMediaDevices on missing browser API

streamich · Feb 4, 2020 · 0f119fe · 0f119fe
1 parent 2cf2ab0
commit 0f119fe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/useMediaDevices.ts b/src/useMediaDevices.ts
@@ -10,17 +10,16 @@ const useMediaDevices = () => {
     let mounted = true;
 
     const onChange = () => {
-      navigator.mediaDevices &&
-        navigator.mediaDevices
-          .enumerateDevices()
-          .then(devices => {
-            if (mounted) {
-              setState({
-                devices: devices.map(({ deviceId, groupId, kind, label }) => ({ deviceId, groupId, kind, label })),
-              });
-            }
-          })
-          .catch(noop);
+      navigator.mediaDevices
+        .enumerateDevices()
+        .then(devices => {
+          if (mounted) {
+            setState({
+              devices: devices.map(({ deviceId, groupId, kind, label }) => ({ deviceId, groupId, kind, label })),
+            });
+          }
+        })
+        .catch(noop);
     };
 
     on(navigator.mediaDevices, 'devicechange', onChange);
@@ -35,4 +34,6 @@ const useMediaDevices = () => {
   return state;
 };
 
-export default useMediaDevices;
+const useMediaDevicesMock = () => ({});
+
+export default typeof navigator === 'object' && !!navigator.mediaDevices ? useMediaDevices : useMediaDevicesMock;
diff --git a/src/util.ts b/src/util.ts
@@ -1,5 +1,5 @@
 export const isClient = typeof window === 'object';
 
-export const on = (obj: any, ...args: any[]) => obj && obj.addEventListener(...args);
+export const on = (obj: any, ...args: any[]) => obj.addEventListener(...args);
 
-export const off = (obj: any, ...args: any[]) => obj && obj.removeEventListener(...args);
+export const off = (obj: any, ...args: any[]) => obj.removeEventListener(...args);