From f200719609743ffea8405d9ff159cf415ff0a833 Mon Sep 17 00:00:00 2001
From: anika-ahluwalia <anika.ahluwalia@gmail.com>
Date: Mon, 6 Jul 2020 14:06:02 -0500
Subject: implemented follow behavior options

---
 src/client/views/linking/LinkEditor.tsx    |  9 +++++----
 src/client/views/linking/LinkMenu.scss     |  7 ++++++-
 src/client/views/linking/LinkMenuItem.scss |  4 ++++
 src/client/views/linking/LinkMenuItem.tsx  | 13 ++++++++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/client/views/linking/LinkEditor.tsx b/src/client/views/linking/LinkEditor.tsx
index fbdfda5b3..3adf44339 100644
--- a/src/client/views/linking/LinkEditor.tsx
+++ b/src/client/views/linking/LinkEditor.tsx
@@ -288,7 +288,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
     @observable description = StrCast(LinkManager.currentLink?.description);
     @observable openDropdown: boolean = false;
 
-    @observable currentFollow: string = "Default";
+    @observable followBehavior = this.props.linkDoc.follow ? this.props.linkDoc.follow : "Default";
 
 
     //@observable description = this.props.linkDoc.description ? StrCast(this.props.linkDoc.description) : "DESCRIPTION";
@@ -330,7 +330,8 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
     @action
     changeFollowBehavior = (follow: string) => {
         this.openDropdown = false;
-        this.currentFollow = follow;
+        this.followBehavior = follow;
+        this.props.linkDoc.follow = follow;
     }
 
     @computed
@@ -340,7 +341,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                 Follow Behavior:</div>
             <div className="linkEditor-followingDropdown-dropdown">
                 <div className="linkEditor-followingDropdown-header">
-                    {this.currentFollow}
+                    {this.followBehavior}
                     <FontAwesomeIcon className="linkEditor-followingDropdown-icon"
                         icon={this.openDropdown ? "chevron-up" : "chevron-down"}
                         size={"sm"} onPointerDown={this.changeDropdown} />
@@ -348,7 +349,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                 {this.openDropdown ?
                     <div className="linkEditor-followingDropdown-optionsList">
                         <div className="linkEditor-followingDropdown-option"
-                            onPointerDown={() => this.changeFollowBehavior("default")}>
+                            onPointerDown={() => this.changeFollowBehavior("Default")}>
                             Default
                         </div>
                         <div className="linkEditor-followingDropdown-option"
diff --git a/src/client/views/linking/LinkMenu.scss b/src/client/views/linking/LinkMenu.scss
index f827f25c2..4b9f5641a 100644
--- a/src/client/views/linking/LinkMenu.scss
+++ b/src/client/views/linking/LinkMenu.scss
@@ -3,6 +3,10 @@
 .linkMenu {
     width: 100%;
     height: auto;
+
+    &:hover {
+        width: calc(auto + 26px);
+    }
 }
 
 .linkMenu-list {
@@ -17,6 +21,7 @@
     padding-bottom: 6.5px;
     padding-left: 6.5px;
     padding-right: 2px;
+    //width: calc(auto + 50px);
 }
 
 .linkMenu-group {
@@ -39,7 +44,7 @@
             }
 
             p.expand-one {
-                width: calc(100% - 26px);
+                width: calc(100% + 26px);
             }
 
             .linkEditor-tableButton {
diff --git a/src/client/views/linking/LinkMenuItem.scss b/src/client/views/linking/LinkMenuItem.scss
index a71b2dbba..7fecc2820 100644
--- a/src/client/views/linking/LinkMenuItem.scss
+++ b/src/client/views/linking/LinkMenuItem.scss
@@ -12,6 +12,7 @@
         .linkMenu-text {
 
             padding: 4px 2px;
+            //display: inline;
 
             .linkMenu-destination-title {
                 text-decoration: none;
@@ -52,6 +53,7 @@
 
     &:hover {
 
+
         .linkMenu-item-buttons {
             display: flex;
         }
@@ -61,6 +63,7 @@
             .linkMenu-destination-title {
                 text-decoration: underline;
                 color: rgb(15, 57, 148);
+                display: inline;
             }
 
             &.expand-two p {
@@ -81,6 +84,7 @@
 }
 
 .linkMenu-item-buttons {
+    //@extend: right;
     position: absolute;
     top: 50%;
     right: 0;
diff --git a/src/client/views/linking/LinkMenuItem.tsx b/src/client/views/linking/LinkMenuItem.tsx
index 891c6d263..9f6b47375 100644
--- a/src/client/views/linking/LinkMenuItem.tsx
+++ b/src/client/views/linking/LinkMenuItem.tsx
@@ -150,7 +150,18 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
         console.log("FOLLOWWW");
         DocumentLinksButton.EditLink = undefined;
         LinkDocPreview.LinkInfo = undefined;
-        DocumentManager.Instance.FollowLink(this.props.linkDoc, this.props.sourceDoc, doc => this.props.addDocTab(doc, "onRight"), false);
+
+        if (this.props.linkDoc.follow) {
+            if (this.props.linkDoc.follow === "Default") {
+                DocumentManager.Instance.FollowLink(this.props.linkDoc, this.props.sourceDoc, doc => this.props.addDocTab(doc, "onRight"), false);
+            } else if (this.props.linkDoc.follow === "Always open in right tab") {
+                this.props.addDocTab(this.props.sourceDoc, "onRight");
+            } else if (this.props.linkDoc.follow === "Always open in new tab") {
+                this.props.addDocTab(this.props.sourceDoc, "inTab");
+            }
+        } else {
+            DocumentManager.Instance.FollowLink(this.props.linkDoc, this.props.sourceDoc, doc => this.props.addDocTab(doc, "onRight"), false);
+        }
     }
 
     @action
-- 
cgit v1.2.3-70-g09d2