Merge branch 'release-2.19.6' into release

Author: raclim

client/modules/App/components/Overlay.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useRef } from 'react';
-import MediaQuery from 'react-responsive';
+import { useMediaQuery } from 'react-responsive';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
@@ -9,8 +9,8 @@ import type { RootState } from '../../../reducers';
 import ExitIcon from '../../../images/exit.svg';
 
 type OverlayProps = {
-  children?: React.ReactElement;
-  actions?: React.ReactElement;
+  children?: React.ReactNode;
+  actions?: React.ReactNode;
   closeOverlay?: () => void;
   title?: string;
   ariaLabel?: string;
@@ -35,6 +35,9 @@ export const Overlay = ({
 
   const browserHistory = useHistory();
 
+  const isDesktop = useMediaQuery({ minWidth: 770 });
+  const isMobile = useMediaQuery({ maxWidth: 769 });
+
   const close = useCallback(() => {
     const node = ref.current;
     if (!node) return;
@@ -66,7 +69,7 @@ export const Overlay = ({
           <header className="overlay__header">
             <h2 className="overlay__title">{title}</h2>
             <div className="overlay__actions">
-              <MediaQuery minWidth={770}>{actions}</MediaQuery>
+              {isDesktop && actions}
               <button
                 className="overlay__close-button"
                 onClick={close}
@@ -76,11 +79,9 @@ export const Overlay = ({
               </button>
             </div>
           </header>
-          <MediaQuery maxWidth={769}>
-            {actions && (
-              <div className="overlay__actions-mobile">{actions}</div>
-            )}
-          </MediaQuery>
+          {isMobile && actions && (
+            <div className="overlay__actions-mobile">{actions}</div>
+          )}
           {children}
         </section>
       </div>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.19.5",
+  "version": "2.19.6",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",