From 0fbaf95971dc0b3a671e1f586a876d9019e860ed Mon Sep 17 00:00:00 2001 From: ladeirarodolfo <39910206+ladeirarodolfo@users.noreply.github.com> Date: Tue, 12 Nov 2019 09:13:59 -0300 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20for=20JS=20breaking?= =?UTF-8?q?=20on=20header=20(#1164)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../viewer/src/connectedComponents/ConnectedHeader.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/viewer/src/connectedComponents/ConnectedHeader.js b/platform/viewer/src/connectedComponents/ConnectedHeader.js index 0a47c045f..53fe09b9a 100644 --- a/platform/viewer/src/connectedComponents/ConnectedHeader.js +++ b/platform/viewer/src/connectedComponents/ConnectedHeader.js @@ -3,11 +3,14 @@ import { connect } from 'react-redux'; import { hotkeysManager } from '../App.js'; const mapStateToProps = state => { - const hotkeyDefinitions = - state.preferences.hotkeyDefinitions.length > 0 - ? state.preferences.hotkeyDefinitions + const { hotkeyDefinitions = [] } = state.preferences || {}; + + const _hotkeyDefinitions = + hotkeyDefinitions.length > 0 + ? hotkeyDefinitions : hotkeysManager.hotkeyDefaults; - hotkeysManager.setHotkeys(hotkeyDefinitions); + + hotkeysManager.setHotkeys(_hotkeyDefinitions); return { user: state.oidc && state.oidc.user,