Merge branch 'master' into menu-in-access-sheet

Author: siddharthkp

packages/app/src/app/components/CodeEditor/CodeMirror/index.js

@@ -12,6 +12,7 @@ import { getCodeMirror } from 'app/utils/codemirror';
 import CodeMirror from 'codemirror';
 import { listen } from 'codesandbox-api';
 import * as React from 'react';
+import { debounce } from 'lodash-es';
 import { withTheme } from 'styled-components';
 // eslint-disable-next-line
 import LinterWorker from 'worker-loader?publicPath=/&name=monaco-linter.[hash:8].worker.js!app/overmind/effects/vscode/LinterWorker/index';
@@ -54,6 +55,7 @@ class CodemirrorEditor extends React.Component<Props, State> implements Editor {
     this.settings = props.settings;
 
     this.codeSandboxListener = this.setupCodeSandboxListener();
+    this.resizeEditor = debounce(this.resizeEditor, 30);
   }
 
   setupCodeSandboxListener = () => listen(this.handleMessage);
@@ -79,8 +81,7 @@ class CodemirrorEditor extends React.Component<Props, State> implements Editor {
       this.props.width !== nextProps.width ||
       this.props.height !== nextProps.height
     ) {
-      // eslint-disable-next-line no-unused-expressions
-      this.codemirror?.refresh();
+      this.resizeEditor();
       return true;
     }
 
@@ -111,6 +112,11 @@ class CodemirrorEditor extends React.Component<Props, State> implements Editor {
     });
   }
 
+  resizeEditor() {
+    // eslint-disable-next-line no-unused-expressions
+    this.codemirror?.refresh();
+  }
+
   setErrors = (errors: Array<ModuleError>) => {
     const codeLines = this.codemirror.getValue().split('\n');
 

packages/homepage/content/docs/2-git.md

@@ -8,14 +8,13 @@ description:
 
 ## Base Concept
 
-With CodeSandbox you can import any GitHub repositories as a sandbox (this
+With CodeSandbox you can import any GitHub repository as a sandbox (this
 concept is described in more detail [here](/docs/importing#import-from-github)).
 An imported sandbox will automatically stay in sync with the GitHub repository;
 if you make a commit to GitHub it will reflect immediately in the sandbox.
 
 For that reason we've made GitHub sandboxes immutable, this means that you
-cannot make direct changes to the sandbox itself. However, you can still fork
-the sandbox. When you create a fork of a GitHub sandbox we will still keep a
+cannot make direct changes to the sandbox itself. They are treated as [templates](/docs/templates), so you can fork from them. When you create a fork of a GitHub sandbox we will still keep a
 reference to the original GitHub repository. This allows you to create commits
 and open pull requests from the forked sandboxes.
 
@@ -25,7 +24,7 @@ Anyone can import public GitHub repositories. You need a [Pro subscription](http
 
 You can see a forked sandbox of a GitHub sandbox as a separate branch. We still
 keep a reference to the original branch, and we also track the changes that
-happen. When you create a fork of the Git sandbox you will see a new panel in
+happen. When you create a fork of the GitHub sandbox you will see a new panel in
 the sidebar that looks like this:
 
 ![GitHub Sidebar](./images/github-sidebar.png)