Remove custom close button and simplify quick pick navigation logic

Author: robertpiosik

apps/editor/src/commands/add-file-to-context-command.ts

@@ -134,23 +134,13 @@ export const add_file_to_context_command = (
             label: f.label,
             full_path: f.full_path
           }))
-          folder_quick_pick.buttons = [
-            vscode.QuickInputButtons.Back,
-            {
-              iconPath: new vscode.ThemeIcon('close'),
-              tooltip: 'Close'
-            }
-          ]
+          folder_quick_pick.buttons = [vscode.QuickInputButtons.Back]
 
           let folder_accepted = false
-          let should_close_fully = false
 
           folder_quick_pick.onDidTriggerButton((button) => {
             if (button === vscode.QuickInputButtons.Back) {
               folder_quick_pick.hide()
-            } else if (button.tooltip == 'Close') {
-              should_close_fully = true
-              folder_quick_pick.hide()
             }
           })
 
@@ -186,11 +176,6 @@ export const add_file_to_context_command = (
             folder_quick_pick.dispose()
             is_showing_folder_quick_pick = false
 
-            if (should_close_fully) {
-              quick_pick.dispose()
-              return
-            }
-
             if (!folder_accepted) {
               if (file_items_cache.length > 0) {
                 quick_pick.items = file_items_cache

apps/editor/src/commands/remove-file-from-context-command.ts

@@ -158,23 +158,13 @@ export const remove_file_from_context_command = (
             label: f.label,
             full_path: f.full_path
           }))
-          folder_quick_pick.buttons = [
-            vscode.QuickInputButtons.Back,
-            {
-              iconPath: new vscode.ThemeIcon('close'),
-              tooltip: 'Close'
-            }
-          ]
+          folder_quick_pick.buttons = [vscode.QuickInputButtons.Back]
 
           let folder_accepted = false
-          let should_close_fully = false
 
           folder_quick_pick.onDidTriggerButton((button) => {
             if (button === vscode.QuickInputButtons.Back) {
               folder_quick_pick.hide()
-            } else if (button.tooltip == 'Close') {
-              should_close_fully = true
-              folder_quick_pick.hide()
             }
           })
 
@@ -210,11 +200,6 @@ export const remove_file_from_context_command = (
             folder_quick_pick.dispose()
             is_showing_folder_quick_pick = false
 
-            if (should_close_fully) {
-              quick_pick.dispose()
-              return
-            }
-
             if (!folder_accepted) {
               if (file_items_cache.length > 0) {
                 quick_pick.items = file_items_cache