Merge pull request #1978 from Gauravjeetsingh/minor-issues

Alpha QA issues
KhalisFoundation · Jun 17, 2024 · 0ebab2a · 0ebab2a
2 parents ed07d29 + ceaf7b7
commit 0ebab2a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 23 deletions.
diff --git a/www/main/addons/announcement/components/Annoucement.jsx b/www/main/addons/announcement/components/Annoucement.jsx
@@ -87,7 +87,7 @@ const Announcement = ({ isGurmukhi }) => {
         <textarea
           className={classNames(
             'announcement-text',
-            keyboardOpenStatus && 'gurmukhi',
+            keyboardOpenStatus && isGurmukhi && 'gurmukhi',
             isGurmukhi && 'gurmukhi',
             'disable-kb-shortcuts',
           )}

diff --git a/www/main/addons/ceremonies/components/CeremonyPane.jsx b/www/main/addons/ceremonies/components/CeremonyPane.jsx
@@ -136,8 +136,8 @@ const CeremonyPane = ({ token, name, id, onScreenClose }) => {
     current: getTheme(currentTheme),
   };
 
-  const openCeremonyFromDropdown = (givenPane) => {
-    onThemeClick(paneSelector.current.dataset.theme, givenPane);
+  const openCeremonyFromDropdown = (e, givenPane) => {
+    onThemeClick(e, paneSelector.current.dataset.theme, givenPane);
     setPaneSelectorActive(false);
   };
 

diff --git a/www/main/common/sttm-ui/multipane-dropdown/MultipaneDropdown.jsx b/www/main/common/sttm-ui/multipane-dropdown/MultipaneDropdown.jsx
@@ -16,9 +16,9 @@ const MultipaneDropdown = ({
   const dropdownOptions = [pane1, pane2, pane3].map((item, index) => (
     <p
       key={`pane-option-${index + 1}`}
-      onClick={() => {
+      onClick={(e) => {
         if (!item.locked) {
-          clickHandler(index + 1);
+          clickHandler(e, index + 1);
         }
       }}
       title={item.locked ? i18n.t('MULTI_PANE.LOCKED_PANE_MSG') : ''}

diff --git a/www/main/navigator/shabad/ShabadContent.jsx b/www/main/navigator/shabad/ShabadContent.jsx
@@ -426,10 +426,8 @@ const ShabadContent = () => {
       loadCeremony(ceremonyId).then((ceremonyVerses) => {
         if (ceremonyVerses) {
           setActiveShabad(ceremonyVerses);
-          const newEntry = saveToHistory(ceremonyVerses, 'ceremony');
-          if (newEntry) {
-            openFirstVerse(ceremonyVerses[0].ID, ceremonyVerses[0].crossPlatformID);
-          }
+          saveToHistory(ceremonyVerses, 'ceremony');
+          openFirstVerse(ceremonyVerses[0].ID, ceremonyVerses[0].crossPlatformID);
         }
       });
     } else {

diff --git a/www/main/navigator/shabad/ShabadText.jsx b/www/main/navigator/shabad/ShabadText.jsx
@@ -159,6 +159,7 @@ export const ShabadText = ({
             initialVerseId,
           );
           setFilteredItems(filterRequiredVerseItems(verseList));
+          updateTraversedVerse(verseList[0].ID, 0);
         }
       });
     }
@@ -213,8 +214,10 @@ export const ShabadText = ({
         activeVerse: activeVerseId,
       });
       const verseIndex = filteredItems.findIndex((verse) => verse.verseId === activeVerseId);
-      if (verseIndex >= 0) setActiveVerse({ [verseIndex]: activeVerseId });
-      scrollToVerse(activeVerseId, filteredItems, virtuosoRef);
+      if (verseIndex >= 0 && activeVerseId !== 61 && filteredItems[verseIndex].verse !== ',') {
+        setActiveVerse({ [verseIndex]: activeVerseId });
+        scrollToVerse(activeVerseId, filteredItems, virtuosoRef);
+      }
     }
   }, [activeShabadId, activeVerseId, sundarGutkaBaniId, ceremonyId]);
 

diff --git a/www/main/navigator/shabad/utils/scroll-to-verse.js b/www/main/navigator/shabad/utils/scroll-to-verse.js
@@ -1,8 +1,11 @@
 export const scrollToVerse = (verseId, activeShabad, virtuosoRef) => {
   const verseIndex = activeShabad.findIndex((obj) => obj.verseId === verseId);
-  virtuosoRef.current.scrollToIndex({
-    index: verseIndex,
-    behavior: 'smooth',
-    align: 'center',
-  });
+  // Ignoring flower verse to avoid unwanted scroll during asa di vaar
+  if (verseIndex >= 0 && verseId !== 61 && activeShabad[verseIndex].verse !== ',') {
+    virtuosoRef.current.scrollToIndex({
+      index: verseIndex,
+      behavior: 'smooth',
+      align: 'center',
+    });
+  }
 };
diff --git a/www/obs/index.html b/www/obs/index.html
@@ -247,13 +247,16 @@
 
       document.body.style.backgroundColor = overlayColor;
 
-      const $gurbani = document.querySelector('.o-gurbani');
-      const { overlayLarivaar, larivaarAssist } = overlayPrefs;
-      let line = '';
-      if ($gurbani.children.length) {
-        line = [...$gurbani.children].map(word => word.innerHTML).join(' ');
-      }
-      $gurbani.innerHTML = assist(line, overlayLarivaar, larivaarAssist);
+      const $gurbaniWrapper = document.querySelectorAll('.o-gurbani');
+
+      $gurbaniWrapper.forEach($gurbani => {
+        let line = '';
+        const { overlayLarivaar, larivaarAssist } = overlayPrefs;
+        if ($gurbani.children.length) {
+          line = [...$gurbani.children].map(word => word.innerHTML).join(' ');
+        }
+        $gurbani.innerHTML = assist(line, overlayLarivaar, larivaarAssist);
+      });
     };
 
     socket.on('show-line', request => {