QmlDesigner: Fix toggle section expand after choosing expand all

Fixes: QDS-8104
Change-Id: I6191a7b249490e6193acdd8b618c0817a3fc6ab3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml

@@ -270,6 +270,8 @@ Item {
                                 expanded: bundleCategoryExpanded
                                 expandOnClick: false
                                 onToggleExpand: bundleCategoryExpanded = !bundleCategoryExpanded
+                                onExpand: bundleCategoryExpanded = true
+                                onCollapse: bundleCategoryExpanded = false
 
                                 Grid {
                                     width: scrollView.width

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml

@@ -72,10 +72,19 @@ Item {
     Connections {
         target: Controller
         function onCollapseAll() {
-            if (collapsible)
+            if (collapsible) {
-                section.expanded = false
+                if (section.expandOnClick)
+                    section.expanded = false
+                else
+                    section.collapse()
+            }
+        }
+        function onExpandAll() {
+            if (section.expandOnClick)
+                section.expanded = true
+            else
+                section.expand()
         }
-        function onExpandAll() { section.expanded = true }
     }
 
     signal drop(var drag)
@@ -83,6 +92,8 @@ Item {
     signal dropExit()
     signal showContextMenu()
     signal toggleExpand()
+    signal expand()
+    signal collapse()
 
     DropArea {
         id: dropArea