merge w master

1 files changed, 46 insertions, 35 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index d440ed287..79a1d1303 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -1,14 +1,13 @@
 import { CollectionView } from "../views/collections/CollectionView";
 import { CollectionViewType } from "../views/collections/CollectionView";
 import { AudioBox } from "../views/nodes/AudioBox";
-import { FormattedTextBox } from "../views/nodes/FormattedTextBox";
+import { FormattedTextBox } from "../views/nodes/formattedText/FormattedTextBox";
 import { ImageBox } from "../views/nodes/ImageBox";
 import { KeyValueBox } from "../views/nodes/KeyValueBox";
 import { PDFBox } from "../views/nodes/PDFBox";
 import { ScriptingBox } from "../views/nodes/ScriptingBox";
 import { VideoBox } from "../views/nodes/VideoBox";
 import { WebBox } from "../views/nodes/WebBox";
-import { CurrentUserUtils } from "../../server/authentication/models/current_user_utils";
 import { OmitKeys, JSONUtils, Utils } from "../../Utils";
 import { Field, Doc, Opt, DocListCastAsync, FieldResult, DocListCast } from "../../new_fields/Doc";
 import { ImageField, VideoField, AudioField, PdfField, WebField, YoutubeField } from "../../new_fields/URLField";
@@ -84,11 +83,13 @@ export interface DocumentOptions {
     x?: number;
     y?: number;
     z?: number;
+    author?: string;
     dropAction?: dropActionType;
     childDropAction?: dropActionType;
     layoutKey?: string;
     type?: string;
     title?: string;
+    label?: string; // short form of title for use as an icon label
     style?: string;
     page?: number;
     scale?: number;
@@ -108,12 +109,14 @@ export interface DocumentOptions {
     ignoreClick?: boolean;
     lockedPosition?: boolean; // lock the x,y coordinates of the document so that it can't be dragged
     lockedTransform?: boolean; // lock the panx,pany and scale parameters of the document so that it be panned/zoomed
+    isAnnotating?: boolean; // whether we web document is annotation mode where links can't be clicked to allow annotations to be created
     opacity?: number;
     defaultBackgroundColor?: string;
     isBackground?: boolean;
     isLinkButton?: boolean;
     columnWidth?: number;
-    fontSize?: number;
+    _fontSize?: number;
+    _fontFamily?: string;
     curPage?: number;
     currentTimecode?: number; // the current timecode of a time-based document (e.g., current time of a video)  value is in seconds
     displayTimecode?: number; // the time that a document should be displayed (e.g., time an annotation should be displayed on a video)
@@ -143,11 +146,13 @@ export interface DocumentOptions {
     icon?: string;
     sourcePanel?: Doc; // panel to display in 'targetContainer' as the result of a button onClick script
     targetContainer?: Doc; // document whose proto will be set to 'panel' as the result of a onClick click script
+    searchFileTypes?: List<string>; // file types allowed in a search query
     strokeWidth?: number;
     treeViewPreventOpen?: boolean; // ignores the treeViewOpen Doc flag which allows a treeViewItem's expand/collapse state to be independent of other views of the same document in the tree view
     treeViewHideTitle?: boolean; // whether to hide the title of a tree view
     treeViewHideHeaderFields?: boolean; // whether to hide the drop down options for tree view items.
     treeViewOpen?: boolean; // whether this document is expanded in a tree view
+    treeViewExpandedView?: string; // which field/thing is displayed when this item is opened in tree view
     treeViewChecked?: ScriptField; // script to call when a tree view checkbox is checked
     limitHeight?: number; // maximum height for newly created (eg, from pasting) text documents
     // [key: string]: Opt<Field>;
@@ -185,7 +190,7 @@ export namespace Docs {
         };
         type TemplateMap = Map<DocumentType, PrototypeTemplate>;
         type PrototypeMap = Map<DocumentType, Doc>;
-        const data = "data";
+        const defaultDataKey = "data";
 
         const TemplateMap: TemplateMap = new Map([
             [DocumentType.RTF, {
@@ -193,100 +198,100 @@ export namespace Docs {
                 options: { _height: 150, _xMargin: 10, _yMargin: 10 }
             }],
             [DocumentType.SEARCH, {
-                layout: { view: SearchBox, dataField: data },
+                layout: { view: SearchBox, dataField: defaultDataKey },
                 options: { _width: 400 }
             }],
             [DocumentType.COLOR, {
-                layout: { view: ColorBox, dataField: data },
+                layout: { view: ColorBox, dataField: defaultDataKey },
                 options: { _nativeWidth: 220, _nativeHeight: 300 }
             }],
             [DocumentType.IMG, {
-                layout: { view: ImageBox, dataField: data },
+                layout: { view: ImageBox, dataField: defaultDataKey },
                 options: {}
             }],
             [DocumentType.WEB, {
-                layout: { view: WebBox, dataField: data },
+                layout: { view: WebBox, dataField: defaultDataKey },
                 options: { _height: 300 }
             }],
             [DocumentType.COL, {
-                layout: { view: CollectionView, dataField: data },
+                layout: { view: CollectionView, dataField: defaultDataKey },
                 options: { _panX: 0, _panY: 0, scale: 1 } // , _width: 500, _height: 500 }
             }],
             [DocumentType.KVP, {
-                layout: { view: KeyValueBox, dataField: data },
+                layout: { view: KeyValueBox, dataField: defaultDataKey },
                 options: { _height: 150 }
             }],
             [DocumentType.DOCHOLDER, {
-                layout: { view: DocHolderBox, dataField: data },
+                layout: { view: DocHolderBox, dataField: defaultDataKey },
                 options: { _height: 250 }
             }],
             [DocumentType.VID, {
-                layout: { view: VideoBox, dataField: data },
+                layout: { view: VideoBox, dataField: defaultDataKey },
                 options: { currentTimecode: 0 },
             }],
             [DocumentType.AUDIO, {
-                layout: { view: AudioBox, dataField: data },
+                layout: { view: AudioBox, dataField: defaultDataKey },
                 options: { _height: 35, backgroundColor: "lightGray" }
             }],
             [DocumentType.PDF, {
-                layout: { view: PDFBox, dataField: data },
+                layout: { view: PDFBox, dataField: defaultDataKey },
                 options: { curPage: 1 }
             }],
             [DocumentType.IMPORT, {
-                layout: { view: DirectoryImportBox, dataField: data },
+                layout: { view: DirectoryImportBox, dataField: defaultDataKey },
                 options: { _height: 150 }
             }],
             [DocumentType.LINK, {
-                layout: { view: LinkBox, dataField: data },
+                layout: { view: LinkBox, dataField: defaultDataKey },
                 options: { _height: 150 }
             }],
             [DocumentType.LINKDB, {
                 data: new List<Doc>(),
-                layout: { view: EmptyBox, dataField: data },
-                options: { childDropAction: "alias", title: "LINK DB" }
+                layout: { view: EmptyBox, dataField: defaultDataKey },
+                options: { childDropAction: "alias", title: "Global Link Database" }
             }],
             [DocumentType.SCRIPTING, {
-                layout: { view: ScriptingBox, dataField: data }
+                layout: { view: ScriptingBox, dataField: defaultDataKey }
             }],
             [DocumentType.YOUTUBE, {
-                layout: { view: YoutubeBox, dataField: data }
+                layout: { view: YoutubeBox, dataField: defaultDataKey }
             }],
             [DocumentType.LABEL, {
-                layout: { view: LabelBox, dataField: data },
+                layout: { view: LabelBox, dataField: defaultDataKey },
             }],
             [DocumentType.BUTTON, {
                 layout: { view: LabelBox, dataField: "onClick" },
             }],
             [DocumentType.SLIDER, {
-                layout: { view: SliderBox, dataField: data },
+                layout: { view: SliderBox, dataField: defaultDataKey },
             }],
             [DocumentType.PRES, {
-                layout: { view: PresBox, dataField: data },
+                layout: { view: PresBox, dataField: defaultDataKey },
                 options: {}
             }],
             [DocumentType.FONTICON, {
-                layout: { view: FontIconBox, dataField: data },
+                layout: { view: FontIconBox, dataField: defaultDataKey },
                 options: { _width: 40, _height: 40, borderRounding: "100%" },
             }],
             [DocumentType.RECOMMENDATION, {
-                layout: { view: RecommendationsBox, dataField: data },
+                layout: { view: RecommendationsBox, dataField: defaultDataKey },
                 options: { _width: 200, _height: 200 },
             }],
             [DocumentType.WEBCAM, {
-                layout: { view: DashWebRTCVideo, dataField: data }
+                layout: { view: DashWebRTCVideo, dataField: defaultDataKey }
             }],
             [DocumentType.PRESELEMENT, {
-                layout: { view: PresElementBox, dataField: data }
+                layout: { view: PresElementBox, dataField: defaultDataKey }
             }],
             [DocumentType.SEARCHITEM, {
-                layout: { view: SearchItem, dataField: data }
+                layout: { view: SearchItem, dataField: defaultDataKey  }
             }],
             [DocumentType.INK, {
-                layout: { view: InkingStroke, dataField: data },
+                layout: { view: InkingStroke, dataField: defaultDataKey },
                 options: { backgroundColor: "transparent" }
             }],
             [DocumentType.SCREENSHOT, {
-                layout: { view: ScreenshotBox, dataField: data },
+                layout: { view: ScreenshotBox, dataField: defaultDataKey },
             }],
         ]);
 
@@ -582,6 +587,7 @@ export namespace Docs {
             I.title = "ink";
             I.x = options.x;
             I.y = options.y;
+            I._backgroundColor = "transparent";
             I._width = options._width;
             I._height = options._height;
             I.data = new InkField(points);
@@ -599,7 +605,7 @@ export namespace Docs {
         }
 
         export function WebDocument(url: string, options: DocumentOptions = {}) {
-            return InstanceFromProto(Prototypes.get(DocumentType.WEB), new WebField(new URL(url)), options);
+            return InstanceFromProto(Prototypes.get(DocumentType.WEB), url ? new WebField(new URL(url)) : undefined, { _fitWidth: true, _chromeStatus: url ? "disabled" : "enabled", isAnnotating: true, lockedTransform: true, ...options });
         }
 
         export function HtmlDocument(html: string, options: DocumentOptions = {}) {
@@ -618,6 +624,10 @@ export namespace Docs {
             return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { _chromeStatus: "collapsed", schemaColumns: new List([new SchemaHeaderField("title", "#f1efeb")]), ...options, _viewType: CollectionViewType.Freeform }, id);
         }
 
+        export function PileDocument(documents: Array<Doc>, options: DocumentOptions, id?: string) {
+            return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { _chromeStatus: "collapsed", backgroundColor: "black", schemaColumns: new List([new SchemaHeaderField("title", "#f1efeb")]), ...options, _viewType: CollectionViewType.Pile }, id);
+        }
+
         export function LinearDocument(documents: Array<Doc>, options: DocumentOptions, id?: string) {
             return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { _chromeStatus: "collapsed", backgroundColor: "black", schemaColumns: new List([new SchemaHeaderField("title", "#f1efeb")]), ...options, _viewType: CollectionViewType.Linear }, id);
         }
@@ -927,7 +937,7 @@ export namespace Docs {
                     });
                 }
                 ctor = Docs.Create.WebDocument;
-                options = { _height: options._width, ...options, title: path, _nativeWidth: undefined };
+                options = { ...options, _nativeWidth: 850, _nativeHeight: 962, _width: 500, _height: 566, title: path, };
             }
             return ctor ? ctor(path, options) : undefined;
         }
