Merge pull request #55 from t-kazu/feature/rubyCode-props

rubyCodeに関するリファクタリングを行いました

Author: takaokouji

src/components/gui/gui.jsx

@@ -349,9 +349,7 @@ GUIComponent.propTypes = {
     onToggleLoginOpen: PropTypes.func,
     onUpdateProjectTitle: PropTypes.func,
     renderLogin: PropTypes.func,
-    rubyCode: PropTypes.shape({
-        rubyCode: PropTypes.string
-    }),
+    rubyCode: PropTypes.string,
     rubyTabVisible: PropTypes.bool,
     soundsTabVisible: PropTypes.bool,
     stageSizeMode: PropTypes.oneOf(Object.keys(STAGE_SIZE_MODES)),

src/containers/gui.jsx

@@ -109,7 +109,7 @@ const mapStateToProps = state => ({
     soundsTabVisible: state.scratchGui.editorTab.activeTabIndex === SOUNDS_TAB_INDEX,
     tipsLibraryVisible: state.scratchGui.modals.tipsLibrary,
     rubyTabVisible: state.scratchGui.editorTab.activeTabIndex === RUBY_TAB_INDEX,
-    rubyCode: state.scratchGui.rubyCode,
+    rubyCode: state.scratchGui.rubyCode.code,
     vm: state.scratchGui.vm
 });
 

src/containers/ruby-tab.jsx

@@ -19,15 +19,13 @@ const RubyTab = ({rubyCode}) => (
             showInvisibles: true
         }}
         theme="clouds"
-        value={rubyCode.rubyCode}
+        value={rubyCode}
         width="100%"
     />
 );
 
 RubyTab.propTypes = {
-    rubyCode: PropTypes.shape({
-        rubyCode: PropTypes.string
-    })
+    rubyCode: PropTypes.string
 };
 
 export default RubyTab;

src/reducers/ruby-code.js

@@ -1,15 +1,15 @@
 const UPDATE_RUBYCODE = 'smalruby3-gui/navigation/UPDATE_RUBYCODE';
 
 const initialState = {
-    rubyCode: ''
+    code: ''
 };
 
 const reducer = function (state, action) {
     if (typeof state === 'undefined') state = initialState;
     switch (action.type) {
     case UPDATE_RUBYCODE:
         return {
-            rubyCode: action.rubyCode
+            code: action.code
         };
     default:
         return state;
@@ -19,7 +19,7 @@ const reducer = function (state, action) {
 const updateRubyCode = function (code) {
     return {
         type: UPDATE_RUBYCODE,
-        rubyCode: code
+        code: code
     };
 };