feat(UI): textarea autofocus selecting a query tab, closes #166

antares-sql · Jan 9, 2022 · b4545b1 · b4545b1
1 parent d9a3eab
commit b4545b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
@@ -18,7 +18,6 @@
             <li
                v-for="(tab, i) of draggableTabs"
                :key="i"
-               :ref="selectedTab === tab.uid ? 'tab-selected' : ''"
                class="tab-item tab-draggable"
                draggable="true"
                :class="{'active': selectedTab === tab.uid}"
@@ -568,7 +567,7 @@ export default {
          return this.workspace ? this.workspace.selectedTab : null;
       },
       queryTabs () {
-         return this.workspace.tabs.filter(tab => tab.type === 'query');
+         return this.workspace ? this.workspace.tabs.filter(tab => tab.type === 'query') : [];
       },
       schemaChild () {
          for (const key in this.workspace.breadcrumbs) {
@@ -584,16 +583,12 @@ export default {
       }
    },
    watch: {
-      selectedTab (newVal, oldVal) {
-         if (newVal !== oldVal) {
+      queryTabs: function (newVal, oldVal) {
+         if (newVal.length > oldVal.length) {
             setTimeout(() => {
-               const element = this.$refs['tab-selected'] ? this.$refs['tab-selected'][0] : null;
-               if (element) {
-                  element.setAttribute('tabindex', '-1');
-                  element.focus();
-                  element.removeAttribute('tabindex');
-               }
-            }, 50);
+               const scroller = this.$refs.tabWrap;
+               if (scroller) scroller.$el.scrollLeft = scroller.$el.scrollWidth;
+            }, 0);
          }
       }
    },

diff --git a/src/renderer/components/WorkspaceTabQuery.vue b/src/renderer/components/WorkspaceTabQuery.vue
@@ -218,8 +218,13 @@ export default {
    },
    watch: {
       isSelected (val) {
-         if (val)
+         if (val) {
             this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });
+            setTimeout(() => {
+               if (this.$refs.queryEditor)
+                  this.$refs.queryEditor.editor.focus();
+            }, 0);
+         }
       },
       selectedSchema () {
          this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });