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

@@ -125,13 +125,16 @@ class Editor extends React.Component {
       this._resizeEditor();
       this._editor.on('focus', this._resizeEditor);
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
       this._editor.on('blur', () => {
         this.props.onEditorBlurred();
       });
       this._editor.on('focus', () => {
         this.props.onEditorFocused(this.props.language);
       });
+=======
+>>>>>>> ec49c81... Handle fixed potion, handle body and html, handle resize, handle editor refocus to same line
       this._editor.setOptions({
         fontFamily: 'Inconsolata',
         fontSize: '14px',
@@ -152,17 +155,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/reducers/ui.js

@@ -1,42 +1,10 @@
-<<<<<<< HEAD
 import {Map} from 'immutable';
 
 import {EditorLocation, Notification, UiState} from '../records';
 
 const defaultState = new UiState();
 
 function addNotification(state, type, severity, metadata = {}) {
-=======
-import Immutable from 'immutable';
-import {
-  updateEditorColumnFlex,
-  updateWorkspaceRowFlex,
-} from '../util/resize';
-
-
-const DEFAULT_COLUMN_FLEX = new Immutable.List(['1', '1', '1']);
-const DEFAULT_ROW_FLEX = new Immutable.List(['1', '1']);
-export const DEFAULT_WORKSPACE = new Immutable.Map({
-  columnFlex: DEFAULT_COLUMN_FLEX,
-  rowFlex: DEFAULT_ROW_FLEX,
-  isDraggingColumnDivider: false,
-});
-
-const defaultState = new Immutable.Map().
-  set('editors', new Immutable.Map({
-    typing: false,
-    requestedFocusedLine: null,
-    textSizeIsLarge: false,
-    focusedSelector: null,
-    focusedEditor: null,
-  })).
-  set('workspace', DEFAULT_WORKSPACE).
-  set('notifications', new Immutable.Map()).
-  set('topBar', new Immutable.Map({openMenu: null})).
-  set('lastRefreshTimestamp', null);
-
-function addNotification(state, type, severity, payload = {}) {
->>>>>>> 54c9f3a... Update Element Highlighter
   return state.setIn(
     ['notifications', type],
     new Notification({type, severity, metadata: new Map(metadata)}),
@@ -72,9 +40,10 @@ export default function ui(stateIn, action) {
     case 'UPDATE_PROJECT_SOURCE':
       return state.set('isTyping', true);
 
-    case 'CURRENT_FOCUSED_SELECTOR_CHANGED':
+    case 'UPDATE_HIGHLIGHTER_SELECTOR':
       return state.setIn(
-        ['editors', 'focusedSelector'], action.payload,
+        ['editors', 'highlighterSelector'],
+        action.payload.selector,
       );
 
     case 'USER_DONE_TYPING':
@@ -90,7 +59,6 @@ export default function ui(stateIn, action) {
         }),
       );
 
-<<<<<<< HEAD
     case 'CLEAR_CONSOLE_ENTRIES':
       return state.set(
         'requestedFocusedLine',
@@ -100,34 +68,6 @@ export default function ui(stateIn, action) {
           column: 0,
         }),
       );
-=======
-    case 'EDITOR_FOCUSED_REQUESTED_LINE':
-      return state.setIn(['editors', 'requestedFocusedLine'], null);
-
-    case 'EDITOR_FOCUSED':
-      return state.setIn(
-        ['editors', 'focusedEditor'],
-        action.payload.language,
-      );
-
-    case 'EDITOR_BLURRED':
-      return state.setIn(
-        ['editors', 'focusedEditor'],
-        null,
-      );
-
-    case 'EDITOR_RESIZED':
-      return state.setIn(
-        ['editors', 'focusedSelector'],
-        null,
-      );
-
-    case 'DRAG_ROW_DIVIDER':
-      return state.updateIn(['workspace', 'columnFlex'], (prevFlex) => {
-        const newFlex = updateEditorColumnFlex(action.payload);
-        return newFlex ? Immutable.fromJS(newFlex) : prevFlex;
-      });
->>>>>>> 23eb7f2... Updates to element highlighter
 
     case 'EDITOR_FOCUSED_REQUESTED_LINE':
       return state.set('requestedFocusedLine', null);