Handle fixed potion, handle body and html, handle resize, handle editor refocus to same line

Author: pwjablonski

src/actions/ui.js

@@ -14,7 +14,7 @@ export const editorFocusedRequestedLine = createAction(
 
 export const editorFocused = createAction(
   'EDITOR_FOCUSED',
-  language => ({language}),
+  (source, cursor, language) => ({source, cursor, language}),
 );
 
 export const editorBlurred = createAction(

src/components/Editor.jsx

@@ -100,12 +100,6 @@ class Editor extends React.Component {
       this._startNewSession(this.props.source);
       this._resizeEditor();
       this._editor.on('focus', this._resizeEditor);
-      this._editor.on('blur', () => {
-        this.props.onEditorBlurred();
-      });
-      this._editor.on('focus', () => {
-        this.props.onEditorFocused(this.props.language);
-      });
       this._editor.setOptions({
         fontFamily: 'Inconsolata',
         fontSize: '14px',
@@ -125,17 +119,27 @@ class Editor extends React.Component {
 
   _startNewSession(source) {
     const session = createAceSessionWithoutWorker(this.props.language, source);
+    const cursor = session.selection.lead;
     session.on('change', () => {
       this.props.onInput(this._editor.getValue());
     });
     session.selection.on('changeCursor', () => {
-      const cursor = session.selection.lead;
       this.props.onCursorChange(
         this._editor.getValue(),
         cursor,
         this.props.language,
       );
     });
+    this._editor.on('blur', () => {
+      this.props.onEditorBlurred();
+    });
+    this._editor.on('focus', () => {
+      this.props.onEditorFocused(
+        this._editor.getValue(),
+        cursor,
+        this.props.language,
+      );
+    });
     session.setAnnotations(this.props.errors);
     this._editor.setSession(session);
     this._editor.moveCursorTo(0, 0);

src/components/Workspace.jsx

@@ -142,8 +142,8 @@ class Workspace extends React.Component {
     this.props.dispatch(focusLine(language, line, column));
   }
 
-  _handleEditorFocused(language) {
-    this.props.dispatch(editorFocused(language));
+  _handleEditorFocused(source, cursor, language) {
+    this.props.dispatch(editorFocused(source, cursor, language));
   }
 
   _handleEditorBlurred() {

src/sagas/ui.js

@@ -65,6 +65,7 @@ export default function* () {
     debounceFor('UPDATE_PROJECT_SOURCE', userDoneTyping, 1000),
     takeEvery('POP_OUT_PROJECT', popOutProject),
     takeEvery('CURRENT_CURSOR_CHANGED', updateFocusedSelector),
+    takeEvery('EDITOR_FOCUSED', updateFocusedSelector),
     takeEvery('EXPORT_PROJECT', exportProject),
   ]);
 }