Merge branch 'release-2.1.6' into develop

Author: catarak

client/modules/App/App.jsx

@@ -7,6 +7,13 @@ import { setPreviousPath } from '../IDE/actions/ide';
 import { setLanguage } from '../IDE/actions/preferences';
 import CookieConsent from '../User/components/CookieConsent';
 
+function hideCookieConsent(pathname) {
+  if (pathname.includes('/full/') || pathname.includes('/embed/')) {
+    return true;
+  }
+  return false;
+}
+
 class App extends React.Component {
   constructor(props, context) {
     super(props, context);
@@ -40,9 +47,10 @@ class App extends React.Component {
   }
 
   render() {
+    const hide = hideCookieConsent(this.props.location.pathname);
     return (
       <div className="app">
-        <CookieConsent />
+        <CookieConsent hide={hide} />
         {this.state.isMounted &&
           !window.devToolsExtension &&
           getConfig('NODE_ENV') === 'development' && <DevTools />}

client/modules/User/components/CookieConsent.jsx

@@ -6,6 +6,7 @@ import ReactGA from 'react-ga';
 import { Transition } from 'react-transition-group';
 import { Link } from 'react-router';
 import { Trans, useTranslation } from 'react-i18next';
+import { PropTypes } from 'prop-types';
 import getConfig from '../../../utils/getConfig';
 import { setUserCookieConsent } from '../actions';
 import { remSize, prop, device } from '../../../theme';
@@ -72,7 +73,7 @@ const CookieConsentButtons = styled.div`
   }
 `;
 
-function CookieConsent() {
+function CookieConsent({ hide }) {
   const user = useSelector((state) => state.user);
   const [cookieConsent, setBrowserCookieConsent] = useState('none');
   const [inProp, setInProp] = useState(false);
@@ -154,6 +155,8 @@ function CookieConsent() {
     }
   }, [cookieConsent]);
 
+  if (hide) return null;
+
   return (
     <Transition in={inProp} timeout={500}>
       {(state) => (
@@ -186,4 +189,12 @@ function CookieConsent() {
   );
 }
 
+CookieConsent.propTypes = {
+  hide: PropTypes.bool
+};
+
+CookieConsent.defaultProps = {
+  hide: false
+};
+
 export default CookieConsent;

package-lock.json

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