Merge branch 'release-2.1.3' into develop

Author: catarak

.github/workflows/deploy.yml

@@ -2,8 +2,8 @@ name: Deploy to production
 on:
   workflow_run:
     workflows: ["Test"]
-    branches:
-      - release
+    tags:
+      - '*'
     types:
       - completed
 env:

client/modules/IDE/pages/FullView.jsx

@@ -17,13 +17,21 @@ import RootPage from '../../../components/RootPage';
 function FullView(props) {
   const dispatch = useDispatch();
   const project = useSelector((state) => state.project);
+  const [isRendered, setIsRendered] = useState(false);
 
   useEffect(() => {
     dispatch(getProject(props.params.project_id, props.params.username));
   }, []);
 
+  useEffect(() => {
+    // if (isRendered) prevents startSketch() from being called twice
+    // this calls startSketch if REGISTER happens before sketch is fetched
+    if (isRendered) {
+      dispatch(startSketch());
+    }
+  }, [project.id]);
+
   // send register event until iframe is loaded and sends a message back.
-  const [isRendered, setIsRendered] = useState(false);
   const clearInterval = useInterval(() => {
     dispatchMessage({ type: MessageTypes.REGISTER });
   }, 100);

client/modules/User/pages/CollectionView.jsx

@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
 
 import Nav from '../../../components/Nav';
+import RootPage from '../../../components/RootPage';
 
 import CollectionCreate from '../components/CollectionCreate';
 import Collection from '../components/Collection';
@@ -57,11 +58,11 @@ class CollectionView extends React.Component {
 
   render() {
     return (
-      <div className="dashboard">
+      <RootPage>
         <Nav layout="dashboard" />
 
         {this.renderContent()}
-      </div>
+      </RootPage>
     );
   }
 }

package-lock.json

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