Merge pull request #36203 from nextcloud/enh/a11y-search-menu

Port global search menu to focus trapped NcHeaderMenu

core/src/views/UnifiedSearch.vue

@@ -20,7 +20,7 @@
   -
   -->
 <template>
-	<HeaderMenu id="unified-search"
+	<NcHeaderMenu id="unified-search"
 		class="unified-search"
 		exclude-click-outside-classes="popover"
 		:open.sync="open"
@@ -150,24 +150,26 @@
 				</li>
 			</ul>
 		</template>
-	</HeaderMenu>
+	</NcHeaderMenu>
 </template>
 
 <script>
+import debounce from 'debounce'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
-import { minSearchLength, getTypes, search, defaultLimit, regexFilterIn, regexFilterNot, enableLiveSearch } from '../services/UnifiedSearchService'
 import { showError } from '@nextcloud/dialogs'
 
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
-import debounce from 'debounce'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
-import NcHighlight from '@nextcloud/vue/dist/Components/NcHighlight'
-import Magnify from 'vue-material-design-icons/Magnify'
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import NcHeaderMenu from '@nextcloud/vue/dist/Components/NcHeaderMenu.js'
+import NcHighlight from '@nextcloud/vue/dist/Components/NcHighlight.js'
+
+import Magnify from 'vue-material-design-icons/Magnify.vue'
 
-import HeaderMenu from '../components/HeaderMenu'
-import SearchResult from '../components/UnifiedSearch/SearchResult'
-import SearchResultPlaceholders from '../components/UnifiedSearch/SearchResultPlaceholders'
+import SearchResult from '../components/UnifiedSearch/SearchResult.vue'
+import SearchResultPlaceholders from '../components/UnifiedSearch/SearchResultPlaceholders.vue'
+
+import { minSearchLength, getTypes, search, defaultLimit, regexFilterIn, regexFilterNot, enableLiveSearch } from '../services/UnifiedSearchService.js'
 
 const REQUEST_FAILED = 0
 const REQUEST_OK = 1
@@ -177,12 +179,12 @@ export default {
 	name: 'UnifiedSearch',
 
 	components: {
+		Magnify,
 		NcActionButton,
 		NcActions,
 		NcEmptyContent,
-		HeaderMenu,
+		NcHeaderMenu,
 		NcHighlight,
-		Magnify,
 		SearchResult,
 		SearchResultPlaceholders,
 	},

dist/core-common.js.LICENSE.txt

@@ -392,8 +392,6 @@ object-assign
 
 /*! For license information please see NcTextField.js.LICENSE.txt */
 
-/*! For license information please see excludeClickOutsideClasses.js.LICENSE.txt */
-
 /*! For license information please see index.module.js.LICENSE.txt */
 
 /*! Hammer.JS - v2.0.7 - 2016-04-22