@@ -970,7 +980,7 @@ export namespace DocUtils {
     export function MakeLink(source: { doc: Doc }, target: { doc: Doc }, linkRelationship: string = "", id?: string) {
         const sv = DocumentManager.Instance.getDocumentView(source.doc);
         if (sv && sv.props.ContainingCollectionDoc === target.doc) return;
-        if (target.doc === CurrentUserUtils.UserDocument) return undefined;
+        if (target.doc === Doc.UserDoc()) return undefined;
 
         const linkDoc = Docs.Create.LinkDocument(source, target, { linkRelationship }, id);
         Doc.GetProto(linkDoc).title = ComputedField.MakeFunction('self.anchor1.title +" (" + (self.linkRelationship||"to") +") "  + self.anchor2.title');
@@ -983,7 +993,7 @@ export namespace DocUtils {
     export function addDocumentCreatorMenuItems(docTextAdder: (d: Doc) => void, docAdder: (d: Doc) => void, x: number, y: number): void {
         ContextMenu.Instance.addItem({
             description: "Add Note ...",
-            subitems: DocListCast((Doc.UserDoc().noteTypes as Doc).data).map((note, i) => ({
+            subitems: DocListCast((Doc.UserDoc()["template-notes"] as Doc).data).map((note, i) => ({
                 description: ":" + StrCast(note.title),
                 event: (args: { x: number, y: number }) => {
                     const textDoc = Docs.Create.TextDocument("", {
@@ -1000,7 +1010,7 @@ export namespace DocUtils {
         });
         ContextMenu.Instance.addItem({
             description: "Add Template Doc ...",
-            subitems: DocListCast(Cast(Doc.UserDoc().expandingButtons, Doc, null)?.data).map(btnDoc => Cast(btnDoc?.dragFactory, Doc, null)).filter(doc => doc).map((dragDoc, i) => ({
+            subitems: DocListCast(Cast(Doc.UserDoc().dockedBtns, Doc, null)?.data).map(btnDoc => Cast(btnDoc?.dragFactory, Doc, null)).filter(doc => doc).map((dragDoc, i) => ({
                 description: ":" + StrCast(dragDoc.title),
                 event: (args: { x: number, y: number }) => {
                     const newDoc = Doc.ApplyTemplate(dragDoc);
@@ -1018,3 +1028,4 @@ export namespace DocUtils {
 }
 
 Scripting.addGlobal("Docs", Docs);
+