From 45ee17afbdfa3320343f848ea31cc387549cf519 Mon Sep 17 00:00:00 2001
From: Camille Villa <cvilla100@gmail.com>
Date: Mon, 11 Mar 2019 11:12:21 -0700
Subject: [PATCH] Display info panel when toggling open sidebar panel
Co-Authored-By: Chris Beer <chris@cbeer.info>
---
src/state/actions/window.js | 6 ++++--
src/state/reducers/companionWindows.js | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/state/actions/window.js b/src/state/actions/window.js
index 85a1ecf0f..706c5af7c 100644
--- a/src/state/actions/window.js
+++ b/src/state/actions/window.js
@@ -19,6 +19,7 @@ export function focusWindow(windowId) {
* @memberof ActionCreators
*/
export function addWindow(options) {
+ const cwDefault = `cw-${uuid()}`;
const defaultOptions = {
id: `window-${uuid()}`,
canvasIndex: 0,
@@ -30,12 +31,13 @@ export function addWindow(options) {
height: 400,
x: 2700,
y: 2700,
- companionWindowIds: [],
+ companionWindowIds: [cwDefault],
+ sideBarPanel: 'info',
rotation: null,
view: 'single',
maximized: false,
};
- return { type: ActionTypes.ADD_WINDOW, window: { ...defaultOptions, ...options } };
+ return { type: ActionTypes.ADD_WINDOW, window: { ...defaultOptions, ...options }, companionWindow: { id: cwDefault, position: 'left', content: 'info' } };
}
/**
diff --git a/src/state/reducers/companionWindows.js b/src/state/reducers/companionWindows.js
index c5cfc2dcc..a221bf97d 100644
--- a/src/state/reducers/companionWindows.js
+++ b/src/state/reducers/companionWindows.js
@@ -9,6 +9,9 @@ export function companionWindowsReducer(state = {}, action) {
case ActionTypes.ADD_COMPANION_WINDOW:
return setIn(state, [action.id], action.payload);
+ case ActionTypes.ADD_WINDOW:
+ return setIn(state, [action.companionWindow.id], action.companionWindow);
+
case ActionTypes.UPDATE_COMPANION_WINDOW:
return updateIn(state, [action.id], orig => merge(orig, action.payload));
--
GitLab