Merge branch 'master' into sophie-ai-images

2 files changed, 7 insertions, 12 deletions

diff --git a/src/client/views/topbar/TopBar.scss b/src/client/views/topbar/TopBar.scss
index 2237d5ac1..20245104e 100644
--- a/src/client/views/topbar/TopBar.scss
+++ b/src/client/views/topbar/TopBar.scss
@@ -1,5 +1,4 @@
-@import '../global/globalCssVariables';
-
+@import '../global/globalCssVariables.module.scss';
 
 .topbar-container {
     flex-direction: column;
diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx
index 55d94406a..4155800b8 100644
--- a/src/client/views/topbar/TopBar.tsx
+++ b/src/client/views/topbar/TopBar.tsx
@@ -16,13 +16,13 @@ import { ReportManager } from '../../util/reportManager/ReportManager';
 import { ServerStats } from '../../util/ServerStats';
 import { SettingsManager } from '../../util/SettingsManager';
 import { SharingManager } from '../../util/SharingManager';
+import { SnappingManager } from '../../util/SnappingManager';
 import { Transform } from '../../util/Transform';
 import { CollectionDockingView } from '../collections/CollectionDockingView';
 import { CollectionLinearView } from '../collections/collectionLinear';
-import { ContextMenu } from '../ContextMenu';
 import { DashboardView } from '../DashboardView';
 import { Colors } from '../global/globalEnums';
-import { DocumentView, DocumentViewInternal } from '../nodes/DocumentView';
+import { DocumentViewInternal, returnEmptyDocViewList } from '../nodes/DocumentView';
 import { DefaultStyleProvider } from '../StyleProvider';
 import './TopBar.scss';
 
@@ -85,9 +85,9 @@ export class TopBar extends React.Component {
                         type={Type.TERT}
                         tooltip="Browsing mode for directly navigating to documents"
                         size={Size.SMALL}
-                        color={DocumentView.ExploreMode ? this.variantColor : this.color}
-                        background={DocumentView.ExploreMode ? this.color : 'transparent'}
-                        onClick={action(() => (DocumentView.ExploreMode = !DocumentView.ExploreMode))}
+                        color={SnappingManager.ExploreMode ? this.variantColor : this.color}
+                        background={SnappingManager.ExploreMode ? this.color : 'transparent'}
+                        onClick={() => SnappingManager.SetExploreMode(!SnappingManager.ExploreMode)}
                     />
                 )}
             </div>
@@ -100,18 +100,14 @@ export class TopBar extends React.Component {
             <div className="collectionMenu-contMenuButtons" style={{ height: '100%' }}>
                 <CollectionLinearView
                     Document={selDoc}
-                    DataDoc={undefined}
+                    docViewPath={returnEmptyDocViewList}
                     fieldKey="data"
                     dropAction="embed"
-                    setHeight={returnFalse}
                     styleProvider={DefaultStyleProvider}
-                    rootSelected={returnTrue}
-                    bringToFront={emptyFunction}
                     select={emptyFunction}
                     isContentActive={returnTrue}
                     isAnyChildContentActive={returnFalse}
                     isSelected={returnFalse}
-                    docViewPath={returnEmptyDoclist}
                     moveDocument={returnFalse}
                     addDocument={returnFalse}
                     addDocTab={DocumentViewInternal.addDocTabFunc}