hash
stringlengths 40
40
| date
stringdate 2017-10-11 16:52:59
2025-03-24 06:02:38
| author
stringclasses 190
values | commit_message
stringlengths 12
90
| is_merge
bool 1
class | masked_commit_message
stringlengths 5
75
| type
stringclasses 8
values | git_diff
stringlengths 144
14.2M
|
|---|---|---|---|---|---|---|---|
4d58c874744adf3a38a46b7183fb682abc871a7e
|
2021-07-22 13:20:08
|
Kael
|
docs: show $vuetify sass variables
| false
|
show $vuetify sass variables
|
docs
|
diff --git a/packages/docs/src/components/api/ApiSearch.vue b/packages/docs/src/components/api/ApiSearch.vue
index ed02d17062c..f27586767b7 100644
--- a/packages/docs/src/components/api/ApiSearch.vue
+++ b/packages/docs/src/components/api/ApiSearch.vue
@@ -40,5 +40,6 @@
<script>
export default {
name: 'ApiSearch',
+ inheritAttrs: false,
}
</script>
diff --git a/packages/docs/src/components/api/SassApi.vue b/packages/docs/src/components/api/SassApi.vue
index 948205a9ad2..38b1654826e 100644
--- a/packages/docs/src/components/api/SassApi.vue
+++ b/packages/docs/src/components/api/SassApi.vue
@@ -2,9 +2,9 @@
<v-row>
<v-col cols="12">
<api-search
+ v-model="apiItem"
:items="items"
:label="$t('search-sass-api')"
- @input="setApiItem"
/>
</v-col>
<v-col
@@ -56,11 +56,5 @@
return items
},
},
-
- methods: {
- setApiItem (item) {
- this.apiItem = item?.replace('$', '') || null
- },
- },
}
</script>
|
259d38c2ba22c204105b6fd0537d2b4b51614610
|
2021-07-19 21:16:09
|
matheuzsrlog
|
docs: (api): update v-tabs change event type and description (#13946)
| false
|
(api): update v-tabs change event type and description (#13946)
|
docs
|
diff --git a/packages/api-generator/src/locale/en/v-tabs.json b/packages/api-generator/src/locale/en/v-tabs.json
index 353b1a4213f..9913fcc4de0 100644
--- a/packages/api-generator/src/locale/en/v-tabs.json
+++ b/packages/api-generator/src/locale/en/v-tabs.json
@@ -27,6 +27,6 @@
"vertical": "Stacks tabs on top of each other vertically."
},
"events": {
- "change": "Emitted when tab is changed by user interaction"
+ "change": "Emitted when tab is changed by user interaction. Returns a string if **href** attribute is set and number if it is not."
}
}
diff --git a/packages/api-generator/src/maps/v-tabs.js b/packages/api-generator/src/maps/v-tabs.js
index 961d080df37..e7f08475a02 100644
--- a/packages/api-generator/src/maps/v-tabs.js
+++ b/packages/api-generator/src/maps/v-tabs.js
@@ -9,7 +9,7 @@ module.exports = {
events: [
{
name: 'change',
- value: 'number',
+ value: 'number | string',
},
],
},
|
28ed40bc4d083ec59dc950a749305f554c1f94bd
|
2025-01-20 21:43:28
|
John Leider
|
fix(VTreeview): properly indent nodes
| false
|
properly indent nodes
|
fix
|
diff --git a/packages/vuetify/src/labs/VTreeview/VTreeviewItem.sass b/packages/vuetify/src/labs/VTreeview/VTreeviewItem.sass
index 568e9233a50..34393acf5d1 100644
--- a/packages/vuetify/src/labs/VTreeview/VTreeviewItem.sass
+++ b/packages/vuetify/src/labs/VTreeview/VTreeviewItem.sass
@@ -16,3 +16,6 @@
.v-list-group__items .v-list-item
padding-inline-start: calc(#{$treeview-item-padding-inline-start} + var(--indent-padding)) !important
+
+ .v-list-group__items .v-list-item.v-list-group__header
+ padding-inline-start: calc(#{$treeview-group-header-padding-inline-start} + var(--indent-padding)) !important
diff --git a/packages/vuetify/src/labs/VTreeview/VTreeviewItem.tsx b/packages/vuetify/src/labs/VTreeview/VTreeviewItem.tsx
index 95732952a7f..5374e61d950 100644
--- a/packages/vuetify/src/labs/VTreeview/VTreeviewItem.tsx
+++ b/packages/vuetify/src/labs/VTreeview/VTreeviewItem.tsx
@@ -80,29 +80,29 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
prepend: hasPrepend ? slotProps => {
return (
<>
- { props.toggleIcon && (
- <VListItemAction start={ false }>
- <VBtn
- density="compact"
- icon={ props.toggleIcon }
- loading={ props.loading }
- variant="text"
- onClick={ props.onToggleExpand }
- >
- {{
- loader () {
- return (
- <VProgressCircular
- indeterminate="disable-shrink"
- size="20"
- width="2"
- />
- )
- },
- }}
- </VBtn>
- </VListItemAction>
- )}
+ <VListItemAction start={ false }>
+ { props.toggleIcon && (
+ <VBtn
+ density="compact"
+ icon={ props.toggleIcon }
+ loading={ props.loading }
+ variant="text"
+ onClick={ props.onToggleExpand }
+ >
+ {{
+ loader () {
+ return (
+ <VProgressCircular
+ indeterminate="disable-shrink"
+ size="20"
+ width="2"
+ />
+ )
+ },
+ }}
+ </VBtn>
+ )}
+ </VListItemAction>
{ slots.prepend?.(slotProps) }
</>
diff --git a/packages/vuetify/src/labs/VTreeview/_variables.scss b/packages/vuetify/src/labs/VTreeview/_variables.scss
index ce050d3b605..554becdd230 100644
--- a/packages/vuetify/src/labs/VTreeview/_variables.scss
+++ b/packages/vuetify/src/labs/VTreeview/_variables.scss
@@ -4,3 +4,4 @@ $treeview-group-list-indent-size: 16px !default;
$treeview-group-list-prepend-width: 16px !default;
$treeview-item-padding-inline-start: 12px !default;
$treeview-item-prepend-padding-inline-start: 44px !default;
+$treeview-group-header-padding-inline-start: 16px !default;
|
f45747018cc468224c61305b67b44685861ed917
|
2020-07-06 04:18:27
|
FoxyHutch
|
docs(button-groups): migrate page (#71)
| false
|
migrate page (#71)
|
docs
|
diff --git a/packages/docs-next/build/api-gen/locale/en/v-btn-toggle.json b/packages/docs-next/build/api-gen/locale/en/v-btn-toggle.json
index 59a842316d3..b94046f0e5a 100644
--- a/packages/docs-next/build/api-gen/locale/en/v-btn-toggle.json
+++ b/packages/docs-next/build/api-gen/locale/en/v-btn-toggle.json
@@ -1,7 +1,15 @@
{
"props": {
"empty": "",
- "rounded": "Applies a large border radius on the buttons."
+ "activeClass": "Mixins.BaseItemGroup.props.activeClass",
+ "backgroundColor": "Changes the background-color for the component.",
+ "borderless": "Removes the group's border.",
+ "dense": "Reduces the button size and padding.",
+ "group": "Generally used in [v-toolbar](/components/toolbars) and [v-app-bar](/components/app-bars). Removes background color, border and increases space between the buttons",
+ "mandatory": "Mixins.BaseItemGroup.props.mandatory",
+ "multiple": "Mixins.BaseItemGroup.props.multiple",
+ "rounded": "Round edge buttons",
+ "shaped": "Applies a large border radius on the top left and bottom right of the card."
},
"slots": {
"empty": ""
diff --git a/packages/docs-next/src/examples/v-btn-toggle/misc-toolbar.vue b/packages/docs-next/src/examples/v-btn-toggle/misc-toolbar.vue
new file mode 100644
index 00000000000..02a8e100451
--- /dev/null
+++ b/packages/docs-next/src/examples/v-btn-toggle/misc-toolbar.vue
@@ -0,0 +1,124 @@
+<template>
+ <v-toolbar dense>
+ <v-overflow-btn
+ :items="dropdown_font"
+ label="Select font"
+ hide-details
+ class="pa-0"
+ ></v-overflow-btn>
+
+ <template v-if="$vuetify.breakpoint.mdAndUp">
+ <v-divider vertical></v-divider>
+
+ <v-overflow-btn
+ :items="dropdown_edit"
+ editable
+ label="Select size"
+ hide-details
+ class="pa-0"
+ overflow
+ ></v-overflow-btn>
+
+ <v-divider vertical></v-divider>
+
+ <v-spacer></v-spacer>
+
+ <v-btn-toggle
+ v-model="toggle_multiple"
+ color="primary"
+ dense
+ group
+ multiple
+ >
+ <v-btn
+ :value="1"
+ text
+ >
+ <v-icon>mdi-format-bold</v-icon>
+ </v-btn>
+
+ <v-btn
+ :value="2"
+ text
+ >
+ <v-icon>mdi-format-italic</v-icon>
+ </v-btn>
+
+ <v-btn
+ :value="3"
+ text
+ >
+ <v-icon>mdi-format-underline</v-icon>
+ </v-btn>
+
+ <v-btn
+ :value="4"
+ text
+ >
+ <v-icon>mdi-format-color-fill</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+
+ <div class="mx-4"></div>
+
+ <v-btn-toggle
+ v-model="toggle_exclusive"
+ color="primary"
+ dense
+ group
+ >
+ <v-btn
+ :value="1"
+ text
+ >
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+
+ <v-btn
+ :value="2"
+ text
+ >
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+
+ <v-btn
+ :value="3"
+ text
+ >
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+
+ <v-btn
+ :value="4"
+ text
+ >
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </template>
+ </v-toolbar>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ dropdown_font: [
+ { text: 'Arial' },
+ { text: 'Calibri' },
+ { text: 'Courier' },
+ { text: 'Verdana' },
+ ],
+ dropdown_edit: [
+ { text: '100%' },
+ { text: '75%' },
+ { text: '50%' },
+ { text: '25%' },
+ { text: '0%' },
+ ],
+ toggle_exclusive: 2,
+ toggle_multiple: [1, 2, 3],
+ }
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-btn-toggle/misc-wysiwyg.vue b/packages/docs-next/src/examples/v-btn-toggle/misc-wysiwyg.vue
new file mode 100644
index 00000000000..4d51b5fa066
--- /dev/null
+++ b/packages/docs-next/src/examples/v-btn-toggle/misc-wysiwyg.vue
@@ -0,0 +1,108 @@
+<template>
+ <v-card
+ max-width="400"
+ class="mx-auto"
+ >
+ <v-textarea
+ v-model="value"
+ auto-grow
+ full-width
+ rows="2"
+ ></v-textarea>
+
+ <v-row
+ class="px-2 pb-2 ma-0"
+ justify="space-between"
+ >
+ <v-btn-toggle
+ v-model="formatting"
+ multiple
+ >
+ <v-btn color="white">
+ <v-icon>mdi-format-italic</v-icon>
+ </v-btn>
+
+ <v-btn color="white">
+ <v-icon>mdi-format-bold</v-icon>
+ </v-btn>
+
+ <v-btn color="white">
+ <v-icon>mdi-format-underline</v-icon>
+ </v-btn>
+
+ <v-btn color="white">
+ <v-row
+ align="center"
+ class="flex-column"
+ justify="center"
+ >
+ <v-icon class="cols 12">
+ mdi-format-color-text
+ </v-icon>
+
+ <v-sheet
+ tile
+ style="margin-top: -4px;"
+ height="4"
+ width="26"
+ color="purple"
+ ></v-sheet>
+ </v-row>
+ </v-btn>
+ </v-btn-toggle>
+
+ <v-btn-toggle v-model="alignment">
+ <v-btn color="white">
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+
+ <v-btn color="white">
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+
+ <v-btn color="white">
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-row>
+
+ <v-sheet
+ class="pa-4 text-center"
+ color="grey lighten-3"
+ tile
+ >
+ <v-row
+ class="mb-2"
+ dense
+ >
+ <v-col
+ v-for="n in numbers"
+ :key="n"
+ class="caption grey--text text--darken-1"
+ v-text="n"
+ ></v-col>
+ </v-row>
+
+ <v-row dense>
+ <v-col
+ v-for="l in letters"
+ :key="l"
+ class="title grey--text font-weight-regular text--darken-2"
+ v-text="l"
+ ></v-col>
+ </v-row>
+ </v-sheet>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ alignment: 1,
+ formatting: [],
+ numbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0],
+ letters: 'qwertyuiop'.split(''),
+ value: 'Toggle button requirements.\r\rHave at least three toggle buttons in a group\rLabel buttons with text, an icon, or',
+ }),
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-btn-toggle/prop-mandatory.vue b/packages/docs-next/src/examples/v-btn-toggle/prop-mandatory.vue
new file mode 100644
index 00000000000..0b451288484
--- /dev/null
+++ b/packages/docs-next/src/examples/v-btn-toggle/prop-mandatory.vue
@@ -0,0 +1,46 @@
+<template>
+ <v-card
+ flat
+ class="py-12"
+ >
+ <v-card-text>
+ <v-row
+ align="center"
+ justify="center"
+ >
+ <v-col cols="12">
+ <p class="text-center">
+ Mandatory
+ </p>
+ </v-col>
+ <v-btn-toggle
+ v-model="toggle_exclusive"
+ mandatory
+ >
+ <v-btn>
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-row>
+ </v-card-text>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ toggle_exclusive: undefined,
+ }
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-btn-toggle/prop-multiple.vue b/packages/docs-next/src/examples/v-btn-toggle/prop-multiple.vue
new file mode 100644
index 00000000000..83d7d1d0a9b
--- /dev/null
+++ b/packages/docs-next/src/examples/v-btn-toggle/prop-multiple.vue
@@ -0,0 +1,53 @@
+<template>
+ <v-card
+ flat
+ class="py-12"
+ >
+ <v-card-text>
+ <v-row
+ align="center"
+ justify="center"
+ >
+ <v-col cols="12">
+ <p class="text-center">
+ Multiple
+ </p>
+ </v-col>
+ <v-btn-toggle
+ v-model="toggle_exclusive"
+ multiple
+ >
+ <v-btn>
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+
+ <v-col
+ cols="12"
+ class="text-center"
+ >
+ Model: {{ toggle_exclusive }}
+ </v-col>
+ </v-row>
+ </v-card-text>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ toggle_exclusive: [],
+ }
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-btn-toggle/prop-rounded.vue b/packages/docs-next/src/examples/v-btn-toggle/prop-rounded.vue
new file mode 100644
index 00000000000..5927b81ada5
--- /dev/null
+++ b/packages/docs-next/src/examples/v-btn-toggle/prop-rounded.vue
@@ -0,0 +1,46 @@
+<template>
+ <v-card
+ flat
+ class="py-12"
+ >
+ <v-card-text>
+ <v-row
+ align="center"
+ justify="center"
+ >
+ <v-col cols="12">
+ <p class="text-center">
+ Rounded
+ </p>
+ </v-col>
+ <v-btn-toggle
+ v-model="toggle_exclusive"
+ rounded
+ >
+ <v-btn>
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-row>
+ </v-card-text>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ toggle_exclusive: undefined,
+ }
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-btn-toggle/usage.vue b/packages/docs-next/src/examples/v-btn-toggle/usage.vue
new file mode 100644
index 00000000000..2f43967a3d6
--- /dev/null
+++ b/packages/docs-next/src/examples/v-btn-toggle/usage.vue
@@ -0,0 +1,205 @@
+<template>
+ <v-row>
+ <v-col
+ cols="12"
+ sm="6"
+ class="py-2"
+ >
+ <p>Exclusive</p>
+
+ <v-btn-toggle v-model="toggle_exclusive">
+ <v-btn>
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-col>
+
+ <v-col
+ cols="12"
+ sm="6"
+ class="py-2"
+ >
+ <p>Multiple</p>
+
+ <v-btn-toggle
+ v-model="toggle_multiple"
+ dense
+ background-color="primary"
+ dark
+ multiple
+ >
+ <v-btn>
+ <v-icon>mdi-format-bold</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-italic</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-underline</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-color-fill</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-col>
+
+ <v-col
+ cols="12"
+ sm="6"
+ class="py-2"
+ >
+ <p>No Options Selected</p>
+
+ <v-btn-toggle v-model="toggle_none">
+ <v-btn>
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+ <v-btn>
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-col>
+
+ <v-col
+ cols="12"
+ sm="6"
+ class="py-2"
+ >
+ <p>Mandatory</p>
+
+ <v-btn-toggle
+ v-model="toggle_one"
+ shaped
+ mandatory
+ >
+ <v-btn>
+ <v-icon>mdi-format-align-left</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-center</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-right</v-icon>
+ </v-btn>
+
+ <v-btn>
+ <v-icon>mdi-format-align-justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-col>
+
+ <v-col
+ cols="12"
+ class="py-2"
+ >
+ <p>Text Options</p>
+
+ <v-btn-toggle
+ v-model="text"
+ tile
+ color="deep-purple accent-3"
+ group
+ >
+ <v-btn value="left">
+ Left
+ </v-btn>
+
+ <v-btn value="center">
+ Center
+ </v-btn>
+
+ <v-btn value="right">
+ Right
+ </v-btn>
+
+ <v-btn value="justify">
+ Justify
+ </v-btn>
+ </v-btn-toggle>
+ </v-col>
+
+ <v-col
+ cols="12"
+ class="py-2"
+ >
+ <p>Text & Icon Options</p>
+
+ <v-btn-toggle
+ v-model="icon"
+ borderless
+ >
+ <v-btn value="left">
+ <span class="hidden-sm-and-down">Left</span>
+
+ <v-icon right>
+ mdi-format-align-left
+ </v-icon>
+ </v-btn>
+
+ <v-btn value="center">
+ <span class="hidden-sm-and-down">Center</span>
+
+ <v-icon right>
+ mdi-format-align-center
+ </v-icon>
+ </v-btn>
+
+ <v-btn value="right">
+ <span class="hidden-sm-and-down">Right</span>
+
+ <v-icon right>
+ mdi-format-align-right
+ </v-icon>
+ </v-btn>
+
+ <v-btn value="justify">
+ <span class="hidden-sm-and-down">Justify</span>
+
+ <v-icon right>
+ mdi-format-align-justify
+ </v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </v-col>
+ </v-row>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ text: 'center',
+ icon: 'justify',
+ toggle_none: null,
+ toggle_one: 0,
+ toggle_exclusive: 2,
+ toggle_multiple: [0, 1, 2],
+ }
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/pages/en/components/button-groups.md b/packages/docs-next/src/pages/en/components/button-groups.md
index 5ee138cac6b..a892310a6b6 100644
--- a/packages/docs-next/src/pages/en/components/button-groups.md
+++ b/packages/docs-next/src/pages/en/components/button-groups.md
@@ -3,77 +3,63 @@ meta:
title: Button group component
description: The button group component allows you to combine a series of selectable buttons together in a single-line.
keywords: button groups, vuetify button group component, vue button group component
+related:
+ - /components/buttons/
+ - /components/icons/
+ - /components/selection-controls/
---
# Button groups
-Component description
+The `v-btn-toggle` component is a simple wrapper for `v-item-group` built specifically to work with `v-btn`.
<entry-ad />
## Usage
-Usage text
+Toggle buttons allow you to create a styled group of buttons that can selected or toggled under a single **v-model**.
-`<usage name="" />`
-**name**: component name
-eg: `<usage name="v-alert" />`
+<example file="v-btn-toggle/usage" />
## API
-- [API Page Link](../../api/v-component)
+- [v-btn-toggle](../../api/v-btn-toggle)
+- [v-btn](../../api/v-btn)
-## Sub-Components
-
-Omit if none
-
-### Sub Component 1
-
-Sub component text
-
-### Sub Component 2
-
-Sub component text
+## Examples
-## Caveats
+### Props
-Omit if none
+#### Mandatory
-<alert type="success">Success Caveat</alert>
-<alert type="info">Info Caveat</alert>
-<alert type="warning">Warning Caveat</alert>
-<alert type="error">Error Caveat</alert>
+A `v-btn-toggle` with the **mandatory** prop will always have a value.
-## Examples
+<example file="v-btn-toggle/prop-mandatory" />
-Example text.
-
-### Props
+#### Multiple
-Omit if none
+A `v-btn-toggle` with the **multiple** prop will allow a user to select multiple return values as an array.
-### Events
+<example file="v-btn-toggle/prop-multiple" />
-Omit if none
+#### Rounded
-### Slots
+You can make `v-btn-toggle` rounded using the **rounded** prop.
-Omit if none
+<example file="v-btn-toggle/prop-rounded" />
### Misc
-Omit if none
+#### Toolbar
-#### Example Header
+Easily integrate customized button solutions with a `v-toolbar`
-Example description
+<example file="v-btn-toggle/misc-toolbar" />
-`<example file="" />`
-**file**: `<component>/<type>-<propname>`
-eg: `<example file="v-alert/prop-colored-border" />`
+#### WYSIWYG
-## Accessibility
+Group similar actions and design your own WYSIWYG component.
-Accessibility text - omit if none
+<example file="v-btn-toggle/misc-wysiwyg" />
<backmatter />
|
3a5161948a1d9c1667760f490733f7081d2f9e4d
|
2019-06-19 17:46:31
|
Jacek Karczmarczyk
|
feat(styles): add rtl/ltr start/end spacing and alignment (#7448)
| false
|
add rtl/ltr start/end spacing and alignment (#7448)
|
feat
|
diff --git a/packages/docs/src/data/pages/framework/Alignment.json b/packages/docs/src/data/pages/framework/Alignment.json
index 68eecf1bbff..10280d58093 100644
--- a/packages/docs/src/data/pages/framework/Alignment.json
+++ b/packages/docs/src/data/pages/framework/Alignment.json
@@ -5,6 +5,14 @@
{
"type": "section",
"children": [
+ {
+ "type": "text",
+ "lang": "howText"
+ },
+ {
+ "type": "text",
+ "lang": "alignments"
+ },
{
"type": "usage",
"value": "example"
diff --git a/packages/docs/src/examples/spacing/playground.vue b/packages/docs/src/examples/spacing/playground.vue
index 00c0f722cfa..7bb62d0080d 100644
--- a/packages/docs/src/examples/spacing/playground.vue
+++ b/packages/docs/src/examples/spacing/playground.vue
@@ -73,7 +73,7 @@
<script>
export default {
data: () => ({
- directions: ['t', 'b', 'l', 'r', 'x', 'y', 'a'],
+ directions: ['t', 'b', 'l', 'r', 's', 'e', 'x', 'y', 'a'],
sizes: ['auto', '0', '1', '2', '3', '4', '5'],
paddingDirection: 'a',
paddingSize: '2',
diff --git a/packages/docs/src/lang/en/framework/Alignment.json b/packages/docs/src/lang/en/framework/Alignment.json
index 29d1a88a543..40d8d2a7e71 100644
--- a/packages/docs/src/lang/en/framework/Alignment.json
+++ b/packages/docs/src/lang/en/framework/Alignment.json
@@ -1,6 +1,15 @@
{
"header": "# Text alignment",
"headerText": "Layouts can change when screen resolutions change. The alignment classes help you position your text based on viewport size.",
+ "howText": "The helper classes apply **text-alignment** to an element. These classes can be applied using the following format `text-{screen}-{alignment}` with `{screen}` being the [viewport size](/framework/display) and `{alignment}` being the text alignment as described below:",
+ "alignments": [
+ "`left` - aligns text to the left",
+ "`right` - aligns text to the right",
+ "`start` - aligns text to the left in LTR mode and to the right in RTL mode",
+ "`end` - aligns text to the right in LTR mode and to the left in RTL mode",
+ "`center` - centers the text",
+ "`justify` - justifies the text"
+ ],
"examples": {
"example": {
"desc": ""
diff --git a/packages/docs/src/lang/en/framework/Spacing.json b/packages/docs/src/lang/en/framework/Spacing.json
index b7fd9536741..87e478bf8a3 100644
--- a/packages/docs/src/lang/en/framework/Spacing.json
+++ b/packages/docs/src/lang/en/framework/Spacing.json
@@ -16,6 +16,8 @@
"`b` - applies the spacing for `*-bottom`",
"`l` - applies the spacing for `*-left`",
"`r` - applies the spacing for `*-right`",
+ "`s` - applies the spacing for `*-left` (in LTR mode) and for `*-right` (in RTL mode)",
+ "`e` - applies the spacing for `*-right` (in LTR mode) and for `*-left` (in RTL mode)",
"`x` - applies the spacing for both `*-left` and `*-right`",
"`y` - applies the spacing for both `*-top` and `*-bottom`",
"`a` - applies the spacing for the property in all directions"
diff --git a/packages/vuetify/src/components/VApp/VApp.ts b/packages/vuetify/src/components/VApp/VApp.ts
index d9ae16be74f..b911e0c74e3 100644
--- a/packages/vuetify/src/components/VApp/VApp.ts
+++ b/packages/vuetify/src/components/VApp/VApp.ts
@@ -45,6 +45,7 @@ export default mixins(
staticClass: 'application',
class: {
'application--is-rtl': this.$vuetify.rtl,
+ 'application--is-ltr': !this.$vuetify.rtl,
...this.themeClasses,
},
attrs: { 'data-app': true },
diff --git a/packages/vuetify/src/components/VApp/__tests__/__snapshots__/VApp.spec.ts.snap b/packages/vuetify/src/components/VApp/__tests__/__snapshots__/VApp.spec.ts.snap
index bbb3daf52b8..a4eaae79040 100644
--- a/packages/vuetify/src/components/VApp/__tests__/__snapshots__/VApp.spec.ts.snap
+++ b/packages/vuetify/src/components/VApp/__tests__/__snapshots__/VApp.spec.ts.snap
@@ -3,7 +3,7 @@
exports[`VApp.ts should allow a custom id 1`] = `
<div data-app="true"
- class="application theme--light"
+ class="application application--is-ltr theme--light"
id="inspire"
>
<div class="application--wrap">
@@ -15,7 +15,7 @@ exports[`VApp.ts should allow a custom id 1`] = `
exports[`VApp.ts should match a snapshot 1`] = `
<div data-app="true"
- class="application theme--light"
+ class="application application--is-ltr theme--light"
id="app"
>
<div class="application--wrap">
diff --git a/packages/vuetify/src/components/VDataTable/VDataTable.ts b/packages/vuetify/src/components/VDataTable/VDataTable.ts
index 296280f2cb5..561babd51fc 100644
--- a/packages/vuetify/src/components/VDataTable/VDataTable.ts
+++ b/packages/vuetify/src/components/VDataTable/VDataTable.ts
@@ -321,7 +321,7 @@ export default VDataIterator.extend({
}, [this.$createElement(VIcon, ['close'])])
const column = this.$createElement('td', {
- staticClass: 'text-xs-left',
+ staticClass: 'text-xs-start',
attrs: {
colspan: this.computedHeadersLength,
},
diff --git a/packages/vuetify/src/components/VDataTable/VDataTableHeaderDesktop.ts b/packages/vuetify/src/components/VDataTable/VDataTableHeaderDesktop.ts
index 20acce4e4f9..2fdb8d7436a 100644
--- a/packages/vuetify/src/components/VDataTable/VDataTableHeaderDesktop.ts
+++ b/packages/vuetify/src/components/VDataTable/VDataTableHeaderDesktop.ts
@@ -2,7 +2,7 @@
import { VNode } from 'vue'
import mixins from '../../util/mixins'
import header, { TableHeader } from './mixins/header'
-import { getTextAlignment, wrapInArray } from '../../util/helpers'
+import { wrapInArray } from '../../util/helpers'
export default mixins(header).extend({
name: 'v-data-table-header-desktop',
@@ -28,7 +28,7 @@ export default mixins(header).extend({
}
const classes = [
- getTextAlignment(header.align, this.$vuetify.rtl),
+ `text-xs-${header.align || 'start'}`,
...wrapInArray(header.class),
]
diff --git a/packages/vuetify/src/components/VDataTable/VRow.ts b/packages/vuetify/src/components/VDataTable/VRow.ts
index 8a74f1410e2..d59f53ae649 100644
--- a/packages/vuetify/src/components/VDataTable/VRow.ts
+++ b/packages/vuetify/src/components/VDataTable/VRow.ts
@@ -4,7 +4,7 @@ import { PropValidator } from 'vue/types/options'
import { TableHeader } from './mixins/header'
// Utils
-import { getObjectValueByPath, getTextAlignment } from '../../util/helpers'
+import { getObjectValueByPath } from '../../util/helpers'
export default Vue.extend({
name: 'v-row',
@@ -21,10 +21,6 @@ export default Vue.extend({
const computedSlots = slots()
const columns: VNode[] = props.headers.map((header: TableHeader) => {
- const classes = {
- [getTextAlignment(header.align, props.rtl)]: true,
- }
-
const children = []
const value = getObjectValueByPath(props.item, header.value)
@@ -41,7 +37,7 @@ export default Vue.extend({
}
return h('td', {
- class: classes,
+ class: `text-xs-${header.align || 'start'}`,
}, children)
})
diff --git a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap
index ded4e5e9b85..6eaef3d7a05 100644
--- a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap
@@ -250,7 +250,7 @@ exports[`VDataTable.ts should render loading state 2`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -266,7 +266,7 @@ exports[`VDataTable.ts should render loading state 2`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -282,7 +282,7 @@ exports[`VDataTable.ts should render loading state 2`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -298,7 +298,7 @@ exports[`VDataTable.ts should render loading state 2`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -314,7 +314,7 @@ exports[`VDataTable.ts should render loading state 2`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -447,7 +447,7 @@ exports[`VDataTable.ts should render virtual table 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -463,7 +463,7 @@ exports[`VDataTable.ts should render virtual table 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -479,7 +479,7 @@ exports[`VDataTable.ts should render virtual table 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -495,7 +495,7 @@ exports[`VDataTable.ts should render virtual table 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -511,7 +511,7 @@ exports[`VDataTable.ts should render virtual table 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -532,19 +532,19 @@ exports[`VDataTable.ts should render virtual table 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -552,19 +552,19 @@ exports[`VDataTable.ts should render virtual table 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -572,19 +572,19 @@ exports[`VDataTable.ts should render virtual table 1`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
262
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
@@ -592,19 +592,19 @@ exports[`VDataTable.ts should render virtual table 1`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
305
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
@@ -612,19 +612,19 @@ exports[`VDataTable.ts should render virtual table 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
@@ -739,7 +739,7 @@ exports[`VDataTable.ts should render with body slot 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -755,7 +755,7 @@ exports[`VDataTable.ts should render with body slot 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -771,7 +771,7 @@ exports[`VDataTable.ts should render with body slot 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -787,7 +787,7 @@ exports[`VDataTable.ts should render with body slot 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -803,7 +803,7 @@ exports[`VDataTable.ts should render with body slot 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -927,7 +927,7 @@ exports[`VDataTable.ts should render with data 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -943,7 +943,7 @@ exports[`VDataTable.ts should render with data 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -959,7 +959,7 @@ exports[`VDataTable.ts should render with data 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -975,7 +975,7 @@ exports[`VDataTable.ts should render with data 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -991,7 +991,7 @@ exports[`VDataTable.ts should render with data 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -1010,19 +1010,19 @@ exports[`VDataTable.ts should render with data 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -1030,19 +1030,19 @@ exports[`VDataTable.ts should render with data 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -1050,19 +1050,19 @@ exports[`VDataTable.ts should render with data 1`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
262
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
@@ -1070,19 +1070,19 @@ exports[`VDataTable.ts should render with data 1`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
305
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
@@ -1090,19 +1090,19 @@ exports[`VDataTable.ts should render with data 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
@@ -1213,7 +1213,7 @@ exports[`VDataTable.ts should render with group scoped slot 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -1229,7 +1229,7 @@ exports[`VDataTable.ts should render with group scoped slot 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -1245,7 +1245,7 @@ exports[`VDataTable.ts should render with group scoped slot 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -1261,7 +1261,7 @@ exports[`VDataTable.ts should render with group scoped slot 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -1395,7 +1395,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -1411,7 +1411,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -1427,7 +1427,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -1443,7 +1443,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -1460,7 +1460,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
<tbody>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1491,16 +1491,16 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -1511,7 +1511,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1542,16 +1542,16 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -1562,7 +1562,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1593,16 +1593,16 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
@@ -1613,7 +1613,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1644,16 +1644,16 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
@@ -1664,7 +1664,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1695,16 +1695,16 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
@@ -1820,7 +1820,7 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -1836,7 +1836,7 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -1852,7 +1852,7 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -1868,7 +1868,7 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -1885,7 +1885,7 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
<tbody>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1916,16 +1916,16 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
<td class="text-xs-left">
Jelly bean
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
375
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
0
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
94
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
0%
</td>
</tr>
@@ -1933,22 +1933,22 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
<td class="text-xs-left">
Lollipop
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
392
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
0.2
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
98
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
2%
</td>
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -1979,22 +1979,22 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -2025,22 +2025,22 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
<tr class="v-row-group__header">
<td colspan="5"
- class="text-xs-left"
+ class="text-xs-start"
>
<button type="button"
class="ma-0 v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--small"
@@ -2071,16 +2071,16 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -2192,7 +2192,7 @@ exports[`VDataTable.ts should render with item scoped slot 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -2208,7 +2208,7 @@ exports[`VDataTable.ts should render with item scoped slot 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -2224,7 +2224,7 @@ exports[`VDataTable.ts should render with item scoped slot 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -2240,7 +2240,7 @@ exports[`VDataTable.ts should render with item scoped slot 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -2256,7 +2256,7 @@ exports[`VDataTable.ts should render with item scoped slot 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -2394,7 +2394,7 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -2410,7 +2410,7 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -2426,7 +2426,7 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -2442,7 +2442,7 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -2458,7 +2458,7 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -2477,19 +2477,19 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -2502,19 +2502,19 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
@@ -2527,19 +2527,19 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
262
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
@@ -2552,19 +2552,19 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
305
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
@@ -2577,19 +2577,19 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
@@ -2700,7 +2700,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
aria-label
aria-sort="none"
width="1px"
- class="text-xs-left"
+ class="text-xs-start"
>
<span>
</span>
@@ -2719,7 +2719,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -2735,7 +2735,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -2751,7 +2751,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -2767,7 +2767,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -2783,7 +2783,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -2799,7 +2799,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
</thead>
<tbody>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -2809,24 +2809,24 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -2836,24 +2836,24 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -2863,24 +2863,24 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
262
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -2890,24 +2890,24 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
305
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -2917,19 +2917,19 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
@@ -3035,7 +3035,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
aria-label
aria-sort="none"
width="1px"
- class="text-xs-left"
+ class="text-xs-start"
>
<span>
</span>
@@ -3054,7 +3054,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -3070,7 +3070,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -3086,7 +3086,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -3102,7 +3102,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -3118,7 +3118,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -3134,7 +3134,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
</thead>
<tbody>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light v-data-table__expand-icon--active"
>
@@ -3144,24 +3144,24 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -3171,24 +3171,24 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -3198,24 +3198,24 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
262
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -3225,24 +3225,24 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
305
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<i role="button"
class="v-icon v-data-table__expand-icon v-icon--link material-icons theme--light"
>
@@ -3252,19 +3252,19 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
@@ -3370,7 +3370,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
aria-label
aria-sort="none"
width="1px"
- class="text-xs-left"
+ class="text-xs-start"
>
<div class="v-data-table__checkbox v-simple-checkbox">
<div class="v-input--selection-controls__ripple">
@@ -3396,7 +3396,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -3412,7 +3412,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -3428,7 +3428,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -3444,7 +3444,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -3460,7 +3460,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -3476,7 +3476,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
</thead>
<tbody>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<div class="v-data-table__checkbox v-simple-checkbox">
<div class="v-input--selection-controls__ripple">
</div>
@@ -3490,24 +3490,24 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
<td class="text-xs-left">
Frozen Yogurt
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
159
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
24
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<div class="v-data-table__checkbox v-simple-checkbox">
<div class="v-input--selection-controls__ripple">
</div>
@@ -3521,24 +3521,24 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
<td class="text-xs-left">
Ice cream sandwich
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
237
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
37
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
1%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<div class="v-data-table__checkbox v-simple-checkbox">
<div class="v-input--selection-controls__ripple">
</div>
@@ -3552,24 +3552,24 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
<td class="text-xs-left">
Eclair
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
262
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
23
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
6
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
7%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<div class="v-data-table__checkbox v-simple-checkbox">
<div class="v-input--selection-controls__ripple">
</div>
@@ -3583,24 +3583,24 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
<td class="text-xs-left">
Cupcake
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
305
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.7
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
67
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
4.3
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
8%
</td>
</tr>
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
<div class="v-data-table__checkbox v-simple-checkbox">
<div class="v-input--selection-controls__ripple">
</div>
@@ -3614,19 +3614,19 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
<td class="text-xs-left">
Gingerbread
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
356
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
49
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
3.9
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
16%
</td>
</tr>
diff --git a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap
index 6cb8082d14c..e34d351aa35 100644
--- a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap
@@ -18,7 +18,7 @@ exports[`VDataTableHeader.ts desktop should render 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -34,7 +34,7 @@ exports[`VDataTableHeader.ts desktop should render 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -50,7 +50,7 @@ exports[`VDataTableHeader.ts desktop should render 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -66,7 +66,7 @@ exports[`VDataTableHeader.ts desktop should render 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -82,7 +82,7 @@ exports[`VDataTableHeader.ts desktop should render 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -117,7 +117,7 @@ exports[`VDataTableHeader.ts desktop should work with multiSort 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -133,7 +133,7 @@ exports[`VDataTableHeader.ts desktop should work with multiSort 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -149,7 +149,7 @@ exports[`VDataTableHeader.ts desktop should work with multiSort 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -165,7 +165,7 @@ exports[`VDataTableHeader.ts desktop should work with multiSort 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -181,7 +181,7 @@ exports[`VDataTableHeader.ts desktop should work with multiSort 1`] = `
scope="col"
aria-label="Iron (%): Sorted descending. Activate to remove sorting."
aria-sort="descending"
- class="text-xs-left sortable active desc"
+ class="text-xs-start sortable active desc"
>
<span>
Iron (%)
@@ -222,7 +222,7 @@ exports[`VDataTableHeader.ts desktop should work with showGroupBy 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -241,7 +241,7 @@ exports[`VDataTableHeader.ts desktop should work with showGroupBy 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -260,7 +260,7 @@ exports[`VDataTableHeader.ts desktop should work with showGroupBy 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -279,7 +279,7 @@ exports[`VDataTableHeader.ts desktop should work with showGroupBy 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -298,7 +298,7 @@ exports[`VDataTableHeader.ts desktop should work with showGroupBy 1`] = `
scope="col"
aria-label="Iron (%): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Iron (%)
@@ -336,7 +336,7 @@ exports[`VDataTableHeader.ts desktop should work with sortBy correctly 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -352,7 +352,7 @@ exports[`VDataTableHeader.ts desktop should work with sortBy correctly 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -368,7 +368,7 @@ exports[`VDataTableHeader.ts desktop should work with sortBy correctly 1`] = `
scope="col"
aria-label="Carbs (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Carbs (g)
@@ -384,7 +384,7 @@ exports[`VDataTableHeader.ts desktop should work with sortBy correctly 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -400,7 +400,7 @@ exports[`VDataTableHeader.ts desktop should work with sortBy correctly 1`] = `
scope="col"
aria-label="Iron (%): Sorted descending. Activate to remove sorting."
aria-sort="descending"
- class="text-xs-left sortable active desc"
+ class="text-xs-start sortable active desc"
>
<span>
Iron (%)
@@ -435,7 +435,7 @@ exports[`VDataTableHeader.ts desktop should work with sortDesc correctly 1`] = `
scope="col"
aria-label="Calories: Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Calories
@@ -451,7 +451,7 @@ exports[`VDataTableHeader.ts desktop should work with sortDesc correctly 1`] = `
scope="col"
aria-label="Fat (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Fat (g)
@@ -467,7 +467,7 @@ exports[`VDataTableHeader.ts desktop should work with sortDesc correctly 1`] = `
scope="col"
aria-label="Carbs (g): Sorted descending. Activate to remove sorting."
aria-sort="descending"
- class="text-xs-left sortable active desc"
+ class="text-xs-start sortable active desc"
>
<span>
Carbs (g)
@@ -483,7 +483,7 @@ exports[`VDataTableHeader.ts desktop should work with sortDesc correctly 1`] = `
scope="col"
aria-label="Protein (g): Not sorted. Activate to sort ascending."
aria-sort="none"
- class="text-xs-left sortable"
+ class="text-xs-start sortable"
>
<span>
Protein (g)
@@ -499,7 +499,7 @@ exports[`VDataTableHeader.ts desktop should work with sortDesc correctly 1`] = `
scope="col"
aria-label="Iron (%): Sorted ascending. Activate to sort descending."
aria-sort="ascending"
- class="text-xs-left sortable active asc"
+ class="text-xs-start sortable active asc"
>
<span>
Iron (%)
diff --git a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VRow.spec.ts.snap b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VRow.spec.ts.snap
index 3ea574e6b69..695423566dc 100644
--- a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VRow.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VRow.spec.ts.snap
@@ -37,10 +37,10 @@ exports[`VRow.ts should render with scoped slots 1`] = `
exports[`VRow.ts should render without slots 1`] = `
<tr>
- <td class="text-xs-left">
+ <td class="text-xs-start">
0.68
</td>
- <td class="text-xs-left">
+ <td class="text-xs-start">
0.65
</td>
</tr>
diff --git a/packages/vuetify/src/styles/tools/_rtl.sass b/packages/vuetify/src/styles/tools/_rtl.sass
index 17d8f104bd0..86e90653cfa 100644
--- a/packages/vuetify/src/styles/tools/_rtl.sass
+++ b/packages/vuetify/src/styles/tools/_rtl.sass
@@ -1,3 +1,7 @@
@mixin rtl()
.application--is-rtl &
@content
+
+@mixin ltr()
+ .application--is-ltr &
+ @content
diff --git a/packages/vuetify/src/styles/utilities/_spacing.sass b/packages/vuetify/src/styles/utilities/_spacing.sass
index 275f154e98f..00f797a71dc 100644
--- a/packages/vuetify/src/styles/utilities/_spacing.sass
+++ b/packages/vuetify/src/styles/utilities/_spacing.sass
@@ -24,6 +24,18 @@
.ml-auto
margin-left: auto !important
+.ms-auto
+ +ltr()
+ margin-left: auto !important
+ +rtl()
+ margin-right: auto !important
+
+.me-auto
+ +ltr()
+ margin-right: auto !important
+ +rtl()
+ margin-left: auto !important
+
$i: 0
@each $level, $spacer in $spacers
.ma-#{$i}
@@ -42,6 +54,16 @@ $i: 0
margin-bottom: map-get($spacer, 'y') !important
.ml-#{$i}
margin-left: map-get($spacer, 'x') !important
+ .ms-#{$i}
+ +ltr()
+ margin-left: map-get($spacer, 'x') !important
+ +rtl()
+ margin-right: map-get($spacer, 'x') !important
+ .me-#{$i}
+ +ltr()
+ margin-right: map-get($spacer, 'x') !important
+ +rtl()
+ margin-left: map-get($spacer, 'x') !important
.pa-#{$i}
padding: map-get($spacer, 'y') map-get($spacer, 'x') !important
@@ -59,5 +81,15 @@ $i: 0
padding-bottom: map-get($spacer, 'y') !important
.pl-#{$i}
padding-left: map-get($spacer, 'x') !important
+ .ps-#{$i}
+ +ltr()
+ padding-left: map-get($spacer, 'x') !important
+ +rtl()
+ padding-right: map-get($spacer, 'x') !important
+ .pe-#{$i}
+ +ltr()
+ padding-right: map-get($spacer, 'x') !important
+ +rtl()
+ padding-left: map-get($spacer, 'x') !important
$i: $i + 1
diff --git a/packages/vuetify/src/styles/utilities/_text.sass b/packages/vuetify/src/styles/utilities/_text.sass
index ddfbdb85ff1..c0d7063d066 100644
--- a/packages/vuetify/src/styles/utilities/_text.sass
+++ b/packages/vuetify/src/styles/utilities/_text.sass
@@ -12,6 +12,18 @@
.text-#{$size}-justify
text-align: justify !important
+ .text-#{$size}-start
+ +ltr()
+ text-align: left !important
+ +rtl()
+ text-align: right !important
+
+ .text-#{$size}-end
+ +ltr()
+ text-align: right !important
+ +rtl()
+ text-align: left !important
+
@each $name, $weight in $font-weights
.font-weight
&-#{$name}
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index 91e9ad7174f..aa2949345ea 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -430,15 +430,6 @@ export function searchItems (items: any[], search: string) {
return items.filter(item => Object.keys(item).some(key => defaultFilter(getObjectValueByPath(item, key), search)))
}
-export function getTextAlignment (align: string | undefined, rtl: boolean): string {
- align = align || 'start'
-
- if (align === 'start') align = rtl ? 'right' : 'left'
- else if (align === 'end') align = rtl ? 'left' : 'right'
-
- return `text-xs-${align}`
-}
-
/**
* Returns:
* - 'normal' for old style slots - `<template slot="default">`
|
f2d89ae3685035087da2029fae2af8fe693b5cb6
|
2020-07-17 03:54:00
|
John Leider
|
chore: add missing icon
| false
|
add missing icon
|
chore
|
diff --git a/packages/docs-next/src/vuetify/icons.js b/packages/docs-next/src/vuetify/icons.js
index 22662176396..6f6a528695a 100644
--- a/packages/docs-next/src/vuetify/icons.js
+++ b/packages/docs-next/src/vuetify/icons.js
@@ -87,6 +87,7 @@ import {
mdiTablet,
mdiTagOutline,
mdiTelevision,
+ mdiTextBoxSearch,
mdiThemeLightDark,
mdiTranslate,
mdiTwitter,
@@ -185,6 +186,7 @@ export const icons = {
mdiTablet,
mdiTagOutline,
mdiTelevision,
+ mdiTextBoxSearch,
mdiThemeLightDark,
mdiTranslate,
mdiTwitter,
|
f9b150ff561e25be08153b7604effdb2e89747b0
|
2021-11-17 15:24:15
|
Kael
|
feat(VOverlay): add `contained` prop
| false
|
add `contained` prop
|
feat
|
diff --git a/packages/api-generator/src/locale/en/v-overlay.json b/packages/api-generator/src/locale/en/v-overlay.json
index a472505664b..cf62f3ab415 100644
--- a/packages/api-generator/src/locale/en/v-overlay.json
+++ b/packages/api-generator/src/locale/en/v-overlay.json
@@ -1,6 +1,7 @@
{
"props": {
- "absolute": "Applies **position: absolute** to the component.",
+ "absolute": "Applies **position: absolute** to the content element.",
+ "contained": "Limits the size of the component and scrim to its offset parent. Implies `absolute` and `attach`.",
"opacity": "Sets the overlay opacity",
"zIndex": "The z-index used for the component"
}
diff --git a/packages/vuetify/src/components/VOverlay/VOverlay.sass b/packages/vuetify/src/components/VOverlay/VOverlay.sass
index 72cce58b0f5..c491c522ffc 100644
--- a/packages/vuetify/src/components/VOverlay/VOverlay.sass
+++ b/packages/vuetify/src/components/VOverlay/VOverlay.sass
@@ -47,3 +47,6 @@
// Modifier
.v-overlay--absolute
position: absolute
+
+.v-overlay--contained .v-overlay__scrim
+ position: absolute
diff --git a/packages/vuetify/src/components/VOverlay/VOverlay.tsx b/packages/vuetify/src/components/VOverlay/VOverlay.tsx
index e071b0c6bb6..6f560e0668c 100644
--- a/packages/vuetify/src/components/VOverlay/VOverlay.tsx
+++ b/packages/vuetify/src/components/VOverlay/VOverlay.tsx
@@ -33,7 +33,6 @@ import {
ref,
Teleport,
toHandlers,
- toRef,
Transition,
watch,
} from 'vue'
@@ -82,10 +81,8 @@ export const VOverlay = genericComponent<new () => {
props: {
absolute: Boolean,
- attach: {
- type: [Boolean, String, Object] as PropType<boolean | string | Element>,
- default: 'body',
- },
+ attach: [Boolean, String, Object] as PropType<boolean | string | Element>,
+ contained: Boolean,
contentClass: null,
noClickAnimation: Boolean,
modelValue: Boolean,
@@ -111,7 +108,7 @@ export const VOverlay = genericComponent<new () => {
setup (props, { slots, attrs, emit }) {
const isActive = useProxiedModel(props, 'modelValue')
- const { teleportTarget } = useTeleport(toRef(props, 'attach'))
+ const { teleportTarget } = useTeleport(computed(() => props.attach || props.contained))
const { themeClasses } = useTheme(props)
const { rtlClasses } = useRtl()
const { hasContent, onAfterLeave } = useLazy(props, isActive)
@@ -174,7 +171,7 @@ export const VOverlay = genericComponent<new () => {
const root = ref()
const top = ref<number>()
- watch(() => isActive.value && props.absolute && teleportTarget.value == null, val => {
+ watch(() => isActive.value && (props.absolute || props.contained) && teleportTarget.value == null, val => {
if (val) {
const scrollParent = getScrollParent(root.value)
if (scrollParent && scrollParent !== document.scrollingElement) {
@@ -216,8 +213,9 @@ export const VOverlay = genericComponent<new () => {
class={[
'v-overlay',
{
- 'v-overlay--absolute': props.absolute,
+ 'v-overlay--absolute': props.absolute || props.contained,
'v-overlay--active': isActive.value,
+ 'v-overlay--contained': props.contained,
},
themeClasses.value,
rtlClasses.value,
|
68bf3d8fdace3bd00461f7c9cfddcd2ae2148d3a
|
2018-05-10 01:05:20
|
John Leider
|
fix(v-label): fix pointer-events
| false
|
fix pointer-events
|
fix
|
diff --git a/src/stylus/components/_labels.styl b/src/stylus/components/_labels.styl
index 9e11345b100..abd226aa423 100755
--- a/src/stylus/components/_labels.styl
+++ b/src/stylus/components/_labels.styl
@@ -10,9 +10,9 @@ v-label($material)
theme(v-label, "v-label")
.v-label
+ cursor: pointer
font-size: 16px
line-height: 1
min-height: 8px
- pointer-events: none
position: absolute
transition: .3s $transition.swing
diff --git a/src/stylus/components/_selection-controls.styl b/src/stylus/components/_selection-controls.styl
index e7e6366f175..031afad132a 100755
--- a/src/stylus/components/_selection-controls.styl
+++ b/src/stylus/components/_selection-controls.styl
@@ -57,7 +57,6 @@ rtl(v-selection-control-rtl, "v-input--selection-controls")
transition: inherit
.v-label
- pointer-events: all
user-select: none
&.v-input--is-focused,
diff --git a/src/stylus/components/_text-fields.styl b/src/stylus/components/_text-fields.styl
index ad49b5122c7..b297ad463fa 100755
--- a/src/stylus/components/_text-fields.styl
+++ b/src/stylus/components/_text-fields.styl
@@ -113,6 +113,7 @@ rtl(v-text-field-rtl, "v-text-field")
white-space: nowrap
.v-label
+ cursor: auto
height: 20px
line-height: 20px
max-width: 90%
@@ -200,6 +201,10 @@ rtl(v-text-field-rtl, "v-text-field")
.v-input__append-outer
margin-top: 16px
+ &:not(.v-text-field--solo)
+ .v-label
+ cursor: pointer
+
&--box
.v-input__slot,
input
|
03f437beabcac7599f706b900de77f8d902e6f82
|
2023-09-01 10:13:44
|
Kael
|
fix(VField): correct left outline width with outline+rounded
| false
|
correct left outline width with outline+rounded
|
fix
|
diff --git a/packages/vuetify/src/components/VField/VField.sass b/packages/vuetify/src/components/VField/VField.sass
index 3136e52456a..226de95f2f4 100644
--- a/packages/vuetify/src/components/VField/VField.sass
+++ b/packages/vuetify/src/components/VField/VField.sass
@@ -366,7 +366,8 @@
@at-root
#{selector.append('.v-field--rounded', &)},
- #{selector.append('[class^="rounded-"]', &)}
+ #{selector.append('[class^="rounded-"]', &)},
+ #{selector.append('[class*=" rounded-"]', &)}
flex-basis: calc(var(--v-input-control-height) / 2 + 2px)
@include tools.ltr()
|
337448c0651d83d81062eb0ed25173cebaa97df1
|
2020-06-02 21:40:59
|
John Leider
|
chore(release): publish v2.2.31
| false
|
publish v2.2.31
|
chore
|
diff --git a/lerna.json b/lerna.json
index 951b7502ccd..ad5c7e8d2a3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
- "version": "2.2.30",
+ "version": "2.2.31",
"useWorkspaces": true
}
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index 7bc6c9059f8..c69d9daed72 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
- "version": "2.2.30",
+ "version": "2.2.31",
"private": true,
"description": "",
"main": "dist/api.js",
@@ -15,7 +15,7 @@
"dependencies": {
"deepmerge": "^4.0.0",
"vue": "^2.6.10",
- "vuetify": "^2.2.30"
+ "vuetify": "^2.2.31"
},
"devDependencies": {
"@babel/node": "^7.5.5",
diff --git a/packages/docs/package.json b/packages/docs/package.json
index a3757d77fdd..3f7a2a0cb62 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <[email protected]>",
- "version": "2.2.30",
+ "version": "2.2.31",
"scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --config build/webpack.client.config.js --hot --progress",
"build": "rimraf dist && cross-env NODE_ENV=production webpack --config build/webpack.prod.config.js --no-progress --hide-modules && yarn prerender",
@@ -13,7 +13,7 @@
"lint:fix": "yarn lint --fix"
},
"dependencies": {
- "@vuetify/api-generator": "^2.2.30",
+ "@vuetify/api-generator": "^2.2.31",
"babel-polyfill": "^6.26.0",
"chokidar": "^3.0.2",
"compression": "^1.7.4",
@@ -43,7 +43,7 @@
"vue-router": "^3.0.7",
"vue-server-renderer": "^2.6.10",
"vuelidate": "^0.7.4",
- "vuetify": "^2.2.30",
+ "vuetify": "^2.2.31",
"vuex": "^3.1.1",
"vuex-pathify": "^1.4.0",
"vuex-router-sync": "^5.0.0",
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index 429458e6fbc..19f542853d7 100644
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -1,7 +1,7 @@
{
"name": "vuetify",
"description": "Vue Material Component Framework",
- "version": "2.2.30",
+ "version": "2.2.31",
"author": {
"name": "John Leider",
"email": "[email protected]"
|
7875421f2129a7024454cb2703ea4811dcf613dc
|
2022-07-06 02:38:15
|
John Leider
|
docs(home): remove special sponsor
| false
|
remove special sponsor
|
docs
|
diff --git a/packages/docs/src/pages/en/home.md b/packages/docs/src/pages/en/home.md
index 8a5512b8466..5f572d8ff46 100644
--- a/packages/docs/src/pages/en/home.md
+++ b/packages/docs/src/pages/en/home.md
@@ -13,17 +13,17 @@ Vuetify is a Vue UI Library with beautifully handcrafted Material Components. No
<br>
<br>
-## Special Sponsor
+<!-- ## Special Sponsor
Thank you to our special sponsor:
-<sponsor height="70" slug="appeggio" />
+<sponsor height="70" slug="" />
<br>
<br>
-<br>
+<br> -->
-### Project Sponsors
+## Project Sponsors
The continued development and maintenance of Vuetify
<br>
|
7932d7a3fbf40ca586f6e6e2b1f02f4dcc495c5b
|
2019-08-01 19:51:02
|
Doug Allrich
|
fix(VSelect): tweak default menu max-height value (#8225)
| false
|
tweak default menu max-height value (#8225)
|
fix
|
diff --git a/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataFooter.spec.ts.snap b/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataFooter.spec.ts.snap
index fd7b9b1f5be..44df34f67a0 100644
--- a/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataFooter.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataFooter.spec.ts.snap
@@ -35,7 +35,7 @@ exports[`VDataFooter.ts should render first & last icons with showFirstLastPage
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -132,7 +132,7 @@ exports[`VDataFooter.ts should render in RTL mode 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -229,7 +229,7 @@ exports[`VDataFooter.ts should render with custom itemsPerPage 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -305,7 +305,7 @@ exports[`VDataFooter.ts should show current page if has showCurrentPage 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataIterator.spec.ts.snap b/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataIterator.spec.ts.snap
index 35a6a934905..284573716ef 100644
--- a/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataIterator.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataIterator.spec.ts.snap
@@ -47,7 +47,7 @@ exports[`VDataIterator.ts should render and match snapshot 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -138,7 +138,7 @@ exports[`VDataIterator.ts should render and match snapshot with data 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -220,7 +220,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -302,7 +302,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -384,7 +384,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap
index be656eb7453..d34c6facf1d 100644
--- a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTable.spec.ts.snap
@@ -54,7 +54,7 @@ exports[`VDataTable.ts should render 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -180,7 +180,7 @@ exports[`VDataTable.ts should render loading state 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -386,7 +386,7 @@ exports[`VDataTable.ts should render loading state 2`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -675,7 +675,7 @@ exports[`VDataTable.ts should render virtual table 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -866,7 +866,7 @@ exports[`VDataTable.ts should render with body slot 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -1155,7 +1155,7 @@ exports[`VDataTable.ts should render with data 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -1339,7 +1339,7 @@ exports[`VDataTable.ts should render with group scoped slot 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -1766,7 +1766,7 @@ exports[`VDataTable.ts should render with group.summary scoped slot 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -2139,7 +2139,7 @@ exports[`VDataTable.ts should render with grouped rows 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -2343,7 +2343,7 @@ exports[`VDataTable.ts should render with item scoped slot 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -2657,7 +2657,7 @@ exports[`VDataTable.ts should render with item.expanded scoped slot 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -2994,7 +2994,7 @@ exports[`VDataTable.ts should render with showExpand 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -3331,7 +3331,7 @@ exports[`VDataTable.ts should render with showExpand 2`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -3695,7 +3695,7 @@ exports[`VDataTable.ts should render with showSelect 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap
index 87cdb6d8676..a8b13e27a75 100644
--- a/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap
+++ b/packages/vuetify/src/components/VDataTable/__tests__/__snapshots__/VDataTableHeader.spec.ts.snap
@@ -545,7 +545,7 @@ exports[`VDataTableHeader.ts mobile should render 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -608,7 +608,7 @@ exports[`VDataTableHeader.ts mobile should render with data-table-select header
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -673,7 +673,7 @@ exports[`VDataTableHeader.ts mobile should work with multiSort 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -725,7 +725,7 @@ exports[`VDataTableHeader.ts mobile should work with showGroupBy 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -790,7 +790,7 @@ exports[`VDataTableHeader.ts mobile should work with sortBy correctly 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -855,7 +855,7 @@ exports[`VDataTableHeader.ts mobile should work with sortDesc correctly 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap b/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap
index fcad3fe5914..8bfc857fca7 100644
--- a/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap
+++ b/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap
@@ -31,7 +31,7 @@ exports[`VOverflowBtn.js should use default autocomplete selections 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light v-autocomplete__content"
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -80,7 +80,7 @@ exports[`VOverflowBtn.js should use default autocomplete selections 2`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light v-autocomplete__content"
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VSelect/VSelect.ts b/packages/vuetify/src/components/VSelect/VSelect.ts
index acb7f09e47d..81489e5a886 100644
--- a/packages/vuetify/src/components/VSelect/VSelect.ts
+++ b/packages/vuetify/src/components/VSelect/VSelect.ts
@@ -31,7 +31,7 @@ export const defaultMenuProps = {
closeOnContentClick: false,
disableKeys: true,
openOnClick: false,
- maxHeight: 300,
+ maxHeight: 304,
}
// Types
diff --git a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect.spec.ts.snap b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect.spec.ts.snap
index 844545742ad..035db5367f1 100644
--- a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect.spec.ts.snap
+++ b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect.spec.ts.snap
@@ -40,7 +40,7 @@ exports[`VSelect.ts should only show items if they are in items 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -87,7 +87,7 @@ exports[`VSelect.ts should only show items if they are in items 2`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -137,7 +137,7 @@ exports[`VSelect.ts should only show items if they are in items 3`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -190,7 +190,7 @@ exports[`VSelect.ts should only show items if they are in items 4`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -237,7 +237,7 @@ exports[`VSelect.ts should render v-select correctly when not using scope slot 1
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -284,7 +284,7 @@ exports[`VSelect.ts should render v-select correctly when not using v-list-item
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -331,7 +331,7 @@ exports[`VSelect.ts should render v-select correctly when using v-list-item in i
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect2.spec.ts.snap b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect2.spec.ts.snap
index 16c251bba1a..b324f883337 100644
--- a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect2.spec.ts.snap
+++ b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect2.spec.ts.snap
@@ -41,7 +41,7 @@ exports[`VSelect.ts should be clearable with prop, dirty and multi select 1`] =
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -100,7 +100,7 @@ exports[`VSelect.ts should be clearable with prop, dirty and single select 1`] =
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
@@ -150,7 +150,7 @@ exports[`VSelect.ts should use scoped slot for selection generation 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
diff --git a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect3.spec.ts.snap b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect3.spec.ts.snap
index 52346420698..347d02fa8d5 100644
--- a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect3.spec.ts.snap
+++ b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelect3.spec.ts.snap
@@ -32,7 +32,7 @@ exports[`VSelect.ts should add color to selected index 1`] = `
</div>
<div class="v-menu">
<div class="v-menu__content theme--light "
- style="max-height: 300px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
+ style="max-height: 304px; min-width: 0px; max-width: auto; top: 12px; left: 0px; transform-origin: top left; z-index: 0; display: none;"
>
</div>
</div>
|
27e088082b223f98c5c93789e19651453d5b3b56
|
2019-03-26 23:48:06
|
John Leider
|
refactor(services): improve typings
| false
|
improve typings
|
refactor
|
diff --git a/packages/vuetify/src/services/goto/index.ts b/packages/vuetify/src/services/goto/index.ts
index 9f4d585f186..24ec328fe6a 100644
--- a/packages/vuetify/src/services/goto/index.ts
+++ b/packages/vuetify/src/services/goto/index.ts
@@ -9,23 +9,15 @@ import {
} from './util'
// Types
+import { VuetifyGoToOptions, VuetifyGoToTarget } from 'vuetify/types/services/goto'
+
import { VuetifyServiceContract } from 'vuetify/types/services'
-import Vue from 'vue'
-
-type GoToTarget = number | string | HTMLElement | Vue
-interface GoToSettings {
- container: string | HTMLElement | Vue
- duration: number
- offset: number
- easing: string | easingPatterns.EasingFunction
- appOffset: boolean
-}
export default function goTo (
- _target: GoToTarget,
- _settings: Partial<GoToSettings> = {}
+ _target: VuetifyGoToTarget,
+ _settings: Partial<VuetifyGoToOptions> = {}
): Promise<number> {
- const settings: GoToSettings = {
+ const settings: VuetifyGoToOptions = {
container: (document.scrollingElement as HTMLElement | null) || document.body || document.documentElement,
duration: 500,
offset: 0,
@@ -47,13 +39,13 @@ export default function goTo (
}
const startTime = performance.now()
- const targetLocation = getOffset(_target) - settings.offset
+ const targetLocation = getOffset(_target) - settings.offset!
const startLocation = container.scrollTop
if (targetLocation === startLocation) return Promise.resolve(targetLocation)
const ease = typeof settings.easing === 'function'
? settings.easing
- : (easingPatterns as Dictionary<easingPatterns.EasingFunction>)[settings.easing]
+ : easingPatterns[settings.easing!]
/* istanbul ignore else */
if (!ease) throw new TypeError(`Easing function "${settings.easing}" not found.`)
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index f330b8cccc7..87ec32c0bc8 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -254,13 +254,6 @@ export function filterObjectOnKeys<T, K extends keyof T> (obj: T, keys: K[]): {
return filtered
}
-export function filterChildren (array: VNode[] = [], tag: string): VNode[] {
- return array.filter(child => {
- return child.componentOptions &&
- child.componentOptions.Ctor.options.name === tag
- })
-}
-
export function convertToUnit (str: string | number | null | undefined, unit = 'px'): string | undefined {
if (str == null || str === '') {
return undefined
diff --git a/packages/vuetify/types/index.d.ts b/packages/vuetify/types/index.d.ts
index 9d554d8e46c..c193e6fa6d1 100644
--- a/packages/vuetify/types/index.d.ts
+++ b/packages/vuetify/types/index.d.ts
@@ -1,11 +1,22 @@
import Vue, { Component, PluginFunction, PluginObject, VueConstructor, DirectiveFunction, DirectiveOptions } from 'vue'
-import { VuetifyLangOptions as VuetifyLanguage } from './services/lang'
import './lib'
import './alacarte'
import './colors'
-import { VuetifyThemeOptions } from 'vuetify/types/services/theme'
-import { VuetifyIconOptions } from 'vuetify/types/services/icons'
+
+// Services
+import { Application } from '../src/services/application'
+import { Breakpoint } from '../src/services/breakpoint'
+import { Goto } from '../src/services/goto'
import { Icons } from '../src/services/icons'
+import { Lang } from '../src/services/lang'
+import { Theme } from '../src/services/theme'
+
+// Service Options
+import { VuetifyBreakpointOptions } from './services/breakpoint'
+import { VuetifyGoToOptions } from './services/goto'
+import { VuetifyIconOptions } from './services/icons'
+import { VuetifyLangOptions } from './services/lang'
+import { VuetifyThemeOptions } from './services/theme'
declare const Vuetify: Vuetify
export default Vuetify
@@ -14,7 +25,9 @@ export interface Vuetify {
version: string
}
-export type ComponentOrPack = Component & { $_vuetify_subcomponents?: Record<string, ComponentOrPack> }
+export type ComponentOrPack = Component & {
+ $_vuetify_subcomponents?: Record<string, ComponentOrPack>
+}
export interface VuetifyUseOptions {
transitions?: Record<string, VueConstructor>
@@ -29,17 +42,17 @@ export interface VuetifyUseOptions {
* @example <v-icon>$vuetify.icons.(name)</v-icon>
*/
icons?: Partial<VuetifyIconOptions>
- lang?: Partial<VuetifyLanguage>
+ lang?: Partial<VuetifyLangOptions>
rtl?: boolean
}
export interface VuetifyObject extends Vue {
- readonly breakpoint: Readonly<VuetifyBreakpoint>
+ readonly breakpoint: InstanceType<typeof Breakpoint>
readonly goTo: <T extends string | number | HTMLElement | Vue>(target: T, options?: VuetifyGoToOptions) => Promise<T>
- application: VuetifyApplication
- theme: VuetifyThemeOptions
+ application: InstanceType<typeof Application>
+ theme: InstanceType<typeof Theme>
icons: InstanceType<typeof Icons>
- lang: VuetifyLanguage
+ lang: InstanceType<typeof Lang>
rtl: boolean
}
@@ -60,73 +73,3 @@ declare module 'vue/types/options' {
vuetify?: any
}
}
-
-export interface VuetifyApplication {
- bar: number
- bottom: number
- footer: number
- left: number
- right: number
- top: number
- register (uid: number, target: string, value: number): void
- unregister (uid: number, target: string): void
- update (target: string): void
-}
-
-export interface VuetifyBreakpointThresholds {
- xs: number
- sm: number
- md: number
- lg: number
-}
-
-export interface VuetifyBreakpointOptions {
- thresholds: VuetifyBreakpointThresholds
- scrollbarWidth: number
-}
-
-export interface VuetifyBreakpoint {
- height: number
- lg: boolean
- lgAndDown: boolean
- lgAndUp: boolean
- lgOnly: boolean
- md: boolean
- mdAndDown: boolean
- mdAndUp: boolean
- mdOnly: boolean
- name: string
- sm: boolean
- smAndDown: boolean
- smAndUp: boolean
- smOnly: boolean
- width: number
- xl: boolean
- xlOnly: boolean
- xs: boolean
- xsOnly: boolean
- thresholds: VuetifyBreakpointThresholds
- scrollbarWidth: number
-}
-
-export type VuetifyGoToEasing =
- ((t: number) => number) |
- 'linear' |
- 'easeInQuad' |
- 'easeOutQuad' |
- 'easeInOutQuad' |
- 'easeInCubic' |
- 'easeOutCubic' |
- 'easeInOutCubic' |
- 'easeInQuart' |
- 'easeOutQuart' |
- 'easeInOutQuart' |
- 'easeInQuint' |
- 'easeOutQuint' |
- 'easeInOutQuint'
-
-export interface VuetifyGoToOptions {
- duration?: number
- offset?: number
- easing?: VuetifyGoToEasing
-}
diff --git a/packages/vuetify/types/presets/index.d.ts b/packages/vuetify/types/presets/index.d.ts
index 2db04a2ec36..28d50fffc32 100644
--- a/packages/vuetify/types/presets/index.d.ts
+++ b/packages/vuetify/types/presets/index.d.ts
@@ -1,9 +1,5 @@
import { VuetifyIconOptions } from 'vuetify/types/services/icons'
-
-import {
- VuetifyThemeService,
- VuetifyThemeOptions
-} from 'vuetify/types/services/theme'
+import { VuetifyThemeOptions } from 'vuetify/types/services/theme'
export interface VuetifyPreset {
[name: string]: any
diff --git a/packages/vuetify/types/services/breakpoint.d.ts b/packages/vuetify/types/services/breakpoint.d.ts
index 5394f67d3a8..8d7f12c1215 100644
--- a/packages/vuetify/types/services/breakpoint.d.ts
+++ b/packages/vuetify/types/services/breakpoint.d.ts
@@ -1,9 +1,35 @@
export interface VuetifyBreakpointOptions {
- thresholds: {
- xs?: number
- sm?: number
- md?: number
- lg?: number
- }
+ thresholds: Partial<VuetifyBreakpointThresholds>
scrollBarWidth?: number
}
+
+export interface VuetifyBreakpointThresholds {
+ xs: number
+ sm: number
+ md: number
+ lg: number
+}
+
+export interface VuetifyBreakpoint {
+ height: number
+ lg: boolean
+ lgAndDown: boolean
+ lgAndUp: boolean
+ lgOnly: boolean
+ md: boolean
+ mdAndDown: boolean
+ mdAndUp: boolean
+ mdOnly: boolean
+ name: string
+ sm: boolean
+ smAndDown: boolean
+ smAndUp: boolean
+ smOnly: boolean
+ width: number
+ xl: boolean
+ xlOnly: boolean
+ xs: boolean
+ xsOnly: boolean
+ thresholds: VuetifyBreakpointThresholds
+ scrollbarWidth: number
+}
diff --git a/packages/vuetify/types/services/goto.d.ts b/packages/vuetify/types/services/goto.d.ts
new file mode 100644
index 00000000000..f6529dbecd5
--- /dev/null
+++ b/packages/vuetify/types/services/goto.d.ts
@@ -0,0 +1,28 @@
+// Types
+import Vue from 'vue'
+
+type VuetifyGoToTarget = number | string | HTMLElement | Vue
+
+export type VuetifyGoToEasing =
+ ((t: number) => number) |
+ 'linear' |
+ 'easeInQuad' |
+ 'easeOutQuad' |
+ 'easeInOutQuad' |
+ 'easeInCubic' |
+ 'easeOutCubic' |
+ 'easeInOutCubic' |
+ 'easeInQuart' |
+ 'easeOutQuart' |
+ 'easeInOutQuart' |
+ 'easeInQuint' |
+ 'easeOutQuint' |
+ 'easeInOutQuint'
+
+export interface VuetifyGoToOptions {
+ container?: string | HTMLElement | Vue,
+ duration?: number
+ offset?: number
+ easing?: VuetifyGoToEasing
+ appOffset?: boolean
+}
diff --git a/packages/vuetify/types/services/theme.d.ts b/packages/vuetify/types/services/theme.d.ts
index b241231175a..680812d6812 100644
--- a/packages/vuetify/types/services/theme.d.ts
+++ b/packages/vuetify/types/services/theme.d.ts
@@ -1,9 +1,5 @@
import { Theme } from '../../src/services/theme'
-export interface VuetifyThemeService {
- new (options?: VuetifyThemeOptions): Theme
-}
-
export interface VuetifyThemeOptions {
dark?: boolean
disable?: boolean
diff --git a/packages/vuetify/types/test/global.ts b/packages/vuetify/types/test/global.ts
index 49a9b378e71..027f1c44157 100644
--- a/packages/vuetify/types/test/global.ts
+++ b/packages/vuetify/types/test/global.ts
@@ -37,17 +37,10 @@ Vue.component('theme', {
// Can't do this, some components rely on the pre-defined values
// this.$vuetify.theme = { primary: 123 }
- Object.assign(this.$vuetify.theme, {
+ Object.assign(this.$vuetify.theme.themes.light, {
primary: 123
})
- this.$vuetify.theme = {
- themes: {
- light: {
- ...this.$vuetify.theme!.themes!.light,
- primary: 132
- }
- } as any
- }
+ this.$vuetify.theme.themes.light.primary = 132
}
})
|
5f702bb64ec42e1ba6bf363d6bf2f481af41b726
|
2019-07-17 22:51:15
|
John Leider
|
docs(VBtn): improve playground
| false
|
improve playground
|
docs
|
diff --git a/packages/docs/src/examples/buttons/playground.vue b/packages/docs/src/examples/buttons/playground.vue
index c099f761100..444489d9c25 100644
--- a/packages/docs/src/examples/buttons/playground.vue
+++ b/packages/docs/src/examples/buttons/playground.vue
@@ -6,7 +6,6 @@
<v-btn
v-bind="options"
class="mt-5"
- dark
>
<v-icon
v-if="hasIcon"
@@ -18,16 +17,35 @@
<span v-else>
{{ text }}
</span>
- <template v-if="customLoad" v-slot:loader>
+ <template
+ v-if="customLoad"
+ v-slot:loader
+ >
Loading...
</template>
</v-btn>
<v-flex xs12>
<v-container grid-list-md>
- <v-slider v-model="minWidth" label="Min width" min="10" max="300"></v-slider>
- <v-slider v-model="minHeight" label="Min height" min="10" max="300"></v-slider>
- <v-slider v-model="elevation" label="Elevation" min="0" max="24"></v-slider>
+ <v-slider
+ v-model="minWidth"
+ label="Min width"
+ min="10"
+ max="300"
+ ></v-slider>
+ <v-slider
+ v-model="minHeight"
+ label="Min height"
+ min="10"
+ max="300"
+ ></v-slider>
+ <v-slider
+ v-model="elevation"
+ label="Elevation"
+ min="0"
+ max="24"
+ clearable
+ ></v-slider>
<v-layout wrap>
<v-flex
xs12
@@ -91,7 +109,7 @@
size: 'medium',
sizes: ['x-small', 'small', 'medium', 'large', 'x-large'],
type: [],
- types: ['block', 'depressed', 'fab', 'outlined', 'round', 'text'],
+ types: ['block', 'depressed', 'fab', 'outlined', 'rounded', 'text'],
text: 'Customize me',
minWidth: undefined,
minHeight: undefined,
@@ -135,5 +153,18 @@
return Object.keys(this.$vuetify.theme.themes.dark)
},
},
+ watch: {
+ type (val) {
+ if (
+ val.includes('depressed') ||
+ val.includes('outlined') ||
+ val.includes('text')
+ ) {
+ this.elevation = 0
+ } else {
+ this.elevation = 2
+ }
+ },
+ },
}
</script>
|
d339c881ff1c939090d97d7003f1667b4d7e8ec6
|
2019-03-29 22:43:29
|
sh7dm
|
refactor(VParallax): convert to Sass
| false
|
convert to Sass
|
refactor
|
diff --git a/packages/vuetify/src/stylus/components/_parallax.styl b/packages/vuetify/src/components/VParallax/VParallax.sass
similarity index 81%
rename from packages/vuetify/src/stylus/components/_parallax.styl
rename to packages/vuetify/src/components/VParallax/VParallax.sass
index b55a77a31a1..2cd64793c9d 100644
--- a/packages/vuetify/src/stylus/components/_parallax.styl
+++ b/packages/vuetify/src/components/VParallax/VParallax.sass
@@ -1,4 +1,4 @@
-@import '../bootstrap'
+@import '../../styles/styles.sass'
.v-parallax
position: relative
@@ -23,11 +23,11 @@
display: none
transform: translate(-50%, 0)
will-change: transform
- transition: .3s opacity $transition.swing
+ transition: .3s opacity map-get($transition, 'swing')
z-index: 1
&__content
- color: $shades.white
+ color: map-get($shades, 'white')
height: 100%
z-index: 2
position: relative
diff --git a/packages/vuetify/src/components/VParallax/VParallax.ts b/packages/vuetify/src/components/VParallax/VParallax.ts
index 1ad490f7126..4ed51401ce6 100644
--- a/packages/vuetify/src/components/VParallax/VParallax.ts
+++ b/packages/vuetify/src/components/VParallax/VParallax.ts
@@ -1,5 +1,5 @@
// Style
-import '../../stylus/components/_parallax.styl'
+import './VParallax.sass'
// Mixins
import Translatable from '../../mixins/translatable'
|
d74a68cf112726f4fbc02da4b13f2dade130db59
|
2019-12-03 21:46:09
|
John Leider
|
docs(DocMarkdown): ensure replace doesn't throw error
| false
|
ensure replace doesn't throw error
|
docs
|
diff --git a/packages/docs/src/components/base/Markdown.vue b/packages/docs/src/components/base/Markdown.vue
index 001ffc97d3c..9692bde3165 100644
--- a/packages/docs/src/components/base/Markdown.vue
+++ b/packages/docs/src/components/base/Markdown.vue
@@ -115,8 +115,13 @@
if (wantsList) code = code.map(c => `- ${c}\n`).join('')
+ if (typeof code !== 'string') {
+ code = ''
+ console.log(code, typeof code)
+ }
+
// Convert markdown links
- code = (code || '').replace(/\[([^\]]*)\]\(([^)]*)\)/g, parseLink)
+ code = code.replace(/\[([^\]]*)\]\(([^)]*)\)/g, parseLink)
const innerHTML = marked(code)
|
a8922b9a17414c8e5cdc652b6038063e3caa43a1
|
2018-09-19 19:34:30
|
John Leider
|
refactor(v-item): remove value requirement
| false
|
remove value requirement
|
refactor
|
diff --git a/src/mixins/groupable.ts b/src/mixins/groupable.ts
index 487b53d0e61..da76614c6d4 100644
--- a/src/mixins/groupable.ts
+++ b/src/mixins/groupable.ts
@@ -9,7 +9,6 @@ import { inject as RegistrableInject } from './registrable'
// Utilities
import mixins from '../util/mixins'
import { PropValidator } from 'vue/types/options'
-import { consoleWarn } from '../util/console'
type VItemGroupInstance = InstanceType<typeof VItemGroup>
@@ -52,10 +51,6 @@ export default mixins<options>(
},
created () {
- if (!('value' in this)) {
- consoleWarn('Implementing component is missing a value property', this)
- }
-
this.itemGroup && this.itemGroup.register(this)
},
diff --git a/test/unit/components/VItemGroup/VItem.spec.js b/test/unit/components/VItemGroup/VItem.spec.js
index 6c2c7d9bee2..af25f894d46 100644
--- a/test/unit/components/VItemGroup/VItem.spec.js
+++ b/test/unit/components/VItemGroup/VItem.spec.js
@@ -3,7 +3,6 @@ import { test } from '@/test'
import VItem from '@/components/VItemGroup/VItem'
const registrableWarning = '[Vuetify] The v-item component must be used inside a v-item-group'
-const valueWarning = '[Vuetify] Implementing component is missing a value property'
const vm = new Vue()
const defaultSlot = () => vm.$createElement('div', 'foobar')
@@ -23,7 +22,6 @@ test('VItem', ({ mount }) => {
mount(VItem)
expect('v-item is missing a default scopedSlot').toHaveBeenTipped()
- expect(valueWarning).toHaveBeenTipped()
expect(registrableWarning).toHaveBeenTipped()
})
@@ -41,7 +39,6 @@ test('VItem', ({ mount }) => {
mount(Mock)
expect('v-item should only contain a single element').toHaveBeenTipped()
- expect(valueWarning).toHaveBeenTipped()
expect(registrableWarning).toHaveBeenTipped()
})
@@ -67,7 +64,5 @@ test('VItem', ({ mount }) => {
await wrapper.vm.$nextTick()
expect(wrapper.html()).toMatchSnapshot()
-
- expect(valueWarning).toHaveBeenTipped()
})
})
diff --git a/test/unit/components/VItemGroup/VItemGroup.spec.js b/test/unit/components/VItemGroup/VItemGroup.spec.js
index 51cab3feed8..9f7e85a9955 100644
--- a/test/unit/components/VItemGroup/VItemGroup.spec.js
+++ b/test/unit/components/VItemGroup/VItemGroup.spec.js
@@ -5,7 +5,6 @@ import VItemGroup from '@/components/VItemGroup/VItemGroup'
const vm = new Vue()
const defaultSlot = ({ toggle }) => vm.$createElement('div', { on: { click: toggle } }, 'foobar')
-const valueWarning = '[Vuetify] Implementing component is missing a value property'
const Mock = {
name: 'test',
@@ -54,8 +53,6 @@ test('VItemGroup.ts', ({ mount }) => {
item.destroy()
expect(wrapper.vm.items.length).toBe(0)
-
- expect(valueWarning).toHaveBeenTipped()
})
it('should update state from child clicks', () => {
@@ -99,8 +96,6 @@ test('VItemGroup.ts', ({ mount }) => {
child1.click()
expect(change).toBeCalledWith([1])
-
- expect(valueWarning).toHaveBeenTipped()
})
it('should have a conditional method for toggling items', () => {
@@ -146,8 +141,6 @@ test('VItemGroup.ts', ({ mount }) => {
expect(wrapper.vm.selectedItems.length).toBe(1)
expect(wrapper.vm.internalValue).toEqual([0])
-
- expect(valueWarning).toHaveBeenTipped()
})
it('should update a single item group', () => {
@@ -238,7 +231,5 @@ test('VItemGroup.ts', ({ mount }) => {
first.destroy()
expect(change).toBeCalledWith(undefined)
-
- expect(valueWarning).toHaveBeenTipped()
})
})
|
91dda3384b701cabfa693f7ff576e895962b20e4
|
2019-06-25 22:56:28
|
Dmitry Sharshakov
|
docs(VListItemGroup): update examples (#7646)
| false
|
update examples (#7646)
|
docs
|
diff --git a/packages/docs/src/data/pages/components/ListItemGroups.json b/packages/docs/src/data/pages/components/ListItemGroups.json
index 4210ae30eed..a63879bcd29 100644
--- a/packages/docs/src/data/pages/components/ListItemGroups.json
+++ b/packages/docs/src/data/pages/components/ListItemGroups.json
@@ -24,14 +24,26 @@
}
]
},
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "playground",
+ "value": "playground"
+ }
+ ]
+ },
{
"type": "section",
"children": [
{
"type": "examples",
"value": [
- "selection-controls",
- "flat"
+ "simple/flat",
+ "simple/multiple",
+ "simple/mandatory",
+ "simple/active-class",
+ "intermediate/selection-controls"
]
}
]
diff --git a/packages/docs/src/examples/list-item-groups/selection-controls.vue b/packages/docs/src/examples/list-item-groups/intermediate/selection-controls.vue
similarity index 100%
rename from packages/docs/src/examples/list-item-groups/selection-controls.vue
rename to packages/docs/src/examples/list-item-groups/intermediate/selection-controls.vue
diff --git a/packages/docs/src/examples/list-item-groups/playground.vue b/packages/docs/src/examples/list-item-groups/playground.vue
new file mode 100644
index 00000000000..542820930f3
--- /dev/null
+++ b/packages/docs/src/examples/list-item-groups/playground.vue
@@ -0,0 +1,60 @@
+<template>
+ <div>
+ <v-layout row wrap justify-space-around>
+ <v-switch v-model="multiple" class="mx-2" label="Multiple"></v-switch>
+ <v-switch v-model="mandatory" class="mx-2" label="Mandatory"></v-switch>
+ <v-switch v-model="flat" class="mx-2" label="Flat"></v-switch>
+ <v-switch v-model="dense" class="mx-2" label="Dense"></v-switch>
+ <v-flex xs12>
+ <v-slider v-model="count" min="0" max="25" label="Items count"></v-slider>
+ </v-flex>
+ </v-layout>
+
+ <v-card
+ class="mx-auto"
+ max-width="400"
+ >
+ <v-list
+ :flat="flat"
+ :dense="dense"
+ >
+ <v-list-item-group
+ v-model="model"
+ :multiple="multiple"
+ :mandatory="mandatory"
+ color="indigo"
+ >
+ <v-list-item
+ v-for="i in count"
+ :key="i"
+ >
+ <v-list-item-icon>
+ <v-icon v-text="item.icon"></v-icon>
+ </v-list-item-icon>
+
+ <v-list-item-content>
+ <v-list-item-title v-text="item.text"></v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
+ </v-list-item-group>
+ </v-list>
+ </v-card>
+ </div>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ item: {
+ icon: 'mdi-wifi',
+ text: 'Wifi',
+ },
+ model: 1,
+ multiple: false,
+ mandatory: false,
+ flat: false,
+ dense: false,
+ count: 4,
+ }),
+ }
+</script>
diff --git a/packages/docs/src/examples/list-item-groups/simple/active-class.vue b/packages/docs/src/examples/list-item-groups/simple/active-class.vue
new file mode 100644
index 00000000000..cba8213d987
--- /dev/null
+++ b/packages/docs/src/examples/list-item-groups/simple/active-class.vue
@@ -0,0 +1,51 @@
+<template>
+ <v-card
+ class="mx-auto"
+ max-width="400"
+ >
+ <v-list>
+ <v-list-item-group v-model="model" active-class="border" color="indigo">
+ <v-list-item
+ v-for="(item, i) in items"
+ :key="i"
+ >
+ <v-list-item-icon>
+ <v-icon v-text="item.icon"></v-icon>
+ </v-list-item-icon>
+
+ <v-list-item-content>
+ <v-list-item-title v-text="item.text"></v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
+ </v-list-item-group>
+ </v-list>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ items: [
+ {
+ icon: 'mdi-wifi',
+ text: 'Wifi',
+ },
+ {
+ icon: 'mdi-bluetooth',
+ text: 'Bluetooth',
+ },
+ {
+ icon: 'mdi-chart-donut',
+ text: 'Data Usage',
+ },
+ ],
+ model: 1,
+ }),
+ }
+</script>
+
+<style scoped>
+.border {
+ border: 2px dashed orange;
+}
+</style>
diff --git a/packages/docs/src/examples/list-item-groups/flat.vue b/packages/docs/src/examples/list-item-groups/simple/flat.vue
similarity index 100%
rename from packages/docs/src/examples/list-item-groups/flat.vue
rename to packages/docs/src/examples/list-item-groups/simple/flat.vue
diff --git a/packages/docs/src/examples/list-item-groups/simple/mandatory.vue b/packages/docs/src/examples/list-item-groups/simple/mandatory.vue
new file mode 100644
index 00000000000..afc167610a6
--- /dev/null
+++ b/packages/docs/src/examples/list-item-groups/simple/mandatory.vue
@@ -0,0 +1,45 @@
+<template>
+ <v-card
+ class="mx-auto"
+ max-width="400"
+ >
+ <v-list>
+ <v-list-item-group v-model="model" mandatory color="indigo">
+ <v-list-item
+ v-for="(item, i) in items"
+ :key="i"
+ >
+ <v-list-item-icon>
+ <v-icon v-text="item.icon"></v-icon>
+ </v-list-item-icon>
+
+ <v-list-item-content>
+ <v-list-item-title v-text="item.text"></v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
+ </v-list-item-group>
+ </v-list>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ items: [
+ {
+ icon: 'mdi-wifi',
+ text: 'Wifi',
+ },
+ {
+ icon: 'mdi-bluetooth',
+ text: 'Bluetooth',
+ },
+ {
+ icon: 'mdi-chart-donut',
+ text: 'Data Usage',
+ },
+ ],
+ model: 1,
+ }),
+ }
+</script>
diff --git a/packages/docs/src/examples/list-item-groups/simple/multiple.vue b/packages/docs/src/examples/list-item-groups/simple/multiple.vue
new file mode 100644
index 00000000000..6e0dcaf7ba5
--- /dev/null
+++ b/packages/docs/src/examples/list-item-groups/simple/multiple.vue
@@ -0,0 +1,45 @@
+<template>
+ <v-card
+ class="mx-auto"
+ max-width="400"
+ >
+ <v-list>
+ <v-list-item-group v-model="model" multiple color="indigo">
+ <v-list-item
+ v-for="(item, i) in items"
+ :key="i"
+ >
+ <v-list-item-icon>
+ <v-icon v-text="item.icon"></v-icon>
+ </v-list-item-icon>
+
+ <v-list-item-content>
+ <v-list-item-title v-text="item.text"></v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
+ </v-list-item-group>
+ </v-list>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ items: [
+ {
+ icon: 'mdi-wifi',
+ text: 'Wifi',
+ },
+ {
+ icon: 'mdi-bluetooth',
+ text: 'Bluetooth',
+ },
+ {
+ icon: 'mdi-chart-donut',
+ text: 'Data Usage',
+ },
+ ],
+ model: 1,
+ }),
+ }
+</script>
diff --git a/packages/docs/src/lang/en/components/ListItemGroups.json b/packages/docs/src/lang/en/components/ListItemGroups.json
index 417a18f03fc..d4bff21520c 100644
--- a/packages/docs/src/lang/en/components/ListItemGroups.json
+++ b/packages/docs/src/lang/en/components/ListItemGroups.json
@@ -6,12 +6,24 @@
"desc": "By default, the `v-list-item-group` operates similarly to `v-item-group`. If a **value** is not provided, the group will provide a default based upon its index."
},
"selection-controls": {
- "header": "Selection controls",
+ "header": "### Selection controls",
"desc": "Using a default scoped slot, you can access an items internal state and toggle it. Since the **active** property is a _boolean_, we use the **true-value** prop on the checkbox to link its state to the `v-list-item`."
},
"flat": {
- "header": "De-emphasized selections",
+ "header": "### De-emphasized selections",
"desc": "You can easily disable the default highlighting of selected `v-list-item`s. This creates a lower profile for a user's choices."
+ },
+ "multiple": {
+ "header": "### Select multiple items",
+ "desc": "You can select multiple items at one time."
+ },
+ "mandatory": {
+ "header": "### Mandatory",
+ "desc": "At least one item must be selected."
+ },
+ "active-class": {
+ "header": "### Custom active class",
+ "desc": "You can set class which will be added when item is selected."
}
}
}
|
9969ebb8b1cbba528c13ca075917c5b32f7ed5a5
|
2024-07-17 00:19:33
|
Ryou1127
|
fix(VBtn): allow stacked and block props to work together (#20162)
| false
|
allow stacked and block props to work together (#20162)
|
fix
|
diff --git a/packages/vuetify/src/components/VBtn/VBtn.sass b/packages/vuetify/src/components/VBtn/VBtn.sass
index 8ed3b7b0f7f..3acf7c34624 100644
--- a/packages/vuetify/src/components/VBtn/VBtn.sass
+++ b/packages/vuetify/src/components/VBtn/VBtn.sass
@@ -168,6 +168,9 @@
.v-icon
--v-icon-size-multiplier: #{calc(24/21)}
+ &.v-btn--block
+ min-width: 100%
+
.v-btn__loader
align-items: center
display: flex
|
a30b1993071660089ba13992dd363e10bd7dae4f
|
2019-07-26 23:33:02
|
Andrew Henry
|
docs(Grids): fix playground example
| false
|
fix playground example
|
docs
|
diff --git a/packages/docs/src/examples/grids/playground.vue b/packages/docs/src/examples/grids/playground.vue
index b2dfd2e5231..5ba237a219b 100644
--- a/packages/docs/src/examples/grids/playground.vue
+++ b/packages/docs/src/examples/grids/playground.vue
@@ -82,9 +82,9 @@
computed: {
layoutAttributes () {
return {
- [this.alignment]: true,
- [this.justify]: true,
- [this.flexDirection]: true,
+ [this.alignment]: Number.isNaN(+this.alignment),
+ [this.justify]: Number.isNaN(+this.justify),
+ [this.flexDirection]: Number.isNaN(+this.flexDirection),
reverse: this.reverse,
'fill-height': this.fillHeight,
}
|
cc30e17c873789da35105fb6c4afb186add55a61
|
2019-04-16 21:17:06
|
Lilian Chrétienne
|
docs(VCalendar): change the color of the elements inside v-slot:day (#7007)
| false
|
change the color of the elements inside v-slot:day (#7007)
|
docs
|
diff --git a/packages/docs/src/examples/calendars/features.vue b/packages/docs/src/examples/calendars/features.vue
index b2caae98c6d..bb050acf794 100644
--- a/packages/docs/src/examples/calendars/features.vue
+++ b/packages/docs/src/examples/calendars/features.vue
@@ -234,12 +234,13 @@
:color="color"
>
<template v-slot:day="day">
- <div
+ <v-sheet
v-if="day.day % 3 === 0"
- class="day"
+ :color="color"
+ class="white--text pa-1"
>
day slot {{ day.date }}
- </div>
+ </v-sheet>
</template>
<template v-slot:header="day">
<div
|
f7b17e78b66420046382b8ad8a64b2ee7b0bcf7d
|
2018-10-10 02:27:14
|
John Leider
|
fix(v-stepper): add registrable mixin
| false
|
add registrable mixin
|
fix
|
diff --git a/src/components/VStepper/VStepper.js b/src/components/VStepper/VStepper.js
index 8efab363590..5d67fd189c2 100644
--- a/src/components/VStepper/VStepper.js
+++ b/src/components/VStepper/VStepper.js
@@ -1,12 +1,18 @@
+// Styles
import '../../stylus/components/_steppers.styl'
+// Mixins
+import { provide as RegistrableProvide } from '../../mixins/registrable'
import Themeable from '../../mixins/themeable'
/* @vue/component */
export default {
name: 'v-stepper',
- mixins: [Themeable],
+ mixins: [
+ RegistrableProvide('stepper'),
+ Themeable
+ ],
provide () {
return {
@@ -59,29 +65,29 @@ export default {
prev && (this.isBooted = true)
},
value () {
- this.getSteps()
this.$nextTick(() => (this.inputValue = this.value))
}
},
mounted () {
- this.getSteps()
-
this.inputValue = this.value || this.steps[0].step || 1
},
methods: {
- getSteps () {
- this.steps = []
- this.content = []
- for (let index = 0; index < this.$children.length; index++) {
- const child = this.$children[index]
- if (child.$options.name === 'v-stepper-step') {
- this.steps.push(child)
- } else if (child.$options.name === 'v-stepper-content') {
- child.isVertical = this.vertical
- this.content.push(child)
- }
+ register (item) {
+ if (item.$options.name === 'v-stepper-step') {
+ this.steps.push(item)
+ } else if (item.$options.name === 'v-stepper-content') {
+ item.isVertical = this.vertical
+ this.content.push(item)
+ }
+ },
+ unregister (item) {
+ if (item.$options.name === 'v-stepper-step') {
+ this.steps = this.steps.filter(i => i !== item)
+ } else if (item.$options.name === 'v-stepper-content') {
+ item.isVertical = this.vertical
+ this.content = this.content.filter(i => i !== item)
}
},
stepClick (step) {
diff --git a/src/components/VStepper/VStepperContent.js b/src/components/VStepper/VStepperContent.js
index 8fc77ed2d2b..4913803d0ce 100644
--- a/src/components/VStepper/VStepperContent.js
+++ b/src/components/VStepper/VStepperContent.js
@@ -1,8 +1,12 @@
+// Components
import {
VTabTransition,
VTabReverseTransition
} from '../transitions'
+// Mixins
+import { inject as RegistrableInject } from '../../mixins/registrable'
+
// Helpers
import { convertToUnit } from '../../util/helpers'
@@ -10,6 +14,10 @@ import { convertToUnit } from '../../util/helpers'
export default {
name: 'v-stepper-content',
+ mixins: [
+ RegistrableInject('stepper', 'v-stepper-content', 'v-stepper')
+ ],
+
inject: {
isVerticalProvided: {
from: 'isVertical'
@@ -80,6 +88,7 @@ export default {
this.onTransition,
false
)
+ this.stepper && this.stepper.register(this)
},
beforeDestroy () {
@@ -88,6 +97,7 @@ export default {
this.onTransition,
false
)
+ this.stepper && this.stepper.unregister(this)
},
methods: {
diff --git a/src/components/VStepper/VStepperStep.js b/src/components/VStepper/VStepperStep.js
index 25cde7baebe..fd61d2105d9 100644
--- a/src/components/VStepper/VStepperStep.js
+++ b/src/components/VStepper/VStepperStep.js
@@ -3,6 +3,7 @@ import VIcon from '../VIcon'
// Mixins
import Colorable from '../../mixins/colorable'
+import { inject as RegistrableInject } from '../../mixins/registrable'
// Directives
import Ripple from '../../directives/ripple'
@@ -13,7 +14,10 @@ export default {
directives: { Ripple },
- mixins: [Colorable],
+ mixins: [
+ Colorable,
+ RegistrableInject('stepper', 'v-stepper-step', 'v-stepper')
+ ],
inject: ['stepClick'],
@@ -67,6 +71,14 @@ export default {
}
},
+ mounted () {
+ this.stepper && this.stepper.register(this)
+ },
+
+ beforeDestroy () {
+ this.stepper && this.stepper.unregister(this)
+ },
+
methods: {
click (e) {
e.stopPropagation()
diff --git a/test/unit/components/VStepper/VStepperContent.spec.js b/test/unit/components/VStepper/VStepperContent.spec.js
index 507123ebe3e..1aaa9349c94 100644
--- a/test/unit/components/VStepper/VStepperContent.spec.js
+++ b/test/unit/components/VStepper/VStepperContent.spec.js
@@ -5,6 +5,8 @@ import {
} from '@/components/transitions'
import VStepperContent from '@/components/VStepper/VStepperContent'
+const tip = '[Vuetify] The v-stepper-content component must be used inside a v-stepper'
+
test('VStepperContent.js', ({ mount }) => {
it('should set height to auto', async () => {
const wrapper = mount(VStepperContent, {
@@ -22,6 +24,7 @@ test('VStepperContent.js', ({ mount }) => {
await wrapper.vm.$nextTick()
expect(wrapper.vm.isActive).toBe(true)
expect(wrapper.vm.height).toBe('auto')
+ expect(tip).toHaveBeenTipped()
})
it('should use reverse transition', () => {
@@ -37,6 +40,7 @@ test('VStepperContent.js', ({ mount }) => {
wrapper.setData({ isReverse: true })
expect(wrapper.vm.computedTransition).toBe(VTabReverseTransition)
+ expect(tip).toHaveBeenTipped()
})
it('should accept a custom height', async () => {
@@ -83,6 +87,7 @@ test('VStepperContent.js', ({ mount }) => {
await wrapper.vm.$nextTick()
expect(enter.mock.calls.length).toBe(1)
expect(leave.mock.calls.length).toBe(1)
+ expect(tip).toHaveBeenTipped()
})
it('should toggle isActive state', () => {
@@ -107,6 +112,7 @@ test('VStepperContent.js', ({ mount }) => {
expect(wrapper.vm.isActive).toBe(false)
expect(wrapper.vm.isReverse).toBe(true)
+ expect(tip).toHaveBeenTipped()
})
it('should set height', async () => {
@@ -136,6 +142,7 @@ test('VStepperContent.js', ({ mount }) => {
await new Promise(resolve => setTimeout(resolve, 10))
expect(wrapper.vm.height).toBe(0)
+ expect(tip).toHaveBeenTipped()
})
it('should set height only if isActive', async () => {
@@ -161,6 +168,7 @@ test('VStepperContent.js', ({ mount }) => {
await new Promise(resolve => setTimeout(resolve, 450))
expect(wrapper.vm.height).toBe(0)
+ expect(tip).toHaveBeenTipped()
})
it('should reset height', async () => {
@@ -195,5 +203,6 @@ test('VStepperContent.js', ({ mount }) => {
expect(wrapper.vm.height).toBe('auto')
wrapper.destroy()
+ expect(tip).toHaveBeenTipped()
})
})
diff --git a/test/unit/components/VStepper/VStepperStep.spec.js b/test/unit/components/VStepper/VStepperStep.spec.js
index 559f76bbadf..6c243149945 100755
--- a/test/unit/components/VStepper/VStepperStep.spec.js
+++ b/test/unit/components/VStepper/VStepperStep.spec.js
@@ -1,6 +1,9 @@
import { test } from '@/test'
import VStepperStep from '@/components//VStepper/VStepperStep'
+const tip = '[Vuetify] The v-stepper-step component must be used inside a v-stepper'
+const warning = '[Vue warn]: Injection "stepClick" not found'
+
test('VStepperStep.js', ({ mount }) => {
it('should accept a custom color', async () => {
const wrapper = mount(VStepperStep, {
@@ -12,7 +15,8 @@ test('VStepperStep.js', ({ mount }) => {
})
expect(wrapper.html()).toMatchSnapshot()
- expect('[Vue warn]: Injection "stepClick" not found').toHaveBeenWarned()
+ expect(warning).toHaveBeenWarned()
+ expect(tip).toHaveBeenTipped()
})
it('should accept a custom css color', async () => {
@@ -25,6 +29,7 @@ test('VStepperStep.js', ({ mount }) => {
})
expect(wrapper.html()).toMatchSnapshot()
- expect('[Vue warn]: Injection "stepClick" not found').toHaveBeenWarned()
+ expect(warning).toHaveBeenWarned()
+ expect(tip).toHaveBeenTipped()
})
})
|
6e242cb37c02a83f9cb9c862ad40a595e612d027
|
2018-08-22 16:10:07
|
Kael
|
fix(VMenu, VDialog): allow content theme to be overridden
| false
|
allow content theme to be overridden
|
fix
|
diff --git a/src/components/VDialog/VDialog.js b/src/components/VDialog/VDialog.js
index fda2d841020..1993f010a5e 100644
--- a/src/components/VDialog/VDialog.js
+++ b/src/components/VDialog/VDialog.js
@@ -203,7 +203,7 @@ export default {
this.$createElement(SlotProvider, {
props: {
provide: {
- theme: { isDark: this.$vuetify.dark }
+ theme: { isDark: this.$vuetify.dark || this.dark }
}
}
}, this.showLazyContent(this.$slots.default))
diff --git a/src/components/VMenu/mixins/menu-generators.js b/src/components/VMenu/mixins/menu-generators.js
index cad99e0d075..37a02b8d3c3 100644
--- a/src/components/VMenu/mixins/menu-generators.js
+++ b/src/components/VMenu/mixins/menu-generators.js
@@ -84,7 +84,7 @@ export default {
this.$createElement(SlotProvider, {
props: {
provide: {
- theme: { isDark: this.$vuetify.dark }
+ theme: { isDark: this.$vuetify.dark || this.dark }
}
}
}, this.showLazyContent(this.$slots.default))
|
bc49c6ed83ea111a9ffc981b3859e8cc9f9743c6
|
2018-12-01 13:48:48
|
Jacek Karczmarczyk
|
refactor(VDatePicker): sort props
| false
|
sort props
|
refactor
|
diff --git a/packages/vuetify/src/components/VDatePicker/VDatePicker.js b/packages/vuetify/src/components/VDatePicker/VDatePicker.js
index 8391c68b383..c775efb3dfe 100644
--- a/packages/vuetify/src/components/VDatePicker/VDatePicker.js
+++ b/packages/vuetify/src/components/VDatePicker/VDatePicker.js
@@ -305,9 +305,9 @@ export default {
disabled: this.disabled,
readonly: this.readonly,
selectingYear: this.activePicker === 'YEAR',
- value: this.multiple ? this.value[0] : this.value,
year: this.formatters.year(`${this.inputYear}`),
- yearIcon: this.yearIcon
+ yearIcon: this.yearIcon,
+ value: this.multiple ? this.value[0] : this.value
},
slot: 'title',
on: {
|
cb7f42500680505efeb701a86e4becf5cef97dce
|
2023-01-11 00:04:41
|
John Leider
|
docs(flex): update examples to resolve console warnings
| false
|
update examples to resolve console warnings
|
docs
|
diff --git a/packages/docs/src/examples/flex/flex-align-self.vue b/packages/docs/src/examples/flex/flex-align-self.vue
index 8a1bb16c033..dafe42ffd51 100644
--- a/packages/docs/src/examples/flex/flex-align-self.vue
+++ b/packages/docs/src/examples/flex/flex-align-self.vue
@@ -1,57 +1,59 @@
<template>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- height="100"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 align-self-start">align-self-start</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <div>
+ <v-sheet
+ class="d-flex mb-6 bg-surface-variant"
+ height="100"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 align-self-start">align-self-start</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- height="100"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 align-self-end">align-self-end</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet
+ class="d-flex mb-6 bg-surface-variant"
+ height="100"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 align-self-end">align-self-end</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- height="100"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 align-self-center">align-self-center</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet
+ class="d-flex mb-6 bg-surface-variant"
+ height="100"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 align-self-center">align-self-center</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- height="100"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 align-self-baseline">align-self-baseline</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet
+ class="d-flex mb-6 bg-surface-variant"
+ height="100"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 align-self-baseline">align-self-baseline</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- height="100"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 align-self-auto">align-self-auto</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet
+ class="d-flex mb-6 bg-surface-variant"
+ height="100"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 align-self-auto">align-self-auto</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- height="100"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 align-self-stretch">align-self-stretch</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet
+ class="d-flex mb-6 bg-surface-variant"
+ height="100"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 align-self-stretch">align-self-stretch</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
+ </div>
</template>
<script>
diff --git a/packages/docs/src/examples/flex/flex-align.vue b/packages/docs/src/examples/flex/flex-align.vue
index 89f3ba92050..a9be4a6df59 100644
--- a/packages/docs/src/examples/flex/flex-align.vue
+++ b/packages/docs/src/examples/flex/flex-align.vue
@@ -1,66 +1,68 @@
<template>
- <v-sheet
- class="d-flex align-start mb-6 bg-surface-variant"
- height="100"
- >
+ <div>
<v-sheet
- v-for="n in 3"
- :key="n"
- class="ma-2 pa-2"
+ class="d-flex align-start mb-6 bg-surface-variant"
+ height="100"
>
- align-start
+ <v-sheet
+ v-for="n in 3"
+ :key="n"
+ class="ma-2 pa-2"
+ >
+ align-start
+ </v-sheet>
</v-sheet>
- </v-sheet>
- <v-sheet
- class="d-flex align-end mb-6 bg-surface-variant"
- height="100"
- >
<v-sheet
- v-for="n in 3"
- :key="n"
- class="ma-2 pa-2"
+ class="d-flex align-end mb-6 bg-surface-variant"
+ height="100"
>
- align-end
+ <v-sheet
+ v-for="n in 3"
+ :key="n"
+ class="ma-2 pa-2"
+ >
+ align-end
+ </v-sheet>
</v-sheet>
- </v-sheet>
- <v-sheet
- class="d-flex align-center mb-6 bg-surface-variant"
- height="100"
- >
<v-sheet
- v-for="n in 3"
- :key="n"
- class="ma-2 pa-2"
+ class="d-flex align-center mb-6 bg-surface-variant"
+ height="100"
>
- align-center
+ <v-sheet
+ v-for="n in 3"
+ :key="n"
+ class="ma-2 pa-2"
+ >
+ align-center
+ </v-sheet>
</v-sheet>
- </v-sheet>
- <v-sheet
- class="d-flex align-baseline mb-6 bg-surface-variant"
- height="100"
- >
<v-sheet
- v-for="n in 3"
- :key="n"
- class="ma-2 pa-2"
+ class="d-flex align-baseline mb-6 bg-surface-variant"
+ height="100"
>
- align-baseline
+ <v-sheet
+ v-for="n in 3"
+ :key="n"
+ class="ma-2 pa-2"
+ >
+ align-baseline
+ </v-sheet>
</v-sheet>
- </v-sheet>
- <v-sheet
- class="d-flex align-stretch mb-6 bg-surface-variant"
- height="100"
- >
<v-sheet
- v-for="n in 3"
- :key="n"
- class="ma-2 pa-2"
+ class="d-flex align-stretch mb-6 bg-surface-variant"
+ height="100"
>
- align-stretch
+ <v-sheet
+ v-for="n in 3"
+ :key="n"
+ class="ma-2 pa-2"
+ >
+ align-stretch
+ </v-sheet>
</v-sheet>
- </v-sheet>
+ </div>
</template>
diff --git a/packages/docs/src/examples/flex/flex-column.vue b/packages/docs/src/examples/flex/flex-column.vue
index 13845bfa1d4..62f9dc06989 100644
--- a/packages/docs/src/examples/flex/flex-column.vue
+++ b/packages/docs/src/examples/flex/flex-column.vue
@@ -1,16 +1,15 @@
<template>
- <div
- class="d-flex flex-column mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
- </div>
- <div
- class="d-flex flex-column-reverse mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
+ <div>
+ <div class="d-flex flex-column mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
+ </div>
+
+ <div class="d-flex flex-column-reverse mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
+ </div>
</div>
</template>
diff --git a/packages/docs/src/examples/flex/flex-direction.vue b/packages/docs/src/examples/flex/flex-direction.vue
index 25ed4149f5c..14c326db7d5 100644
--- a/packages/docs/src/examples/flex/flex-direction.vue
+++ b/packages/docs/src/examples/flex/flex-direction.vue
@@ -1,16 +1,15 @@
<template>
- <div
- class="d-flex flex-row mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
- </div>
- <div
- class="d-flex flex-row-reverse mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
+ <div>
+ <div class="d-flex flex-row mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
+ </div>
+
+ <div class="d-flex flex-row-reverse mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2">Flex item 1</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 2</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item 3</v-sheet>
+ </div>
</div>
</template>
diff --git a/packages/docs/src/examples/flex/flex-justify.vue b/packages/docs/src/examples/flex/flex-justify.vue
index e24f5cb42b4..94379a6a7ee 100644
--- a/packages/docs/src/examples/flex/flex-justify.vue
+++ b/packages/docs/src/examples/flex/flex-justify.vue
@@ -1,8 +1,6 @@
<template>
<div>
- <div
- class="d-flex justify-start mb-6 bg-surface-variant"
- >
+ <div class="d-flex justify-start mb-6 bg-surface-variant">
<v-sheet
v-for="n in 3"
:key="n"
@@ -12,9 +10,7 @@
</v-sheet>
</div>
- <div
- class="d-flex justify-end mb-6 bg-surface-variant"
- >
+ <div class="d-flex justify-end mb-6 bg-surface-variant">
<v-sheet
v-for="n in 3"
:key="n"
@@ -24,9 +20,7 @@
</v-sheet>
</div>
- <div
- class="d-flex justify-center mb-6 bg-surface-variant"
- >
+ <div class="d-flex justify-center mb-6 bg-surface-variant">
<v-sheet
v-for="n in 3"
:key="n"
@@ -36,9 +30,7 @@
</v-sheet>
</div>
- <div
- class="d-flex justify-space-between mb-6 bg-surface-variant"
- >
+ <div class="d-flex justify-space-between mb-6 bg-surface-variant">
<v-sheet
v-for="n in 3"
:key="n"
@@ -48,9 +40,7 @@
</v-sheet>
</div>
- <div
- class="d-flex justify-space-around mb-6 bg-surface-variant"
- >
+ <div class="d-flex justify-space-around mb-6 bg-surface-variant">
<v-sheet
v-for="n in 3"
:key="n"
diff --git a/packages/docs/src/examples/flex/flex-order.vue b/packages/docs/src/examples/flex/flex-order.vue
index fb3567cfe03..6f2e66cf972 100644
--- a/packages/docs/src/examples/flex/flex-order.vue
+++ b/packages/docs/src/examples/flex/flex-order.vue
@@ -1,13 +1,13 @@
<template>
- <v-sheet
- class="d-flex flex-wrap-reverse bg-surface-variant"
- >
+ <v-sheet class="d-flex flex-wrap-reverse bg-surface-variant">
<v-sheet class="order-3 pa-2 ma-2">
First flex item
</v-sheet>
+
<v-sheet class="order-2 pa-2 ma-2">
Second flex item
</v-sheet>
+
<v-sheet class="order-1 pa-2 ma-2">
Third flex item
</v-sheet>
diff --git a/packages/docs/src/examples/flex/flex-wrap-reverse.vue b/packages/docs/src/examples/flex/flex-wrap-reverse.vue
index b460aa48856..531c1157889 100644
--- a/packages/docs/src/examples/flex/flex-wrap-reverse.vue
+++ b/packages/docs/src/examples/flex/flex-wrap-reverse.vue
@@ -1,7 +1,5 @@
<template>
- <v-sheet
- class="d-flex flex-wrap-reverse bg-surface-variant"
- >
+ <v-sheet class="d-flex flex-wrap-reverse bg-surface-variant">
<v-sheet
v-for="n in 20"
:key="n"
diff --git a/packages/docs/src/examples/flex/flex-wrap.vue b/packages/docs/src/examples/flex/flex-wrap.vue
index e086bcffa32..4b41ab1538c 100644
--- a/packages/docs/src/examples/flex/flex-wrap.vue
+++ b/packages/docs/src/examples/flex/flex-wrap.vue
@@ -1,7 +1,5 @@
<template>
- <v-sheet
- class="d-flex flex-wrap bg-surface-variant"
- >
+ <v-sheet class="d-flex flex-wrap bg-surface-variant">
<v-sheet
v-for="n in 20"
:key="n"
diff --git a/packages/docs/src/examples/flex/flexbox-inline.vue b/packages/docs/src/examples/flex/flexbox-inline.vue
index 50f55cc5b26..04474a97073 100644
--- a/packages/docs/src/examples/flex/flexbox-inline.vue
+++ b/packages/docs/src/examples/flex/flexbox-inline.vue
@@ -1,7 +1,5 @@
<template>
- <v-sheet
- class="d-inline-flex bg-surface-variant"
- >
+ <v-sheet class="d-inline-flex bg-surface-variant">
<v-sheet class="ma-2 pa-2">
I'm a single element in an inline flexbox container!
</v-sheet>
diff --git a/packages/docs/src/examples/flex/flexbox.vue b/packages/docs/src/examples/flex/flexbox.vue
index a47f588a285..c16949bec74 100644
--- a/packages/docs/src/examples/flex/flexbox.vue
+++ b/packages/docs/src/examples/flex/flexbox.vue
@@ -1,7 +1,5 @@
<template>
- <v-sheet
- class="d-flex bg-surface-variant"
- >
+ <v-sheet class="d-flex bg-surface-variant">
<v-sheet class="ma-2 pa-2">
I'm a single element in a flexbox container!
</v-sheet>
diff --git a/packages/docs/src/examples/flex/grow-shrink.vue b/packages/docs/src/examples/flex/grow-shrink.vue
index 0baa819f68f..6d2f19a29d8 100644
--- a/packages/docs/src/examples/flex/grow-shrink.vue
+++ b/packages/docs/src/examples/flex/grow-shrink.vue
@@ -12,6 +12,7 @@
I'm 2 column wide
</v-sheet>
</v-col>
+
<v-col
cols="1"
style="min-width: 100px; max-width: 100%;"
@@ -21,6 +22,7 @@
I'm 1 column wide and I grow to take all the space
</v-sheet>
</v-col>
+
<v-col
cols="5"
style="min-width: 100px;"
diff --git a/packages/docs/src/examples/flex/margins-align-items.vue b/packages/docs/src/examples/flex/margins-align-items.vue
index 0fd4c1f8891..8ba24b6fe9c 100644
--- a/packages/docs/src/examples/flex/margins-align-items.vue
+++ b/packages/docs/src/examples/flex/margins-align-items.vue
@@ -1,19 +1,21 @@
<template>
- <v-sheet
- class="d-flex align-start flex-column mb-6 bg-surface-variant"
- height="200"
- >
- <v-sheet class="ma-2 pa-2 mb-auto">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <div>
+ <v-sheet
+ class="d-flex align-start flex-column mb-6 bg-surface-variant"
+ height="200"
+ >
+ <v-sheet class="ma-2 pa-2 mb-auto">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex align-end flex-column bg-surface-variant"
- height="200"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2 mt-auto">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet
+ class="d-flex align-end flex-column bg-surface-variant"
+ height="200"
+ >
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2 mt-auto">Flex item</v-sheet>
+ </v-sheet>
+ </div>
</template>
diff --git a/packages/docs/src/examples/flex/margins.vue b/packages/docs/src/examples/flex/margins.vue
index 0af6b6a532a..6f14ab386c8 100644
--- a/packages/docs/src/examples/flex/margins.vue
+++ b/packages/docs/src/examples/flex/margins.vue
@@ -1,25 +1,21 @@
<template>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <div>
+ <v-sheet class="d-flex mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2 mr-auto">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet class="d-flex mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2 mr-auto">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
- <v-sheet
- class="d-flex mb-6 bg-surface-variant"
- >
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
- </v-sheet>
+ <v-sheet class="d-flex mb-6 bg-surface-variant">
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ <v-sheet class="ma-2 pa-2">Flex item</v-sheet>
+ </v-sheet>
+ </div>
</template>
|
f200334c8848c56b450e8948f07783ce4a2510bf
|
2023-01-13 18:51:52
|
Lorand Horvath
|
docs(border-radius): Fix typo infix class (#16426)
| false
|
Fix typo infix class (#16426)
|
docs
|
diff --git a/packages/docs/src/pages/en/styles/border-radius.md b/packages/docs/src/pages/en/styles/border-radius.md
index 12dd9d4f5f7..12cedd6971d 100644
--- a/packages/docs/src/pages/en/styles/border-radius.md
+++ b/packages/docs/src/pages/en/styles/border-radius.md
@@ -74,7 +74,7 @@ You can create pills with the `.rounded-pill` class and circles with the `.round
#### Rounding by side
-Border radius is configurable on a per-side basis using the infix classes `-t`, `-e`, `-b`, and `-s` (corresponding respectively to the sides **top**, **end**, **bottom** and **left**).
+Border radius is configurable on a per-side basis using the infix classes `-t`, `-e`, `-b`, and `-s` (corresponding respectively to the sides **top**, **end**, **bottom** and **start**).
E.g. `.rounded-b-xl` and `.rounded-t`.
@@ -84,12 +84,12 @@ E.g. `.rounded-b-xl` and `.rounded-t`.
Border radius is configurable on a per-corner basis using the infix classes, `-ts`, `-te`, `-be`, `-bs` (corresponding respectively to the corners **top-start**, **top-end**, **bottom-end**, **bottom-start**)
-E.g. `.rounded-br-xl` and `.rounded-tr`.
+E.g. `.rounded-be-xl` and `.rounded-te`.
<example file="border-radius/misc-rounding-by-corner" />
#### Removing Border Radius
-Use the `.rounded-0` helper class to remove all border radius on an element, or select by side or corner; e.g. `.rounded-l-0` and `.rounded-te-0`.
+Use the `.rounded-0` helper class to remove all border radius on an element, or select by side or corner; e.g. `.rounded-s-0` and `.rounded-te-0`.
<example file="border-radius/misc-removing-border-radius" />
|
5703a6c8a0b95a7a0567576ac3d0f0d980a0079e
|
2024-05-21 17:59:53
|
Yuchao
|
fix(VAutocomplete/VCombobox): remove tab key listener (#19846)
| false
|
remove tab key listener (#19846)
|
fix
|
diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
index 6491ece4401..b111a890618 100644
--- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
@@ -238,7 +238,7 @@ export const VAutocomplete = genericComponent<new <
menu.value = false
}
- if (highlightFirst.value && ['Enter', 'Tab'].includes(e.key)) {
+ if (highlightFirst.value && e.key === 'Enter') {
select(displayItems.value[0])
}
diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.tsx b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
index cd3225f795e..cff4ae00550 100644
--- a/packages/vuetify/src/components/VCombobox/VCombobox.tsx
+++ b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
@@ -290,8 +290,8 @@ export const VCombobox = genericComponent<new <
menu.value = false
}
- if (['Enter', 'Escape', 'Tab'].includes(e.key)) {
- if (highlightFirst.value && ['Enter', 'Tab'].includes(e.key)) {
+ if (['Enter', 'Escape'].includes(e.key)) {
+ if (highlightFirst.value && e.key === 'Enter') {
select(filteredItems.value[0])
}
|
63955b6b39b0c9dea11451e26d95b539dfe78469
|
2024-03-25 22:58:17
|
John Leider
|
chore(package.json): update @vuetify/one
| false
|
update @vuetify/one
|
chore
|
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 7b6a5370bb2..b6c68468db1 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -23,7 +23,7 @@
"@cosmicjs/sdk": "^1.0.11",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
- "@vuetify/one": "^1.5.0",
+ "@vuetify/one": "^1.5.1",
"algoliasearch": "^4.20.0",
"fflate": "^0.8.1",
"isomorphic-fetch": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index ff1736f9542..1ec8f34ce8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3949,10 +3949,10 @@
find-cache-dir "^3.3.2"
upath "^2.0.1"
-"@vuetify/one@^1.5.0":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/@vuetify/one/-/one-1.5.0.tgz#c76df35ca8ec7fb55abedfe9d1523fc58d3d5ad5"
- integrity sha512-nuMPMnMcR87FkbhC8NW0B0fI0S57LXkR6/Zy3dxPGMOoSZ2L5BFk2BYq2fUJ5xtUnghA9SRUcagT6XXLG1mlwA==
+"@vuetify/one@^1.5.1":
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/@vuetify/one/-/one-1.5.1.tgz#e97f1d4515641615c75d2fb4f32b358b1a45adcd"
+ integrity sha512-sWBa8KcuM8MXqxj2FV5OBYSUM/Rgob7Vyvz3TosSanmrfGjPJRnVh8HyE/6hcfpMNFwVYHEBKls6Hc5FlcGdZw==
"@vueuse/head@^1.3.1":
version "1.3.1"
|
cf2234ee6d8b2e0fa1488bd3b9f7e7f5c0dbad56
|
2022-10-18 11:34:43
|
Jacek Karczmarczyk
|
fix(VImg): missing emit typings (#15917)
| false
|
missing emit typings (#15917)
|
fix
|
diff --git a/packages/vuetify/src/components/VImg/VImg.tsx b/packages/vuetify/src/components/VImg/VImg.tsx
index 36f078ec41d..fe5b38eef6f 100644
--- a/packages/vuetify/src/components/VImg/VImg.tsx
+++ b/packages/vuetify/src/components/VImg/VImg.tsx
@@ -70,7 +70,11 @@ export const VImg = defineComponent({
...makeTransitionProps(),
},
- emits: ['loadstart', 'load', 'error'],
+ emits: {
+ loadstart: (event: string | undefined) => true,
+ load: (event: string | undefined) => true,
+ error: (event: string | undefined) => true,
+ },
setup (props, { emit, slots }) {
const currentSrc = ref('') // Set from srcset
|
86e3294534f65030b0cf3ecd2d41cd682ec11b97
|
2020-12-24 02:41:24
|
amajesticpotatoe
|
docs(usage): fix color in v-sheet
| false
|
fix color in v-sheet
|
docs
|
diff --git a/packages/docs/src/examples/v-sheet/usage.vue b/packages/docs/src/examples/v-sheet/usage.vue
index 8d4d815badf..ff2b9b9e2e3 100644
--- a/packages/docs/src/examples/v-sheet/usage.vue
+++ b/packages/docs/src/examples/v-sheet/usage.vue
@@ -26,7 +26,7 @@
selects: {
color: [
'white',
- 'gray darken-2',
+ 'grey darken-2',
'warning',
'error',
'success',
|
c88997356cb5dda6974f81c0843b7ad3f1cdad9d
|
2019-01-14 01:26:56
|
John Leider
|
feat(VAlert): refactor for v2 (#6107)
| false
|
refactor for v2 (#6107)
|
feat
|
diff --git a/packages/docs/src/data/deprecated.json b/packages/docs/src/data/deprecated.json
index 57e302b7d5c..9a3d4cc027a 100644
--- a/packages/docs/src/data/deprecated.json
+++ b/packages/docs/src/data/deprecated.json
@@ -1,68 +1,71 @@
-{
- "props": {
- "v-text-field": {
- "textarea": "1.1"
- },
- "v-select": {
- "autocomplete": "1.1",
- "combobox": "1.1",
- "tags": "1.1",
- "editable": "1.1",
- "overflow": "1.1",
- "segmented": "1.1",
- "multi-line": "1.1"
- },
- "v-breadcrumbs": {
- "justify-center": "1.2",
- "justify-end": "1.2"
- },
- "v-autocomplete": {
- "activator": false,
- "closeOnClick": false,
- "closeOnContentClick": false,
- "combobox": false,
- "delimiters": false,
- "nudgeBottom": false,
- "nudgeLeft": false,
- "nudgeRight": false,
- "nudgeTop": false,
- "nudgeWidth": false,
- "offsetX": false,
- "offsetY": false,
- "transition": false
- },
- "v-combobox": {
- "activator": false,
- "closeOnClick": false,
- "closeOnContentClick": false,
- "combobox": false,
- "delimiters": false,
- "nudgeBottom": false,
- "nudgeLeft": false,
- "nudgeRight": false,
- "nudgeTop": false,
- "nudgeWidth": false,
- "offsetX": false,
- "offsetY": false,
- "transition": false
- },
- "v-overflow-btn": {
- "activator": false,
- "closeOnClick": false,
- "closeOnContentClick": false,
- "combobox": false,
- "delimiters": false,
- "nudgeBottom": false,
- "nudgeLeft": false,
- "nudgeRight": false,
- "nudgeTop": false,
- "nudgeWidth": false,
- "offsetX": false,
- "offsetY": false,
- "transition": false
- },
- "v-input": {
- "append-icon-cb": false
- }
- }
-}
+{
+ "props": {
+ "v-alert": {
+ "outline": "2.0"
+ },
+ "v-text-field": {
+ "textarea": "1.1"
+ },
+ "v-select": {
+ "autocomplete": "1.1",
+ "combobox": "1.1",
+ "tags": "1.1",
+ "editable": "1.1",
+ "overflow": "1.1",
+ "segmented": "1.1",
+ "multi-line": "1.1"
+ },
+ "v-breadcrumbs": {
+ "justify-center": "1.2",
+ "justify-end": "1.2"
+ },
+ "v-autocomplete": {
+ "activator": false,
+ "closeOnClick": false,
+ "closeOnContentClick": false,
+ "combobox": false,
+ "delimiters": false,
+ "nudgeBottom": false,
+ "nudgeLeft": false,
+ "nudgeRight": false,
+ "nudgeTop": false,
+ "nudgeWidth": false,
+ "offsetX": false,
+ "offsetY": false,
+ "transition": false
+ },
+ "v-combobox": {
+ "activator": false,
+ "closeOnClick": false,
+ "closeOnContentClick": false,
+ "combobox": false,
+ "delimiters": false,
+ "nudgeBottom": false,
+ "nudgeLeft": false,
+ "nudgeRight": false,
+ "nudgeTop": false,
+ "nudgeWidth": false,
+ "offsetX": false,
+ "offsetY": false,
+ "transition": false
+ },
+ "v-overflow-btn": {
+ "activator": false,
+ "closeOnClick": false,
+ "closeOnContentClick": false,
+ "combobox": false,
+ "delimiters": false,
+ "nudgeBottom": false,
+ "nudgeLeft": false,
+ "nudgeRight": false,
+ "nudgeTop": false,
+ "nudgeWidth": false,
+ "offsetX": false,
+ "offsetY": false,
+ "transition": false
+ },
+ "v-input": {
+ "append-icon-cb": false
+ }
+ }
+}
diff --git a/packages/docs/src/examples/alerts/closable.vue b/packages/docs/src/examples/alerts/closable.vue
index 0e789eac1d0..212d7cc0c8f 100644
--- a/packages/docs/src/examples/alerts/closable.vue
+++ b/packages/docs/src/examples/alerts/closable.vue
@@ -3,9 +3,15 @@
<v-alert
v-model="alert"
dismissible
- type="success"
+ color="cyan"
+ border="left"
+ elevation="1"
+ colored-border
+ icon="mdi-twitter"
>
- This is a success alert that is closable.
+ Phasellus tempus. Fusce ac felis sit amet ligula pharetra condimentum. In dui magna, posuere eget, vestibulum et, tempor auctor, justo. Pellentesque posuere. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo.
+
+ Phasellus nec sem in justo pellentesque facilisis. Phasellus magna. Cras risus ipsum, faucibus ut, ullamcorper id, varius ac, leo. In hac habitasse platea dictumst. Praesent turpis.
</v-alert>
<div class="text-xs-center">
diff --git a/packages/docs/src/examples/alerts/icon.vue b/packages/docs/src/examples/alerts/icon.vue
index b96004198c7..8a65da28362 100644
--- a/packages/docs/src/examples/alerts/icon.vue
+++ b/packages/docs/src/examples/alerts/icon.vue
@@ -1,16 +1,16 @@
<template>
<div>
<v-alert
- :value="true"
- color="success"
+ type="info"
icon="new_releases"
+ prominent
>
- This is a success alert with a custom icon.
+ This is an info alert with a custom icon.
</v-alert>
<v-alert
- :value="true"
- color="error"
+ type="error"
+ dense
>
This is an error alert with no icon.
</v-alert>
diff --git a/packages/docs/src/examples/alerts/outline.vue b/packages/docs/src/examples/alerts/outline.vue
index c5b4dbbde9e..aa52a51d172 100644
--- a/packages/docs/src/examples/alerts/outline.vue
+++ b/packages/docs/src/examples/alerts/outline.vue
@@ -1,37 +1,32 @@
<template>
<div>
<v-alert
- :value="true"
- color="success"
- icon="check_circle"
- outline
+ type="success"
+ outlined
+ dense
>
This is a success alert.
</v-alert>
<v-alert
- :value="true"
- color="info"
- icon="info"
- outline
+ type="info"
+ outlined
>
This is an info alert.
</v-alert>
<v-alert
- :value="true"
- color="warning"
- icon="priority_high"
- outline
+ type="warning"
+ outlined
+ prominent
>
This is a warning alert.
</v-alert>
<v-alert
- :value="true"
- color="error"
- icon="warning"
- outline
+ type="error"
+ outlined
+ dismissible
>
This is a error alert.
</v-alert>
diff --git a/packages/docs/src/examples/alerts/transition.vue b/packages/docs/src/examples/alerts/transition.vue
index d754db3444a..7f36640c745 100644
--- a/packages/docs/src/examples/alerts/transition.vue
+++ b/packages/docs/src/examples/alerts/transition.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div class="text-xs-center">
+ <div class="text-xs-center mb-3">
<v-btn
color="primary"
@click="alert = !alert"
@@ -10,10 +10,15 @@
</div>
<v-alert
:value="alert"
- type="success"
+ color="pink"
+ dark
+ border="top"
+ icon="mdi-home"
transition="scale-transition"
>
- This is a success alert.
+ Phasellus tempus. Fusce ac felis sit amet ligula pharetra condimentum. In dui magna, posuere eget, vestibulum et, tempor auctor, justo. Pellentesque posuere. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo.
+
+ Phasellus nec sem in justo pellentesque facilisis. Phasellus magna. Cras risus ipsum, faucibus ut, ullamcorper id, varius ac, leo. In hac habitasse platea dictumst. Praesent turpis.
</v-alert>
</div>
</template>
diff --git a/packages/docs/src/examples/alerts/usage.vue b/packages/docs/src/examples/alerts/usage.vue
index dab3e295349..44015f5189a 100644
--- a/packages/docs/src/examples/alerts/usage.vue
+++ b/packages/docs/src/examples/alerts/usage.vue
@@ -1,31 +1,133 @@
<template>
- <div>
+ <div class="grey lighten-5 pa-3">
<v-alert
- :value="true"
- type="success"
+ v-model="show"
+ v-bind="localAttrs"
+ :dismissible="dismissible"
+ :type="type"
+ class="mb-3"
>
- This is a success alert.
+ This is a {{ type }} alert.
</v-alert>
-
- <v-alert
- :value="true"
- type="info"
- >
- This is a info alert.
- </v-alert>
-
- <v-alert
- :value="true"
- type="warning"
+ <div class="text-xs-center">
+ <v-btn
+ v-if="!show"
+ color="primary"
+ height="56"
+ @click="show = true"
+ >
+ Toggle
+ </v-btn>
+ </div>
+ <v-layout
+ align-center
+ justify-center
>
- This is a warning alert.
- </v-alert>
-
- <v-alert
- :value="true"
- type="error"
- >
- This is a error alert.
- </v-alert>
+ <v-flex
+ xs12
+ md8
+ >
+ <v-select
+ v-model="variant"
+ :items="items"
+ clearable
+ label="Variant"
+ ></v-select>
+ <v-radio-group
+ v-model="type"
+ label="Type"
+ row
+ >
+ <v-radio
+ color="success"
+ label="Success"
+ value="success"
+ ></v-radio>
+ <v-radio
+ color="info"
+ label="Info"
+ value="info"
+ ></v-radio>
+ <v-radio
+ color="warning"
+ label="Warning"
+ value="warning"
+ ></v-radio>
+ <v-radio
+ color="error"
+ label="Error"
+ value="error"
+ ></v-radio>
+ </v-radio-group>
+ <template v-if="variant === 'border'">
+ <v-radio-group
+ v-model="border"
+ label="Border Location"
+ row
+ >
+ <v-radio
+ label="Top"
+ value="top"
+ ></v-radio>
+ <v-radio
+ label="Right"
+ value="right"
+ ></v-radio>
+ <v-radio
+ label="Bottom"
+ value="bottom"
+ ></v-radio>
+ <v-radio
+ label="Left"
+ value="left"
+ ></v-radio>
+ </v-radio-group>
+ <v-checkbox
+ v-model="coloredBorder"
+ hide-details
+ label="Colored Border"
+ ></v-checkbox>
+ <v-checkbox
+ v-model="dismissible"
+ hide-details
+ label="Dismissible"
+ ></v-checkbox>
+ </template>
+ </v-flex>
+ </v-layout>
</div>
</template>
+
+<script>
+ export default {
+ data: () => ({
+ border: 'left',
+ coloredBorder: false,
+ dismissible: false,
+ items: [
+ 'border',
+ 'outlined',
+ 'dense',
+ 'prominent'
+ ],
+ show: true,
+ type: 'success',
+ variant: null
+ }),
+
+ computed: {
+ localAttrs () {
+ const attrs = {}
+
+ if (this.variant === 'border') {
+ attrs.border = this.border
+ attrs.coloredBorder = this.coloredBorder
+ } else {
+ attrs[this.variant] = true
+ }
+
+ return attrs
+ }
+ }
+ }
+</script>
diff --git a/packages/docs/src/lang/en/components/Alerts.json b/packages/docs/src/lang/en/components/Alerts.json
index e998647833e..cf236b4cd4a 100644
--- a/packages/docs/src/lang/en/components/Alerts.json
+++ b/packages/docs/src/lang/en/components/Alerts.json
@@ -23,9 +23,15 @@
}
},
"props": {
+ "border": "Puts a border on the element. Accepts **top** | **right** | **bottom** | **left**",
+ "coloredBorder": "Swap color from the background to the border for an alternative border look",
+ "closeLabel": "Text used for *aria-label* on **dismissible** alerts",
+ "dense": "Hides icon for a more simplistic alert",
"dismissible": "Specifies that the Alert can be closed",
"icon": "Designates a specific icon",
"outline": "Alert will have an outline",
+ "outlined": "Alert will have an outline",
+ "prominent": "Displays a larger vertically centered icon to draw more attention",
"type": "Specify a **success**, **info**, **warning** or **error** alert. Uses the contextual color and a pre-defined icon."
}
}
diff --git a/packages/docs/src/lang/en/components/Sparklines.json b/packages/docs/src/lang/en/components/Sparklines.json
index 70630867abc..6f68676cde5 100644
--- a/packages/docs/src/lang/en/components/Sparklines.json
+++ b/packages/docs/src/lang/en/components/Sparklines.json
@@ -4,7 +4,7 @@
"examples": {
"playground": {
"header": "",
- "desc": "The `v-sparkline` component is the bridge between having a chart and not. It is a rich and lightweight pseudo chart that excels in displaying numerical data."
+ "desc": "The sparkline component comes in 2 variations, **trend**(default) and **bar**. Each support a multitude of options for customizing the look and feel of the sparkline."
},
"heartRate": {
"header": "### Take a break",
diff --git a/packages/docs/src/lang/en/components/Treeview.json b/packages/docs/src/lang/en/components/Treeview.json
index 1aeaad19690..b3ec606cd06 100644
--- a/packages/docs/src/lang/en/components/Treeview.json
+++ b/packages/docs/src/lang/en/components/Treeview.json
@@ -38,6 +38,7 @@
"open": "Syncable prop that allows one to control which nodes are open. The array consists of the `item-key` of each open item.",
"openAll": "When `true` will cause all branch nodes to be opened when component is mounted",
"openOnClick": "When `true` will cause nodes to be opened by clicking anywhere on it, instead of only opening by clicking on expand icon. When using this prop with `activatable` you will be unable to mark nodes with children as active.",
+ "returnObject": "When `true` will make v-model, `active.sync` and `open.sync` return the complete object instead of just the key",
"selectable": "Will render a checkbox next to each node allowing them to be selected",
"selectedColor": "The color of the selection checkbox",
"transition": "Applies a transition when nodes are opened and closed",
diff --git a/packages/docs/src/lang/en/generic/Props.json b/packages/docs/src/lang/en/generic/Props.json
index 63ceefdb73b..ed3f45ac995 100644
--- a/packages/docs/src/lang/en/generic/Props.json
+++ b/packages/docs/src/lang/en/generic/Props.json
@@ -12,7 +12,9 @@
"mask": "Apply a custom character mask to the input. See mask table below for more information",
"max": "Sets maximum width",
"maxHeight": "Sets the maximum height for the content",
+ "minHeight": "Sets the minimum height for the content",
"maxWidth": "Sets the maximum width for the content",
+ "minWidth": "Sets the minimum width for the content",
"min": "Sets minimum width",
"mobileBreakPoint": "Sets the designated mobile breakpoint",
"overlap": "Component will overlap the slotted content",
diff --git a/packages/kitchen/src/pan/Alerts.vue b/packages/kitchen/src/pan/Alerts.vue
index d68115c0294..35871008229 100644
--- a/packages/kitchen/src/pan/Alerts.vue
+++ b/packages/kitchen/src/pan/Alerts.vue
@@ -1,92 +1,334 @@
<template>
- <v-container text-xs-center>
- <v-layout
- column
- variations
- >
+ <v-container>
+ <v-layout column>
+ <!-- Dense -->
<v-flex>
- <h3 class="title grey--text mb-4 mt-5">
- Colors
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Dense
+ </h3>
+ <v-alert
+ type="success"
+ dense
+ >
+ This is a success alert.
+ </v-alert>
+
+ <v-alert
+ type="info"
+ dense
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ dense
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ dense
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Default -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Default
</h3>
<v-alert
- :value="true"
type="success"
>
This is a success alert.
</v-alert>
<v-alert
- :value="true"
type="info"
>
This is a info alert.
</v-alert>
<v-alert
- :value="true"
type="warning"
>
This is a warning alert.
</v-alert>
<v-alert
- :value="true"
type="error"
>
- This is a error alert.
+ This is an error alert.
</v-alert>
</v-flex>
+ <!-- Prominent -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Prominent
+ </h3>
+ <v-alert
+ type="success"
+ prominent
+ >
+ This is a success alert.
+ </v-alert>
+ <v-alert
+ type="info"
+ prominent
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ prominent
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ prominent
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Border -->
<v-flex>
- <h3 class="title grey--text mb-4 mt-5">
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Border
+ </h3>
+ <v-alert
+ type="success"
+ border="top"
+ >
+ This is a success alert.
+ </v-alert>
+
+ <v-alert
+ type="info"
+ border="right"
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ border="bottom"
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ border="left"
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Colored Border -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Colored Border
+ </h3>
+ <v-alert
+ type="success"
+ border="right"
+ colored-border
+ >
+ This is a success alert.
+ </v-alert>
+
+ <v-alert
+ type="info"
+ border="bottom"
+ colored-border
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ border="left"
+ colored-border
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ border="top"
+ colored-border
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Prominent outline -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Dense outline
+ </h3>
+ <v-alert
+ type="success"
+ dense
+ outlined
+ >
+ This is a success alert.
+ </v-alert>
+
+ <v-alert
+ type="info"
+ dense
+ outlined
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ dense
+ outlined
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ dense
+ outlined
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Outline -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Outline
+ </h3>
+ <v-alert
+ type="success"
+ outlined
+ >
+ This is a success alert.
+ </v-alert>
+
+ <v-alert
+ type="info"
+ outlined
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ outlined
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ outlined
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Prominent outline -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
+ Prominent outline
+ </h3>
+ <v-alert
+ type="success"
+ prominent
+ outlined
+ >
+ This is a success alert.
+ </v-alert>
+
+ <v-alert
+ type="info"
+ prominent
+ outlined
+ >
+ This is an info alert.
+ </v-alert>
+
+ <v-alert
+ type="warning"
+ prominent
+ outlined
+ >
+ This is a warning alert.
+ </v-alert>
+
+ <v-alert
+ type="error"
+ prominent
+ outlined
+ >
+ This is an error alert.
+ </v-alert>
+ </v-flex>
+ <!-- Closable -->
+ <v-flex>
+ <h3 class="title grey--text text-xs-center mb-4 mt-5">
Closable
</h3>
<v-alert
- v-model="alertDismissible"
+ v-model="alertClosable"
dismissible
- type="success"
+ color="blue-grey"
+ dark
>
- This is a success alert that is closable.
+ <div>
+ <!-- eslint-disable max-len -->
+ Nullam vel sem. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Sed hendrerit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc.
+ </div>
</v-alert>
<div class="text-xs-center">
<v-btn
- v-if="!alertDismissible"
+ v-if="!alertClosable"
color="primary"
dark
- @click="alertDismissible = true"
+ @click="alertClosable = true"
>
Reset
</v-btn>
</div>
</v-flex>
-
+ <!-- Custom icons -->
<v-flex>
<h3 class="title grey--text mb-4 mt-5">
Custom icons
</h3>
<v-alert
- :value="true"
- color="success"
+ color="purple"
+ dark
icon="mdi-account-check"
>
- This is a success alert with a custom icon.
+ This is a purple alert with a custom icon.
</v-alert>
<v-alert
- :value="true"
color="error"
+ dark
>
This is an error alert with no icon.
</v-alert>
</v-flex>
-
+ <!-- CSS Transitions -->
<v-flex>
<h3 class="title grey--text mb-4 mt-5">
Custom transitions
</h3>
<div class="text-xs-center">
<v-btn
+ class="mb-3"
color="primary"
@click="alertTransition = !alertTransition"
>
@@ -96,47 +338,58 @@
<v-alert
v-model="alertTransition"
type="success"
- transition="scale-transition"
+ transition="fade-transition"
>
This is a success alert.
</v-alert>
</v-flex>
-
+ <!-- Slots -->
<v-flex>
<h3 class="title grey--text mb-4 mt-5">
- Outline
+ Slots
</h3>
<v-alert
- :value="true"
- color="success"
- outline
- >
- This is a success alert.
- </v-alert>
-
- <v-alert
- :value="true"
- color="info"
- outline
- >
- This is an info alert.
- </v-alert>
-
- <v-alert
- :value="true"
- color="warning"
- outline
- >
- This is a warning alert.
- </v-alert>
-
- <v-alert
- :value="true"
- color="error"
- outline
+ v-model="alertTransition2"
+ class="mb-0"
+ color="blue darken-3"
+ dark
>
- This is a error alert.
+ <template slot="prepend">
+ <v-avatar
+ class="pa-2 mr-3"
+ color="white"
+ size="64"
+ >
+ <v-img
+ src="https://cdn.vuetifyjs.com/images/logos/v-alt.svg"
+ height="100%"
+ contain
+ />
+ </v-avatar>
+ </template>
+ <div>
+ <!-- eslint-disable max-len -->
+ Nullam vel sem. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Sed hendrerit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc.
+ </div>
+ <v-btn
+ slot="close"
+ slot-scope="{ toggle }"
+ icon
+ @click="toggle"
+ >
+ <v-icon>mdi-close</v-icon>
+ </v-btn>
</v-alert>
+ <div class="text-xs-center">
+ <v-btn
+ v-if="!alertTransition2"
+ color="primary"
+ dark
+ @click="alertTransition2 = true"
+ >
+ Reset
+ </v-btn>
+ </div>
</v-flex>
<v-flex>
@@ -144,40 +397,50 @@
Closable with outline
</h3>
<v-alert
- v-model="alertDismissible"
+ v-model="alertOutline"
dismissible
color="success"
- outline
+ outlined
>
This is a closable success outline alert.
</v-alert>
<v-alert
- v-model="alertDismissible"
+ v-model="alertOutline"
dismissible
color="info"
- outline
+ outlined
>
This is a closable info outline alert.
</v-alert>
<v-alert
- v-model="alertDismissible"
+ v-model="alertOutline"
dismissible
color="warning"
- outline
+ outlined
>
This is a closable warning outline alert.
</v-alert>
<v-alert
- v-model="alertDismissible"
+ v-model="alertOutline"
dismissible
color="error"
- outline
+ outlined
>
This is a closable error outline alert.
</v-alert>
+ <div class="text-xs-center">
+ <v-btn
+ v-if="!alertOutline"
+ color="primary"
+ dark
+ @click="alertOutline = true"
+ >
+ Reset
+ </v-btn>
+ </div>
</v-flex>
<v-flex>
@@ -187,7 +450,7 @@
<v-alert
:value="true"
color="success"
- outline
+ outlined
icon="mdi-account-check"
>
This is a success alert.
@@ -196,7 +459,7 @@
<v-alert
:value="true"
color="info"
- outline
+ outlined
icon="mdi-account-check"
>
This is an info alert.
@@ -205,7 +468,7 @@
<v-alert
:value="true"
color="warning"
- outline
+ outlined
icon="mdi-account-check"
>
This is a warning alert.
@@ -214,7 +477,7 @@
<v-alert
:value="true"
color="error"
- outline
+ outlined
icon="mdi-account-check"
>
This is a error alert.
@@ -229,8 +492,16 @@ export default {
name: 'Alerts',
data: () => ({
- alertDismissible: true,
- alertTransition: true
+ alertClosable: true,
+ alertTransition: true,
+ alertTransition2: true,
+ alertOutline: true
})
}
</script>
+
+<style>
+ .v-alert {
+ margin-bottom: 16px;
+ }
+</style>
diff --git a/packages/vuetify/src/components/VAlert/VAlert.sass b/packages/vuetify/src/components/VAlert/VAlert.sass
new file mode 100644
index 00000000000..c5646c1d17d
--- /dev/null
+++ b/packages/vuetify/src/components/VAlert/VAlert.sass
@@ -0,0 +1,159 @@
+// Imports
+@import '../../styles/styles.sass'
+@import './_variables.scss'
+@import './_mixins.sass'
+
+// Theme
+.v-alert.theme--light
+ @include alert-theme($material-light)
+.v-alert.theme--dark
+ @include alert-theme($material-dark)
+
+// Block
+.v-alert
+ display: flex
+ font-size: 16px
+ margin-bottom: 16px
+ padding: 16px
+
+ > .v-icon,
+ > .v-alert__content
+ margin-right: 16px
+
+ > .v-icon + .v-alert__content
+ margin-right: 0
+
+ > .v-alert__content + .v-icon
+ margin-right: 0
+
+ +rtl()
+ > .v-icon,
+ > .v-alert__content
+ margin-right: 0
+ margin-left: 16px
+
+ > .v-icon + .v-alert__content
+ margin-left: 0
+
+ > .v-alert__content + .v-icon
+ margin-left: 0
+
+// Elements
+.v-alert__border
+ border-style: solid
+ border-width: $alert-border-width
+ content: ''
+ position: absolute
+
+ &:not(.v-alert__border--has-color)
+ opacity: 0.26
+
+ &--left,
+ &--right
+ bottom: 0
+ top: 0
+
+ &--bottom,
+ &--top
+ left: 0
+ right: 0
+
+ &--bottom
+ border-bottom-left-radius: inherit
+ border-bottom-right-radius: inherit
+ bottom: 0
+
+ &--left
+ border-top-left-radius: inherit
+ border-bottom-left-radius: inherit
+ left: 0
+
+ &--right
+ border-top-right-radius: inherit
+ border-bottom-right-radius: inherit
+ right: 0
+
+ &--top
+ border-top-left-radius: inherit
+ border-top-right-radius: inherit
+ top: 0
+
+ +rtl()
+ &--left
+ border-top-left-radius: 0
+ border-bottom-left-radius: 0
+ border-top-right-radius: inherit
+ border-bottom-right-radius: inherit
+ left: auto
+ right: 0
+
+ &--right
+ border-top-left-radius: inherit
+ border-bottom-left-radius: inherit
+ border-top-right-radius: 0
+ border-bottom-right-radius: 0
+ left: 0
+ right: auto
+
+.v-alert__content
+ flex: 1 1 auto
+
+.v-alert__dismissible
+ margin-top: -6px
+ margin-bottom: -6px
+
+.v-alert__icon
+ border-radius: 50%
+ height: 24px
+ min-width: 24px
+ position: relative
+
+ &.v-icon
+ font-size: 24px
+
+// Modifiers
+.v-alert--border
+ @each $direction in ['top', 'right', 'bottom', 'left']
+ &-#{$direction}
+ padding-#{$direction}: 24px
+
+ +rtl()
+ &-left
+ padding-right: 24px
+ padding-left: 16px
+
+ &-right
+ padding-left: 24px
+ padding-right: 16px
+
+.v-alert--dense
+ padding-top: 8px
+ padding-bottom: 8px
+
+.v-alert--outline
+ background: transparent !important
+ border: 2px solid currentColor !important
+
+ .v-alert__icon
+ color: inherit !important
+
+.v-alert--prominent
+ align-items: center
+
+ .v-alert__icon
+ height: 48px
+ min-width: 48px
+
+ &:after
+ background: currentColor !important
+ border-radius: 50%
+ bottom: 0
+ content: ''
+ left: 0
+ opacity: 0.16
+ position: absolute
+ right: 0
+ top: 0
+
+ &.v-icon
+ font-size: 32px
diff --git a/packages/vuetify/src/components/VAlert/VAlert.ts b/packages/vuetify/src/components/VAlert/VAlert.ts
index 2c98512d3f7..0f95a0c949e 100644
--- a/packages/vuetify/src/components/VAlert/VAlert.ts
+++ b/packages/vuetify/src/components/VAlert/VAlert.ts
@@ -1,26 +1,55 @@
// Styles
-import '../../stylus/components/_alerts.styl'
+import './VAlert.sass'
+
+// Extensions
+import VSheet from '../VSheet'
// Components
+import VBtn from '../VBtn'
import VIcon from '../VIcon'
// Mixins
-import Colorable from '../../mixins/colorable'
import Toggleable from '../../mixins/toggleable'
+import Themeable from '../../mixins/themeable'
import Transitionable from '../../mixins/transitionable'
// Types
+import { VNodeData } from 'vue'
import { VNode } from 'vue/types'
import mixins from '../../util/mixins'
+import { deprecate } from '../../util/console'
/* @vue/component */
-export default mixins(Colorable, Toggleable, Transitionable).extend({
+export default mixins(
+ VSheet,
+ Toggleable,
+ Transitionable
+).extend({
name: 'v-alert',
props: {
+ border: {
+ type: String,
+ validator (val: string) {
+ return [
+ 'top',
+ 'right',
+ 'bottom',
+ 'left'
+ ].includes(val)
+ }
+ },
+ coloredBorder: Boolean,
+ closeLabel: {
+ type: String,
+ default: '$vuetify.close'
+ },
+ dense: Boolean,
dismissible: Boolean,
icon: String,
outline: Boolean,
+ outlined: Boolean,
+ prominent: Boolean,
type: {
type: String,
validator (val: string) {
@@ -31,71 +60,163 @@ export default mixins(Colorable, Toggleable, Transitionable).extend({
'warning'
].includes(val)
}
+ },
+ value: {
+ type: Boolean,
+ default: true
}
},
+ created () {
+ /* istanbul ignore if */
+ if (this.outline) deprecate('outline', 'outlined')
+ },
+
computed: {
+ __cachedBorder (): VNode | null {
+ if (!this.border) return null
+
+ let data: VNodeData = {
+ staticClass: 'v-alert__border',
+ class: {
+ [`v-alert__border--${this.border}`]: true
+ }
+ }
+
+ if (this.coloredBorder) {
+ data = this.setBackgroundColor(this.computedColor, data)
+ data.class['v-alert__border--has-color'] = true
+ }
+
+ return this.$createElement('div', data)
+ },
+ __cachedDismissible (): VNode | null {
+ if (!this.dismissible) return null
+
+ const color = this.iconColor
+
+ return this.$createElement(VBtn, {
+ staticClass: 'v-alert__dismissible',
+ props: {
+ color,
+ icon: true
+ },
+ attrs: {
+ 'aria-label': this.$vuetify.t(this.closeLabel)
+ },
+ on: {
+ click: () => (this.isActive = false)
+ }
+ }, [
+ this.$createElement(VIcon, {
+ props: { color }
+ }, '$vuetify.icons.cancel')
+ ])
+ },
+ __cachedIcon (): VNode | null {
+ if (!this.computedIcon) return null
+
+ return this.$createElement(VIcon, {
+ staticClass: 'v-alert__icon',
+ props: { color: this.iconColor }
+ }, this.computedIcon)
+ },
+ classes (): object {
+ const classes: Record<string, boolean> = {
+ ...VSheet.options.computed.classes.call(this),
+ 'v-alert--border': Boolean(this.border),
+ 'v-alert--dense': this.dense,
+ 'v-alert--outline': this.hasOutline,
+ 'v-alert--prominent': this.prominent
+ }
+
+ if (this.border) {
+ classes[`v-alert--border-${this.border}`] = true
+ }
+
+ return classes
+ },
computedColor (): string {
- return (this.type && !this.color) ? this.type : (this.color || 'error')
+ return this.color || this.type
},
- computedIcon (): string | void {
- if (this.icon || !this.type) return this.icon
+ computedIcon (): string | false {
+ if (this.icon != null) return this.icon
switch (this.type) {
case 'info': return '$vuetify.icons.info'
case 'error': return '$vuetify.icons.error'
case 'success': return '$vuetify.icons.success'
case 'warning': return '$vuetify.icons.warning'
- default: return this.icon
+ default: return false
}
+ },
+ hasColoredIcon (): boolean {
+ return (
+ this.hasOutline ||
+ (Boolean(this.border) && this.coloredBorder)
+ )
+ },
+ // TODO: remove deprecated
+ hasOutline (): boolean {
+ return this.outline || this.outlined
+ },
+ iconColor () {
+ return this.hasColoredIcon ? this.computedColor : undefined
+ },
+ isDark () {
+ if (
+ this.type &&
+ !this.coloredBorder &&
+ !this.hasOutline
+ ) return true
+
+ return Themeable.options.computed.isDark.call(this)
}
},
methods: {
- genIcon (): VNode | null {
- if (!this.computedIcon) return null
-
- return this.$createElement(VIcon, {
- 'class': 'v-alert__icon'
- }, this.computedIcon)
- },
+ genAlert (): VNode {
+ const children = [
+ this.$slots.prepend || this.__cachedIcon,
+ this.__cachedBorder,
+ this.genContent(),
+ this.$slots.append,
+ this.$scopedSlots.close
+ ? this.$scopedSlots.close({ toggle: this.toggle })
+ : this.__cachedDismissible
+ ]
+ let data: VNodeData = {
+ staticClass: 'v-alert',
+ class: this.classes,
+ style: this.styles,
+ directives: [{
+ name: 'show',
+ value: this.isActive
+ }]
+ }
- genDismissible (): VNode | null {
- if (!this.dismissible) return null
+ if (!this.coloredBorder) {
+ const setColor = this.hasOutline ? this.setTextColor : this.setBackgroundColor
+ data = setColor(this.computedColor, data)
+ }
- return this.$createElement('a', {
- 'class': 'v-alert__dismissible',
- on: { click: () => { this.isActive = false } }
- }, [
- this.$createElement(VIcon, {
- props: {
- right: true
- }
- }, '$vuetify.icons.cancel')
- ])
+ return this.$createElement('div', data, children)
+ },
+ genContent (): VNode {
+ return this.$createElement('div', {
+ staticClass: 'v-alert__content'
+ }, this.$slots.default)
+ },
+ /** @public */
+ toggle () {
+ this.isActive = !this.isActive
}
},
render (h): VNode {
- const children = [
- this.genIcon(),
- h('div', this.$slots.default),
- this.genDismissible()
- ] as any
- const setColor = this.outline ? this.setTextColor : this.setBackgroundColor
- const alert = h('div', setColor(this.computedColor, {
- staticClass: 'v-alert',
- 'class': {
- 'v-alert--outline': this.outline
- },
- directives: [{
- name: 'show',
- value: this.isActive
- }],
- on: this.$listeners
- }), children)
-
- if (!this.transition) return alert
+ const render = this.genAlert()
+
+ if (!this.transition) return render
return h('transition', {
props: {
@@ -103,6 +224,6 @@ export default mixins(Colorable, Toggleable, Transitionable).extend({
origin: this.origin,
mode: this.mode
}
- }, [alert])
+ }, [render])
}
})
diff --git a/packages/vuetify/test/unit/components/VAlert/VAlert.spec.js b/packages/vuetify/src/components/VAlert/__tests__/VAlert.spec.js
similarity index 100%
rename from packages/vuetify/test/unit/components/VAlert/VAlert.spec.js
rename to packages/vuetify/src/components/VAlert/__tests__/VAlert.spec.js
diff --git a/packages/vuetify/src/components/VAlert/__tests__/VAlert.spec.ts b/packages/vuetify/src/components/VAlert/__tests__/VAlert.spec.ts
new file mode 100644
index 00000000000..919ff161bb8
--- /dev/null
+++ b/packages/vuetify/src/components/VAlert/__tests__/VAlert.spec.ts
@@ -0,0 +1,167 @@
+// Libraries
+import Vue from 'vue'
+
+// Components
+import VAlert from '../VAlert'
+
+// Utilities
+import {
+ mount,
+ Wrapper
+} from '@vue/test-utils'
+
+describe('VAlert.ts', () => {
+ let mountFunction: (options?: object) => Wrapper<Vue>
+
+ beforeEach(() => {
+ mountFunction = (options = {}) => {
+ return mount(VAlert, {
+ ...options,
+ mocks: {
+ $vuetify: {
+ t: (val: string) => val
+ }
+ }
+ })
+ }
+ })
+
+ it('should be open by default', () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.element.style.display).toBe('')
+ expect(wrapper.html()).toMatchSnapshot()
+
+ wrapper.setProps({ value: false })
+
+ expect(wrapper.element.style.display).toBe('none')
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should have a close icon', () => {
+ const wrapper = mountFunction({
+ propsData: { dismissible: true }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should be dismissible', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ dismissible: true
+ }
+ })
+
+ const icon = wrapper.find('.v-alert__dismissible')
+ const input = jest.fn(show => wrapper.setProps({ show }))
+
+ wrapper.vm.$on('input', input)
+
+ icon.trigger('click')
+
+ expect(input).toBeCalledWith(false)
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should have a custom icon', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ icon: 'list'
+ }
+ })
+
+ const icon = wrapper.find('.v-alert__icon')
+
+ expect(icon.text()).toBe('list')
+ })
+
+ it('should have no icon', () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.contains('.v-icon')).toBe(false)
+ })
+
+ it('should display contextual colors by type', () => {
+ const wrapper = mountFunction({
+ propsData: { type: 'error' }
+ })
+
+ expect(wrapper.classes('error')).toBe(true)
+
+ wrapper.setProps({ type: 'success' })
+ expect(wrapper.classes('success')).toBe(true)
+
+ wrapper.setProps({ type: 'warning' })
+ expect(wrapper.classes('warning')).toBe(true)
+
+ wrapper.setProps({ type: 'info' })
+ expect(wrapper.classes('info')).toBe(true)
+ })
+
+ it('should allow overriding color for contextual alert', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ type: 'error',
+ color: 'primary'
+ }
+ })
+
+ expect(wrapper.classes('primary')).toBe(true)
+ })
+
+ it('should allow overriding icon for contextual alert', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ type: 'error',
+ icon: 'block'
+ }
+ })
+
+ const icon = wrapper.find('.v-alert__icon')
+
+ expect(icon.text()).toBe('block')
+ })
+
+ it('should show border', () => {
+ const directions = ['top', 'right', 'bottom', 'left']
+ const wrapper = mountFunction()
+
+ expect(wrapper.classes('v-alert--border')).toBe(false)
+
+ for (const border of directions) {
+ wrapper.setProps({ border })
+
+ expect(wrapper.classes('v-alert--border')).toBe(true)
+ expect(wrapper.classes(`v-alert--border-${border}`)).toBe(true)
+ }
+ })
+
+ it('should move color classes to border and icon elements', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ color: 'pink',
+ border: 'left'
+ }
+ })
+ const border = wrapper.find('.v-alert__border')
+
+ expect(wrapper.classes('pink')).toBe(true)
+ expect(border.classes('pink')).toBe(false)
+
+ wrapper.setProps({ coloredBorder: true })
+ expect(wrapper.classes('pink')).toBe(false)
+ expect(border.classes('pink')).toBe(true)
+ expect(border.classes('v-alert__border--has-color')).toBe(true)
+ })
+
+ it('should toggle isActive state', () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.isActive).toBe(true)
+
+ wrapper.vm.toggle()
+
+ expect(wrapper.vm.isActive).toBe(false)
+ })
+})
diff --git a/packages/vuetify/src/components/VAlert/__tests__/__snapshots__/VAlert.spec.ts.snap b/packages/vuetify/src/components/VAlert/__tests__/__snapshots__/VAlert.spec.ts.snap
new file mode 100644
index 00000000000..cea268d076b
--- /dev/null
+++ b/packages/vuetify/src/components/VAlert/__tests__/__snapshots__/VAlert.spec.ts.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`VAlert.ts should be dismissible 1`] = `
+
+<div class="v-alert v-sheet theme--light"
+ style="display: none;"
+>
+ <div class="v-alert__content">
+ </div>
+ <button type="button"
+ class="v-alert__dismissible v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--default"
+ aria-label="$vuetify.close"
+ >
+ <span class="v-btn__content">
+ <i aria-hidden="true"
+ class="v-icon material-icons theme--light"
+ >
+ $vuetify.icons.cancel
+ </i>
+ </span>
+ </button>
+</div>
+
+`;
+
+exports[`VAlert.ts should be open by default 1`] = `
+
+<div class="v-alert v-sheet theme--light">
+ <div class="v-alert__content">
+ </div>
+</div>
+
+`;
+
+exports[`VAlert.ts should be open by default 2`] = `
+
+<div class="v-alert v-sheet theme--light"
+ style="display: none;"
+>
+ <div class="v-alert__content">
+ </div>
+</div>
+
+`;
+
+exports[`VAlert.ts should have a close icon 1`] = `
+
+<div class="v-alert v-sheet theme--light">
+ <div class="v-alert__content">
+ </div>
+ <button type="button"
+ class="v-alert__dismissible v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--default"
+ aria-label="$vuetify.close"
+ >
+ <span class="v-btn__content">
+ <i aria-hidden="true"
+ class="v-icon material-icons theme--light"
+ >
+ $vuetify.icons.cancel
+ </i>
+ </span>
+ </button>
+</div>
+
+`;
diff --git a/packages/vuetify/src/components/VAlert/_mixins.sass b/packages/vuetify/src/components/VAlert/_mixins.sass
new file mode 100644
index 00000000000..b49a81283cb
--- /dev/null
+++ b/packages/vuetify/src/components/VAlert/_mixins.sass
@@ -0,0 +1,4 @@
+@mixin alert-theme($material)
+ .v-alert--prominent .v-alert__icon
+ &:after
+ background: map-get($material, 'dividers')
diff --git a/packages/vuetify/src/components/VAlert/_variables.scss b/packages/vuetify/src/components/VAlert/_variables.scss
new file mode 100644
index 00000000000..afbf8918123
--- /dev/null
+++ b/packages/vuetify/src/components/VAlert/_variables.scss
@@ -0,0 +1 @@
+$alert-border-width: thick;
diff --git a/packages/vuetify/src/components/VProgressLinear/VProgressLinear.ts b/packages/vuetify/src/components/VProgressLinear/VProgressLinear.ts
index 6b28bbb46b6..2e6356f0970 100644
--- a/packages/vuetify/src/components/VProgressLinear/VProgressLinear.ts
+++ b/packages/vuetify/src/components/VProgressLinear/VProgressLinear.ts
@@ -152,11 +152,16 @@ export default mixins(Colorable).extend({
staticClass: 'v-progress-linear__bar',
style: this.styles
}, [fade, slide])
+
const background = h('div', this.setBackgroundColor(this.backgroundColor || this.color, {
staticClass: 'v-progress-linear__background',
style: this.backgroundStyle
}))
+ const content = this.$slots.default && h('div', {
+ staticClass: 'v-progress-linear__content'
+ }, this.$slots.default)
+
return h('div', {
staticClass: 'v-progress-linear',
attrs: {
@@ -174,7 +179,8 @@ export default mixins(Colorable).extend({
on: this.$listeners
}, [
background,
- bar
+ bar,
+ content
])
}
})
diff --git a/packages/vuetify/src/components/VSparkline/VSparkline.ts b/packages/vuetify/src/components/VSparkline/VSparkline.ts
index c7f995becff..f4a4b6f221d 100644
--- a/packages/vuetify/src/components/VSparkline/VSparkline.ts
+++ b/packages/vuetify/src/components/VSparkline/VSparkline.ts
@@ -8,7 +8,7 @@ import { genPath } from './helpers/path'
// Types
import Vue, { VNode } from 'vue'
-import { Prop } from 'vue/types/options'
+import { Prop, PropValidator } from 'vue/types/options'
export type SparklineItem = number | { value: number }
@@ -30,6 +30,12 @@ export interface Point {
value: number
}
+export interface BarText {
+ points: Point[]
+ boundary: Boundary
+ offsetX: number
+}
+
interface options extends Vue {
$refs: {
path: SVGPathElement
@@ -91,6 +97,11 @@ export default mixins<options &
default: false
},
showLabels: Boolean,
+ type: {
+ type: String,
+ default: 'trend',
+ validator: (val: string) => ['trend', 'bar'].includes(val)
+ } as PropValidator<'trend' | 'bar'>,
value: {
type: Array as Prop<SparklineItem[]>,
default: () => ([])
@@ -161,7 +172,7 @@ export default mixins<options &
immediate: true,
handler () {
this.$nextTick(() => {
- if (!this.autoDraw) return
+ if (!this.autoDraw || this.type === 'bar') return
const path = this.$refs.path
const length = path.getTotalLength()
@@ -192,7 +203,7 @@ export default mixins<options &
this.$createElement('stop', {
attrs: {
offset: index / len,
- 'stop-color': color || 'currentColor'
+ 'stop-color': color || this.color || 'currentColor'
}
})
)
@@ -209,17 +220,20 @@ export default mixins<options &
}, stops)
])
},
- genLabels () {
- if (!this.hasLabels) return undefined
-
+ genG (children: VNode[]) {
return this.$createElement('g', {
style: {
fontSize: '8',
textAnchor: 'middle',
dominantBaseline: 'mathematical',
- fill: 'currentColor'
+ fill: this.color || 'currentColor'
}
- }, this.parsedLabels.map(this.genText))
+ }, children)
+ },
+ genLabels () {
+ if (!this.hasLabels) return undefined
+
+ return this.genG(this.parsedLabels.map(this.genText))
},
genPath () {
const radius = this.smooth === true ? 8 : Number(this.smooth)
@@ -245,23 +259,126 @@ export default mixins<options &
y: this.textY
}
}, [children])
+ },
+ genBar () {
+ if (!this.value || this.value.length < 2) return undefined as never
+ const { width, height, padding, lineWidth } = this
+ const viewWidth = width || this.value.length * Number(padding) * 2
+ const viewHeight = height || 75
+ const boundary: Boundary = {
+ minX: Number(padding),
+ minY: Number(padding),
+ maxX: Number(viewWidth) - Number(padding),
+ maxY: Number(viewHeight) - Number(padding)
+ }
+ const props = {
+ ...this.$props
+ }
+
+ props.points = genPoints(this.value, boundary)
+
+ const totalWidth = boundary.maxX / (props.points.length - 1)
+
+ props.boundary = boundary
+ props.lineWidth = lineWidth || (totalWidth - Number(padding || 5))
+ props.offsetX = (totalWidth - props.lineWidth) / 2
+
+ return this.$createElement('svg', {
+ attrs: {
+ width: '100%',
+ height: '25%',
+ viewBox: `0 0 ${viewWidth} ${viewHeight}`
+ }
+ }, [
+ this.genGradient(),
+ this.genClipPath(props.offsetX, 'sparkline-bar-' + this._uid),
+ this.showLabels ? this.genBarLabels(props as BarText) : undefined as never,
+ this.$createElement('g', {
+ attrs: {
+ transform: `scale(1,-1) translate(0,-${boundary.maxY})`,
+ 'clip-path': `url(#sparkline-bar-${this._uid}-clip)`,
+ fill: `url(#${this._uid})`
+ }
+ }, [
+ this.$createElement('rect', {
+ attrs: {
+ x: 0,
+ y: 0,
+ width: viewWidth,
+ height: viewHeight
+ }
+ })
+ ])
+ ])
+ },
+ genClipPath (offsetX: number, id: string) {
+ const { maxY } = this.boundary
+ const rounding = typeof this.smooth === 'number'
+ ? this.smooth
+ : this.smooth ? 2 : 0
+
+ return this.$createElement('clipPath', {
+ attrs: {
+ id: `${id}-clip`
+ }
+ }, this.points.map(item =>
+ this.$createElement('rect', {
+ attrs: {
+ x: item.x - offsetX,
+ y: 0,
+ width: this.lineWidth,
+ height: Math.max(maxY - item.y, 0),
+ rx: rounding,
+ ry: rounding
+ }
+ }, [
+ this.autoDraw ? this.$createElement('animate', {
+ attrs: {
+ attributeName: 'height',
+ from: 0,
+ to: maxY - item.y,
+ dur: `${this.autoDrawDuration}ms`,
+ fill: 'freeze'
+ }
+ }) : undefined as never
+ ])
+ ))
+ },
+ genBarLabels (props: BarText): VNode {
+ const offsetX = (props.offsetX || 0) / 2
+
+ const children = props.points.map(item => (
+ this.$createElement('text', {
+ attrs: {
+ x: item.x - offsetX * -0.45 - 10,
+ y: props.boundary.maxY + 10
+ }
+ }, item.value.toString())
+ ))
+
+ return this.genG(children)
+ },
+ genTrend () {
+ return this.$createElement('svg', this.setTextColor(this.color, {
+ attrs: {
+ 'stroke-width': this.lineWidth || 1,
+ width: '100%',
+ height: '25%',
+ viewBox: `0 0 ${this.width} ${this.height}`
+ }
+ }), [
+ this.genGradient(),
+ this.genLabels(),
+ this.genPath()
+ ])
}
},
render (h): VNode {
if (this.value.length < 2) return undefined as never
- return h('svg', this.setTextColor(this.color, {
- attrs: {
- 'stroke-width': this.lineWidth || 1,
- width: '100%',
- height: '25%',
- viewBox: `0 0 ${this.width} ${this.height}`
- }
- }), [
- this.genGradient(),
- this.genLabels(),
- this.genPath()
- ])
+ return this.type === 'trend'
+ ? this.genTrend()
+ : this.genBar()
}
})
diff --git a/packages/vuetify/src/components/VTreeview/VTreeview.ts b/packages/vuetify/src/components/VTreeview/VTreeview.ts
index a7f93ad77d3..971284fbda9 100644
--- a/packages/vuetify/src/components/VTreeview/VTreeview.ts
+++ b/packages/vuetify/src/components/VTreeview/VTreeview.ts
@@ -60,6 +60,10 @@ export default mixins(
default: () => ([])
} as PropValidator<NodeArray>,
openAll: Boolean,
+ returnObject: {
+ type: Boolean,
+ default: false // TODO: Should be true in next major
+ },
value: {
type: Array,
default: () => ([])
@@ -102,29 +106,14 @@ export default mixins(
},
deep: true
},
- active (value: (string | number)[]) {
- const old = [...this.activeCache]
- if (!value || deepEqual(old, value)) return
-
- old.forEach(key => this.updateActive(key, false))
- value.forEach(key => this.updateActive(key, true))
- this.emitActive()
+ active (value: (string | number | any)[]) {
+ this.handleNodeCacheWatcher(value, this.activeCache, this.updateActive, this.emitActive)
},
- value (value: (string | number)[]) {
- const old = [...this.selectedCache]
- if (!value || deepEqual(old, value)) return
-
- old.forEach(key => this.updateSelected(key, false))
- value.forEach(key => this.updateSelected(key, true))
- this.emitSelected()
+ value (value: (string | number | any)[]) {
+ this.handleNodeCacheWatcher(value, this.selectedCache, this.updateSelected, this.emitSelected)
},
- open (value: (string | number)[]) {
- const old = [...this.openCache]
- if (deepEqual(old, value)) return
-
- old.forEach(key => this.updateOpen(key, false))
- value.forEach(key => this.updateOpen(key, true))
- this.emitOpen()
+ open (value: (string | number | any)[]) {
+ this.handleNodeCacheWatcher(value, this.openCache, this.updateOpen, this.emitOpen)
}
},
@@ -217,13 +206,26 @@ export default mixins(
return node
},
emitOpen () {
- this.$emit('update:open', [...this.openCache])
+ this.emitNodeCache('update:open', this.openCache)
},
emitSelected () {
- this.$emit('input', [...this.selectedCache])
+ this.emitNodeCache('input', this.selectedCache)
},
emitActive () {
- this.$emit('update:active', [...this.activeCache])
+ this.emitNodeCache('update:active', this.activeCache)
+ },
+ emitNodeCache (event: string, cache: NodeCache) {
+ this.$emit(event, this.returnObject ? [...cache].map(key => this.nodes[key].item) : [...cache])
+ },
+ handleNodeCacheWatcher (value: any[], cache: NodeCache, updateFn: Function, emitFn: Function) {
+ value = this.returnObject ? value.map(v => getObjectValueByPath(v, this.itemKey)) : value
+ const old = [...cache]
+ if (deepEqual(old, value)) return
+
+ old.forEach(key => updateFn(key, false))
+ value.forEach(key => updateFn(key, true))
+
+ emitFn()
},
getDescendants (key: string | number, descendants: NodeArray = []) {
const children = this.nodes[key].children
diff --git a/packages/vuetify/src/locale/en.ts b/packages/vuetify/src/locale/en.ts
index f01ebde9203..d2f90b46173 100644
--- a/packages/vuetify/src/locale/en.ts
+++ b/packages/vuetify/src/locale/en.ts
@@ -1,4 +1,5 @@
export default {
+ close: 'Close',
dataIterator: {
rowsPerPageText: 'Items per page:',
rowsPerPageAll: 'All',
diff --git a/packages/vuetify/src/locale/hr.ts b/packages/vuetify/src/locale/hr.ts
new file mode 100644
index 00000000000..3b30fc7a93c
--- /dev/null
+++ b/packages/vuetify/src/locale/hr.ts
@@ -0,0 +1,14 @@
+export default {
+ dataIterator: {
+ rowsPerPageText: 'Stavaka po stranici:',
+ rowsPerPageAll: 'Svi',
+ pageText: '{0}-{1} od {2}',
+ noResultsText: 'Nisu pronađeni odgovarajući zapisi',
+ nextPage: 'Sljedeća stranica',
+ prevPage: 'Prethodna stranica'
+ },
+ dataTable: {
+ rowsPerPageText: 'Redova po stranici:'
+ },
+ noDataText: 'Nema dostupnih podataka'
+}
diff --git a/packages/vuetify/src/locale/index.ts b/packages/vuetify/src/locale/index.ts
index 25558b5ee97..66e82e29e08 100755
--- a/packages/vuetify/src/locale/index.ts
+++ b/packages/vuetify/src/locale/index.ts
@@ -7,6 +7,7 @@ export { default as es } from './es'
export { default as et } from './et'
export { default as fa } from './fa'
export { default as fr } from './fr'
+export { default as hr } from './hr'
export { default as hu } from './hu'
export { default as id } from './id'
export { default as it } from './it'
@@ -16,6 +17,7 @@ export { default as pt } from './pt'
export { default as ro } from './ro'
export { default as ru } from './ru'
export { default as srCyrl } from './sr-Cyrl'
+export { default as th } from './th'
export { default as uk } from './uk'
export { default as zhHans } from './zh-Hans'
export { default as zhHant } from './zh-Hant'
diff --git a/packages/vuetify/src/locale/th.ts b/packages/vuetify/src/locale/th.ts
new file mode 100644
index 00000000000..fa295721cde
--- /dev/null
+++ b/packages/vuetify/src/locale/th.ts
@@ -0,0 +1,14 @@
+export default {
+ dataIterator: {
+ rowsPerPageText: 'รายการต่อหน้า:',
+ rowsPerPageAll: 'ทั้งหมด',
+ pageText: '{0}-{1} จาก {2}',
+ noResultsText: 'ไม่พบข้อมูลที่ค้นหา',
+ nextPage: 'หน้าต่อไป',
+ prevPage: 'หน้าที่แล้ว'
+ },
+ dataTable: {
+ rowsPerPageText: 'แถวต่อหน้า:'
+ },
+ noDataText: 'ไม่มีข้อมูล'
+}
diff --git a/packages/vuetify/src/stylus/components/_alerts.styl b/packages/vuetify/src/stylus/components/_alerts.styl
deleted file mode 100644
index 81686668275..00000000000
--- a/packages/vuetify/src/stylus/components/_alerts.styl
+++ /dev/null
@@ -1,56 +0,0 @@
-@import '../bootstrap'
-
-.v-alert
- border-radius: $alert-border-radius
- border-width: $alert-border-width
- border-style: solid
- color: #fff
- display: flex
- font-size: $alert-font-size
- margin: $alert-margin
- padding: $alert-padding
- position: relative
- transition: $primary-transition
-
- .v-alert__icon.v-icon,
- &__dismissible .v-icon
- align-self: center
- color: $alert-icon-color
- font-size: $alert-icon-font-size
- &--outline .v-icon
- color: inherit !important
-
- &__icon
- margin-right: $alert-padding
-
- &__dismissible
- align-self: flex-start
- color: inherit
- margin-left: $alert-padding
- margin-right: 0
- text-decoration: none
- transition: $primary-transition
- user-select: none
-
- &:hover
- opacity: .8
-
- &--no-icon
- .v-alert__icon
- display: none
-
- > div
- align-self: center
- flex: 1 1
-
- @media screen and (max-width: $grid-breakpoints.sm)
- &__icon
- display: none
-
-// Double .v-alert is intended - it increases css specificity
-// to properly set the border color where alert has set color
-// with modifier (for example "red lighten-2")
-.v-alert.v-alert
- border-color: $material-light.dividers !important
- &--outline
- border: $alert-outline-border-width $alert-outline-border-style currentColor !important
diff --git a/packages/vuetify/src/stylus/components/_progress-linear.styl b/packages/vuetify/src/stylus/components/_progress-linear.styl
index 527adc2263b..8157301ea1a 100644
--- a/packages/vuetify/src/stylus/components/_progress-linear.styl
+++ b/packages/vuetify/src/stylus/components/_progress-linear.styl
@@ -46,6 +46,13 @@
bottom: 0
transition: .3s ease-in
+ &__content
+ width: 100%
+ position: absolute
+ top: 0
+ left: 0
+ z-index: 2
+
&--query
.v-progress-linear__bar__indeterminate
&--active .long
diff --git a/packages/vuetify/src/stylus/settings/_variables.styl b/packages/vuetify/src/stylus/settings/_variables.styl
index 29e9a78e971..49082968f4a 100644
--- a/packages/vuetify/src/stylus/settings/_variables.styl
+++ b/packages/vuetify/src/stylus/settings/_variables.styl
@@ -270,7 +270,7 @@ $list-dense-subheader-height := $list-item-dense-single-height
$list-dense-subheader-group-height := $list-dense-subheader-height //the subheader under a group menu
// Paper
-$sheet-border-radius := 2px
+$sheet-border-radius := 4px
// Pickers
$time-picker-number-font-size := 16px
diff --git a/packages/vuetify/src/util/console.ts b/packages/vuetify/src/util/console.ts
index 4274a82f5ee..684ad1b1fc0 100644
--- a/packages/vuetify/src/util/console.ts
+++ b/packages/vuetify/src/util/console.ts
@@ -35,7 +35,10 @@ export function consoleError (message: string, vm?: any, parent?: any): void {
}
export function deprecate (original: string, replacement: string, vm?: any, parent?: any) {
- consoleWarn(`'${original}' is deprecated, use '${replacement}' instead`, vm, parent)
+ consoleWarn(`[UPGRADE] '${original}' is deprecated, use '${replacement}' instead`, vm, parent)
+}
+export function breaking (original: string, replacement: string, vm?: any, parent?: any) {
+ consoleError(`[BREAKING] '${original}' has been removed, use '${replacement}' instead`, vm, parent)
}
/**
diff --git a/packages/vuetify/test/unit/components/VAlert/__snapshots__/VAlert.spec.js.snap b/packages/vuetify/test/unit/components/VAlert/__snapshots__/VAlert.spec.js.snap
deleted file mode 100644
index 2057d043db2..00000000000
--- a/packages/vuetify/test/unit/components/VAlert/__snapshots__/VAlert.spec.js.snap
+++ /dev/null
@@ -1,48 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`VAlert.vue should be closed by default 1`] = `
-
-<div class="v-alert error"
- style="display: none;"
->
- <div>
- </div>
-</div>
-
-`;
-
-exports[`VAlert.vue should be dismissible 1`] = `
-
-<div class="v-alert error"
- style="display: none;"
->
- <div>
- </div>
- <a class="v-alert__dismissible">
- <i aria-hidden="true"
- class="v-icon v-icon--right material-icons theme--light"
- >
- cancel
- </i>
- </a>
-</div>
-
-`;
-
-exports[`VAlert.vue should have a close icon 1`] = `
-
-<div class="v-alert error"
- style="display: none;"
->
- <div>
- </div>
- <a class="v-alert__dismissible">
- <i aria-hidden="true"
- class="v-icon v-icon--right material-icons theme--light"
- >
- cancel
- </i>
- </a>
-</div>
-
-`;
diff --git a/packages/vuetify/test/unit/components/VProgressLinear/VProgressLinear.spec.js b/packages/vuetify/test/unit/components/VProgressLinear/VProgressLinear.spec.js
index dda10d3cdfd..116554eacff 100644
--- a/packages/vuetify/test/unit/components/VProgressLinear/VProgressLinear.spec.js
+++ b/packages/vuetify/test/unit/components/VProgressLinear/VProgressLinear.spec.js
@@ -1,7 +1,7 @@
import { test } from '@/test'
import VProgressLinear from '@/components/VProgressLinear'
-test('VProgressLinear.js', ({ mount }) => {
+test('VProgressLinear.js', ({ mount, compileToFunctions }) => {
it('should render component and match snapshot', () => {
const wrapper = mount(VProgressLinear, {
propsData: {
@@ -162,4 +162,18 @@ test('VProgressLinear.js', ({ mount }) => {
expect(wrapper.html()).toMatchSnapshot()
})
+ it('should render default slot content', () => {
+ const wrapper = mount(VProgressLinear, {
+ propsData: {
+ value: 90,
+ bufferValue: 80
+ },
+ slots: {
+ default: [compileToFunctions('<div class="foobar">content</div>')]
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ expect(wrapper.find('.foobar').length).toBe(1)
+ })
})
diff --git a/packages/vuetify/test/unit/components/VProgressLinear/__snapshots__/VProgressLinear.spec.js.snap b/packages/vuetify/test/unit/components/VProgressLinear/__snapshots__/VProgressLinear.spec.js.snap
index 0225cdef2cc..402c4897201 100644
--- a/packages/vuetify/test/unit/components/VProgressLinear/__snapshots__/VProgressLinear.spec.js.snap
+++ b/packages/vuetify/test/unit/components/VProgressLinear/__snapshots__/VProgressLinear.spec.js.snap
@@ -213,6 +213,36 @@ exports[`VProgressLinear.js should render component with css color and match sna
`;
+exports[`VProgressLinear.js should render default slot content 1`] = `
+
+<div role="progressbar"
+ aria-valuemin="0"
+ aria-valuemax="80"
+ aria-valuenow="90"
+ class="v-progress-linear"
+ style="height: 7px;"
+>
+ <div class="v-progress-linear__background primary"
+ style="height: 7px; opacity: 0.3; width: 80%;"
+ >
+ </div>
+ <div class="v-progress-linear__bar"
+ style="width: 80%;"
+ >
+ <div class="v-progress-linear__bar__determinate primary"
+ style="width: 112.5%;"
+ >
+ </div>
+ </div>
+ <div class="v-progress-linear__content">
+ <div class="foobar">
+ content
+ </div>
+ </div>
+</div>
+
+`;
+
exports[`VProgressLinear.js should render inactive component and match snapshot 1`] = `
<div role="progressbar"
diff --git a/packages/vuetify/test/unit/components/VTreeview/VTreeview.spec.js b/packages/vuetify/test/unit/components/VTreeview/VTreeview.spec.js
index b85a08c32bf..a4c8ea51d5c 100644
--- a/packages/vuetify/test/unit/components/VTreeview/VTreeview.spec.js
+++ b/packages/vuetify/test/unit/components/VTreeview/VTreeview.spec.js
@@ -132,7 +132,8 @@ test('VTreeView.ts', ({ mount }) => {
const wrapper = mount(VTreeview, {
propsData: {
items: [{ id: 0, name: 'Root', children: [{ id: 1, name: 'Child' }] }],
- value: []
+ value: [],
+ selectable: true
}
})
@@ -146,7 +147,7 @@ test('VTreeView.ts', ({ mount }) => {
expect(wrapper.find('.v-treeview-node--selected').length).toBe(2)
expect(wrapper.html()).toMatchSnapshot()
- wrapper.setProps({ value: undefined })
+ wrapper.setProps({ value: [] })
await wrapper.vm.$nextTick()
expect(wrapper.html()).toMatchSnapshot()
})
@@ -410,4 +411,42 @@ test('VTreeView.ts', ({ mount }) => {
expect(Object.keys(wrapper.vm.nodes).length).toBe(2)
})
+
+ it('should emit objects when return-object prop is used', async () => {
+ const items = [{ id: 0, name: 'Root', children: [{ id: 1, name: 'Child' }] }]
+
+ const wrapper = mount(VTreeview, {
+ propsData: {
+ items,
+ activatable: true,
+ selectable: true,
+ returnObject: true
+ }
+ })
+
+ const active = jest.fn()
+ wrapper.vm.$on('update:active', active)
+ const selected = jest.fn()
+ wrapper.vm.$on('input', selected)
+ const open = jest.fn()
+ wrapper.vm.$on('update:open', open)
+
+ wrapper.find('.v-treeview-node__root')[0].trigger('click')
+ await wrapper.vm.$nextTick()
+
+ expect(active).toHaveBeenCalledTimes(1)
+ expect(active).toHaveBeenCalledWith([items[0]])
+
+ wrapper.find('.v-treeview-node__checkbox')[0].trigger('click')
+ await wrapper.vm.$nextTick()
+
+ expect(selected).toHaveBeenCalledTimes(1)
+ expect(selected).toHaveBeenCalledWith([items[0], items[0].children[0]])
+
+ wrapper.find('.v-treeview-node__toggle')[0].trigger('click')
+ await wrapper.vm.$nextTick()
+
+ expect(open).toHaveBeenCalledTimes(1)
+ expect(open).toHaveBeenCalledWith([items[0]])
+ })
})
diff --git a/packages/vuetify/test/unit/components/VTreeview/__snapshots__/VTreeview.spec.js.snap b/packages/vuetify/test/unit/components/VTreeview/__snapshots__/VTreeview.spec.js.snap
index 428bc436201..3c279617d49 100644
--- a/packages/vuetify/test/unit/components/VTreeview/__snapshots__/VTreeview.spec.js.snap
+++ b/packages/vuetify/test/unit/components/VTreeview/__snapshots__/VTreeview.spec.js.snap
@@ -533,6 +533,11 @@ exports[`VTreeView.ts should update selection when selected prop changes 1`] = `
>
arrow_drop_down
</i>
+ <i aria-hidden="true"
+ class="v-icon v-treeview-node__checkbox v-icon--link material-icons theme--light"
+ >
+ check_box_outline_blank
+ </i>
<div class="v-treeview-node__content">
<div class="v-treeview-node__label">
Root
@@ -554,6 +559,11 @@ exports[`VTreeView.ts should update selection when selected prop changes 2`] = `
>
arrow_drop_down
</i>
+ <i aria-hidden="true"
+ class="v-icon v-treeview-node__checkbox v-icon--link material-icons theme--light accent--text"
+ >
+ check_box
+ </i>
<div class="v-treeview-node__content">
<div class="v-treeview-node__label">
Root
@@ -563,6 +573,11 @@ exports[`VTreeView.ts should update selection when selected prop changes 2`] = `
<div class="v-treeview-node__children">
<div class="v-treeview-node v-treeview-node--leaf v-treeview-node--selected">
<div class="v-treeview-node__root">
+ <i aria-hidden="true"
+ class="v-icon v-treeview-node__checkbox v-icon--link material-icons theme--light accent--text"
+ >
+ check_box
+ </i>
<div class="v-treeview-node__content">
<div class="v-treeview-node__label">
Child
@@ -579,13 +594,18 @@ exports[`VTreeView.ts should update selection when selected prop changes 2`] = `
exports[`VTreeView.ts should update selection when selected prop changes 3`] = `
<div class="v-treeview theme--light">
- <div class="v-treeview-node v-treeview-node--selected">
+ <div class="v-treeview-node">
<div class="v-treeview-node__root">
<i aria-hidden="true"
class="v-icon v-treeview-node__toggle v-icon--link material-icons theme--light v-treeview-node__toggle--open"
>
arrow_drop_down
</i>
+ <i aria-hidden="true"
+ class="v-icon v-treeview-node__checkbox v-icon--link material-icons theme--light"
+ >
+ check_box_outline_blank
+ </i>
<div class="v-treeview-node__content">
<div class="v-treeview-node__label">
Root
@@ -593,8 +613,13 @@ exports[`VTreeView.ts should update selection when selected prop changes 3`] = `
</div>
</div>
<div class="v-treeview-node__children">
- <div class="v-treeview-node v-treeview-node--leaf v-treeview-node--selected">
+ <div class="v-treeview-node v-treeview-node--leaf">
<div class="v-treeview-node__root">
+ <i aria-hidden="true"
+ class="v-icon v-treeview-node__checkbox v-icon--link material-icons theme--light"
+ >
+ check_box_outline_blank
+ </i>
<div class="v-treeview-node__content">
<div class="v-treeview-node__label">
Child
|
c175b9b0b7c38eebd602263babc4134a0a8c15d3
|
2018-11-30 07:59:18
|
John Leider
|
docs: fix toc styles
| false
|
fix toc styles
|
docs
|
diff --git a/packages/vuetifyjs.com/src/components/core/Toc.vue b/packages/vuetifyjs.com/src/components/core/Toc.vue
index 59701a460d9..8725d276b75 100644
--- a/packages/vuetifyjs.com/src/components/core/Toc.vue
+++ b/packages/vuetifyjs.com/src/components/core/Toc.vue
@@ -1,6 +1,7 @@
<template>
<div
v-scroll="onScroll"
+ class="mb-4"
v-on="$listeners"
>
<slot name="top" />
@@ -14,12 +15,12 @@
:href="item.id"
:class="{
'primary--text': activeIndex === i,
- 'grey--text text--darken-1': !activeIndex === i
+ 'grey--text text--darken-1': activeIndex !== i
}"
:style="{
borderColor: activeIndex === i ? 'inherit' : null
}"
- class="body-2 mb-3 d-block"
+ class="mb-3 d-block"
@click.stop.prevent="goTo(item.target)"
v-text="item.text"
/>
@@ -108,7 +109,7 @@
text-align: left;
width: 100%;
- li a.body-2 {
+ li a {
border-left: 2px solid transparent;
padding-left: 16px;
text-decoration: none;
|
3daa452c84285c13fd712a3a0b3650a83f94131f
|
2024-02-22 02:47:31
|
Donald Shtjefni
|
fix(VIcon): add mdi set only if defaultSet is mdi (#18876)
| false
|
add mdi set only if defaultSet is mdi (#18876)
|
fix
|
diff --git a/packages/vuetify/src/composables/icons.tsx b/packages/vuetify/src/composables/icons.tsx
index 4d6282cc1ea..6fe43814aea 100644
--- a/packages/vuetify/src/composables/icons.tsx
+++ b/packages/vuetify/src/composables/icons.tsx
@@ -167,23 +167,29 @@ export const VClassIcon = defineComponent({
})
export type VClassIcon = InstanceType<typeof VClassIcon>
-export const defaultSets: Record<string, IconSet> = {
- svg: {
- component: VSvgIcon,
- },
- class: {
- component: VClassIcon,
- },
+function genDefaults (): Record<string, IconSet> {
+ return {
+ svg: {
+ component: VSvgIcon,
+ },
+ class: {
+ component: VClassIcon,
+ },
+ }
}
// Composables
export function createIcons (options?: IconOptions) {
+ const sets = genDefaults()
+ const defaultSet = options?.defaultSet ?? 'mdi'
+
+ if (defaultSet === 'mdi' && !sets.mdi) {
+ sets.mdi = mdi
+ }
+
return mergeDeep({
- defaultSet: 'mdi',
- sets: {
- ...defaultSets,
- mdi,
- },
+ defaultSet,
+ sets,
aliases: {
...aliases,
/* eslint-disable max-len */
@@ -235,7 +241,7 @@ export const useIcon = (props: Ref<IconValue | undefined>) => {
setName => typeof icon === 'string' && icon.startsWith(`${setName}:`)
)
- const iconName = iconSetName ? icon.slice(iconSetName.length + 1) : icon
+ const iconName = iconSetName?.startsWith('svg') ? icon.slice(iconSetName.length + 1) : icon.replace(':', '-')
const iconSet = icons.sets[iconSetName ?? icons.defaultSet]
return {
|
d7546ce1e96317344b2e83cfa686b8c9985a91f4
|
2023-10-17 23:50:18
|
John Leider
|
docs(AvatarOption): fix hover functionality
| false
|
fix hover functionality
|
docs
|
diff --git a/packages/docs/src/components/app/settings/options/AvatarOption.vue b/packages/docs/src/components/app/settings/options/AvatarOption.vue
index 78d3c4e88a3..b36365257bd 100644
--- a/packages/docs/src/components/app/settings/options/AvatarOption.vue
+++ b/packages/docs/src/components/app/settings/options/AvatarOption.vue
@@ -27,33 +27,32 @@
:key="i"
cols="auto"
>
- <v-hover v-model="hover">
- <template #default="{ props }">
+ <v-hover>
+ <template #default="{ props: hoverProps, isHovering }">
<v-badge :model-value="user.avatar === avatar">
<v-avatar
- v-bind="props"
- :style="styles"
+ v-bind="hoverProps"
+ :style="auth.isSubscriber ? {} : {
+ filter: isHovering ? 'grayscale(0%)' : 'grayscale(100%)',
+ opacity: isHovering ? '1' : '.12',
+ }"
size="56"
class="cursor-pointer"
@click="onClick(avatar)"
>
<v-img :src="avatar">
- <v-fade-transition
- v-if="!auth.isSubscriber"
- hide-on-leave
+
+ <div
+ v-if="isHovering && !auth.isSubscriber"
+ class="d-flex align-center justify-center h-100"
+ @click.stop.prevent
>
- <div
- v-if="hover"
- class="d-flex align-center justify-center h-100"
- @click.stop.prevent
- >
- <v-icon
- color="white"
- icon="mdi-lock"
- size="small"
- />
- </div>
- </v-fade-transition>
+ <v-icon
+ color="white"
+ icon="mdi-lock"
+ size="small"
+ />
+ </div>
</v-img>
</v-avatar>
</v-badge>
@@ -73,22 +72,10 @@
import { useAuthStore } from '@/store/auth'
import { useUserStore } from '@/store/user'
- // Utilities
- import { computed, shallowRef } from 'vue'
-
const auth0 = useAuth0()
const auth = useAuthStore()
const user = useUserStore()
- const hover = shallowRef(false)
-
- const styles = computed(() => {
- return auth.isSubscriber ? {} : {
- filter: hover.value ? 'grayscale(0%)' : 'grayscale(100%)',
- opacity: hover.value ? '1' : '.12',
- }
- })
-
const avatars = [
'https://cdn.vuetifyjs.com/docs/images/avatars/grass.png',
'https://cdn.vuetifyjs.com/docs/images/avatars/wood.png',
|
f30e5eb7c34cfffc03bded8334c6d1e324a04ead
|
2023-11-16 21:41:52
|
John Leider
|
chore(release): publish v3.4.2
| false
|
publish v3.4.2
|
chore
|
diff --git a/lerna.json b/lerna.json
index c941a2be08a..fb8b33e062a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
- "version": "3.4.1",
+ "version": "3.4.2",
"useWorkspaces": true
}
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index a75a45c4492..ef076210819 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
- "version": "3.4.1",
+ "version": "3.4.2",
"private": true,
"description": "",
"scripts": {
@@ -18,7 +18,7 @@
"ts-morph": "^18.0.0",
"tsx": "^3.14.0",
"vue": "^3.3.4",
- "vuetify": "^3.4.1"
+ "vuetify": "^3.4.2"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 019476db8b0..568088c66f9 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <[email protected]>",
- "version": "3.4.1",
+ "version": "3.4.2",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -37,7 +37,7 @@
"vue-i18n": "^9.3.0-beta.16",
"vue-instantsearch": "^4.8.8",
"vue-prism-component": "^2.0.0",
- "vuetify": "^3.4.1"
+ "vuetify": "^3.4.2"
},
"devDependencies": {
"@emailjs/browser": "^3.10.0",
@@ -50,7 +50,7 @@
"@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-vue": "^4.2.2",
"@vue/compiler-sfc": "^3.3.4",
- "@vuetify/api-generator": "^3.4.1",
+ "@vuetify/api-generator": "^3.4.2",
"ajv": "^8.12.0",
"async-es": "^3.2.4",
"date-fns": "^2.29.3",
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index 2bf2717ca3e..cb89da88dd6 100755
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -1,7 +1,7 @@
{
"name": "vuetify",
"description": "Vue Material Component Framework",
- "version": "3.4.1",
+ "version": "3.4.2",
"author": {
"name": "John Leider",
"email": "[email protected]"
|
8875f68fbd0d8b4a1691bc4aeac7e3cd020ceff8
|
2019-02-22 14:27:26
|
Kael
|
fix(detachable): remove detached activator element on destroy
| false
|
remove detached activator element on destroy
|
fix
|
diff --git a/packages/vuetify/src/mixins/detachable.js b/packages/vuetify/src/mixins/detachable.js
index 97e7f07582f..afbe7376d7f 100644
--- a/packages/vuetify/src/mixins/detachable.js
+++ b/packages/vuetify/src/mixins/detachable.js
@@ -58,11 +58,18 @@ export default {
},
beforeDestroy () {
- if (!this.$refs.content) return
-
// IE11 Fix
try {
- this.$refs.content.parentNode.removeChild(this.$refs.content)
+ if (this.$refs.content) {
+ this.$refs.content.parentNode.removeChild(this.$refs.content)
+ }
+
+ if (this.activatorNode) {
+ const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]
+ activator.forEach(node => {
+ node.elm && node.elm.parentNode.removeChild(node.elm)
+ })
+ }
} catch (e) { console.log(e) }
},
|
deb87cee9735b5b81f0e50d460c6ed1475b575df
|
2023-11-15 01:41:01
|
John Leider
|
chore(VDatePicker): fix lint
| false
|
fix lint
|
chore
|
diff --git a/packages/vuetify/src/components/VDatePicker/VDatePicker.tsx b/packages/vuetify/src/components/VDatePicker/VDatePicker.tsx
index b2cc798b948..59bffbee03e 100644
--- a/packages/vuetify/src/components/VDatePicker/VDatePicker.tsx
+++ b/packages/vuetify/src/components/VDatePicker/VDatePicker.tsx
@@ -19,7 +19,7 @@ import { useProxiedModel } from '@/composables/proxiedModel'
// Utilities
import { computed, ref, shallowRef, watch } from 'vue'
-import { deepEqual, genericComponent, omit, propsFactory, useRender, wrapInArray } from '@/util'
+import { genericComponent, omit, propsFactory, useRender, wrapInArray } from '@/util'
// Types
import type { PropType } from 'vue'
|
ade8707bfea1c11de4167591f359bf5b4fa6db30
|
2019-10-28 12:35:33
|
Vinícius Rufine
|
fix(VSheet): default border radius (#9405)
| false
|
default border radius (#9405)
|
fix
|
diff --git a/packages/vuetify/src/components/VSheet/_variables.scss b/packages/vuetify/src/components/VSheet/_variables.scss
index 799e8be4a6e..544db59325b 100644
--- a/packages/vuetify/src/components/VSheet/_variables.scss
+++ b/packages/vuetify/src/components/VSheet/_variables.scss
@@ -1,3 +1,3 @@
@import '../../styles/styles.sass';
-$sheet-border-radius: 0px !default;
+$sheet-border-radius: $border-radius-root !default;
|
5d75a1dc603abf50f5a6e5f8f1f583ac93ec721a
|
2022-02-25 20:36:06
|
John Leider
|
fix(colors): remove !important declaration on background-text color
| false
|
remove !important declaration on background-text color
|
fix
|
diff --git a/packages/vuetify/src/styles/generic/_colors.scss b/packages/vuetify/src/styles/generic/_colors.scss
index beb8609994d..9662417b144 100644
--- a/packages/vuetify/src/styles/generic/_colors.scss
+++ b/packages/vuetify/src/styles/generic/_colors.scss
@@ -14,7 +14,7 @@
@mixin background-text-color($color_name, $color_type) {
$map_value: map-deep-get(colors.$text-on-colors, $color_name, $color_type);
- color: $map_value !important;
+ color: $map_value;
}
@if (settings.$color-pack) {
|
ebac4de5b4f17fde90b802afac8944fd88515bce
|
2020-11-30 23:07:39
|
John Leider
|
docs(PremiumThemes): verify shopify module before removing it
| false
|
verify shopify module before removing it
|
docs
|
diff --git a/packages/docs/src/components/doc/PremiumThemes.vue b/packages/docs/src/components/doc/PremiumThemes.vue
index 4e0eb42adcf..53cc39309cf 100644
--- a/packages/docs/src/components/doc/PremiumThemes.vue
+++ b/packages/docs/src/components/doc/PremiumThemes.vue
@@ -89,11 +89,13 @@
data: () => ({ products: null }),
- async beforeCreate () {
+ beforeCreate () {
if (!this.$store.hasModule('shopify')) {
this.$store.registerModule('shopify', shopify)
}
+ },
+ async beforeMount () {
const request = await this.$store.dispatch('shopify/fetch') || []
const products = []
@@ -121,7 +123,9 @@
},
beforeDestroy () {
- this.$store.unregisterModule('shopify')
+ if (this.$store.hasModule('shopify')) {
+ this.$store.unregisterModule('shopify')
+ }
},
}
</script>
|
cb2d597358198765e756a98fa0c26abcc0f06dc6
|
2018-01-29 03:22:30
|
Albert Kaaman
|
fix: stepper style bleed (#3096)
| false
|
stepper style bleed (#3096)
|
fix
|
diff --git a/src/stylus/components/_steppers.styl b/src/stylus/components/_steppers.styl
index 51a84e0ebf8..ce8d1495991 100755
--- a/src/stylus/components/_steppers.styl
+++ b/src/stylus/components/_steppers.styl
@@ -157,7 +157,7 @@ theme(stepper, "stepper")
// overflow: hidden
width: 100%
- .btn
+ > .btn
margin: 24px 8px 8px 0
&--is-booted
|
6733af28837d9e269289c7bf8fa0b6b4d801a260
|
2017-12-31 21:58:24
|
Kael
|
chore: enable performance reporting for development
| false
|
enable performance reporting for development
|
chore
|
diff --git a/dev/index.js b/dev/index.js
index 960a6bc2a60..8327590f8bb 100644
--- a/dev/index.js
+++ b/dev/index.js
@@ -5,6 +5,8 @@ import Vuetify from 'vuetify'
import VueRouter from 'vue-router'
import router from './router'
+Vue.config.performance = true
+
Vue.use(Vuetify)
Vue.use(VueRouter)
|
447fb7cb3bef19f5c9b1223824cdc2a75b599e03
|
2019-01-09 02:47:36
|
MajesticPotatoe
|
docs(roadmap): update 1.4 release
| false
|
update 1.4 release
|
docs
|
diff --git a/packages/vuetifyjs.com/src/lang/en/getting-started/Roadmap.json b/packages/vuetifyjs.com/src/lang/en/getting-started/Roadmap.json
index 55a0d7f1d34..92539defc56 100644
--- a/packages/vuetifyjs.com/src/lang/en/getting-started/Roadmap.json
+++ b/packages/vuetifyjs.com/src/lang/en/getting-started/Roadmap.json
@@ -55,7 +55,7 @@
"complete": true,
"title": "v1.4 Release",
"caption": "December 2018",
- "text": "Add new components, `v-calendar`, `v-sparkline` and a abstracting `v-toolbar`'s functionality into multiple components.",
+ "text": "Add new component `v-sparkline` and a abstracting `v-toolbar`'s functionality into multiple components. `v-calendar` has been delayed till future release.",
"value": false
},
{
|
8487c209f5d6c812a2dafbead42bc343ca21c57b
|
2022-07-01 06:00:03
|
John Leider
|
chore(VSlideGroup): remove duplicate content key
| false
|
remove duplicate content key
|
chore
|
diff --git a/packages/vuetify/src/components/VSlideGroup/VSlideGroup.tsx b/packages/vuetify/src/components/VSlideGroup/VSlideGroup.tsx
index a76473cc3df..f072d325b98 100644
--- a/packages/vuetify/src/components/VSlideGroup/VSlideGroup.tsx
+++ b/packages/vuetify/src/components/VSlideGroup/VSlideGroup.tsx
@@ -354,7 +354,6 @@ export const VSlideGroup = defineComponent({
ref={ containerRef }
class="v-slide-group__container"
onScroll={ onScroll }
- key="container"
>
<div
ref={ contentRef }
|
eed47fec4094817b95c6befc83fbd714f73709c0
|
2020-05-27 19:50:57
|
Albert Kaaman
|
feat: add vue-i18n (#5)
| false
|
add vue-i18n (#5)
|
feat
|
diff --git a/packages/docs-next/.editorconfig b/packages/docs-next/.editorconfig
index 7053c49a045..887b40c982c 100644
--- a/packages/docs-next/.editorconfig
+++ b/packages/docs-next/.editorconfig
@@ -1,4 +1,4 @@
-[*.{js,jsx,ts,tsx,vue}]
+[*.{js,jsx,ts,tsx,vue,json}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
diff --git a/packages/docs-next/crowdin.yml b/packages/docs-next/crowdin.yml
index 4bd25601f67..b44a8ec7673 100644
--- a/packages/docs-next/crowdin.yml
+++ b/packages/docs-next/crowdin.yml
@@ -1,10 +1,14 @@
"project_identifier": "vuetify"
-"api_key": "<api-key>"
-"base_path": "<path to folder>\\src\\pages"
+"api_key_env": "CROWDIN_API_KEY"
+"base_path": "src"
"preserve_hierarchy": true
"files": [
{
- "source": "en\\**\\*.md",
- "translation": "%locale%\\**\\%original_file_name%",
+ "source": "pages\\en\\**\\*.md",
+ "translation": "pages\\%locale%\\**\\%original_file_name%",
+ },
+ {
+ "source": "i18n\\messages\\en.json",
+ "translation": "i18n\\message\\%locale%.json"
}
]
diff --git a/packages/docs-next/package.json b/packages/docs-next/package.json
index a58b3dbefe6..abd371f9c85 100644
--- a/packages/docs-next/package.json
+++ b/packages/docs-next/package.json
@@ -13,6 +13,7 @@
"core-js": "^3.6.4",
"register-service-worker": "^1.7.1",
"vue": "^2.6.11",
+ "vue-i18n": "^8.17.7",
"vue-router": "^3.1.6",
"vuetify": "^2.3.0-beta.6",
"vuex": "^3.4.0"
diff --git a/packages/docs-next/public/index.html b/packages/docs-next/public/index.html
index 6cab08d6629..6abed58e0b7 100644
--- a/packages/docs-next/public/index.html
+++ b/packages/docs-next/public/index.html
@@ -12,13 +12,6 @@
<script type="text/javascript">
var _jipt = [
['project', 'vuetify'],
- ['before_dom_insert', function (text, node, attribute) {
- if (text.substr(0, 4) === '####') return '<h4>' + text + '</h4>'
- else if (text.substr(0, 3) === '###') return '<h3>' + text + '</h3>'
- else if (text.substr(0, 2) === '##') return '<h2>' + text + '</h2>'
- else if (text.substr(0, 1) === '#') return '<h1>' + text + '</h1>'
- else return text
- }]
]
</script>
</head>
diff --git a/packages/docs-next/src/i18n/locales.js b/packages/docs-next/src/i18n/locales.js
new file mode 100644
index 00000000000..5a83820f55f
--- /dev/null
+++ b/packages/docs-next/src/i18n/locales.js
@@ -0,0 +1,14 @@
+module.exports = [
+ {
+ name: 'English',
+ locale: 'en',
+ },
+ {
+ name: 'Svenska',
+ locale: 'sv-SE',
+ },
+ {
+ name: 'Help Translate',
+ locale: 'eo-UY',
+ },
+]
diff --git a/packages/docs-next/src/i18n/messages/en.json b/packages/docs-next/src/i18n/messages/en.json
new file mode 100644
index 00000000000..6aa8a46fb20
--- /dev/null
+++ b/packages/docs-next/src/i18n/messages/en.json
@@ -0,0 +1,5 @@
+{
+ "api": "API",
+ "components": "Components",
+ "getting-started": "Getting started"
+}
diff --git a/packages/docs-next/src/i18n/messages/eo-UY.json b/packages/docs-next/src/i18n/messages/eo-UY.json
new file mode 100644
index 00000000000..ce0ccaca284
--- /dev/null
+++ b/packages/docs-next/src/i18n/messages/eo-UY.json
@@ -0,0 +1,3 @@
+{
+ "components": "crwdns58546:0crwdne58546:0"
+}
diff --git a/packages/docs-next/src/i18n/messages/sv-SE.json b/packages/docs-next/src/i18n/messages/sv-SE.json
new file mode 100644
index 00000000000..5522a21d401
--- /dev/null
+++ b/packages/docs-next/src/i18n/messages/sv-SE.json
@@ -0,0 +1,5 @@
+{
+ "api": "API",
+ "components": "Komponenter",
+ "getting-started": "Komma igång"
+}
diff --git a/packages/docs-next/src/layouts/default/AppBar.vue b/packages/docs-next/src/layouts/default/AppBar.vue
index 00050200cd7..8861cfef1bd 100644
--- a/packages/docs-next/src/layouts/default/AppBar.vue
+++ b/packages/docs-next/src/layouts/default/AppBar.vue
@@ -4,28 +4,64 @@
clipped-right
>
<v-toolbar-title>Application</v-toolbar-title>
+
<v-spacer />
+
<v-toolbar-items>
- <v-btn
- text
- @click="translate"
- >
- <v-icon>$mdiTranslate</v-icon>
- </v-btn>
+ <v-menu>
+ <template v-slot:activator="{ on }">
+ <v-btn
+ text
+ v-on="on"
+ >
+ <v-icon>$mdiTranslate</v-icon>
+ </v-btn>
+ </template>
+
+ <v-list>
+ <v-list-item
+ v-for="(item, index) in locales"
+ :key="index"
+ @click="switchLocale(item.locale)"
+ >
+ <v-list-item-title>{{ item.name }}</v-list-item-title>
+ </v-list-item>
+ </v-list>
+ </v-menu>
</v-toolbar-items>
</v-app-bar>
</template>
<script>
+ // Utilities
+ import { get } from 'vuex-pathify'
+
+ // Language
+ import locales from '@/i18n/locales'
+
export default {
name: 'DefaultBar',
+ data: () => ({ locales }),
+
+ computed: {
+ translating: get('app/translating'),
+ },
+
methods: {
- translate () {
- setTimeout(() => {
- this.$router.go()
- }, 1000)
- this.$router.replace({ params: { lang: 'eo-UY' } })
+ async switchLocale (locale) {
+ if (this.$i18n.locale === locale) return
+
+ const to = this.$router.resolve({ params: { locale } })
+
+ await this.$router.replace(to.location)
+
+ // If we're moving to or from crowdin language, we should
+ // refresh so that jipt script can be loaded or unloaded
+ if (
+ this.translating ||
+ locale === 'eo-UY'
+ ) window.location.reload()
},
},
}
diff --git a/packages/docs-next/src/layouts/default/Drawer.vue b/packages/docs-next/src/layouts/default/Drawer.vue
index 851d40748d4..e0ed02553d3 100644
--- a/packages/docs-next/src/layouts/default/Drawer.vue
+++ b/packages/docs-next/src/layouts/default/Drawer.vue
@@ -20,7 +20,7 @@
<v-list-item
v-for="page in pages[item.group]"
:key="page.title"
- :to="`/${lang}${page.to}`"
+ :to="`/${locale}${page.to}`"
>
<v-list-item-content>
<v-list-item-title v-text="page.title" />
@@ -39,22 +39,22 @@
name: 'DefaultDrawer',
computed: {
- lang: get('route/params@lang'),
+ locale: get('route/params@locale'),
pages: get('app/pages'),
items () {
return [
{
- title: 'Getting started',
+ title: this.$t('getting-started'),
icon: '$mdiSpeedometer',
group: 'getting-started',
},
{
- title: 'Components',
+ title: this.$t('components'),
icon: '$mdiViewDashboard',
group: 'components',
},
{
- title: 'API',
+ title: this.$t('api'),
icon: '$mdiBeaker',
group: 'api',
},
diff --git a/packages/docs-next/src/layouts/root/Index.vue b/packages/docs-next/src/layouts/root/Index.vue
index e0a807186e7..3ebd438c313 100644
--- a/packages/docs-next/src/layouts/root/Index.vue
+++ b/packages/docs-next/src/layouts/root/Index.vue
@@ -17,7 +17,31 @@
import '@/styles/overrides.sass'
import 'github-markdown-css/github-markdown.css'
+ // Utilities
+ import { get } from 'vuex-pathify'
+
+ // Language
+ import { loadLocale } from '@/plugins/i18n'
+
export default {
- //
+ name: 'RootLayout',
+
+ computed: {
+ translating: get('app/translating'),
+ },
+
+ created () {
+ if (!this.translating) return
+
+ const crowdin = document.createElement('script')
+
+ crowdin.src = 'https://cdn.crowdin.com/jipt/jipt.js'
+
+ document.head.appendChild(crowdin)
+ },
+
+ beforeRouteUpdate: (to, _, next) => {
+ loadLocale(to.params.locale).then(next)
+ },
}
</script>
diff --git a/packages/docs-next/src/main.js b/packages/docs-next/src/main.js
index a6f73cac6fe..b9305dc2129 100644
--- a/packages/docs-next/src/main.js
+++ b/packages/docs-next/src/main.js
@@ -4,14 +4,15 @@ import { registerPlugins } from './plugins'
import { createVuetify } from './plugins/vuetify'
import { createStore } from '@/store/index'
import { createRouter } from '@/router/index'
+import { i18n } from '@/plugins/i18n'
import './registerServiceWorker'
import { sync } from 'vuex-router-sync'
Vue.config.productionTip = false
-const store = createStore()
const router = createRouter()
const vuetify = createVuetify()
+const store = createStore()
sync(store, router)
@@ -21,5 +22,6 @@ new Vue({
router,
vuetify,
store,
+ i18n,
render: h => h(App),
}).$mount('#app')
diff --git a/packages/docs-next/src/pages/sv-SE/api/VAlert.md b/packages/docs-next/src/pages/sv-SE/api/VAlert.md
new file mode 100644
index 00000000000..da4f0d98fd6
--- /dev/null
+++ b/packages/docs-next/src/pages/sv-SE/api/VAlert.md
@@ -0,0 +1,30 @@
+---
+layout: documentation
+title: V-Alert API
+description: API for the v-alert component.
+keywords: v-alert, alerts, api, vue alert component, vuetify alert component
+---
+
+# V-Alert API
+
+## Props
+| Name | Type | Default | Description |
+|:------ |:------:|:---------:|:-------------------------------------------------------------------------------------- |
+| border | string | undefined | Puts a border on the alert. Accepts **top** \| **right** \| **bottom** \| **left**. |
+
+## Slots
+
+## Events
+
+## Functions
+
+## SASS Variables
+
+<carbon-ad />
+
+## Up Next
+<up-next />
+
+<vuetify-ad />
+
+<contribute />
diff --git a/packages/docs-next/src/pages/sv-SE/components/Alerts.md b/packages/docs-next/src/pages/sv-SE/components/Alerts.md
new file mode 100644
index 00000000000..a13e55db352
--- /dev/null
+++ b/packages/docs-next/src/pages/sv-SE/components/Alerts.md
@@ -0,0 +1,39 @@
+---
+layout: documentation
+title: V-Alert
+description: The v-alert component is used to convey information to the user. Designed to stand out, the alerts come in four contextual styles.
+keywords: v-alert, alerts, vue alert component, vuetify alert component
+nav: components/alerts
+---
+
+# V-Alert
+The `v-alert` component is used to convey important information to the user through the use contextual types icons and color. These default types come in in 4 variations: `success`, `info`, `warning`, and `error`. Default icons are assigned which help represent different actions each type portrays. Many parts of an alert such as border, icon, and color can also be customized to fit almost any situation.
+
+<carbon-ad />
+
+## Usage
+Alerts in their simplest form are a flat sheets of paper that display a message.<usage>v-alert</usage>
+
+## Sub-Components
+None
+
+## Caveats
+> warning I'm an alert. Fear My Alertness!
+
+## Examples
+Below is a collection of simple to complex examples.
+
+ ### Type Lorem ipsum <example>v-alert.type</example>
+
+## Accessibility
+By default, v-alert components are assigned the WAI-ARIA role of alert which denotes that the alert "is a live region with important and usually time-sensitive, information." When using the dismissible prop the close icon will receive a corresponding aria-label. This value can be modified by changing either the close-label prop or globally through customizing the Internationalization's default value for the close property.
+
+## API
+
+
+## Up Next
+<up-next />
+
+<vuetify-ad />
+
+<contribute />
diff --git a/packages/docs-next/src/pages/sv-SE/getting-started/QuickStart.md b/packages/docs-next/src/pages/sv-SE/getting-started/QuickStart.md
new file mode 100644
index 00000000000..49be4d33e44
--- /dev/null
+++ b/packages/docs-next/src/pages/sv-SE/getting-started/QuickStart.md
@@ -0,0 +1,268 @@
+---
+title: Quick Start
+description: Get started with Vue and Vuetify in no time. Support for Vue CLI, Webpack, Nuxt and more.
+keywords: quick start, vuetify templates, installing vuetify, install vuetify
+---
+
+# Snabbstart
+
+Get started with Vuetify, the world’s most popular Vue.js framework for building feature rich, blazing fast application.
+
+<carbon-ad></carbon-ad>
+
+## Vue CLI Install
+> warning For information on how to use Vue CLI, visit the [official documentation]().
+
+If you have not already created a new Vue.js project using **Vue CLI**, you can do so by typing:
+
+```bash
+vue create my-app
+# navigate to new project directory
+cd my-app
+```
+
+Now that you have an instantiated project, you can add the Vuetify [Vue CLI package]() using the cli.
+
+```bash
+vue add vuetify
+```
+
+### Vue UI install
+Vuetify can also be installed using **Vue UI**, the new visual application for Vue CLI. Ensure that you have the latest version of Vue CLI installed, then from your terminal type:
+
+```bash
+# ensure Vue CLI is >= 3.0
+vue --version
+
+# Then start the UI
+vue ui
+```
+
+This will start the Vue User Interface and open a [new window]() in your browser. On the left side of your screen, click on **Plugins**. Once navigated, search for Vuetify in the input field.
+
+
+
+## Nuxt install
+Vuetify can be added by installing the Nuxt Vuetify module.
+
+```bash
+yarn add @nuxtjs/vuetify -D
+# OR
+npm install @nuxtjs/vuetify -D
+```
+
+Once installed, update your nuxt.config.js file to include the Vuetify module in the build.
+
+
+```js
+// nuxt.config.js
+{
+ buildModules: [
+ // Simple usage
+ '@nuxtjs/vuetify',
+
+ // With options
+ ['@nuxtjs/vuetify', { /* module options */ }]
+ ]
+}
+```
+
+More information on installing Nuxt can be found on the official documentation.
+
+## Webpack install
+To install Vuetify into a Webpack project you need to add a few dependencies:
+
+```bash
+yarn add vuetify
+# OR
+npm install vuetify
+```
+
+```bash
+yarn add sass sass-loader fibers deepmerge -D
+# OR
+npm install sass sass-loader fibers deepmerge -D
+```
+
+Once installed, locate your webpack.config.js file and copy the snippet below into the rules array. If you have an existing sass rule configured, you may need to apply some or all of the changes below. If you are you looking to utilize the vuetify-loader for treeshaking, ensure that you are on version >=4 of Webpack. You can find more information on setting it up with webpack on the A-la-carte page.
+
+
+```js
+// webpack.config.js
+
+module.exports = {
+ rules: [
+ {
+ test: /\.s(c|a)ss$/,
+ use: [
+ 'vue-style-loader',
+ 'css-loader',
+ {
+ loader: 'sass-loader',
+ // Requires sass-loader@^7.0.0
+ options: {
+ implementation: require('sass'),
+ fiber: require('fibers'),
+ indentedSyntax: true // optional
+ },
+ // Requires sass-loader@^8.0.0
+ options: {
+ implementation: require('sass'),
+ sassOptions: {
+ fiber: require('fibers'),
+ indentedSyntax: true // optional
+ },
+ },
+ },
+ ],
+ },
+ ],
+}
+```
+
+Create a plugin file for Vuetify, src/plugins/vuetify.js with the below content:
+
+```js
+// src/plugins/vuetify.js
+
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import 'vuetify/dist/vuetify.min.css'
+
+Vue.use(Vuetify)
+
+const opts = {}
+
+export default new Vuetify(opts)
+```
+
+If using vuetify-loader use the content below:
+
+```js
+// src/plugins/vuetify.js
+
+import Vue from 'vue'
+import Vuetify from 'vuetify/lib'
+
+Vue.use(Vuetify)
+
+const opts = {}
+
+export default new Vuetify(opts)
+```
+
+Navigate to your main entry point where you instantiate your Vue instance and pass the Vuetify object in as an option.
+
+```js
+// src/main.js
+
+import Vue from 'vue'
+import vuetify from '@/plugins/vuetify' // path to vuetify export
+
+new Vue({
+ vuetify,
+}).$mount('#app')
+```
+
+### Font installation
+Vuetify uses Google's Roboto font and Material Design Icons. The simplest way to install these are to include their CDN's in your main index.html.
+
+```html
+<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel="stylesheet">
+<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
+```
+
+## CDN usage
+To test using Vuetify.js without installing a template from Vue CLI, copy the code below into your index.html. This will pull the latest version of Vue and Vuetify, allowing you to start playing with components. You can also use the Vuetify starter on codepen. While not recommended, if you need to utilize the cdn packages in a production environment, it is recommended that you scope the versions of your assets. For more information on how to do this, navigate to the jsdelivr website.
+> info In order for your application to work properly, you must wrap it in a v-app component. See the Application component page for more information.
+
+```html
+<!DOCTYPE html>
+<html>
+<head>
+ <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel="stylesheet">
+ <link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
+ <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
+</head>
+<body>
+ <div id="app">
+ <v-app>
+ <v-content>
+ <v-container>Hello world</v-container>
+ </v-content>
+ </v-app>
+ </div>
+
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.js"></script>
+ <script>
+ new Vue({
+ el: '#app',
+ vuetify: new Vuetify(),
+ })
+ </script>
+</body>
+</html>
+```
+
+## Usage with Electron
+To use Vuetify with Electron, add the electron-builder plugin via Vue CLI.
+
+```bash
+# Install
+vue add electron-builder
+
+# Usage
+yarn electron:build
+yarn electron:serve
+```
+
+## Usage with PWA
+If you are creating a new app with Vue CLI, you have the option to select Progressive Web App (PWA) Support in the first prompt after initiating vue create my-app. This package can also be installed into existing Vue CLI projects by entering the following command:
+
+```bash
+vue add pwa
+```
+
+## Usage with Cordova
+To use Vuetify with Cordova, add the Cordova plugin via Vue CLI:
+
+```bash
+# If cordova is not already installed
+yarn global add cordova
+
+# Install
+vue add cordova
+
+# Usage
+yarn cordova-serve-android # Development Android
+yarn cordova-build-android # Build Android
+yarn cordova-serve-ios # Development IOS
+yarn cordova-build-ios # Build IOS
+yarn cordova-serve-browser # Development Browser
+yarn cordova-build-browser # Build Browser
+```
+
+## Usage with Capacitor
+To use Vuetify with **Capacitor**, add the [Capacitor]() plugin via Vue CLI:
+
+```bash
+# Install
+$ vue add @nklayman/capacitor
+
+# Usage
+$ yarn capacitor:serve
+```
+
+[Looking for Web Developer jobs? Try Jooble](https://jooble.org/jobs-web-developer)
+
+## Related Topics
+<related-topics />
+
+## Up Next
+<up-next />
+
+<vuetify-ad />
+
+<contribute />
diff --git a/packages/docs-next/src/plugins/i18n.js b/packages/docs-next/src/plugins/i18n.js
new file mode 100644
index 00000000000..bd7bc7bc282
--- /dev/null
+++ b/packages/docs-next/src/plugins/i18n.js
@@ -0,0 +1,35 @@
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import messages from '@/i18n/messages/en'
+
+Vue.use(VueI18n)
+
+export const i18n = new VueI18n({
+ locale: 'en',
+ fallbackLocale: 'en',
+ messages: {
+ en: messages,
+ },
+})
+
+const loadedLocales = ['en']
+
+export function setLocale (locale) {
+ i18n.locale = locale
+}
+
+export function loadLocale (locale) {
+ if (i18n.locale === locale) {
+ return Promise.resolve(setLocale(locale))
+ }
+
+ if (loadedLocales.includes(locale)) {
+ return Promise.resolve(setLocale(locale))
+ }
+
+ return import(/* webpackChunkName: "lang-[request]" */ `@/i18n/messages/${locale}.json`).then(messages => {
+ i18n.setLocaleMessage(locale, messages.default)
+ loadedLocales.push(locale)
+ return setLocale(locale)
+ })
+}
diff --git a/packages/docs-next/src/router/index.js b/packages/docs-next/src/router/index.js
index b8e4c40d871..4d04dd104b7 100644
--- a/packages/docs-next/src/router/index.js
+++ b/packages/docs-next/src/router/index.js
@@ -2,6 +2,7 @@
import Vue from 'vue'
import Router from 'vue-router'
import VueGtag from 'vue-gtag'
+import { loadLocale } from '../plugins/i18n'
Vue.use(Router)
@@ -17,7 +18,7 @@ export function createRouter () {
},
routes: [
{
- path: '/:lang',
+ path: '/:locale',
component: () => import('@/layouts/root/Index'),
children: [
{
@@ -34,6 +35,10 @@ export function createRouter () {
],
},
],
+ beforeEnter: (to, _, next) => {
+ const locale = to.params.locale
+ loadLocale(locale).then(next)
+ },
},
],
})
diff --git a/packages/docs-next/src/store/modules/app.js b/packages/docs-next/src/store/modules/app.js
index cebd70d110b..37381eafafa 100644
--- a/packages/docs-next/src/store/modules/app.js
+++ b/packages/docs-next/src/store/modules/app.js
@@ -16,7 +16,11 @@ const actions = {
},
}
-const getters = {}
+const getters = {
+ translating: (state, getters, rootState) => {
+ return rootState.route.params.locale === 'eo-UY'
+ },
+}
export default {
namespaced: true,
diff --git a/packages/docs-next/src/views/Documentation.vue b/packages/docs-next/src/views/Documentation.vue
index baae225a332..fc91413bbe6 100644
--- a/packages/docs-next/src/views/Documentation.vue
+++ b/packages/docs-next/src/views/Documentation.vue
@@ -14,11 +14,11 @@
async function load (route) {
const page = upperFirst(camelCase(route.params.page))
- const { category, lang } = route.params
+ const { category, locale } = route.params
return import(
/* webpackChunkName: "documentation-pages" */
- `@/pages/${lang}/${category}/${page}.md`
+ `@/pages/${locale}/${category}/${page}.md`
)
}
@@ -46,23 +46,21 @@
page: undefined,
}),
- async created () {
- const { attributes, vue } = await load(this.$route)
+ watch: {
+ '$route.params.locale': 'loadComponent',
+ },
- this.attributes = attributes
- this.page = vue.component
+ created () {
+ this.loadComponent()
},
- beforeRouteEnter (to, from, next) {
- next(vm => {
- const { lang } = to.params
- if (lang === 'eo-UY') {
- console.log(lang)
- const crowdin = document.createElement('script')
- crowdin.setAttribute('src', 'https://cdn.crowdin.com/jipt/jipt.js')
- document.head.appendChild(crowdin)
- }
- })
+ methods: {
+ async loadComponent () {
+ const { attributes, vue } = await load(this.$route)
+
+ this.attributes = attributes
+ this.page = vue.component
+ },
},
}
</script>
diff --git a/packages/docs-next/yarn.lock b/packages/docs-next/yarn.lock
index 8b323c3595c..676917d21ae 100644
--- a/packages/docs-next/yarn.lock
+++ b/packages/docs-next/yarn.lock
@@ -10950,6 +10950,11 @@ vue-hot-reload-api@^2.3.0:
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
+vue-i18n@^8.17.7:
+ version "8.17.7"
+ resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.17.7.tgz#d87e653e815a07f86e2c2dfe35261e6ea105c38a"
+ integrity sha512-7IQJ+72IIIxfR6Mt+X6EDmMP1i5oETFpc0FttnWKA9cgacf1DAlyho1aTItekG+AkbNs6nz4q3sYrXaPdC0irA==
+
vue-loader@^15.9.1:
version "15.9.2"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.2.tgz#ae01f5f4c9c6a04bff4483912e72ef91a402c1ae"
|
c1be94c4990dade5af8ae4894646c906784238cc
|
2018-10-28 15:14:07
|
nekosaur
|
fix: page-head header disappeared if no translation available
| false
|
page-head header disappeared if no translation available
|
fix
|
diff --git a/packages/vuetifyjs.com/components/views/DocView.vue b/packages/vuetifyjs.com/components/views/DocView.vue
index b99ea3155fd..eb2bee138df 100644
--- a/packages/vuetifyjs.com/components/views/DocView.vue
+++ b/packages/vuetifyjs.com/components/views/DocView.vue
@@ -44,12 +44,12 @@
header () {
const header = `${this.namespace}.header`
- return this.$te(header) ? this.$t(header) : ''
+ return this.$t(header)
},
headerText () {
const headerText = `${this.namespace}.headerText`
- return this.$te(headerText) ? this.$t(headerText) : ''
+ return this.$t(headerText)
},
namespace () {
const route = this.$route.path.slice(1).split('/')
@@ -75,7 +75,7 @@
padding-top: 75px
padding-bottom: 0
transition: .2s $transition.fast-out-slow-in
-
+
section
margin-bottom: 48px
</style>
diff --git a/packages/vuetifyjs.com/i18n/en-US/getting-started/WhyVuetify.js b/packages/vuetifyjs.com/i18n/en-US/getting-started/WhyVuetify.js
index 7b9a84edc42..789556349f9 100644
--- a/packages/vuetifyjs.com/i18n/en-US/getting-started/WhyVuetify.js
+++ b/packages/vuetifyjs.com/i18n/en-US/getting-started/WhyVuetify.js
@@ -1,5 +1,6 @@
export default {
header: 'What\'s the difference?',
+ headerText: '',
toc: [
{
text: `What's the difference?`,
|
eb3de4a3649b0e7c9c1b6953598e942d48347f5b
|
2023-04-11 19:28:45
|
John Leider
|
fix(VListItem): adjust three-line padding for density (#17093)
| false
|
adjust three-line padding for density (#17093)
|
fix
|
diff --git a/packages/vuetify/src/components/VList/VListItem.sass b/packages/vuetify/src/components/VList/VListItem.sass
index 93668e12e45..de7bacc3d51 100644
--- a/packages/vuetify/src/components/VList/VListItem.sass
+++ b/packages/vuetify/src/components/VList/VListItem.sass
@@ -1,4 +1,5 @@
@use 'sass:list'
+@use 'sass:math'
@use '../../styles/tools'
@use './variables' as *
@@ -178,6 +179,10 @@
padding-top: $three-line-padding
padding-bottom: $three-line-padding
+ .v-list-item__prepend,
+ .v-list-item__append
+ padding-top: math.div($three-line-padding, 2)
+
&:not(.v-list-item--nav)
&.v-list-item--one-line
padding-inline-start: list.nth($list-item-padding, 2)
|
635946ca4bfb43b2684a702c96911c30a210db4d
|
2024-04-23 00:00:22
|
SonTT19
|
fix(VCarouselItem): add missing class prop (#19649)
| false
|
add missing class prop (#19649)
|
fix
|
diff --git a/packages/vuetify/src/components/VCarousel/VCarouselItem.tsx b/packages/vuetify/src/components/VCarousel/VCarouselItem.tsx
index 3ab8d45070b..258a70f98ea 100644
--- a/packages/vuetify/src/components/VCarousel/VCarouselItem.tsx
+++ b/packages/vuetify/src/components/VCarousel/VCarouselItem.tsx
@@ -27,7 +27,10 @@ export const VCarouselItem = genericComponent<VImgSlots>()({
return (
<VWindowItem
- class="v-carousel-item"
+ class={[
+ 'v-carousel-item',
+ props.class,
+ ]}
{ ...windowItemProps }
>
<VImg
|
cbb0f172ce4085bf447bd2de0c9b801ce00126b6
|
2018-11-11 07:36:49
|
Albert Kaaman
|
docs(v-data-table): simplify and standardize examples (#5554)
| false
|
simplify and standardize examples (#5554)
|
docs
|
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/crud.vue b/packages/vuetifyjs.com/src/examples/data-tables/crud.vue
index 53a41bc627d..01dd9afd587 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/crud.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/crud.vue
@@ -48,7 +48,6 @@
<v-data-table
:headers="headers"
:items="desserts"
- hide-actions
class="elevation-1"
>
<template slot="items" slot-scope="props">
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/editdialog.vue b/packages/vuetifyjs.com/src/examples/data-tables/editdialog.vue
index 98909c130f2..839865c8fae 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/editdialog.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/editdialog.vue
@@ -53,9 +53,6 @@
</v-edit-dialog>
</td>
</template>
- <template slot="pageText" slot-scope="{ pageStart, pageStop }">
- From {{ pageStart }} to {{ pageStop }}
- </template>
</v-data-table>
<v-snackbar v-model="snack" :timeout="3000" :color="snackColor">
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/expand.vue b/packages/vuetifyjs.com/src/examples/data-tables/expand.vue
index 5a127b37381..c07609313dc 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/expand.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/expand.vue
@@ -2,7 +2,6 @@
<v-data-table
:headers="headers"
:items="desserts"
- hide-actions
item-key="name"
>
<template slot="items" slot-scope="props">
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/footer.vue b/packages/vuetifyjs.com/src/examples/data-tables/footer.vue
index 1c9357ce445..e49e7be056d 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/footer.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/footer.vue
@@ -13,7 +13,7 @@
<td class="text-xs-right">{{ props.item.iron }}</td>
</template>
<template slot="footer">
- <td colspan="100%">
+ <td :colspan="headers.length">
<strong>This is an extra footer</strong>
</td>
</template>
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/noData.vue b/packages/vuetifyjs.com/src/examples/data-tables/noData.vue
index 83729bf3f20..61c0d6778de 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/noData.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/noData.vue
@@ -2,17 +2,8 @@
<v-data-table
:headers="headers"
:items="desserts"
- hide-actions
class="elevation-1"
>
- <template slot="items" slot-scope="props">
- <td>{{ props.item.name }}</td>
- <td class="text-xs-right">{{ props.item.calories }}</td>
- <td class="text-xs-right">{{ props.item.fat }}</td>
- <td class="text-xs-right">{{ props.item.carbs }}</td>
- <td class="text-xs-right">{{ props.item.protein }}</td>
- <td class="text-xs-right">{{ props.item.iron }}</td>
- </template>
<template slot="no-data">
<v-alert :value="true" color="error" icon="warning">
Sorry, nothing to display here :(
@@ -38,8 +29,7 @@
{ text: 'Protein (g)', value: 'protein' },
{ text: 'Iron (%)', value: 'iron' }
],
- desserts: [
- ]
+ desserts: []
}
}
}
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/paginate.vue b/packages/vuetifyjs.com/src/examples/data-tables/paginate.vue
index 162b4600101..e6786df7ca8 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/paginate.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/paginate.vue
@@ -5,19 +5,8 @@
:items="desserts"
:search="search"
:pagination.sync="pagination"
- hide-actions
class="elevation-1"
>
- <template slot="headerCell" slot-scope="props">
- <v-tooltip bottom>
- <span slot="activator">
- {{ props.header.text }}
- </span>
- <span>
- {{ props.header.text }}
- </span>
- </v-tooltip>
- </template>
<template slot="items" slot-scope="props">
<td>{{ props.item.name }}</td>
<td class="text-xs-right">{{ props.item.calories }}</td>
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/select.vue b/packages/vuetifyjs.com/src/examples/data-tables/select.vue
index 7e03456b988..220079c7042 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/select.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/select.vue
@@ -1,23 +1,12 @@
<template>
<v-data-table
+ v-model="selected"
:headers="headers"
:items="desserts"
- :search="search"
- v-model="selected"
item-key="name"
select-all
class="elevation-1"
>
- <template slot="headerCell" slot-scope="props">
- <v-tooltip bottom>
- <span slot="activator">
- {{ props.header.text }}
- </span>
- <span>
- {{ props.header.text }}
- </span>
- </v-tooltip>
- </template>
<template slot="items" slot-scope="props">
<td>
<v-checkbox
@@ -40,7 +29,6 @@
export default {
data () {
return {
- search: '',
selected: [],
headers: [
{
diff --git a/packages/vuetifyjs.com/src/examples/data-tables/standard.vue b/packages/vuetifyjs.com/src/examples/data-tables/standard.vue
index a6a4b4a64f3..efc925865e4 100644
--- a/packages/vuetifyjs.com/src/examples/data-tables/standard.vue
+++ b/packages/vuetifyjs.com/src/examples/data-tables/standard.vue
@@ -2,7 +2,6 @@
<v-data-table
:headers="headers"
:items="desserts"
- hide-actions
class="elevation-1"
>
<template slot="items" slot-scope="props">
diff --git a/packages/vuetifyjs.com/src/lang/en/components/DataTables.json b/packages/vuetifyjs.com/src/lang/en/components/DataTables.json
index 88d5c609866..4fbf9510499 100644
--- a/packages/vuetifyjs.com/src/lang/en/components/DataTables.json
+++ b/packages/vuetifyjs.com/src/lang/en/components/DataTables.json
@@ -59,8 +59,8 @@
"desc": "If you're loading data from a backend and want to paginate and sort the results before displaying them, you can use the `total-items` prop. Defining this prop will disable the built-in sorting and pagination, and you will instead need to use the `pagination` prop to listen for changes. Use the `loading` prop to display a progress bar while fetching data."
},
"headerless": {
- "header": "Headerless tables",
- "desc": "Setting the `hide-headers` prop creates a headerless table."
+ "header": "Remove default header and footer",
+ "desc": "You can apply the `hide-headers` and `hide-actions` props to remove the default header and footer respectively."
},
"editdialog": {
"header": "Inline Editing",
|
5f4251af1ab909a101575ecfb5f8d8ce2e19b12e
|
2022-12-06 20:04:34
|
John Leider
|
docs(sizing): update entry component name
| false
|
update entry component name
|
docs
|
diff --git a/packages/docs/src/pages/en/styles/sizing.md b/packages/docs/src/pages/en/styles/sizing.md
index a90ddda569f..6cf35bd44aa 100644
--- a/packages/docs/src/pages/en/styles/sizing.md
+++ b/packages/docs/src/pages/en/styles/sizing.md
@@ -12,7 +12,7 @@ related:
Sizing utility classes are used to modify the dimensions of an element.
-<entry-ad />
+<entry />
## Height
|
e4403217cdb511eacdd5a46477c5b3c8e6c17ec2
|
2021-03-18 22:24:13
|
nekosaur
|
docs(api-gen): fix hmr crash when updating api map
| false
|
fix hmr crash when updating api map
|
docs
|
diff --git a/packages/api-generator/src/index.js b/packages/api-generator/src/index.js
index 921995fb7da..c727f8be427 100755
--- a/packages/api-generator/src/index.js
+++ b/packages/api-generator/src/index.js
@@ -1,8 +1,8 @@
-const { createApp } = require('vue')
+const { createApp, capitalize, camelize } = require('vue')
const { createVuetify } = require('vuetify')
const { components: excludes } = require('./helpers/excludes')
const { sortBy } = require('lodash')
-const { camelCase, kebabCase } = require('./helpers/text')
+const { kebabCase } = require('./helpers/text')
const { getPropType, parseSassVariables } = require('./helpers/parsing')
const deepmerge = require('./helpers/merge')
@@ -55,7 +55,7 @@ const addComponentApiDescriptions = (componentName, api, locales) => {
for (const category of ['props', 'events', 'slots', 'functions', 'sass']) {
for (const item of api[category]) {
- const name = category === 'props' ? camelCase(item.name) : item.name
+ const name = category === 'props' ? camelize(item.name) : item.name
let description = ''
if (category === 'sass') {
description = (sources[0] && sources[0][category] && sources[0][category][name]) || ''
@@ -176,7 +176,7 @@ const getApi = (name, locales) => {
// if (name === '$vuetify') return getVuetifyApi(locales)
// if (name === 'internationalization') return getInternationalizationApi(locales)
if (DIRECTIVES.includes(name)) return getDirectiveApi(name, locales)
- else return getComponentApi(name, locales)
+ else return getComponentApi(capitalize(camelize(name)), locales)
}
const getComponentsApi = locales => {
|
8c0e2bcce1c9ccd64cbf5f5d085d2ca9becbac3c
|
2021-06-28 22:36:13
|
Kael
|
fix(VCombobox): re-compute menu items before setting index (#13825)
| false
|
re-compute menu items before setting index (#13825)
|
fix
|
diff --git a/packages/vuetify/src/components/VSelect/VSelect.ts b/packages/vuetify/src/components/VSelect/VSelect.ts
index a21f14b781f..eddce16391c 100644
--- a/packages/vuetify/src/components/VSelect/VSelect.ts
+++ b/packages/vuetify/src/components/VSelect/VSelect.ts
@@ -658,12 +658,6 @@ export default baseMixins.extend<options>().extend({
const keyCode = e.keyCode
const menu = this.$refs.menu
- // If enter, space, open menu
- if ([
- keyCodes.enter,
- keyCodes.space,
- ].includes(keyCode)) this.activateMenu()
-
this.$emit('keydown', e)
if (!menu) return
@@ -677,6 +671,12 @@ export default baseMixins.extend<options>().extend({
})
}
+ // If enter, space, open menu
+ if ([
+ keyCodes.enter,
+ keyCodes.space,
+ ].includes(keyCode)) this.activateMenu()
+
// If menu is not active, up/down/home/end can do
// one of 2 things. If multiple, opens the
// menu, if not, will cycle through all
@@ -709,6 +709,7 @@ export default baseMixins.extend<options>().extend({
if (!menu || !this.isDirty) return
// When menu opens, set index of first active item
+ this.$refs.menu.getTiles()
for (let i = 0; i < menu.tiles.length; i++) {
if (menu.tiles[i].getAttribute('aria-selected') === 'true') {
this.setMenuIndex(i)
@@ -839,11 +840,6 @@ export default baseMixins.extend<options>().extend({
(this.$refs.menu as { [key: string]: any }).updateDimensions()
})
- // We only need to reset list index for multiple
- // to keep highlight when an item is toggled
- // on and off
- if (!this.multiple) return
-
const listIndex = this.getMenuIndex()
this.setMenuIndex(-1)
|
0d63bff207505e8369eb6451bb413716c7daffa7
|
2019-05-31 01:03:47
|
Elijah Kotyluk
|
docs(VDivider): update examples for 2.0 (#7343)
| false
|
update examples for 2.0 (#7343)
|
docs
|
diff --git a/packages/docs/src/data/pages/components/Dividers.json b/packages/docs/src/data/pages/components/Dividers.json
index 10cca4aeb3b..a61987b7871 100644
--- a/packages/docs/src/data/pages/components/Dividers.json
+++ b/packages/docs/src/data/pages/components/Dividers.json
@@ -40,11 +40,10 @@
{
"type": "examples",
"value": [
- "simple/lightAndDark",
"simple/inset",
"simple/vertical",
+ "simple/verticalInset",
"intermediate/subheaders",
- "intermediate/dividerList",
"intermediate/dividerListPortrait"
]
}
diff --git a/packages/docs/src/examples/dividers/intermediate/subheaders.vue b/packages/docs/src/examples/dividers/intermediate/subheaders.vue
index 85035e312e6..db0383a5499 100644
--- a/packages/docs/src/examples/dividers/intermediate/subheaders.vue
+++ b/packages/docs/src/examples/dividers/intermediate/subheaders.vue
@@ -1,50 +1,50 @@
<template>
- <v-layout row>
- <v-flex xs12 sm6 offset-sm3>
+ <v-layout justify-center>
+ <v-flex xs12 sm8 md6>
<v-card>
- <v-toolbar color="light-blue" dark>
+ <v-toolbar color="orange lighten-1" dark>
<v-app-bar-nav-icon></v-app-bar-nav-icon>
- <v-toolbar-title>My files</v-toolbar-title>
+
+ <v-toolbar-title>Message Board</v-toolbar-title>
+
<v-spacer></v-spacer>
- <v-btn dark icon>
+
+ <v-btn icon>
<v-icon>search</v-icon>
</v-btn>
- <v-btn dark icon>
- <v-icon>view_module</v-icon>
- </v-btn>
</v-toolbar>
- <v-list two-line subheader>
- <v-subheader inset>Folders</v-subheader>
- <v-list-item v-for="item in items" :key="item.title" @click="">
- <v-list-item-avatar>
- <v-icon :class="[item.iconClass]">{{ item.icon }}</v-icon>
- </v-list-item-avatar>
- <v-list-item-content>
- <v-list-item-title>{{ item.title }}</v-list-item-title>
- <v-list-item-subtitle>{{ item.subtitle }}</v-list-item-subtitle>
- </v-list-item-content>
- <v-list-item-action>
- <v-btn icon>
- <v-icon color="grey lighten-1">info</v-icon>
- </v-btn>
- </v-list-item-action>
- </v-list-item>
- <v-divider inset></v-divider>
- <v-subheader inset>Files</v-subheader>
- <v-list-item v-for="item in items2" :key="item.title" @click="">
- <v-list-item-avatar>
- <v-icon :class="[item.iconClass]">{{ item.icon }}</v-icon>
- </v-list-item-avatar>
- <v-list-item-content>
- <v-list-item-title>{{ item.title }}</v-list-item-title>
- <v-list-item-subtitle>{{ item.subtitle }}</v-list-item-subtitle>
- </v-list-item-content>
- <v-list-item-action>
- <v-btn icon>
- <v-icon color="grey lighten-1">info</v-icon>
- </v-btn>
- </v-list-item-action>
- </v-list-item>
+
+ <v-list two-line>
+ <template v-for="(item, index) in items">
+ <v-subheader
+ v-if="item.header"
+ :key="item.header"
+ inset
+ >
+ {{ item.header }}
+ </v-subheader>
+
+ <v-divider
+ v-else-if="item.divider"
+ :key="index"
+ inset
+ ></v-divider>
+
+ <v-list-item
+ v-else
+ :key="item.title"
+ ripple
+ @click=""
+ >
+ <v-list-item-avatar>
+ <img :src="item.avatar">
+ </v-list-item-avatar>
+ <v-list-item-content>
+ <v-list-item-title v-html="item.title"></v-list-item-title>
+ <v-list-item-subtitle v-html="item.subtitle"></v-list-item-subtitle>
+ </v-list-item-content>
+ </v-list-item>
+ </template>
</v-list>
</v-card>
</v-flex>
@@ -56,13 +56,67 @@
data () {
return {
items: [
- { icon: 'folder', iconClass: 'grey lighten-1 white--text', title: 'Photos', subtitle: 'Jan 9, 2014' },
- { icon: 'folder', iconClass: 'grey lighten-1 white--text', title: 'Recipes', subtitle: 'Jan 17, 2014' },
- { icon: 'folder', iconClass: 'grey lighten-1 white--text', title: 'Work', subtitle: 'Jan 28, 2014' }
- ],
- items2: [
- { icon: 'assignment', iconClass: 'blue white--text', title: 'Vacation itinerary', subtitle: 'Jan 20, 2014' },
- { icon: 'call_to_action', iconClass: 'amber white--text', title: 'Kitchen remodel', subtitle: 'Jan 10, 2014' }
+ {
+ header: 'Today'
+ },
+ { divider: true },
+ {
+ avatar: 'https://picsum.photos/250/300?image=660',
+ title: 'Meeting @ Noon',
+ subtitle:
+ "<span class='text--primary'>Spike Lee</span> — I'll be in your neighborhood"
+ },
+ {
+ avatar: 'https://picsum.photos/250/300?image=821',
+ title: 'Summer BBQ <span class="grey--text text--lighten-1"></span>',
+ subtitle:
+ "<span class='text--primary'>to Operations support</span> — Wish I could come."
+ },
+ {
+ avatar: 'https://picsum.photos/250/300?image=783',
+ title: 'Yes yes',
+ subtitle:
+ "<span class='text--primary'>Bella</span> — Do you have Paris recommendations"
+ },
+ {
+ header: 'Yesterday'
+ },
+ { divider: true },
+ {
+ avatar: 'https://picsum.photos/250/300?image=1006',
+ title: 'Dinner tonight?',
+ subtitle:
+ "<span class='text--primary'>LaToya</span> — Do you want to hang out?"
+ },
+ {
+ avatar: 'https://picsum.photos/250/300?image=146',
+ title: 'So long',
+ subtitle:
+ "<span class='text--primary'>Nancy</span> — Do you see what time it is?"
+ },
+ {
+ header: 'Last Week'
+ },
+ { divider: true },
+ {
+ avatar: 'https://picsum.photos/250/300?image=1008',
+ title: 'Breakfast?',
+ subtitle:
+ "<span class='text--primary'>LaToya</span> — Do you want to hang out?"
+ },
+ {
+ avatar: 'https://picsum.photos/250/300?image=839',
+ title:
+ 'Winter Porridge <span class="grey--text text--lighten-1"></span>',
+ subtitle:
+ "<span class='text--primary'>cc: Daniel</span> — Tell me more..."
+ },
+ {
+ avatar: 'https://picsum.photos/250/300?image=145',
+ title: 'Oui oui',
+ subtitle:
+ "<span class='text--primary'>Nancy</span> — Do you see what time it is?"
+ }
]
}
}
diff --git a/packages/docs/src/examples/dividers/playground.vue b/packages/docs/src/examples/dividers/playground.vue
index f4403aaa99d..193f847463d 100644
--- a/packages/docs/src/examples/dividers/playground.vue
+++ b/packages/docs/src/examples/dividers/playground.vue
@@ -3,7 +3,6 @@
<v-toolbar
v-if="variant === 'vertical'"
color="gray"
- :dark="dark"
>
<v-toolbar-title>Title</v-toolbar-title>
@@ -40,7 +39,7 @@
<v-layout v-else row>
<v-flex xs12 sm6 offset-sm3>
- <v-card :dark="dark">
+ <v-card>
<v-list>
<v-list-item @click="">
<v-list-item-action>
@@ -108,9 +107,9 @@
</v-flex>
</v-layout>
<v-layout
+ class="mt-5"
align-center
justify-center
- class="mt-5"
>
<v-flex
xs12
@@ -121,16 +120,14 @@
:items="items"
clearable
label="Variant"
+ light
></v-select>
<template>
- <v-switch
- v-model="dark"
- :label="`Light/Dark Theme`"
- ></v-switch>
<v-checkbox
v-model="inset"
hide-details
label="Inset"
+ light
></v-checkbox>
</template>
</v-flex>
@@ -141,7 +138,6 @@
<script>
export default {
data: () => ({
- dark: false,
inset: false,
items: [
'default',
diff --git a/packages/docs/src/examples/dividers/simple/inset.vue b/packages/docs/src/examples/dividers/simple/inset.vue
index df29fab1ee5..3566859378f 100644
--- a/packages/docs/src/examples/dividers/simple/inset.vue
+++ b/packages/docs/src/examples/dividers/simple/inset.vue
@@ -2,14 +2,6 @@
<v-layout row>
<v-flex xs12 sm6 offset-sm3>
<v-card>
- <v-toolbar color="cyan" dark>
- <v-app-bar-nav-icon></v-app-bar-nav-icon>
- <v-toolbar-title>Inbox</v-toolbar-title>
- <v-spacer></v-spacer>
- <v-btn icon>
- <v-icon>search</v-icon>
- </v-btn>
- </v-toolbar>
<v-list two-line>
<template v-for="(item, index) in items.slice(0, 6)">
<v-subheader v-if="item.header" :key="item.header">{{ item.header }}</v-subheader>
@@ -39,11 +31,7 @@
{ divider: true, inset: true },
{ avatar: 'https://cdn.vuetifyjs.com/images/lists/2.jpg', title: 'Summer BBQ <span class="grey--text text--lighten-1">4</span>', subtitle: "<span class='text--primary'>to Alex, Scott, Jennifer</span> — Wish I could come, but I'm out of town this weekend." },
{ divider: true, inset: true },
- { avatar: 'https://cdn.vuetifyjs.com/images/lists/3.jpg', title: 'Oui oui', subtitle: "<span class='text--primary'>Sandra Adams</span> — Do you have Paris recommendations? Have you ever been?" },
- { divider: true, inset: true },
- { avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg', title: 'Birthday gift', subtitle: "<span class='text--primary'>Trevor Hansen</span> — Have any ideas about what we should get Heidi for her birthday?" },
- { divider: true, inset: true },
- { avatar: 'https://cdn.vuetifyjs.com/images/lists/5.jpg', title: 'Recipe to try', subtitle: "<span class='text--primary'>Britta Holt</span> — We should eat this: Grate, Squash, Corn, and tomatillo Tacos." }
+ { avatar: 'https://cdn.vuetifyjs.com/images/lists/3.jpg', title: 'Oui oui', subtitle: "<span class='text--primary'>Sandra Adams</span> — Do you have Paris recommendations? Have you ever been?" }
]
})
}
diff --git a/packages/docs/src/examples/dividers/simple/vertical.vue b/packages/docs/src/examples/dividers/simple/vertical.vue
index 99ec1ce133f..06e0ef8e7d9 100644
--- a/packages/docs/src/examples/dividers/simple/vertical.vue
+++ b/packages/docs/src/examples/dividers/simple/vertical.vue
@@ -7,7 +7,6 @@
<v-divider
class="mx-3"
- inset
vertical
></v-divider>
diff --git a/packages/docs/src/examples/dividers/simple/verticalInset.vue b/packages/docs/src/examples/dividers/simple/verticalInset.vue
new file mode 100644
index 00000000000..75631ddacb5
--- /dev/null
+++ b/packages/docs/src/examples/dividers/simple/verticalInset.vue
@@ -0,0 +1,53 @@
+<template>
+ <v-toolbar
+ color="teal"
+ dark
+ >
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-divider
+ class="mx-3"
+ inset
+ light
+ vertical
+ ></v-divider>
+
+ <span class="subheading">My Home</span>
+
+ <v-spacer></v-spacer>
+
+ <v-toolbar-items>
+ <v-btn text>
+ News
+ </v-btn>
+
+ <v-divider
+ inset
+ light
+ vertical
+ ></v-divider>
+
+ <v-btn text>
+ Blog
+ </v-btn>
+
+ <v-divider
+ inset
+ light
+ vertical
+ ></v-divider>
+
+ <v-btn text>
+ Music
+ </v-btn>
+
+ <v-divider
+ inset
+ light
+ vertical
+ ></v-divider>
+ </v-toolbar-items>
+
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+ </v-toolbar>
+</template>
diff --git a/packages/docs/src/lang/en/components/Dividers.json b/packages/docs/src/lang/en/components/Dividers.json
index d05b4b8d8f6..c45b14562b1 100644
--- a/packages/docs/src/lang/en/components/Dividers.json
+++ b/packages/docs/src/lang/en/components/Dividers.json
@@ -5,26 +5,21 @@
"usage": {
"desc": "Dividers in their simplest form display a horizontal line."
},
- "lightAndDark": {
- "header": "### Light and dark",
- "desc": "Dividers have light and dark theme variants.",
- "uninverted": true
- },
"inset": {
"header": "### Inset dividers",
"desc": "Inset dividers are moved 72px to the right. This will cause them to line up with list items."
},
"vertical": {
"header": "### Vertical dividers",
- "desc": "Vertical dividers give you more tools for unique layouts and can be paired with the inset property for even more options."
+ "desc": "Vertical dividers give you more tools for unique layouts."
},
- "subheaders": {
- "header": "### Subheaders and dividers",
- "desc": "Subheaders can be lined up with inset dividers by using the same prop."
+ "verticalInset": {
+ "header": "### Vertical inset dividers",
+ "desc": "Vertical dividers can also be paired with the inset property for even more options."
},
- "dividerList": {
- "header": "### List dividers",
- "desc": "Inset dividers and subheaders can help break up content"
+ "subheaders": {
+ "header": "### Dividers and subheaders",
+ "desc": "Dividers and subheaders can help break up content and can be lined up with one another by using the same inset prop."
},
"dividerListPortrait": {
"header": "### Dividers in Portrait View",
|
d0dea264541bd6ae79ed3ab0e741a7ace8fd8b8b
|
2019-05-10 20:44:52
|
John Leider
|
docs(rollbar): remove rollbar integration
| false
|
remove rollbar integration
|
docs
|
diff --git a/packages/docs/package.json b/packages/docs/package.json
index bcd6857570a..362a15b16db 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -32,7 +32,6 @@
"moment": "^2.24.0",
"node-fetch": "^2.3.0",
"pluralize": "^7.0.0",
- "rollbar": "^2.5.4",
"route-cache": "^0.4.4",
"serve-favicon": "^2.5.0",
"vee-validate": "^2.2.0",
diff --git a/packages/docs/server.js b/packages/docs/server.js
index e3ad73c879e..05882e14747 100644
--- a/packages/docs/server.js
+++ b/packages/docs/server.js
@@ -10,7 +10,6 @@ const resolve = file => path.resolve(__dirname, file)
const { createBundleRenderer } = require('vue-server-renderer')
const Ouch = require('ouch')
const redirects = require('./src/router/301.json')
-const rollbar = require('./src/util/rollbar')
const isProd = process.env.NODE_ENV === 'production'
const useMicroCache = process.env.MICRO_CACHE !== 'false'
@@ -72,7 +71,6 @@ const serve = (path, cache) => express.static(resolve(path), {
app.use(express.json())
app.use(cookieParser())
-rollbar.options.enabled && app.use(rollbar.errorHandler())
app.use(compression({ threshold: 0 }))
app.use(favicon('./src/public/favicon.ico'))
app.use('/', serve('./src/public', true))
diff --git a/packages/docs/src/plugins/index.js b/packages/docs/src/plugins/index.js
index 94fe83eaa6b..80a54ecd094 100644
--- a/packages/docs/src/plugins/index.js
+++ b/packages/docs/src/plugins/index.js
@@ -1,3 +1,2 @@
// Make this dynamic
import '@/plugins/no-ssr'
-import '@/plugins/rollbar'
diff --git a/packages/docs/src/plugins/rollbar.js b/packages/docs/src/plugins/rollbar.js
deleted file mode 100644
index 89f4ef3c11d..00000000000
--- a/packages/docs/src/plugins/rollbar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Vue from 'vue'
-import rollbar from '../util/rollbar'
-
-if (rollbar.enabled) {
- Vue.prototype.$rollbar = rollbar
- Vue.config.errorHandler = (err, vm, info) => {
- rollbar.error(err, { info })
- }
-}
diff --git a/packages/docs/src/util/rollbar.js b/packages/docs/src/util/rollbar.js
deleted file mode 100644
index 8c17ef2bc5b..00000000000
--- a/packages/docs/src/util/rollbar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const Rollbar = require('rollbar')
-
-const tokens = {
- server: '55e39f2b749c4fb88a4e097b1922af8d',
- client: 'ab7bd8b91ef94a13897d45f6972578d4'
-}
-
-let rollbar = {
- options: { enabled: false }
-}
-
-if (process.env.NODE_ENV === 'production' && !!process.env.NOW_URL) {
- rollbar = new Rollbar({
- accessToken: process.env.VUE_ENV === 'client' ? tokens.client : tokens.server,
- captureUncaught: true,
- captureUnhandledRejections: true,
- enabled: true,
- source_map_enabled: true,
- environment: process.env.NODE_ENV,
- verbose: true,
- payload: {
- server: {
- host: process.env.NOW_URL
- }
- }
- })
-}
-
-module.exports = rollbar
diff --git a/yarn.lock b/yarn.lock
index a065516689f..4b701355061 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2691,11 +2691,6 @@ async@^2.5.0, async@^2.6.1:
dependencies:
lodash "^4.17.11"
-async@~1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
- integrity sha1-pIFqF81f9RbfosdpikUzabl5DeA=
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -4454,11 +4449,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
[email protected]:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/console-polyfill/-/console-polyfill-0.3.0.tgz#84900902a18c47a5eba932be75fa44d23e8af861"
- integrity sha512-w+JSDZS7XML43Xnwo2x5O5vxB0ID7T5BdqDtyqT6uiCAX2kZAgcWxNaGqT97tZfSHzfOcvrfsDAodKcJ3UvnXQ==
-
consolidate@^0.15.1:
version "0.15.1"
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -5075,13 +5065,6 @@ debuglog@^1.0.1:
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
-decache@^3.0.5:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/decache/-/decache-3.1.0.tgz#4f5036fbd6581fcc97237ac3954a244b9536c2da"
- integrity sha1-T1A2+9ZYH8yXI3rDlUokS5U2wto=
- dependencies:
- find "^0.2.4"
-
decamelize-keys@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5609,13 +5592,6 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
[email protected]:
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-1.3.3.tgz#fada6e3a9cd2b0e080e6d6fc751418649734f35c"
- integrity sha1-+tpuOpzSsOCA5tb8dRQYZJc081w=
- dependencies:
- stackframe "^0.3.1"
-
error-stack-parser@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
@@ -6353,13 +6329,6 @@ find-up@^3.0.0:
dependencies:
locate-path "^3.0.0"
-find@^0.2.4:
- version "0.2.9"
- resolved "https://registry.yarnpkg.com/find/-/find-0.2.9.tgz#4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"
- integrity sha1-S3Px/55WrZG3bnFkB/5f/mVUu4w=
- dependencies:
- traverse-chain "~0.1.0"
-
findup-sync@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -7853,11 +7822,6 @@ is-wsl@^1.1.0:
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-is_js@^0.9.0:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/is_js/-/is_js-0.9.0.tgz#0ab94540502ba7afa24c856aa985561669e9c52d"
- integrity sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0=
-
[email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -8527,7 +8491,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
[email protected], json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
[email protected], json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
@@ -9006,11 +8970,6 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
-lru-cache@~2.2.1:
- version "2.2.4"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
- integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
-
macos-release@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
@@ -11627,13 +11586,6 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"
-request-ip@~2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-2.0.2.tgz#deeae6d4af21768497db8cd05fa37143f8f1257e"
- integrity sha1-3urm1K8hdoSX24zQX6NxQ/jxJX4=
- dependencies:
- is_js "^0.9.0"
-
[email protected]:
version "1.1.2"
resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
@@ -11798,22 +11750,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"
-rollbar@^2.5.4:
- version "2.5.4"
- resolved "https://registry.yarnpkg.com/rollbar/-/rollbar-2.5.4.tgz#8b2ec6de999aaeee04c784110ecb40268a38c71d"
- integrity sha512-JIcDNTqnHstU/vXBRafrh0pKB9Wc1FXP/wI33xhs84MJyCGw00vQ2nVDjH8Zq6M/EH0Fmezrr8vA4AikTvsISA==
- dependencies:
- async "~1.2.1"
- console-polyfill "0.3.0"
- debug "2.6.9"
- error-stack-parser "1.3.3"
- json-stringify-safe "~5.0.0"
- lru-cache "~2.2.1"
- request-ip "~2.0.1"
- uuid "3.0.x"
- optionalDependencies:
- decache "^3.0.5"
-
route-cache@^0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/route-cache/-/route-cache-0.4.4.tgz#c7141fac4e44d1480dae1c1ba44458d91ad1a98a"
@@ -12460,11 +12396,6 @@ stack-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
-stackframe@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4"
- integrity sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=
-
stackframe@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
@@ -13042,11 +12973,6 @@ tr46@^1.0.1:
dependencies:
punycode "^2.1.0"
-traverse-chain@~0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1"
- integrity sha1-YdvC1Ttp/2CRoSoWj9fUMxB+QPE=
-
[email protected]:
version "0.6.6"
resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
@@ -13484,11 +13410,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
[email protected]:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
- integrity sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=
-
uuid@^3.0.1, uuid@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
|
768354778575a7b47c8da9075bb125d3864979e9
|
2018-04-05 08:18:56
|
John Leider
|
feat(v-text-field): added new features, new styles
| false
|
added new features, new styles
|
feat
|
diff --git a/src/components/VInput/VInput.js b/src/components/VInput/VInput.js
index cf61ff1de2a..6980f119792 100755
--- a/src/components/VInput/VInput.js
+++ b/src/components/VInput/VInput.js
@@ -40,9 +40,6 @@ export default {
},
computed: {
- classesColor () {
- return this.addTextColorClassChecks({}, this.validationState)
- },
classesInput () {
return {
...this.classes,
@@ -53,8 +50,8 @@ export default {
'v-input--is-focused': this.isFocused,
'v-input--is-loading': this.loading !== false,
...this.classesColor,
- 'theme--light': !this.dark,
- 'theme--dark': this.dark
+ ...this.addTextColorClassChecks({}, this.validationState),
+ ...this.themeClasses
}
},
// Implementing components can
@@ -140,7 +137,10 @@ export default {
genInputWrapper () {
return this.$createElement('div', {
staticClass: 'v-input__wrapper',
- 'class': this.classesColor,
+ 'class': this.addTextColorClassChecks(
+ {},
+ this.hasState ? this.validationState : this.color
+ ),
style: {
height: this.computedHeight
}
diff --git a/src/components/VTextField/VTextField.js b/src/components/VTextField/VTextField.js
index 1852101eb63..d939e91043c 100755
--- a/src/components/VTextField/VTextField.js
+++ b/src/components/VTextField/VTextField.js
@@ -10,7 +10,6 @@ import VInput from '../VInput'
// Mixins
import Maskable from '../../mixins/maskable'
-import Soloable from '../../mixins/soloable'
const dirtyTypes = ['color', 'file', 'time', 'date', 'datetime-local', 'week', 'month']
@@ -19,10 +18,7 @@ export default {
extends: VInput,
- mixins: [
- Maskable,
- Soloable
- ],
+ mixins: [Maskable],
inheritAttrs: false,
@@ -48,11 +44,14 @@ export default {
default: 'primary'
},
counter: [Boolean, Number, String],
+ flat: Boolean,
fullWidth: Boolean,
label: String,
placeholder: String,
prefix: String,
singleLine: Boolean,
+ solo: Boolean,
+ soloInverted: Boolean,
suffix: String,
type: {
type: String,
@@ -63,11 +62,13 @@ export default {
computed: {
classes () {
return {
- 'v-input--text': true,
- 'v-input--text--prefix': this.prefix,
- 'v-input--text--single-line': this.isSingle,
- 'v-input--text--solo': this.solo,
- 'v-input--text--box': (this.box || this.solo)
+ 'v-text-field': true,
+ 'v-text-field--prefix': this.prefix,
+ 'v-text-field--single-line': this.isSingle,
+ 'v-text-field--solo': this.isSolo,
+ 'v-text-field--solo-inverted': this.soloInverted,
+ 'v-text-field--box': (this.box || this.solo),
+ 'elevation-0': this.flat
}
},
internalValue: {
@@ -93,7 +94,10 @@ export default {
return this.isDirty || dirtyTypes.includes(this.type)
},
isSingle () {
- return this.solo || this.singleLine
+ return this.isSolo || this.singleLine
+ },
+ isSolo () {
+ return this.solo || this.soloInverted
}
},
@@ -230,25 +234,32 @@ export default {
},
genDefaultSlot () {
return [
- this.genLabel(),
- this.prefix ? this.genAffix('prefix') : null,
- this.genInput(),
- this.suffix ? this.genAffix('suffix') : null,
+ this.genTextFieldWrapper(),
this.genIconSlot(),
this.genProgress()
]
},
genMessages () {
return this.$createElement('div', {
- staticClass: 'v-input--text__details'
+ staticClass: 'v-text-field__details'
}, [
VInput.methods.genMessages.call(this),
this.genCounter()
])
},
+ genTextFieldWrapper () {
+ return this.$createElement('div', {
+ staticClass: 'v-text-field__wrapper'
+ }, [
+ this.genLabel(),
+ this.prefix ? this.genAffix('prefix') : null,
+ this.genInput(),
+ this.suffix ? this.genAffix('suffix') : null
+ ])
+ },
genAffix (type) {
return this.$createElement('div', {
- 'class': `v-input--text__${type}`,
+ 'class': `v-text-field__${type}`,
ref: type
}, this[type])
},
diff --git a/src/mixins/soloable.js b/src/mixins/soloable.js
deleted file mode 100644
index 5b58fd08d9f..00000000000
--- a/src/mixins/soloable.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default {
- name: 'soloable',
-
- props: {
- flat: Boolean,
- soloInverted: Boolean,
- solo: Boolean
- },
-
- computed: {
- isSolo () {
- return this.solo || this.soloInverted
- }
- },
-
- methods: {
- genSoloClasses () {
- return {
- 'input-group--solo': this.isSolo,
- 'input-group--solo-inverted': this.soloInverted,
- 'elevation-0': this.flat
- }
- }
- }
-}
diff --git a/src/stylus/components/_messages.styl b/src/stylus/components/_messages.styl
index 4339c6ab018..2af846ed5f7 100644
--- a/src/stylus/components/_messages.styl
+++ b/src/stylus/components/_messages.styl
@@ -17,8 +17,9 @@ theme(v-messages, "v-messages")
&__message
line-height: 1
+ position: absolute
transition: $primary-transition
- .slide-y-transition-leave,
- .slide-y-transition-leave-active
- position: absolute
+ // .slide-y-transition-leave,
+ // .slide-y-transition-leave-active
+ // position: absolute
diff --git a/src/stylus/components/_radio-group.styl b/src/stylus/components/_radio-group.styl
index e42bb924325..cf152a31444 100644
--- a/src/stylus/components/_radio-group.styl
+++ b/src/stylus/components/_radio-group.styl
@@ -19,3 +19,6 @@ theme(radiogroup, "radio-group")
&--column
.v-input--radio-group__input
flex-direction: column
+
+ .v-radio:not(:last-child)
+ margin-bottom: 8px
diff --git a/src/stylus/components/_radios.styl b/src/stylus/components/_radios.styl
index f373cbdd884..cd558384369 100644
--- a/src/stylus/components/_radios.styl
+++ b/src/stylus/components/_radios.styl
@@ -4,7 +4,7 @@
.v-radio
align-items: center
display: flex
- height: 32px
+ height: auto
margin-right: 16px
outline: none
diff --git a/src/stylus/components/_text-fields.styl b/src/stylus/components/_text-fields.styl
index 49bc6f12b47..910422f3ae3 100755
--- a/src/stylus/components/_text-fields.styl
+++ b/src/stylus/components/_text-fields.styl
@@ -1,18 +1,37 @@
@import '../bootstrap'
@import '../theme'
-v-input--text($material)
+v-text-field($material)
&:not(.v-input--has-state)
.v-input__wrapper:before
- background-color: $material.dividers
+ background-color: $material.input-bottom-line
+
+ &:hover
+ .v-input__wrapper:before
+ background-color: $material.text.primary
&__prefix,
&__suffix
color: $material.text.secondary
-theme(v-input--text, "v-input--text")
+ &.v-text-field--solo
+ background: $material.cards
+
+ &.v-text-field--solo-inverted
+ background: rgba($material.inputs.solo-inverted)
+
+ &.v-input--is-focused
+ background: rgba($material.inputs.solo-inverted-focused)
-.v-input--text
+ // May need to remove this
+ .icon,
+ input,
+ label
+ color: $material.inputs.solo-inverted-focused-text
+
+theme(v-text-field, "v-text-field")
+
+.v-text-field
&__details
display: flex
flex: 1 0 auto
@@ -30,17 +49,50 @@ theme(v-input--text, "v-input--text")
&__suffix
padding: 8px 0 8px 4px
+ &__wrapper
+ flex: 1 1 auto
+ position: relative
+
+ &--solo
+ padding: 8px 16px
+ elevation(2)
+
+ .v-input__icon--prepend
+ margin-left: 0
+
+ .v-input__icon--outer
+ margin-right: 0
+
+ .v-input__wrapper
+ margin-bottom: 0
+ position: static
+
+ &:before,
+ &:after
+ display: none
+
+ .v-text-field__details
+ bottom: -22px
+ position: absolute
+ width: 100%
+
.v-counter
white-space: nowrap
.v-label
+ line-height: normal // needed because of hidden overflow clips y axis of text
+ max-width: 100%
+ overflow: hidden
+ text-overflow: ellipsis
top: calc(50% - 10px)
transform-origin: top left
+ white-space: nowrap
- &.v-input--is-focused,
- &.v-input--is-label-active
- .v-label
- transform: translateY(-19px) scale(0.75)
+ &:not(.v-text-field--solo)
+ &.v-input--is-focused,
+ &.v-input--is-label-active
+ .v-label--active
+ transform: translateY(-19px) scale(0.75)
&.v-input--is-focused
.v-input__wrapper:after
@@ -72,383 +124,3 @@ theme(v-input--text, "v-input--text")
background-color: currentColor
height: 2px
transform: scaleX(0)
-
-// v-input--text($material)
-// &__wrapper:before
-// background-color: $material.dividers
-
-// .v-input__wrapper:before
-// background-image: linear-gradient(
-// to right,
-// $material.text.disabled 0,
-// $material.text.disabled 33%,
-// transparent 0
-// )
-
-// &--box
-// background: $material.inputs.box
-
-// &--solo
-// background: $material.cards
-
-// &__prefix,
-// &__suffix
-// color: $material.text.secondary
-
-// theme(v-input--text, "v-input--text")
-
-// .v-input--text
-// .v-label--active
-// transform: translate(0, -10px) scale(.75)
-
-// &--prefix
-// &:not(.v-input--text--solo)
-// .v-label
-// left: 14px
-
-// &--prefix
-// &.v-input--is-dirty,
-// &.v-input--is-focused
-// &:not(.v-input--text--single-line)
-// .v-label
-// left: 0
-
-// &.v-input--text--box
-// border-radius: $card-border-radius
-// cursor: text
-// margin: 16px 0 28px
-// position: relative
-// elevation(2)
-
-// .v-input__wrapper
-// align-items: center
-// border-bottom: none !important
-// height: 52px
-// padding: 0 16px
-
-// .v-input__append-outer,
-// .v-input__prepend-outer
-// align-self: center
-
-// .v-label--active
-// transform: scale(0.75)
-
-// input
-// align-self: flex-end
-
-// &:after
-// background-color: currentColor
-// border-bottom-left-radius: $card-border-radius
-// border-bottom-right-radius: $card-border-radius
-// bottom: -1px
-// content: ''
-// height: 2px
-// left: 0
-// position: absolute
-// transition: $primary-transition
-// transform: scaleX(0)
-// width: 100%
-
-// .v-input__wrapper
-// &:after
-// display: none
-
-// .v-input__append-inner,
-// .v-input__append-outer
-// padding-right: 16px
-
-// .v-input__prepend-outer
-// padding-left: 16px
-
-// + .v-input__control .v-input__wrapper
-// padding: 0
-
-// &.v-input--is-focused:after
-// transform: scaleX(1)
-
-// &.v-input--text--solo
-// input
-// border-bottom: 1px solid transparent // Input not lining up with label
-// height: 100%
-
-// &:after
-// display: none
-
-// &__prefix
-// margin-right: 4px
-
-// &__prefix,
-// &__suffix
-// height: 32px
-// font-size: 16px
-// line-height: 1
-// padding: 8px 0 8px
-
-// .v-input__wrapper
-// &:before,
-// &:after
-// bottom: -1px
-// content: ''
-// left: 0
-// position: absolute
-// transition: $primary-transition
-// width: 100%
-
-// &:before
-// background-color: transparent
-// background-position: bottom
-// background-repeat: repeat-x
-// background-size: 3px 1px
-// height: 1px
-
-// &:after
-// background-color: currentColor
-// height: 2px
-// transform: scaleX(0)
-
-// textfield($material)
-// &.input-group--text-field-box
-// .input-group__input
-// background: $material.buttons.focused-alt
-
-// input::placeholder,
-// textarea::placeholder
-// color: $material.text.disabled
-
-// &:not(.input-group--error)
-// .input-group__counter
-// color: $material.text.secondary
-
-// theme(textfield, "input-group--text-field")
-
-// /** Label */
-// .input-group--text-field label
-// position: absolute
-// top: $input-group-text-field-label-top
-// left: 0
-
-// /** Input */
-// .input-group--text-field
-// // TODO: Revisit in 1.1 refactor
-// // Input was mis-aligned by 1px
-// input
-// padding-bottom: 1px
-
-// input,
-// textarea
-// font-size: $input-font-size
-
-// &::placeholder
-// color: inherit
-// transition: .3s $transition.swing
-
-// .input-group--text-field input
-// box-shadow: none
-// flex: 1
-// height: $input-height
-// margin: 0
-// min-width: 0
-// overflow: hidden
-// text-overflow: ellipsis
-// white-space: nowrap
-
-// &:focus
-// outline: none
-
-// &:disabled
-// pointer-events: none
-
-// /** Textarea */
-// .input-group--text-field
-// textarea
-// flex: 1 1
-
-// &:focus
-// outline: none
-
-// .input-group--text-field.input-group--textarea
-// label
-// top: 13px
-
-// .input-group__input
-// border-radius: 2px
-// transition: .4s $transition.fast-in-fast-out
-
-// textarea
-// font-size: $input-font-size
-// transition: .3s $transition.swing
-
-// &:not(.input-group--full-width)
-// label
-// top: 30px
-// left: 15px
-
-// .input-group__input
-// padding: 30px 0 0 13px
-
-// .input-group__details
-// &:before,
-// &:after
-// opacity: 0
-
-// /** Counter */
-// .input-group--text-field
-// .input-group__counter
-// margin-left: auto
-
-// &--error
-// color: inherit
-
-// /** Input States */
-// .input-group--text-field
-// &.input-group--placeholder.input-group--dirty
-// input::placeholder,
-// textarea::placeholder
-// opacity: 0
-
-// /** No Resize */
-// .input-group--text-field
-// &.input-group--no-resize textarea
-// resize: none
-
-// /** Types */
-// .input-group--text-field
-// // Icons
-// &.input-group--prepend-icon
-// .input-group__prepend-icon
-// align-items: center
-// display: flex
-// justify-content: flex-start
-// min-width: 40px
-
-// .input-group__details
-// margin-left: auto
-// max-width: calc(100% - 40px)
-
-// label
-// left: 40px
-
-// &:not(.input-group--single-line)
-// &.input-group--focused,
-// &.input-group--placeholder
-// label
-// opacity: 1
-
-// &:not(.input-group--textarea)
-// label
-// transform: translate(0, -18px) scale(.75)
-
-// &:not(.input-group--full-width).input-group--textarea
-// label
-// transform: translate(0, -8px) scale(.75)
-
-// &.input-group--text-field-box
-// label
-// transform: translate(0, -10px) scale(.75)
-
-// &.input-group--dirty
-// &.input-group--select,
-// &:not(.input-group--textarea)
-// label
-// transform: translate(0, -18px) scale(.75)
-
-// &:not(.input-group--full-width).input-group--textarea
-// label
-// transform: translate(0, -8px) scale(.75)
-
-// // Multi Line
-// &.input-group--multi-line
-// textarea
-// padding-top: 4px
-
-// // Full Width
-// &.input-group--full-width
-// padding: 16px
-
-// label
-// margin-left: $grid-gutters.lg
-
-// .input-group__details:before, .input-group__details:after
-// display: none
-
-// /** Prefix/Suffix */
-// .input-group--prefix
-// &:not(.input-group--focused):not(.input-group--dirty)
-// label
-// left: 16px
-
-// .input-group--prefix,
-// .input-group--suffix
-// .input-group--text-field__prefix,
-// .input-group--text-field__suffix
-// align-items: center
-// display: inline-flex
-// font-size: 16px
-// margin-top: 1px
-
-// .input-group--text-field__prefix
-// margin-right: 3px
-
-// .input-group--text-field__suffix
-// margin-left: 3px
-
-// /** Box */
-// .input-group--text-field-box
-// input, textarea
-// cursor: pointer
-
-// label
-// left: 16px
-
-// .input-group__input
-// align-items: flex-end
-// border-radius: 4px 4px 0 0
-// cursor: pointer
-// min-height: 56px
-// user-select: none
-
-// .input-group__details
-// padding: 8px 16px 0
-// user-select: none
-
-// &:before,
-// &:after
-// height: 2px
-// border-bottom-left-radius: 4px
-// border-bottom-right-radius: 4px
-
-// &.input-group--multi-line
-// textarea
-// padding-left: 24px
-// padding-right: 24px
-
-// &:not(.input-group--textarea)
-// &.input-group--multi-line
-// .input-group__input
-// padding-top: 26px
-
-// label
-// top: 26px
-
-// &:not(.input-group--multi-line)
-// .input-group__input
-// padding-left: 16px
-// padding-right: 16px
-
-// label
-// top: 32px
-
-// &:not(.input-group--single-line)
-// &.input-group--focused,
-// &.input-group--dirty
-// label
-// transform: translate(0, -10px) scale(0.75)
-// // Icons
-// &.input-group--prepend-icon
-// .input-group__details
-// &:before, &:after
-// margin-left: 56px
-// max-width: calc(100% - 56px)
-
-// label
-// left: 56px
diff --git a/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap b/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap
index 648a54e3b68..7fa66f08159 100644
--- a/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap
+++ b/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap
@@ -12,9 +12,9 @@ exports[`VDataIterator.js should match a snapshot - footer slot 1`] = `
<div class="v-data-iterator__actions">
<div class="v-data-iterator__actions__select">
Items per page:
- <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+ <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -91,7 +91,7 @@ exports[`VDataIterator.js should match a snapshot - footer slot 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
@@ -156,9 +156,9 @@ exports[`VDataIterator.js should match a snapshot - no data 1`] = `
<div class="v-data-iterator__actions">
<div class="v-data-iterator__actions__select">
Items per page:
- <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+ <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -235,7 +235,7 @@ exports[`VDataIterator.js should match a snapshot - no data 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
@@ -291,9 +291,9 @@ exports[`VDataIterator.js should match a snapshot - no matching records 1`] = `
<div class="v-data-iterator__actions">
<div class="v-data-iterator__actions__select">
Items per page:
- <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+ <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -370,7 +370,7 @@ exports[`VDataIterator.js should match a snapshot - no matching records 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
@@ -430,9 +430,9 @@ exports[`VDataIterator.js should match a snapshot - with data 1`] = `
<div class="v-data-iterator__actions">
<div class="v-data-iterator__actions__select">
Items per page:
- <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+ <div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -509,7 +509,7 @@ exports[`VDataIterator.js should match a snapshot - with data 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
diff --git a/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap b/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap
index cf464ce3a1a..94bf45a9c32 100644
--- a/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap
+++ b/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap
@@ -68,9 +68,9 @@ exports[`VDataTable.vue should match a snapshot - no data 1`] = `
<div class="v-datatable__actions">
<div class="v-datatable__actions__select">
Rows per page:
- <div class="v-input v-select v-input--text theme--light">
+ <div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -144,7 +144,7 @@ exports[`VDataTable.vue should match a snapshot - no data 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
@@ -254,9 +254,9 @@ exports[`VDataTable.vue should match a snapshot - no matching results 1`] = `
<div class="v-datatable__actions">
<div class="v-datatable__actions__select">
Rows per page:
- <div class="v-input v-select v-input--text theme--light">
+ <div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -330,7 +330,7 @@ exports[`VDataTable.vue should match a snapshot - no matching results 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
@@ -442,9 +442,9 @@ exports[`VDataTable.vue should match a snapshot - with data 1`] = `
<div class="v-datatable__actions">
<div class="v-datatable__actions__select">
Rows per page:
- <div class="v-input v-select v-input--text theme--light">
+ <div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -518,7 +518,7 @@ exports[`VDataTable.vue should match a snapshot - with data 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
</div>
</div>
</div>
diff --git a/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap b/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap
index bcfd2044ae9..57503d43905 100644
--- a/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap
+++ b/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap
@@ -2,7 +2,7 @@
exports[`VInput.js should generate an icon and match snapshot 1`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__prepend-outer">
<div class="v-input__icon v-input__icon--prepend">
<i aria-hidden="true"
@@ -28,7 +28,7 @@ exports[`VInput.js should generate an icon and match snapshot 1`] = `
exports[`VInput.js should generate an icon and match snapshot 2`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
@@ -56,7 +56,7 @@ exports[`VInput.js should generate an icon and match snapshot 2`] = `
exports[`VInput.js should generate append and prepend slots 1`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__prepend-outer">
<div>
prepend-icon
@@ -78,7 +78,7 @@ exports[`VInput.js should generate append and prepend slots 1`] = `
exports[`VInput.js should generate append and prepend slots 2`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
@@ -95,7 +95,7 @@ exports[`VInput.js should generate append and prepend slots 2`] = `
exports[`VInput.js should generate append and prepend slots 3`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__prepend-outer">
<div>
prepend
@@ -117,7 +117,7 @@ exports[`VInput.js should generate append and prepend slots 3`] = `
exports[`VInput.js should generate append and prepend slots 4`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
@@ -139,7 +139,7 @@ exports[`VInput.js should generate append and prepend slots 4`] = `
exports[`VInput.js should not generate input details 1`] = `
-<div class="v-input theme--light">
+<div class="v-input">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
diff --git a/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap b/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap
index 3b275193331..a31174a88d2 100644
--- a/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap
+++ b/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap
@@ -2,7 +2,7 @@
exports[`VRadioGroup.vue should be in error when v-radio-group is 1`] = `
-<div class="v-input v-input--selection-controls v-input--radio-group v-input--radio-group--column v-input--has-state error--text theme--light">
+<div class="v-input v-input--selection-controls v-input--radio-group v-input--radio-group--column v-input--has-state error--text">
<div class="v-input__control">
<div class="v-input__wrapper error--text">
<div role="radiogroup"
@@ -41,7 +41,7 @@ exports[`VRadioGroup.vue should be in error when v-radio-group is 1`] = `
exports[`VRadioGroup.vue should be in error when v-radio-group is 2`] = `
-<div class="v-input v-input--selection-controls v-input--radio-group v-input--radio-group--column theme--light">
+<div class="v-input v-input--selection-controls v-input--radio-group v-input--radio-group--column">
<div class="v-input__control">
<div class="v-input__wrapper">
<div role="radiogroup"
@@ -80,7 +80,7 @@ exports[`VRadioGroup.vue should be in error when v-radio-group is 2`] = `
exports[`VRadioGroup.vue should render role on radio group 1`] = `
-<div class="v-input v-input--selection-controls v-input--radio-group v-input--radio-group--column theme--light">
+<div class="v-input v-input--selection-controls v-input--radio-group v-input--radio-group--column">
<div class="v-input__control">
<div class="v-input__wrapper">
<div role="radiogroup"
diff --git a/test/unit/components/VSelect/__snapshots__/VSelect.spec.js.snap b/test/unit/components/VSelect/__snapshots__/VSelect.spec.js.snap
index 4bfd6387536..7f4cf257dfc 100644
--- a/test/unit/components/VSelect/__snapshots__/VSelect.spec.js.snap
+++ b/test/unit/components/VSelect/__snapshots__/VSelect.spec.js.snap
@@ -10,9 +10,9 @@ exports[`VSelect should escape items in menu 1`] = `
exports[`VSelect should only show items if they are in items 1`] = `
-<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -43,7 +43,7 @@ exports[`VSelect should only show items if they are in items 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -56,9 +56,9 @@ exports[`VSelect should only show items if they are in items 1`] = `
exports[`VSelect should only show items if they are in items 2`] = `
-<div class="v-input v-select v-input--text theme--light">
+<div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -86,7 +86,7 @@ exports[`VSelect should only show items if they are in items 2`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -99,9 +99,9 @@ exports[`VSelect should only show items if they are in items 2`] = `
exports[`VSelect should only show items if they are in items 3`] = `
-<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -132,7 +132,7 @@ exports[`VSelect should only show items if they are in items 3`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -145,9 +145,9 @@ exports[`VSelect should only show items if they are in items 3`] = `
exports[`VSelect should only show items if they are in items 4`] = `
-<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -181,7 +181,7 @@ exports[`VSelect should only show items if they are in items 4`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -194,9 +194,9 @@ exports[`VSelect should only show items if they are in items 4`] = `
exports[`VSelect should render v-select correctly when not using scope slot 1`] = `
-<div class="v-input v-select v-input--text theme--light">
+<div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -224,7 +224,7 @@ exports[`VSelect should render v-select correctly when not using scope slot 1`]
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -237,9 +237,9 @@ exports[`VSelect should render v-select correctly when not using scope slot 1`]
exports[`VSelect should render v-select correctly when not using v-list-tile in item scope slot 1`] = `
-<div class="v-input v-select v-input--text theme--light">
+<div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -267,7 +267,7 @@ exports[`VSelect should render v-select correctly when not using v-list-tile in
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -280,9 +280,9 @@ exports[`VSelect should render v-select correctly when not using v-list-tile in
exports[`VSelect should render v-select correctly when using v-list-tile in item scope slot 1`] = `
-<div class="v-input v-select v-input--text theme--light">
+<div class="v-input v-select v-input--text">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -310,7 +310,7 @@ exports[`VSelect should render v-select correctly when using v-list-tile in item
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
diff --git a/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap b/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap
index b444112bc98..f3690199afe 100644
--- a/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap
+++ b/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap
@@ -2,9 +2,9 @@
exports[`VSelect should be clearable with prop, dirty and multi select 1`] = `
-<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -44,7 +44,7 @@ exports[`VSelect should be clearable with prop, dirty and multi select 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -57,9 +57,9 @@ exports[`VSelect should be clearable with prop, dirty and multi select 1`] = `
exports[`VSelect should be clearable with prop, dirty and single select 1`] = `
-<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty theme--light">
+<div class="v-input v-select v-input--text v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
<div class="menu"
@@ -99,7 +99,7 @@ exports[`VSelect should be clearable with prop, dirty and single select 1`] = `
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
diff --git a/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap b/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap
index 29bad8d66c2..0e4a6d53506 100644
--- a/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap
+++ b/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap
@@ -2,7 +2,7 @@
exports[`VSlider.vue should be focused when active 1`] = `
-<div class="v-input v-input--slider v-input--is-label-active v-input--is-dirty v-input--is-focused theme--light">
+<div class="v-input v-input--slider v-input--is-label-active v-input--is-dirty v-input--is-focused">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
@@ -36,7 +36,7 @@ exports[`VSlider.vue should be focused when active 1`] = `
exports[`VSlider.vue should match a snapshot 1`] = `
-<div class="v-input v-input--slider theme--light">
+<div class="v-input v-input--slider">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
@@ -70,7 +70,7 @@ exports[`VSlider.vue should match a snapshot 1`] = `
exports[`VSlider.vue should render component with thumbLabel and match a snapshot 1`] = `
-<div class="v-input v-input--slider theme--light">
+<div class="v-input v-input--slider">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
@@ -113,7 +113,7 @@ exports[`VSlider.vue should render component with thumbLabel and match a snapsho
exports[`VSlider.vue should render component with ticks and match a snapshot 1`] = `
-<div class="v-input v-input--slider v-input--slider--ticks theme--light">
+<div class="v-input v-input--slider v-input--slider--ticks">
<div class="v-input__control">
<div class="v-input__wrapper"
style="height: 32px;"
diff --git a/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap b/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap
index 40e482f0f75..b3542b8b8ef 100644
--- a/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap
+++ b/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap
@@ -18,26 +18,28 @@ exports[`VTextField.js should calculate element height when using auto-grow prop
exports[`VTextField.js should have prefix and suffix 1`] = `
-<div class="v-input v-input--text v-input--text--prefix theme--light">
+<div class="v-input v-text-field v-text-field--prefix">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
- <label class="v-label"
- style="left: 12px; position: absolute;"
- >
- </label>
- <div class="v-input--text__prefix">
- $
- </div>
- <input tabindex="0"
- type="text"
- >
- <div class="v-input--text__suffix">
- .com
+ <div class="v-text-field__wrapper">
+ <label class="v-label"
+ style="left: 12px; position: absolute;"
+ >
+ </label>
+ <div class="v-text-field__prefix">
+ $
+ </div>
+ <input tabindex="0"
+ type="text"
+ >
+ <div class="v-text-field__suffix">
+ .com
+ </div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -96,21 +98,23 @@ exports[`VTextField.js should match textarea snapshot 1`] = `
exports[`VTextField.js should not display counter when set to false 1`] = `
-<div class="v-input v-input--text theme--light">
+<div class="v-input v-text-field">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
- <label class="v-label"
- style="left: 0px; position: absolute;"
- >
- </label>
- <input maxlength="50"
- tabindex="0"
- type="text"
- >
+ <div class="v-text-field__wrapper">
+ <label class="v-label"
+ style="left: 0px; position: absolute;"
+ >
+ </label>
+ <input maxlength="50"
+ tabindex="0"
+ type="text"
+ >
+ </div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -126,21 +130,23 @@ exports[`VTextField.js should not display counter when set to false 1`] = `
exports[`VTextField.js should not display counter when set to false 2`] = `
-<div class="v-input v-input--text theme--light">
+<div class="v-input v-text-field">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
- <label class="v-label"
- style="left: 0px; position: absolute;"
- >
- </label>
- <input maxlength="50"
- tabindex="0"
- type="text"
- >
+ <div class="v-text-field__wrapper">
+ <label class="v-label"
+ style="left: 0px; position: absolute;"
+ >
+ </label>
+ <input maxlength="50"
+ tabindex="0"
+ type="text"
+ >
+ </div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -153,20 +159,22 @@ exports[`VTextField.js should not display counter when set to false 2`] = `
exports[`VTextField.js should render component and match snapshot 1`] = `
-<div class="v-input v-input--text theme--light">
+<div class="v-input v-text-field">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
- <label class="v-label"
- style="left: 0px; position: absolute;"
- >
- </label>
- <input tabindex="0"
- type="text"
- >
+ <div class="v-text-field__wrapper">
+ <label class="v-label"
+ style="left: 0px; position: absolute;"
+ >
+ </label>
+ <input tabindex="0"
+ type="text"
+ >
+ </div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -179,18 +187,20 @@ exports[`VTextField.js should render component and match snapshot 1`] = `
exports[`VTextField.js should render component with async loading and custom progress and match snapshot 1`] = `
-<div class="v-input v-input--text v-input--is-loading theme--light">
+<div class="v-input v-text-field v-input--is-loading">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
- <label class="v-label"
- style="left: 0px; position: absolute;"
- >
- </label>
- <input tabindex="0"
- type="text"
- >
+ <div class="v-text-field__wrapper">
+ <label class="v-label"
+ style="left: 0px; position: absolute;"
+ >
+ </label>
+ <input tabindex="0"
+ type="text"
+ >
+ </div>
<div class="progress-linear"
style="height: 7px;"
>
@@ -208,7 +218,7 @@ exports[`VTextField.js should render component with async loading and custom pro
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
@@ -221,18 +231,20 @@ exports[`VTextField.js should render component with async loading and custom pro
exports[`VTextField.js should render component with async loading and match snapshot 1`] = `
-<div class="v-input v-input--text v-input--is-loading theme--light">
+<div class="v-input v-text-field v-input--is-loading">
<div class="v-input__control">
- <div class="v-input__wrapper"
+ <div class="v-input__wrapper primary--text"
style="height: 32px;"
>
- <label class="v-label"
- style="left: 0px; position: absolute;"
- >
- </label>
- <input tabindex="0"
- type="text"
- >
+ <div class="v-text-field__wrapper">
+ <label class="v-label"
+ style="left: 0px; position: absolute;"
+ >
+ </label>
+ <input tabindex="0"
+ type="text"
+ >
+ </div>
<div class="progress-linear"
style="height: 2px;"
>
@@ -250,7 +262,7 @@ exports[`VTextField.js should render component with async loading and match snap
</div>
</div>
</div>
- <div class="v-input--text__details">
+ <div class="v-text-field__details">
<div class="v-messages">
<div class="v-messages__wrapper">
</div>
|
ac958d8540f20417a5bbd44fcc7dd3484e5df3c2
|
2021-03-02 06:17:08
|
amajesticpotatoe
|
docs(installation): fix v3 alpha insall link
| false
|
fix v3 alpha insall link
|
docs
|
diff --git a/packages/docs/src/pages/en/getting-started/installation.md b/packages/docs/src/pages/en/getting-started/installation.md
index d2c2edfb5ae..9c6d03acdc2 100644
--- a/packages/docs/src/pages/en/getting-started/installation.md
+++ b/packages/docs/src/pages/en/getting-started/installation.md
@@ -19,7 +19,7 @@ Get started with Vuetify, the world’s most popular Vue.js framework for buildi
<alert type="error">
- The current stable version of Vuetify does not support Vue 3. Support for Vue 3 will come with the release of [Vuetify v3](/introduction/roadmap/#v30-titan). When creating a new project meant for production, please ensure you selected Vue 2 from the Vue CLI prompts, or that you are installing to an existing Vue 2 project. If you would like to create or use Vuetify v3 for testing purposes, you can read more information at [Vuetify v3 Alpha install](#vuetify-v3-alpha-preset-install)
+ The current stable version of Vuetify does not support Vue 3. Support for Vue 3 will come with the release of [Vuetify v3](/introduction/roadmap/#v30-titan). When creating a new project meant for production, please ensure you selected Vue 2 from the Vue CLI prompts, or that you are installing to an existing Vue 2 project. If you would like to create or use Vuetify v3 for testing purposes, you can read more information at [Vuetify v3 Alpha install](#vuetify-v3-alpha-install)
</alert>
|
d2081276304dbaba0937efb342dfab88c6541623
|
2023-03-22 08:11:09
|
Andrew Henry
|
docs(internationalization): fix useLocale api link
| false
|
fix useLocale api link
|
docs
|
diff --git a/packages/docs/src/pages/en/features/internationalization.md b/packages/docs/src/pages/en/features/internationalization.md
index 6b765a4ba4d..0c9d49634d3 100644
--- a/packages/docs/src/pages/en/features/internationalization.md
+++ b/packages/docs/src/pages/en/features/internationalization.md
@@ -80,7 +80,7 @@ You can change the locale during runtime by using the `useLocale` composable. If
| Feature | Description |
| - | - |
-| [useLocale](/api/vuetify/use-locale/) | The locale composable is used
+| [useLocale](/api/use-locale/) | The locale composable is used
| [v-locale-provider](/api/v-locale-provider/) | The locale provider component is used to scope a portion of your application to a different locale than the default one |
<api-inline hide-links />
|
534c77256ca1b3e2802ed561b2cd2349b6bb9a62
|
2022-02-28 21:08:17
|
John Leider
|
feat(VGrid): change default padding from 12px to 16px
| false
|
change default padding from 12px to 16px
|
feat
|
diff --git a/packages/vuetify/src/styles/settings/_variables.scss b/packages/vuetify/src/styles/settings/_variables.scss
index efd28859672..73e6a985406 100644
--- a/packages/vuetify/src/styles/settings/_variables.scss
+++ b/packages/vuetify/src/styles/settings/_variables.scss
@@ -107,8 +107,7 @@ $grid-breakpoints: map-deep-merge(
$grid-gutter: $spacer * 6 !default;
$form-grid-gutter: $spacer * 2 !default;
$grid-columns: 12 !default;
-
-$container-padding-x: $grid-gutter * .5 !default;
+$container-padding-x: $spacer * 4 !default;
$grid-gutters: () !default;
$grid-gutters: map-deep-merge(
|
19079a8fdb9dd9e96118f23a16a683eef8cb6022
|
2018-10-28 15:16:42
|
John Leider
|
fix($home-page): fixed feature cards
| false
|
fixed feature cards
|
fix
|
diff --git a/packages/vuetifyjs.com/pages/HomePage.vue b/packages/vuetifyjs.com/pages/HomePage.vue
index 55ec61f64f4..b47cc410812 100755
--- a/packages/vuetifyjs.com/pages/HomePage.vue
+++ b/packages/vuetifyjs.com/pages/HomePage.vue
@@ -278,7 +278,7 @@
return this.featured.slice(0, 6)
},
features () {
- return this.$t('Vuetify.Home.features').reverse()
+ return this.$t('Vuetify.Home.features').slice().reverse()
},
letterFromAuthor () {
return this.$t('Vuetify.Home.letterFromAuthor')
|
00a30da38a65f4f7984643945d500ce0916661e8
|
2020-05-24 05:08:45
|
MajesticPotatoe
|
chore: upgrade frontmatter-markdown-loader
| false
|
upgrade frontmatter-markdown-loader
|
chore
|
diff --git a/packages/docs-next/package.json b/packages/docs-next/package.json
index aa75c7a2a27..b1353dd68d0 100644
--- a/packages/docs-next/package.json
+++ b/packages/docs-next/package.json
@@ -37,7 +37,7 @@
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2",
"eslint-plugin-vuetify": "^1.0.0-beta.6",
- "frontmatter-markdown-loader": "^3.4.3",
+ "frontmatter-markdown-loader": "^3.5.0",
"github-markdown-css": "^4.0.0",
"html-loader": "^1.1.0",
"http-server": "^0.12.3",
diff --git a/packages/docs-next/yarn.lock b/packages/docs-next/yarn.lock
index 00c9b6fa701..9e0b38a63a3 100644
--- a/packages/docs-next/yarn.lock
+++ b/packages/docs-next/yarn.lock
@@ -882,11 +882,11 @@
fastq "^1.6.0"
"@octokit/auth-token@^2.4.0":
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.0.tgz#b64178975218b99e4dfe948253f0673cbbb59d9f"
- integrity sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.1.tgz#375d79eebd03750e6a9b0299e80b8167c7c85655"
+ integrity sha512-NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA==
dependencies:
- "@octokit/types" "^2.0.0"
+ "@octokit/types" "^4.0.1"
"@octokit/core@^2.4.3":
version "2.5.3"
@@ -939,18 +939,18 @@
deprecation "^2.3.1"
"@octokit/request-error@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.0.tgz#94ca7293373654400fbb2995f377f9473e00834b"
- integrity sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.1.tgz#49bd71e811daffd5bdd06ef514ca47b5039682d1"
+ integrity sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==
dependencies:
- "@octokit/types" "^2.0.0"
+ "@octokit/types" "^4.0.1"
deprecation "^2.0.0"
once "^1.4.0"
"@octokit/request@^5.3.0", "@octokit/request@^5.4.0":
- version "5.4.2"
- resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.2.tgz#74f8e5bbd39dc738a1b127629791f8ad1b3193ee"
- integrity sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==
+ version "5.4.3"
+ resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.3.tgz#85b78ea4ae6e1c4ac2b02528102d4cd776145935"
+ integrity sha512-RtqMzF3mhqxmWoqVD84x2gdtbqn2inTBU/HPkWf5u0R5r7fBTaLPAcCBgukeI2gjTwD9ChL9Cu0MlTBs7B/tSw==
dependencies:
"@octokit/endpoint" "^6.0.1"
"@octokit/request-error" "^2.0.0"
@@ -971,7 +971,7 @@
"@octokit/plugin-request-log" "^1.0.0"
"@octokit/plugin-rest-endpoint-methods" "3.11.0"
-"@octokit/types@^2.0.0", "@octokit/types@^2.11.1", "@octokit/types@^2.16.0":
+"@octokit/types@^2.11.1", "@octokit/types@^2.16.0":
version "2.16.2"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.16.2.tgz#4c5f8da3c6fecf3da1811aef678fda03edac35d2"
integrity sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==
@@ -1086,9 +1086,9 @@
integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
"@types/node@*", "@types/node@>= 8":
- version "14.0.4"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz#43a63fc5edce226bed106b31b875165256271107"
- integrity sha512-k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew==
+ version "14.0.5"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
+ integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -1920,9 +1920,9 @@ aws-sign2@~0.7.0:
integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
aws4@^1.8.0:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
- integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
+ integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
axios@^0.18.1:
version "0.18.1"
@@ -2667,9 +2667,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
- version "1.0.30001062"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001062.tgz#d814b648338504b315222ace6f1a533d9a55e390"
- integrity sha512-ei9ZqeOnN7edDrb24QfJ0OZicpEbsWxv7WusOiQGz/f2SfvBgHHbOEwBJ8HKGVSyx8Z6ndPjxzR6m0NQq+0bfw==
+ version "1.0.30001064"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001064.tgz#a0f49689119ba08943b09968e118faf3f645add0"
+ integrity sha512-hdBcQMFvJIrOhkpAZiRXz04Cmetwc9NekeuNl0qZfHOugxOhJKxsjF1RmISMPFjIF4PPx1reliIzbfN42EiQ5A==
case-sensitive-paths-webpack-plugin@^2.3.0:
version "2.3.0"
@@ -4146,9 +4146,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.413:
- version "1.3.447"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.447.tgz#48372c3eaaf6daccad4f8fa598bdcc455dfe5ff1"
- integrity sha512-aXQTgDBUfSejZkwrFIQZ/jJOOevQE9ROsvIs4aSib+l4FknL4qUxGWjCySu4msJFHwVKo9fkX+8bIGSHQp/vTg==
+ version "1.3.451"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz#0c075af3e2f06d706670bde0279432802ca8c83f"
+ integrity sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==
elliptic@^6.0.0, elliptic@^6.5.2:
version "6.5.2"
@@ -5084,21 +5084,21 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
-front-matter@^3.0.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-3.2.1.tgz#88be839638f397bbbcb0d61ac03bd08abb4f0a40"
- integrity sha512-YUhgEhbL6tG+Ok3vTGIoSDKqcr47aSDvyhEqIv8B+YuBJFsPnOiArNXTPp2yO07NL+a0L4+2jXlKlKqyVcsRRA==
+front-matter@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-4.0.0.tgz#41c1d7267c082d28f14566366a32369ba6bd2a82"
+ integrity sha512-N8uzPf026Za9KqPT+oeZv99PszNbeDlgZhGpqbVQL9lYfbuy7RhvfIs/kKSTMEHv/QADltU0Dp78Q9uy3GwwEg==
dependencies:
js-yaml "^3.13.1"
-frontmatter-markdown-loader@^3.4.3:
- version "3.4.3"
- resolved "https://registry.yarnpkg.com/frontmatter-markdown-loader/-/frontmatter-markdown-loader-3.4.3.tgz#a8c815173a07624a6f7d8be994cb2c18c2cad4b9"
- integrity sha512-07UWRpICJwk4UVN3yat7i42zMXbY61HbFTzs2vAGk7p5abnYG9JeaIC4gIJB6C2xH3HDlgjy5Tb2abrHfx+FFA==
+frontmatter-markdown-loader@^3.5.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/frontmatter-markdown-loader/-/frontmatter-markdown-loader-3.5.0.tgz#8b0f9fc72e8f25c49f42a2b39266bba2159e285a"
+ integrity sha512-Eu5ZdzAO66kGmL8BkXUDNgiZJyHPjShjQOdqhRwJfD6KNBjOyDa+uGyCaYOGlsOIQ/wQtAVxYfVjnuGIdlpHdw==
dependencies:
- front-matter "^3.0.1"
+ front-matter "^4.0.0"
loader-utils "^2.0.0"
- markdown-it "^10.0.0"
+ markdown-it "^11.0.0"
fs-extra@^4.0.2:
version "4.0.3"
@@ -5777,10 +5777,10 @@ http-errors@~1.7.2:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
-"http-parser-js@>=0.4.0 <0.4.11":
- version "0.4.10"
- resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
- integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+http-parser-js@>=0.5.1:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
+ integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==
[email protected]:
version "0.19.1"
@@ -5879,9 +5879,9 @@ ignore@^4.0.3, ignore@^4.0.6:
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
ignore@^5.1.1, ignore@^5.1.4:
- version "5.1.4"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
- integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106"
+ integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==
[email protected]:
version "3.0.0"
@@ -6540,9 +6540,9 @@ js-tokens@^3.0.2:
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
js-yaml@^3.13.1:
- version "3.13.1"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
- integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+ integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
@@ -6750,13 +6750,6 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-linkify-it@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
- integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
- dependencies:
- uc.micro "^1.0.1"
-
linkify-it@^3.0.1:
version "3.0.2"
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
@@ -7064,17 +7057,6 @@ markdown-it-prism@^2.0.5:
dependencies:
prismjs "1.19.0"
-markdown-it@^10.0.0:
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
- integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
- dependencies:
- argparse "^1.0.7"
- entities "~2.0.0"
- linkify-it "^2.0.0"
- mdurl "^1.0.1"
- uc.micro "^1.0.5"
-
markdown-it@^11.0.0:
version "11.0.0"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz#dbfc30363e43d756ebc52c38586b91b90046b876"
@@ -9878,9 +9860,9 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
spdx-correct@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
- integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+ integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
dependencies:
spdx-expression-parse "^3.0.0"
spdx-license-ids "^3.0.0"
@@ -11225,11 +11207,11 @@ [email protected]:
websocket-extensions ">=0.1.1"
websocket-driver@>=0.5.1:
- version "0.7.3"
- resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
- integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
+ version "0.7.4"
+ resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+ integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
dependencies:
- http-parser-js ">=0.4.0 <0.4.11"
+ http-parser-js ">=0.5.1"
safe-buffer ">=5.1.0"
websocket-extensions ">=0.1.1"
|
8f1b0819402ce4fc36f1e137262b01c749ca7416
|
2019-06-17 22:27:24
|
John Leider
|
refactor(VCard): improve loading styles
| false
|
improve loading styles
|
refactor
|
diff --git a/packages/vuetify/src/components/VCard/VCard.sass b/packages/vuetify/src/components/VCard/VCard.sass
index 4266e0076be..b277c3cd2bd 100644
--- a/packages/vuetify/src/components/VCard/VCard.sass
+++ b/packages/vuetify/src/components/VCard/VCard.sass
@@ -103,10 +103,12 @@
transition: .2s opacity map-get($transition, 'fast-in-slow-out')
.v-card--disabled
- opacity: 0.6
pointer-events: none
user-select: none
+ > *:not(.v-card__progress)
+ opacity: 0.6
+
.v-card--loading
overflow: hidden
|
f20636ad47e46249d4e344c43cceda2ac5d17d9a
|
2024-08-11 17:42:43
|
Yuchao Wu
|
refactor(VList): make itemType optional in useListItems
| false
|
make itemType optional in useListItems
|
refactor
|
diff --git a/packages/vuetify/src/components/VList/VList.tsx b/packages/vuetify/src/components/VList/VList.tsx
index fd1d33d9f38..f5c492fd9eb 100644
--- a/packages/vuetify/src/components/VList/VList.tsx
+++ b/packages/vuetify/src/components/VList/VList.tsx
@@ -38,7 +38,7 @@ function isPrimitive (value: unknown): value is string | number | boolean {
return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean'
}
-function transformItem (props: ItemProps & { itemType: string }, item: any): InternalListItem {
+function transformItem (props: ItemProps & { itemType?: string }, item: any): InternalListItem {
const type = getPropertyFromItem(item, props.itemType, 'item')
const title = isPrimitive(item) ? item : getPropertyFromItem(item, props.itemTitle)
const value = getPropertyFromItem(item, props.itemValue, undefined)
@@ -63,7 +63,7 @@ function transformItem (props: ItemProps & { itemType: string }, item: any): Int
}
}
-function transformItems (props: ItemProps & { itemType: string }, items: (string | object)[]) {
+function transformItems (props: ItemProps & { itemType?: string }, items: (string | object)[]) {
const array: InternalListItem[] = []
for (const item of items) {
@@ -73,7 +73,7 @@ function transformItems (props: ItemProps & { itemType: string }, items: (string
return array
}
-export function useListItems (props: ItemProps & { itemType: string }) {
+export function useListItems (props: ItemProps & { itemType?: string }) {
const items = computed(() => transformItems(props, props.items))
return { items }
diff --git a/packages/vuetify/src/labs/VTreeview/VTreeview.tsx b/packages/vuetify/src/labs/VTreeview/VTreeview.tsx
index f6d3560039e..ca69507ce99 100644
--- a/packages/vuetify/src/labs/VTreeview/VTreeview.tsx
+++ b/packages/vuetify/src/labs/VTreeview/VTreeview.tsx
@@ -35,7 +35,7 @@ export const makeVTreeviewProps = propsFactory({
collapseIcon: '$treeviewCollapse',
expandIcon: '$treeviewExpand',
slim: true,
- }), ['nav']),
+ }), ['itemType', 'nav']),
}, 'VTreeview')
export const VTreeview = genericComponent<new <T>(
|
69bebc3543ebbdace1e99b6443d3c5196b602cdc
|
2019-07-07 00:57:49
|
nekosaur
|
fix(VSparkline): adjust label position depending on line width
| false
|
adjust label position depending on line width
|
fix
|
diff --git a/packages/vuetify/src/components/VSparkline/VSparkline.ts b/packages/vuetify/src/components/VSparkline/VSparkline.ts
index d0e0c6e49ba..d8895d4436b 100644
--- a/packages/vuetify/src/components/VSparkline/VSparkline.ts
+++ b/packages/vuetify/src/components/VSparkline/VSparkline.ts
@@ -409,7 +409,7 @@ export default mixins<options &
},
}), [
this.genGradient(),
- this.hasLabels && this.genLabels(-2),
+ this.hasLabels && this.genLabels(-(this._lineWidth / 2)),
this.genPath(),
])
},
diff --git a/packages/vuetify/src/components/VSparkline/__tests__/VSparkline.spec.ts b/packages/vuetify/src/components/VSparkline/__tests__/VSparkline.spec.ts
index 88331639169..db6918bee26 100644
--- a/packages/vuetify/src/components/VSparkline/__tests__/VSparkline.spec.ts
+++ b/packages/vuetify/src/components/VSparkline/__tests__/VSparkline.spec.ts
@@ -224,4 +224,28 @@ describe('VSparkline.ts', () => {
expect(wrapper.html()).toMatchSnapshot()
})
+
+ it('should render component with label size and match a snapshot', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ value: [1, 7, 42],
+ showLabels: true,
+ labelSize: 14,
+ },
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should position labels correctly', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ value: [1, 7, 42],
+ showLabels: true,
+ lineWidth: 20,
+ },
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
})
diff --git a/packages/vuetify/src/components/VSparkline/__tests__/__snapshots__/VSparkline.spec.ts.snap b/packages/vuetify/src/components/VSparkline/__tests__/__snapshots__/VSparkline.spec.ts.snap
index 9b2ea28aa03..bb1d74aac42 100644
--- a/packages/vuetify/src/components/VSparkline/__tests__/__snapshots__/VSparkline.spec.ts.snap
+++ b/packages/vuetify/src/components/VSparkline/__tests__/__snapshots__/VSparkline.spec.ts.snap
@@ -1,5 +1,55 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`VSparkline.ts should position labels correctly 1`] = `
+
+<svg display="block"
+ stroke-width="20"
+ viewbox="0 0 300 85.5"
+ class="primary--text"
+>
+ <defs>
+ <linearGradient id="35"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="0"
+ >
+ <stop offset="0"
+ stop-color="primary"
+ >
+ </stop>
+ </linearGradient>
+ </defs>
+ <g style="font-size: 8; text-anchor: middle; dominant-baseline: mathematical; fill: primary;">
+ <text x="8"
+ y="76.25"
+ font-size="7"
+ >
+ 1
+ </text>
+ <text x="150"
+ y="76.25"
+ font-size="7"
+ >
+ 7
+ </text>
+ <text x="292"
+ y="76.25"
+ font-size="7"
+ >
+ 42
+ </text>
+ </g>
+ <path id="35"
+ d="M8 66.99999L150 58.36585365853659S150 58.36585365853659 150 58.36585365853659L292 8.00001"
+ fill="none"
+ stroke="url(#35)"
+ >
+ </path>
+</svg>
+
+`;
+
exports[`VSparkline.ts should render component and match a snapshot 1`] = `
<svg display="block"
@@ -646,6 +696,56 @@ exports[`VSparkline.ts should render component with gradient and match a snapsho
`;
+exports[`VSparkline.ts should render component with label size and match a snapshot 1`] = `
+
+<svg display="block"
+ stroke-width="4"
+ viewbox="0 0 300 96"
+ class="primary--text"
+>
+ <defs>
+ <linearGradient id="33"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="0"
+ >
+ <stop offset="0"
+ stop-color="primary"
+ >
+ </stop>
+ </linearGradient>
+ </defs>
+ <g style="font-size: 8; text-anchor: middle; dominant-baseline: mathematical; fill: primary;">
+ <text x="8"
+ y="81.5"
+ font-size="14"
+ >
+ 1
+ </text>
+ <text x="150"
+ y="81.5"
+ font-size="14"
+ >
+ 7
+ </text>
+ <text x="292"
+ y="81.5"
+ font-size="14"
+ >
+ 42
+ </text>
+ </g>
+ <path id="33"
+ d="M8 66.99999L150 58.36585365853659S150 58.36585365853659 150 58.36585365853659L292 8.00001"
+ fill="none"
+ stroke="url(#33)"
+ >
+ </path>
+</svg>
+
+`;
+
exports[`VSparkline.ts should render component with line width and match a snapshot 1`] = `
<svg display="block"
|
ac51a6e41773ff4c1ca47b65cfa693a1dec7fb44
|
2019-04-11 19:34:16
|
sh7dm
|
chore(groupable): move tests place to TS file
| false
|
move tests place to TS file
|
chore
|
diff --git a/packages/vuetify/src/mixins/groupable/__tests__/groupable.spec.js b/packages/vuetify/src/mixins/groupable/__tests__/groupable.spec.js
deleted file mode 100644
index 51b2b6eb2d9..00000000000
--- a/packages/vuetify/src/mixins/groupable/__tests__/groupable.spec.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { test } from '@/test'
-
-test('groupable.ts', ({ mount }) => {
- it('should register and unregister', async () => {
- //
- })
-})
diff --git a/packages/vuetify/src/mixins/groupable/__tests__/groupable.spec.ts b/packages/vuetify/src/mixins/groupable/__tests__/groupable.spec.ts
new file mode 100644
index 00000000000..f4fd5ed02ae
--- /dev/null
+++ b/packages/vuetify/src/mixins/groupable/__tests__/groupable.spec.ts
@@ -0,0 +1,5 @@
+describe('groupable.ts', () => {
+ it('should register and unregister', async () => {
+ //
+ })
+})
|
0ad9d7f0efba50f0be4d56b4d13a7aaf155dc765
|
2022-05-05 20:46:53
|
Albert Kaaman
|
fix(VSelect): set model value to trigger emit (#15020)
| false
|
set model value to trigger emit (#15020)
|
fix
|
diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
index 2598fed757d..60734f71dc9 100644
--- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
@@ -147,12 +147,14 @@ export const VAutocomplete = genericComponent<new <T>() => {
const isSelecting = ref(false)
function select (item: any) {
if (props.multiple) {
- const index = selections.value.findIndex(selection => selection.value === item.value)
+ const index = selected.value.findIndex(selection => selection === item.value)
if (index === -1) {
- model.value.push(item.value)
+ model.value = [...model.value, item.value]
} else {
- model.value = selected.value.filter(selection => selection !== item.value)
+ const value = [...model.value]
+ value.splice(index, 1)
+ model.value = value
}
} else {
model.value = [item.value]
diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.tsx b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
index 8943e9d854a..62ab1446449 100644
--- a/packages/vuetify/src/components/VCombobox/VCombobox.tsx
+++ b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
@@ -230,12 +230,14 @@ export const VCombobox = genericComponent<new <T>() => {
}
function select (item: any) {
if (props.multiple) {
- const index = selections.value.findIndex(selection => selection.value === item.value)
+ const index = selected.value.findIndex(selection => selection === item.value)
if (index === -1) {
- model.value.push(item.value)
+ model.value = [...model.value, item.value]
} else {
- model.value = selected.value.filter(selection => selection !== item.value)
+ const value = [...model.value]
+ value.splice(index, 1)
+ model.value = value
}
search.value = ''
@@ -266,7 +268,7 @@ export const VCombobox = genericComponent<new <T>() => {
if (!props.multiple || !search.value) return
- model.value.push(search.value)
+ model.value = [...model.value, search.value]
search.value = ''
}
})
diff --git a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
index 58bbbb282a0..2f008a51ae3 100644
--- a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
+++ b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
@@ -38,16 +38,21 @@ export const VExpansionPanel = defineComponent({
const { roundedClasses } = useRounded(props)
const isDisabled = computed(() => groupItem?.disabled.value || props.disabled)
+ const selectedIndices = computed(() => groupItem.group.items.value.reduce<number[]>((arr, item, index) => {
+ if (groupItem.group.selected.value.includes(item.id)) arr.push(index)
+ return arr
+ }, []))
+
const isBeforeSelected = computed(() => {
const index = groupItem.group.items.value.findIndex(item => item.id === groupItem.id)
return !groupItem.isSelected.value &&
- groupItem.group.selected.value.some(id => groupItem.group.items.value.indexOf(id) - index === 1)
+ selectedIndices.value.some(selectedIndex => selectedIndex - index === 1)
})
const isAfterSelected = computed(() => {
const index = groupItem.group.items.value.findIndex(item => item.id === groupItem.id)
return !groupItem.isSelected.value &&
- groupItem.group.selected.value.some(id => groupItem.group.items.value.indexOf(id) - index === -1)
+ selectedIndices.value.some(selectedIndex => selectedIndex - index === -1)
})
provide(VExpansionPanelSymbol, groupItem)
diff --git a/packages/vuetify/src/components/VSelect/VSelect.tsx b/packages/vuetify/src/components/VSelect/VSelect.tsx
index d4726a64743..d0036cd3bb5 100644
--- a/packages/vuetify/src/components/VSelect/VSelect.tsx
+++ b/packages/vuetify/src/components/VSelect/VSelect.tsx
@@ -134,12 +134,14 @@ export const VSelect = genericComponent<new <T>() => {
}
function select (item: any) {
if (props.multiple) {
- const index = selections.value.findIndex(selection => selection.value === item.value)
+ const index = selected.value.findIndex(selection => selection === item.value)
if (index === -1) {
- model.value.push(item.value)
+ model.value = [...model.value, item.value]
} else {
- model.value = selected.value.filter(selection => selection !== item.value)
+ const value = [...model.value]
+ value.splice(index, 1)
+ model.value = value
}
} else {
model.value = [item.value]
diff --git a/packages/vuetify/src/composables/group.ts b/packages/vuetify/src/composables/group.ts
index 0f7b5f748d8..73127173b2c 100644
--- a/packages/vuetify/src/composables/group.ts
+++ b/packages/vuetify/src/composables/group.ts
@@ -28,7 +28,7 @@ export interface GroupProvide {
register: (item: GroupItem, cmp: ComponentInternalInstance) => void
unregister: (id: number) => void
select: (id: number, value: boolean) => void
- selected: Ref<any[]>
+ selected: Ref<Readonly<number[]>>
isSelected: (id: number) => boolean
prev: () => void
next: () => void
diff --git a/packages/vuetify/src/composables/proxiedModel.ts b/packages/vuetify/src/composables/proxiedModel.ts
index 05af84d0ff4..482593c624e 100644
--- a/packages/vuetify/src/composables/proxiedModel.ts
+++ b/packages/vuetify/src/composables/proxiedModel.ts
@@ -28,8 +28,8 @@ export function useProxiedModel<
const internal = ref(transformIn(props[prop])) as Ref<Inner>
- return computed<Inner>({
- get () {
+ return computed<Inner extends any[] ? Readonly<Inner> : Inner>({
+ get (): any {
if (propIsDefined.value) return transformIn(props[prop])
else return internal.value
},
|
2f8a4b4aea09176968c58c84207a4efaad0327c1
|
2023-11-21 12:25:13
|
Kael
|
fix(VDataTable): pass minWidth to headers
| false
|
pass minWidth to headers
|
fix
|
diff --git a/packages/vuetify/src/components/VDataTable/VDataTableHeaders.tsx b/packages/vuetify/src/components/VDataTable/VDataTableHeaders.tsx
index ec0d2956b50..f250696b424 100644
--- a/packages/vuetify/src/components/VDataTable/VDataTableHeaders.tsx
+++ b/packages/vuetify/src/components/VDataTable/VDataTableHeaders.tsx
@@ -129,7 +129,7 @@ export const VDataTableHeaders = genericComponent<VDataTableHeadersSlots>()({
]}
style={{
width: convertToUnit(column.width),
- minWidth: convertToUnit(column.width),
+ minWidth: convertToUnit(column.minWidth),
...getFixedStyles(column, y),
}}
colspan={ column.colspan }
|
dc496a4d021f71608ba8f108873fe4d0e25fd1c7
|
2022-10-15 16:43:15
|
nekosaur
|
fix(docs): broken build
| false
|
broken build
|
fix
|
diff --git a/packages/api-generator/src/index.ts b/packages/api-generator/src/index.ts
index 9e8a6a6f884..4582e608420 100644
--- a/packages/api-generator/src/index.ts
+++ b/packages/api-generator/src/index.ts
@@ -28,7 +28,7 @@ const run = async () => {
await fs.writeFile(`./src/tmp/${component}.d.ts`, template.replaceAll('__component__', component))
}
- const outPath = '../docs/src/api/data/'
+ const outPath = path.resolve(__dirname, '../../docs/src/api/data/')
const componentData = await Promise.all(
Object.entries(components).map(([componentName, componentInstance]) => pool.run(
diff --git a/packages/api-generator/src/types.ts b/packages/api-generator/src/types.ts
index 126b9520be9..a2fd452ed1a 100644
--- a/packages/api-generator/src/types.ts
+++ b/packages/api-generator/src/types.ts
@@ -23,10 +23,21 @@ export function generateComposableDataFromTypes () {
const composables = inspect(project, sourceFile.getTypeAlias('Composables')) as ObjectDefinition
return Object.entries(composables.properties).map(([name, data]) => {
+ const returnType = (data as FunctionDefinition).returnType
+ let exposed
+ if (returnType.type === 'allOf') {
+ exposed = returnType.items.reduce((obj, item) => {
+ const props = (item as ObjectDefinition).properties
+ return { ...obj, ...props }
+ }, {})
+ } else if (returnType.type === 'object') {
+ exposed = returnType.properties
+ }
+
return {
name,
data: {
- exposed: ((data as FunctionDefinition).returnType as ObjectDefinition).properties,
+ exposed,
},
}
}) as { name: string, data: { exposed: Record<string, Definition> } }[]
@@ -315,19 +326,21 @@ function generateDefinition (node: Node<ts.Node>, recursed: string[], project: P
const arrayElementType = type.getArrayElementType()
- const arrayType = generateDefinition(node, getRecursiveArrayTypes(recursed, type), project, arrayElementType)
+ const arrayType = generateDefinition(node, getRecursiveTypes(recursed, type), project, arrayElementType)
definition.items = arrayType.type === 'anyOf' ? arrayType.items : [arrayType]
} else if (type.isIntersection()) {
definition = definition as IntersectionDefinition
definition.type = 'allOf'
- definition.items = type.getIntersectionTypes().map(type => generateDefinition(node, recursed, project, type))
+ definition.items = type.getIntersectionTypes()
+ .map(intersectionType => generateDefinition(node, recursed, project, intersectionType))
// TODO: Should we collapse allOf with only objects to single object?
} else if (type.isUnion()) {
definition = definition as UnionDefinition
definition.type = 'anyOf'
- definition.items = type.getUnionTypes().map(type => generateDefinition(node, recursed, project, type))
+ definition.items = type.getUnionTypes()
+ .map(unionType => generateDefinition(node, recursed, project, unionType))
// Ugly hack to get rid of explicit false and true types
// TODO: Do this some other way
@@ -366,10 +379,11 @@ function generateDefinition (node: Node<ts.Node>, recursed: string[], project: P
return {
name: parameter.getEscapedName(),
optional: parameter.isOptional(),
- ...generateDefinition(node, getRecursiveObjectTypes(recursed, parameterType), project, parameterType),
+ ...generateDefinition(node, getRecursiveTypes(recursed, parameterType), project, parameterType),
}
})
- definition.returnType = generateDefinition(node, recursed, project, signature.getReturnType())
+ const returnType = signature.getReturnType()
+ definition.returnType = generateDefinition(node, getRecursiveTypes(recursed, returnType), project, returnType)
} else if (targetType && /^(Map|Set)<.*>/.test(definition.text)) { // TODO: Better way to detect Map/Set type
definition = definition as InterfaceDefinition
definition.type = 'interface'
@@ -397,7 +411,7 @@ function generateDefinition (node: Node<ts.Node>, recursed: string[], project: P
const propertyName = property.getEscapedName()
const propertyType = tc.getTypeOfSymbolAtLocation(property, node)
- definition.properties[propertyName] = generateDefinition(node, getRecursiveObjectTypes(recursed, propertyType), project, propertyType)
+ definition.properties[propertyName] = generateDefinition(node, getRecursiveTypes(recursed, propertyType), project, propertyType)
definition.properties[propertyName].optional = property.isOptional()
}
@@ -414,37 +428,59 @@ function generateDefinition (node: Node<ts.Node>, recursed: string[], project: P
return definition
}
-function getRecursiveObjectTypes (recursiveTypes: string[], type: Type<ts.Type>) {
- return recursiveTypes.slice().concat(findPotentialRecursiveObjectTypes(type))
-}
+// function getRecursiveObjectTypes (recursiveTypes: string[], type: Type<ts.Type>) {
+// return recursiveTypes.slice().concat(findPotentialRecursiveObjectTypes(type))
+// }
-function getRecursiveArrayTypes (recursiveTypes: string[], type: Type<ts.Type>) {
- return recursiveTypes.slice().concat(findPotentialRecursiveArrayTypes(type))
-}
+// function getRecursiveArrayTypes (recursiveTypes: string[], type: Type<ts.Type>) {
+// return recursiveTypes.slice().concat(findPotentialRecursiveArrayTypes(type))
+// }
-function findPotentialRecursiveObjectTypes (type: Type<ts.Type>) {
- if (type == null || type.isArray()) return []
+// function findPotentialRecursiveObjectTypes (type: Type<ts.Type>) {
+// if (type == null || type.isArray()) return []
- const recursiveTypes = []
+// const recursiveTypes = []
- if (type.isUnionOrIntersection()) {
- recursiveTypes.push(...type.getAliasTypeArguments().map(t => t.getText()))
- } else if (type.getAliasSymbol() || type.isClassOrInterface() || type.getTypeArguments().length) {
- recursiveTypes.push(type.getText())
- }
+// if (type.isUnionOrIntersection()) {
+// recursiveTypes.push(...type.getAliasTypeArguments().map(t => t.getText()))
+// } else if (type.getAliasSymbol() || type.isClassOrInterface() || type.getTypeArguments().length) {
+// recursiveTypes.push(type.getText())
+// }
- return recursiveTypes
+// return recursiveTypes
+// }
+
+// function findPotentialRecursiveArrayTypes (type: Type<ts.Type>) {
+// if (type == null) return []
+
+// const recursiveTypes = []
+
+// if (type.isUnionOrIntersection()) {
+// recursiveTypes.push(...type.getAliasTypeArguments().map(t => t.getText()))
+// } else if (type.isArray()) {
+// recursiveTypes.push(...findPotentialRecursiveArrayTypes(type.getArrayElementType()))
+// } else if (type.getAliasSymbol() || type.isClassOrInterface() || type.getTypeArguments().length) {
+// recursiveTypes.push(type.getText())
+// }
+
+// return recursiveTypes
+// }
+
+function getRecursiveTypes (recursiveTypes: string[], type: Type<ts.Type>) {
+ return recursiveTypes.slice().concat(findPotentialRecursiveTypes(type))
}
-function findPotentialRecursiveArrayTypes (type: Type<ts.Type>) {
+function findPotentialRecursiveTypes (type: Type<ts.Type>) {
if (type == null) return []
const recursiveTypes = []
- if (type.isUnionOrIntersection()) {
- recursiveTypes.push(...type.getAliasTypeArguments().map(t => t.getText()))
+ if (type.isUnion()) {
+ recursiveTypes.push(...type.getUnionTypes().map(t => t.getText()))
+ } else if (type.isIntersection()) {
+ recursiveTypes.push(...type.getIntersectionTypes().map(t => t.getText()))
} else if (type.isArray()) {
- recursiveTypes.push(...findPotentialRecursiveArrayTypes(type.getArrayElementType()))
+ recursiveTypes.push(...findPotentialRecursiveTypes(type.getArrayElementType()))
} else if (type.getAliasSymbol() || type.isClassOrInterface() || type.getTypeArguments().length) {
recursiveTypes.push(type.getText())
}
diff --git a/packages/docs/package.json b/packages/docs/package.json
index fd89519309b..90e149ca97b 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -43,6 +43,7 @@
"@types/rimraf": "^3.0.2",
"@vitejs/plugin-vue": "^3.0.3",
"@vue/compiler-sfc": "^3.2.38",
+ "@vuetify/api-generator": "^3.0.0-beta.13",
"@vuetify/vite-ssg": "^0.19.0",
"ajv": "^8.11.0",
"front-matter": "^4.0.2",
diff --git a/packages/docs/src/components/api/PropsTable.vue b/packages/docs/src/components/api/PropsTable.vue
index 5f2fe724570..9686b0de1d9 100644
--- a/packages/docs/src/components/api/PropsTable.vue
+++ b/packages/docs/src/components/api/PropsTable.vue
@@ -47,7 +47,7 @@
import { getType } from './utils'
import PrismCell from './PrismCell.vue'
import NameCell from './NameCell.vue'
- import { kebabCase } from 'lodash'
+ import { kebabCase } from 'lodash-es'
export default defineComponent({
components: {
diff --git a/packages/docs/src/components/api/SassTable.vue b/packages/docs/src/components/api/SassTable.vue
index 46a15436fe2..69961c5a8af 100644
--- a/packages/docs/src/components/api/SassTable.vue
+++ b/packages/docs/src/components/api/SassTable.vue
@@ -39,7 +39,7 @@
import { getType } from './utils'
import PrismCell from './PrismCell.vue'
import NameCell from './NameCell.vue'
- import { kebabCase } from 'lodash'
+ import { kebabCase } from 'lodash-es'
export default defineComponent({
components: {
|
df17ddd9fed37808adfea8060657f7476c55f703
|
2023-06-13 13:01:49
|
Alexandre
|
fix(VTab): remove firefox invalid keyframe property (#17495)
| false
|
remove firefox invalid keyframe property (#17495)
|
fix
|
diff --git a/packages/vuetify/src/components/VTabs/VTab.tsx b/packages/vuetify/src/components/VTabs/VTab.tsx
index cdd4ebae19f..068449deefe 100644
--- a/packages/vuetify/src/components/VTabs/VTab.tsx
+++ b/packages/vuetify/src/components/VTabs/VTab.tsx
@@ -86,11 +86,11 @@ export const VTab = genericComponent()({
const sigma = 1.5
animate(nextEl, {
- backgroundColor: [color, ''],
+ backgroundColor: [color, 'currentcolor'],
transform: [
`translate${XY}(${delta}px) scale${XY}(${initialScale})`,
`translate${XY}(${delta / sigma}px) scale${XY}(${(scale - 1) / sigma + 1})`,
- '',
+ 'none',
],
transformOrigin: Array(3).fill(origin),
}, {
|
4b4cbcda96231041a1fa7971a861e8347705811e
|
2023-06-16 00:03:28
|
John Leider
|
chore(vite): fix lint error
| false
|
fix lint error
|
chore
|
diff --git a/packages/docs/vite.config.mts b/packages/docs/vite.config.mts
index 510c8e27682..282dfb23617 100644
--- a/packages/docs/vite.config.mts
+++ b/packages/docs/vite.config.mts
@@ -258,7 +258,7 @@ export default defineConfig(({ command, mode, ssrBuild }) => {
script: 'sync',
formatting: 'minify',
crittersOptions: false,
- includedRoutes (routes) {
+ includedRoutes (routes: string[]) {
return routes.filter(route => (route === '/' || route.startsWith('/en/')) &&
['/eo-UY/', '/api/', ':', '*'].every(v => !route.includes(v))
)
|
246cd06b86000079152417fff95f840ae3ee9925
|
2023-07-28 20:15:38
|
Albert Kaaman
|
fix(date): parse string dates in local time zone (#17876)
| false
|
parse string dates in local time zone (#17876)
|
fix
|
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index a9bf0e5f981..f250a67ffdb 100755
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -164,6 +164,7 @@
"rollup-plugin-sass": "^1.2.19",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
+ "timezone-mock": "^1.3.6",
"ts-json-schema-generator": "^1.2.0",
"vite": "^4.3.5",
"vite-ssr": "^0.17.1",
diff --git a/packages/vuetify/src/labs/date/adapters/__tests__/vuetify.spec.ts b/packages/vuetify/src/labs/date/adapters/__tests__/vuetify.spec.ts
index 0179555dfb7..35b0cb6e88f 100644
--- a/packages/vuetify/src/labs/date/adapters/__tests__/vuetify.spec.ts
+++ b/packages/vuetify/src/labs/date/adapters/__tests__/vuetify.spec.ts
@@ -1,5 +1,6 @@
// Utilities
import { describe, expect, it } from '@jest/globals'
+import timezoneMock, { TimeZone } from 'timezone-mock'
import { VuetifyDateAdapter } from '../vuetify'
describe('vuetify date adapter', () => {
@@ -22,4 +23,30 @@ describe('vuetify date adapter', () => {
expect(instance.format(new Date(2000, 0, 1), 'fullDateWithWeekday')).toBe('lördag 1 januari 2000')
})
+
+ it.each([
+ 'UTC',
+ 'US/Pacific',
+ 'Europe/London',
+ 'Brazil/East',
+ 'Australia/Adelaide',
+ 'Etc/GMT-2',
+ 'Etc/GMT-4',
+ 'Etc/GMT+4',
+ ])('should handle timezone %s when parsing date without time', (timezone) => {
+ // locale option here has no impact on timezone
+ let instance = new VuetifyDateAdapter({ locale: 'en-us' })
+
+ const str = "2001-01-01"
+
+ timezoneMock.register(timezone as TimeZone)
+
+ const date = instance.date(str)
+
+ expect(date?.getFullYear()).toBe(2001)
+ expect(date?.getDate()).toBe(1)
+ expect(date?.getMonth()).toBe(0)
+
+ timezoneMock.unregister()
+ })
})
diff --git a/packages/vuetify/src/labs/date/adapters/vuetify.ts b/packages/vuetify/src/labs/date/adapters/vuetify.ts
index eb9f29d66fc..efd99352f48 100644
--- a/packages/vuetify/src/labs/date/adapters/vuetify.ts
+++ b/packages/vuetify/src/labs/date/adapters/vuetify.ts
@@ -204,16 +204,11 @@ function endOfMonth (date: Date) {
return new Date(date.getFullYear(), date.getMonth() + 1, 0)
}
-function formatYyyyMmDd (value: string): string {
- const formattedValue = value.split('-')
- .map(d => d.padStart(2, '0'))
- .join('-')
+function parseLocalDate (value: string): Date {
+ const parts = value.split('-').map(Number)
- const offsetMin = (new Date().getTimezoneOffset() / -60)
- const offsetSign = offsetMin < 0 ? '-' : '+'
- const offsetValue = Math.abs(offsetMin).toString().padStart(2, '0')
-
- return `${formattedValue}T00:00:00.000${offsetSign}${offsetValue}:00`
+ // new Date() uses local time zone when passing individual date component values
+ return new Date(parts[0], parts[1] - 1, parts[2])
}
const _YYYMMDD = /([12]\d{3}-([1-9]|0[1-9]|1[0-2])-([1-9]|0[1-9]|[12]\d|3[01]))/
@@ -227,7 +222,7 @@ function date (value?: any): Date | null {
let parsed
if (_YYYMMDD.test(value)) {
- parsed = Date.parse(formatYyyyMmDd(value))
+ return parseLocalDate(value)
} else {
parsed = Date.parse(value)
}
diff --git a/yarn.lock b/yarn.lock
index a42974b29f3..9311451aa2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13413,6 +13413,11 @@ timed-out@^4.0.1:
resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==
+timezone-mock@^1.3.6:
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.3.6.tgz#44e4c5aeb57e6c07ae630a05c528fc4d9aab86f4"
+ integrity sha512-YcloWmZfLD9Li5m2VcobkCDNVaLMx8ohAb/97l/wYS3m+0TIEK5PFNMZZfRcusc6sFjIfxu8qcJT0CNnOdpqmg==
+
tinybench@^2.3.1:
version "2.4.0"
resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.4.0.tgz#83f60d9e5545353610fe7993bd783120bc20c7a7"
|
468d4b646a7a5fef6b76c5d4265e9b4b2a018767
|
2020-06-03 05:28:25
|
John Leider
|
fix(breakpoint): set correct mobile value when using breakpoint strings
| false
|
set correct mobile value when using breakpoint strings
|
fix
|
diff --git a/packages/vuetify/src/services/breakpoint/__tests__/breakpoint.spec.ts b/packages/vuetify/src/services/breakpoint/__tests__/breakpoint.spec.ts
index 772d172f527..df56ba2de59 100644
--- a/packages/vuetify/src/services/breakpoint/__tests__/breakpoint.spec.ts
+++ b/packages/vuetify/src/services/breakpoint/__tests__/breakpoint.spec.ts
@@ -284,4 +284,15 @@ describe('Breakpoint.ts', () => {
await resizeWindow(399)
expect(breakpoint.xs).toBe(true)
})
+
+ it('should allow breakpoint strings for mobileBreakPoint', async () => {
+ breakpoint.mobileBreakPoint = 'lg'
+ await resizeWindow(1920)
+
+ expect(breakpoint.mobile).toBe(false)
+
+ await resizeWindow(600)
+
+ expect(breakpoint.mobile).toBe(true)
+ })
})
diff --git a/packages/vuetify/src/services/breakpoint/index.ts b/packages/vuetify/src/services/breakpoint/index.ts
index bb4f2f86c78..19e164d0063 100644
--- a/packages/vuetify/src/services/breakpoint/index.ts
+++ b/packages/vuetify/src/services/breakpoint/index.ts
@@ -41,7 +41,8 @@ export class Breakpoint extends Service implements IBreakpoint {
public xlOnly = false
- public name = ''
+ // Value is xs to match v2.x functionality
+ public name: IBreakpoint['name'] = 'xs'
public height = 0
@@ -148,11 +149,24 @@ export class Breakpoint extends Service implements IBreakpoint {
break
}
- // Check if value is a valid number
- // or an explicit breakpoint name
- this.mobile = !isNaN(parseInt(this.mobileBreakPoint))
- ? width < parseInt(this.mobileBreakPoint, 10)
- : this.name === this.mobileBreakPoint
+ if (typeof this.mobileBreakPoint === 'number') {
+ this.mobile = width < parseInt(this.mobileBreakPoint, 10)
+
+ return
+ }
+
+ const breakpoints = {
+ xs: 0,
+ sm: 1,
+ md: 2,
+ lg: 3,
+ xl: 4,
+ } as const
+
+ const current = breakpoints[this.name]
+ const max = breakpoints[this.mobileBreakPoint]
+
+ this.mobile = current <= max
}
// Cross-browser support as described in:
diff --git a/packages/vuetify/types/services/breakpoint.d.ts b/packages/vuetify/types/services/breakpoint.d.ts
index 00d7713975b..71e42bc7bb5 100644
--- a/packages/vuetify/types/services/breakpoint.d.ts
+++ b/packages/vuetify/types/services/breakpoint.d.ts
@@ -12,7 +12,7 @@ export interface Breakpoint {
mdAndDown: boolean
mdAndUp: boolean
mdOnly: boolean
- name: string
+ name: BreakpointName
sm: boolean
smAndDown: boolean
smAndUp: boolean
diff --git a/packages/vuetify/types/test/global.ts b/packages/vuetify/types/test/global.ts
index 1ceae6fc156..36160edf7dd 100644
--- a/packages/vuetify/types/test/global.ts
+++ b/packages/vuetify/types/test/global.ts
@@ -5,7 +5,7 @@ Vuetify.config.silent = true
Vue.component('breakpoint', {
created () {
- const name: string = this.$vuetify.breakpoint.name
+ const name = this.$vuetify.breakpoint.name
const numbers: number[] = [
this.$vuetify.breakpoint.height,
this.$vuetify.breakpoint.width,
|
34ae4c2285899a48c524bff108fcd3aaa66d8e47
|
2018-06-03 00:40:50
|
John Leider
|
fix(v-slider): update readonly
| false
|
update readonly
|
fix
|
diff --git a/src/components/VSlider/VSlider.js b/src/components/VSlider/VSlider.js
index 1b313f49930..1420e866173 100644
--- a/src/components/VSlider/VSlider.js
+++ b/src/components/VSlider/VSlider.js
@@ -436,6 +436,8 @@ export default {
}
},
onKeyDown (e) {
+ if (this.disabled || this.readonly) return
+
const value = this.parseKeyDown(e)
if (value == null) return
diff --git a/src/stylus/components/_sliders.styl b/src/stylus/components/_sliders.styl
index 7f48e548848..48b0c7bd428 100755
--- a/src/stylus/components/_sliders.styl
+++ b/src/stylus/components/_sliders.styl
@@ -79,6 +79,9 @@ rtl(v-slider-rtl, "v-input--slider")
.v-input__slot
margin-bottom: 16px
+ &.v-input--is-readonly
+ pointer-events: none
+
&.v-input--is-disabled
.v-slider__thumb
transform: translateY(-50%) scale(.45)
diff --git a/test/unit/components/VSlider/VSlider.spec.js b/test/unit/components/VSlider/VSlider.spec.js
index b3dffcf8e86..42e1e935e2d 100644
--- a/test/unit/components/VSlider/VSlider.spec.js
+++ b/test/unit/components/VSlider/VSlider.spec.js
@@ -505,4 +505,42 @@ test('VSlider.vue', ({ mount }) => {
expect(warning).toHaveBeenTipped()
})
+
+ it('should not react to keydown', () => {
+ const parseKeyDown = jest.fn()
+ const wrapper = mount(VSlider, {
+ propsData: { disabled: true },
+ methods: { parseKeyDown }
+ })
+
+ const input = wrapper.first('input')
+
+ input.trigger('focus')
+
+ expect(wrapper.vm.isFocused).toBe(true)
+
+ input.trigger('keydown.right')
+
+ expect(parseKeyDown).not.toBeCalled()
+
+ wrapper.setProps({
+ disabled: false,
+ readonly: true
+ })
+
+ input.trigger('keydown.right')
+
+ expect(parseKeyDown).not.toBeCalled()
+
+ wrapper.setProps({
+ disabled: false,
+ readonly: false
+ })
+
+ input.trigger('keydown.right')
+
+ expect(parseKeyDown).toBeCalled()
+
+ expect(warning).toHaveBeenTipped()
+ })
})
|
1144b44fe2af658286fd6eecdc6a5631171c152f
|
2020-05-04 18:13:09
|
MajesticPotatoe
|
docs(VChip): fix search in custom list example
| false
|
fix search in custom list example
|
docs
|
diff --git a/packages/docs/src/examples/chips/complex/photos.vue b/packages/docs/src/examples/chips/complex/photos.vue
index 74dfe883e17..9647b40d389 100644
--- a/packages/docs/src/examples/chips/complex/photos.vue
+++ b/packages/docs/src/examples/chips/complex/photos.vue
@@ -57,12 +57,12 @@
<v-divider v-if="!allSelected"></v-divider>
<v-list>
- <template v-for="(item, i) in categories">
+ <template v-for="item in categories">
<v-list-item
- v-if="!selected.includes(i)"
- :key="i"
+ v-if="!selected.includes(item)"
+ :key="item.text"
:disabled="loading"
- @click="selected.push(i)"
+ @click="selected.push(item)"
>
<v-list-item-avatar>
<v-icon
@@ -139,7 +139,7 @@
const selections = []
for (const selection of this.selected) {
- selections.push(this.items[selection])
+ selections.push(selection)
}
return selections
|
19ddcef6cfcfbd62e86730e4d43926d5ca7b1f1d
|
2024-05-13 22:40:52
|
Curt Grimes
|
fix(VMenu): allow enter keypress to work in textareas (#19768)
| false
|
allow enter keypress to work in textareas (#19768)
|
fix
|
diff --git a/packages/vuetify/src/components/VMenu/VMenu.tsx b/packages/vuetify/src/components/VMenu/VMenu.tsx
index 7ac262c0b47..02fcdad31a7 100644
--- a/packages/vuetify/src/components/VMenu/VMenu.tsx
+++ b/packages/vuetify/src/components/VMenu/VMenu.tsx
@@ -126,6 +126,7 @@ export const VMenu = genericComponent<OverlaySlots>()({
if (props.disabled) return
if (e.key === 'Tab' || (e.key === 'Enter' && !props.closeOnContentClick)) {
+ if (e.key === 'Enter' && e.target instanceof HTMLTextAreaElement) return
if (e.key === 'Enter') e.preventDefault()
const nextElement = getNextElement(
|
da40a66082151aec8321213c21a4d7e8298870a8
|
2023-03-11 20:52:29
|
nekosaur
|
docs: fix back-to-top blocking interactions
| false
|
fix back-to-top blocking interactions
|
docs
|
diff --git a/packages/docs/src/components/app/BackToTop.vue b/packages/docs/src/components/app/BackToTop.vue
index 90c0a00b253..ef8fd5e0583 100644
--- a/packages/docs/src/components/app/BackToTop.vue
+++ b/packages/docs/src/components/app/BackToTop.vue
@@ -1,7 +1,7 @@
<template>
<v-layout-item
v-scroll="onScroll"
- class="text-end"
+ class="text-end pointer-events-none"
model-value
position="bottom"
size="88"
@@ -10,7 +10,7 @@
<v-fab-transition>
<v-btn
v-show="model"
- class="mt-auto"
+ class="mt-auto pointer-events-initial"
color="primary"
elevation="8"
icon="mdi-chevron-up"
@@ -38,3 +38,13 @@
})
}
</script>
+
+<style scoped>
+ .pointer-events-none {
+ pointer-events: none;
+ }
+
+ .pointer-events-initial {
+ pointer-events: initial;
+ }
+</style>
|
4529f80490bbbbf48d242e516a2cbaeacf83ce96
|
2023-12-06 19:40:45
|
John Leider
|
chore: remove gitpod and Dockerfile
| false
|
remove gitpod and Dockerfile
|
chore
|
diff --git a/.gitpod.yml b/.gitpod.yml
deleted file mode 100644
index 27174506dc0..00000000000
--- a/.gitpod.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
- - init: yarn install && yarn run build
-vscode:
- extensions:
- - [email protected]:TEzauMObB6f3i2JqlvrOpA==
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 8ebbc1ed333..00000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM mhart/alpine-node:12
-
-COPY . .
-
-EXPOSE 8095
-
-RUN yarn
-RUN yarn build
-CMD ["yarn", "start"]
|
56480638706244057e0b4ce6ee56f876d2f7dc36
|
2019-03-30 23:16:10
|
sh7dm
|
refactor(VGrid): convert to Sass
| false
|
convert to Sass
|
refactor
|
diff --git a/packages/vuetify/src/components/VGrid/VContainer.js b/packages/vuetify/src/components/VGrid/VContainer.js
index 0df99f72093..3df4d7f0257 100644
--- a/packages/vuetify/src/components/VGrid/VContainer.js
+++ b/packages/vuetify/src/components/VGrid/VContainer.js
@@ -1,4 +1,4 @@
-import '../../stylus/components/_grid.styl'
+import './_grid.sass'
import Grid from './grid'
diff --git a/packages/vuetify/src/components/VGrid/VContent.js b/packages/vuetify/src/components/VGrid/VContent.js
index f84e2d4a8ab..bd057133b30 100644
--- a/packages/vuetify/src/components/VGrid/VContent.js
+++ b/packages/vuetify/src/components/VGrid/VContent.js
@@ -1,5 +1,5 @@
// Styles
-import '../../stylus/components/_content.styl'
+import './_content.sass'
// Mixins
import SSRBootable from '../../mixins/ssr-bootable'
diff --git a/packages/vuetify/src/components/VGrid/VFlex.js b/packages/vuetify/src/components/VGrid/VFlex.js
index 7a05762de50..bf1977bb850 100644
--- a/packages/vuetify/src/components/VGrid/VFlex.js
+++ b/packages/vuetify/src/components/VGrid/VFlex.js
@@ -1,4 +1,4 @@
-import '../../stylus/components/_grid.styl'
+import './_grid.sass'
import Grid from './grid'
diff --git a/packages/vuetify/src/components/VGrid/VLayout.js b/packages/vuetify/src/components/VGrid/VLayout.js
index 8cb49a6e88a..b7a8d3f7e2c 100644
--- a/packages/vuetify/src/components/VGrid/VLayout.js
+++ b/packages/vuetify/src/components/VGrid/VLayout.js
@@ -1,4 +1,4 @@
-import '../../stylus/components/_grid.styl'
+import './_grid.sass'
import Grid from './grid'
diff --git a/packages/vuetify/src/stylus/components/_content.styl b/packages/vuetify/src/components/VGrid/_content.sass
similarity index 63%
rename from packages/vuetify/src/stylus/components/_content.styl
rename to packages/vuetify/src/components/VGrid/_content.sass
index 7c7c6abc379..d89609acf07 100644
--- a/packages/vuetify/src/stylus/components/_content.styl
+++ b/packages/vuetify/src/components/VGrid/_content.sass
@@ -1,8 +1,11 @@
-@import '../bootstrap'
-@import '../browsers'
+@import '../../styles/styles.sass'
+
+@mixin firefox()
+ @-moz-document url-prefix()
+ @content
.v-content
- bootable()
+ +bootable()
display: flex
flex: 1 0 auto
diff --git a/packages/vuetify/src/stylus/components/_grid.styl b/packages/vuetify/src/components/VGrid/_grid.sass
similarity index 72%
rename from packages/vuetify/src/stylus/components/_grid.styl
rename to packages/vuetify/src/components/VGrid/_grid.sass
index 4239f487c71..a4da8111cde 100644
--- a/packages/vuetify/src/stylus/components/_grid.styl
+++ b/packages/vuetify/src/components/VGrid/_grid.sass
@@ -1,21 +1,21 @@
-@import '../bootstrap'
+@import '../../styles/styles.sass'
.container
flex: 1 1 100%
margin: auto
- padding: $grid-gutters.xl
+ padding: map-get($grid-gutters, 'xl')
width: 100%
&.grow-shrink-0
- flex-grow: 0;
- flex-shrink: 0;
+ flex-grow: 0
+ flex-shrink: 0
- for $size, $width in $container-max-widths
+ @each $size, $width in $container-max-widths
@media only screen and (min-width: $width)
- max-width: ($width * 0.9375) // Credit to bootstrap
+ max-width: $width * 0.9375 // Credit to bootstrap
- @media $display-breakpoints.sm-and-down
- padding: $grid-gutters.lg
+ @media #{map-get($display-breakpoints, 'sm-and-down')}
+ padding: map-get($grid-gutters, 'lg')
&.fluid
max-width: 100%
@@ -29,28 +29,28 @@
flex: 1 1 auto
&.grow-shrink-0
- flex-grow: 0;
- flex-shrink: 0;
+ flex-grow: 0
+ flex-shrink: 0
&.grid-list
- for $size, $gutter in $grid-gutters
- &-{$size}
+ @each $size, $gutter in $grid-gutters
+ &-#{$size}
.layout
.flex
- padding: ($gutter / 2)
+ padding: $gutter / 2
.layout:only-child
- margin: -($gutter / 2)
+ margin: -$gutter / 2
.layout:not(:only-child)
- margin: auto -($gutter / 2)
+ margin: auto -$gutter / 2
*:not(:only-child)
.layout:first-child
- margin-top: -($gutter / 2)
+ margin-top: -$gutter / 2
.layout:last-child
- margin-bottom: -($gutter / 2)
+ margin-bottom: -$gutter / 2
.layout
display: flex
@@ -78,24 +78,30 @@
flex-wrap: wrap
&.grow-shrink-0
- flex-grow: 0;
- flex-shrink: 0;
-
-for $size, $width in $grid-breakpoints
- @media all and (min-width: $width)
- for n in (1..$grid-columns)
- .flex.{$size}{n}
- flex-basis: (n / $grid-columns * 100)%
+ flex-grow: 0
+ flex-shrink: 0
+
+@each $size, $width in $grid-breakpoints
+ @media all and (min-width: #{$width})
+ $n: $grid-columns
+ @while $n > 0
+ .flex.#{$size}#{$n}
+ flex-basis: $n / $grid-columns * 100%
flex-grow: 0
- max-width: (n / $grid-columns * 100)%
+ max-width: $n / $grid-columns * 100%
+
+ .flex.order-#{$size}#{$n}
+ order: $n
- .flex.order-{$size}{n}
- order: n
+ $n: $n - 1
- for n in (0..$grid-columns)
- .flex.offset-{$size}{n}
+ $m: $grid-columns
+ @while $m >= 0
+ .flex.offset-#{$size}#{$m}
// Offsets can only ever work in row layouts
- margin-left: (n / $grid-columns * 100)%
+ margin-left: $m / $grid-columns * 100%
+
+ $m: $m - 1
.flex,
.child-flex > *
@@ -103,8 +109,8 @@ for $size, $width in $grid-breakpoints
max-width: 100%
&.grow-shrink-0
- flex-grow: 0;
- flex-shrink: 0;
+ flex-grow: 0
+ flex-shrink: 0
.align
&-start
@@ -222,8 +228,8 @@ for $size, $width in $grid-breakpoints
flex: 1 1 auto !important
&.grow-shrink-0
- flex-grow: 0;
- flex-shrink: 0;
+ flex-grow: 0
+ flex-shrink: 0
.d-block
display: block !important
|
9eb64c6ebe4ffdf150564530f9785daeacea5488
|
2022-04-15 16:09:32
|
nekosaur
|
fix(VListItem): add isIndeterminate to slot props
| false
|
add isIndeterminate to slot props
|
fix
|
diff --git a/packages/vuetify/src/components/VList/VListItem.tsx b/packages/vuetify/src/components/VList/VListItem.tsx
index f36acdf08f5..137e0ae27b1 100644
--- a/packages/vuetify/src/components/VList/VListItem.tsx
+++ b/packages/vuetify/src/components/VList/VListItem.tsx
@@ -126,6 +126,7 @@ export const VListItem = genericComponent<new () => {
isActive: isActive.value,
select,
isSelected: isSelected.value,
+ isIndeterminate: isIndeterminate.value,
}))
useSelectLink(link, select)
|
ffd4da52fe209c2147a98149d7dc8c2118fb8825
|
2020-06-24 23:02:02
|
FoxyHutch
|
docs(VBanner): migrate page (#34)
| false
|
migrate page (#34)
|
docs
|
diff --git a/packages/docs-next/build/api-gen/locale/en/v-banner.json b/packages/docs-next/build/api-gen/locale/en/v-banner.json
index 451ec5cc425..da5fa541192 100644
--- a/packages/docs-next/build/api-gen/locale/en/v-banner.json
+++ b/packages/docs-next/build/api-gen/locale/en/v-banner.json
@@ -1,19 +1,24 @@
{
"props": {
- "empty": ""
- // add prop lang here
+ "empty": "",
+ "app": "When used inside of `v-main`, will calculate top based upon application `v-toolbar` and `v-system-bar`.",
+ "icon": "Designates a specific icon.",
+ "iconColor": "Designates a specific icon color.",
+ "singleLine": "Forces the banner onto a single line.",
+ "sticky": "Applies **position: sticky** to the component (**Evergreen browsers only**). You can find more information on the [MDN documentation for sticky position](https://developer.mozilla.org/en-US/docs/Web/CSS/position)."
},
"slots": {
- "empty": ""
- // add slot lang here
+ "empty": "",
+ "actions": "The slot used for the action's content such as a [v-btn](/components/buttons). The **dismiss** function in this slots scope, when invoked, will close the banner.",
+ "icon": "The slot used for the icon's content."
},
"events": {
"empty": ""
// add event lang here
},
"functions": {
- "empty": ""
- // add function lang here
+ "empty": "",
+ "toggle": "Mixins.Toggleable.props.value"
},
"sass": {
"empty": ""
diff --git a/packages/docs-next/src/examples/v-banner/event-icon-click.vue b/packages/docs-next/src/examples/v-banner/event-icon-click.vue
new file mode 100644
index 00000000000..be659093e5b
--- /dev/null
+++ b/packages/docs-next/src/examples/v-banner/event-icon-click.vue
@@ -0,0 +1,34 @@
+<template>
+ <v-banner
+ single-line
+ @click:icon="alert"
+ >
+ <v-icon
+ slot="icon"
+ color="warning"
+ size="36"
+ >
+ mdi-wifi-strength-alert-outline
+ </v-icon>
+ Unable to verify your Internet connection
+
+ <template v-slot:actions>
+ <v-btn
+ color="primary"
+ text
+ >
+ Connecting Settings
+ </v-btn>
+ </template>
+ </v-banner>
+</template>
+
+<script>
+ export default {
+ methods: {
+ alert () {
+ alert('Hello, World!')
+ },
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-banner/misc-two-line.vue b/packages/docs-next/src/examples/v-banner/misc-two-line.vue
new file mode 100644
index 00000000000..9c3d4dfdfd3
--- /dev/null
+++ b/packages/docs-next/src/examples/v-banner/misc-two-line.vue
@@ -0,0 +1,20 @@
+<template>
+ <v-banner>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent cursus nec sem id malesuada.
+ Curabitur lacinia sem et turpis euismod, eget elementum ex pretium.
+ <template v-slot:actions>
+ <v-btn
+ text
+ color="primary"
+ >
+ Dismiss
+ </v-btn>
+ <v-btn
+ text
+ color="primary"
+ >
+ Retry
+ </v-btn>
+ </template>
+ </v-banner>
+</template>
diff --git a/packages/docs-next/src/examples/v-banner/prop-single-line.vue b/packages/docs-next/src/examples/v-banner/prop-single-line.vue
new file mode 100644
index 00000000000..72a78d690f2
--- /dev/null
+++ b/packages/docs-next/src/examples/v-banner/prop-single-line.vue
@@ -0,0 +1,46 @@
+<template>
+ <v-card>
+ <v-system-bar></v-system-bar>
+ <v-toolbar flat>
+ <v-toolbar-title>My Document</v-toolbar-title>
+ <v-spacer></v-spacer>
+ <div>
+ <v-switch
+ v-model="sticky"
+ label="Sticky Banner"
+ hide-details
+ ></v-switch>
+ </div>
+ </v-toolbar>
+ <v-banner
+ single-line
+ :sticky="sticky"
+ >
+ We can't save your edits while you are in offline mode.
+
+ <template v-slot:actions>
+ <v-btn
+ text
+ color="deep-purple accent-4"
+ >
+ Get Online
+ </v-btn>
+ </template>
+ </v-banner>
+ <v-card-text class="grey lighten-4">
+ <v-sheet
+ max-width="800"
+ height="300"
+ class="mx-auto"
+ ></v-sheet>
+ </v-card-text>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ sticky: false,
+ }),
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-banner/slot-actions.vue b/packages/docs-next/src/examples/v-banner/slot-actions.vue
new file mode 100644
index 00000000000..4fbfa50a8d1
--- /dev/null
+++ b/packages/docs-next/src/examples/v-banner/slot-actions.vue
@@ -0,0 +1,37 @@
+<template>
+ <div>
+ <v-checkbox
+ v-model="v0"
+ label="Visible"
+ ></v-checkbox>
+ <v-banner
+ v-model="v0"
+ single-line
+ transition="slide-y-transition"
+ >
+ No Internet connection
+ <template v-slot:actions="{ dismiss }">
+ <v-btn
+ text
+ color="primary"
+ @click="dismiss"
+ >
+ Dismiss
+ </v-btn>
+ <v-btn
+ text
+ color="primary"
+ >
+ Retry
+ </v-btn>
+ </template>
+ </v-banner>
+ </div>
+</template>
+<script>
+ export default {
+ data: () => ({
+ v0: true,
+ }),
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-banner/slot-icon.vue b/packages/docs-next/src/examples/v-banner/slot-icon.vue
new file mode 100644
index 00000000000..a6705e076fa
--- /dev/null
+++ b/packages/docs-next/src/examples/v-banner/slot-icon.vue
@@ -0,0 +1,33 @@
+<template>
+ <v-banner two-line>
+ <v-avatar
+ slot="icon"
+ color="deep-purple accent-4"
+ size="40"
+ >
+ <v-icon
+ icon="mdi-lock"
+ color="white"
+ >
+ mdi-lock
+ </v-icon>
+ </v-avatar>
+
+ Three line text string example with two actions. One to two lines is preferable. Three lines should be considered the maximum string length on desktop in order to keep messages short and actionable.
+
+ <template v-slot:actions>
+ <v-btn
+ text
+ color="deep-purple accent-4"
+ >
+ Action
+ </v-btn>
+ <v-btn
+ text
+ color="deep-purple accent-4"
+ >
+ Action
+ </v-btn>
+ </template>
+ </v-banner>
+</template>
diff --git a/packages/docs-next/src/examples/v-banner/usage.vue b/packages/docs-next/src/examples/v-banner/usage.vue
new file mode 100644
index 00000000000..6d030f3719b
--- /dev/null
+++ b/packages/docs-next/src/examples/v-banner/usage.vue
@@ -0,0 +1,36 @@
+<template>
+ <div style="width: 100%;">
+ <v-banner
+ v-bind="$attrs"
+ v-on="$listeners"
+ >
+ A banner for use on desktop / mobile
+ </v-banner>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: 'Usage',
+
+ inheritAttrs: false,
+
+ data: () => ({
+ defaults: {
+ elevation: null,
+ icon: null,
+ 'single-line': null,
+ sticky: null,
+ },
+ options: {
+ selects: {
+ icon: ['$mdiAccount', '$mdiVuetify'],
+ },
+ sliders: {
+ elevation: [0, 24],
+ },
+ },
+ tabs: ['single-line', 'sticky'],
+ }),
+ }
+</script>
diff --git a/packages/docs-next/src/pages/en/components/banners.md b/packages/docs-next/src/pages/en/components/banners.md
index 1ab102fa555..6321ea801f1 100644
--- a/packages/docs-next/src/pages/en/components/banners.md
+++ b/packages/docs-next/src/pages/en/components/banners.md
@@ -3,77 +3,68 @@ meta:
title: Banner component
description: The banner component displays an important and succint message for a user to address. It can also provide actions for user to take.
keywords: banners, vuetify banner component, vue banner component
+related:
+ - /components/alerts/
+ - /components/icons/
+ - /components/snackbars/
---
# Banners
-Component description
+The `v-banner` component is used as middle-interruptive message to user with 1-2 actions. It comes in 2 variations **single-line** and **multi-line** (implicit). These can have icons which you can use with your message and actions.
<entry-ad />
## Usage
-Usage text
+Banners can have 1-2 lines of text, actions and icon.
-`<usage name="" />`
-- **name**: component name
-- eg: `<usage name="v-alert" />`
+<usage name="v-banner" />
## API
-- [API Page Link]()
+- [v-banner](../../api/v-banner)
-## Sub-Components
+## Examples
-Omit if none
+Below is a collection of simple to complex examples.
-### Sub Component 1
+### Props
-Sub component text
+#### Single line
-### Sub Component 2
+**Single-line** VBanner is used for small amount of information and is recommended for **desktop** only implementations. You can optionally enable the **sticky** prop to ensure the content is pinned to the screen (note: does not work in IE11). You can find more information about [sticky positioning here](https://developer.mozilla.org/en-US/docs/Web/CSS/position).
-Sub component text
+<example file="v-banner/prop-single-line" />
-## Caveats
+### Events
-Omit if none
+#### Icon click
-<alert type="success">Success Caveat</alert>
-<alert type="info">Info Caveat</alert>
-<alert type="warning">Warning Caveat</alert>
-<alert type="error">Error Caveat</alert>
+VBanner emits `click:icon` event on icon click, even with custom icon slot.
-## Examples
+<example file="v-banner/event-icon-click" />
-Example text.
+### Slots
-### Props
+#### Actions
-Omit if none
+The `actions` slot has `dismiss` function in its scope, you can use it to easily dismiss banner.
-### Events
+<example file="v-banner/slot-actions" />
-Omit if none
+#### Icon
-### Slots
+The icon slot allows you to to explicitly control the content and functionality within it.
-Omit if none
+<example file="v-banner/slot-icon" />
### Misc
-Omit if none
-
-#### Example Header
-
-Example description
-
-`<example file="" />`
-- **file**: `<component>/<type>-<propname>`
-- eg: `<example file="v-alert/prop-colored-border" />`
+#### Two line
-## Accessibility
+**Two-line** VBanner can store larger amount of data, use it for big messages. This is recommend **mobile** implementations.
-Accessibility text - omit if none
+<example file="v-banner/misc-two-line" />
<backmatter />
|
26043530b33b13fcca86db9969f7b4732edad188
|
2018-12-16 05:54:06
|
John Leider
|
test(validatable): change test process to avoid race condition
| false
|
change test process to avoid race condition
|
test
|
diff --git a/packages/vuetify/test/unit/mixins/validatable.spec.js b/packages/vuetify/test/unit/mixins/validatable.spec.js
index bc042052c4c..5988f9a71f7 100644
--- a/packages/vuetify/test/unit/mixins/validatable.spec.js
+++ b/packages/vuetify/test/unit/mixins/validatable.spec.js
@@ -272,7 +272,7 @@ test('validatable.js', ({ mount }) => {
})
expect(wrapper.vm.hasInput).toBe(false)
- wrapper.setData({ lazyValue: 'foo' })
+ wrapper.setProps({ value: 'foo' })
// Wait for watcher's $nextTick call
await wrapper.vm.$nextTick()
|
a373af46c3a1a2744aa6dac427413282f9e800c9
|
2019-07-25 19:36:22
|
John Leider
|
docs(Faq): add new question/answer
| false
|
add new question/answer
|
docs
|
diff --git a/packages/docs/src/lang/en/getting-started/FrequentlyAskedQuestions.json b/packages/docs/src/lang/en/getting-started/FrequentlyAskedQuestions.json
index 9ba3c55cdd9..0daf4939cbf 100644
--- a/packages/docs/src/lang/en/getting-started/FrequentlyAskedQuestions.json
+++ b/packages/docs/src/lang/en/getting-started/FrequentlyAskedQuestions.json
@@ -10,6 +10,10 @@
"q": "### Error: Cannot find module 'node-sass'",
"a": "Ensure that your `@vue/cli packages` located in `package.json` are at least **^3.5.0**."
},
+ {
+ "q": "### Invalid CSS after \" @content\": expected \"}\", was \"($material-light); \"",
+ "a": "Ensure that you are using `sass` instead of `node-sass` in your **package.json**."
+ },
{
"q": "### My code doesn't work - what should I do",
"a": "First, ensure that you're using the latest version of Vue.js and Vuetify. Try to reproduce it in codepen using the following [template](https://template.vuetifyjs.com/). If you are unable to reproduce the issue outside of your environment, this usually means the issue resides locally. If you are still unable to resolve your issue, please provide your codepen and issue in **#need-help** in the [community](https://chat.vuetifyjs.com)."
|
ba964822a5b50418fdef505c47432da39e894013
|
2023-06-13 13:44:19
|
Kael
|
chore(dev): remove double v-app from playground
| false
|
remove double v-app from playground
|
chore
|
diff --git a/packages/vuetify/dev/App.vue b/packages/vuetify/dev/App.vue
index 102b76b636f..2bbd9199069 100644
--- a/packages/vuetify/dev/App.vue
+++ b/packages/vuetify/dev/App.vue
@@ -1,7 +1,5 @@
<template>
- <v-app>
- <Playground />
- </v-app>
+ <Playground />
</template>
<script>
|
206e5943034d5730930e83f9baa7ba5cd8967b7e
|
2020-04-11 03:35:36
|
John Leider
|
docs(Home): update hero buttons
| false
|
update hero buttons
|
docs
|
diff --git a/packages/docs/src/lang/en/vuetify/Home.json b/packages/docs/src/lang/en/vuetify/Home.json
index 48c91b77099..1b34cd70877 100644
--- a/packages/docs/src/lang/en/vuetify/Home.json
+++ b/packages/docs/src/lang/en/vuetify/Home.json
@@ -1,6 +1,6 @@
{
"becomeSponsor": "Support Vuetify",
- "callout": "# Material Design Component Framework",
+ "callout": "# Material Design<br>Component Framework",
"text": "Vuetify is a Vue UI Library with beautifully handcrafted Material Components. No design skills required — everything you need to create amazing applications is at your fingertips.",
"features": {
"community": {
diff --git a/packages/docs/src/views/home/components/Hero.vue b/packages/docs/src/views/home/components/Hero.vue
index 0ff01ce8128..b5e24b1f243 100644
--- a/packages/docs/src/views/home/components/Hero.vue
+++ b/packages/docs/src/views/home/components/Hero.vue
@@ -17,7 +17,7 @@
>
<v-responsive
class="overflow-visible"
- max-width="550"
+ max-width="625"
>
<base-title class="home-hero__title mb-4">
<base-markdown>Vuetify.Home.callout</base-markdown>
@@ -27,43 +27,64 @@
<div class="py-4" />
- <base-btn
- :block="$vuetify.breakpoint.smAndDown"
- :to="`/${$route.params.lang}/introduction/why-vuetify/`"
- class="primary--text my-6"
- color="white"
- x-large
- >
- <v-icon
- left
- size="20"
+ <div class="d-flex flex-wrap justify-left justify-sm-center justify-md-start align-center mx-n2">
+ <base-btn
+ :to="`/${$route.params.lang}/getting-started/quick-start/`"
+ class="primary--text ma-2 grow"
+ color="white"
+ x-large
+ @click="$ga.event('home', 'click', 'get-started')"
>
- mdi-speedometer
- </v-icon>
-
- {{ $t('Vuetify.Home.getStarted') }}
- </base-btn>
-
- <v-btn
- :block="$vuetify.breakpoint.smAndDown"
- class="my-6 ma-md-6"
- color="white"
- href="https://github.com/vuetifyjs/vuetify"
- min-width="187"
- outlined
- rel="nofollower noopener"
- target="_blank"
- x-large
- >
- <v-icon
- left
- size="20"
+ <v-icon
+ left
+ size="20"
+ >
+ mdi-speedometer
+ </v-icon>
+
+ {{ $t('Vuetify.Home.getStarted') }}
+ </base-btn>
+
+ <v-btn
+ :to="`/${$route.params.lang}/introduction/why-vuetify/`"
+ class="ma-2 grow"
+ color="white"
+ outlined
+ x-large
+ @click="$ga.event('home', 'click', 'why-vuetify')"
>
- mdi-github-face
- </v-icon>
-
- Github
- </v-btn>
+ <v-icon
+ left
+ size="20"
+ >
+ mdi-vuetify
+ </v-icon>
+
+ {{ $t('Vuetify.Home.whyVuetifyText2') }}
+ </v-btn>
+
+ <v-btn
+ class="ma-2 grow"
+ color="grey lighten-5"
+ href="https://github.com/vuetifyjs/vuetify"
+ rel="nofollower noopener"
+ target="_blank"
+ min-width="187"
+ light
+ x-large
+ depressed
+ @click="$ga.event('home', 'click', 'github')"
+ >
+ <v-icon
+ left
+ size="20"
+ >
+ mdi-github-face
+ </v-icon>
+
+ Github
+ </v-btn>
+ </div>
</v-responsive>
</v-col>
@@ -119,7 +140,7 @@
&.theme--dark
background: linear-gradient(to bottom, #2196F3, #5CBBF6)
- a
+ a:not(.v-btn)
color: inherit
text-decoration: none
|
81ae2c4d4ccb47a9db7cfb990d92158a29cc344e
|
2020-07-01 19:56:45
|
Dmitry Sharshakov
|
docs(VVirtualScroller): migrate the page (#54)
| false
|
migrate the page (#54)
|
docs
|
diff --git a/packages/docs-next/build/api-gen/locale/en/v-virtual-scroller.json b/packages/docs-next/build/api-gen/locale/en/v-virtual-scroller.json
index 451ec5cc425..e9497810800 100644
--- a/packages/docs-next/build/api-gen/locale/en/v-virtual-scroller.json
+++ b/packages/docs-next/build/api-gen/locale/en/v-virtual-scroller.json
@@ -1,11 +1,14 @@
{
"props": {
- "empty": ""
- // add prop lang here
+ "empty": "",
+ "bench": "The number of items **outside** the user view that are rendered (even if they are **not** viewable); to help prevent empty white space when scrolling *fast*.",
+ "height": "Height of the component as a css value",
+ "itemHeight": "Height in pixels of the items to display",
+ "items": "The array of items to display"
},
"slots": {
- "empty": ""
- // add slot lang here
+ "empty": "",
+ "default": "Default slot to customize items appearance"
},
"events": {
"empty": ""
diff --git a/packages/docs-next/src/examples/v-virtual-scroller/misc-user-directory.vue b/packages/docs-next/src/examples/v-virtual-scroller/misc-user-directory.vue
new file mode 100644
index 00000000000..4f19830b0d7
--- /dev/null
+++ b/packages/docs-next/src/examples/v-virtual-scroller/misc-user-directory.vue
@@ -0,0 +1,102 @@
+<template>
+ <v-card
+ class="mx-auto"
+ max-width="400"
+ >
+ <v-card-title class="white--text orange darken-4">
+ User Directory
+
+ <v-spacer></v-spacer>
+
+ <v-btn
+ color="white"
+ class="text--primary"
+ fab
+ small
+ >
+ <v-icon>mdi-plus</v-icon>
+ </v-btn>
+ </v-card-title>
+
+ <v-card-text class="pt-4">
+ Lorem ipsum dolor sit, amet consectetur adipisicing elit. Quasi nobis a at voluptates culpa optio amet! Inventore deserunt voluptatem maxime a veniam placeat, eos impedit nulla quos? Officiis, aperiam ducimus.
+ </v-card-text>
+
+ <v-divider></v-divider>
+
+ <v-virtual-scroll
+ :items="items"
+ :item-height="50"
+ height="300"
+ >
+ <template v-slot="{ item }">
+ <v-list-item>
+ <v-list-item-avatar>
+ <v-avatar
+ :color="item.color"
+ size="56"
+ class="white--text"
+ >
+ {{ item.initials }}
+ </v-avatar>
+ </v-list-item-avatar>
+
+ <v-list-item-content>
+ <v-list-item-title>{{ item.fullName }}</v-list-item-title>
+ </v-list-item-content>
+
+ <v-list-item-action>
+ <v-btn
+ depressed
+ small
+ >
+ View User
+
+ <v-icon
+ color="orange darken-4"
+ right
+ >
+ mdi-open-in-new
+ </v-icon>
+ </v-btn>
+ </v-list-item-action>
+ </v-list-item>
+ </template>
+ </v-virtual-scroll>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ colors: ['#2196F3', '#90CAF9', '#64B5F6', '#42A5F5', '#1E88E5', '#1976D2', '#1565C0', '#0D47A1', '#82B1FF', '#448AFF', '#2979FF', '#2962FF'],
+ names: ['Oliver', 'Jake', 'Noah', 'James', 'Jack', 'Connor', 'Liam', 'John', 'Harry', 'Callum', 'Mason', 'Robert', 'Jacob', 'Jacob', 'Jacob', 'Michael', 'Charlie', 'Kyle', 'William', 'William', 'Thomas', 'Joe', 'Ethan', 'David', 'George', 'Reece', 'Michael', 'Richard', 'Oscar', 'Rhys', 'Alexander', 'Joseph', 'James', 'Charlie', 'James', 'Charles', 'William', 'Damian', 'Daniel', 'Thomas', 'Amelia', 'Margaret', 'Emma', 'Mary', 'Olivia', 'Samantha', 'Olivia', 'Patricia', 'Isla', 'Bethany'],
+ surnames: ['Smith', 'Anderson', 'Clark', 'Wright', 'Mitchell', 'Johnson', 'Thomas', 'Rodriguez', 'Lopez', 'Perez', 'Williams', 'Jackson', 'Lewis', 'Hill', 'Roberts', 'Jones', 'White', 'Lee', 'Scott', 'Turner', 'Brown', 'Harris', 'Walker', 'Green', 'Phillips', 'Davis', 'Martin', 'Hall', 'Adams', 'Campbell', 'Miller', 'Thompson', 'Allen', 'Baker', 'Parker', 'Wilson', 'Garcia', 'Young', 'Gonzalez', 'Evans', 'Moore', 'Martinez', 'Hernandez', 'Nelson', 'Edwards', 'Taylor', 'Robinson', 'King', 'Carter', 'Collins'],
+ }),
+
+ computed: {
+ items () {
+ const namesLength = this.names.length
+ const surnamesLength = this.surnames.length
+ const colorsLength = this.colors.length
+
+ return Array.from({ length: 10000 }, (k, v) => {
+ const name = this.names[this.genRandomIndex(namesLength)]
+ const surname = this.surnames[this.genRandomIndex(surnamesLength)]
+
+ return {
+ color: this.colors[this.genRandomIndex(colorsLength)],
+ fullName: `${name} ${surname}`,
+ initials: `${name[0]} ${surname[0]}`,
+ }
+ })
+ },
+ },
+
+ methods: {
+ genRandomIndex (length) {
+ return Math.ceil(Math.random() * (length - 1))
+ },
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-virtual-scroller/prop-bench.vue b/packages/docs-next/src/examples/v-virtual-scroller/prop-bench.vue
new file mode 100644
index 00000000000..2360665433d
--- /dev/null
+++ b/packages/docs-next/src/examples/v-virtual-scroller/prop-bench.vue
@@ -0,0 +1,74 @@
+<template>
+ <div>
+ <v-responsive
+ max-width="400"
+ class="mx-auto mb-4"
+ >
+ <v-text-field
+ v-model="benched"
+ type="number"
+ label="Total Benched"
+ min="0"
+ max="10"
+ ></v-text-field>
+ </v-responsive>
+
+ <v-card
+ elevation="16"
+ max-width="400"
+ class="mx-auto"
+ >
+ <v-virtual-scroll
+ :bench="benched"
+ :items="items"
+ height="300"
+ item-height="64"
+ >
+ <template v-slot="{ item }">
+ <v-list-item :key="item">
+ <v-list-item-action>
+ <v-btn
+ fab
+ small
+ depressed
+ color="primary"
+ >
+ {{ item }}
+ </v-btn>
+ </v-list-item-action>
+
+ <v-list-item-content>
+ <v-list-item-title>
+ User Database Record <strong>ID {{ }}</strong>
+ </v-list-item-title>
+ </v-list-item-content>
+
+ <v-list-item-action>
+ <v-icon small>
+ mdi-open-in-new
+ </v-icon>
+ </v-list-item-action>
+ </v-list-item>
+
+ <v-divider></v-divider>
+ </template>
+ </v-virtual-scroll>
+ </v-card>
+ </div>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ benched: 0,
+ }),
+ computed: {
+ items () {
+ return Array.from({ length: this.length }, (k, v) => v + 1)
+ },
+ length () {
+ return 7000
+ },
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/examples/v-virtual-scroller/usage.vue b/packages/docs-next/src/examples/v-virtual-scroller/usage.vue
new file mode 100644
index 00000000000..5e3113086bb
--- /dev/null
+++ b/packages/docs-next/src/examples/v-virtual-scroller/usage.vue
@@ -0,0 +1,56 @@
+<template>
+ <div class="py-6 grow">
+ <v-slider
+ v-model="count"
+ hide-details
+ min="7000"
+ max="15000"
+ ></v-slider>
+ <div class="text-center font-weight-bold">
+ {{ items.length }} Total Items
+ </div>
+
+ <v-card outlined>
+ <v-virtual-scroll
+ :items="items"
+ v-bind="$attrs"
+ v-on="$listeners"
+ >
+ <template v-slot="{ item }">
+ <div class="px-2">
+ I'm item number {{ item }}
+ </div>
+ </template>
+ </v-virtual-scroll>
+ </v-card>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: 'Usage',
+
+ inheritAttrs: false,
+
+ data: () => ({
+ count: 10000,
+ defaults: {
+ height: 100,
+ 'item-height': 20,
+ },
+ options: {
+ sliders: {
+ height: [100, 175],
+ 'item-height': [20, 50],
+ },
+ },
+ tabs: [],
+ }),
+
+ computed: {
+ items () {
+ return Array.from({ length: this.count }, (k, v) => v + 1)
+ },
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/pages/en/components/virtual-scroller.md b/packages/docs-next/src/pages/en/components/virtual-scroller.md
index 99227ee3cc6..6e19e6c2cc3 100644
--- a/packages/docs-next/src/pages/en/components/virtual-scroller.md
+++ b/packages/docs-next/src/pages/en/components/virtual-scroller.md
@@ -3,77 +3,50 @@ meta:
title: Virtual scroller component,
description: The Virtual scroll component is a container that renders only visible elements. It is useful when in need to display large amount of uniform data.,
keywords: virtual scroll, vuetify virtual scroll component, vue virtual scroll component, v-virtual-scroll component
+related:
+ - /components/lists/
+ - /components/data-tables/
+ - /components/data-iterators/
---
# Virtual scroller
-Component description
+The `v-virtual-scroll` component displays a virtual, *infinite* list. It supports dynamic height and scrolling vertically.
<entry-ad />
## Usage
-Usage text
+The virtual scroller displays just enough records to fill the viewport and uses the existing component, rehydrating it with new data.
-`<usage name="" />`
-**name**: component name
-eg: `<usage name="v-alert" />`
+<usage name="v-virtual-scroller" />
## API
-- [API Page Link](../../api/v-component)
-
-## Sub-Components
-
-Omit if none
-
-### Sub Component 1
-
-Sub component text
-
-### Sub Component 2
-
-Sub component text
+- [v-virtual-scroller](../../api/v-virtual-scroller)
## Caveats
-Omit if none
-
-<alert type="success">Success Caveat</alert>
-<alert type="info">Info Caveat</alert>
-<alert type="warning">Warning Caveat</alert>
-<alert type="error">Error Caveat</alert>
+<alert type="info">
+ We are in the *process* of integrating the `v-virtual-scroll` component into existing features and components. If you are interested in helping, please reach out to **John Leider** in the [Discord Community](https://community.vuetifyjs.com).
+</alert>
## Examples
-Example text.
-
### Props
-Omit if none
-
-### Events
-
-Omit if none
+#### Bench
-### Slots
+By default the `v-virtual-scroll` does not pre-render additional items outside of the viewport. Using the `bench` prop will have the scroller render additional items as **padding**. It is **recommended** to keep this number as low as possible for the best possible `performance`.
-Omit if none
+<example file="v-virtual-scroller/prop-bench" />
### Misc
-Omit if none
-
-#### Example Header
-
-Example description
-
-`<example file="" />`
-**file**: `<component>/<type>-<propname>`
-eg: `<example file="v-alert/prop-colored-border" />`
+#### User directory
-## Accessibility
+The `v-virtual-scroll` component can render an __unlimited__ amount of items by rendering **only** what it needs to fill the scroller's viewport.
-Accessibility text - omit if none
+<example file="v-virtual-scroller/misc-user-directory" />
<backmatter />
|
fd87f7f8144ed2e28be981b8b1ada4c20ab5ced8
|
2017-11-17 13:17:07
|
Kael
|
chore: add zenhub badge to readme
| false
|
add zenhub badge to readme
|
chore
|
diff --git a/README.md b/README.md
index fd13de0880a..c0558ff3e2c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
<p align="center">
<a href="https://vuetifyjs.com" target="_blank"><img width="100"src="https://vuetifyjs.com/static/doc-images/logo.svg"></a>
</p>
@@ -24,6 +25,9 @@
<a href="https://www.npmjs.com/package/vuetify">
<img src="https://img.shields.io/npm/l/vuetify.svg" alt="License">
</a>
+ <a href="https://app.zenhub.com/workspace/o/vuetifyjs/vuetify/boards">
+ <img src="https://img.shields.io/badge/Managed_with-ZenHub-5e60ba.svg" alt="zenhub">
+ </a>
<a href="https://chat.vuetifyjs.com">
<img src="https://img.shields.io/badge/chat-on%20discord-7289da.svg" alt="Chat">
</a>
|
9c5c8e9c02de52d816f6826a16abf309350f1bd4
|
2019-04-02 21:01:09
|
MajesticPotatoe
|
test(VOverflowBtn): update snaps
| false
|
update snaps
|
test
|
diff --git a/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap b/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap
index dcb759cc6cd..ab78222a54b 100644
--- a/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap
+++ b/packages/vuetify/src/components/VOverflowBtn/__tests__/__snapshots__/VOverflowBtn.spec.ts.snap
@@ -44,14 +44,18 @@ exports[`VOverflowBtn.js should use default autocomplete selections 1`] = `
exports[`VOverflowBtn.js should use default autocomplete selections 2`] = `
-<div class="v-input v-text-field v-text-field--single-line v-select v-autocomplete v-overflow-btn v-input--is-label-active v-input--is-dirty theme--light">
+<div class="v-input v-text-field v-text-field--single-line v-select v-autocomplete v-overflow-btn v-overflow-btn--segmented v-input--is-label-active v-input--is-dirty theme--light">
<div class="v-input__control">
<div class="v-input__slot">
<div class="v-select__slot">
<div class="v-select__selections">
- <div class="v-select__selection v-select__selection--comma">
- foo
- </div>
+ <button type="button"
+ class="v-btn v-btn--flat v-btn--text theme--light v-size--default"
+ >
+ <span class="v-btn__content">
+ foo
+ </span>
+ </button>
<input autocomplete="off"
readonly="readonly"
type="text"
|
b9ed79db8ae68eed6bc13cf10aefa6944fa8675b
|
2024-07-25 11:46:02
|
Kael
|
fix(VAutocomplete): allow searching when menu is focused
| false
|
allow searching when menu is focused
|
fix
|
diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
index f2786a5ccd8..706bf17036f 100644
--- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
@@ -27,6 +27,7 @@ import { makeTransitionProps } from '@/composables/transition'
// Utilities
import { computed, mergeProps, nextTick, ref, shallowRef, watch } from 'vue'
import {
+ checkPrintable,
ensureValidVNode,
genericComponent,
IN_BROWSER,
@@ -195,7 +196,7 @@ export const VAutocomplete = genericComponent<new <
))
const listRef = ref<VList>()
- const { onListScroll, onListKeydown } = useScrolling(listRef, vTextFieldRef)
+ const listEvents = useScrolling(listRef, vTextFieldRef)
function onClear (e: MouseEvent) {
if (props.openOnClear) {
menu.value = true
@@ -217,6 +218,11 @@ export const VAutocomplete = genericComponent<new <
}
menu.value = !menu.value
}
+ function onListKeydown (e: KeyboardEvent) {
+ if (checkPrintable(e)) {
+ vTextFieldRef.value?.focus()
+ }
+ }
function onKeydown (e: KeyboardEvent) {
if (props.readonly || form?.isReadonly.value) return
@@ -472,10 +478,10 @@ export const VAutocomplete = genericComponent<new <
onKeydown={ onListKeydown }
onFocusin={ onFocusin }
onFocusout={ onFocusout }
- onScrollPassive={ onListScroll }
tabindex="-1"
aria-live="polite"
color={ props.itemColor ?? props.color }
+ { ...listEvents }
{ ...props.listProps }
>
{ slots['prepend-item']?.() }
diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.tsx b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
index 62836a211d1..c94595b94c0 100644
--- a/packages/vuetify/src/components/VCombobox/VCombobox.tsx
+++ b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
@@ -28,6 +28,7 @@ import { makeTransitionProps } from '@/composables/transition'
// Utilities
import { computed, mergeProps, nextTick, ref, shallowRef, watch } from 'vue'
import {
+ checkPrintable,
ensureValidVNode,
genericComponent,
IN_BROWSER,
@@ -246,7 +247,7 @@ export const VCombobox = genericComponent<new <
))
const listRef = ref<VList>()
- const { onListScroll, onListKeydown } = useScrolling(listRef, vTextFieldRef)
+ const listEvents = useScrolling(listRef, vTextFieldRef)
function onClear (e: MouseEvent) {
cleared = true
@@ -268,6 +269,11 @@ export const VCombobox = genericComponent<new <
}
menu.value = !menu.value
}
+ function onListKeydown (e: KeyboardEvent) {
+ if (checkPrintable(e)) {
+ vTextFieldRef.value?.focus()
+ }
+ }
// eslint-disable-next-line complexity
function onKeydown (e: KeyboardEvent) {
if (isComposingIgnoreKey(e) || props.readonly || form?.isReadonly.value) return
@@ -516,10 +522,10 @@ export const VCombobox = genericComponent<new <
onKeydown={ onListKeydown }
onFocusin={ onFocusin }
onFocusout={ onFocusout }
- onScrollPassive={ onListScroll }
tabindex="-1"
aria-live="polite"
color={ props.itemColor ?? props.color }
+ { ...listEvents }
{ ...props.listProps }
>
{ slots['prepend-item']?.() }
diff --git a/packages/vuetify/src/components/VSelect/VSelect.tsx b/packages/vuetify/src/components/VSelect/VSelect.tsx
index a31744a18f4..7253ce04632 100644
--- a/packages/vuetify/src/components/VSelect/VSelect.tsx
+++ b/packages/vuetify/src/components/VSelect/VSelect.tsx
@@ -26,6 +26,7 @@ import { makeTransitionProps } from '@/composables/transition'
// Utilities
import { computed, mergeProps, nextTick, ref, shallowRef, watch } from 'vue'
import {
+ checkPrintable,
ensureValidVNode,
genericComponent,
IN_BROWSER,
@@ -197,7 +198,7 @@ export const VSelect = genericComponent<new <
})
const listRef = ref<VList>()
- const { onListScroll, onListKeydown } = useScrolling(listRef, vTextFieldRef)
+ const listEvents = useScrolling(listRef, vTextFieldRef)
function onClear (e: MouseEvent) {
if (props.openOnClear) {
menu.value = true
@@ -208,6 +209,11 @@ export const VSelect = genericComponent<new <
menu.value = !menu.value
}
+ function onListKeydown (e: KeyboardEvent) {
+ if (checkPrintable(e)) {
+ onKeydown(e)
+ }
+ }
function onKeydown (e: KeyboardEvent) {
if (!e.key || props.readonly || form?.isReadonly.value) return
@@ -232,12 +238,6 @@ export const VSelect = genericComponent<new <
// html select hotkeys
const KEYBOARD_LOOKUP_THRESHOLD = 1000 // milliseconds
- function checkPrintable (e: KeyboardEvent) {
- const isPrintableChar = e.key.length === 1
- const noModifier = !e.ctrlKey && !e.metaKey && !e.altKey
- return isPrintableChar && noModifier
- }
-
if (props.multiple || !checkPrintable(e)) return
const now = performance.now()
@@ -399,10 +399,10 @@ export const VSelect = genericComponent<new <
onMousedown={ (e: MouseEvent) => e.preventDefault() }
onKeydown={ onListKeydown }
onFocusin={ onFocusin }
- onScrollPassive={ onListScroll }
tabindex="-1"
aria-live="polite"
color={ props.itemColor ?? props.color }
+ { ...listEvents }
{ ...props.listProps }
>
{ slots['prepend-item']?.() }
diff --git a/packages/vuetify/src/components/VSelect/useScrolling.ts b/packages/vuetify/src/components/VSelect/useScrolling.ts
index e6f5bb96dbe..05def0cc479 100644
--- a/packages/vuetify/src/components/VSelect/useScrolling.ts
+++ b/packages/vuetify/src/components/VSelect/useScrolling.ts
@@ -70,5 +70,8 @@ export function useScrolling (listRef: Ref<VList | undefined>, textFieldRef: Ref
}
}
- return { onListScroll, onListKeydown }
+ return {
+ onScrollPassive: onListScroll,
+ onKeydown: onListKeydown,
+ } as Record<string, Function> // typescript doesn't know about vue's event merging
}
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index e9efebb2037..089e4ca8418 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -760,3 +760,9 @@ export function templateRef () {
return fn as TemplateRef
}
+
+export function checkPrintable (e: KeyboardEvent) {
+ const isPrintableChar = e.key.length === 1
+ const noModifier = !e.ctrlKey && !e.metaKey && !e.altKey
+ return isPrintableChar && noModifier
+}
|
e7bf13a25280b659ccd1562a24edf58c84013470
|
2021-03-06 10:39:07
|
Kael
|
refactor: create useRender helper instead of expose() (#13214)
| false
|
create useRender helper instead of expose() (#13214)
|
refactor
|
diff --git a/packages/vuetify/src/components/VImg/VImg.tsx b/packages/vuetify/src/components/VImg/VImg.tsx
index 31c76b06e21..950635eb475 100644
--- a/packages/vuetify/src/components/VImg/VImg.tsx
+++ b/packages/vuetify/src/components/VImg/VImg.tsx
@@ -4,11 +4,9 @@ import './VImg.sass'
import {
computed,
defineComponent,
- getCurrentInstance,
h,
nextTick,
onBeforeMount,
- reactive,
ref,
vShow,
watch,
@@ -25,6 +23,7 @@ import type { ObserveDirectiveBinding } from '@/directives/intersect'
// Utils
import makeProps from '@/util/makeProps'
+import { useRender } from '@/util/useRender'
import { useDirective } from '@/util/useDirective'
import { maybeTransition } from '@/util'
@@ -83,16 +82,6 @@ export default defineComponent({
const naturalWidth = ref<number>()
const naturalHeight = ref<number>()
- // TODO: use expose() https://github.com/vuejs/vue-test-utils-next/issues/435
- const vm = getCurrentInstance() as any
- vm.setupState = reactive({
- currentSrc,
- image,
- state,
- naturalWidth,
- naturalHeight,
- })
-
const normalisedSrc = computed<srcObject>(() => {
return props.src && typeof props.src === 'object'
? {
@@ -242,7 +231,7 @@ export default defineComponent({
return maybeTransition(props, { appear: true }, error)
})
- return () => withDirectives(
+ useRender(() => withDirectives(
<VResponsive
class="v-img"
aspectRatio={ aspectRatio.value }
@@ -260,6 +249,14 @@ export default defineComponent({
},
modifiers: { once: true },
})]
- )
+ ))
+
+ return {
+ currentSrc,
+ image,
+ state,
+ naturalWidth,
+ naturalHeight,
+ }
},
})
diff --git a/packages/vuetify/src/components/VLayout/VLayout.tsx b/packages/vuetify/src/components/VLayout/VLayout.tsx
index 4e14a83c1a9..142e3b6a1bb 100644
--- a/packages/vuetify/src/components/VLayout/VLayout.tsx
+++ b/packages/vuetify/src/components/VLayout/VLayout.tsx
@@ -3,6 +3,7 @@ import './VLayout.sass'
// Utilities
import { defineComponent } from 'vue'
+import { useRender } from '@/util/useRender'
import makeProps from '@/util/makeProps'
// Composables
@@ -13,21 +14,21 @@ export default defineComponent({
props: makeProps(makeLayoutProps()),
- setup (props, { slots, expose }) {
+ setup (props, { slots }) {
const { layoutClasses, getLayoutItem, items } = createLayout(props)
- expose({
- getLayoutItem,
- items,
- })
-
- return () => (
+ useRender(() => (
<div
class={layoutClasses.value}
style={{
height: props.fullHeight ? '100vh' : undefined,
}}
>{ slots.default?.() }</div>
- )
+ ))
+
+ return {
+ getLayoutItem,
+ items,
+ }
},
})
diff --git a/packages/vuetify/src/util/useRender.ts b/packages/vuetify/src/util/useRender.ts
new file mode 100644
index 00000000000..11ce01130ff
--- /dev/null
+++ b/packages/vuetify/src/util/useRender.ts
@@ -0,0 +1,7 @@
+import { getCurrentInstance } from 'vue'
+import type { VNode } from 'vue'
+
+export function useRender (render: () => VNode): void {
+ const vm = getCurrentInstance() as any
+ vm.render = render
+}
|
49485718d24889d7ccda05bac564afb1d9f4c9c7
|
2022-06-20 20:42:05
|
John Leider
|
refactor(VCheckbox): tuning pass (#15264)
| false
|
tuning pass (#15264)
|
refactor
|
diff --git a/packages/docs/src/pages/en/components/checkboxes.md b/packages/docs/src/pages/en/components/checkboxes.md
index 7661bdd523f..0192f471f7a 100644
--- a/packages/docs/src/pages/en/components/checkboxes.md
+++ b/packages/docs/src/pages/en/components/checkboxes.md
@@ -14,7 +14,9 @@ related:
The `v-checkbox` component provides users the ability to choose between two distinct values. These are very similar to a switch and can be used in complex forms and checklists. A simpler version, `v-simple-checkbox` is used primarily as a lightweight alternative in data-table components to select rows or display inline boolean data.
-<entry />
+
+
+---
## Usage
@@ -22,6 +24,8 @@ A `v-checkbox` in its simplest form provides a toggle between 2 values.
<example file="v-checkbox/usage" />
+<entry />
+
## API
<api-inline />
diff --git a/packages/vuetify/src/components/VCheckbox/__tests__/VCheckbox.spec.cy.tsx b/packages/vuetify/src/components/VCheckbox/__tests__/VCheckbox.spec.cy.tsx
new file mode 100644
index 00000000000..31b26987435
--- /dev/null
+++ b/packages/vuetify/src/components/VCheckbox/__tests__/VCheckbox.spec.cy.tsx
@@ -0,0 +1,14 @@
+/// <reference types="../../../../types/cypress" />
+
+import { VCheckbox } from '..'
+import { generate } from '@/../cypress/templates'
+
+const props = {}
+
+const stories = {
+ Default: <VCheckbox />,
+}
+// Tests
+describe('VCheckbox', () => {
+ generate({ stories, props, component: VCheckbox })
+})
|
5657a1e4520af572023f3013604bc7d92db6a25a
|
2023-07-25 01:15:36
|
John Leider
|
feat(VSelectionControl): add base-color support
| false
|
add base-color support
|
feat
|
diff --git a/packages/vuetify/src/components/VSelectionControl/VSelectionControl.tsx b/packages/vuetify/src/components/VSelectionControl/VSelectionControl.tsx
index 6f2899c9e42..16bcae12161 100644
--- a/packages/vuetify/src/components/VSelectionControl/VSelectionControl.tsx
+++ b/packages/vuetify/src/components/VSelectionControl/VSelectionControl.tsx
@@ -50,6 +50,7 @@ export type VSelectionControlSlots = {
export const makeSelectionControlProps = propsFactory({
label: String,
+ baseColor: String,
trueValue: null,
falseValue: null,
value: null,
@@ -105,11 +106,9 @@ export function useSelectionControl (
},
})
const { textColorClasses, textColorStyles } = useTextColor(computed(() => {
- return (
- model.value &&
- !props.error &&
- !props.disabled
- ) ? props.color : undefined
+ if (props.error || props.disabled) return undefined
+
+ return model.value ? props.color : props.baseColor
}))
const icon = computed(() => model.value ? props.trueIcon : props.falseIcon)
|
09bfd7a408c61e340da790537d85baacaff4961e
|
2019-07-18 20:44:27
|
John Leider
|
docs(VDataTable): update slot example
| false
|
update slot example
|
docs
|
diff --git a/packages/docs/src/examples/data-tables/intermediate/slots.vue b/packages/docs/src/examples/data-tables/intermediate/slots.vue
index 63af41dc65d..a31f4c1b1e6 100644
--- a/packages/docs/src/examples/data-tables/intermediate/slots.vue
+++ b/packages/docs/src/examples/data-tables/intermediate/slots.vue
@@ -51,14 +51,16 @@
</template>
<template v-if="isEnabled('body')" v-slot:body="{ items }">
- <tr v-for="item in items" :key="item.name">
- <td>{{ item.name }}</td>
- <td>CONTENT</td>
- <td>CONTENT</td>
- <td>CONTENT</td>
- <td>CONTENT</td>
- <td>CONTENT</td>
- </tr>
+ <tbody>
+ <tr v-for="item in items" :key="item.name">
+ <td>{{ item.name }}</td>
+ <td>CONTENT</td>
+ <td>CONTENT</td>
+ <td>CONTENT</td>
+ <td>CONTENT</td>
+ <td>CONTENT</td>
+ </tr>
+ </tbody>
</template>
<template v-if="isEnabled('no-data')" v-slot:no-data>
|
b13428774f1a47fa248cc8cdf8e698f4b4801579
|
2022-05-28 01:15:10
|
Andrew Henry
|
docs(buttons): reposition variant alert
| false
|
reposition variant alert
|
docs
|
diff --git a/packages/docs/src/pages/en/components/buttons.md b/packages/docs/src/pages/en/components/buttons.md
index 2da0fc066ae..ef88944d3ac 100644
--- a/packages/docs/src/pages/en/components/buttons.md
+++ b/packages/docs/src/pages/en/components/buttons.md
@@ -55,14 +55,14 @@ The recommended placement of elements inside of `v-btn` is:
The **variant** prop gives you easy access to several different button styles. Available variants are: **contained**(default), **contained-flat**, **contained-text**, **outlined**, **plain**, and **text**.
-<example file="v-btn/prop-variant" />
-
<alert type="warning">
- When a `v-btn` is used inside of `v-toolbar` and `v-app-bar` the default variant `text` is applied instead of **contained**.
+ When a `v-btn` is used inside of `v-toolbar` and `v-app-bar` the default variant **text** is applied instead of **contained**.
</alert>
+<example file="v-btn/prop-variant" />
+
#### Block
**block** buttons extend the full available width.
|
6e5894e47dd69822519ead22334d9ccfede57747
|
2022-10-25 18:18:21
|
Kael
|
test: fix snapshots rendering
| false
|
fix snapshots rendering
|
test
|
diff --git a/packages/vuetify/cypress/templates/generateStories.tsx b/packages/vuetify/cypress/templates/generateStories.tsx
index efa77b0dfb6..715145ed455 100644
--- a/packages/vuetify/cypress/templates/generateStories.tsx
+++ b/packages/vuetify/cypress/templates/generateStories.tsx
@@ -2,7 +2,7 @@
* Utilities for generating formatted mount functions
* Some utility functions for mounting these generated examples inside of tests
*/
-import { JSXComponent } from 'vue'
+import { FunctionalComponent, JSXComponent } from 'vue'
const _ = Cypress._
@@ -30,7 +30,7 @@ const title = (key: string) => <h4 class="my-4">{ key }</h4>
const grid = (content: JSX.Element | JSX.Element[]) => <div style="display: flex; grid-gap: 0.8rem;">{ content }</div>
// Spacing between mounted components
-const Wrapper = () => <div class="ma-4"></div>
+const Wrapper: FunctionalComponent = (_, { slots }) => <div class="ma-4">{ slots.default?.() }</div>
/**
* Generate an array of Examples by iterating over Stories.
|
d938634702d2dc5e5d43c166541110730db5a082
|
2022-08-08 21:31:09
|
John Leider
|
fix(VInput): reduce vertical height caused by details
| false
|
reduce vertical height caused by details
|
fix
|
diff --git a/packages/vuetify/src/components/VInput/VInput.sass b/packages/vuetify/src/components/VInput/VInput.sass
index c70a3925121..8a155488b82 100644
--- a/packages/vuetify/src/components/VInput/VInput.sass
+++ b/packages/vuetify/src/components/VInput/VInput.sass
@@ -45,7 +45,6 @@
grid-area: messages
letter-spacing: $input-details-letter-spacing
line-height: $input-details-line-height
- margin-bottom: $input-details-margin-bottom
min-height: $input-details-min-height
padding-top: $input-details-padding-above
overflow: hidden
@@ -83,4 +82,5 @@
grid-area: append
.v-input__control
+ display: flex
grid-area: control
diff --git a/packages/vuetify/src/components/VInput/_variables.scss b/packages/vuetify/src/components/VInput/_variables.scss
index 7beea6aa844..dbfc5b088f3 100644
--- a/packages/vuetify/src/components/VInput/_variables.scss
+++ b/packages/vuetify/src/components/VInput/_variables.scss
@@ -13,7 +13,6 @@ $input-details-font-size: .75rem !default;
$input-details-font-weight: 400 !default;
$input-details-letter-spacing: .0333333333em !default;
$input-details-line-height: normal !default;
-$input-details-margin-bottom: 16px !default;
$input-details-min-height: 22px !default;
$input-details-padding-above: 6px !default;
$input-details-transition: 150ms settings.$standard-easing !default;
|
5f8d8cbe1450afbfba5de2e44ec874b7522ce627
|
2021-07-02 00:13:43
|
John Leider
|
feat(VBreadcrumbs): port to v3 (#13856)
| false
|
port to v3 (#13856)
|
feat
|
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.sass b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.sass
index 2cf05f3c634..de391e24e3c 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.sass
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.sass
@@ -1,45 +1,39 @@
-@import './_variables'
+@import ./index
-// Theme
-+theme(v-breadcrumbs) using ($material)
- .v-breadcrumbs__divider, .v-breadcrumbs__item--disabled
- color: map-deep-get($material, 'text', 'disabled')
-
-// Block
.v-breadcrumbs
- align-items: center
- display: flex
- flex-wrap: wrap
- flex: $breadcrumbs-flex
- list-style-type: none
- margin: $breadcrumbs-margin
+ line-height: $breadcrumbs-line-height
padding: $breadcrumbs-padding
- li
- align-items: center
- display: inline-flex
- font-size: $breadcrumbs-item-font-size
+ &--rounded
+ @include rounded($breadcrumbs-rounded-border-radius)
- .v-icon
- font-size: $breadcrumbs-item-large-font-size
+ @at-root
+ @include density('v-breadcrumbs', $breadcrumbs-density) using ($modifier)
+ padding-top: $breadcrumbs-padding + $modifier
+ padding-bottom: $breadcrumbs-padding + $modifier
- &:nth-child(even)
- padding: $breadcrumbs-even-child-padding
-// Element
-.v-breadcrumbs__item
+.v-breadcrumbs-item
align-items: center
+ color: inherit
display: inline-flex
+ padding: $breadcrumbs-item-padding
text-decoration: none
- transition: $primary-transition
+ vertical-align: $breadcrumbs-vertical-align
&--disabled
+ opacity: $breadcrumbs-item-disabled-opacity
pointer-events: none
-// Modifier
-.v-breadcrumbs--large
- li
- font-size: $breadcrumbs-item-large-font-size
+ &--link:hover
+ text-decoration: $breadcrumbs-item-link-text-decoration
+
+ .v-icon
+ font-size: $breadcrumbs-item-icon-font-size
+ margin-inline-start: $breadcrumbs-item-icon-margin-inline-start
+ margin-inline-end: $breadcrumbs-item-icon-margin-inline-end
- .v-icon
- font-size: $breadcrumbs-item-large-font-size
+.v-breadcrumbs-divider
+ display: inline-block
+ padding: $breadcrumbs-divider-padding
+ vertical-align: $breadcrumbs-vertical-align
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts
deleted file mode 100644
index fb5e03db2d2..00000000000
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// @ts-nocheck
-/* eslint-disable */
-
-// Styles
-import './VBreadcrumbs.sass'
-
-// Types
-import { VNode } from 'vue'
-import { PropValidator } from 'vue/types/options'
-
-// Components
-import VBreadcrumbsItem from './VBreadcrumbsItem'
-import VBreadcrumbsDivider from './VBreadcrumbsDivider'
-
-// Mixins
-import Themeable from '../../mixins/themeable'
-
-// Utils
-import mixins from '../../util/mixins'
-
-export default mixins(
- Themeable
- /* @vue/component */
-).extend({
- name: 'v-breadcrumbs',
-
- props: {
- divider: {
- type: String,
- default: '/',
- },
- items: {
- type: Array,
- default: () => ([]),
- } as PropValidator<any[]>,
- large: Boolean,
- },
-
- computed: {
- classes (): object {
- return {
- 'v-breadcrumbs--large': this.large,
- ...this.themeClasses,
- }
- },
- },
-
- methods: {
- genDivider () {
- return this.$createElement(VBreadcrumbsDivider, this.$slots.divider ? this.$slots.divider : this.divider)
- },
- genItems () {
- const items = []
- const hasSlot = !!this.$scopedSlots.item
- const keys = []
-
- for (let i = 0; i < this.items.length; i++) {
- const item = this.items[i]
-
- keys.push(item.text)
-
- if (hasSlot) items.push(this.$scopedSlots.item!({ item }))
- else items.push(this.$createElement(VBreadcrumbsItem, { key: keys.join('.'), props: item }, [item.text]))
-
- if (i < this.items.length - 1) items.push(this.genDivider())
- }
-
- return items
- },
- },
-
- render (h): VNode {
- const children = this.$slots.default || this.genItems()
-
- return h('ul', {
- staticClass: 'v-breadcrumbs',
- class: this.classes,
- }, children)
- },
-})
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx
new file mode 100644
index 00000000000..1643a2583f5
--- /dev/null
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx
@@ -0,0 +1,110 @@
+// Styles
+import './VBreadcrumbs.sass'
+
+// Components
+import VBreadcrumbsItem from './VBreadcrumbsItem'
+import VBreadcrumbsDivider from './VBreadcrumbsDivider'
+import { VIcon } from '@/components/VIcon'
+
+// Composables
+import { makeDensityProps, useDensity } from '@/composables/density'
+import { makeRoundedProps, useRounded } from '@/composables/rounded'
+import { makeTagProps } from '@/composables/tag'
+import { useTextColor } from '@/composables/color'
+
+// Utilities
+import { computed, defineComponent, provide, toRef } from 'vue'
+import { makeProps } from '@/util'
+
+// Types
+import type { InjectionKey, PropType, Ref } from 'vue'
+import type { LinkProps } from '@/composables/router'
+
+interface BreadcrumbsContext {
+ color: Ref<string | undefined>
+ disabled: Ref<boolean>
+}
+
+export const VBreadcrumbsSymbol: InjectionKey<BreadcrumbsContext> = Symbol.for('vuetify:breadcrumbs')
+
+export type BreadcrumbItem = string | (LinkProps & {
+ text: string
+})
+
+export default defineComponent({
+ name: 'VBreadcrumbs',
+
+ props: makeProps({
+ color: String,
+ disabled: Boolean,
+ divider: {
+ type: String,
+ default: '/',
+ },
+ icon: String,
+ items: {
+ type: Array as PropType<BreadcrumbItem[]>,
+ default: () => ([]),
+ },
+
+ ...makeDensityProps(),
+ ...makeRoundedProps(),
+ ...makeTagProps({ tag: 'ul' }),
+ }),
+
+ setup (props, { slots }) {
+ const { densityClasses } = useDensity(props, 'v-breadcrumbs')
+ const { roundedClasses } = useRounded(props, 'v-breadcrumbs')
+ const { textColorClasses, textColorStyles } = useTextColor(toRef(props, 'color'))
+ const items = computed(() => {
+ return props.items.map((item, index, array) => ({
+ props: {
+ disabled: index >= array.length - 1,
+ ...(typeof item === 'string' ? { text: item } : item),
+ },
+ }))
+ })
+
+ provide(VBreadcrumbsSymbol, {
+ color: toRef(props, 'color'),
+ disabled: toRef(props, 'disabled'),
+ })
+
+ return () => (
+ <props.tag
+ class={[
+ 'v-breadcrumbs',
+ densityClasses.value,
+ roundedClasses.value,
+ textColorClasses.value,
+ ]}
+ style={[
+ textColorStyles.value,
+ ]}
+ >
+ { props.icon && (
+ <VIcon icon={ props.icon } left />
+ ) }
+
+ { items.value.map((item, index) => (
+ <>
+ <VBreadcrumbsItem
+ key={ index }
+ { ...item.props }
+ >
+ { slots.item?.({ ...item, index }) }
+ </VBreadcrumbsItem>
+
+ { index < props.items.length - 1 && (
+ <VBreadcrumbsDivider>
+ { slots.divider ? slots.divider({ ...item, index }) : props.divider }
+ </VBreadcrumbsDivider>
+ ) }
+ </>
+ )) }
+
+ { slots.default?.() }
+ </props.tag>
+ )
+ },
+})
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.ts b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.ts
deleted file mode 100644
index 23d9bab8bcc..00000000000
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// @ts-nocheck
-/* eslint-disable */
-
-import { createSimpleFunctional } from '../../util/helpers'
-
-export default createSimpleFunctional('v-breadcrumbs__divider', 'li')
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx
new file mode 100644
index 00000000000..6b33bef1000
--- /dev/null
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx
@@ -0,0 +1,3 @@
+import { createSimpleFunctional } from '@/util'
+
+export default createSimpleFunctional('v-breadcrumbs-divider', 'li')
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsItem.ts b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsItem.ts
deleted file mode 100644
index 7c22cfc3d7d..00000000000
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsItem.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// @ts-nocheck
-/* eslint-disable */
-
-import Routable from '../../mixins/routable'
-
-import mixins from '../../util/mixins'
-import { VNode } from 'vue'
-
-/* @vue/component */
-export default mixins(Routable).extend({
- name: 'v-breadcrumbs-item',
-
- props: {
- // In a breadcrumb, the currently
- // active item should be dimmed
- activeClass: {
- type: String,
- default: 'v-breadcrumbs__item--disabled',
- },
- ripple: {
- type: [Boolean, Object],
- default: false,
- },
- },
-
- computed: {
- classes (): object {
- return {
- 'v-breadcrumbs__item': true,
- [this.activeClass]: this.disabled,
- }
- },
- },
-
- render (h): VNode {
- const { tag, data } = this.generateRouteLink()
-
- return h('li', [
- h(tag, {
- ...data,
- attrs: {
- ...data.attrs,
- 'aria-current': this.isActive && this.isLink ? 'page' : undefined,
- },
- }, this.$slots.default),
- ])
- },
-})
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsItem.tsx b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsItem.tsx
new file mode 100644
index 00000000000..b2564fcb5dc
--- /dev/null
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsItem.tsx
@@ -0,0 +1,72 @@
+// Composables
+import { makeRouterProps, useLink } from '@/composables/router'
+import { makeTagProps } from '@/composables/tag'
+import { useTextColor } from '@/composables/color'
+
+// Utilities
+import { computed, defineComponent, inject } from 'vue'
+import { makeProps } from '@/util'
+
+// Types
+import { VBreadcrumbsSymbol } from './VBreadcrumbs'
+
+export default defineComponent({
+ name: 'VBreadcrumbsItem',
+
+ props: makeProps({
+ active: Boolean,
+ activeClass: String,
+ activeColor: String,
+ color: String,
+ disabled: Boolean,
+ text: String,
+
+ ...makeRouterProps(),
+ ...makeTagProps({ tag: 'li' }),
+ }),
+
+ setup (props, { slots, attrs }) {
+ const breadcrumbs = inject(VBreadcrumbsSymbol)
+
+ if (!breadcrumbs) throw new Error('[Vuetify] Could not find v-breadcrumbs provider')
+
+ const link = useLink(props, attrs)
+ const isActive = computed(() => {
+ return props.active || link.isExactActive?.value
+ })
+ const color = computed(() => {
+ if (isActive.value) return props.activeColor ?? breadcrumbs.color.value
+
+ return props.color
+ })
+ const { textColorClasses, textColorStyles } = useTextColor(color)
+
+ return () => {
+ const Tag = (link.isLink.value) ? 'a' : props.tag
+
+ return (
+ <Tag
+ class={[
+ 'v-breadcrumbs-item',
+ {
+ 'v-breadcrumbs-item--active': isActive.value,
+ 'v-breadcrumbs-item--disabled': props.disabled || breadcrumbs.disabled.value,
+ 'v-breadcrumbs-item--link': link.isLink.value,
+ [`${props.activeClass}`]: isActive.value && props.activeClass,
+ },
+ textColorClasses.value,
+ ]}
+ style={[
+ textColorStyles.value,
+ ]}
+ aria-current={ isActive.value ? 'page' : undefined }
+ onClick={ isActive.value && link.navigate }
+ >
+ { props.text }
+
+ { slots.default?.() }
+ </Tag>
+ )
+ }
+ },
+})
diff --git a/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbs.spec.ts b/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbs.spec.ts
index 2f17d92f0fa..0fb56cba511 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbs.spec.ts
+++ b/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbs.spec.ts
@@ -1,101 +1,30 @@
-// @ts-nocheck
-/* eslint-disable */
-
// Components
-// import VBreadcrumbs from '../VBreadcrumbs'
-// import VBreadcrumbsItem from '../VBreadcrumbsItem'
+import { VBreadcrumbs } from '..'
// Utilities
-import { compileToFunctions } from 'vue-template-compiler'
-import {
- mount,
- Wrapper,
-} from '@vue/test-utils'
-
-describe.skip('VBreadcrumbs.ts', () => {
- type Instance = InstanceType<typeof VBreadcrumbs>
- let mountFunction: (options?: object) => Wrapper<Instance>
-
- beforeEach(() => {
- mountFunction = (options = {}) => {
- return mount(VBreadcrumbs, {
- ...options,
- })
- }
- })
-
- it('should have breadcrumbs classes', () => {
- const wrapper = mount(VBreadcrumbs)
-
- expect(wrapper.classes('v-breadcrumbs')).toBe(true)
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should render items without slot', () => {
- const wrapper = mountFunction({
- propsData: {
- items: [
- { text: 'a' },
- { text: 'b' },
- { text: 'c' },
- { text: 'd' },
- ],
- },
- })
+import { createVuetify } from '@/framework'
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from '@jest/globals'
- expect(wrapper.html()).toMatchSnapshot()
- })
+describe('VBreadcrumbs', () => {
+ const vuetify = createVuetify()
- it('should not complain about identical keys', () => {
- mountFunction({
- propsData: {
- items: [
- { text: 'a' },
- { text: 'a' },
- ],
- },
+ function mountFunction (options = {}) {
+ return mount(VBreadcrumbs, {
+ global: { plugins: [vuetify] },
+ ...options,
})
+ }
- expect(`Duplicate keys detected: 'a'`).not.toHaveBeenWarned()
- })
-
- it('should use slot to render items if present', () => {
- const wrapper = mountFunction({
- propsData: {
- items: [
- { text: 'a' },
- { text: 'b' },
- { text: 'c' },
- { text: 'd' },
- ],
- },
- scopedSlots: {
- item (props) {
- return this.$createElement(VBreadcrumbsItem, {
- key: props.item.text,
- }, props.item.text.toUpperCase())
- },
- },
- })
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should use a custom divider slot', () => {
+ it.each([
+ ['item'],
+ ['divider'],
+ ])('should generate slot content', slot => {
const wrapper = mountFunction({
- propsData: {
- items: [
- { text: 'a' },
- { text: 'b' },
- { text: 'c' },
- { text: 'd' },
- ],
- },
- slots: {
- divider: '/divider/',
- },
+ props: { items: ['fizz', 'buzz'] },
+ slots: { [slot]: '<div>foobar</div>' },
})
- expect(wrapper.html()).toMatchSnapshot()
+ expect(wrapper.html()).toContain('<div>foobar</div>')
})
})
diff --git a/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbsItem.spec.ts b/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbsItem.spec.ts
deleted file mode 100644
index 281ad0414d6..00000000000
--- a/packages/vuetify/src/components/VBreadcrumbs/__tests__/VBreadcrumbsItem.spec.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// @ts-nocheck
-/* eslint-disable */
-
-// Components
-// import VBreadcrumbsItem from '../VBreadcrumbsItem'
-
-// Utilities
-import {
- mount,
- Wrapper,
-} from '@vue/test-utils'
-
-describe.skip('VBreadcrumbsItem.ts', () => {
- type Instance = InstanceType<typeof VBreadcrumbsItem>
- let mountFunction: (options?: object) => Wrapper<Instance>
-
- beforeEach(() => {
- mountFunction = (options = {}) => {
- return mount(VBreadcrumbsItem, {
- ...options,
- })
- }
- })
-
- it('should render component and match snapshot', () => {
- const wrapper = mountFunction()
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should render component with active & link state and match snapshot', () => {
- const wrapper = mountFunction({
- propsData: {
- link: true,
- },
- })
- wrapper.setData({
- isActive: true,
- })
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-})
diff --git a/packages/vuetify/src/components/VBreadcrumbs/__tests__/__snapshots__/VBreadcrumbs.spec.ts.snap b/packages/vuetify/src/components/VBreadcrumbs/__tests__/__snapshots__/VBreadcrumbs.spec.ts.snap
deleted file mode 100644
index 7226436c740..00000000000
--- a/packages/vuetify/src/components/VBreadcrumbs/__tests__/__snapshots__/VBreadcrumbs.spec.ts.snap
+++ /dev/null
@@ -1,108 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`VBreadcrumbs.ts should have breadcrumbs classes 1`] = `
-<ul class="v-breadcrumbs theme--light">
-</ul>
-`;
-
-exports[`VBreadcrumbs.ts should render items without slot 1`] = `
-<ul class="v-breadcrumbs theme--light">
- <li>
- <div class="v-breadcrumbs__item">
- a
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- b
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- c
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- d
- </div>
- </li>
-</ul>
-`;
-
-exports[`VBreadcrumbs.ts should use a custom divider slot 1`] = `
-<ul class="v-breadcrumbs theme--light">
- <li>
- <div class="v-breadcrumbs__item">
- a
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /divider/
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- b
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /divider/
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- c
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /divider/
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- d
- </div>
- </li>
-</ul>
-`;
-
-exports[`VBreadcrumbs.ts should use slot to render items if present 1`] = `
-<ul class="v-breadcrumbs theme--light">
- <li>
- <div class="v-breadcrumbs__item">
- A
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- B
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- C
- </div>
- </li>
- <li class="v-breadcrumbs__divider">
- /
- </li>
- <li>
- <div class="v-breadcrumbs__item">
- D
- </div>
- </li>
-</ul>
-`;
diff --git a/packages/vuetify/src/components/VBreadcrumbs/__tests__/__snapshots__/VBreadcrumbsItem.spec.ts.snap b/packages/vuetify/src/components/VBreadcrumbs/__tests__/__snapshots__/VBreadcrumbsItem.spec.ts.snap
deleted file mode 100644
index 112e1f9a3bd..00000000000
--- a/packages/vuetify/src/components/VBreadcrumbs/__tests__/__snapshots__/VBreadcrumbsItem.spec.ts.snap
+++ /dev/null
@@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`VBreadcrumbsItem.ts should render component and match snapshot 1`] = `
-<li>
- <div class="v-breadcrumbs__item">
- </div>
-</li>
-`;
-
-exports[`VBreadcrumbsItem.ts should render component with active & link state and match snapshot 1`] = `
-<li>
- <div class="v-breadcrumbs__item"
- aria-current="page"
- >
- </div>
-</li>
-`;
diff --git a/packages/vuetify/src/components/VBreadcrumbs/_index.scss b/packages/vuetify/src/components/VBreadcrumbs/_index.scss
new file mode 100644
index 00000000000..dca47ae85b9
--- /dev/null
+++ b/packages/vuetify/src/components/VBreadcrumbs/_index.scss
@@ -0,0 +1,2 @@
+@import '../../styles/styles.sass';
+@import './variables';
diff --git a/packages/vuetify/src/components/VBreadcrumbs/_variables.scss b/packages/vuetify/src/components/VBreadcrumbs/_variables.scss
index 41188317e81..e1137417d90 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/_variables.scss
+++ b/packages/vuetify/src/components/VBreadcrumbs/_variables.scss
@@ -1,8 +1,13 @@
-@import '../../styles/styles.sass';
-
-$breadcrumbs-flex: 0 1 auto !default;
-$breadcrumbs-padding: 18px 12px !default;
-$breadcrumbs-even-child-padding: 0 12px !default;
-$breadcrumbs-item-font-size: 14px !default;
-$breadcrumbs-item-large-font-size: 16px !default;
-$breadcrumbs-margin: 0 !default;
+// Defaults
+$breadcrumbs-density: ('default': 0, 'comfortable': -1, 'compact': -2) !default;
+$breadcrumbs-divider-padding: 0 8px !default;
+$breadcrumbs-item-disabled-opacity: var(--v-disabled-opacity) !default;
+$breadcrumbs-item-icon-font-size: map-deep-get($typography, 'body-1', 'size') !default;
+$breadcrumbs-item-icon-margin-inline-end: 2px !default;
+$breadcrumbs-item-icon-margin-inline-start: -4px !default;
+$breadcrumbs-item-link-text-decoration: underline !default;
+$breadcrumbs-item-padding: 0 4px !default;
+$breadcrumbs-line-height: map-deep-get($typography, 'subtitle-2', 'line-height') !default;
+$breadcrumbs-padding: 16px !default;
+$breadcrumbs-rounded-border-radius: $border-radius-root !default;
+$breadcrumbs-vertical-align: middle !default;
diff --git a/packages/vuetify/src/components/VBreadcrumbs/index.ts b/packages/vuetify/src/components/VBreadcrumbs/index.ts
index 6cb5617f88a..e05fd8fa8b7 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/index.ts
+++ b/packages/vuetify/src/components/VBreadcrumbs/index.ts
@@ -1,13 +1,3 @@
-import VBreadcrumbs from './VBreadcrumbs'
-import VBreadcrumbsItem from './VBreadcrumbsItem'
-import VBreadcrumbsDivider from './VBreadcrumbsDivider'
-
-export { VBreadcrumbs, VBreadcrumbsItem, VBreadcrumbsDivider }
-
-export default {
- $_vuetify_subcomponents: {
- VBreadcrumbs,
- VBreadcrumbsItem,
- VBreadcrumbsDivider,
- },
-}
+export { default as VBreadcrumbs } from './VBreadcrumbs'
+export { default as VBreadcrumbsItem } from './VBreadcrumbsItem'
+export { default as VBreadcrumbsDivider } from './VBreadcrumbsDivider'
diff --git a/packages/vuetify/src/components/index.ts b/packages/vuetify/src/components/index.ts
index ef12078743c..fe4a6f7b056 100644
--- a/packages/vuetify/src/components/index.ts
+++ b/packages/vuetify/src/components/index.ts
@@ -7,7 +7,7 @@ export * from './VBadge'
export * from './VBanner'
export * from './VBottomNavigation'
// export * from './VBottomSheet'
-// export * from './VBreadcrumbs'
+export * from './VBreadcrumbs'
// export * from './VBtn'
export * from './VBtn'
// export * from './VBtnToggle'
diff --git a/packages/vuetify/src/composables/router.tsx b/packages/vuetify/src/composables/router.tsx
index 9e981ef28c4..780868edd92 100644
--- a/packages/vuetify/src/composables/router.tsx
+++ b/packages/vuetify/src/composables/router.tsx
@@ -18,7 +18,7 @@ import type {
RouteLocationNormalizedLoaded,
RouteLocationRaw,
Router,
- UseLinkOptions,
+ RouterLinkOptions,
} from 'vue-router'
export function useRoute (): Ref<RouteLocationNormalizedLoaded | undefined> {
@@ -31,7 +31,7 @@ export function useRouter (): Router | undefined {
return getCurrentInstance()?.proxy?.$router
}
-interface LinkProps extends Partial<UseLinkOptions> {
+export interface LinkProps extends Partial<RouterLinkOptions> {
href?: string
}
@@ -57,7 +57,7 @@ export function useLink (props: LinkProps, attrs: SetupContext['attrs']): UseLin
}
}
- const link = props.to ? RouterLink.useLink(props as UseLinkOptions) : undefined
+ const link = props.to ? RouterLink.useLink(props as RouterLinkOptions) : undefined
return {
...link,
diff --git a/packages/vuetify/src/globals.d.ts b/packages/vuetify/src/globals.d.ts
index 131449ca11e..3c0d86802b1 100644
--- a/packages/vuetify/src/globals.d.ts
+++ b/packages/vuetify/src/globals.d.ts
@@ -2,6 +2,7 @@ import type { TouchStoredHandlers } from './directives/touch'
import type { ComponentPublicInstance, FunctionalComponent, VNode } from 'vue'
import { IconProps } from '@/composables/icons'
+import type { RouteLocationRaw } from 'vue-router'
declare global {
interface HTMLCollection {
@@ -104,3 +105,10 @@ declare module '@vue/runtime-dom' {
style: any
}
}
+
+declare module 'vue-router' {
+ export interface RouterLinkOptions {
+ to: RouteLocationRaw
+ replace?: boolean
+ }
+}
|
8ef606c76db2e0d1daca6ab6ca33eab00a4e405a
|
2019-01-10 18:56:49
|
MajesticPotatoe
|
chore(vbtn): abstract variables and mixins
| false
|
abstract variables and mixins
|
chore
|
diff --git a/packages/vuetify/src/components/VBtn/VBtn.sass b/packages/vuetify/src/components/VBtn/VBtn.sass
index a8c3e1745c0..52a61e64065 100644
--- a/packages/vuetify/src/components/VBtn/VBtn.sass
+++ b/packages/vuetify/src/components/VBtn/VBtn.sass
@@ -1,34 +1,7 @@
// Imports
@import '../../styles/styles.sass'
-
-// Variables
-$btn-border-radius: 4px
-$btn-font-size: 14px
-$btn-icon-font-size: 18px
-$btn-icon-padding: 12px
-$btn-rounded-border-radius: 28px
-$btn-outline-border-width: 2px
-$btn-sizes: ('x-small': 20, 'small': 28, 'default': 36, 'large': 54, 'x-large': 70)
-
-// Mixins
-@mixin btn-theme($material)
- color: map-deep-get($material, 'text', 'primary')
-
- &.v-btn--disabled
- color: map-deep-get($material, 'buttons', 'disabled') !important
-
- .v-icon,
- .v-btn__loading
- color: map-deep-get($material, 'buttons', 'disabled') !important
-
- &:not(.v-btn--flat):not(.v-btn--outline)
- background-color: map-deep-get($material, 'buttons', 'focused') !important
-
- &:not(.v-btn--flat)
- background-color: map-get($material, 'app-bar')
-
- &.v-btn--outline.v-btn--text
- border-color: map-get($material, 'dividers')
+@import './_variables.sass'
+@import './_mixins.sass'
// Theme
.v-btn:not(.v-btn--outline)
diff --git a/packages/vuetify/src/components/VBtn/_mixins.sass b/packages/vuetify/src/components/VBtn/_mixins.sass
new file mode 100644
index 00000000000..0fb031ba43d
--- /dev/null
+++ b/packages/vuetify/src/components/VBtn/_mixins.sass
@@ -0,0 +1,19 @@
+// Mixins
+@mixin btn-theme($material)
+ color: map-deep-get($material, 'text', 'primary')
+
+ &.v-btn--disabled
+ color: map-deep-get($material, 'buttons', 'disabled') !important
+
+ .v-icon,
+ .v-btn__loading
+ color: map-deep-get($material, 'buttons', 'disabled') !important
+
+ &:not(.v-btn--flat):not(.v-btn--outline)
+ background-color: map-deep-get($material, 'buttons', 'focused') !important
+
+ &:not(.v-btn--flat)
+ background-color: map-get($material, 'app-bar')
+
+ &.v-btn--outline.v-btn--text
+ border-color: map-get($material, 'dividers')
diff --git a/packages/vuetify/src/components/VBtn/_variables.sass b/packages/vuetify/src/components/VBtn/_variables.sass
new file mode 100644
index 00000000000..62f382cb8de
--- /dev/null
+++ b/packages/vuetify/src/components/VBtn/_variables.sass
@@ -0,0 +1,8 @@
+// Variables
+$btn-border-radius: 4px
+$btn-font-size: 14px
+$btn-icon-font-size: 18px
+$btn-icon-padding: 12px
+$btn-rounded-border-radius: 28px
+$btn-outline-border-width: 2px
+$btn-sizes: ('x-small': 20, 'small': 28, 'default': 36, 'large': 54, 'x-large': 70)
|
a49dbb2c468531cf28122e664d2c2435b855f509
|
2019-12-17 14:12:55
|
Murat Doğançay
|
fix(locale): Updated Turkish translation for Carousel
| false
|
Updated Turkish translation for Carousel
|
fix
|
diff --git a/packages/vuetify/src/locale/tr.ts b/packages/vuetify/src/locale/tr.ts
index c4f5309cc75..42cd484e6a7 100644
--- a/packages/vuetify/src/locale/tr.ts
+++ b/packages/vuetify/src/locale/tr.ts
@@ -30,7 +30,7 @@ export default {
prev: 'Önceki görsel',
next: 'Sonraki görsel',
ariaLabel: {
- delimiter: 'Carousel slide {0} of {1}',
+ delimiter: 'Galeri sayfa {0} / {1}',
},
},
calendar: {
|
eeb70bfec0651b6941dbfe659c54dff3076449b1
|
2021-03-04 00:51:26
|
amajesticpotatoe
|
docs(releasemenu): update 2.x release link
| false
|
update 2.x release link
|
docs
|
diff --git a/packages/docs/src/components/menus/ReleasesMenu.vue b/packages/docs/src/components/menus/ReleasesMenu.vue
index 1e25684325f..cc258e7fc0e 100644
--- a/packages/docs/src/components/menus/ReleasesMenu.vue
+++ b/packages/docs/src/components/menus/ReleasesMenu.vue
@@ -26,8 +26,8 @@
return [
{ heading: this.$t('documentation') },
{
- title: '2.3.x',
- href: 'https://v2.vuetifyjs.com',
+ title: '2.4.x',
+ href: 'https://vuetifyjs.com',
},
{
title: '1.5.x',
|
291f1ef4c87c28250288c922aff59d8fa245bab5
|
2020-07-05 03:30:43
|
John Leider
|
docs(Md): improve md support
| false
|
improve md support
|
docs
|
diff --git a/packages/docs-next/src/components/app/Md.vue b/packages/docs-next/src/components/app/Md.vue
index c13084bcc4c..47b6475b6f3 100644
--- a/packages/docs-next/src/components/app/Md.vue
+++ b/packages/docs-next/src/components/app/Md.vue
@@ -18,19 +18,26 @@
},
},
- render (h, { data, props, slots }) {
- const children = slots().default
- const text = children && children.length
- ? children[0].text
- : data.domProps ? data.domProps.textContent : ''
- const innerHTML = md.render(text, {})
+ render (h, { children: nodes = [], data, props, slots }) {
+ const children = []
+ const node = nodes[0] || {}
+
+ if (node.children) {
+ children.push(...node.children)
+ } else if (nodes.length > 1) {
+ children.push(nodes)
+ } else {
+ const text = node.text || data.domProps.textContent || ''
+
+ data.domProps = {
+ ...data.domProps,
+ innerHTML: md.render(text, {}),
+ }
+ }
data.staticClass = `v-markdown ${data.staticClass || ''}`.trim()
- return h(props.tag, {
- ...data,
- domProps: { innerHTML },
- })
+ return h(props.tag, data, children)
},
}
</script>
|
bfd80a7fb02e5dffb50a525f9b478bf5de856870
|
2019-09-25 00:31:07
|
bludnic
|
fix(VNavigationDrawer): emit update:mini-variant event (#8768)
| false
|
emit update:mini-variant event (#8768)
|
fix
|
diff --git a/packages/vuetify/src/components/VNavigationDrawer/VNavigationDrawer.ts b/packages/vuetify/src/components/VNavigationDrawer/VNavigationDrawer.ts
index 12a65078e6f..2e9173a1bc5 100644
--- a/packages/vuetify/src/components/VNavigationDrawer/VNavigationDrawer.ts
+++ b/packages/vuetify/src/components/VNavigationDrawer/VNavigationDrawer.ts
@@ -131,7 +131,7 @@ export default baseMixins.extend({
'v-navigation-drawer--floating': this.floating,
'v-navigation-drawer--is-mobile': this.isMobile,
'v-navigation-drawer--is-mouseover': this.isMouseover,
- 'v-navigation-drawer--mini-variant': this.miniVariant || (this.expandOnHover && !this.isMouseover),
+ 'v-navigation-drawer--mini-variant': this.isMiniVariant,
'v-navigation-drawer--open': this.isActive,
'v-navigation-drawer--open-on-hover': this.expandOnHover,
'v-navigation-drawer--right': this.right,
@@ -169,12 +169,7 @@ export default baseMixins.extend({
return this.right ? 100 : -100
},
computedWidth (): string | number {
- if (
- (this.expandOnHover && !this.isMouseover) ||
- this.miniVariant
- ) return this.miniVariantWidth
-
- return this.width
+ return this.isMiniVariant ? this.miniVariantWidth : this.width
},
hasApp (): boolean {
return (
@@ -185,6 +180,15 @@ export default baseMixins.extend({
isBottom (): boolean {
return this.bottom && this.isMobile
},
+ isMiniVariant (): boolean {
+ return (
+ !this.expandOnHover &&
+ this.miniVariant
+ ) || (
+ this.expandOnHover &&
+ !this.isMouseover
+ )
+ },
isMobile (): boolean {
return (
!this.stateless &&
@@ -280,6 +284,10 @@ export default baseMixins.extend({
if (val !== this.isActive) this.isActive = val
},
+ expandOnHover: 'updateMiniVariant',
+ isMouseover (val) {
+ this.updateMiniVariant(!val)
+ },
},
beforeMount () {
@@ -440,6 +448,9 @@ export default baseMixins.extend({
return isNaN(width) ? this.$el.clientWidth : width
},
+ updateMiniVariant (val: boolean) {
+ if (this.miniVariant !== val) this.$emit('update:mini-variant', val)
+ },
},
render (h): VNode {
diff --git a/packages/vuetify/src/components/VNavigationDrawer/__tests__/VNavigationDrawer.spec.ts b/packages/vuetify/src/components/VNavigationDrawer/__tests__/VNavigationDrawer.spec.ts
index 2895e159f67..7aa12c5aa7b 100644
--- a/packages/vuetify/src/components/VNavigationDrawer/__tests__/VNavigationDrawer.spec.ts
+++ b/packages/vuetify/src/components/VNavigationDrawer/__tests__/VNavigationDrawer.spec.ts
@@ -10,7 +10,7 @@ import {
beforeEach(() => resizeWindow(1920, 1080))
-describe('VNavigationDrawer', () => {
+describe('VNavigationDrawer', () => { // eslint-disable-line max-statements
type Instance = InstanceType<typeof VNavigationDrawer>
let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
@@ -303,6 +303,76 @@ describe('VNavigationDrawer', () => {
expect(update).toHaveBeenCalled()
})
+ it('should open on mouseenter when mini-variant = true and expand-on-hover = true', async () => {
+ const update = jest.fn()
+ const wrapper = mountFunction({
+ propsData: {
+ miniVariant: true,
+ expandOnHover: true,
+ },
+ listeners: {
+ 'update:mini-variant': update,
+ },
+ })
+
+ wrapper.trigger('mouseenter')
+ await wrapper.vm.$nextTick()
+
+ expect(update).toHaveBeenCalledWith(false)
+ expect(wrapper.classes('v-navigation-drawer--open-on-hover')).toBe(true)
+ expect(wrapper.classes('v-navigation-drawer--mini-variant')).toBe(false)
+ })
+
+ it('should emit `update:mini-variant` when mouseenter/mouseleave', async () => {
+ const calls: string[] = []
+ const update = jest.fn(val => calls.push(val))
+ const wrapper = mountFunction({
+ propsData: {
+ miniVariant: true,
+ expandOnHover: true,
+ },
+ listeners: {
+ 'update:mini-variant': (value: boolean) => {
+ wrapper.setProps({ miniVariant: value })
+ update(value)
+ },
+ },
+ })
+
+ wrapper.trigger('mouseenter')
+ await wrapper.vm.$nextTick()
+
+ wrapper.trigger('mouseleave')
+ await wrapper.vm.$nextTick()
+
+ expect(calls).toEqual([false, true])
+ })
+
+ it('should emit `update:mini-variant` when expandOnHover has been changed', async () => {
+ const calls: string[] = []
+ const update = jest.fn(val => calls.push(val))
+ const wrapper = mountFunction({
+ propsData: {
+ miniVariant: false,
+ expandOnHover: false,
+ },
+ listeners: {
+ 'update:mini-variant': (value: boolean) => {
+ wrapper.setProps({ miniVariant: value })
+ update(value)
+ },
+ },
+ })
+
+ wrapper.setProps({ expandOnHover: true })
+ await wrapper.vm.$nextTick()
+
+ wrapper.setProps({ expandOnHover: false })
+ await wrapper.vm.$nextTick()
+
+ expect(calls).toEqual([true, false])
+ })
+
it('should react to open / close from touch events', async () => {
const wrapper = mountFunction({
attachToDocument: true,
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.