Searchable menus - refinements (mainly navigation)

Author: mathesoncalum

src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledMenu.qml

@@ -46,12 +46,14 @@ MenuView {
     signal loaded()
 
     function requestFocus() {
+        if (root.isSearchable) {
+            searchField.navigation.requestActive()
+            return
+        }
         var focused = prv.focusOnSelected()
         if (!focused) {
-            focused = prv.focusOnFirstEnabled()
+            prv.focusOnFirstEnabled()
         }
-
-        return focused
     }
 
     property Component menuMetricsComponent: Component {
@@ -286,6 +288,9 @@ MenuView {
             SearchField {
                 id: searchField
 
+                navigation.panel: content.navigationPanel
+                navigation.row: 0
+
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -298,6 +303,18 @@ MenuView {
             }
 
             SeparatorLine { width: parent.width }
+
+            states: [
+                State {
+                    name: "SEARCHING"
+                    when: searchField.searchText !== ""
+
+                    PropertyChanges {
+                        target: root
+                        placementPolicies: PopupView.IgnoreFit
+                    }
+                }
+            ]
         }
 
         StyledListView {
@@ -352,8 +369,6 @@ MenuView {
             // the following logic is also likely to be unreliable [C.M]
             interactive: contentHeight > root.height
 
-            arrowControlsAvailable: true
-
             QtObject {
                 id: prv
 
@@ -417,7 +432,13 @@ MenuView {
                         parentWindow: root.window
 
                         navigation.panel: content.navigationPanel
-                        navigation.row: loader.index
+                        navigation.row: root.isSearchable ? loader.index + 1 : loader.index
+
+                        navigation.onActiveChanged: {
+                            if (item.navigation.active) {
+                                listView.positionViewAtIndex(loader.index, ListView.Contain)
+                            }
+                        }
 
                         iconAndCheckMarkMode: root.menuMetrics?.iconAndCheckMarkMode || StyledMenuItem.None