mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-01-18 12:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(button): tiny size and icon transition machecism change

Browse Source
This commit is contained in:
07akioni 2019-09-20 00:25:08 +08:00
parent 1e6549d271
commit 8eb7810179
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/common/Button/src/main.vue
View File

@ -12,7 +12,7 @@
'n-button--rippling': rippling,
'n-button--enter-pressed': enterPressed,
'n-button--ghost': ghost,
'n-button--right-icon': iconOnRight,
[`n-button--${iconPosition}-icon`]: iconPosition && (hasIcon || loading) && !noTextContent,
[`n-${synthesizedTheme}-theme`]: synthesizedTheme
}"
:tabindex="synthesizedFocusable ? 0 : -1"
@ -144,7 +144,7 @@ export default {
},
size: {
validator (value) {
return ['small', 'medium', 'large'].includes(value)
return ['tiny', 'small', 'medium', 'large'].includes(value)
},
default: 'medium'
},
@ -175,7 +175,7 @@ export default {
default: null
},
iconPosition: {
default: null,
default: 'left',
validator (iconPosition) {
return ['left', 'right'].includes(iconPosition)
}
@ -190,6 +190,9 @@ export default {
}
},
computed: {
noTextContent () {
return this.circle || !this.$slots.default
},
avoidHollowOut () {
return this.ghost || !['primary', 'link', 'info', 'success', 'warning', 'error'].includes(this.type)
},