added standard 3d gl view for maps. added close button for infoUI.

1 files changed, 5 insertions, 98 deletions

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoUI.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoUI.tsx
index 6a9c96854..181f325f3 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoUI.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormInfoUI.tsx
@@ -2,15 +2,14 @@ import { IReactionDisposer, makeObservable, observable, runInAction } from 'mobx
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { Doc, DocListCast, Field, FieldResult } from '../../../../fields/Doc';
+import { InkTool } from '../../../../fields/InkField';
+import { DocumentManager } from '../../../util/DocumentManager';
 import { LinkManager } from '../../../util/LinkManager';
-import { ObservableReactComponent } from '../../ObservableReactComponent';
 import { DocButtonState, DocumentLinksButton } from '../../nodes/DocumentLinksButton';
-import { CollectionFreeFormInfoState, InfoState, StateEntryFunc, infoState } from './CollectionFreeFormInfoState';
+import { ObservableReactComponent } from '../../ObservableReactComponent';
+import { CollectionFreeFormInfoState, InfoState, infoState, StateEntryFunc } from './CollectionFreeFormInfoState';
 import { CollectionFreeFormView } from './CollectionFreeFormView';
 import './CollectionFreeFormView.scss';
-import { InkTool } from '../../../../fields/InkField';
-import { DocumentManager } from '../../../util/DocumentManager';
-import TrailsIcon from '../../nodes/FontIconBox/TrailsIcon';
 
 export interface CollectionFreeFormInfoUIProps {
     Document: Doc;
@@ -19,7 +18,7 @@ export interface CollectionFreeFormInfoUIProps {
 
 @observer
 export class CollectionFreeFormInfoUI extends ObservableReactComponent<CollectionFreeFormInfoUIProps> {
-    private _disposers: { [name: string]: IReactionDisposer } = {};
+    _firstDocPos = { x: 0, y: 0 };
 
     constructor(props: any) {
         super(props);
@@ -225,98 +224,6 @@ export class CollectionFreeFormInfoUI extends ObservableReactComponent<Collectio
         return start;
     };
 
-    /*
-    componentDidMount(): void {
-        this._disposers.reaction1 = reaction(
-            () => this._props.Freeform.childDocs.slice(),
-            docs => {
-                if (docs.length === 1) {
-                    this.firstDoc = docs[0];
-                    this.firstDocPos = { x: NumCast(this.firstDoc.x), y: NumCast(this.firstDoc.y) };
-                    this.message = 'Hello world! You can drag and drop to move your document around.';
-                } else if (docs.length === 2) {
-                    this.message = 'Great job. To create a new link between them, click the link icon on both documents.';
-                } else {
-                    // this.message = 'Click anywhere and begin typing to create your first text document!';
-                }
-            },
-            { fireImmediately: true }
-        );
-        this._disposers.reaction2 = reaction(
-            () => ({ x: NumCast(this.firstDoc?.x), y: NumCast(this.firstDoc?.y), links: this.firstDoc && LinkManager.Instance.getAllDirectLinks(this.firstDoc) }),
-            ({ x, y, links }) => {
-                if ((x && x != this.firstDocPos.x) || (y && y != this.firstDocPos.y)) {
-                    this.message = 'Great moves. Try creating a second document.';
-                }
-                if (links && links.length > 0) {
-                    this.message = 'You made your first link! You can view your links by selecting the blue dot.';
-                }
-            },
-            { fireImmediately: true }
-        );
-        this._disposers.reaction3 = reaction(
-            () => ({ activeTool: Doc.ActiveTool, viewingLinks: DocumentLinksButton.LinkEditorDocView }),
-            ({ activeTool, viewingLinks }) => {
-                if (activeTool == InkTool.Pen) {
-                    this.message = "You're in pen mode! Click and drag to draw your first masterpiece.";
-                }
-                if (viewingLinks) {
-                    this.message = 'To edit your links, click the pencil icon.';
-                }
-                if (Doc.ActiveTool === InkTool.Pen) {
-                    this.message = 'Editing links';
-                }
-            },
-            { fireImmediately: true }
-        );
-        this._disposers.reaction4 = reaction(
-            () => ({ startLink: DocumentLinksButton.StartLink, endLink: Doc.UserDoc().links }),
-            ({ startLink, endLink }) => {
-                if (startLink) {
-                    this.message = "You've started a link.";
-                } else if (endLink) {
-                    this.message = "You've completed a link.";
-                }
-            }
-        );
-        this._disposers.reaction5 = reaction(
-            () => ({ pin: Doc.ActivePresentation?.data, trails: DocumentManager.Instance.DocumentViews.find(view => view.Document === Doc.MyTrails) }),
-            ({ pin, trails }) => {
-                // if (pin) {
-                //     this.message = 'You pinned your doc to a trail.';
-                // }
-                if (trails) {
-                    this.message = 'This is your trails tab.';
-                }
-            }
-        );
-        this._disposers.reaction6 = reaction(
-            () => ({ presentationMode: Doc.ActivePresentation?.presentation_status }),
-            ({ presentationMode }) => {
-                if (presentationMode === 'edit') {
-                    this.message = 'You are editing your presentation.';
-                } else if (presentationMode === 'manual') {
-                    this.message = 'Manual presentation mode';
-                } else if (presentationMode === 'auto') {
-                    this.message = 'Auto presentation mode';
-                }
-            }
-        );
-    }
-
-    componentWillUnmount(): void {
-        Object.values(this._disposers).forEach(disposer => disposer?.());
-    }
-
-    // stop reaction from what it's currently doing
-    // this._disposers.reaction1();
-
-    @observable message = 'Click anywhere and begin typing to create your first document!';
-    @observable firstDoc: Doc | undefined = undefined;
-    @observable secondDoc: Doc | undefined = undefined;
-    */
-    firstDocPos = { x: 0, y: 0 };
-
     render() {
         return <CollectionFreeFormInfoState next={this.setCurrState} infoState={this.currState} />;
     }