Merge branch 'alyssa-starter' of https://github.com/brown-dash/Dash-Web into alyssa-starter

1 files changed, 23 insertions, 13 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index c852f9a2a..76c67a252 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -3,7 +3,7 @@ import { faBuffer, faHireAHelper } from '@fortawesome/free-brands-svg-icons';
 import * as far from '@fortawesome/free-regular-svg-icons';
 import * as fa from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { action, computed, configure, makeObservable, observable, reaction, runInAction, trace } from 'mobx';
+import { action, computed, configure, makeObservable, observable, reaction, runInAction } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import ResizeObserver from 'resize-observer-polyfill';
@@ -74,8 +74,10 @@ import { PresBox } from './nodes/trails';
 import { AnchorMenu } from './pdf/AnchorMenu';
 import { GPTPopup } from './pdf/GPTPopup/GPTPopup';
 import { TopBar } from './topbar/TopBar';
+import { SmartDrawHandler } from './smartdraw/SmartDrawHandler';
+import { InkTranscription } from './InkTranscription';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const { LEFT_MENU_WIDTH, TOPBAR_HEIGHT } = require('./global/globalCssVariables.module.scss'); // prettier-ignore
 
 @observer
@@ -315,6 +317,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faCompass,
                 fa.faSnowflake,
                 fa.faStar,
+                fa.faSplotch,
                 fa.faMicrophone,
                 fa.faCircleHalfStroke,
                 fa.faKeyboard,
@@ -337,6 +340,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faTerminal,
                 fa.faToggleOn,
                 fa.faFile,
+                fa.faFileExport,
                 fa.faLocationArrow,
                 fa.faSearch,
                 fa.faFileDownload,
@@ -376,6 +380,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faXmark,
                 fa.faExclamation,
                 fa.faFileAlt,
+                fa.faFileArrowDown,
                 fa.faFileAudio,
                 fa.faFileVideo,
                 fa.faFilePdf,
@@ -392,6 +397,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faArrowsLeftRight,
                 fa.faPause,
                 fa.faPen,
+                fa.faUserPen,
                 fa.faPenNib,
                 fa.faPhone,
                 fa.faPlay,
@@ -402,6 +408,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faArrowsAltV,
                 fa.faTimesCircle,
                 fa.faThumbtack,
+                fa.faScissors,
                 fa.faTree,
                 fa.faTv,
                 fa.faUndoAlt,
@@ -429,6 +436,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faBold,
                 fa.faItalic,
                 fa.faClipboard,
+                fa.faClipboardCheck,
                 fa.faUnderline,
                 fa.faStrikethrough,
                 fa.faSuperscript,
@@ -437,6 +445,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faEyeDropper,
                 fa.faPaintRoller,
                 fa.faBars,
+                fa.faBarsStaggered,
                 fa.faBrush,
                 fa.faShapes,
                 fa.faEllipsisH,
@@ -475,6 +484,8 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faHashtag,
                 fa.faAlignJustify,
                 fa.faCheckSquare,
+                fa.faSquarePlus,
+                fa.faReply,
                 fa.faListUl,
                 fa.faWindowMinimize,
                 fa.faWindowRestore,
@@ -574,6 +585,7 @@ export class MainView extends ObservableReactComponent<object> {
         DocumentManager.removeOverlayViews();
         Doc.linkFollowUnhighlight();
         const targets = document.elementsFromPoint(e.x, e.y);
+        const targetClasses = targets.map(target => target.className.toString());
         if (targets.length) {
             let targClass = targets[0].className.toString();
             for (let i = 0; i < targets.length - 1; i++) {
@@ -581,6 +593,8 @@ export class MainView extends ObservableReactComponent<object> {
                 else break;
             }
             !targClass.includes('contextMenu') && ContextMenu.Instance.closeMenu();
+            !targetClasses.includes('marqueeView') && !targetClasses.includes('smart-draw-handler') && SmartDrawHandler.Instance.hideSmartDrawHandler();
+            !targetClasses.includes('smart-draw-handler') && SmartDrawHandler.Instance.hideRegenerate();
             !['timeline-menu-desc', 'timeline-menu-item', 'timeline-menu-input'].includes(targClass) && TimelineMenu.Instance.closeMenu();
         }
     });
