From 60a0856d1234d87429acd4352ecbde655c821a62 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 6 Jul 2020 16:07:51 -0400
Subject: [PATCH] Fix issue where preset list search would get autofocus
 unexpectedly

---
 modules/modes/select.js | 2 ++
 modules/ui/inspector.js | 4 ++--
 modules/ui/sidebar.js   | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/modes/select.js b/modules/modes/select.js
index e595e0178..440a6416e 100644
--- a/modules/modes/select.js
+++ b/modules/modes/select.js
@@ -487,6 +487,8 @@ export function modeSelect(context, selectedIDs) {
 
     mode.exit = function() {
 
+        _newFeature = false;
+
         _operations.forEach(function(operation) {
             if (operation.behavior) {
                 context.uninstall(operation.behavior);
diff --git a/modules/ui/inspector.js b/modules/ui/inspector.js
index d35dc0331..2dc6825f8 100644
--- a/modules/ui/inspector.js
+++ b/modules/ui/inspector.js
@@ -17,7 +17,7 @@ export function uiInspector(context) {
     var _newFeature = false;
 
 
-    function inspector(selection, newFeature) {
+    function inspector(selection) {
         presetList
             .entityIDs(_entityIDs)
             .autofocus(_newFeature)
@@ -67,7 +67,7 @@ export function uiInspector(context) {
             if (entity.hasNonGeometryTags()) return false;
 
             // prompt to select preset if feature is new and untagged
-            if (newFeature) return true;
+            if (_newFeature) return true;
 
             // all existing features except vertices should default to inspector
             if (entity.geometry(context.graph()) !== 'vertex') return false;
diff --git a/modules/ui/sidebar.js b/modules/ui/sidebar.js
index af3ba323b..0f87ceecb 100644
--- a/modules/ui/sidebar.js
+++ b/modules/ui/sidebar.js
@@ -238,7 +238,8 @@ export function uiSidebar(context) {
                 if (!inspector.entityIDs() || !utilArrayIdentical(inspector.entityIDs(), [datum.id]) || inspector.state() !== 'hover') {
                     inspector
                         .state('hover')
-                        .entityIDs([datum.id]);
+                        .entityIDs([datum.id])
+                        .newFeature(false);
 
                     inspectorWrap
                         .call(inspector);
@@ -300,7 +301,7 @@ export function uiSidebar(context) {
                         .newFeature(newFeature);
 
                     inspectorWrap
-                        .call(inspector, newFeature);
+                        .call(inspector);
                 }
 
             } else {