aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFawn <fangrui_tong@brown.edu>2019-06-21 13:32:23 -0400
committerFawn <fangrui_tong@brown.edu>2019-06-21 13:32:23 -0400
commitd78c651322ad228152b862eaa378946fe65cc9f9 (patch)
tree08d8e0cbf0d3c19c58689b8e2dbb1025abc83844
parentb1a2871fcca57ce934b8613b315a08eede188669 (diff)
dragged links from menu are aliases
-rw-r--r--src/client/util/DocumentManager.ts13
-rw-r--r--src/client/util/DragManager.ts12
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx14
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx267
4 files changed, 163 insertions, 143 deletions
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 84f4d7fa2..325f4894d 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -10,6 +10,7 @@ import { CollectionPDFView } from '../views/collections/CollectionPDFView';
import { CollectionVideoView } from '../views/collections/CollectionVideoView';
import { Id } from '../../new_fields/FieldSymbols';
import { LinkManager } from './LinkManager';
+import { CurrentUserUtils } from '../../server/authentication/models/current_user_utils';
export class DocumentManager {
@@ -84,6 +85,18 @@ export class DocumentManager {
@computed
public get LinkedDocumentViews() {
+ // console.log("linked");
+ // let docs = DocListCast(CurrentUserUtils.UserDocument.data);
+ // docs.forEach(d => {
+ // console.log("d", StrCast(d.title));
+
+ // });
+
+ // let d = Cast(CurrentUserUtils.UserDocument.activeWorkspace, Doc, new Doc);
+ // console.log("DOC", StrCast(d.title));
+
+
+
let linked = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
// console.log("FINDING LINKED DVs FOR", StrCast(dv.props.Document.title));
let linksList = LinkManager.Instance.findAllRelatedLinks(dv.props.Document);
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 01193cab5..78cae4ff7 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -1,6 +1,6 @@
import { action, runInAction, observable } from "mobx";
import { Doc, DocListCastAsync } from "../../new_fields/Doc";
-import { Cast } from "../../new_fields/Types";
+import { Cast, StrCast } from "../../new_fields/Types";
import { emptyFunction } from "../../Utils";
import { CollectionDockingView } from "../views/collections/CollectionDockingView";
import * as globalCssVariables from "../views/globalCssVariables.scss";
@@ -52,6 +52,7 @@ export async function DragLinkAsDocument(dragEle: HTMLElement, x: number, y: num
let moddrag = await Cast(draggeddoc.annotationOn, Doc);
let dragData = new DragManager.DocumentDragData(moddrag ? [moddrag] : [draggeddoc]);
+ dragData.dropAction = "alias" as dropActionType;
DragManager.StartDocumentDrag([dragEle], dragData, x, y, {
handlers: {
dragComplete: action(emptyFunction),
@@ -82,6 +83,7 @@ export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: n
if (doc) moddrag.push(doc);
}
let dragData = new DragManager.DocumentDragData(moddrag.length ? moddrag : draggedDocs);
+ dragData.dropAction = "alias" as dropActionType;
// dragData.moveDocument = (document, targetCollection, addDocument) => {
// return false;
// };
@@ -201,14 +203,18 @@ export namespace DragManager {
export let StartDragFunctions: (() => void)[] = [];
export function StartDocumentDrag(eles: HTMLElement[], dragData: DocumentDragData, downX: number, downY: number, options?: DragOptions) {
+ console.log("outside", dragData.userDropAction, dragData.dropAction);
runInAction(() => StartDragFunctions.map(func => func()));
StartDrag(eles, dragData, downX, downY, options,
- (dropData: { [id: string]: any }) =>
+ (dropData: { [id: string]: any }) => {
+ console.log("DRAG", dragData.userDropAction, dragData.dropAction);
(dropData.droppedDocuments = dragData.userDropAction === "alias" || (!dragData.userDropAction && dragData.dropAction === "alias") ?
dragData.draggedDocuments.map(d => Doc.MakeAlias(d)) :
dragData.userDropAction === "copy" || (!dragData.userDropAction && dragData.dropAction === "copy") ?
dragData.draggedDocuments.map(d => Doc.MakeCopy(d, true)) :
- dragData.draggedDocuments));
+ dragData.draggedDocuments
+ );
+ });
}
export function StartAnnotationDrag(eles: HTMLElement[], dragData: AnnotationDragData, downX: number, downY: number, options?: DragOptions) {
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
index ca55b0ff0..65d5ac474 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
@@ -16,8 +16,10 @@ export interface CollectionFreeFormLinkViewProps {
// removeDocument: (document: Doc) => boolean;
// sameContext: boolean;
- sourceView: DocumentView;
- targetView: DocumentView;
+ // sourceView: DocumentView;
+ // targetView: DocumentView;
+ sourceView: Doc;
+ targetView: Doc;
}
@observer
@@ -49,11 +51,11 @@ export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFo
// let b = this.props.B;
let a1 = this.props.sourceView;
let a2 = this.props.targetView;
- let x1 = NumCast(a1.Document.x) + (BoolCast(a1.Document.isMinimized, false) ? 5 : NumCast(a1.Document.width) / NumCast(a1.Document.zoomBasis, 1) / 2);
- let y1 = NumCast(a1.Document.y) + (BoolCast(a1.Document.isMinimized, false) ? 5 : NumCast(a1.Document.height) / NumCast(a1.Document.zoomBasis, 1) / 2);
+ let x1 = NumCast(a1.x) + (BoolCast(a1.isMinimized, false) ? 5 : NumCast(a1.width) / NumCast(a1.zoomBasis, 1) / 2);
+ let y1 = NumCast(a1.y) + (BoolCast(a1.isMinimized, false) ? 5 : NumCast(a1.height) / NumCast(a1.zoomBasis, 1) / 2);
- let x2 = NumCast(a2.Document.x) + (BoolCast(a2.Document.isMinimized, false) ? 5 : NumCast(a2.Document.width) / NumCast(a2.Document.zoomBasis, 1) / 2);
- let y2 = NumCast(a2.Document.y) + (BoolCast(a2.Document.isMinimized, false) ? 5 : NumCast(a2.Document.height) / NumCast(a2.Document.zoomBasis, 1) / 2);
+ let x2 = NumCast(a2.x) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.width) / NumCast(a2.zoomBasis, 1) / 2);
+ let y2 = NumCast(a2.y) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.height) / NumCast(a2.zoomBasis, 1) / 2);
return (
<>
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index 6868e8187..9d2f8946b 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -96,153 +96,152 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
return equalViews.filter(sv => sv.props.ContainingCollectionView && sv.props.ContainingCollectionView.props.Document === this.props.Document);
}
- // @computed
- // get uniqueConnections() {
- // // console.log("\n");
- // let connections = DocumentManager.Instance.LinkedDocumentViews.reduce((drawnPairs, connection) => {
- // // console.log("CONNECTION BETWEEN", StrCast(connection.anchor1View.props.Document.title), StrCast(connection.anchor2View.props.Document.title));
- // let srcViews = this.documentAnchors(connection.anchor1View);
- // // srcViews.forEach(sv => {
- // // console.log("DOCANCHORS SRC", StrCast(connection.anchor1View.Document.title), StrCast(sv.Document.title));
- // // });
-
- // let targetViews = this.documentAnchors(connection.anchor2View);
- // // targetViews.forEach(sv => {
- // // console.log("DOCANCHORS TARG", StrCast(connection.anchor2View.Document.title), StrCast(sv.Document.title));
- // // });
-
- // // console.log("lengths", srcViews.length, targetViews.length);
-
- // // srcViews.forEach(v => {
- // // console.log("SOURCE VIEW", StrCast(v.props.Document.title));
- // // });
- // // targetViews.forEach(v => {
- // // console.log("TARGET VIEW", StrCast(v.Document.title));
- // // });
-
- // let possiblePairs: { anchor1: Doc, anchor2: Doc }[] = [];
- // // srcViews.map(sv => {
- // // console.log("SOURCE VIEW", StrCast(sv.props.Document.title));
- // // targetViews.map(tv => {
- // // console.log("TARGET VIEW", StrCast(tv.props.Document.title));
- // // // console.log("PUSHING PAIR", StrCast(sv.props.Document.title), StrCast(tv.props.Document.title));
- // // possiblePairs.push({ anchor1: sv.props.Document, anchor2: tv.props.Document });
- // // });
- // // console.log("END\n");
- // // });
- // srcViews.forEach(sv => {
- // // console.log("SOURCE VIEW", StrCast(sv.props.Document.title));
- // targetViews.forEach(tv => {
- // // console.log("TARGET VIEW", StrCast(tv.props.Document.title));
- // // console.log("PUSHING PAIR", StrCast(sv.props.Document.title), StrCast(tv.props.Document.title));
- // possiblePairs.push({ anchor1: sv.props.Document, anchor2: tv.props.Document });
- // });
- // // console.log("END\n");
- // });
- // // console.log("POSSIBLE PAIRS LENGTH", possiblePairs.length);
- // possiblePairs.map(possiblePair => {
- // // console.log("POSSIBLEPAIR", StrCast(possiblePair.anchor1.title), StrCast(possiblePair.anchor2.title));
- // if (!drawnPairs.reduce((found, drawnPair) => {
- // let match1 = (Doc.AreProtosEqual(possiblePair.anchor1, drawnPair.anchor1) && Doc.AreProtosEqual(possiblePair.anchor2, drawnPair.anchor2));
- // let match2 = (Doc.AreProtosEqual(possiblePair.anchor1, drawnPair.anchor2) && Doc.AreProtosEqual(possiblePair.anchor2, drawnPair.anchor1));
- // let match = match1 || match2;
- // if (match && !drawnPair.linkDocs.reduce((found, link) => found || link[Id] === connection.linkDoc[Id], false)) {
- // drawnPair.linkDocs.push(connection.linkDoc);
- // }
- // return match || found;
- // }, false)) {
- // drawnPairs.push({ anchor1: possiblePair.anchor1, anchor2: possiblePair.anchor2, linkDocs: [connection.linkDoc] });
- // }
- // });
- // return drawnPairs;
- // }, [] as { anchor1: Doc, anchor2: Doc, linkDocs: Doc[] }[]);
- // return connections.map(c => {
- // let x = c.linkDocs.reduce((p, l) => p + l[Id], "");
- // return <CollectionFreeFormLinkView key={x} anchor1={c.anchor1} anchor2={c.anchor2} />;
- // });
- // }
+ @computed
+ get uniqueConnections() {
+ // console.log("\n");
+ let connections = DocumentManager.Instance.LinkedDocumentViews.reduce((drawnPairs, connection) => {
+ // console.log("CONNECTION BETWEEN", StrCast(connection.anchor1View.props.Document.title), StrCast(connection.anchor2View.props.Document.title));
+ let srcViews = this.documentAnchors(connection.anchor1View);
+ // srcViews.forEach(sv => {
+ // console.log("DOCANCHORS SRC", StrCast(connection.anchor1View.Document.title), StrCast(sv.Document.title));
+ // });
+
+ let targetViews = this.documentAnchors(connection.anchor2View);
+ // targetViews.forEach(sv => {
+ // console.log("DOCANCHORS TARG", StrCast(connection.anchor2View.Document.title), StrCast(sv.Document.title));
+ // });
+
+ // console.log("lengths", srcViews.length, targetViews.length);
+
+ // srcViews.forEach(v => {
+ // console.log("SOURCE VIEW", StrCast(v.props.Document.title));
+ // });
+ // targetViews.forEach(v => {
+ // console.log("TARGET VIEW", StrCast(v.Document.title));
+ // });
+
+ let possiblePairs: { anchor1: Doc, anchor2: Doc }[] = [];
+ // srcViews.map(sv => {
+ // console.log("SOURCE VIEW", StrCast(sv.props.Document.title));
+ // targetViews.map(tv => {
+ // console.log("TARGET VIEW", StrCast(tv.props.Document.title));
+ // // console.log("PUSHING PAIR", StrCast(sv.props.Document.title), StrCast(tv.props.Document.title));
+ // possiblePairs.push({ anchor1: sv.props.Document, anchor2: tv.props.Document });
+ // });
+ // console.log("END\n");
+ // });
+ srcViews.forEach(sv => {
+ // console.log("SOURCE VIEW", StrCast(sv.props.Document.title));
+ targetViews.forEach(tv => {
+ // console.log("TARGET VIEW", StrCast(tv.props.Document.title));
+ // console.log("PUSHING PAIR", StrCast(sv.props.Document.title), StrCast(tv.props.Document.title));
+ possiblePairs.push({ anchor1: sv.props.Document, anchor2: tv.props.Document });
+ });
+ // console.log("END\n");
+ });
+ // console.log("POSSIBLE PAIRS LENGTH", possiblePairs.length);
+ possiblePairs.map(possiblePair => {
+ // console.log("POSSIBLEPAIR", StrCast(possiblePair.anchor1.title), StrCast(possiblePair.anchor2.title));
+ if (!drawnPairs.reduce((found, drawnPair) => {
+ let match1 = (Doc.AreProtosEqual(possiblePair.anchor1, drawnPair.anchor1) && Doc.AreProtosEqual(possiblePair.anchor2, drawnPair.anchor2));
+ let match2 = (Doc.AreProtosEqual(possiblePair.anchor1, drawnPair.anchor2) && Doc.AreProtosEqual(possiblePair.anchor2, drawnPair.anchor1));
+ let match = match1 || match2;
+ if (match && !drawnPair.linkDocs.reduce((found, link) => found || link[Id] === connection.linkDoc[Id], false)) {
+ drawnPair.linkDocs.push(connection.linkDoc);
+ }
+ return match || found;
+ }, false)) {
+ drawnPairs.push({ anchor1: possiblePair.anchor1, anchor2: possiblePair.anchor2, linkDocs: [connection.linkDoc] });
+ }
+ });
+ return drawnPairs;
+ }, [] as { anchor1: Doc, anchor2: Doc, linkDocs: Doc[] }[]);
+ return connections.map(c => {
+ let x = c.linkDocs.reduce((p, l) => p + l[Id], "");
+ return <CollectionFreeFormLinkView key={x} sourceView={c.anchor1} targetView={c.anchor2} />;
+ });
+ }
- findUniquePairs = (): JSX.Element[] => {
- let connections = DocumentManager.Instance.LinkedDocumentViews;
+ // findUniquePairs = (): JSX.Element[] => {
+ // let connections = DocumentManager.Instance.LinkedDocumentViews;
- // console.log("CONNECTIONS");
- // connections.forEach(c => console.log(StrCast(c.anchor1View.Document.title), StrCast(c.anchor2View.Document.title)));
+ // // console.log("CONNECTIONS");
+ // // connections.forEach(c => console.log(StrCast(c.anchor1View.Document.title), StrCast(c.anchor2View.Document.title)));
- let unique: Set<{ sourceView: DocumentView, targetView: DocumentView, linkDoc: Doc }> = new Set();
- connections.forEach(c => {
+ // let unique: Set<{ sourceView: DocumentView, targetView: DocumentView, linkDoc: Doc }> = new Set();
+ // connections.forEach(c => {
- // let match1Index = unique.findIndex(u => (c.anchor1View === u.sourceView) && (c.anchor2View === u.targetView));
- // let match2Index = unique.findIndex(u => (c.anchor1View === u.targetView) && (c.anchor2View === u.sourceView));
- let match1 = unique.has({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
- let match2 = unique.has({ sourceView: c.anchor2View, targetView: c.anchor1View, linkDoc: c.linkDoc });
- let sameContext = c.anchor1View.props.ContainingCollectionView === c.anchor2View.props.ContainingCollectionView;
+ // // let match1Index = unique.findIndex(u => (c.anchor1View === u.sourceView) && (c.anchor2View === u.targetView));
+ // // let match2Index = unique.findIndex(u => (c.anchor1View === u.targetView) && (c.anchor2View === u.sourceView));
+ // let match1 = unique.has({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
+ // let match2 = unique.has({ sourceView: c.anchor2View, targetView: c.anchor1View, linkDoc: c.linkDoc });
+ // let sameContext = c.anchor1View.props.ContainingCollectionView === c.anchor2View.props.ContainingCollectionView;
- // console.log("CONNECTION", StrCast(c.anchor1View.props.Document.title), StrCast(c.anchor2View.props.Document.title), match1, match2);
+ // // console.log("CONNECTION", StrCast(c.anchor1View.props.Document.title), StrCast(c.anchor2View.props.Document.title), match1, match2);
- // if in same context, push if docview pair does not already exist
- // else push both directions of pair
- if (sameContext) {
- if (!(match1 || match2)) unique.add({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
- } else {
- unique.add({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
- unique.add({ sourceView: c.anchor2View, targetView: c.anchor1View, linkDoc: c.linkDoc });
- }
- });
+ // // if in same context, push if docview pair does not already exist
+ // // else push both directions of pair
+ // if (sameContext) {
+ // if (!(match1 || match2)) unique.add({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
+ // } else {
+ // unique.add({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
+ // unique.add({ sourceView: c.anchor2View, targetView: c.anchor1View, linkDoc: c.linkDoc });
+ // }
+ // });
- let uniqueList: JSX.Element[] = [];
- unique.forEach(u => {
- // TODO: make better key
- let key = StrCast(u.sourceView.Document[Id]) + "-link-" + StrCast(u.targetView.Document[Id]) + "-" + Date.now() + Math.random();
- let sourceIn = u.sourceView.props.ContainingCollectionView ? u.sourceView.props.ContainingCollectionView.props.Document === this.props.Document : false;
- let targetIn = u.targetView.props.ContainingCollectionView ? u.targetView.props.ContainingCollectionView.props.Document === this.props.Document : false;
- let sameContext = u.sourceView.props.ContainingCollectionView === u.targetView.props.ContainingCollectionView;
- let inContainer = sameContext ? sourceIn || targetIn : sourceIn;
-
- if (inContainer) {
- // let alias = Doc.MakeAlias(proxy);
- if (sameContext) {
- uniqueList.push(<CollectionFreeFormLinkView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
- } else {
- let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
- if (!proxy) {
- proxy = Docs.LinkButtonDocument(
- { sourceViewId: StrCast(u.sourceView.props.Document[Id]), targetViewId: StrCast(u.targetView.props.Document[Id]) },
- { width: 200, height: 100, borderRounding: 0 });
- let proxy1Proto = Doc.GetProto(proxy);
- proxy1Proto.sourceViewId = StrCast(u.sourceView.props.Document[Id]);
- proxy1Proto.targetViewId = StrCast(u.targetView.props.Document[Id]);
- proxy1Proto.isLinkButton = true;
-
- // LinkManager.Instance.linkProxies.push(proxy);
- LinkManager.Instance.addLinkProxy(proxy);
- }
- uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} proxyDoc={proxy} />);
-
- // let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
- // if (proxy) {
- // this.props.addDocument(proxy, false);
- // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
- // }
- // let proxyKey = Doc.AreProtosEqual(u.sourceView.Document, Cast(u.linkDoc.anchor1, Doc, new Doc)) ? "proxy1" : "proxy2";
- // let proxy = Cast(u.linkDoc[proxyKey], Doc, new Doc);
- // this.props.addDocument(proxy, false);
-
- // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView}
- // proxyDoc={proxy} addDocTab={this.props.addDocTab} />);
- }
- }
- });
- return uniqueList;
- }
+ // let uniqueList: JSX.Element[] = [];
+ // unique.forEach(u => {
+ // // TODO: make better key
+ // let key = StrCast(u.sourceView.Document[Id]) + "-link-" + StrCast(u.targetView.Document[Id]) + "-" + Date.now() + Math.random();
+ // let sourceIn = u.sourceView.props.ContainingCollectionView ? u.sourceView.props.ContainingCollectionView.props.Document === this.props.Document : false;
+ // let targetIn = u.targetView.props.ContainingCollectionView ? u.targetView.props.ContainingCollectionView.props.Document === this.props.Document : false;
+ // let sameContext = u.sourceView.props.ContainingCollectionView === u.targetView.props.ContainingCollectionView;
+ // let inContainer = sameContext ? sourceIn || targetIn : sourceIn;
+
+ // if (inContainer) {
+ // // let alias = Doc.MakeAlias(proxy);
+ // if (sameContext) {
+ // uniqueList.push(<CollectionFreeFormLinkView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
+ // } else {
+ // let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
+ // if (!proxy) {
+ // proxy = Docs.LinkButtonDocument(
+ // { sourceViewId: StrCast(u.sourceView.props.Document[Id]), targetViewId: StrCast(u.targetView.props.Document[Id]) },
+ // { width: 200, height: 100, borderRounding: 0 });
+ // let proxy1Proto = Doc.GetProto(proxy);
+ // proxy1Proto.sourceViewId = StrCast(u.sourceView.props.Document[Id]);
+ // proxy1Proto.targetViewId = StrCast(u.targetView.props.Document[Id]);
+ // proxy1Proto.isLinkButton = true;
+
+ // // LinkManager.Instance.linkProxies.push(proxy);
+ // LinkManager.Instance.addLinkProxy(proxy);
+ // }
+ // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} proxyDoc={proxy} />);
+
+ // // let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
+ // // if (proxy) {
+ // // this.props.addDocument(proxy, false);
+ // // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
+ // // }
+ // // let proxyKey = Doc.AreProtosEqual(u.sourceView.Document, Cast(u.linkDoc.anchor1, Doc, new Doc)) ? "proxy1" : "proxy2";
+ // // let proxy = Cast(u.linkDoc[proxyKey], Doc, new Doc);
+ // // this.props.addDocument(proxy, false);
+
+ // // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView}
+ // // proxyDoc={proxy} addDocTab={this.props.addDocTab} />);
+ // }
+ // }
+ // });
+ // return uniqueList;
+ // }
render() {
- this.findUniquePairs();
return (
<div className="collectionfreeformlinksview-container">
<svg className="collectionfreeformlinksview-svgCanvas">
- {/* {this.uniqueConnections} */}
- {this.findUniquePairs()}
+ {this.uniqueConnections}
+ {/* {this.findUniquePairs()} */}
</svg>
{this.props.children}
</div>