Skip to content

Commit 64a6dd1

Browse files
authored
Merge pull request #2709 from nextcloud/chore/nc-vue-8.25
chore: adapt changes in nc-vue
2 parents b5ada95 + 7e5ebcf commit 64a6dd1

5 files changed

Lines changed: 15 additions & 19 deletions

File tree

src/components/Questions/Question.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</h3>
7272
<div
7373
v-if="!readOnly && !questionValid"
74-
v-tooltip.auto="warningInvalid"
74+
:title="warningInvalid"
7575
class="question__header__title__warning"
7676
tabindex="0">
7777
<IconAlertCircleOutline :size="20" />

src/components/SidebarTabs/SettingsSidebarTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
{{ t('forms', 'Store responses anonymously') }}
3636
</NcCheckboxRadioSwitch>
3737
<NcCheckboxRadioSwitch
38-
v-tooltip="disableSubmitMultipleExplanation"
38+
:title="disableSubmitMultipleExplanation"
3939
:checked="submitMultiple"
4040
:disabled="disableSubmitMultiple || formArchived || locked"
4141
type="switch"

src/components/SidebarTabs/SharingSearchDiv.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,34 @@
55

66
<template>
77
<div>
8-
<NcSelect
8+
<NcSelectUsers
99
:clear-search-on-select="false"
10-
:close-on-select="false"
10+
keep-open
1111
:loading="showLoadingCircle"
1212
:disabled="locked"
1313
:get-option-key="(option) => option.key"
1414
:options="options"
1515
:placeholder="t('forms', 'Search for user, group or team …')"
16-
user-select
1716
:filter-by="() => true"
1817
label="displayName"
1918
:aria-label-combobox="t('forms', 'Search for user, group or team …')"
2019
@search="asyncSearch"
21-
@input="addShare">
20+
@update:model-value="addShare">
2221
<template #no-options>
2322
{{ noResultText }}
2423
</template>
25-
</NcSelect>
24+
</NcSelectUsers>
2625
</div>
2726
</template>
2827

2928
<script>
30-
import NcSelect from '@nextcloud/vue/components/NcSelect'
29+
import NcSelectUsers from '@nextcloud/vue/components/NcSelectUsers'
3130
3231
import UserSearchMixin from '../../mixins/UserSearchMixin.js'
3332
3433
export default {
3534
components: {
36-
NcSelect,
35+
NcSelectUsers,
3736
},
3837
3938
mixins: [UserSearchMixin],

src/components/SidebarTabs/TransferOwnership.vue

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,20 @@
3838
)
3939
" />
4040
<!-- eslint-enable vue/no-v-html -->
41-
<NcSelect
41+
<NcSelectUsers
4242
v-model="selected"
4343
class="modal-content__select"
44-
:reset-focus-on-options-change="false"
45-
clear-search-on-select
46-
close-on-select
44+
:reset-on-options-change="false"
4745
:loading="loading"
4846
:get-option-key="(option) => option.key"
4947
:options="options"
5048
:placeholder="t('forms', 'Search for a user')"
51-
user-select
5249
label="displayName"
53-
@search="(query) => asyncSearch(query, true)">
50+
@search="asyncSearch">
5451
<template #no-options>
5552
{{ noResultText }}
5653
</template>
57-
</NcSelect>
54+
</NcSelectUsers>
5855

5956
<br />
6057

@@ -103,7 +100,7 @@ import axios from '@nextcloud/axios'
103100
import NcButton from '@nextcloud/vue/components/NcButton'
104101
import NcDialog from '@nextcloud/vue/components/NcDialog'
105102
import NcTextField from '@nextcloud/vue/components/NcTextField'
106-
import NcSelect from '@nextcloud/vue/components/NcSelect'
103+
import NcSelectUsers from '@nextcloud/vue/components/NcSelectUsers'
107104
import UserSearchMixin from '../../mixins/UserSearchMixin.js'
108105
import logger from '../../utils/Logger.js'
109106
@@ -112,7 +109,7 @@ export default {
112109
NcButton,
113110
NcDialog,
114111
NcTextField,
115-
NcSelect,
112+
NcSelectUsers,
116113
},
117114
mixins: [UserSearchMixin],
118115

src/mixins/UserSearchMixin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default {
6666
if (this.isValidQuery) {
6767
// already set loading to have proper ux feedback during debounce
6868
this.loading = true
69-
await this.debounceGetSuggestions(query)
69+
this.debounceGetSuggestions(query)
7070
}
7171
},
7272

0 commit comments

Comments
 (0)