-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added VBtnPlus that integrates VBtn, VHover and VTooltip. It includes unit tests and Storybook stories. In addition moved to vue-type to make type checking and validation of props more concise. This has been done for both VBtnPlus and VStatsCard. Also added warning unit tests for both.
- Loading branch information
nidkil
committed
Jan 19, 2019
1 parent
41ad049
commit 445074f
Showing
11 changed files
with
330 additions
and
147 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,93 @@ | ||
| <template> | ||
| <div> | ||
| <v-hover v-if="tooltip"> | ||
| <v-tooltip | ||
| slot-scope="{ hover }" | ||
| bottom | ||
| > | ||
| <v-btn | ||
| slot="activator" | ||
| flat | ||
| :icon="hasIcon(item)" | ||
| :color="hover ? toolbarTextColorHover() : toolbarTextColor()" | ||
| :class="{ 'text-capitalize': item.label, 'text-lowercase': item.icon }" | ||
| > | ||
| <span v-if="item.label">{{ item.label }}</span> | ||
| <v-icon v-else>{{ item.icon }}</v-icon> | ||
| </v-btn> | ||
| <span>{{ item.tooltip }}</span> | ||
| </v-tooltip> | ||
| </v-hover> | ||
| <v-hover v-else> | ||
| <v-btn | ||
| slot-scope="{ hover }" | ||
| flat | ||
| :icon="hasIcon(item)" | ||
| :color="hover ? toolbarTextColorHover() : toolbarTextColor()" | ||
| :class="{ 'text-capitalize': item.label, 'text-lowercase': item.icon }" | ||
| > | ||
| <span v-if="item.label">{{ item.label }}</span> | ||
| <v-icon v-else>{{ item.icon }}</v-icon> | ||
| </v-btn> | ||
| </v-hover> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| name: 'v-btn-plus', | ||
| props: { | ||
| color: { | ||
| type: String, | ||
| required: false, | ||
| default: 'primary' | ||
| }, | ||
| icon: { | ||
| type: String, | ||
| required: false, | ||
| default: null | ||
| }, | ||
| label: { | ||
| type: String, | ||
| required: false, | ||
| default: 'label' | ||
| }, | ||
| tooltip: { | ||
| type: String, | ||
| required: false, | ||
| default: null | ||
| } | ||
| }, | ||
| data: () => ({}), | ||
| methods: { | ||
| onClick() { | ||
| this.$emit('click') | ||
| }, | ||
| hasIcon() { | ||
| return this.icon && this.icon.length > 0 | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| </style> | ||
| <template> | ||
| <div> | ||
| <v-hover v-if="tooltip"> | ||
| <v-tooltip | ||
| slot-scope="{ hover }" | ||
| bottom | ||
| > | ||
| <v-btn | ||
| slot="activator" | ||
| :theme="theme" | ||
| :align="align" | ||
| :justify="justify" | ||
| :disabled="disabled" | ||
| :depressed="type === 'depressed'" | ||
| :block="type === 'block'" | ||
| :flat="type === 'flat'" | ||
| :fab="type === 'fab'" | ||
| :icon="type === 'icon'" | ||
| :outline="type === 'outline'" | ||
| :raised="type === 'raised'" | ||
| :round="type === 'round'" | ||
| :color="hover ? colorHover : color" | ||
| :class="{ 'text-capitalize': label, 'text-lowercase': icon }" | ||
| :size="size" | ||
| @click="onClick()" | ||
| > | ||
| <span v-if="label">{{ label }}</span> | ||
| <v-icon v-else>{{ icon }}</v-icon> | ||
| </v-btn> | ||
| <span>{{ tooltip }}</span> | ||
| </v-tooltip> | ||
| </v-hover> | ||
| <v-hover v-else> | ||
| <v-btn | ||
| slot-scope="{ hover }" | ||
| :theme="theme" | ||
| :align="align" | ||
| :justify="justify" | ||
| :disabled="disabled" | ||
| :depressed="type === 'depressed'" | ||
| :block="type === 'block'" | ||
| :flat="type === 'flat'" | ||
| :fab="type === 'fab'" | ||
| :icon="type === 'icon'" | ||
| :outline="type === 'outline'" | ||
| :raised="type === 'raised'" | ||
| :round="type === 'round'" | ||
| :color="hover ? colorHover : color" | ||
| :class="{ 'text-capitalize': label, 'text-lowercase': icon }" | ||
| :size="size" | ||
| @click="onClick()" | ||
| > | ||
| <span v-if="label">{{ label }}</span> | ||
| <v-icon v-else>{{ icon }}</v-icon> | ||
| </v-btn> | ||
| </v-hover> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import VueTypes from 'vue-types' | ||
| export default { | ||
| name: 'v-btn-plus', | ||
| props: { | ||
| align: VueTypes.oneOf(['bottom', 'top']), | ||
| justify: VueTypes.oneOf(['left', 'right']), | ||
| color: VueTypes.string.def('primary'), | ||
| colorHover: VueTypes.string.def('secondary'), | ||
| disabled: VueTypes.bool.def(false), | ||
| icon: VueTypes.string, | ||
| label: VueTypes.string, | ||
| position: VueTypes.oneOf(['left', 'right']), | ||
| tooltip: VueTypes.string, | ||
| size: VueTypes.oneOf(['small', 'medium', 'large']).def('small'), | ||
| theme: VueTypes.oneOf(['light', 'dark']), | ||
| type: VueTypes.oneOf(['block', 'depressed', 'fab', 'flat', 'icon', 'outline', 'raised', 'round']).def('raised') | ||
| }, | ||
| methods: { | ||
| onClick() { | ||
| this.$emit('click') | ||
| } | ||
| }, | ||
| created: function() { | ||
| // Workaround as prop validation on multiple props is not possible | ||
| if (!this.icon && !this.label) { | ||
| console.error('[Vue warn]: Missing required prop, specify at least one of the following: "label" or "icon"') | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.