diff --git a/src/components/Converter.jsx b/src/components/Converter.jsx index f2cdce5..1963c51 100644 --- a/src/components/Converter.jsx +++ b/src/components/Converter.jsx @@ -93,7 +93,7 @@ function Converter() { ] = useSelector((state) => [ state.canvas.canvasId, state.canvas.canvases, - state.canvas.showHiddenCanvases, + state.gui.easterEgg, ], shallowEqual); const [selectedCanvas, selectCanvas] = useState(canvasId); diff --git a/src/controls/keypress.js b/src/controls/keypress.js index bbb9924..8dbbe65 100644 --- a/src/controls/keypress.js +++ b/src/controls/keypress.js @@ -6,7 +6,7 @@ import copy from '../utils/clipboard'; import { toggleGrid, toggleHistoricalView, - toggleHiddenCanvases, + toggleEasterEgg, togglePixelNotify, toggleMvmCtrls, toggleMute, @@ -205,10 +205,10 @@ export function createKeyDownHandler(store) { return; } case 'p': - store.dispatch(toggleHiddenCanvases()); - store.dispatch(notify((store.getState().canvas.showHiddenCanvases) - ? t`Show Hidden Canvases` - : t`Hide Hidden Canvases`)); + store.dispatch(toggleEasterEgg()); + store.dispatch(notify((store.getState().gui.easterEgg) + ? t`Easter Egg ON` + : t`Easter Egg OFF`)); break; default: } diff --git a/src/store/actions/index.js b/src/store/actions/index.js index e68492c..4e18273 100644 --- a/src/store/actions/index.js +++ b/src/store/actions/index.js @@ -27,9 +27,9 @@ export function toggleHistoricalView() { }; } -export function toggleHiddenCanvases() { +export function toggleEasterEgg() { return { - type: 's/TGL_HIDDEN_CANVASES', + type: 's/TGL_EASTER_EGG', }; } diff --git a/src/store/middleware/extensions.js b/src/store/middleware/extensions.js index 4710500..aa3ffad 100644 --- a/src/store/middleware/extensions.js +++ b/src/store/middleware/extensions.js @@ -111,7 +111,7 @@ export default () => (next) => (action) => { switch (type) { case 'RELOAD_URL': case 's/SELECT_CANVAS': - case 's/TGL_HIDDEN_CANVASES': + case 's/TGL_EASTER_EGG': case 's/REC_ME': if (isActive) { const renderer = getRenderer(); diff --git a/src/store/middleware/rendererHook.js b/src/store/middleware/rendererHook.js index 88e456c..b97fe01 100644 --- a/src/store/middleware/rendererHook.js +++ b/src/store/middleware/rendererHook.js @@ -80,7 +80,7 @@ export default (store) => (next) => (action) => { break; } - case 's/TGL_HIDDEN_CANVASES': { + case 's/TGL_EASTER_EGG': { const renderer = getRenderer(); const { is3D } = state.canvas; if (is3D) { diff --git a/src/store/reducers/canvas.js b/src/store/reducers/canvas.js index 394a28e..469b0b0 100644 --- a/src/store/reducers/canvas.js +++ b/src/store/reducers/canvas.js @@ -148,7 +148,6 @@ const initialState = { isHistoricalView: false, historicalDate: null, historicalTime: null, - showHiddenCanvases: false, hover: null, // last canvas view and selectedColor // just used to get back to the previous state when switching canvases @@ -183,13 +182,6 @@ export default function canvasReducer( }); } - case 's/TGL_HIDDEN_CANVASES': { - return { - ...state, - showHiddenCanvases: !state.showHiddenCanvases, - }; - } - case 'UPDATE_VIEW': { const { view } = action; return { diff --git a/src/store/reducers/gui.js b/src/store/reducers/gui.js index d1492d6..260d073 100644 --- a/src/store/reducers/gui.js +++ b/src/store/reducers/gui.js @@ -19,6 +19,7 @@ const initialState = { style: 'default', // properties that aren't saved holdPaint: HOLD_PAINT.OFF, + easterEgg: false, moveU: 0, moveV: 0, moveW: 0, @@ -112,6 +113,13 @@ export default function gui( chatNotify: !state.chatNotify, }; + case 's/TGL_EASTER_EGG': { + return { + ...state, + easterEgg: !state.easterEgg, + }; + } + case 's/SELECT_HOLD_PAINT': { return { ...state, @@ -182,6 +190,7 @@ export default function gui( case 'persist/REHYDRATE': return { ...state, + easterEgg: false, holdPaint: HOLD_PAINT.OFF, moveU: 0, moveV: 0,