Implement Quick Switch feature

2 files changed, 5 insertions, 0 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index e82275b9f..2b0719f92 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -8,6 +8,7 @@ import injectSheet from 'react-jss';
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
 import { Component as ShareFranz } from '../../features/shareFranz';
+import { Component as QuickSwitch } from '../../features/quickSwitch';
 import ErrorBoundary from '../util/ErrorBoundary';
 
 // import globalMessages from '../../i18n/globalMessages';
@@ -185,6 +186,7 @@ class AppLayout extends Component {
               )}
               <BasicAuth />
               <ShareFranz />
+              <QuickSwitch />
               {services}
               {children}
             </div>
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index 63d858c47..0af521452 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -41,6 +41,8 @@ export default @injectCSS(styles) class Modal extends Component {
       showClose,
     } = this.props;
 
+    const appRoot = document.getElementById('root');
+
     return (
       <ReactModal
         isOpen={isOpen}
@@ -53,6 +55,7 @@ export default @injectCSS(styles) class Modal extends Component {
         portal={portal}
         onRequestClose={close}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
+        appElement={appRoot}
       >
         {showClose && close && (
           <button