@@ -838,7 +852,6 @@ export class MainView extends ObservableReactComponent<object> {
     };
 
     @computed get mainInnerContent() {
-        trace();
         const leftMenuFlyoutWidth = this._leftMenuFlyoutWidth + this.leftMenuWidth();
         const width = this.propertiesWidth() + leftMenuFlyoutWidth;
         return (
@@ -966,13 +979,11 @@ export class MainView extends ObservableReactComponent<object> {
             <div className="mainView-snapLines">
                 <svg style={{ width: '100%', height: '100%' }}>
                     {[
-                        ...SnappingManager.HorizSnapLines.map((l, i) => (
-                            // eslint-disable-next-line react/no-array-index-key
-                            <line key={'horiz' + i} x1="0" y1={l} x2="2000" y2={l} stroke={lightOrDark(StrCast(dragPar.layoutDoc.backgroundColor, 'gray'))} opacity={0.3} strokeWidth={1} strokeDasharray="2 2" />
+                        ...SnappingManager.HorizSnapLines.map(l => (
+                            <line key={'horiz' + l} x1="0" y1={l} x2="2000" y2={l} stroke={lightOrDark(StrCast(dragPar.layoutDoc.backgroundColor, 'gray'))} opacity={0.3} strokeWidth={1} strokeDasharray="2 2" />
                         )),
-                        ...SnappingManager.VertSnapLines.map((l, i) => (
-                            // eslint-disable-next-line react/no-array-index-key
-                            <line key={'vert' + i} y1={this.topOfMainDocContent.toString()} x1={l} y2="2000" x2={l} stroke={lightOrDark(StrCast(dragPar.layoutDoc.backgroundColor, 'gray'))} opacity={0.3} strokeWidth={1} strokeDasharray="2 2" />
+                        ...SnappingManager.VertSnapLines.map(l => (
+                            <line key={'vert' + l} y1={this.topOfMainDocContent.toString()} x1={l} y2="2000" x2={l} stroke={lightOrDark(StrCast(dragPar.layoutDoc.backgroundColor, 'gray'))} opacity={0.3} strokeWidth={1} strokeDasharray="2 2" />
                         )),
                     ]}
                 </svg>
@@ -1060,10 +1071,7 @@ export class MainView extends ObservableReactComponent<object> {
                         docView={DocButtonState.Instance.LinkEditorDocView}
                     />
                 ) : null}
-                {LinkInfo.Instance?.LinkInfo ? (
-                    // eslint-disable-next-line react/jsx-props-no-spreading
-                    <LinkDocPreview {...LinkInfo.Instance.LinkInfo} />
-                ) : null}
+                {LinkInfo.Instance?.LinkInfo ? <LinkDocPreview {...LinkInfo.Instance.LinkInfo} /> : null}
                 {((page: string) => {
                     // prettier-ignore
                     switch (page) {
@@ -1081,6 +1089,7 @@ export class MainView extends ObservableReactComponent<object> {
                 <TaskCompletionBox />
                 <ContextMenu />
                 <ImageLabelHandler />
+                <SmartDrawHandler />
                 <AnchorMenu />
                 <MapAnchorMenu />
                 <DirectionsAnchorMenu />
@@ -1088,6 +1097,7 @@ export class MainView extends ObservableReactComponent<object> {
                 <MarqueeOptionsMenu />
                 <TimelineMenu />
                 <RichTextMenu />
+                <InkTranscription />
                 {this.snapLines}
                 <LightboxView key="lightbox" PanelWidth={this._windowWidth} addSplit={CollectionDockingView.AddSplit} PanelHeight={this._windowHeight} maxBorder={this.lightboxMaxBorder} />
                 <GPTPopup key="gptpopup" />