Merge branch 'master' into nathan-starter

1 files changed, 7 insertions, 6 deletions

diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index f7cd0e925..73d2872d1 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -1,9 +1,10 @@
-/* eslint-disable no-new */
 // if ((module as any).hot) {
 //     (module as any).hot.accept();
 // }
 
 import * as dotenv from 'dotenv'; // see https://github.com/motdotla/dotenv#how-do-i-use-dotenv-with-import
+import { Node } from 'prosemirror-model';
+import { EditorView } from 'prosemirror-view';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom/client';
 import { AssignAllExtensions } from '../../extensions/Extensions';
@@ -23,6 +24,8 @@ import { CollectionView } from './collections/CollectionView';
 import { TabDocView } from './collections/TabDocView';
 import { CollectionFreeFormView } from './collections/collectionFreeForm';
 import { CollectionFreeFormInfoUI } from './collections/collectionFreeForm/CollectionFreeFormInfoUI';
+import { FaceCollectionBox, UniqueFaceBox } from './collections/collectionFreeForm/FaceCollectionBox';
+import { ImageLabelBox } from './collections/collectionFreeForm/ImageLabelBox';
 import { CollectionSchemaView } from './collections/collectionSchema/CollectionSchemaView';
 import { SchemaRowBox } from './collections/collectionSchema/SchemaRowBox';
 import './global/globalScripts';
@@ -60,12 +63,9 @@ import { FormattedTextBox } from './nodes/formattedText/FormattedTextBox';
 import { SummaryView } from './nodes/formattedText/SummaryView';
 import { ImportElementBox } from './nodes/importBox/ImportElementBox';
 import { PresBox, PresElementBox } from './nodes/trails';
-import { SearchBox } from './search/SearchBox';
-import { ImageLabelBox } from './collections/collectionFreeForm/ImageLabelBox';
 import { FaceRecognitionHandler } from './search/FaceRecognitionHandler';
-import { FaceCollectionBox, UniqueFaceBox } from './collections/collectionFreeForm/FaceCollectionBox';
-import { Node } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
+import { SearchBox } from './search/SearchBox';
+import { AnnotationPalette } from './smartdraw/AnnotationPalette';
 
 dotenv.config();
 
@@ -118,6 +118,7 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
         KeyValueBox.Init();
         PresBox.Init(TabDocView.AllTabDocs);
         DocumentContentsView.Init(KeyValueBox.LayoutString(), {
+            AnnotationPalette,
             FormattedTextBox,
             ImageBox,
             FontIconBox,