Skip to content

Commit

Permalink
Port global search menu to focus trapped NcHeaderMenu
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Ng <chrng8@gmail.com>
  • Loading branch information
Pytal committed Jan 18, 2023
1 parent 184d57c commit 6c4fce6
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 260 deletions.
238 changes: 0 additions & 238 deletions core/src/components/HeaderMenu.vue

This file was deleted.

30 changes: 16 additions & 14 deletions core/src/views/UnifiedSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-
-->
<template>
<HeaderMenu id="unified-search"
<NcHeaderMenu id="unified-search"
class="unified-search"
exclude-click-outside-classes="popover"
:open.sync="open"
Expand Down Expand Up @@ -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
Expand All @@ -177,12 +179,12 @@ export default {
name: 'UnifiedSearch',
components: {
Magnify,
NcActionButton,
NcActions,
NcEmptyContent,
HeaderMenu,
NcHeaderMenu,
NcHighlight,
Magnify,
SearchResult,
SearchResultPlaceholders,
},
Expand Down
Loading

0 comments on commit 6c4fce6

Please sign in to comment.