Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add Vocabulary Select implementation instead of buefy select
  • Loading branch information
obulat committed Dec 17, 2020
commit 6f09c179a352af6b2ea71887928a72ff3f46cf34
3 changes: 1 addition & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,10 @@ export default {
@import "~bulma";
@import '~buefy/src/scss/utils/_variables.scss';
@import '~buefy/src/scss/components/_modal.scss';
@import '~buefy/src/scss/components/_select.scss';
@import '~buefy/src/scss/components/_form.scss';
@import '~buefy/src/scss/components/_icon.scss';

@import "@creativecommons/vocabulary/scss/vocabulary.scss";
@import "~@creativecommons/vocabulary/scss/vocabulary.scss";

#app {
-webkit-font-smoothing: antialiased;
Expand Down
80 changes: 80 additions & 0 deletions src/Vocabulary/VSelect.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<template>
<div
class="control"
:class="{ 'is-expanded': expanded }"
>
<span
class="select"
:class="spanClasses"
>
<select
ref="select"
v-model="computedValue"
v-bind="$attrs"
@blur="$emit('blur', $event)"
@focus="$emit('focus', $event)"
>
<template v-if="placeholder">
<option
v-if="computedValue == null"
:value="null"
disabled
hidden
>
{{ placeholder }}
</option>
</template>
<slot />
</select>
</span>
<slot name="left-icon" />
</div>
</template>

<script>
export default {
name: 'VSelect',
inheritAttrs: false,
props: {
value: {
type: [String, Number],
default: null
},
placeholder: String,
expanded: Boolean
},
data() {
return {
selected: this.value,
elementRef: 'select'
}
},
computed: {
computedValue: {
get() {
return this.selected
},
set(value) {
this.selected = value
this.$emit('input', value)
}
},
spanClasses() {
return [this.size, this.statusType, {
'is-fullwidth': this.expanded,
'is-empty': this.selected === null
}]
}
},
watch: {
/**
* When v-model is changed:
* 1. Set the selected option.
* 2. If it's invalid, validate again.
*/
value(value) {
this.selected = value
}
}
}
</script>
36 changes: 16 additions & 20 deletions src/components/DropdownStep.vue
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
<template>
<div class="step-actions">
<b-field class="license-dropdown">
<b-select
:placeholder="this.$t('stepper.DD.placeholder')"
:value="shortName"
@input="setCurrentLicense"
<v-select
class="license-dropdown"
:placeholder="$t('stepper.DD.placeholder')"
:value="shortName"
@input="setCurrentLicense"
>
<option
v-for="license in licenseList"
:key="license"
:value="license"
>
<option
v-for="license in licenseList"
:key="license"
:value="license"
>
{{ license }}
</option>
</b-select>
</b-field>
{{ license }}
</option>
</v-select>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import VSelect from '@/Vocabulary/VSelect'
export default {
name: 'DropdownStep',
components: { VSelect },
inheritAttrs: false,
props: {
status: {
type: String,
validator(value) {
return ['active', 'previous', 'inactive'].includes(value)
}
},
id: Number
},
data() {
Expand Down