Merge branch 'master' into playground

Ives van Hoorne · Ives van Hoorne · commit 22f363534e3c · 2018-03-11T21:49:43.000+01:00
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Content/Tabs/index.js b/packages/app/src/app/pages/Sandbox/Editor/Content/Tabs/index.js
@@ -15,13 +15,6 @@ import {
 } from './elements';
 
 class EditorTabs extends React.Component {
-  componentWillMount() {
-    window.addEventListener('keydown', this.closeListener);
-  }
-  componentWillUnmount() {
-    window.removeEventListener('keydown', this.closeListener);
-  }
-
   componentDidUpdate(prevProps) {
     if (this.props.currentModuleId !== prevProps.currentModuleId) {
       // We need to scroll to the tab
@@ -42,16 +35,6 @@ class EditorTabs extends React.Component {
     }
   }
 
-  closeListener = e => {
-    if ((e.ctrlKey || e.metaKey) && e.keyCode === 87) {
-      e.preventDefault();
-      const currentPos = this.props.tabs
-        .filter(x => x)
-        .findIndex(t => t.moduleId === this.props.currentModuleId);
-      this.closeTab(currentPos);
-    }
-  };
-
   closeTab = tabIndex => {
     this.props.signals.editor.tabClosed({ tabIndex });
   };
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Content/index.js b/packages/app/src/app/pages/Sandbox/Editor/Content/index.js
@@ -27,7 +27,9 @@ const settings = store =>
     vimMode: store.preferences.settings.vimMode,
     lintEnabled: store.preferences.settings.lintEnabled,
     codeMirror: store.preferences.settings.codeMirror,
-    tabWidth: store.preferences.settings.tabSize || 2,
+    tabWidth: store.preferences.settings.prettierConfig
+      ? store.preferences.settings.prettierConfig.tabWidth || 2
+      : 2,
   }: Settings);
 
 type Props = {
diff --git a/packages/app/src/app/pages/Sandbox/Editor/index.js b/packages/app/src/app/pages/Sandbox/Editor/index.js
@@ -55,12 +55,15 @@ function ContentSplit({ signals, store, match }) {
             <SplitPane
               split="vertical"
               defaultSize={sandboxOwned ? 16 * 16 : 18 * 16}
+              minSize={0}
               onDragStarted={() => signals.editor.resizingStarted()}
               onDragFinished={() => signals.editor.resizingStopped()}
-              resizerStyle={{
-                visibility: store.workspace.openedWorkspaceItem
-                  ? 'visible'
-                  : 'hidden',
+              onChange={size => {
+                if (size > 0 && !store.workspace.openedWorkspaceItem) {
+                  signals.workspace.setWorkspaceItem({ item: 'files' });
+                } else if (size === 0 && store.workspace.openedWorkspaceItem) {
+                  signals.workspace.setWorkspaceItem({ item: null });
+                }
               }}
               pane1Style={{
                 visibility: store.workspace.openedWorkspaceItem
diff --git a/packages/app/src/app/pages/common/Modals/PreferencesModal/CodeFormatting/Prettier/index.js b/packages/app/src/app/pages/common/Modals/PreferencesModal/CodeFormatting/Prettier/index.js
@@ -88,7 +88,7 @@ function Prettier({ store, signals }) {
           title="Trailing commas"
           type="dropdown"
           options={['none', 'es5', 'all']}
-          {...bindValue('traillingComma')}
+          {...bindValue('trailingComma')}
         />
         <SubDescription>
           Print trailing commas wherever possible.
diff --git a/packages/app/src/app/store/modules/editor/sequences.js b/packages/app/src/app/store/modules/editor/sequences.js
@@ -17,7 +17,15 @@ export const closeQuickActions = set(state`editor.quickActionsOpen`, false);
 
 export const toggleProjectView = toggle(state`editor.isInProjectView`);
 
-export const closeTab = [closeTabByIndex, actions.setCurrentModuleByTab];
+const hasEnoughTabs = when(state`editor.tabs`, tabs => tabs.length > 1);
+
+export const closeTab = [
+  hasEnoughTabs,
+  {
+    false: [],
+    true: [closeTabByIndex, actions.setCurrentModuleByTab],
+  },
+];
 
 export const clearErrors = [
   set(state`editor.errors`, []),
diff --git a/packages/app/src/sandbox/compile.js b/packages/app/src/sandbox/compile.js
@@ -150,6 +150,8 @@ const PREINSTALLED_DEPENDENCIES = [
   'babel-plugin-transform-prevent-infinite-loops',
   'babel-plugin-transform-vue-jsx',
   'babel-plugin-jsx-pragmatic',
+
+  'flow-bin',
 ];
 
 function getDependencies(parsedPackage, configurations) {
diff --git a/packages/app/src/sandbox/url-listeners.js b/packages/app/src/sandbox/url-listeners.js
@@ -37,6 +37,7 @@ export default function setupHistoryListeners() {
           const oldURL = document.location.href;
           origHistoryProto.replaceState.call(window.history, state, '', url);
           const newURL = document.location.href;
+          sendUrlChange(newURL);
           if (newURL.indexOf('#') === -1) {
             window.dispatchEvent(new PopStateEvent('popstate', { state }));
           } else {
diff --git a/packages/common/utils/keybindings.js b/packages/common/utils/keybindings.js
@@ -53,6 +53,18 @@ export const KEYBINDINGS = {
     signal: 'workspace.toggleCurrentWorkspaceItem',
   },
 
+  'editor.close-tab': {
+    title: 'Close Current Tab',
+    type: 'View',
+    bindings: [['Control', 'W']],
+    signal: 'editor.tabClosed',
+    payload: state => ({
+      tabIndex: state.editor.tabs
+        .filter(x => x)
+        .findIndex(t => t.moduleId === state.currentModuleId),
+    }),
+  },
+
   'editor.zen-mode': {
     title: 'Toggle Zen Mode',
     type: 'View',
