Fix navigator.vibrate check, address review comments

indico · Jul 18, 2024 · 73bd348 · 73bd348
1 parent ed589c2
commit 73bd348
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
@@ -37,7 +37,6 @@ function MainSettings() {
     hapticFeedback,
     setHapticFeedback,
   } = useSettings();
-  console.log('hapticFeedback', typeof hapticFeedback);
 
   const toggleDarkMode = () => {
     // Set the theme preference in localStorage and in the SettingsContext

diff --git a/src/pages/participant/ParticipantPage.tsx b/src/pages/participant/ParticipantPage.tsx
@@ -130,7 +130,7 @@ function ParticipantPageContent({
         });
       }
     }
-  }, [participant, errorModal]);
+  }, [participant, errorModal, hapticFeedback]);
 
   const accompanyingPersons = useMemo(() => {
     if (participant?.registrationData) {
@@ -161,7 +161,7 @@ function ParticipantPageContent({
       } finally {
       }
     },
-    [offline, errorModal, soundEffect]
+    [offline, errorModal, soundEffect, hapticFeedback]
   );
 
   useEffect(() => {

diff --git a/src/utils/haptics.ts b/src/utils/haptics.ts
@@ -4,13 +4,13 @@ const patterns = {
   clear: [0],
 };
 
-export function vibrate(pattern: number[]) {
-  if (!navigator.vibrate || !navigator.userActivation.isActive) {
+function vibrate(pattern: number[]) {
+  if (!('vibrate' in navigator) || !navigator.userActivation.isActive) {
     console.warn('Haptics not supported!');
     return;
   }
 
-  navigator.vibrate(pattern);
+  return navigator.vibrate(pattern);
 }
 
 export const playVibration = {