refactored CodeEditor to use content of open files

ShyykoSerhiy · ShyykoSerhiy · commit ff360f4cbcf6 · 2017-08-17T12:31:16.000-04:00
diff --git a/src/public/containers/editor/CodeEditor.tsx b/src/public/containers/editor/CodeEditor.tsx
@@ -6,7 +6,13 @@ import { MonacoEditor } from '../../components/editor/MonacoEditor';
 
 
 const mapStateToProps = (state: SockscodeState) => {
-    return { code: state.code };
+    const { open } = state.fileList;
+    if (open) {
+        const file = state.fileList.files.get(open);
+        return { code: file.content };
+    }
+
+    return { code: '' };
 }
 
 const mapDispatchToProps = (dispatch: Dispatch<{}>) => {
diff --git a/src/public/containers/files/FileItem.tsx b/src/public/containers/files/FileItem.tsx
@@ -34,7 +34,7 @@ interface FileItemState {
 @CSSModules(styles)
 class FileItem extends React.Component<FileItemProps, FileItemState>{
     render() {
-        const { onExpandCollapse, onFileOpen, fileId, file, ...other } = this.props;
+        const { onExpandCollapse, onFileOpen, fileId, file, parentFileId, ...other } = this.props;
         return <ListItem
             key={fileId}
             value={fileId}
diff --git a/src/public/reducers/Code.ts b/src/public/reducers/Code.ts
diff --git a/src/public/reducers/FileList.ts b/src/public/reducers/FileList.ts
@@ -1,4 +1,5 @@
 import { EXPAND_COLLAPSE, OPEN_FILE, FileListActions } from '../actions/FileListActions';
+import { CodeChangedLocalAction, CodeChangedRemoteAction, CODE_CHANGED_LOCAL, CODE_CHANGED_REMOTE } from '../actions/Actions';
 import { Map, fromJS } from "immutable";
 
 export interface TreeFile {
@@ -251,19 +252,28 @@ let filesFiles = Map<FileId, File>().withMutations((map) => {
 const dummyState: FileListState = { files: filesFiles, open: null };
 (window as any).zzz = dummyState;
 
-const reducer = (state = dummyState, action: FileListActions) => {
+const reducer = (state = dummyState, action: FileListActions | CodeChangedLocalAction | CodeChangedRemoteAction) => {
     console.log(action);
     switch (action.type) {
-        case EXPAND_COLLAPSE:
+        case EXPAND_COLLAPSE: {
             const { fileId } = action;
             const file = state.files.get(fileId);
             const newFile: File = Object.assign({}, file, { isExpanded: !file.isExpanded });
             return Object.assign({}, state, { files: state.files.set(fileId, newFile) });
-        case OPEN_FILE:
+        }
+        case OPEN_FILE: {
             return Object.assign({}, state, { open: action.fileId });
-        default:
-            return state;
+        }
+        case CODE_CHANGED_LOCAL: case CODE_CHANGED_REMOTE: {
+            const openFileId = state.open;
+            if (openFileId) {
+                const openFile = state.files.get(openFileId);
+                const newFile: File = Object.assign({}, openFile, { content: action.code });
+                return Object.assign({}, state, { files: state.files.set(openFileId, newFile) });
+            }            
+        }
     }
+    return state;
 }
 
 export const fileList = reducer;
diff --git a/src/public/reducers/Reducers.ts b/src/public/reducers/Reducers.ts
@@ -1,15 +1,13 @@
 import { combineReducers } from 'redux'
 
-import { code } from './Code';
 import { roomUuid } from './Room';
 import { fileList, FileListState } from './FileList';
 
 export interface SockscodeState {
-  code: string,
   roomUuid: string,
   fileList: FileListState
 }
 
 export const sockscodeApp = combineReducers({
-  code, roomUuid, fileList
+  roomUuid, fileList
 });
