Skip to content

Commit 7145d8a

Browse files
Merge pull request #36843 from nextcloud/enh/a11y-user-status-clear-select
Port clear user status select
2 parents 0b966ab + 86ddc3f commit 7145d8a

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

apps/user_status/src/components/ClearAtSelect.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,25 @@
2424
<label class="clear-at-select__label" for="clearStatus">
2525
{{ $t('user_status', 'Clear status after') }}
2626
</label>
27-
<NcMultiselect id="clearStatus"
28-
label="label"
29-
:value="option"
27+
<NcSelect input-id="clearStatus"
28+
class="clear-at-select__select"
3029
:options="options"
31-
open-direction="top"
32-
@select="select" />
30+
:value="option"
31+
:clearable="false"
32+
placement="top"
33+
@option:selected="select" />
3334
</div>
3435
</template>
3536

3637
<script>
37-
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
38-
import { getAllClearAtOptions } from '../services/clearAtOptionsService'
39-
import { clearAtFilter } from '../filters/clearAtFilter'
38+
import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
39+
import { getAllClearAtOptions } from '../services/clearAtOptionsService.js'
40+
import { clearAtFilter } from '../filters/clearAtFilter.js'
4041
4142
export default {
4243
name: 'ClearAtSelect',
4344
components: {
44-
NcMultiselect,
45+
NcSelect,
4546
},
4647
props: {
4748
clearAt: {
@@ -91,12 +92,11 @@ export default {
9192
align-items: center;
9293
9394
&__label {
94-
margin-right: 10px;
95+
margin-right: 12px;
9596
}
9697
97-
.multiselect {
98+
&__select {
9899
flex-grow: 1;
99-
min-width: 130px;
100100
}
101101
}
102102
</style>

dist/core-common.js

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

dist/core-common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user-status-modal-8299.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user-status-modal-8299.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user_status-menu.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user_status-menu.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)