From 72745aca29cbe09fe7cb625d4824d5e495ca2f43 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 10 Mar 2020 22:25:57 +0100
Subject: [PATCH] fix unnecessary scroll to parent when opening new tab

---
 .../a2c75661-f9e2-478f-a69f-6a9409e69997.xml  | 30 -------------------
 src/public/javascripts/widgets/note_tree.js   |  7 +++++
 src/public/javascripts/widgets/tab_row.js     | 12 ++++----
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
index 99eaaea72..4a91f09a9 100644
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -57,7 +57,6 @@
     <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>apiTokenId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="25" parent="6">
@@ -131,21 +130,17 @@
     <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>attributeId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="39" parent="7" name="IDX_attributes_noteId_index">
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="40" parent="7" name="IDX_attributes_name_value">
       <ColNames>name
 value</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="41" parent="7" name="IDX_attributes_value_index">
       <ColNames>value</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <key id="42" parent="7">
       <ColNames>attributeId</ColNames>
@@ -212,17 +207,14 @@ value</ColNames>
     <index id="54" parent="8" name="sqlite_autoindex_branches_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>branchId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
       <ColNames>noteId
 parentNoteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="56" parent="8" name="IDX_branches_parentNoteId">
       <ColNames>parentNoteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <key id="57" parent="8">
       <ColNames>branchId</ColNames>
@@ -253,7 +245,6 @@ parentNoteId</ColNames>
     <index id="62" parent="9" name="sqlite_autoindex_note_contents_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="63" parent="9">
@@ -284,7 +275,6 @@ parentNoteId</ColNames>
     <index id="68" parent="10" name="sqlite_autoindex_note_revision_contents_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteRevisionId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="69" parent="10">
@@ -369,28 +359,22 @@ parentNoteId</ColNames>
     <index id="84" parent="11" name="sqlite_autoindex_note_revisions_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteRevisionId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="85" parent="11" name="IDX_note_revisions_noteId">
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="86" parent="11" name="IDX_note_revisions_utcDateLastEdited">
       <ColNames>utcDateLastEdited</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="87" parent="11" name="IDX_note_revisions_utcDateCreated">
       <ColNames>utcDateCreated</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="88" parent="11" name="IDX_note_revisions_dateLastEdited">
       <ColNames>dateLastEdited</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="89" parent="11" name="IDX_note_revisions_dateCreated">
       <ColNames>dateCreated</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <key id="90" parent="11">
       <ColNames>noteRevisionId</ColNames>
@@ -477,36 +461,28 @@ parentNoteId</ColNames>
     <index id="105" parent="12" name="sqlite_autoindex_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="106" parent="12" name="IDX_notes_title">
       <ColNames>title</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="107" parent="12" name="IDX_notes_type">
       <ColNames>type</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="108" parent="12" name="IDX_notes_isDeleted">
       <ColNames>isDeleted</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="109" parent="12" name="IDX_notes_dateCreated">
       <ColNames>dateCreated</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="110" parent="12" name="IDX_notes_dateModified">
       <ColNames>dateModified</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="111" parent="12" name="IDX_notes_utcDateCreated">
       <ColNames>utcDateCreated</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <index id="112" parent="12" name="IDX_notes_utcDateModified">
       <ColNames>utcDateModified</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <key id="113" parent="12">
       <ColNames>noteId</ColNames>
@@ -547,7 +523,6 @@ parentNoteId</ColNames>
     <index id="120" parent="13" name="sqlite_autoindex_options_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>name</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="121" parent="13">
@@ -583,7 +558,6 @@ parentNoteId</ColNames>
     <index id="127" parent="14" name="sqlite_autoindex_recent_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="128" parent="14">
@@ -604,12 +578,10 @@ parentNoteId</ColNames>
     <index id="131" parent="15" name="sqlite_autoindex_source_ids_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>sourceId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="132" parent="15" name="IDX_source_ids_utcDateCreated">
       <ColNames>utcDateCreated</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <key id="133" parent="15">
       <ColNames>sourceId</ColNames>
@@ -677,12 +649,10 @@ parentNoteId</ColNames>
     <index id="147" parent="18" name="IDX_sync_entityName_entityId">
       <ColNames>entityName
 entityId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="148" parent="18" name="IDX_sync_utcSyncDate">
       <ColNames>utcSyncDate</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
     <key id="149" parent="18">
       <ColNames>id</ColNames>
diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index 75ced6fae..d304fcc5a 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -831,4 +831,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
         noteCreateService.duplicateNote(noteId, branch.parentNoteId);
     }
+
+    async tabNoteSwitchedEvent({tabContext, notePath}) {
+        // this causes unnecessary scrolling to active note
+        if (tabContext.isActive()) {
+            super.tabNoteSwitchedEvent({tabContext, notePath});
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/public/javascripts/widgets/tab_row.js b/src/public/javascripts/widgets/tab_row.js
index 74da3d668..fd1db5c75 100644
--- a/src/public/javascripts/widgets/tab_row.js
+++ b/src/public/javascripts/widgets/tab_row.js
@@ -431,11 +431,13 @@ export default class TabRowWidget extends BasicWidget {
     removeTab(tabId) {
         const tabEl = this.getTabById(tabId)[0];
 
-        tabEl.parentNode.removeChild(tabEl);
-        this.cleanUpPreviouslyDraggedTabs();
-        this.layoutTabs();
-        this.setupDraggabilly();
-        this.setVisibility();
+        if (tabEl) {
+            tabEl.parentNode.removeChild(tabEl);
+            this.cleanUpPreviouslyDraggedTabs();
+            this.layoutTabs();
+            this.setupDraggabilly();
+            this.setVisibility();
+        }
     }
 
     getTabIdsInOrder() {