Merge pull request #2039 from Gauravjeetsingh/9.2.3-fixes

9.2.3 Beta release QA fixes

Author: Gauravjeetsingh

app.js

@@ -400,10 +400,12 @@ function createBroadcastFiles(arg) {
   const englishFile = `${userDataPath}/sttm-English.txt`;
 
   try {
-    fs.writeFile(gurbaniFile, arg.Line.Gurmukhi.trim(), writeFileCallback);
-    fs.appendFile(gurbaniFile, '\n', writeFileCallback);
-    fs.writeFile(englishFile, arg.Line.English.trim(), writeFileCallback);
-    fs.appendFile(englishFile, '\n', writeFileCallback);
+    if (arg) {
+      fs.writeFile(gurbaniFile, arg?.Line?.Gurmukhi?.trim(), writeFileCallback);
+      fs.appendFile(gurbaniFile, '\n', writeFileCallback);
+      fs.writeFile(englishFile, arg?.Line?.English?.trim(), writeFileCallback);
+      fs.appendFile(englishFile, '\n', writeFileCallback);
+    }
   } catch (err) {
     // eslint-disable-next-line no-console
     console.log(err);

www/main/common/hooks/useKeys.js

@@ -22,7 +22,7 @@ export const useKeys = (key, shortcutType, cb) => {
           }
         }
         if (shortcutType === 'combination') {
-          if (event.code === key && event.ctrlKey) {
+          if (event.code === key && (event.ctrlKey || event.metaKey)) {
             callbackRef.current(event);
           }
         }

www/main/viewer/Slide/Slide.jsx

@@ -129,9 +129,7 @@ const Slide = ({ verseObj, nextLineObj, isMiscSlide, bgColor, updateVerseRef })
     verseObj,
   ]);
 
-  if (!verseObj) return null;
-
-  return (
+  return verseObj ? (
     <div
       className="verse-slide-wrapper"
       id={`verse-${verseObj.ID}`}
@@ -143,7 +141,6 @@ const Slide = ({ verseObj, nextLineObj, isMiscSlide, bgColor, updateVerseRef })
     >
       <CSSTransition in={showVerse} timeout={300} classNames="fade" unmountOnExit>
         <div className={`verse-slide ${leftAlign ? ' slide-left-align' : ''}`}>
-          {isMiscSlide && <SlideAnnouncement getFontSize={getFontSize} isMiscSlide={isMiscSlide} />}
           {verseObj && showVerse && !isMiscSlide && (
             <>
               {verseObj.Gurmukhi && (
@@ -190,6 +187,10 @@ const Slide = ({ verseObj, nextLineObj, isMiscSlide, bgColor, updateVerseRef })
         </div>
       </CSSTransition>
     </div>
+  ) : (
+    <div className="verse-slide-wrapper" style={{ background: bgColor }}>
+      {isMiscSlide && <SlideAnnouncement getFontSize={getFontSize} isMiscSlide={isMiscSlide} />}
+    </div>
   );
 };
 

www/src/scss/viewer/verse-slide/_verse-slide.scss

@@ -7,7 +7,10 @@
   .verse-slide-wrapper {
     align-items: center;
     display: flex;
-    justify-content: center;
+
+    .verse-slide {
+      width: 100%;
+    }
   }
 }