Merge branch 'master' into alyssa-starter

1 files changed, 15 insertions, 0 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index a3fa1c18b..7779d339f 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -59,6 +59,7 @@ import { ImageLabelHandler } from './collections/collectionFreeForm/ImageLabelHa
 import { MarqueeOptionsMenu } from './collections/collectionFreeForm/MarqueeOptionsMenu';
 import { CollectionLinearView } from './collections/collectionLinear';
 import { LinkMenu } from './linking/LinkMenu';
+import { DocCreatorMenu } from './nodes/DataVizBox/DocCreatorMenu';
 import { SchemaCSVPopUp } from './nodes/DataVizBox/SchemaCSVPopUp';
 import { DocButtonState } from './nodes/DocumentLinksButton';
 import { DocumentView, DocumentViewInternal } from './nodes/DocumentView';
@@ -89,6 +90,7 @@ export class MainView extends ObservableReactComponent<object> {
     public static Live: boolean = false;
     private _docBtnRef = React.createRef<HTMLDivElement>();
 
+    @observable private _keepContextMenuOpen: boolean = false;
     @observable private _windowWidth: number = 0;
     @observable private _windowHeight: number = 0;
     @observable private _dashUIWidth: number = 0; // width of entire main dashboard region including left menu buttons and properties panel (but not including the dashboard selector button row)
@@ -280,6 +282,18 @@ export class MainView extends ObservableReactComponent<object> {
 
         library.add(
             ...[
+                fa.faMinimize,
+                fa.faArrowsRotate,
+                fa.faFloppyDisk,
+                fa.faRepeat,
+                fa.faArrowsUpDown,
+                fa.faArrowsLeftRight,
+                fa.faWindowMaximize,
+                fa.faGift,
+                fa.faLockOpen,
+                fa.faSort,
+                fa.faArrowUpZA,
+                fa.faArrowDownAZ,
                 fa.faExclamationCircle,
                 fa.faEdit,
                 fa.faArrowDownShortWide,
@@ -1117,6 +1131,7 @@ export class MainView extends ObservableReactComponent<object> {
                 <PreviewCursor />
                 <TaskCompletionBox />
                 <ContextMenu />
+                <DocCreatorMenu />
                 <ImageLabelHandler />
                 <SmartDrawHandler />
                 <AnchorMenu />