Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web

1 files changed, 45 insertions, 12 deletions

diff --git a/src/client/views/CollectionMulticolumnView.tsx b/src/client/views/CollectionMulticolumnView.tsx
index 94e86c048..3231c0da1 100644
--- a/src/client/views/CollectionMulticolumnView.tsx
+++ b/src/client/views/CollectionMulticolumnView.tsx
@@ -1,40 +1,73 @@
 import { observer } from 'mobx-react';
-import { makeInterface } from '../../new_fields/Schema';
+import { makeInterface, listSpec } from '../../new_fields/Schema';
 import { documentSchema } from '../../new_fields/documentSchemas';
-import { CollectionSubView, SubCollectionViewProps } from './collections/CollectionSubView';
+import { CollectionSubView } from './collections/CollectionSubView';
 import { DragManager } from '../util/DragManager';
 import * as React from "react";
-import { Doc } from '../../new_fields/Doc';
-import { NumCast } from '../../new_fields/Types';
+import { Doc, DocListCast } from '../../new_fields/Doc';
+import { NumCast, Cast, StrCast } from '../../new_fields/Types';
+import { List } from '../../new_fields/List';
+import { ContentFittingDocumentView } from './nodes/ContentFittingDocumentView';
+import { Utils } from '../../Utils';
+import { Transform } from '../util/Transform';
+import "./collectionMulticolumnView.scss";
 
 type MulticolumnDocument = makeInterface<[typeof documentSchema]>;
 const MulticolumnDocument = makeInterface(documentSchema);
 
 @observer
 export default class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocument) {
-
-    constructor(props: Readonly<SubCollectionViewProps>) {
-        super(props);
+    private _dropDisposer?: DragManager.DragDropDisposer;
+    private get configuration() {
         const { Document } = this.props;
-        Document.multicolumnData = new Doc();
+        if (!Document.multicolumnData) {
+            Document.multicolumnData = new List<Doc>();
+        }
+        return DocListCast(this.Document.multicolumnData);
     }
 
-    private _dropDisposer?: DragManager.DragDropDisposer;
-    protected createDropTarget = (ele: HTMLDivElement) => { //used for stacking and masonry view
+    protected createDropTarget = (ele: HTMLDivElement) => {
         this._dropDisposer && this._dropDisposer();
         if (ele) {
             this._dropDisposer = DragManager.MakeDropTarget(ele, this.drop.bind(this));
         }
     }
 
+    getTransform = (ele: React.RefObject<HTMLDivElement>) => () => {
+        if (!ele.current) return Transform.Identity();
+        const { scale, translateX, translateY } = Utils.GetScreenTransform(ele.current);
+        return new Transform(-translateX, -translateY, 1 / scale);
+    }
+
     public isCurrent(doc: Doc) { return !doc.isMinimized && (Math.abs(NumCast(doc.displayTimecode, -1) - NumCast(this.Document.currentTimecode, -1)) < 1.5 || NumCast(doc.displayTimecode, -1) === -1); }
 
     render() {
+        const { PanelWidth } = this.props;
         return (
             <div className={"collectionMulticolumnView_outer"}>
                 <div className={"collectionMulticolumnView_contents"}>
-                    {this.childLayoutPairs.filter(pair => this.isCurrent(pair.layout)).map(({ layout, data }) => {
-
+                    {this.configuration.map(config => {
+                        const { target, columnWidth } = config;
+                        if (target instanceof Doc) {
+                            let computedWidth: number = 0;
+                            const widthSpecifier = Cast(columnWidth, "number");
+                            let matches: RegExpExecArray | null;
+                            if (widthSpecifier !== undefined) {
+                                computedWidth = widthSpecifier;
+                            } else if ((matches = /([\d.]+)\%/.exec(StrCast(columnWidth))) !== null) {
+                                computedWidth = Number(matches[1]) / 100 * PanelWidth();
+                            }
+                            return (!computedWidth ? (null) :
+                                <ContentFittingDocumentView
+                                    {...this.props}
+                                    Document={target}
+                                    DataDocument={undefined}
+                                    PanelWidth={() => computedWidth}
+                                    getTransform={this.props.ScreenToLocalTransform}
+                                />
+                            );
+                        }
+                        return (null);
                     })}
                 </div>
             </div>