From 44c76e577439876465aba8e3ca86eacf497d3163 Mon Sep 17 00:00:00 2001
From: chrisgarrity <chrisg@media.mit.edu>
Date: Fri, 18 May 2018 14:03:49 -0400
Subject: [PATCH] Combine GUI reducers
* Export initial states for each reducer
* combine all gui reducers (excludes scratchPaint and intl)
* combine all initial states to create default guiState for preloading in www
* expect all of the gui state to be accessible at `state.scratchGui`
---
src/containers/blocks.jsx | 8 +-
src/containers/cards.jsx | 14 ++--
src/containers/costume-tab.jsx | 12 +--
src/containers/custom-procedures.jsx | 2 +-
src/containers/gui.jsx | 27 +++---
src/containers/monitor-list.jsx | 2 +-
src/containers/monitor.jsx | 2 +-
src/containers/paint-editor-wrapper.jsx | 4 +-
src/containers/project-loader.jsx | 2 +-
src/containers/project-saver.jsx | 2 +-
src/containers/record-modal.jsx | 2 +-
src/containers/sound-editor.jsx | 8 +-
src/containers/sound-tab.jsx | 10 +--
src/containers/sprite-selector-item.jsx | 6 +-
src/containers/stage-header.jsx | 6 +-
src/containers/stage-selector.jsx | 4 +-
src/containers/stage.jsx | 6 +-
src/containers/target-pane.jsx | 14 ++--
src/containers/tips-library.jsx | 2 +-
src/lib/app-state-hoc.jsx | 44 +++++-----
src/lib/vm-listener-hoc.jsx | 2 +-
src/playground/blocks-only.jsx | 2 +-
src/reducers/block-drag.js | 1 +
src/reducers/cards.js | 1 +
src/reducers/color-picker.js | 1 +
src/reducers/custom-procedures.js | 1 +
src/reducers/editor-tab.js | 1 +
src/reducers/gui.js | 84 ++++++++++++++-----
src/reducers/hovered-target.js | 1 +
src/reducers/menus.js | 5 +-
src/reducers/modals.js | 1 +
src/reducers/mode.js | 2 +-
src/reducers/monitor-layout.js | 1 +
src/reducers/monitors.js | 1 +
src/reducers/stage-size.js | 1 +
src/reducers/targets.js | 1 +
src/reducers/toolbox.js | 1 +
src/reducers/vm.js | 1 +
test/unit/containers/sound-editor.test.jsx | 2 +-
.../containers/sprite-selector-item.test.jsx | 4 +-
40 files changed, 173 insertions(+), 118 deletions(-)
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 00c395726..fbcc66161 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -445,12 +445,12 @@ Blocks.defaultProps = {
};
const mapStateToProps = state => ({
- anyModalVisible: Object.keys(state.modals).some(key => state.modals[key]),
- extensionLibraryVisible: state.modals.extensionLibrary,
+ anyModalVisible: Object.keys(state.scratchGui.modals).some(key => state.scratchGui.modals[key]),
+ extensionLibraryVisible: state.scratchGui.modals.extensionLibrary,
locale: state.intl.locale,
messages: state.intl.messages,
- toolboxXML: state.toolbox.toolboxXML,
- customProceduresVisible: state.customProcedures.active
+ toolboxXML: state.scratchGui.toolbox.toolboxXML,
+ customProceduresVisible: state.scratchGui.customProcedures.active
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/cards.jsx b/src/containers/cards.jsx
index 3d08932f7..5dc081f7b 100644
--- a/src/containers/cards.jsx
+++ b/src/containers/cards.jsx
@@ -17,13 +17,13 @@ import {
import CardsComponent from '../components/cards/cards.jsx';
const mapStateToProps = state => ({
- visible: state.cards.visible,
- content: state.cards.content,
- activeDeckId: state.cards.activeDeckId,
- step: state.cards.step,
- x: state.cards.x,
- y: state.cards.y,
- dragging: state.cards.dragging
+ visible: state.scratchGui.cards.visible,
+ content: state.scratchGui.cards.content,
+ activeDeckId: state.scratchGui.cards.activeDeckId,
+ step: state.scratchGui.cards.step,
+ x: state.scratchGui.cards.x,
+ y: state.scratchGui.cards.y,
+ dragging: state.scratchGui.cards.dragging
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/costume-tab.jsx b/src/containers/costume-tab.jsx
index 8f203e633..3ce034caa 100644
--- a/src/containers/costume-tab.jsx
+++ b/src/containers/costume-tab.jsx
@@ -337,12 +337,12 @@ CostumeTab.propTypes = {
};
const mapStateToProps = state => ({
- editingTarget: state.targets.editingTarget,
- sprites: state.targets.sprites,
- stage: state.targets.stage,
- cameraModalVisible: state.modals.cameraCapture,
- costumeLibraryVisible: state.modals.costumeLibrary,
- backdropLibraryVisible: state.modals.backdropLibrary
+ editingTarget: state.scratchGui.targets.editingTarget,
+ sprites: state.scratchGui.targets.sprites,
+ stage: state.scratchGui.targets.stage,
+ cameraModalVisible: state.scratchGui.modals.cameraCapture,
+ costumeLibraryVisible: state.scratchGui.modals.costumeLibrary,
+ backdropLibraryVisible: state.scratchGui.modals.backdropLibrary
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/custom-procedures.jsx b/src/containers/custom-procedures.jsx
index 7605fd4b6..879800aae 100644
--- a/src/containers/custom-procedures.jsx
+++ b/src/containers/custom-procedures.jsx
@@ -147,7 +147,7 @@ CustomProcedures.defaultProps = {
};
const mapStateToProps = state => ({
- mutator: state.customProcedures.mutator
+ mutator: state.scratchGui.customProcedures.mutator
});
export default connect(
diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx
index bc241be96..62c34de67 100644
--- a/src/containers/gui.jsx
+++ b/src/containers/gui.jsx
@@ -13,6 +13,7 @@ import {
COSTUMES_TAB_INDEX,
SOUNDS_TAB_INDEX
} from '../reducers/editor-tab';
+import {setPlayer} from '../reducers/mode';
import ProjectLoaderHOC from '../lib/project-loader-hoc.jsx';
import vmListenerHOC from '../lib/vm-listener-hoc.jsx';
@@ -99,24 +100,26 @@ GUI.propTypes = {
GUI.defaultProps = GUIComponent.defaultProps;
const mapStateToProps = state => ({
- activeTabIndex: state.editorTab.activeTabIndex,
- blocksTabVisible: state.editorTab.activeTabIndex === BLOCKS_TAB_INDEX,
- cardsVisible: state.cards.visible,
- costumesTabVisible: state.editorTab.activeTabIndex === COSTUMES_TAB_INDEX,
- importInfoVisible: state.modals.importInfo,
- isPlayerOnly: state.mode.isPlayerOnly,
- loadingStateVisible: state.modals.loadingProject,
- previewInfoVisible: state.modals.previewInfo,
- targetIsStage: state.targets.stage && state.targets.stage.id === state.targets.editingTarget,
- soundsTabVisible: state.editorTab.activeTabIndex === SOUNDS_TAB_INDEX,
- tipsLibraryVisible: state.modals.tipsLibrary
+ activeTabIndex: state.scratchGui.editorTab.activeTabIndex,
+ blocksTabVisible: state.scratchGui.editorTab.activeTabIndex === BLOCKS_TAB_INDEX,
+ cardsVisible: state.scratchGui.cards.visible,
+ costumesTabVisible: state.scratchGui.editorTab.activeTabIndex === COSTUMES_TAB_INDEX,
+ importInfoVisible: state.scratchGui.modals.importInfo,
+ isPlayerOnly: state.scratchGui.mode.isPlayerOnly,
+ loadingStateVisible: state.scratchGui.modals.loadingProject,
+ previewInfoVisible: state.scratchGui.modals.previewInfo,
+ targetIsStage: state.scratchGui.targets.stage &&
+ state.scratchGui.targets.stage.id === state.scratchGui.targets.editingTarget,
+ soundsTabVisible: state.scratchGui.editorTab.activeTabIndex === SOUNDS_TAB_INDEX,
+ tipsLibraryVisible: state.scratchGui.modals.tipsLibrary
});
const mapDispatchToProps = dispatch => ({
onExtensionButtonClick: () => dispatch(openExtensionLibrary()),
onActivateTab: tab => dispatch(activateTab(tab)),
onActivateCostumesTab: () => dispatch(activateTab(COSTUMES_TAB_INDEX)),
- onActivateSoundsTab: () => dispatch(activateTab(SOUNDS_TAB_INDEX))
+ onActivateSoundsTab: () => dispatch(activateTab(SOUNDS_TAB_INDEX)),
+ onSetPlayerMode: player => dispatch(setPlayer(player))
});
const ConnectedGUI = connect(
diff --git a/src/containers/monitor-list.jsx b/src/containers/monitor-list.jsx
index b3dcd5b7c..1499b5fea 100644
--- a/src/containers/monitor-list.jsx
+++ b/src/containers/monitor-list.jsx
@@ -33,7 +33,7 @@ MonitorList.propTypes = {
moveMonitorRect: PropTypes.func.isRequired
};
const mapStateToProps = state => ({
- monitors: state.monitors
+ monitors: state.scratchGui.monitors
});
const mapDispatchToProps = dispatch => ({
moveMonitorRect: (id, x, y) => dispatch(moveMonitorRect(id, x, y))
diff --git a/src/containers/monitor.jsx b/src/containers/monitor.jsx
index fd7a584ad..b39358c08 100644
--- a/src/containers/monitor.jsx
+++ b/src/containers/monitor.jsx
@@ -152,7 +152,7 @@ Monitor.propTypes = {
y: PropTypes.number
};
const mapStateToProps = state => ({
- monitorLayout: state.monitorLayout
+ monitorLayout: state.scratchGui.monitorLayout
});
const mapDispatchToProps = dispatch => ({
addMonitorRect: (id, rect, savePosition) =>
diff --git a/src/containers/paint-editor-wrapper.jsx b/src/containers/paint-editor-wrapper.jsx
index 495df1a93..9b606f3da 100644
--- a/src/containers/paint-editor-wrapper.jsx
+++ b/src/containers/paint-editor-wrapper.jsx
@@ -66,7 +66,7 @@ const mapStateToProps = (state, {selectedCostumeIndex}) => {
editingTarget,
sprites,
stage
- } = state.targets;
+ } = state.scratchGui.targets;
const target = editingTarget && sprites[editingTarget] ? sprites[editingTarget] : stage;
const costume = target && target.costumes[selectedCostumeIndex];
return {
@@ -75,7 +75,7 @@ const mapStateToProps = (state, {selectedCostumeIndex}) => {
rotationCenterY: costume && costume.rotationCenterY,
imageFormat: costume && costume.dataFormat,
imageId: editingTarget && `${editingTarget}${costume.skinId}`,
- vm: state.vm
+ vm: state.scratchGui.vm
};
};
diff --git a/src/containers/project-loader.jsx b/src/containers/project-loader.jsx
index 782dab60d..80ef161ea 100644
--- a/src/containers/project-loader.jsx
+++ b/src/containers/project-loader.jsx
@@ -100,7 +100,7 @@ ProjectLoader.propTypes = {
};
const mapStateToProps = state => ({
- vm: state.vm
+ vm: state.scratchGui.vm
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/project-saver.jsx b/src/containers/project-saver.jsx
index 0c755c853..c594421ec 100644
--- a/src/containers/project-saver.jsx
+++ b/src/containers/project-saver.jsx
@@ -69,7 +69,7 @@ ProjectSaver.propTypes = {
};
const mapStateToProps = state => ({
- vm: state.vm
+ vm: state.scratchGui.vm
});
export default connect(
diff --git a/src/containers/record-modal.jsx b/src/containers/record-modal.jsx
index f6ac44526..8a57c03d7 100644
--- a/src/containers/record-modal.jsx
+++ b/src/containers/record-modal.jsx
@@ -139,7 +139,7 @@ RecordModal.propTypes = {
};
const mapStateToProps = state => ({
- vm: state.vm
+ vm: state.scratchGui.vm
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/sound-editor.jsx b/src/containers/sound-editor.jsx
index de10ebc2c..6bd793fce 100644
--- a/src/containers/sound-editor.jsx
+++ b/src/containers/sound-editor.jsx
@@ -211,17 +211,17 @@ SoundEditor.propTypes = {
};
const mapStateToProps = (state, {soundIndex}) => {
- const sprite = state.vm.editingTarget.sprite;
+ const sprite = state.scratchGui.vm.editingTarget.sprite;
// Make sure the sound index doesn't go out of range.
const index = soundIndex < sprite.sounds.length ? soundIndex : sprite.sounds.length - 1;
- const sound = state.vm.editingTarget.sprite.sounds[index];
- const audioBuffer = state.vm.getSoundBuffer(index);
+ const sound = state.scratchGui.vm.editingTarget.sprite.sounds[index];
+ const audioBuffer = state.scratchGui.vm.getSoundBuffer(index);
return {
soundId: sound.soundId,
sampleRate: audioBuffer.sampleRate,
samples: audioBuffer.getChannelData(0),
name: sound.name,
- vm: state.vm
+ vm: state.scratchGui.vm
};
};
diff --git a/src/containers/sound-tab.jsx b/src/containers/sound-tab.jsx
index e39a2b6d1..d532c5ee9 100644
--- a/src/containers/sound-tab.jsx
+++ b/src/containers/sound-tab.jsx
@@ -241,11 +241,11 @@ SoundTab.propTypes = {
};
const mapStateToProps = state => ({
- editingTarget: state.targets.editingTarget,
- sprites: state.targets.sprites,
- stage: state.targets.stage,
- soundLibraryVisible: state.modals.soundLibrary,
- soundRecorderVisible: state.modals.soundRecorder
+ editingTarget: state.scratchGui.targets.editingTarget,
+ sprites: state.scratchGui.targets.sprites,
+ stage: state.scratchGui.targets.stage,
+ soundLibraryVisible: state.scratchGui.modals.soundLibrary,
+ soundRecorderVisible: state.scratchGui.modals.soundRecorder
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/sprite-selector-item.jsx b/src/containers/sprite-selector-item.jsx
index edb124b2c..7d3fc2f21 100644
--- a/src/containers/sprite-selector-item.jsx
+++ b/src/containers/sprite-selector-item.jsx
@@ -79,9 +79,9 @@ SpriteSelectorItem.propTypes = {
};
const mapStateToProps = (state, {assetId, costumeURL, id}) => ({
- costumeURL: costumeURL || (assetId && state.vm.runtime.storage.get(assetId).encodeDataURI()),
- receivedBlocks: state.hoveredTarget.receivedBlocks &&
- state.hoveredTarget.sprite === id
+ costumeURL: costumeURL || (assetId && state.scratchGui.vm.runtime.storage.get(assetId).encodeDataURI()),
+ receivedBlocks: state.scratchGui.hoveredTarget.receivedBlocks &&
+ state.scratchGui.hoveredTarget.sprite === id
});
const mapDispatchToProps = dispatch => ({
dispatchSetHoveredSprite: spriteId => {
diff --git a/src/containers/stage-header.jsx b/src/containers/stage-header.jsx
index 65677e29f..883c882fa 100644
--- a/src/containers/stage-header.jsx
+++ b/src/containers/stage-header.jsx
@@ -50,9 +50,9 @@ StageHeader.propTypes = {
};
const mapStateToProps = state => ({
- stageSize: state.stageSize.stageSize,
- isFullScreen: state.mode.isFullScreen,
- isPlayerOnly: state.mode.isPlayerOnly
+ stageSize: state.scratchGui.stageSize.stageSize,
+ isFullScreen: state.scratchGui.mode.isFullScreen,
+ isPlayerOnly: state.scratchGui.mode.isPlayerOnly
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/stage-selector.jsx b/src/containers/stage-selector.jsx
index f3497a54c..a2039796f 100644
--- a/src/containers/stage-selector.jsx
+++ b/src/containers/stage-selector.jsx
@@ -99,8 +99,8 @@ StageSelector.propTypes = {
};
const mapStateToProps = (state, {assetId}) => ({
- url: assetId && state.vm.runtime.storage.get(assetId).encodeDataURI(),
- vm: state.vm
+ url: assetId && state.scratchGui.vm.runtime.storage.get(assetId).encodeDataURI(),
+ vm: state.scratchGui.vm
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx
index b66efa2c5..881c9c929 100644
--- a/src/containers/stage.jsx
+++ b/src/containers/stage.jsx
@@ -395,10 +395,10 @@ Stage.defaultProps = {
};
const mapStateToProps = state => ({
- isColorPicking: state.colorPicker.active,
- isFullScreen: state.mode.isFullScreen,
+ isColorPicking: state.scratchGui.colorPicker.active,
+ isFullScreen: state.scratchGui.mode.isFullScreen,
// Do not use editor drag style in fullscreen or player mode.
- useEditorDragStyle: !(state.mode.isFullScreen || state.mode.isPlayerOnly)
+ useEditorDragStyle: !(state.scratchGui.mode.isFullScreen || state.scratchGui.mode.isPlayerOnly)
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/target-pane.jsx b/src/containers/target-pane.jsx
index 1178ed64e..dd20a4742 100644
--- a/src/containers/target-pane.jsx
+++ b/src/containers/target-pane.jsx
@@ -144,10 +144,10 @@ TargetPane.propTypes = {
};
const mapStateToProps = state => ({
- editingTarget: state.targets.editingTarget,
- hoveredTarget: state.hoveredTarget,
- sprites: Object.keys(state.targets.sprites).reduce((sprites, k) => {
- let {direction, size, x, y, ...sprite} = state.targets.sprites[k];
+ editingTarget: state.scratchGui.targets.editingTarget,
+ hoveredTarget: state.scratchGui.hoveredTarget,
+ sprites: Object.keys(state.scratchGui.targets.sprites).reduce((sprites, k) => {
+ let {direction, size, x, y, ...sprite} = state.scratchGui.targets.sprites[k];
if (typeof direction !== 'undefined') direction = Math.round(direction);
if (typeof x !== 'undefined') x = Math.round(x);
if (typeof y !== 'undefined') y = Math.round(y);
@@ -155,9 +155,9 @@ const mapStateToProps = state => ({
sprites[k] = {...sprite, direction, size, x, y};
return sprites;
}, {}),
- stage: state.targets.stage,
- raiseSprites: state.blockDrag,
- spriteLibraryVisible: state.modals.spriteLibrary
+ stage: state.scratchGui.targets.stage,
+ raiseSprites: state.scratchGui.blockDrag,
+ spriteLibraryVisible: state.scratchGui.modals.spriteLibrary
});
const mapDispatchToProps = dispatch => ({
onNewSpriteClick: e => {
diff --git a/src/containers/tips-library.jsx b/src/containers/tips-library.jsx
index 7d45f37a6..20304cab4 100644
--- a/src/containers/tips-library.jsx
+++ b/src/containers/tips-library.jsx
@@ -61,7 +61,7 @@ TipsLibrary.propTypes = {
};
const mapStateToProps = state => ({
- visible: state.modals.tipsLibrary
+ visible: state.scratchGui.modals.tipsLibrary
});
const mapDispatchToProps = dispatch => ({
diff --git a/src/lib/app-state-hoc.jsx b/src/lib/app-state-hoc.jsx
index 7f7c2b0d6..8093d2381 100644
--- a/src/lib/app-state-hoc.jsx
+++ b/src/lib/app-state-hoc.jsx
@@ -1,14 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import {Provider} from 'react-redux';
-import {createStore, applyMiddleware, compose} from 'redux';
+import {createStore, applyMiddleware, combineReducers, compose} from 'redux';
import throttle from 'redux-throttle';
import {intlShape} from 'react-intl';
import {IntlProvider, updateIntl} from 'react-intl-redux';
-import {intlInitialState} from '../reducers/intl.js';
-import {initialState as modeInitialState, setPlayer, setFullScreen} from '../reducers/mode.js';
-import reducer from '../reducers/gui';
+import intlReducer from '../reducers/intl.js';
+
+import guiReducer, {guiInitialState, initFullScreen, initPlayer} from '../reducers/gui';
+
+import {setPlayer, setFullScreen} from '../reducers/mode.js';
+
+import {ScratchPaintReducer} from 'scratch-paint';
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
const enhancer = composeEnhancers(
@@ -27,32 +31,22 @@ const AppStateHOC = function (WrappedComponent) {
class AppStateWrapper extends React.Component {
constructor (props) {
super(props);
- let intl = {};
- let mode = {};
- if (props.intl) {
- intl = {
- defaultLocale: 'en',
- locale: props.intl.locale,
- messages: props.intl.messages
- };
- } else {
- intl = intlInitialState.intl;
+ let initializedGui = guiInitialState;
+ if (props.isFullScreen) {
+ initializedGui = initFullScreen(initializedGui);
}
- if (props.isPlayerOnly || props.isFullScreen) {
- mode = {
- isFullScreen: props.isFullScreen || false,
- isPlayerOnly: props.isPlayerOnly || false
- };
- } else {
- mode = modeInitialState;
+ if (props.isPlayerOnly) {
+ initializedGui = initPlayer(initializedGui);
}
+ const reducer = combineReducers({
+ intl: intlReducer,
+ scratchGui: guiReducer,
+ scratchPaint: ScratchPaintReducer
+ });
this.store = createStore(
reducer,
- {
- intl: intl,
- mode: mode
- },
+ {scratchGui: initializedGui},
enhancer);
}
componentDidUpdate (prevProps) {
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx
index 371326320..3fd9e2096 100644
--- a/src/lib/vm-listener-hoc.jsx
+++ b/src/lib/vm-listener-hoc.jsx
@@ -96,7 +96,7 @@ const vmListenerHOC = function (WrappedComponent) {
attachKeyboardEvents: true
};
const mapStateToProps = state => ({
- vm: state.vm
+ vm: state.scratchGui.vm
});
const mapDispatchToProps = dispatch => ({
onTargetsUpdate: data => {
diff --git a/src/playground/blocks-only.jsx b/src/playground/blocks-only.jsx
index 636610433..1a72e267b 100644
--- a/src/playground/blocks-only.jsx
+++ b/src/playground/blocks-only.jsx
@@ -10,7 +10,7 @@ import AppStateHOC from '../lib/app-state-hoc.jsx';
import styles from './blocks-only.css';
-const mapStateToProps = state => ({vm: state.vm});
+const mapStateToProps = state => ({vm: state.scratchGui.vm});
const VMBlocks = connect(mapStateToProps)(Blocks);
const VMControls = connect(mapStateToProps)(Controls);
diff --git a/src/reducers/block-drag.js b/src/reducers/block-drag.js
index 5a261ceaa..745cee756 100644
--- a/src/reducers/block-drag.js
+++ b/src/reducers/block-drag.js
@@ -24,5 +24,6 @@ const updateBlockDrag = function (areBlocksOverGui) {
export {
reducer as default,
+ initialState as blockDragInitialState,
updateBlockDrag
};
diff --git a/src/reducers/cards.js b/src/reducers/cards.js
index 334225639..6f4add89d 100644
--- a/src/reducers/cards.js
+++ b/src/reducers/cards.js
@@ -107,6 +107,7 @@ const endDrag = function () {
export {
reducer as default,
+ initialState as cardsInitialState,
activateDeck,
viewCards,
closeCards,
diff --git a/src/reducers/color-picker.js b/src/reducers/color-picker.js
index fc16354a0..b5edbdc47 100644
--- a/src/reducers/color-picker.js
+++ b/src/reducers/color-picker.js
@@ -34,6 +34,7 @@ const setCallback = callback => ({type: SET_CALLBACK, callback: callback});
export {
reducer as default,
+ initialState as colorPickerInitialState,
activateColorPicker,
deactivateColorPicker,
setCallback
diff --git a/src/reducers/custom-procedures.js b/src/reducers/custom-procedures.js
index 2f4f63d98..3b982941e 100644
--- a/src/reducers/custom-procedures.js
+++ b/src/reducers/custom-procedures.js
@@ -60,6 +60,7 @@ const deactivateCustomProcedures = mutator => ({
export {
reducer as default,
+ initialState as customProceduresInitialState,
activateCustomProcedures,
deactivateCustomProcedures
};
diff --git a/src/reducers/editor-tab.js b/src/reducers/editor-tab.js
index 21b3534e2..e44a7ca84 100644
--- a/src/reducers/editor-tab.js
+++ b/src/reducers/editor-tab.js
@@ -30,6 +30,7 @@ const activateTab = function (tab) {
export {
reducer as default,
+ initialState as editorTabInitialState,
activateTab,
BLOCKS_TAB_INDEX,
COSTUMES_TAB_INDEX,
diff --git a/src/reducers/gui.js b/src/reducers/gui.js
index 8bb226a90..2368e2ec3 100644
--- a/src/reducers/gui.js
+++ b/src/reducers/gui.js
@@ -1,23 +1,60 @@
import {combineReducers} from 'redux';
-import cardsReducer from './cards';
-import colorPickerReducer from './color-picker';
-import customProceduresReducer from './custom-procedures';
-import blockDragReducer from './block-drag';
-import editorTabReducer from './editor-tab';
-import hoveredTargetReducer from './hovered-target';
-import intlReducer from './intl';
-import menuReducer from './menus';
-import modalReducer from './modals';
-import modeReducer from './mode';
-import monitorReducer from './monitors';
-import monitorLayoutReducer from './monitor-layout';
-import targetReducer from './targets';
-import toolboxReducer from './toolbox';
-import vmReducer from './vm';
-import stageSizeReducer from './stage-size';
-import {ScratchPaintReducer} from 'scratch-paint';
+import cardsReducer, {cardsInitialState} from './cards';
+import colorPickerReducer, {colorPickerInitialState} from './color-picker';
+import customProceduresReducer, {customProceduresInitialState} from './custom-procedures';
+import blockDragReducer, {blockDragInitialState} from './block-drag';
+import editorTabReducer, {editorTabInitialState} from './editor-tab';
+import hoveredTargetReducer, {hoveredTargetInitialState} from './hovered-target';
+import menuReducer, {menuInitialState} from './menus';
+import modalReducer, {modalsInitialState} from './modals';
+import modeReducer, {modeInitialState} from './mode';
+import monitorReducer, {monitorsInitialState} from './monitors';
+import monitorLayoutReducer, {monitorLayoutInitialState} from './monitor-layout';
+import stageSizeReducer, {stageSizeInitialState} from './stage-size';
+import targetReducer, {targetsInitialState} from './targets';
+import toolboxReducer, {toolboxInitialState} from './toolbox';
+import vmReducer, {vmInitialState} from './vm';
-export default combineReducers({
+
+const guiInitialState = {
+ blockDrag: blockDragInitialState,
+ cards: cardsInitialState,
+ colorPicker: colorPickerInitialState,
+ customProcedures: customProceduresInitialState,
+ editorTab: editorTabInitialState,
+ mode: modeInitialState,
+ hoveredTarget: hoveredTargetInitialState,
+ stageSize: stageSizeInitialState,
+ menus: menuInitialState,
+ modals: modalsInitialState,
+ monitors: monitorsInitialState,
+ monitorLayout: monitorLayoutInitialState,
+ targets: targetsInitialState,
+ toolbox: toolboxInitialState,
+ vm: vmInitialState
+};
+
+const initPlayer = function (currentState) {
+ return Object.assign(
+ {},
+ currentState,
+ {mode: {
+ isFullScreen: currentState.mode.isFullScreen,
+ isPlayerOnly: true
+ }}
+ );
+};
+const initFullScreen = function (currentState) {
+ return Object.assign(
+ {},
+ currentState,
+ {mode: {
+ isFullScreen: true,
+ isPlayerOnly: currentState.mode.isPlayerOnly
+ }}
+ );
+};
+const guiReducer = combineReducers({
blockDrag: blockDragReducer,
cards: cardsReducer,
colorPicker: colorPickerReducer,
@@ -25,7 +62,6 @@ export default combineReducers({
editorTab: editorTabReducer,
mode: modeReducer,
hoveredTarget: hoveredTargetReducer,
- intl: intlReducer,
stageSize: stageSizeReducer,
menus: menuReducer,
modals: modalReducer,
@@ -33,6 +69,12 @@ export default combineReducers({
monitorLayout: monitorLayoutReducer,
targets: targetReducer,
toolbox: toolboxReducer,
- vm: vmReducer,
- scratchPaint: ScratchPaintReducer
+ vm: vmReducer
});
+
+export {
+ guiReducer as default,
+ guiInitialState,
+ initFullScreen,
+ initPlayer
+};
diff --git a/src/reducers/hovered-target.js b/src/reducers/hovered-target.js
index 43bf87ac0..d6b44f878 100644
--- a/src/reducers/hovered-target.js
+++ b/src/reducers/hovered-target.js
@@ -43,6 +43,7 @@ const setReceivedBlocks = function (receivedBlocks) {
export {
reducer as default,
+ initialState as hoveredTargetInitialState,
setHoveredSprite,
setReceivedBlocks
};
diff --git a/src/reducers/menus.js b/src/reducers/menus.js
index aac3fb852..9d9ab0be9 100644
--- a/src/reducers/menus.js
+++ b/src/reducers/menus.js
@@ -35,13 +35,14 @@ const closeMenu = menu => ({
});
const openFileMenu = () => openMenu(MENU_FILE);
const closeFileMenu = () => closeMenu(MENU_FILE);
-const fileMenuOpen = state => state.menus[MENU_FILE];
+const fileMenuOpen = state => state.scratchGui.menus[MENU_FILE];
const openEditMenu = () => openMenu(MENU_EDIT);
const closeEditMenu = () => closeMenu(MENU_EDIT);
-const editMenuOpen = state => state.menus[MENU_EDIT];
+const editMenuOpen = state => state.scratchGui.menus[MENU_EDIT];
export {
reducer as default,
+ initialState as menuInitialState,
openFileMenu,
closeFileMenu,
openEditMenu,
diff --git a/src/reducers/modals.js b/src/reducers/modals.js
index c373ce796..ddcb50806 100644
--- a/src/reducers/modals.js
+++ b/src/reducers/modals.js
@@ -137,6 +137,7 @@ const closeTipsLibrary = function () {
};
export {
reducer as default,
+ initialState as modalsInitialState,
openBackdropLibrary,
openCameraCapture,
openCostumeLibrary,
diff --git a/src/reducers/mode.js b/src/reducers/mode.js
index b158c9523..d95cb1f99 100644
--- a/src/reducers/mode.js
+++ b/src/reducers/mode.js
@@ -39,7 +39,7 @@ const setPlayer = function (isPlayerOnly) {
export {
reducer as default,
- initialState,
+ initialState as modeInitialState,
setFullScreen,
setPlayer
};
diff --git a/src/reducers/monitor-layout.js b/src/reducers/monitor-layout.js
index 55cb52ee5..7e394caed 100644
--- a/src/reducers/monitor-layout.js
+++ b/src/reducers/monitor-layout.js
@@ -307,6 +307,7 @@ const removeMonitorRect = function (monitorId) {
export {
reducer as default,
+ initialState as monitorLayoutInitialState,
addMonitorRect,
getInitialPosition,
moveMonitorRect,
diff --git a/src/reducers/monitors.js b/src/reducers/monitors.js
index 1b1b1f436..091624225 100644
--- a/src/reducers/monitors.js
+++ b/src/reducers/monitors.js
@@ -25,5 +25,6 @@ const updateMonitors = function (monitors) {
export {
reducer as default,
+ initialState as monitorsInitialState,
updateMonitors
};
diff --git a/src/reducers/stage-size.js b/src/reducers/stage-size.js
index 4c4a58a52..74653f19e 100644
--- a/src/reducers/stage-size.js
+++ b/src/reducers/stage-size.js
@@ -31,6 +31,7 @@ const setStageSize = function (stageSize) {
export {
reducer as default,
+ initialState as stageSizeInitialState,
setStageSize,
STAGE_SIZES
};
diff --git a/src/reducers/targets.js b/src/reducers/targets.js
index 883fe4917..c1f661394 100644
--- a/src/reducers/targets.js
+++ b/src/reducers/targets.js
@@ -39,5 +39,6 @@ const updateTargets = function (targetList, editingTarget) {
};
export {
reducer as default,
+ initialState as targetsInitialState,
updateTargets
};
diff --git a/src/reducers/toolbox.js b/src/reducers/toolbox.js
index e3317ea85..4e7d8d992 100644
--- a/src/reducers/toolbox.js
+++ b/src/reducers/toolbox.js
@@ -26,5 +26,6 @@ const updateToolbox = function (toolboxXML) {
export {
reducer as default,
+ initialState as toolboxInitialState,
updateToolbox
};
diff --git a/src/reducers/vm.js b/src/reducers/vm.js
index dd70f3f4f..da2155cf8 100644
--- a/src/reducers/vm.js
+++ b/src/reducers/vm.js
@@ -23,5 +23,6 @@ const setVM = function (vm) {
};
export {
reducer as default,
+ initialState as vmInitialState,
setVM
};
diff --git a/test/unit/containers/sound-editor.test.jsx b/test/unit/containers/sound-editor.test.jsx
index 988aaca0f..6070b7592 100644
--- a/test/unit/containers/sound-editor.test.jsx
+++ b/test/unit/containers/sound-editor.test.jsx
@@ -35,7 +35,7 @@ describe('Sound Editor Container', () => {
}
}
};
- store = mockStore({vm});
+ store = mockStore({scratchGui: {vm: vm}});
});
test('should pass the correct data to the component from the store', () => {
diff --git a/test/unit/containers/sprite-selector-item.test.jsx b/test/unit/containers/sprite-selector-item.test.jsx
index a423fe816..23bda4e14 100644
--- a/test/unit/containers/sprite-selector-item.test.jsx
+++ b/test/unit/containers/sprite-selector-item.test.jsx
@@ -36,7 +36,9 @@ describe('SpriteSelectorItem Container', () => {
};
beforeEach(() => {
- store = mockStore({hoveredTarget: {receivedBlocks: false, sprite: null}});
+ store = mockStore({scratchGui: {
+ hoveredTarget: {receivedBlocks: false, sprite: null}}
+ });
className = 'ponies';
costumeURL = 'https://scratch.mit.edu/foo/bar/pony';
id = 1337;
--
GitLab