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
|
|---|---|---|---|---|---|---|---|
457e1d3002ddb5f4b0528258bc5050f76bbd06ce
|
2023-12-13 01:19:01
|
John Leider
|
chore(VAutocomplete): fix lint
| false
|
fix lint
|
chore
|
diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
index 5d52420c49e..63cb692f7bb 100644
--- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
@@ -322,7 +322,7 @@ export const VAutocomplete = genericComponent<new <
function select (item: ListItem, add = true) {
if (item.props.disabled) return
-
+
if (props.multiple) {
const index = model.value.findIndex(selection => props.valueComparator(selection.value, item.value))
|
be0a7df7e5c20c74821f8e87e1d6b1a5114ee61f
|
2022-11-01 03:20:09
|
John Leider
|
docs(browser-support): update browser table caption text
| false
|
update browser table caption text
|
docs
|
diff --git a/packages/docs/src/pages/en/getting-started/browser-support.md b/packages/docs/src/pages/en/getting-started/browser-support.md
index 1dc0dff23b2..f86f4e3c6c2 100644
--- a/packages/docs/src/pages/en/getting-started/browser-support.md
+++ b/packages/docs/src/pages/en/getting-started/browser-support.md
@@ -27,7 +27,7 @@ Vuetify 3 is a next generation framework that takes advantage of the latest web
| Internet Explorer | ⛔ Not supported |
| Other Browsers | ❓ Not officially supported |
-<p class="text-caption">* All browsers on iOS use WebKit so have the same support as Safari</p>
+<p class="text-caption">* All browsers on iOS use WebKit and have the same support as Safari</p>
Safari and some older versions of other browsers require polyfills to work correctly. You can use [babel and core-js](https://babeljs.io/docs/en/babel-preset-env#usebuiltins) for this, or you can use [polyfill.io](https://polyfill.io/v3/) like we do on this site:
|
edfc746296f597771c8907736138a63f6a15bce0
|
2022-12-05 21:25:02
|
John Leider
|
fix(VSelectionControl/VCheckbox/VSwitch): long label wrapping (#16194)
| false
|
long label wrapping (#16194)
|
fix
|
diff --git a/packages/vuetify/src/components/VCheckbox/VCheckbox.sass b/packages/vuetify/src/components/VCheckbox/VCheckbox.sass
index 2d7f8259dd9..726776f308f 100644
--- a/packages/vuetify/src/components/VCheckbox/VCheckbox.sass
+++ b/packages/vuetify/src/components/VCheckbox/VCheckbox.sass
@@ -5,4 +5,4 @@
.v-checkbox
.v-selection-control
- height: var(--v-input-control-height)
+ min-height: var(--v-input-control-height)
diff --git a/packages/vuetify/src/components/VSelectionControl/VSelectionControl.sass b/packages/vuetify/src/components/VSelectionControl/VSelectionControl.sass
index 0270a3cc044..66fd63e0a73 100644
--- a/packages/vuetify/src/components/VSelectionControl/VSelectionControl.sass
+++ b/packages/vuetify/src/components/VSelectionControl/VSelectionControl.sass
@@ -14,6 +14,8 @@
user-select: none
.v-label
+ white-space: normal
+ word-break: break-word
height: 100%
width: 100%
@@ -33,6 +35,8 @@
&--inline
display: inline-flex
flex: 0 0 auto
+ min-width: 0
+ max-width: 100%
.v-label
width: auto
diff --git a/packages/vuetify/src/components/VSwitch/VSwitch.sass b/packages/vuetify/src/components/VSwitch/VSwitch.sass
index 345c90ef4d6..8578cc6ccde 100644
--- a/packages/vuetify/src/components/VSwitch/VSwitch.sass
+++ b/packages/vuetify/src/components/VSwitch/VSwitch.sass
@@ -56,7 +56,7 @@
$switch-thumb-transform: $switch-track-width * .5 - $switch-thumb-width * .5 + $switch-thumb-offset
.v-selection-control
- height: var(--v-input-control-height)
+ min-height: var(--v-input-control-height)
.v-selection-control__wrapper
width: auto
|
8f905299c6c6049b75d480943c14622a4eaad014
|
2022-12-14 21:50:55
|
John Leider
|
docs(installation): fix incorrect link for v3 install
| false
|
fix incorrect link for v3 install
|
docs
|
diff --git a/packages/docs/src/pages/en/getting-started/installation.md b/packages/docs/src/pages/en/getting-started/installation.md
index 8dcd1fbdeaf..f0581ea2359 100644
--- a/packages/docs/src/pages/en/getting-started/installation.md
+++ b/packages/docs/src/pages/en/getting-started/installation.md
@@ -11,7 +11,7 @@ related:
<alert type="error">
- You are viewing documentation for **Vuetify 2**. For instructions on installing **Vuetify 3**, navigate to the [Version 3 Installation Guide](https://next.vuetifyjs.com/introduction/guide/)
+ You are viewing documentation for **Vuetify 2**. For instructions on installing **Vuetify 3**, navigate to the [Version 3 Installation Guide](https://next.vuetifyjs.com/getting-started/installation/)
</alert>
|
5b07a9fe49f59828a509995772e5923c8bb89526
|
2024-01-10 20:00:56
|
Jindorf
|
fix(locale): memory leak with default rtl values #18965 (#18975)
| false
|
memory leak with default rtl values #18965 (#18975)
|
fix
|
diff --git a/packages/vuetify/src/composables/locale.ts b/packages/vuetify/src/composables/locale.ts
index bcedbfe2ba4..bb06bc701c2 100644
--- a/packages/vuetify/src/composables/locale.ts
+++ b/packages/vuetify/src/composables/locale.ts
@@ -1,6 +1,5 @@
// Utilities
import { computed, inject, provide, ref } from 'vue'
-import { defaultRtl } from '@/locale'
import { createVuetifyAdapter } from '@/locale/adapters/vuetify'
// Types
@@ -81,8 +80,54 @@ export interface RtlInstance {
export const RtlSymbol: InjectionKey<RtlInstance> = Symbol.for('vuetify:rtl')
+function genDefaults () {
+ return {
+ af: false,
+ ar: true,
+ bg: false,
+ ca: false,
+ ckb: false,
+ cs: false,
+ de: false,
+ el: false,
+ en: false,
+ es: false,
+ et: false,
+ fa: true,
+ fi: false,
+ fr: false,
+ hr: false,
+ hu: false,
+ he: true,
+ id: false,
+ it: false,
+ ja: false,
+ ko: false,
+ lv: false,
+ lt: false,
+ nl: false,
+ no: false,
+ pl: false,
+ pt: false,
+ ro: false,
+ ru: false,
+ sk: false,
+ sl: false,
+ srCyrl: false,
+ srLatn: false,
+ sv: false,
+ th: false,
+ tr: false,
+ az: false,
+ uk: false,
+ vi: false,
+ zhHans: false,
+ zhHant: false,
+ }
+}
+
export function createRtl (i18n: LocaleInstance, options?: RtlOptions): RtlInstance {
- const rtl = ref<Record<string, boolean>>(options?.rtl ?? defaultRtl)
+ const rtl = ref<Record<string, boolean>>(options?.rtl ?? genDefaults())
const isRtl = computed(() => rtl.value[i18n.current.value] ?? false)
return {
diff --git a/packages/vuetify/src/locale/__tests__/index.spec.ts b/packages/vuetify/src/locale/__tests__/index.spec.ts
index 9c2635c0e13..d350805a4c9 100755
--- a/packages/vuetify/src/locale/__tests__/index.spec.ts
+++ b/packages/vuetify/src/locale/__tests__/index.spec.ts
@@ -6,7 +6,7 @@ import * as locales from '../'
describe('locales', () => {
it('should have listed all available locales in index.ts', async () => {
- const imported = Object.keys(locales).filter(key => key !== 'defaultRtl')
+ const imported = Object.keys(locales).filter(key => key !== 'default')
const dir = fs.readdirSync(path.resolve(__dirname, '..'))
.filter(filename => !['adapters', 'index.ts', '__tests__'].includes(filename))
.map(filename => filename.replace(/\.ts$/, '').replace('-', ''))
@@ -22,6 +22,6 @@ describe('locales', () => {
}, {} as Record<string, any>)
const enUnfilled = unfill(locales.en)
- Object.entries(locales).forEach(([locale, messages]) => locale !== 'defaultRtl' && expect(unfill(messages)).toStrictEqual(enUnfilled))
+ Object.entries(locales).forEach(([locale, messages]) => locale !== 'default' && expect(unfill(messages)).toStrictEqual(enUnfilled))
})
})
diff --git a/packages/vuetify/src/locale/index.ts b/packages/vuetify/src/locale/index.ts
index 9669aeb6179..14291b29252 100755
--- a/packages/vuetify/src/locale/index.ts
+++ b/packages/vuetify/src/locale/index.ts
@@ -40,47 +40,3 @@ export { default as uk } from './uk'
export { default as vi } from './vi'
export { default as zhHans } from './zh-Hans'
export { default as zhHant } from './zh-Hant'
-
-export const defaultRtl = {
- af: false,
- ar: true,
- bg: false,
- ca: false,
- ckb: false,
- cs: false,
- de: false,
- el: false,
- en: false,
- es: false,
- et: false,
- fa: true,
- fi: false,
- fr: false,
- hr: false,
- hu: false,
- he: true,
- id: false,
- it: false,
- ja: false,
- ko: false,
- lv: false,
- lt: false,
- nl: false,
- no: false,
- pl: false,
- pt: false,
- ro: false,
- ru: false,
- sk: false,
- sl: false,
- srCyrl: false,
- srLatn: false,
- sv: false,
- th: false,
- tr: false,
- az: false,
- uk: false,
- vi: false,
- zhHans: false,
- zhHant: false,
-}
|
32365b2bf5e625a2adf0f3010ca62057118107a2
|
2022-07-29 00:41:02
|
Elijah Kotyluk
|
docs(installation): update vite commands
| false
|
update vite commands
|
docs
|
diff --git a/packages/docs/src/pages/en/getting-started/installation.md b/packages/docs/src/pages/en/getting-started/installation.md
index 4d388ecfd5f..87d55dedb50 100644
--- a/packages/docs/src/pages/en/getting-started/installation.md
+++ b/packages/docs/src/pages/en/getting-started/installation.md
@@ -30,13 +30,16 @@ First, use npm/yarn to create your Vite project:
```bash
# npm 6.x
-npm init @vitejs/app my-vuetify-app --template vue
+npm create vite@latest my-vue-app --template vue
# npm 7+, extra double-dash is needed:
-npm init @vitejs/app my-vuetify-app -- --template vue
+npm create vite@latest my-vue-app -- --template vue
# yarn
-yarn create @vitejs/app my-vuetify-app --template vue
+yarn create vite my-vue-app --template vue
+
+# pnpm
+pnpm create vite my-vue-app -- --template vue
```
<alert type="info">
|
82ddddf34313e96218e964580b0c9571d52fd434
|
2019-02-16 16:22:56
|
Dmitry Sharshakov
|
docs(kitchen): add sub-header component (#6519)
| false
|
add sub-header component (#6519)
|
docs
|
diff --git a/packages/kitchen/src/components/CoreTitle.vue b/packages/kitchen/src/components/CoreTitle.vue
index cb0ce550b29..7e271233367 100644
--- a/packages/kitchen/src/components/CoreTitle.vue
+++ b/packages/kitchen/src/components/CoreTitle.vue
@@ -1,6 +1,6 @@
<template>
<v-flex align-self-center>
- <h3 class="title grey--text mb-4 mt-5"><slot>Title</slot></h3>
+ <h4 class="title grey--text mb-4 mt-5"><slot>Title</slot></h4>
</v-flex>
</template>
diff --git a/packages/kitchen/src/components/SubHeader.vue b/packages/kitchen/src/components/SubHeader.vue
new file mode 100644
index 00000000000..8a49b31c116
--- /dev/null
+++ b/packages/kitchen/src/components/SubHeader.vue
@@ -0,0 +1,11 @@
+<template>
+ <v-flex align-self-center>
+ <h3 class="display-1 text-uppercase font-weight-light grey--text"><slot>Pan</slot></h3>
+ </v-flex>
+</template>
+
+<script>
+ export default {
+ name: 'SubHeader'
+ }
+</script>
diff --git a/packages/kitchen/src/main.js b/packages/kitchen/src/main.js
index ab2a7e15658..ba8a7988be6 100644
--- a/packages/kitchen/src/main.js
+++ b/packages/kitchen/src/main.js
@@ -6,10 +6,12 @@ import store from './store'
import CoreTitle from '@/components/CoreTitle.vue'
import CoreSection from '@/components/CoreSection.vue'
import MainHeader from '@/components/MainHeader'
+import SubHeader from '@/components/SubHeader'
Vue.config.productionTip = false
Vue.component('MainHeader', MainHeader)
+Vue.component('SubHeader', SubHeader)
Vue.component('CoreTitle', CoreTitle)
Vue.component('CoreSection', CoreSection)
|
5c06f4dfc58aab16c7011176b30260f7e6ac88d1
|
2019-04-07 00:41:58
|
John Leider
|
feat(VCarousel): v2 update (#6924)
| false
|
v2 update (#6924)
|
feat
|
diff --git a/packages/docs/src/data/pages/components/Carousels.json b/packages/docs/src/data/pages/components/Carousels.json
index 1043a771fe7..be28a1f7b6e 100644
--- a/packages/docs/src/data/pages/components/Carousels.json
+++ b/packages/docs/src/data/pages/components/Carousels.json
@@ -29,6 +29,7 @@
{
"type": "examples",
"value": [
+ "cycle",
"customTransition",
"customIcons",
"hideControls",
diff --git a/packages/docs/src/examples/carousels/customIcons.vue b/packages/docs/src/examples/carousels/customIcons.vue
index c7aed157631..8a225b593df 100644
--- a/packages/docs/src/examples/carousels/customIcons.vue
+++ b/packages/docs/src/examples/carousels/customIcons.vue
@@ -1,34 +1,76 @@
<template>
- <v-carousel
- delimiter-icon="stop"
- prev-icon="mdi-arrow-left"
- next-icon="mdi-arrow-right"
+ <v-card
+ elevation="24"
+ max-width="444"
+ class="mx-auto"
>
- <v-carousel-item
- v-for="(item,i) in items"
- :key="i"
- :src="item.src"
- ></v-carousel-item>
- </v-carousel>
+ <v-system-bar lights-out></v-system-bar>
+ <v-carousel
+ :continuous="false"
+ :cycle="cycle"
+ :show-arrows="false"
+ hide-delimiter-background
+ delimiter-icon="mdi-minus"
+ height="300"
+ >
+ <v-carousel-item
+ v-for="(slide, i) in slides"
+ :key="i"
+ >
+ <v-sheet
+ :color="colors[i]"
+ height="100%"
+ tile
+ >
+ <v-layout
+ align-center
+ fill-height
+ justify-center
+ >
+ <div class="display-3">{{ slide }} Slide</div>
+ </v-layout>
+ </v-sheet>
+ </v-carousel-item>
+ </v-carousel>
+ <v-list two-line>
+ <v-list-item>
+ <v-list-item-avatar>
+ <v-img src="https://cdn.vuetifyjs.com/images/john.png"></v-img>
+ </v-list-item-avatar>
+ <v-list-item-content>
+ <v-list-item-title>John Leider</v-list-item-title>
+ <v-list-item-subtitle>Author</v-list-item-subtitle>
+ </v-list-item-content>
+ <v-list-item-action>
+ <v-switch
+ v-model="cycle"
+ label="Cycle Slides"
+ inset
+ ></v-switch>
+ </v-list-item-action>
+ </v-list-item>
+ </v-list>
+ </v-card>
</template>
<script>
export default {
data () {
return {
- items: [
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/squirrel.jpg'
- },
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/sky.jpg'
- },
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/bird.jpg'
- },
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/planet.jpg'
- }
+ colors: [
+ 'green',
+ 'secondary',
+ 'yellow darken-4',
+ 'red lighten-2',
+ 'orange darken-1'
+ ],
+ cycle: false,
+ slides: [
+ 'First',
+ 'Second',
+ 'Third',
+ 'Fourth',
+ 'Fifth'
]
}
}
diff --git a/packages/docs/src/examples/carousels/customTransition.vue b/packages/docs/src/examples/carousels/customTransition.vue
index 99d06b74309..e191566dd7e 100644
--- a/packages/docs/src/examples/carousels/customTransition.vue
+++ b/packages/docs/src/examples/carousels/customTransition.vue
@@ -4,8 +4,8 @@
v-for="(item,i) in items"
:key="i"
:src="item.src"
- reverse-transition="fade"
- transition="fade"
+ reverse-transition="fade-transition"
+ transition="fade-transition"
></v-carousel-item>
</v-carousel>
</template>
@@ -32,16 +32,3 @@
}
}
</script>
-
-<style lang="sass">
-#example-custom-transition
- .fade
- &-enter-active, &-leave-active, &-leave-to
- transition: .3s ease-out
- position: absolute
- top: 0
- left: 0
-
- &-enter, &-leave, &-leave-to
- opacity: 0
-</style>
diff --git a/packages/docs/src/examples/carousels/cycle.vue b/packages/docs/src/examples/carousels/cycle.vue
new file mode 100644
index 00000000000..e29fbaf635b
--- /dev/null
+++ b/packages/docs/src/examples/carousels/cycle.vue
@@ -0,0 +1,49 @@
+<template>
+ <v-carousel
+ cycle
+ height="400"
+ hide-delimiter-background
+ show-arrows-on-hover
+ >
+ <v-carousel-item
+ v-for="(slide, i) in slides"
+ :key="i"
+ >
+ <v-sheet
+ :color="colors[i]"
+ height="100%"
+ >
+ <v-layout
+ align-center
+ fill-height
+ justify-center
+ >
+ <div class="display-3">{{ slide }} Slide</div>
+ </v-layout>
+ </v-sheet>
+ </v-carousel-item>
+ </v-carousel>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ colors: [
+ 'indigo',
+ 'warning',
+ 'pink darken-2',
+ 'red lighten-1',
+ 'deep-purple accent-4'
+ ],
+ slides: [
+ 'First',
+ 'Second',
+ 'Third',
+ 'Fourth',
+ 'Fifth'
+ ]
+ }
+ }
+ }
+</script>
diff --git a/packages/docs/src/examples/carousels/hideControls.vue b/packages/docs/src/examples/carousels/hideControls.vue
index cdf44595bca..3f297af00e2 100644
--- a/packages/docs/src/examples/carousels/hideControls.vue
+++ b/packages/docs/src/examples/carousels/hideControls.vue
@@ -1,5 +1,5 @@
<template>
- <v-carousel hide-controls>
+ <v-carousel :show-arrows="false">
<v-carousel-item
v-for="(item,i) in items"
:key="i"
diff --git a/packages/docs/src/examples/carousels/usage.vue b/packages/docs/src/examples/carousels/usage.vue
index f53e1132233..679880d9aa2 100644
--- a/packages/docs/src/examples/carousels/usage.vue
+++ b/packages/docs/src/examples/carousels/usage.vue
@@ -1,10 +1,23 @@
<template>
<v-carousel>
<v-carousel-item
- v-for="(item,i) in items"
- :key="i"
- :src="item.src"
- ></v-carousel-item>
+ v-for="(color, i) in colors"
+ :key="color"
+ >
+ <v-sheet
+ :color="color"
+ height="100%"
+ tile
+ >
+ <v-layout
+ align-center
+ fill-height
+ justify-center
+ >
+ <div class="display-3">Slide {{ i + 1 }}</div>
+ </v-layout>
+ </v-sheet>
+ </v-carousel-item>
</v-carousel>
</template>
@@ -12,19 +25,12 @@
export default {
data () {
return {
- items: [
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/squirrel.jpg'
- },
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/sky.jpg'
- },
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/bird.jpg'
- },
- {
- src: 'https://cdn.vuetifyjs.com/images/carousel/planet.jpg'
- }
+ colors: [
+ 'primary',
+ 'secondary',
+ 'yellow darken-2',
+ 'red',
+ 'orange'
]
}
}
diff --git a/packages/docs/src/lang/en/components/Carousels.json b/packages/docs/src/lang/en/components/Carousels.json
index 0472ffef8d5..c84d02cc0dd 100644
--- a/packages/docs/src/lang/en/components/Carousels.json
+++ b/packages/docs/src/lang/en/components/Carousels.json
@@ -3,28 +3,27 @@
"headerText": "The `v-carousel` component is used to display large numbers of visual content on a rotating timer.",
"examples": {
"usage": {
- "desc": "A carousel by default has a slide transition.",
- "uninverted": true
+ "desc": "The `v-carousel` component expands upon `v-window` by providing additional features targetted at displaying images."
+ },
+ "cycle": {
+ "header": "### Cycle",
+ "desc": "With the **cycle** prop you can have your slides automatically transition to the next available every 6s (default)."
},
"customTransition": {
"header": "### Custom transition",
- "desc": "You can also apply your own custom transition.",
- "uninverted": true
+ "desc": "The `v-carousel-item` component can have its **transition/reverse-transition** changed."
},
"customIcons": {
- "header": "### Custom icons",
- "desc": "You can also change the icon for the carousel delimiter and previous/next icons.",
- "uninverted": true
+ "header": "### Custom delimiters",
+ "desc": "Use any available icon as your carousel's slide delimiter."
},
"hideDelimiters": {
"header": "### Hide delimiters",
- "desc": "You can hide the bottom controls with the `hide-delimiters` prop.",
- "uninverted": true
+ "desc": "You can hide the bottom controls with `hide-delimiters` prop."
},
"hideControls": {
"header": "### Hide controls",
- "desc": "You can hide the navigation controls with the `hide-controls` prop.",
- "uninverted": true
+ "desc": "You can hide the carousel navigation controls with `:show-arrow=\"false\"`."
}
},
"props": {
diff --git a/packages/vuetify/src/components/VCarousel/VCarousel.sass b/packages/vuetify/src/components/VCarousel/VCarousel.sass
index 07a52abdbcc..0de632e61ca 100644
--- a/packages/vuetify/src/components/VCarousel/VCarousel.sass
+++ b/packages/vuetify/src/components/VCarousel/VCarousel.sass
@@ -1,39 +1,19 @@
@import '../../styles/styles.sass'
.v-carousel
- width: 100%
- position: relative
overflow: hidden
- +elevation(2)
-
- &__prev,
- &__next
- position: absolute
- top: 50%
- z-index: 1
- transform: translateY(-50%)
-
- .v-btn
- margin: 0
- height: auto
- width: auto
-
- i
- font-size: 48px
-
- &:hover
- background: none
+ position: relative
+ width: 100%
&__controls
- background: rgba(0, 0, 0, .5)
align-items: center
+ background: rgba(0, 0, 0, .3)
bottom: 0
display: flex
- justify-content: center
- left: 0
- position: absolute
height: 50px
+ justify-content: center
list-style-type: none
+ position: absolute
width: 100%
z-index: 1
@@ -41,11 +21,10 @@
flex: 0 1 auto
&__item
- margin: 0 8px !important
+ margin: 0 8px
.v-icon
opacity: .5
- transition: $primary-transition
&--active
.v-icon
@@ -58,17 +37,25 @@
.v-icon
opacity: .8
- &__prev
- left: 5px
-
- &__next
- right: 5px
-
- +rtl()
- &__prev
- left: auto
- right: 5px
-
- &__next
- left: 5px
- right: auto
+// Element
+.v-carousel__progress
+ margin: 0
+ position: absolute
+ bottom: 0
+ left: 0
+ right: 0
+
+.v-carousel .v-window-item
+ display: block
+ height: inherit
+ text-decoration: none
+
+// Modifier
+.v-carousel--hide-delimiter-background
+ .v-carousel__controls
+ background: transparent
+
+.v-carousel--vertical-delimiters
+ .v-carousel__controls
+ height: 100% !important
+ width: 50px
diff --git a/packages/vuetify/src/components/VCarousel/VCarousel.ts b/packages/vuetify/src/components/VCarousel/VCarousel.ts
index 373f88e179a..727d3a36565 100644
--- a/packages/vuetify/src/components/VCarousel/VCarousel.ts
+++ b/packages/vuetify/src/components/VCarousel/VCarousel.ts
@@ -7,6 +7,7 @@ import VWindow from '../VWindow/VWindow'
// Components
import VBtn from '../VBtn'
import VIcon from '../VIcon'
+import VProgressLinear from '../VProgressLinear'
// Mixins
// TODO: Move this into core components v2.0
@@ -18,16 +19,17 @@ import { deprecate } from '../../util/console'
// Types
import { VNode } from 'vue'
-import { VNodeDirective } from 'vue/types/vnode'
+import { PropValidator } from 'vue/types/options'
export default VWindow.extend({
name: 'v-carousel',
props: {
- cycle: {
+ continuous: {
type: Boolean,
default: true
},
+ cycle: Boolean,
delimiterIcon: {
type: String,
default: '$vuetify.icons.delimiter'
@@ -38,48 +40,54 @@ export default VWindow.extend({
},
hideControls: Boolean,
hideDelimiters: Boolean,
+ hideDelimiterBackground: Boolean,
+ progress: Boolean,
+ progressColor: String,
interval: {
type: [Number, String],
default: 6000,
validator: (value: string | number) => value > 0
},
- mandatory: {
+ showArrows: {
type: Boolean,
default: true
},
- nextIcon: {
- type: [Boolean, String],
- default: '$vuetify.icons.next'
+ mandatory: {
+ type: Boolean,
+ default: true
},
- prevIcon: {
- type: [Boolean, String],
- default: '$vuetify.icons.prev'
- }
+ verticalDelimiters: {
+ type: String,
+ default: undefined
+ } as PropValidator<'' | 'left' | 'right'>
},
data () {
return {
- changedByDelimiters: false,
internalHeight: this.height,
slideTimeout: undefined as number | undefined
}
},
computed: {
+ classes (): object {
+ return {
+ ...VWindow.options.computed.classes.call(this),
+ 'v-carousel': true,
+ 'v-carousel--hide-delimiter-background': this.hideDelimiterBackground,
+ 'v-carousel--vertical-delimiters': this.isVertical
+ }
+ },
isDark (): boolean {
return this.dark || !this.light
+ },
+ isVertical (): boolean {
+ return this.verticalDelimiters != null
}
},
watch: {
- internalValue (val) {
- this.restartTimeout()
- /* @deprecate */
- /* istanbul ignore else */
- if (!this.$listeners['input']) return
-
- this.$emit('input', val)
- },
+ internalValue: 'restartTimeout',
interval: 'restartTimeout',
height (val, oldVal) {
if (val === oldVal || !val) return
@@ -95,79 +103,39 @@ export default VWindow.extend({
}
},
- mounted () {
- /* @deprecate */
- /* istanbul ignore next */
- if (this.$listeners['input']) {
- deprecate('@input', '@change', this)
+ created () {
+ /* istanbul ignore if */
+ if (this.hideControls) {
+ deprecate('hide-controls', ':show-arrows="false"', this)
}
+ },
+
+ mounted () {
this.startTimeout()
},
methods: {
+ genControlIcons () {
+ if (this.isVertical) return null
+
+ return VWindow.options.methods.genControlIcons.call(this)
+ },
genDelimiters (): VNode {
return this.$createElement('div', {
- staticClass: 'v-carousel__controls'
+ staticClass: 'v-carousel__controls',
+ style: {
+ left: this.verticalDelimiters === 'left' && this.isVertical ? 0 : 'auto',
+ right: this.verticalDelimiters === 'right' ? 0 : 'auto'
+ }
}, [this.genItems()])
},
- genIcon (
- direction: 'prev' | 'next',
- icon: string,
- fn: () => void
- ): VNode {
- return this.$createElement('div', {
- staticClass: `v-carousel__${direction}`
- }, [
- this.$createElement(VBtn, {
- props: {
- icon: true
- },
- attrs: {
- 'aria-label': this.$vuetify.lang.t(`$vuetify.carousel.${direction}`)
- },
- on: {
- click: () => {
- this.changedByDelimiters = true
- fn()
- }
- }
- }, [
- this.$createElement(VIcon, {
- props: { 'size': '46px' }
- }, icon)
- ])
- ])
- },
- genIcons (): VNode[] {
- const icons = []
-
- const prevIcon = this.$vuetify.rtl
- ? this.nextIcon
- : this.prevIcon
-
- if (prevIcon && typeof prevIcon === 'string') {
- icons.push(this.genIcon('prev', prevIcon, this.prev))
- }
-
- const nextIcon = this.$vuetify.rtl
- ? this.prevIcon
- : this.nextIcon
-
- if (nextIcon && typeof nextIcon === 'string') {
- icons.push(this.genIcon('next', nextIcon, this.next))
- }
-
- return icons
- },
genItems (): VNode {
const length = this.items.length
const children = []
for (let i = 0; i < length; i++) {
const child = this.$createElement(VBtn, {
- class: {
- 'v-carousel__controls__item': true
- },
+ staticClass: 'v-carousel__controls__item',
props: {
icon: true,
small: true,
@@ -193,6 +161,15 @@ export default VWindow.extend({
}
}, children)
},
+ genProgress () {
+ return this.$createElement(VProgressLinear, {
+ staticClass: 'v-carousel__progress',
+ props: {
+ color: this.progressColor,
+ value: (this.internalIndex + 1) / this.items.length * 100
+ }
+ })
+ },
restartTimeout () {
this.slideTimeout && clearTimeout(this.slideTimeout)
this.slideTimeout = undefined
@@ -204,46 +181,24 @@ export default VWindow.extend({
if (!this.cycle) return
this.slideTimeout = window.setTimeout(this.next, +this.interval > 0 ? +this.interval : 6000)
- },
- updateReverse (val: number, oldVal: number) {
- if (this.changedByDelimiters) {
- this.changedByDelimiters = false
- return
- }
-
- VWindow.options.methods.updateReverse.call(this, val, oldVal)
}
},
render (h): VNode {
- const children = []
- const data = {
- staticClass: 'v-window v-carousel',
- style: {
- height: convertToUnit(this.height)
- },
- directives: [] as VNodeDirective[]
- }
+ const render = VWindow.options.render.call(this, h)
- /* istanbul ignore else */
- if (!this.touchless) {
- data.directives.push({
- name: 'touch',
- value: {
- left: this.next,
- right: this.prev
- }
- } as VNodeDirective)
- }
+ render.data!.style = `height: ${convertToUnit(this.height)};`
- if (!this.hideControls) {
- children.push(this.genIcons())
+ /* istanbul ignore else */
+ if (!this.hideDelimiters) {
+ render.children!.push(this.genDelimiters())
}
- if (!this.hideDelimiters) {
- children.push(this.genDelimiters())
+ /* istanbul ignore else */
+ if (this.progress || this.progressColor) {
+ render.children!.push(this.genProgress())
}
- return h('div', data, [this.genContainer(), children])
+ return render
}
})
diff --git a/packages/vuetify/src/components/VCarousel/VCarouselItem.ts b/packages/vuetify/src/components/VCarousel/VCarouselItem.ts
index 52c8e935d02..3bf3d10abdd 100644
--- a/packages/vuetify/src/components/VCarousel/VCarouselItem.ts
+++ b/packages/vuetify/src/components/VCarousel/VCarouselItem.ts
@@ -4,8 +4,18 @@ import VWindowItem from '../VWindow/VWindowItem'
// Components
import { VImg } from '../VImg'
+// Utilities
+import mixins from '../../util/mixins'
+import Routable from '../../mixins/routable'
+
+// Types
+const baseMixins = mixins(
+ VWindowItem,
+ Routable
+)
+
/* @vue/component */
-export default VWindowItem.extend({
+export default baseMixins.extend({
name: 'v-carousel-item',
inheritAttrs: false,
@@ -23,6 +33,17 @@ export default VWindowItem.extend({
}, this.$slots.default)
]
},
+ genWindowItem () {
+ const { tag, data } = this.generateRouteLink(this.classes)
+
+ data.staticClass = 'v-window-item'
+ data.directives!.push({
+ name: 'show',
+ value: this.isActive
+ })
+
+ return this.$createElement(tag, data, this.showLazyContent(this.genDefaultSlot()))
+ },
onBeforeEnter () { /* noop */ },
onEnter () { /* noop */ },
onAfterEnter () { /* noop */ },
diff --git a/packages/vuetify/src/components/VCarousel/__tests__/VCarousel.spec.ts b/packages/vuetify/src/components/VCarousel/__tests__/VCarousel.spec.ts
index 0fb69935ee9..29428d262b9 100644
--- a/packages/vuetify/src/components/VCarousel/__tests__/VCarousel.spec.ts
+++ b/packages/vuetify/src/components/VCarousel/__tests__/VCarousel.spec.ts
@@ -4,34 +4,26 @@ import Vue from 'vue'
// Components
import VCarousel from '../VCarousel'
import VCarouselItem from '../VCarouselItem'
+import VProgressLinear from '../../VProgressLinear/VProgressLinear'
// Utilities
import {
mount,
+ MountOptions,
Wrapper
} from '@vue/test-utils'
import { rafPolyfill } from '../../../../test'
-const create = (props = {}, slots = 3) => Vue.component('zxc', {
- functional: true,
- render (h) {
- const items = []
- for (let i = 0; i < slots; i++) {
- items.push(h(VCarouselItem, { props: { src: `${i + 1}` } }))
- }
- return h(VCarousel, { props }, items)
- }
-})
-
describe('VCarousel.ts', () => {
type Instance = InstanceType<typeof VCarousel>
- let mountFunction: (options?: object) => Wrapper<Instance>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
rafPolyfill(window)
beforeEach(() => {
mountFunction = (options = {}) => {
return mount(VCarousel, {
+ sync: false,
mocks: {
$vuetify: {
rtl: false,
@@ -47,7 +39,7 @@ describe('VCarousel.ts', () => {
it('it should restart or clear timeout on cycle change', async () => {
const wrapper = mountFunction({
- props: { cycle: false }
+ propsData: { cycle: false }
})
const restartTimeout = jest.spyOn(wrapper.vm, 'restartTimeout')
@@ -67,4 +59,67 @@ describe('VCarousel.ts', () => {
expect(wrapper.vm.slideTimeout).toBeUndefined()
})
+
+ it('should generate vertical delimiters', () => {
+ const wrapper = mountFunction({
+ propsData: { verticalDelimiters: 'left' }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+
+ wrapper.setProps({ verticalDelimiters: 'right' })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should generate delimiters for each item', async () => {
+ const wrapper = mountFunction({
+ slots: {
+ default: [
+ { extends: VCarouselItem },
+ { extends: VCarouselItem },
+ { extends: VCarouselItem }
+ ]
+ }
+ })
+
+ await wrapper.vm.$nextTick()
+ const items = wrapper.findAll('.v-carousel__controls__item')
+
+ expect(items).toHaveLength(3)
+
+ items.at(1).trigger('click')
+
+ expect(wrapper.vm.internalIndex).toBe(1)
+
+ items.at(0).trigger('click')
+
+ expect(wrapper.vm.internalIndex).toBe(0)
+ })
+
+ it('should render a progress component', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ progress: true
+ }
+ })
+
+ expect(wrapper.find(VProgressLinear).element).toBeTruthy()
+ })
+
+ it('should update internal height when height changes', async () => {
+ const wrapper = mountFunction()
+
+ wrapper.setProps({ height: 300 })
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.vm.internalHeight).toBe(300)
+
+ wrapper.setProps({ height: 0 })
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.vm.internalHeight).toBe(300)
+ })
})
diff --git a/packages/vuetify/src/components/VCarousel/__tests__/__snapshots__/VCarousel.spec.ts.snap b/packages/vuetify/src/components/VCarousel/__tests__/__snapshots__/VCarousel.spec.ts.snap
new file mode 100644
index 00000000000..1c7a3babd6a
--- /dev/null
+++ b/packages/vuetify/src/components/VCarousel/__tests__/__snapshots__/VCarousel.spec.ts.snap
@@ -0,0 +1,35 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`VCarousel.ts should generate vertical delimiters 1`] = `
+
+<div class="v-window theme--dark v-carousel v-carousel--vertical-delimiters"
+ style="height: 500px;"
+>
+ <div class="v-window__container">
+ </div>
+ <div class="v-carousel__controls"
+ style="left: 0px;"
+ >
+ <div class="v-item-group theme--dark">
+ </div>
+ </div>
+</div>
+
+`;
+
+exports[`VCarousel.ts should generate vertical delimiters 2`] = `
+
+<div class="v-window theme--dark v-carousel v-carousel--vertical-delimiters"
+ style="height: 500px;"
+>
+ <div class="v-window__container">
+ </div>
+ <div class="v-carousel__controls"
+ style="left: 0px;"
+ >
+ <div class="v-item-group theme--dark">
+ </div>
+ </div>
+</div>
+
+`;
diff --git a/packages/vuetify/src/components/VWindow/VWindow.sass b/packages/vuetify/src/components/VWindow/VWindow.sass
index 63a2a14e036..fc68c8be07d 100644
--- a/packages/vuetify/src/components/VWindow/VWindow.sass
+++ b/packages/vuetify/src/components/VWindow/VWindow.sass
@@ -9,6 +9,54 @@
&--is-active
overflow: hidden
+ &__prev,
+ &__next
+ background: rgba(0, 0, 0, .3)
+ border-radius: 50%
+ position: absolute
+ margin: 0 16px
+ top: calc(50% - 20px)
+ z-index: 1
+
+ .v-btn
+ margin: 0
+ height: auto
+ width: auto
+
+ &:hover
+ background: none
+
+ &__prev
+ left: 0
+
+ &__next
+ right: 0
+
+ +rtl()
+ &__prev
+ left: auto
+ right: 0
+
+ &__next
+ left: 0
+ right: auto
+
+ &--show-arrows-on-hover
+ .v-window__next,
+ .v-window__prev
+ transition: .2s transform map-get($transition, 'swing')
+
+ .v-window__prev
+ transform: translateX(-200%)
+
+ .v-window__next
+ transform: translateX(200%)
+
+ &:hover
+ .v-window__next,
+ .v-window__prev
+ transform: translateX(0)
+
&-x-transition,
&-x-reverse-transition,
&-y-transition,
diff --git a/packages/vuetify/src/components/VWindow/VWindow.ts b/packages/vuetify/src/components/VWindow/VWindow.ts
index efd50150249..08355825cc5 100644
--- a/packages/vuetify/src/components/VWindow/VWindow.ts
+++ b/packages/vuetify/src/components/VWindow/VWindow.ts
@@ -2,6 +2,8 @@
import './VWindow.sass'
// Components
+import VBtn from '../VBtn'
+import VIcon from '../VIcon'
import { BaseItemGroup } from '../VItemGroup/VItemGroup'
// Directives
@@ -27,14 +29,25 @@ export default BaseItemGroup.extend({
type: String,
default: 'v-window-item--active'
},
+ continuous: Boolean,
mandatory: {
type: Boolean,
default: true
},
+ nextIcon: {
+ type: [Boolean, String],
+ default: '$vuetify.icons.next'
+ },
+ prevIcon: {
+ type: [Boolean, String],
+ default: '$vuetify.icons.prev'
+ },
reverse: {
type: Boolean,
default: undefined
},
+ showArrows: Boolean,
+ showArrowsOnHover: Boolean,
touch: Object,
touchless: Boolean,
value: {
@@ -45,6 +58,7 @@ export default BaseItemGroup.extend({
data () {
return {
+ changedByDelimiters: false,
internalHeight: undefined as undefined | string,
isActive: false,
isBooted: false,
@@ -53,13 +67,17 @@ export default BaseItemGroup.extend({
},
computed: {
+ classes (): object {
+ return {
+ ...BaseItemGroup.options.computed.classes.call(this),
+ 'v-window--show-arrows-on-hover': this.showArrowsOnHover
+ }
+ },
computedTransition (): string {
if (!this.isBooted) return ''
const axis = this.vertical ? 'y' : 'x'
- const direction = this.internalReverse === !this.$vuetify.rtl
- ? '-reverse'
- : ''
+ const direction = this.internalReverse ? '-reverse' : ''
return `v-window-${axis}${direction}-transition`
},
@@ -68,6 +86,12 @@ export default BaseItemGroup.extend({
this.items.find(item => !item.disabled)
)
},
+ hasNext (): boolean {
+ return this.continuous || this.internalIndex < this.items.length - 1
+ },
+ hasPrev (): boolean {
+ return this.continuous || this.internalIndex > 0
+ },
internalIndex (): number {
return this.items.findIndex((item, i) => {
return this.internalValue === this.getValue(item, i)
@@ -90,6 +114,12 @@ export default BaseItemGroup.extend({
methods: {
genContainer (): VNode {
+ const children = [this.$slots.default]
+
+ if (this.showArrows) {
+ children.push(this.genControlIcons())
+ }
+
return this.$createElement('div', {
staticClass: 'v-window__container',
class: {
@@ -98,7 +128,68 @@ export default BaseItemGroup.extend({
style: {
height: this.internalHeight
}
- }, this.$slots.default)
+ }, children)
+ },
+ genIcon (
+ direction: 'prev' | 'next',
+ icon: string,
+ fn: () => void
+ ) {
+ return this.$createElement('div', {
+ staticClass: `v-window__${direction}`
+ }, [
+ this.$createElement(VBtn, {
+ props: {
+ icon: true
+ },
+ attrs: {
+ 'aria-label': this.$vuetify.lang.t(`$vuetify.carousel.${direction}`)
+ },
+ on: {
+ click: () => {
+ this.changedByDelimiters = true
+ fn()
+ }
+ }
+ }, [
+ this.$createElement(VIcon, {
+ props: { size: 40 }
+ }, icon)
+ ])
+ ])
+ },
+ genControlIcons () {
+ const icons = []
+
+ const prevIcon = this.$vuetify.rtl
+ ? this.nextIcon
+ : this.prevIcon
+
+ /* istanbul ignore else */
+ if (
+ this.hasPrev &&
+ prevIcon &&
+ typeof prevIcon === 'string'
+ ) {
+ const icon = this.genIcon('prev', prevIcon, this.prev)
+ icon && icons.push(icon)
+ }
+
+ const nextIcon = this.$vuetify.rtl
+ ? this.prevIcon
+ : this.nextIcon
+
+ /* istanbul ignore else */
+ if (
+ this.hasNext &&
+ nextIcon &&
+ typeof nextIcon === 'string'
+ ) {
+ const icon = this.genIcon('next', nextIcon, this.next)
+ icon && icons.push(icon)
+ }
+
+ return icons
},
getNextIndex (index: number): number {
const nextIndex = (index + 1) % this.items.length
@@ -117,8 +208,9 @@ export default BaseItemGroup.extend({
return prevIndex
},
next () {
- this.isReverse = false
+ this.isReverse = this.$vuetify.rtl
+ /* istanbul ignore if */
if (!this.hasActiveItems) return
const nextIndex = this.getNextIndex(this.internalIndex)
@@ -127,8 +219,9 @@ export default BaseItemGroup.extend({
this.internalValue = this.getValue(item, nextIndex)
},
prev () {
- this.isReverse = true
+ this.isReverse = !this.$vuetify.rtl
+ /* istanbul ignore if */
if (!this.hasActiveItems) return
const lastIndex = this.getPrevIndex(this.internalIndex)
@@ -137,6 +230,11 @@ export default BaseItemGroup.extend({
this.internalValue = this.getValue(item, lastIndex)
},
updateReverse (val: number, oldVal: number) {
+ if (this.changedByDelimiters) {
+ this.changedByDelimiters = false
+ return
+ }
+
this.isReverse = val < oldVal
}
},
@@ -144,13 +242,18 @@ export default BaseItemGroup.extend({
render (h): VNode {
const data = {
staticClass: 'v-window',
+ class: this.classes,
directives: [] as VNodeDirective[]
}
if (!this.touchless) {
const value = this.touch || {
- left: this.next,
- right: this.prev
+ left: () => {
+ this.$vuetify.rtl ? this.prev() : this.next()
+ },
+ right: () => {
+ this.$vuetify.rtl ? this.next() : this.prev()
+ }
}
data.directives.push({
diff --git a/packages/vuetify/src/components/VWindow/VWindowItem.ts b/packages/vuetify/src/components/VWindow/VWindowItem.ts
index 416a684aa5c..2ba34c25443 100644
--- a/packages/vuetify/src/components/VWindow/VWindowItem.ts
+++ b/packages/vuetify/src/components/VWindow/VWindowItem.ts
@@ -86,6 +86,17 @@ export default baseMixins.extend<options>().extend(
genDefaultSlot () {
return this.$slots.default
},
+ genWindowItem () {
+ return this.$createElement('div', {
+ staticClass: 'v-window-item',
+ class: this.classes,
+ directives: [{
+ name: 'show',
+ value: this.isActive
+ }],
+ on: this.$listeners
+ }, this.showLazyContent(this.genDefaultSlot()))
+ },
onAfterEnter () {
if (this.wasCancelled) {
this.wasCancelled = false
@@ -138,16 +149,6 @@ export default baseMixins.extend<options>().extend(
},
render (h): VNode {
- const div = h('div', {
- staticClass: 'v-window-item',
- class: this.classes,
- directives: [{
- name: 'show',
- value: this.isActive
- }],
- on: this.$listeners
- }, this.showLazyContent(this.genDefaultSlot()))
-
return h('transition', {
props: {
name: this.computedTransition
@@ -159,6 +160,6 @@ export default baseMixins.extend<options>().extend(
enter: this.onEnter,
enterCancelled: this.onEnterCancelled
}
- }, [div])
+ }, [this.genWindowItem()])
}
})
diff --git a/packages/vuetify/src/components/VWindow/__tests__/VWindow.spec.ts b/packages/vuetify/src/components/VWindow/__tests__/VWindow.spec.ts
index d2ffc188992..4aaf5c917d6 100644
--- a/packages/vuetify/src/components/VWindow/__tests__/VWindow.spec.ts
+++ b/packages/vuetify/src/components/VWindow/__tests__/VWindow.spec.ts
@@ -5,13 +5,14 @@ import VWindowItem from '../VWindowItem'
// Utilities
import {
mount,
+ MountOptions,
Wrapper
} from '@vue/test-utils'
import { touch } from '../../../../test'
describe('VWindow.ts', () => {
type Instance = InstanceType<typeof VWindow>
- let mountFunction: (options?: object) => Wrapper<Instance>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
(global as any).requestAnimationFrame = cb => cb()
@@ -20,7 +21,12 @@ describe('VWindow.ts', () => {
return mount(VWindow, {
...options,
mocks: {
- $vuetify: { rtl: false }
+ $vuetify: {
+ lang: {
+ t: str => str
+ },
+ rtl: false
+ }
}
})
}
@@ -92,25 +98,25 @@ describe('VWindow.ts', () => {
await wrapper.vm.$nextTick()
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
wrapper.vm.next()
- expect(wrapper.vm.internalValue).toBe(1)
+ expect(wrapper.vm.internalIndex).toBe(1)
wrapper.vm.next()
- expect(wrapper.vm.internalValue).toBe(2)
+ expect(wrapper.vm.internalIndex).toBe(2)
wrapper.vm.next()
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
wrapper.vm.prev()
- expect(wrapper.vm.internalValue).toBe(2)
+ expect(wrapper.vm.internalIndex).toBe(2)
wrapper.vm.prev()
- expect(wrapper.vm.internalValue).toBe(1)
+ expect(wrapper.vm.internalIndex).toBe(1)
wrapper.vm.prev()
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
})
it('should update model when internal index is greater than item count', async () => {
@@ -129,18 +135,18 @@ describe('VWindow.ts', () => {
await wrapper.vm.$nextTick()
- expect(wrapper.vm.internalValue).toBe(2)
+ expect(wrapper.vm.internalIndex).toBe(2)
const [item1, item2, item3] = wrapper.findAll(VWindowItem).wrappers
item3.destroy()
- expect(wrapper.vm.internalValue).toBe(1)
+ expect(wrapper.vm.internalIndex).toBe(1)
item2.destroy()
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
item1.destroy()
- expect(wrapper.vm.internalValue).toBeUndefined()
+ expect(wrapper.vm.internalIndex).toBe(-1)
})
it('should react to touch', async () => {
@@ -159,23 +165,23 @@ describe('VWindow.ts', () => {
await wrapper.vm.$nextTick()
- expect(wrapper.vm.internalValue).toBe(1)
+ expect(wrapper.vm.internalIndex).toBe(1)
touch(wrapper).start(0, 0).end(200, 0)
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
touch(wrapper).start(0, 0).end(200, 0)
- expect(wrapper.vm.internalValue).toBe(4)
+ expect(wrapper.vm.internalIndex).toBe(4)
touch(wrapper).start(200, 0).end(0, 0)
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
wrapper.setProps({ value: 4 })
touch(wrapper).start(200, 0).end(0, 0)
- expect(wrapper.vm.internalValue).toBe(0)
+ expect(wrapper.vm.internalIndex).toBe(0)
wrapper.setProps({ value: 0 })
touch(wrapper).start(0, 0).end(200, 0)
- expect(wrapper.vm.internalValue).toBe(4)
+ expect(wrapper.vm.internalIndex).toBe(4)
})
it('should accept a custom touch object', async () => {
@@ -226,10 +232,94 @@ describe('VWindow.ts', () => {
}
})
- expect(wrapper.vm.internalValue).toBe(1)
+ expect(wrapper.vm.internalIndex).toBe(1)
touch(wrapper).start(0, 0).end(200, 0)
- expect(wrapper.vm.internalValue).toBe(2)
+ expect(wrapper.vm.internalIndex).toBe(2)
touch(wrapper).start(0, 0).end(200, 0)
- expect(wrapper.vm.internalValue).toBe(1)
+ expect(wrapper.vm.internalIndex).toBe(1)
+ })
+
+ it('should generate and show arrows', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ showArrows: true
+ },
+ slots: {
+ default: [
+ { extends: VWindowItem },
+ { extends: VWindowItem },
+ { extends: VWindowItem },
+ { extends: VWindowItem }
+ ]
+ }
+ })
+
+ const next = wrapper.find('.v-window__next .v-btn')
+
+ expect(wrapper.vm.hasNext).toBe(true)
+ expect(wrapper.vm.hasPrev).toBe(false)
+
+ next.trigger('click')
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.vm.hasNext).toBe(true)
+ expect(wrapper.vm.hasPrev).toBe(true)
+
+ next.trigger('click')
+ next.trigger('click')
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.vm.hasNext).toBe(false)
+ expect(wrapper.vm.hasPrev).toBe(true)
+
+ wrapper.setProps({ continuous: true })
+
+ expect(wrapper.vm.hasNext).toBe(true)
+ expect(wrapper.vm.hasPrev).toBe(true)
+ })
+
+ it('should skip disabled items and go to the next available', () => {
+ const props = {
+ disabled: {
+ type: Boolean,
+ default: true
+ }
+ }
+ const wrapper = mountFunction({
+ slots: {
+ default: [
+ { extends: VWindowItem },
+ { extends: VWindowItem, props },
+ { extends: VWindowItem, props },
+ { extends: VWindowItem }
+ ]
+ }
+ })
+
+ expect(wrapper.vm.internalIndex).toBe(0)
+
+ wrapper.vm.next()
+
+ expect(wrapper.vm.internalIndex).toBe(3)
+ })
+
+ it('should ignore touch events', () => {
+ const wrapper = mountFunction({
+ propsData: { touchless: true },
+ slots: {
+ default: [
+ { extends: VWindowItem },
+ { extends: VWindowItem }
+ ]
+ }
+ })
+
+ expect(wrapper.vm.internalIndex).toBe(0)
+
+ touch(wrapper).start(0, 0).end(200, 0)
+
+ expect(wrapper.vm.internalIndex).toBe(0)
})
})
|
9be53b2a82e0a0ad5682e7778b1c05a500dfa291
|
2018-10-28 15:16:56
|
John Leider
|
feat(gitignore): ignore yarn-error files
| false
|
ignore yarn-error files
|
feat
|
diff --git a/packages/vuetifyjs.com/.gitignore b/packages/vuetifyjs.com/.gitignore
index 8f6f5216dd8..ee196b8401d 100644
--- a/packages/vuetifyjs.com/.gitignore
+++ b/packages/vuetifyjs.com/.gitignore
@@ -6,3 +6,4 @@ npm-debug.log
.idea/
.env
.vscode
+yarn-error.log
|
b9ee7739500ce014942f2048a4823d80be3ef278
|
2024-02-20 19:41:50
|
Kael
|
docs: suppress "language does not exist" warning
| false
|
suppress "language does not exist" warning
|
docs
|
diff --git a/packages/docs/src/pages/en/features/scrolling.md b/packages/docs/src/pages/en/features/scrolling.md
index 26c03e14d8b..94debb882d1 100644
--- a/packages/docs/src/pages/en/features/scrolling.md
+++ b/packages/docs/src/pages/en/features/scrolling.md
@@ -66,4 +66,5 @@ export default new Router({
//
],
})
-``` -->
+```
+-->
|
6a39afaf4174b4beb71bc9b1e386c9588c9dadde
|
2017-10-30 08:09:52
|
John Leider
|
refactor(elevation): refactored elevation classes
| false
|
refactored elevation classes
|
refactor
|
diff --git a/src/stylus/settings/_elevations.styl b/src/stylus/settings/_elevations.styl
index 148f945bce1..71e7347394e 100644
--- a/src/stylus/settings/_elevations.styl
+++ b/src/stylus/settings/_elevations.styl
@@ -1,110 +1,89 @@
-shadow-key-umbra-opacity = rgba(0,0,0, .2)
-shadow-key-penumbra-opacity = rgba(0,0,0, .14)
-shadow-ambient-shadow-opacity = rgba(0,0,0, .12)
-
-elevation-0dp = 0 0px 0px shadow-key-umbra-opacity,
- 0 0px 0px shadow-key-penumbra-opacity,
- 0 0px 0px shadow-ambient-shadow-opacity
-
-elevation-1dp = 0 1px 3px shadow-key-umbra-opacity,
- 0 1px 1px shadow-key-penumbra-opacity,
- 0 2px 1px -1px shadow-ambient-shadow-opacity
-
-elevation-2dp = 0 1px 5px shadow-key-umbra-opacity,
- 0 2px 2px shadow-key-penumbra-opacity,
- 0 3px 1px -2px shadow-ambient-shadow-opacity
-
-elevation-3dp = 0 1px 8px shadow-key-umbra-opacity,
- 0 3px 4px shadow-key-penumbra-opacity,
- 0 3px 3px -2px shadow-ambient-shadow-opacity
-
-elevation-4dp = 0 2px 4px -1px shadow-key-umbra-opacity,
- 0 4px 5px shadow-key-penumbra-opacity,
- 0 1px 10px shadow-ambient-shadow-opacity
-
-elevation-5dp = 0 3px 5px -1px shadow-key-umbra-opacity,
- 0 5px 8px shadow-key-penumbra-opacity,
- 0 1px 14px shadow-ambient-shadow-opacity
-
-elevation-6dp = 0 3px 5px -1px shadow-key-umbra-opacity,
- 0 6px 10px shadow-key-penumbra-opacity,
- 0 1px 18px shadow-ambient-shadow-opacity
-
-elevation-7dp = 0 4px 5px -2px shadow-key-umbra-opacity,
- 0 7px 10px 1px shadow-key-penumbra-opacity,
- 0 2px 16px 1px shadow-ambient-shadow-opacity
-
-elevation-8dp = 0 5px 5px -3px shadow-key-umbra-opacity,
- 0 8px 10px 1px shadow-key-penumbra-opacity,
- 0 3px 14px 2px shadow-ambient-shadow-opacity
-
-elevation-9dp = 0 5px 6px -3px shadow-key-umbra-opacity,
- 0 9px 12px 1px shadow-key-penumbra-opacity,
- 0 3px 16px 2px shadow-ambient-shadow-opacity
-
-elevation-10dp = 0 6px 6px -3px shadow-key-umbra-opacity,
- 0 10px 14px 1px shadow-key-penumbra-opacity,
- 0 4px 18px 3px shadow-ambient-shadow-opacity
-
-elevation-11dp = 0 6px 7px -4px shadow-key-umbra-opacity,
- 0 11px 15px 1px shadow-key-penumbra-opacity,
- 0 4px 20px 3px shadow-ambient-shadow-opacity
-
-elevation-12dp = 0 7px 8px -4px shadow-key-umbra-opacity,
- 0 12px 17px 2px shadow-key-penumbra-opacity,
- 0 5px 22px 4px shadow-ambient-shadow-opacity
-
-elevation-13dp = 0 7px 8px -4px shadow-key-umbra-opacity,
- 0 13px 19px 2px shadow-key-penumbra-opacity,
- 0 5px 24px 4px shadow-ambient-shadow-opacity
-
-elevation-14dp = 0 7px 9px -4px shadow-key-umbra-opacity,
- 0 14px 21px 2px shadow-key-penumbra-opacity,
- 0 5px 26px 4px shadow-ambient-shadow-opacity
-
-elevation-15dp = 0 8px 9px -5px shadow-key-umbra-opacity,
- 0 15px 22px 2px shadow-key-penumbra-opacity,
- 0 6px 28px 5px shadow-ambient-shadow-opacity
-
-elevation-16dp = 0 8px 10px -5px shadow-key-umbra-opacity,
- 0 16px 24px 2px shadow-key-penumbra-opacity,
- 0 6px 30px 5px shadow-ambient-shadow-opacity
-
-elevation-17dp = 0 8px 11px -5px shadow-key-umbra-opacity,
- 0 17px 26px 2px shadow-key-penumbra-opacity,
- 0 6px 32px 5px shadow-ambient-shadow-opacity
-
-elevation-18dp = 0 9px 11px -5px shadow-key-umbra-opacity,
- 0 18px 28px 2px shadow-key-penumbra-opacity,
- 0 7px 34px 6px shadow-ambient-shadow-opacity
-
-elevation-19dp = 0 9px 12px -6px shadow-key-umbra-opacity,
- 0 19px 29px 2px shadow-key-penumbra-opacity,
- 0 7px 36px 6px shadow-ambient-shadow-opacity
-
-elevation-20dp = 0 10px 13px -6px shadow-key-umbra-opacity,
- 0 20px 31px 3px shadow-key-penumbra-opacity,
- 0 8px 38px 7px shadow-ambient-shadow-opacity
-
-elevation-21dp = 0 10px 13px -6px shadow-key-umbra-opacity,
- 0 21px 33px 3px shadow-key-penumbra-opacity,
- 0 8px 40px 7px shadow-ambient-shadow-opacity
-
-elevation-22dp = 0 10px 14px -6px shadow-key-umbra-opacity,
- 0 22px 35px 3px shadow-key-penumbra-opacity,
- 0 8px 42px 7px shadow-ambient-shadow-opacity
-
-elevation-23dp = 0 11px 14px -7px shadow-key-umbra-opacity,
- 0 23px 36px 3px shadow-key-penumbra-opacity,
- 0 9px 44px 8px shadow-ambient-shadow-opacity
-
-elevation-24dp = 0 11px 15px -7px shadow-key-umbra-opacity,
- 0 24px 38px 3px shadow-key-penumbra-opacity,
- 0 9px 46px 8px shadow-ambient-shadow-opacity
+$shadow-key-umbra-opacity = rgba(0,0,0, .2)
+$shadow-key-penumbra-opacity = rgba(0,0,0, .14)
+$shadow-key-ambient-opacity = rgba(0,0,0, .12)
+
+$shadow-key-umbra = 0px 0px 0px 0px $shadow-key-umbra-opacity,
+ 0px 2px 1px -1px $shadow-key-umbra-opacity,
+ 0px 3px 3px -2px $shadow-key-umbra-opacity,
+ 0px 2px 4px -1px $shadow-key-umbra-opacity,
+ 0px 3px 5px -1px $shadow-key-umbra-opacity,
+ 0px 3px 5px -1px $shadow-key-umbra-opacity,
+ 0px 4px 5px -2px $shadow-key-umbra-opacity,
+ 0px 5px 5px -3px $shadow-key-umbra-opacity,
+ 0px 5px 6px -3px $shadow-key-umbra-opacity,
+ 0px 6px 6px -3px $shadow-key-umbra-opacity,
+ 0px 6px 7px -4px $shadow-key-umbra-opacity,
+ 0px 7px 8px -4px $shadow-key-umbra-opacity,
+ 0px 7px 8px -4px $shadow-key-umbra-opacity,
+ 0px 7px 9px -4px $shadow-key-umbra-opacity,
+ 0px 8px 9px -5px $shadow-key-umbra-opacity,
+ 0px 8px 10px -5px $shadow-key-umbra-opacity,
+ 0px 8px 11px -5px $shadow-key-umbra-opacity,
+ 0px 9px 11px -5px $shadow-key-umbra-opacity,
+ 0px 9px 12px -6px $shadow-key-umbra-opacity,
+ 0px 10px 13px -6px $shadow-key-umbra-opacity,
+ 0px 10px 13px -6px $shadow-key-umbra-opacity,
+ 0px 10px 14px -6px $shadow-key-umbra-opacity,
+ 0px 11px 14px -7px $shadow-key-umbra-opacity,
+ 0px 11px 15px -7px $shadow-key-umbra-opacity
+
+$shadow-key-penumbra = 0px 0px 0px 0px $shadow-key-penumbra-opacity,
+ 0px 1px 1px 0px $shadow-key-penumbra-opacity,
+ 0px 2px 2px 0px $shadow-key-penumbra-opacity,
+ 0px 3px 4px 0px $shadow-key-penumbra-opacity,
+ 0px 4px 5px 0px $shadow-key-penumbra-opacity,
+ 0px 5px 8px 0px $shadow-key-penumbra-opacity,
+ 0px 6px 10px 0px $shadow-key-penumbra-opacity,
+ 0px 7px 10px 1px $shadow-key-penumbra-opacity,
+ 0px 8px 10px 1px $shadow-key-penumbra-opacity,
+ 0px 9px 12px 1px $shadow-key-penumbra-opacity,
+ 0px 10px 14px 1px $shadow-key-penumbra-opacity,
+ 0px 11px 15px 1px $shadow-key-penumbra-opacity,
+ 0px 12px 17px 2px $shadow-key-penumbra-opacity,
+ 0px 13px 19px 2px $shadow-key-penumbra-opacity,
+ 0px 14px 21px 2px $shadow-key-penumbra-opacity,
+ 0px 15px 22px 2px $shadow-key-penumbra-opacity,
+ 0px 16px 24px 2px $shadow-key-penumbra-opacity,
+ 0px 17px 26px 2px $shadow-key-penumbra-opacity,
+ 0px 18px 28px 2px $shadow-key-penumbra-opacity,
+ 0px 19px 29px 2px $shadow-key-penumbra-opacity,
+ 0px 20px 31px 3px $shadow-key-penumbra-opacity,
+ 0px 21px 33px 3px $shadow-key-penumbra-opacity,
+ 0px 22px 35px 3px $shadow-key-penumbra-opacity,
+ 0px 23px 36px 3px $shadow-key-penumbra-opacity,
+ 0px 24px 38px 3px $shadow-key-penumbra-opacity
+
+$shadow-key-ambient = 0px 0px 0px 0px $shadow-key-ambient-opacity,
+ 0px 1px 3px 0px $shadow-key-ambient-opacity,
+ 0px 1px 5px 0px $shadow-key-ambient-opacity,
+ 0px 1px 8px 0px $shadow-key-ambient-opacity,
+ 0px 1px 10px 0px $shadow-key-ambient-opacity,
+ 0px 1px 14px 0px $shadow-key-ambient-opacity,
+ 0px 1px 18px 0px $shadow-key-ambient-opacity,
+ 0px 2px 16px 1px $shadow-key-ambient-opacity,
+ 0px 3px 14px 2px $shadow-key-ambient-opacity,
+ 0px 3px 16px 2px $shadow-key-ambient-opacity,
+ 0px 4px 18px 3px $shadow-key-ambient-opacity,
+ 0px 4px 20px 3px $shadow-key-ambient-opacity,
+ 0px 5px 22px 4px $shadow-key-ambient-opacity,
+ 0px 5px 24px 4px $shadow-key-ambient-opacity,
+ 0px 5px 26px 4px $shadow-key-ambient-opacity,
+ 0px 6px 28px 5px $shadow-key-ambient-opacity,
+ 0px 6px 30px 5px $shadow-key-ambient-opacity,
+ 0px 6px 32px 5px $shadow-key-ambient-opacity,
+ 0px 7px 34px 6px $shadow-key-ambient-opacity,
+ 0px 7px 36px 6px $shadow-key-ambient-opacity,
+ 0px 8px 38px 7px $shadow-key-ambient-opacity,
+ 0px 8px 40px 7px $shadow-key-ambient-opacity,
+ 0px 8px 42px 7px $shadow-key-ambient-opacity,
+ 0px 9px 44px 8px $shadow-key-ambient-opacity,
+ 0px 9px 46px 8px $shadow-key-ambient-opacity
// MIXINS
elevation($z, important = false)
- box-shadow: elevation-+$z+dp (important ? !important : )
+ box-shadow: $shadow-key-umbra[$z],
+ $shadow-key-penumbra[$z],
+ $shadow-key-ambient[$z] (important ? !important : )
elevationTransition($duration = 280ms, $easing = cubic-bezier(.4, 0, .2, 1))
transition: box-shadow $duration $easing
diff --git a/src/stylus/tools/_elevations.styl b/src/stylus/tools/_elevations.styl
index aef72fb1f8c..9e309735d2d 100755
--- a/src/stylus/tools/_elevations.styl
+++ b/src/stylus/tools/_elevations.styl
@@ -2,6 +2,5 @@
// GENERATE HELPER CLASSES
for z in (0..24)
- .elevation-{z}
- elevation(z, true)
-
+ .elevation-{z}
+ elevation(z, true)
|
ebaf021c876148484b87ac56227e5aa51ff6d7ab
|
2022-05-24 13:05:03
|
Kael
|
test(VBadge): remove jest snapshot tests
| false
|
remove jest snapshot tests
|
test
|
diff --git a/packages/vuetify/src/components/VBadge/__tests__/VBadge.spec.tsx b/packages/vuetify/src/components/VBadge/__tests__/VBadge.spec.tsx
deleted file mode 100644
index 71535377ec0..00000000000
--- a/packages/vuetify/src/components/VBadge/__tests__/VBadge.spec.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-// Components
-import { VBadge } from '..'
-
-// Utilities
-import { mount } from '@vue/test-utils'
-import { createVuetify } from '@/framework'
-
-describe('VBadge.tsx', () => {
- const vuetify = createVuetify()
-
- function mountFunction (options?: any) {
- return mount(VBadge, {
- ...options,
- global: { plugins: [vuetify] },
- })
- }
-
- it.each([
- [{ modelValue: true }],
- [{ modelValue: false }],
- [{ floating: true }],
- [{ dot: true }], // takes priority over badge slot
- [{ dot: true, floating: true }],
- [{ floating: true }],
- [{ icon: 'foo' }], // badge slot overrides icon
- [{ inline: true }],
- [{ location: 'bottom-start' }],
- [{ location: undefined }],
- [{ location: null }],
- [{ content: '10', max: 9 }],
- [{ content: '10', max: 11 }],
- [{ content: 10, max: 11 }],
- [{ content: 'foo', max: 9 }],
- ])('should match snapshot with badge slot and %s props', (props: any) => {
- const wrapper = mountFunction({
- props,
- slots: {
- badge: () => <span>content</span>,
- default: () => <span>element</span>,
- },
- })
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it.each([
- [{ content: 'foo' }],
- [{ content: 'foo', icon: 'bar' }],
- [{ icon: 'foo' }],
- ])('should match snapshot without badge slot and %s props', (props: any) => {
- const wrapper = mountFunction({ props })
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-})
diff --git a/packages/vuetify/src/components/VBadge/__tests__/__snapshots__/VBadge.spec.tsx.snap b/packages/vuetify/src/components/VBadge/__tests__/__snapshots__/VBadge.spec.tsx.snap
deleted file mode 100644
index 16a765da228..00000000000
--- a/packages/vuetify/src/components/VBadge/__tests__/__snapshots__/VBadge.spec.tsx.snap
+++ /dev/null
@@ -1,385 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`VBadge.tsx should match snapshot with badge slot and { content: '10', max: 9 } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { content: '10', max: 11 } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { content: 'foo', max: 9 } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { content: 10, max: 11 } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { dot: true } props 1`] = `
-<div class="v-badge v-badge--dot">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { dot: true, floating: true } props 1`] = `
-<div class="v-badge v-badge--dot v-badge--floating">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { floating: true } props 1`] = `
-<div class="v-badge v-badge--floating">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { floating: true } props 2`] = `
-<div class="v-badge v-badge--floating">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { icon: 'foo' } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { inline: true } props 1`] = `
-<div class="v-badge v-badge--inline">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { location: 'bottom-start' } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { location: null } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { location: undefined } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { modelValue: false } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- style="display: none;"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot with badge slot and { modelValue: true } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <span>
- element
- </span>
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span>
- content
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot without badge slot and { content: 'foo' } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <span class="v-badge__content">
- foo
- </span>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot without badge slot and { content: 'foo', icon: 'bar' } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <i class="bar mdi v-icon notranslate v-icon--size-default v-theme--light"
- aria-hidden="true"
- >
- </i>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
-
-exports[`VBadge.tsx should match snapshot without badge slot and { icon: 'foo' } props 1`] = `
-<div class="v-badge">
- <div class="v-badge__wrapper">
- <transition-stub>
- <span class="v-badge__badge v-theme--light"
- aria-atomic="true"
- aria-label="Badge"
- aria-live="polite"
- role="status"
- >
- <i class="foo mdi v-icon notranslate v-icon--size-default v-theme--light"
- aria-hidden="true"
- >
- </i>
- </span>
- </transition-stub>
- </div>
-</div>
-`;
|
ddb90b1c0654f6142773e428391926e86ebc2ef6
|
2019-11-04 18:49:19
|
Darkside73
|
fix(locale): update Ukrainian translation (#9562)
| false
|
update Ukrainian translation (#9562)
|
fix
|
diff --git a/packages/vuetify/src/locale/uk.ts b/packages/vuetify/src/locale/uk.ts
index b2f8ac8ff1e..bf98f706699 100644
--- a/packages/vuetify/src/locale/uk.ts
+++ b/packages/vuetify/src/locale/uk.ts
@@ -1,17 +1,17 @@
export default {
- close: 'Close',
+ close: 'Закрити',
dataIterator: {
noResultsText: 'В результаті пошуку нічого не знайдено',
- loadingText: 'Loading item...',
+ loadingText: 'Завантаження...',
},
dataTable: {
itemsPerPageText: 'Рядків на сторінці:',
ariaLabel: {
- sortDescending: ': Sorted descending. Activate to remove sorting.',
- sortAscending: ': Sorted ascending. Activate to sort descending.',
- sortNone: ': Not sorted. Activate to sort ascending.',
+ sortDescending: ': Відсортовано за спаданням. Активувати, щоб видалити сортування.',
+ sortAscending: ': Відсортовано за зростанням. Активувати, щоб відсортувати за спаданням.',
+ sortNone: ': Не відсортовано. Активувати, щоб відсортувати за зростанням.',
},
- sortBy: 'Sort by',
+ sortBy: 'Відсортувати за',
},
dataFooter: {
itemsPerPageText: 'Елементів на сторінці:',
@@ -27,18 +27,18 @@ export default {
},
noDataText: 'Немає даних для відображення',
carousel: {
- prev: 'Попередній візуальний',
- next: 'Наступний візуальнийa',
+ prev: 'Попередній слайд',
+ next: 'Наступий слайд',
ariaLabel: {
- delimiter: 'Carousel slide {0} of {1}',
+ delimiter: 'Слайд {0} з {1}',
},
},
calendar: {
moreEvents: 'Ще {0}',
},
fileInput: {
- counter: '{0} files',
- counterSize: '{0} files ({1} in total)',
+ counter: '{0} файлів',
+ counterSize: '{0} файлів ({1} загалом)',
},
timePicker: {
am: 'AM',
|
33064ee76ce5a5dc1d5ffaf178a9cc4f447796c6
|
2018-05-16 06:42:51
|
Kael
|
fix(VTextField): fix error state with external validation (#4010)
| false
|
fix error state with external validation (#4010)
|
fix
|
diff --git a/src/components/VForm/VForm.js b/src/components/VForm/VForm.js
index dcda99c720b..6e232384ed8 100644
--- a/src/components/VForm/VForm.js
+++ b/src/components/VForm/VForm.js
@@ -35,16 +35,32 @@ export default {
methods: {
watchInput (input) {
- const valid = input.$watch('valid', val => {
- if (!input.shouldValidate && this.lazyValidation) return
- this.$set(this.errorBag, input._uid, !val)
- }, { immediate: true })
+ const watcher = input => {
+ return input.$watch('valid', val => {
+ this.$set(this.errorBag, input._uid, !val)
+ }, { immediate: true })
+ }
+
+ const watchers = {
+ valid: undefined,
+ shouldValidate: undefined
+ }
+
+ if (this.lazyValidation) {
+ // Only start watching inputs if we need to
+ watchers.shouldValidate = input.$watch('shouldValidate', val => {
+ if (!val) return
- const shouldValidate = input.$watch('shouldValidate', val => {
- if (val) this.$set(this.errorBag, input._uid, !input.valid)
- }, { immediate: true })
+ // Only watch if we're not already doing it
+ if (this.errorBag.hasOwnProperty(input._uid)) return
- return { valid, shouldValidate }
+ watchers.input = watcher(input)
+ })
+ } else {
+ watchers.valid = watcher(input)
+ }
+
+ return watchers
},
validate () {
const errors = this.inputs.filter(input => !input.validate(true)).length
@@ -54,7 +70,12 @@ export default {
for (let i = this.inputs.length; i--;) {
this.inputs[i].reset()
}
- if (this.lazyValidation) this.errorBag = {}
+ if (this.lazyValidation) {
+ // Account for timeout in validatable
+ setTimeout(() => {
+ this.errorBag = {}
+ }, 0)
+ }
},
register (input) {
const unwatch = this.watchInput(input)
@@ -70,8 +91,8 @@ export default {
if (!found) return
- found.unwatch.valid()
- found.unwatch.shouldValidate()
+ found.unwatch.valid && found.unwatch.valid()
+ found.unwatch.shouldValidate && found.unwatch.shouldValidate()
this.inputs = this.inputs.filter(i => i.uid !== found.uid)
this.$delete(this.errorBag, found.uid)
}
diff --git a/src/components/VInput/VInput.js b/src/components/VInput/VInput.js
index 504259acf49..d8a2d23054c 100755
--- a/src/components/VInput/VInput.js
+++ b/src/components/VInput/VInput.js
@@ -146,10 +146,6 @@ export default {
genInputSlot () {
return this.$createElement('div', {
staticClass: 'v-input__slot',
- 'class': this.addTextColorClassChecks(
- {},
- this.hasState ? this.validationState : this.color
- ),
style: { height: convertToUnit(this.height) },
directives: this.directivesInput,
on: { click: this.onClick },
diff --git a/src/mixins/validatable.js b/src/mixins/validatable.js
index 55757dd2e8c..eb820286e0f 100644
--- a/src/mixins/validatable.js
+++ b/src/mixins/validatable.js
@@ -54,6 +54,9 @@ export default {
this.errorBucket.length > 0 ||
this.error
},
+ externalError () {
+ return this.errorMessages.length > 0 || this.error
+ },
// TODO: Add logic that allows the user to enable based
// upon a good validation
hasSuccess () {
@@ -67,14 +70,11 @@ export default {
return this.shouldValidate && (this.hasError || this.hasSuccess)
},
shouldValidate () {
- return (
- this.error ||
- (
- !this.isResetting &&
- this.hasError &&
- (this.hasInput || this.hasFocused)
- )
- )
+ return this.externalError || (!this.isResetting && (
+ this.validateOnBlur
+ ? this.hasInput && this.hasFocused && !this.isFocused
+ : (this.hasInput || this.hasFocused)
+ ))
},
validations () {
return this.validationTarget.slice(0, this.errorCount)
diff --git a/src/stylus/components/_inputs.styl b/src/stylus/components/_inputs.styl
index e2cbdc4b33c..2c88aceb475 100644
--- a/src/stylus/components/_inputs.styl
+++ b/src/stylus/components/_inputs.styl
@@ -7,7 +7,7 @@ v-input($material)
textarea::placeholder
color: $material.text.disabled
- &:not(.v-input--has-state):not(.v-input--is-disabled)
+ &:not(.v-input--is-disabled)
input,
textarea
color: $material.text.primary
@@ -27,7 +27,6 @@ theme(v-input, "v-input")
font-size: 16px
margin-top: 16px // 12px for label, 16px for spec
text-align: left
- transition: $primary-transition
.v-progress-linear
top: calc(100% - 1px)
@@ -94,7 +93,6 @@ theme(v-input, "v-input")
margin-bottom: 8px
min-height: inherit
position: relative
- transition: $primary-transition
width: 100%
&--is-disabled:not(.v-input--is-readonly)
diff --git a/src/stylus/components/_text-fields.styl b/src/stylus/components/_text-fields.styl
index e1deed4e257..fa9c9c2dee4 100755
--- a/src/stylus/components/_text-fields.styl
+++ b/src/stylus/components/_text-fields.styl
@@ -2,10 +2,10 @@
@import '../theme'
v-text-field($material)
- &:not(.v-input--has-state)
- .v-input__slot:before
- background-color: $material.input-bottom-line
+ .v-input__slot:before
+ background-color: $material.input-bottom-line
+ &:not(.v-input--has-state)
&:hover
.v-input__slot:before
background-color: $material.text.primary
diff --git a/test/unit/components/VCheckbox/__snapshots__/VCheckbox.spec.js.snap b/test/unit/components/VCheckbox/__snapshots__/VCheckbox.spec.js.snap
index 290f3d1f8d6..2d3e45fcc9d 100644
--- a/test/unit/components/VCheckbox/__snapshots__/VCheckbox.spec.js.snap
+++ b/test/unit/components/VCheckbox/__snapshots__/VCheckbox.spec.js.snap
@@ -4,7 +4,7 @@ exports[`VCheckbox.js should use custom icons 1`] = `
<div class="v-input v-input--selection-controls v-input--checkbox">
<div class="v-input__control">
- <div class="v-input__slot accent--text">
+ <div class="v-input__slot">
<div class="v-input--selection-controls__input">
<input aria-checked="mixed"
role="checkbox"
@@ -37,7 +37,7 @@ exports[`VCheckbox.js should use custom icons 2`] = `
<div class="v-input v-input--selection-controls v-input--checkbox">
<div class="v-input__control">
- <div class="v-input__slot accent--text">
+ <div class="v-input__slot">
<div class="v-input--selection-controls__input">
<input aria-checked="mixed"
role="checkbox"
@@ -70,7 +70,7 @@ exports[`VCheckbox.js should use custom icons 3`] = `
<div class="v-input v-input--selection-controls v-input--checkbox">
<div class="v-input__control">
- <div class="v-input__slot accent--text">
+ <div class="v-input__slot">
<div class="v-input--selection-controls__input">
<input aria-checked="mixed"
role="checkbox"
diff --git a/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap b/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap
index e308a197427..24c2aec807b 100644
--- a/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap
+++ b/test/unit/components/VDataIterator/__snapshots__/VDataIterator.spec.js.snap
@@ -16,7 +16,7 @@ exports[`VDataIterator.js should match a snapshot - footer slot 1`] = `
class="v-input v-text-field v-select v-input--hide-details v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -166,7 +166,7 @@ exports[`VDataIterator.js should match a snapshot - no data 1`] = `
class="v-input v-text-field v-select v-input--hide-details v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -307,7 +307,7 @@ exports[`VDataIterator.js should match a snapshot - no matching records 1`] = `
class="v-input v-text-field v-select v-input--hide-details v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -452,7 +452,7 @@ exports[`VDataIterator.js should match a snapshot - with data 1`] = `
class="v-input v-text-field v-select v-input--hide-details v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
diff --git a/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap b/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap
index fa249e32f90..c5f5043a66a 100644
--- a/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap
+++ b/test/unit/components/VDataTable/__snapshots__/VDataTable.spec.js.snap
@@ -72,7 +72,7 @@ exports[`VDataTable.vue should match a snapshot - no data 1`] = `
class="v-input v-text-field v-select v-input--hide-details"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -264,7 +264,7 @@ exports[`VDataTable.vue should match a snapshot - no matching results 1`] = `
class="v-input v-text-field v-select v-input--hide-details"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -458,7 +458,7 @@ exports[`VDataTable.vue should match a snapshot - with data 1`] = `
class="v-input v-text-field v-select v-input--hide-details"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
diff --git a/test/unit/components/VForm/VForm.spec.js b/test/unit/components/VForm/VForm.spec.js
index e64cf7c1381..d614ec22c9b 100644
--- a/test/unit/components/VForm/VForm.spec.js
+++ b/test/unit/components/VForm/VForm.spec.js
@@ -1,4 +1,3 @@
-
import Vue from 'vue'
import { test } from '@/test'
import VTextField from '@/components/VTextField'
@@ -127,34 +126,23 @@ test('VForm.js', ({ mount }) => {
expect(value).toBeCalledWith(false)
})
- it('should reset valid state', async () => {
-
+ it('should reset validation', async () => {
const wrapper = mount(VForm, {
slots: {
default: [VTextField]
}
})
- let value = jest.fn()
- wrapper.vm.$on('input', value)
-
expect(Object.keys(wrapper.vm.errorBag).length).toBe(1)
wrapper.vm.reset()
- await wrapper.vm.$nextTick()
- expect(value).toBeCalledWith(false)
expect(Object.keys(wrapper.vm.errorBag).length).toBe(1)
wrapper.setProps({ lazyValidation: true })
- await wrapper.vm.$nextTick()
-
- expect(value).toBeCalledWith(true)
expect(Object.keys(wrapper.vm.errorBag).length).toBe(1)
wrapper.vm.reset()
- await wrapper.vm.$nextTick()
-
- expect(value).toBeCalledWith(true)
+ await new Promise(resolve => setTimeout(resolve, 0))
expect(Object.keys(wrapper.vm.errorBag).length).toBe(0)
})
})
diff --git a/test/unit/components/VInput/VInput.spec.js b/test/unit/components/VInput/VInput.spec.js
index f0b8ac07eb3..0bc44697cae 100644
--- a/test/unit/components/VInput/VInput.spec.js
+++ b/test/unit/components/VInput/VInput.spec.js
@@ -161,4 +161,15 @@ test('VInput.js', ({ mount }) => {
expect(onMouseDown).toHaveBeenCalledTimes(1)
expect(onMouseUp).toHaveBeenCalledTimes(1)
})
+
+ it('should be in an error state', async () => {
+ const wrapper = mount(VInput, {
+ propsData: { error: true }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+
+ wrapper.setProps({ errorMessages: 'required', error: false })
+ expect(wrapper.html()).toMatchSnapshot()
+ })
})
diff --git a/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap b/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap
index 2e3aa99dae8..a4b8b0cc0fc 100644
--- a/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap
+++ b/test/unit/components/VInput/__snapshots__/VInput.spec.js.snap
@@ -1,5 +1,35 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`VInput.js should be in an error state 1`] = `
+
+<div class="v-input v-input--has-state error--text">
+ <div class="v-input__control">
+ <div class="v-input__slot">
+ </div>
+ <div class="v-messages error--text">
+ <div class="v-messages__wrapper">
+ </div>
+ </div>
+ </div>
+</div>
+
+`;
+
+exports[`VInput.js should be in an error state 2`] = `
+
+<div class="v-input v-input--has-state error--text">
+ <div class="v-input__control">
+ <div class="v-input__slot">
+ </div>
+ <div class="v-messages error--text">
+ <div class="v-messages__wrapper">
+ </div>
+ </div>
+ </div>
+</div>
+
+`;
+
exports[`VInput.js should generate an icon and match snapshot 1`] = `
<div class="v-input">
diff --git a/test/unit/components/VOverflowBtn/__snapshots__/VOverflowBtn.spec.js.snap b/test/unit/components/VOverflowBtn/__snapshots__/VOverflowBtn.spec.js.snap
index 96f931dc36b..c8df3500b4d 100644
--- a/test/unit/components/VOverflowBtn/__snapshots__/VOverflowBtn.spec.js.snap
+++ b/test/unit/components/VOverflowBtn/__snapshots__/VOverflowBtn.spec.js.snap
@@ -4,7 +4,7 @@ exports[`VOverflowBtn should use default autocomplete selections 1`] = `
<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">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -48,7 +48,7 @@ exports[`VOverflowBtn 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-overflow-btn--segmented v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
diff --git a/test/unit/components/VRadioGroup/VRadioGroup.spec.js b/test/unit/components/VRadioGroup/VRadioGroup.spec.js
index 558a3dd008c..f0ddc85e0e1 100644
--- a/test/unit/components/VRadioGroup/VRadioGroup.spec.js
+++ b/test/unit/components/VRadioGroup/VRadioGroup.spec.js
@@ -211,9 +211,6 @@ test('VRadioGroup.vue', ({ mount }) => {
it('should validate on blur', async () => {
const wrapper = mount(VRadioGroup, {
- propsData: {
- rules: [v => !!v || 'Foobar']
- },
slots: {
default: [{
extends: VRadio
diff --git a/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap b/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap
index 7e017dc14f2..5121d5d0f76 100644
--- a/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap
+++ b/test/unit/components/VRadioGroup/__snapshots__/VRadioGroup.spec.js.snap
@@ -4,7 +4,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">
<div class="v-input__control">
- <div class="v-input__slot error--text"
+ <div class="v-input__slot"
style="height: auto;"
>
<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 ac6cce51c07..20b7637c200 100644
--- a/test/unit/components/VSelect/__snapshots__/VSelect.spec.js.snap
+++ b/test/unit/components/VSelect/__snapshots__/VSelect.spec.js.snap
@@ -14,7 +14,7 @@ exports[`VSelect should only show items if they are in items 1`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -66,7 +66,7 @@ exports[`VSelect should only show items if they are in items 2`] = `
class="v-input v-text-field v-select"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -115,7 +115,7 @@ exports[`VSelect should only show items if they are in items 3`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -167,7 +167,7 @@ exports[`VSelect should only show items if they are in items 4`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -222,7 +222,7 @@ exports[`VSelect should render v-select correctly when not using scope slot 1`]
class="v-input v-text-field v-select"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -271,7 +271,7 @@ exports[`VSelect should render v-select correctly when not using v-list-tile in
class="v-input v-text-field v-select"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -320,7 +320,7 @@ exports[`VSelect should render v-select correctly when using v-list-tile in item
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -374,7 +374,7 @@ exports[`VSelect should use scoped slot for selection generation 1`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
diff --git a/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap b/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap
index f280ee5b8da..af7b3afb01f 100644
--- a/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap
+++ b/test/unit/components/VSelect/__snapshots__/VSelect2.spec.js.snap
@@ -6,7 +6,7 @@ exports[`VSelect should add color to selected index 1`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -58,7 +58,7 @@ exports[`VSelect should be clearable with prop, dirty and multi select 1`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
@@ -119,7 +119,7 @@ exports[`VSelect should be clearable with prop, dirty and single select 1`] = `
class="v-input v-text-field v-select v-input--is-label-active v-input--is-dirty"
>
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-menu"
style="display: inline-block;"
>
diff --git a/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap b/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap
index 37cd464df20..d802d8e9e69 100644
--- a/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap
+++ b/test/unit/components/VSlider/__snapshots__/VSlider.spec.js.snap
@@ -4,7 +4,7 @@ exports[`VSlider.vue should change track styles in rtl 1`] = `
<div class="v-input v-input--slider">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -43,7 +43,7 @@ exports[`VSlider.vue should change track styles in rtl 2`] = `
<div class="v-input v-input--slider v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -122,7 +122,7 @@ exports[`VSlider.vue should change track styles in rtl 4`] = `
<div class="v-input v-input--slider">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -161,7 +161,7 @@ exports[`VSlider.vue should change track styles in rtl 5`] = `
<div class="v-input v-input--slider v-input--is-label-active v-input--is-dirty">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -240,7 +240,7 @@ exports[`VSlider.vue should match a snapshot 1`] = `
<div class="v-input v-input--slider">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -279,7 +279,7 @@ exports[`VSlider.vue should render component with thumbLabel and match a snapsho
<div class="v-input v-input--slider v-input--slider--thumb-label">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -329,7 +329,7 @@ exports[`VSlider.vue should render component with thumbLabel and match a snapsho
<div class="v-input v-input--slider v-input--slider--thumb-label">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -379,7 +379,7 @@ exports[`VSlider.vue should render component with ticks and match a snapshot 1`]
<div class="v-input v-input--slider v-input--slider--ticks">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -440,7 +440,7 @@ exports[`VSlider.vue should render component with ticks and match a snapshot 2`]
<div class="v-input v-input--slider v-input--slider--ticks">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input role="slider"
type="slider"
@@ -501,7 +501,7 @@ exports[`VSlider.vue should reverse label location when inverse 1`] = `
<div class="v-input v-input--slider">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<label aria-hidden="true"
class="v-label"
style="left: 0px; position: relative;"
@@ -547,7 +547,7 @@ exports[`VSlider.vue should reverse label location when inverse 2`] = `
<div class="v-input v-input--slider v-input--slider--inverse-label">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-slider">
<input aria-label="foo"
role="slider"
diff --git a/test/unit/components/VTextField/VTextField.spec.js b/test/unit/components/VTextField/VTextField.spec.js
index 22bd86882ca..9d442d83ad2 100644
--- a/test/unit/components/VTextField/VTextField.spec.js
+++ b/test/unit/components/VTextField/VTextField.spec.js
@@ -73,6 +73,15 @@ test('VTextField.js', ({ mount }) => {
expect(wrapper.data().valid).toEqual(false)
})
+ it('should start validating on input', async () => {
+ const wrapper = mount(VTextField)
+
+ expect(wrapper.vm.shouldValidate).toEqual(false)
+ wrapper.setProps({ value: 'asd' })
+ await wrapper.vm.$nextTick()
+ expect(wrapper.vm.shouldValidate).toEqual(true)
+ })
+
it('should not start validating on input if validate-on-blur prop is set', async () => {
const wrapper = mount(VTextField, {
propsData: {
@@ -171,11 +180,7 @@ test('VTextField.js', ({ mount }) => {
})
it('should start validating on blur', async () => {
- const wrapper = mount(VTextField, {
- propsData: {
- rules: [v => !!v || 'Foobar']
- }
- })
+ const wrapper = mount(VTextField)
const input = wrapper.first('input')
expect(wrapper.vm.shouldValidate).toEqual(false)
diff --git a/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap b/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap
index b0c985fba17..0ed9b133a10 100644
--- a/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap
+++ b/test/unit/components/VTextField/__snapshots__/VTextField.spec.js.snap
@@ -20,7 +20,7 @@ exports[`VTextField.js should have prefix and suffix 1`] = `
<div class="v-input v-text-field v-text-field--prefix">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-text-field__slot">
<label aria-hidden="true"
class="v-label"
@@ -53,7 +53,7 @@ exports[`VTextField.js should not display counter when set to false 1`] = `
<div class="v-input v-text-field">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-text-field__slot">
<label aria-hidden="true"
class="v-label"
@@ -84,7 +84,7 @@ exports[`VTextField.js should not display counter when set to false 2`] = `
<div class="v-input v-text-field">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-text-field__slot">
<label aria-hidden="true"
class="v-label"
@@ -112,7 +112,7 @@ exports[`VTextField.js should render component and match snapshot 1`] = `
<div class="v-input v-text-field">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-text-field__slot">
<label aria-hidden="true"
class="v-label"
@@ -139,7 +139,7 @@ exports[`VTextField.js should render component with async loading and custom pro
<div class="v-input v-text-field v-input--is-loading">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-text-field__slot">
<label aria-hidden="true"
class="v-label"
@@ -182,7 +182,7 @@ exports[`VTextField.js should render component with async loading and match snap
<div class="v-input v-text-field v-input--is-loading">
<div class="v-input__control">
- <div class="v-input__slot primary--text">
+ <div class="v-input__slot">
<div class="v-text-field__slot">
<label aria-hidden="true"
class="v-label"
|
c9982cf67e94708a2d3c12440f9a4b30dc88598c
|
2022-08-25 19:45:19
|
John Leider
|
docs(RelatedPage): fix imported package
| false
|
fix imported package
|
docs
|
diff --git a/packages/docs/src/components/doc/RelatedPage.vue b/packages/docs/src/components/doc/RelatedPage.vue
index ce2905507d4..2d023cc9019 100644
--- a/packages/docs/src/components/doc/RelatedPage.vue
+++ b/packages/docs/src/components/doc/RelatedPage.vue
@@ -29,7 +29,7 @@
// Utilities
import { computed } from 'vue'
import { rpath, trailingSlash } from '@/util/routes'
- import { upperFirst } from 'lodash'
+ import { upperFirst } from 'lodash-es'
const appStore = useAppStore()
const props = defineProps({ to: String })
|
8962a00dd1977ef9f5284e9e6d6f992e210e5cc0
|
2024-08-13 13:15:07
|
Joaquín Sánchez
|
docs: optimize build (#20260)
| false
|
optimize build (#20260)
|
docs
|
diff --git a/.github/actions/pnpm-install/action.yml b/.github/actions/pnpm-install/action.yml
index ac8aa599b79..fa18384a880 100644
--- a/.github/actions/pnpm-install/action.yml
+++ b/.github/actions/pnpm-install/action.yml
@@ -13,6 +13,9 @@ runs:
/home/runner/.cache/Cypress
/home/runner/.pnpm-store
key: pnpm-${{ runner.os }}-${{ hashFiles('./pnpm-lock.yaml') }}
+ - uses: actions/setup-node@v4
+ with:
+ node-version-file: .nvmrc
- uses: pnpm/action-setup@v4
- run: pnpm i --frozen-lockfile
shell: bash
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 00000000000..dc5f6a52b13
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+22.6.0
diff --git a/package.json b/package.json
index 52a8aa0aac4..c4b45c44aa2 100755
--- a/package.json
+++ b/package.json
@@ -27,19 +27,19 @@
"vue-ecosystem-ci:test": "pnpm --filter vuetify run lint && pnpm --filter vuetify run test"
},
"engines": {
- "node": ">=18.20.0 || >=20.10.0"
+ "node": ">=22.0.0"
},
"devDependencies": {
"@babel/cli": "^7.24.8",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/preset-typescript": "^7.24.7",
- "@mdi/font": "6.2.95",
- "@mdi/js": "6.2.95",
- "@mdi/svg": "6.2.95",
+ "@mdi/font": "7.4.47",
+ "@mdi/js": "7.4.47",
+ "@mdi/svg": "7.4.47",
"@octokit/core": "^5.2.0",
- "@typescript-eslint/eslint-plugin": "^6.21.0",
- "@typescript-eslint/parser": "^6.21.0",
+ "@typescript-eslint/eslint-plugin": "^7.18.0",
+ "@typescript-eslint/parser": "^7.18.0",
"@unhead/vue": "^1.9.4",
"@vue/compiler-sfc": "^3.4.27",
"@vue/runtime-core": "^3.4.27",
@@ -79,15 +79,20 @@
"semver": "^7.6.0",
"shelljs": "^0.8.5",
"stringify-object": "^5.0.0",
- "typescript": "~5.3.3",
+ "typescript": "~5.5.4",
"upath": "^2.0.1",
"vite-plugin-inspect": "^0.8.3",
"vite-plugin-warmup": "^0.1.0",
"vue": "^3.4.27",
"vue-analytics": "^5.16.1",
"vue-router": "^4.3.0",
- "vue-tsc": "^1.8.27",
+ "vue-tsc": "^2.0.29",
"yargs": "^17.7.2"
},
- "packageManager": "[email protected]"
+ "packageManager": "[email protected]",
+ "pnpm": {
+ "patchedDependencies": {
+ "@mdi/[email protected]": "patches/@[email protected]"
+ }
+ }
}
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index 3ae4d481272..97a2dba0bf0 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -20,6 +20,7 @@
"vuetify": "workspace:*"
},
"devDependencies": {
+ "@types/lodash-es": "^4.17.12",
"@types/stringify-object": "^4.0.5",
"eslint": "^8.57.0",
"lodash-es": "^4.17.21",
diff --git a/packages/docs/auto-imports.d.ts b/packages/docs/auto-imports.d.ts
index 15cb2c8530e..b41ec364536 100644
--- a/packages/docs/auto-imports.d.ts
+++ b/packages/docs/auto-imports.d.ts
@@ -6,11 +6,13 @@
export {}
declare global {
const ComponentPublicInstance: typeof import('vue')['ComponentPublicInstance']
+ const EffectScope: typeof import('vue')['EffectScope']
const IN_BROWSER: typeof import('./src/utils/globals')['IN_BROWSER']
const IS_DEBUG: typeof import('./src/utils/globals')['IS_DEBUG']
const IS_PROD: typeof import('./src/utils/globals')['IS_PROD']
const IS_SERVER: typeof import('./src/utils/globals')['IS_SERVER']
const PropType: typeof import('vue')['PropType']
+ const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
const anyLanguagePattern: typeof import('./src/utils/routes')['anyLanguagePattern']
const camelCase: typeof import('lodash-es')['camelCase']
const camelize: typeof import('vue')['camelize']
@@ -18,43 +20,85 @@ declare global {
const configureMarkdown: typeof import('./src/utils/markdown-it')['configureMarkdown']
const copyElementContent: typeof import('./src/utils/helpers')['copyElementContent']
const createAdProps: typeof import('./src/composables/ad')['createAdProps']
+ const createApp: typeof import('vue')['createApp']
const createOne: typeof import('@vuetify/one')['createOne']
+ const createPinia: typeof import('pinia')['createPinia']
+ const customRef: typeof import('vue')['customRef']
+ const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
+ const defineComponent: typeof import('vue')['defineComponent']
const defineStore: typeof import('pinia')['defineStore']
const disabledLanguagePattern: typeof import('./src/utils/routes')['disabledLanguagePattern']
- const distance: typeof import('./src/utils/helpers')['distance']
+ const effectScope: typeof import('vue')['effectScope']
const eventName: typeof import('./src/utils/helpers')['eventName']
const genAppMetaInfo: typeof import('./src/utils/metadata')['genAppMetaInfo']
const genMetaInfo: typeof import('./src/utils/metadata')['genMetaInfo']
const generatedRoutes: typeof import('./src/utils/routes')['generatedRoutes']
+ const getActivePinia: typeof import('pinia')['getActivePinia']
const getBranch: typeof import('./src/utils/helpers')['getBranch']
+ const getCurrentInstance: typeof import('vue')['getCurrentInstance']
+ const getCurrentScope: typeof import('vue')['getCurrentScope']
+ const getDistance: typeof import('./src/utils/helpers')['getDistance']
const getMatchMedia: typeof import('./src/utils/helpers')['getMatchMedia']
const gtagClick: typeof import('./src/utils/analytics')['gtagClick']
const h: typeof import('vue')['h']
+ const inject: typeof import('vue')['inject']
const insertLinks: typeof import('./src/utils/api')['insertLinks']
const isOn: typeof import('./src/utils/helpers')['isOn']
+ const isProxy: typeof import('vue')['isProxy']
+ const isReactive: typeof import('vue')['isReactive']
+ const isReadonly: typeof import('vue')['isReadonly']
+ const isRef: typeof import('vue')['isRef']
const kebabCase: typeof import('lodash-es')['kebabCase']
const languagePattern: typeof import('./src/utils/routes')['languagePattern']
const leadingSlash: typeof import('./src/utils/routes')['leadingSlash']
+ const mapActions: typeof import('pinia')['mapActions']
+ const mapGetters: typeof import('pinia')['mapGetters']
+ const mapState: typeof import('pinia')['mapState']
+ const mapStores: typeof import('pinia')['mapStores']
+ const mapWritableState: typeof import('pinia')['mapWritableState']
+ const markRaw: typeof import('vue')['markRaw']
const markdownItRules: typeof import('./src/utils/markdown-it-rules')['default']
const mergeProps: typeof import('vue')['mergeProps']
const nextTick: typeof import('vue')['nextTick']
+ const onActivated: typeof import('vue')['onActivated']
const onBeforeMount: typeof import('vue')['onBeforeMount']
const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
const onBeforeUnMount: typeof import('vue')['onBeforeUnMount']
const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
+ const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
+ const onDeactivated: typeof import('vue')['onDeactivated']
+ const onErrorCaptured: typeof import('vue')['onErrorCaptured']
const onMounted: typeof import('vue')['onMounted']
+ const onRenderTracked: typeof import('vue')['onRenderTracked']
+ const onRenderTriggered: typeof import('vue')['onRenderTriggered']
const onScopeDispose: typeof import('vue')['onScopeDispose']
const onServerPrefetch: typeof import('vue')['onServerPrefetch']
+ const onUnmounted: typeof import('vue')['onUnmounted']
+ const onUpdated: typeof import('vue')['onUpdated']
const preferredLocale: typeof import('./src/utils/routes')['preferredLocale']
const propsToString: typeof import('./src/utils/helpers')['propsToString']
+ const provide: typeof import('vue')['provide']
+ const reactive: typeof import('vue')['reactive']
+ const readonly: typeof import('vue')['readonly']
const redirectRoutes: typeof import('./src/utils/routes')['redirectRoutes']
const ref: typeof import('vue')['ref']
+ const resolveComponent: typeof import('vue')['resolveComponent']
const rpath: typeof import('./src/utils/routes')['rpath']
+ const setActivePinia: typeof import('pinia')['setActivePinia']
+ const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']
+ const shallowReactive: typeof import('vue')['shallowReactive']
+ const shallowReadonly: typeof import('vue')['shallowReadonly']
const shallowRef: typeof import('vue')['shallowRef']
const storeToRefs: typeof import('pinia')['storeToRefs']
const stripLinks: typeof import('./src/utils/api')['stripLinks']
+ const toRaw: typeof import('vue')['toRaw']
+ const toRef: typeof import('vue')['toRef']
+ const toRefs: typeof import('vue')['toRefs']
+ const toValue: typeof import('vue')['toValue']
const trailingSlash: typeof import('./src/utils/routes')['trailingSlash']
+ const triggerRef: typeof import('vue')['triggerRef']
+ const unref: typeof import('vue')['unref']
const upperFirst: typeof import('lodash-es')['upperFirst']
const useAd: typeof import('./src/composables/ad')['useAd']
const useAdsStore: typeof import('./src/stores/ads')['useAdsStore']
@@ -63,13 +107,17 @@ declare global {
const useAuthStore: typeof import('@vuetify/one')['useAuthStore']
const useCommitsStore: typeof import('./src/stores/commits')['useCommitsStore']
const useCosmic: typeof import('./src/composables/cosmic')['useCosmic']
+ const useCssModule: typeof import('vue')['useCssModule']
+ const useCssVars: typeof import('vue')['useCssVars']
const useDate: typeof import('vuetify')['useDate']
const useDisplay: typeof import('vuetify')['useDisplay']
+ const useFrontmatter: typeof import('./src/composables/frontmatter')['useFrontmatter']
const useGoTo: typeof import('vuetify')['useGoTo']
const useGtag: typeof import('vue-gtag-next')['useGtag']
const useHttpStore: typeof import('@vuetify/one')['useHttpStore']
const useI18n: typeof import('vue-i18n')['useI18n']
const useJobsStore: typeof import('./src/stores/jobs')['useJobsStore']
+ const useLink: typeof import('vue-router')['useLink']
const useLocaleStore: typeof import('./src/stores/locale')['useLocaleStore']
const useMadeWithVuetifyStore: typeof import('./src/stores/made-with-vuetify')['useMadeWithVuetifyStore']
const useOneStore: typeof import('@vuetify/one')['useOneStore']
@@ -84,6 +132,7 @@ declare global {
const useRtl: typeof import('vuetify')['useRtl']
const useSettingsStore: typeof import('@vuetify/one')['useSettingsStore']
const useShopifyStore: typeof import('./src/stores/shopify')['useShopifyStore']
+ const useSlots: typeof import('vue')['useSlots']
const useSponsorsStore: typeof import('./src/stores/sponsors')['useSponsorsStore']
const useSpotStore: typeof import('./src/stores/spot')['useSpotStore']
const useTeamStore: typeof import('./src/stores/team')['useTeamStore']
@@ -93,17 +142,27 @@ declare global {
const waitForReadystate: typeof import('./src/utils/helpers')['waitForReadystate']
const watch: typeof import('vue')['watch']
const watchEffect: typeof import('vue')['watchEffect']
+ const watchPostEffect: typeof import('vue')['watchPostEffect']
+ const watchSyncEffect: typeof import('vue')['watchSyncEffect']
const wrapInArray: typeof import('./src/utils/helpers')['wrapInArray']
}
+// for type re-export
+declare global {
+ // @ts-ignore
+ export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+ import('vue')
+}
// for vue template auto import
import { UnwrapRef } from 'vue'
declare module 'vue' {
interface GlobalComponents {}
interface ComponentCustomProperties {
+ readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly IN_BROWSER: UnwrapRef<typeof import('./src/utils/globals')['IN_BROWSER']>
readonly IS_DEBUG: UnwrapRef<typeof import('./src/utils/globals')['IS_DEBUG']>
readonly IS_PROD: UnwrapRef<typeof import('./src/utils/globals')['IS_PROD']>
readonly IS_SERVER: UnwrapRef<typeof import('./src/utils/globals')['IS_SERVER']>
+ readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
readonly anyLanguagePattern: UnwrapRef<typeof import('./src/utils/routes')['anyLanguagePattern']>
readonly camelCase: UnwrapRef<typeof import('lodash-es')['camelCase']>
readonly camelize: UnwrapRef<typeof import('vue')['camelize']>
@@ -111,42 +170,84 @@ declare module 'vue' {
readonly configureMarkdown: UnwrapRef<typeof import('./src/utils/markdown-it')['configureMarkdown']>
readonly copyElementContent: UnwrapRef<typeof import('./src/utils/helpers')['copyElementContent']>
readonly createAdProps: UnwrapRef<typeof import('./src/composables/ad')['createAdProps']>
+ readonly createApp: UnwrapRef<typeof import('vue')['createApp']>
readonly createOne: UnwrapRef<typeof import('@vuetify/one')['createOne']>
+ readonly createPinia: UnwrapRef<typeof import('pinia')['createPinia']>
+ readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
+ readonly defineAsyncComponent: UnwrapRef<typeof import('vue')['defineAsyncComponent']>
+ readonly defineComponent: UnwrapRef<typeof import('vue')['defineComponent']>
readonly defineStore: UnwrapRef<typeof import('pinia')['defineStore']>
readonly disabledLanguagePattern: UnwrapRef<typeof import('./src/utils/routes')['disabledLanguagePattern']>
- readonly distance: UnwrapRef<typeof import('./src/utils/helpers')['distance']>
+ readonly effectScope: UnwrapRef<typeof import('vue')['effectScope']>
readonly eventName: UnwrapRef<typeof import('./src/utils/helpers')['eventName']>
readonly genAppMetaInfo: UnwrapRef<typeof import('./src/utils/metadata')['genAppMetaInfo']>
readonly genMetaInfo: UnwrapRef<typeof import('./src/utils/metadata')['genMetaInfo']>
readonly generatedRoutes: UnwrapRef<typeof import('./src/utils/routes')['generatedRoutes']>
+ readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
readonly getBranch: UnwrapRef<typeof import('./src/utils/helpers')['getBranch']>
+ readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
+ readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+ readonly getDistance: UnwrapRef<typeof import('./src/utils/helpers')['getDistance']>
readonly getMatchMedia: UnwrapRef<typeof import('./src/utils/helpers')['getMatchMedia']>
readonly gtagClick: UnwrapRef<typeof import('./src/utils/analytics')['gtagClick']>
readonly h: UnwrapRef<typeof import('vue')['h']>
+ readonly inject: UnwrapRef<typeof import('vue')['inject']>
readonly insertLinks: UnwrapRef<typeof import('./src/utils/api')['insertLinks']>
readonly isOn: UnwrapRef<typeof import('./src/utils/helpers')['isOn']>
+ readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>
+ readonly isReactive: UnwrapRef<typeof import('vue')['isReactive']>
+ readonly isReadonly: UnwrapRef<typeof import('vue')['isReadonly']>
+ readonly isRef: UnwrapRef<typeof import('vue')['isRef']>
readonly kebabCase: UnwrapRef<typeof import('lodash-es')['kebabCase']>
readonly languagePattern: UnwrapRef<typeof import('./src/utils/routes')['languagePattern']>
readonly leadingSlash: UnwrapRef<typeof import('./src/utils/routes')['leadingSlash']>
+ readonly mapActions: UnwrapRef<typeof import('pinia')['mapActions']>
+ readonly mapGetters: UnwrapRef<typeof import('pinia')['mapGetters']>
+ readonly mapState: UnwrapRef<typeof import('pinia')['mapState']>
+ readonly mapStores: UnwrapRef<typeof import('pinia')['mapStores']>
+ readonly mapWritableState: UnwrapRef<typeof import('pinia')['mapWritableState']>
+ readonly markRaw: UnwrapRef<typeof import('vue')['markRaw']>
readonly markdownItRules: UnwrapRef<typeof import('./src/utils/markdown-it-rules')['default']>
readonly mergeProps: UnwrapRef<typeof import('vue')['mergeProps']>
readonly nextTick: UnwrapRef<typeof import('vue')['nextTick']>
+ readonly onActivated: UnwrapRef<typeof import('vue')['onActivated']>
readonly onBeforeMount: UnwrapRef<typeof import('vue')['onBeforeMount']>
readonly onBeforeRouteLeave: UnwrapRef<typeof import('vue-router')['onBeforeRouteLeave']>
readonly onBeforeRouteUpdate: UnwrapRef<typeof import('vue-router')['onBeforeRouteUpdate']>
readonly onBeforeUnmount: UnwrapRef<typeof import('vue')['onBeforeUnmount']>
+ readonly onBeforeUpdate: UnwrapRef<typeof import('vue')['onBeforeUpdate']>
+ readonly onDeactivated: UnwrapRef<typeof import('vue')['onDeactivated']>
+ readonly onErrorCaptured: UnwrapRef<typeof import('vue')['onErrorCaptured']>
readonly onMounted: UnwrapRef<typeof import('vue')['onMounted']>
+ readonly onRenderTracked: UnwrapRef<typeof import('vue')['onRenderTracked']>
+ readonly onRenderTriggered: UnwrapRef<typeof import('vue')['onRenderTriggered']>
readonly onScopeDispose: UnwrapRef<typeof import('vue')['onScopeDispose']>
readonly onServerPrefetch: UnwrapRef<typeof import('vue')['onServerPrefetch']>
+ readonly onUnmounted: UnwrapRef<typeof import('vue')['onUnmounted']>
+ readonly onUpdated: UnwrapRef<typeof import('vue')['onUpdated']>
readonly preferredLocale: UnwrapRef<typeof import('./src/utils/routes')['preferredLocale']>
readonly propsToString: UnwrapRef<typeof import('./src/utils/helpers')['propsToString']>
+ readonly provide: UnwrapRef<typeof import('vue')['provide']>
+ readonly reactive: UnwrapRef<typeof import('vue')['reactive']>
+ readonly readonly: UnwrapRef<typeof import('vue')['readonly']>
readonly redirectRoutes: UnwrapRef<typeof import('./src/utils/routes')['redirectRoutes']>
readonly ref: UnwrapRef<typeof import('vue')['ref']>
+ readonly resolveComponent: UnwrapRef<typeof import('vue')['resolveComponent']>
readonly rpath: UnwrapRef<typeof import('./src/utils/routes')['rpath']>
+ readonly setActivePinia: UnwrapRef<typeof import('pinia')['setActivePinia']>
+ readonly setMapStoreSuffix: UnwrapRef<typeof import('pinia')['setMapStoreSuffix']>
+ readonly shallowReactive: UnwrapRef<typeof import('vue')['shallowReactive']>
+ readonly shallowReadonly: UnwrapRef<typeof import('vue')['shallowReadonly']>
readonly shallowRef: UnwrapRef<typeof import('vue')['shallowRef']>
readonly storeToRefs: UnwrapRef<typeof import('pinia')['storeToRefs']>
readonly stripLinks: UnwrapRef<typeof import('./src/utils/api')['stripLinks']>
+ readonly toRaw: UnwrapRef<typeof import('vue')['toRaw']>
+ readonly toRef: UnwrapRef<typeof import('vue')['toRef']>
+ readonly toRefs: UnwrapRef<typeof import('vue')['toRefs']>
+ readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
readonly trailingSlash: UnwrapRef<typeof import('./src/utils/routes')['trailingSlash']>
+ readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
+ readonly unref: UnwrapRef<typeof import('vue')['unref']>
readonly upperFirst: UnwrapRef<typeof import('lodash-es')['upperFirst']>
readonly useAd: UnwrapRef<typeof import('./src/composables/ad')['useAd']>
readonly useAdsStore: UnwrapRef<typeof import('./src/stores/ads')['useAdsStore']>
@@ -155,13 +256,17 @@ declare module 'vue' {
readonly useAuthStore: UnwrapRef<typeof import('@vuetify/one')['useAuthStore']>
readonly useCommitsStore: UnwrapRef<typeof import('./src/stores/commits')['useCommitsStore']>
readonly useCosmic: UnwrapRef<typeof import('./src/composables/cosmic')['useCosmic']>
+ readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
+ readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
readonly useDate: UnwrapRef<typeof import('vuetify')['useDate']>
readonly useDisplay: UnwrapRef<typeof import('vuetify')['useDisplay']>
+ readonly useFrontmatter: UnwrapRef<typeof import('./src/composables/frontmatter')['useFrontmatter']>
readonly useGoTo: UnwrapRef<typeof import('vuetify')['useGoTo']>
readonly useGtag: UnwrapRef<typeof import('vue-gtag-next')['useGtag']>
readonly useHttpStore: UnwrapRef<typeof import('@vuetify/one')['useHttpStore']>
readonly useI18n: UnwrapRef<typeof import('vue-i18n')['useI18n']>
readonly useJobsStore: UnwrapRef<typeof import('./src/stores/jobs')['useJobsStore']>
+ readonly useLink: UnwrapRef<typeof import('vue-router')['useLink']>
readonly useLocaleStore: UnwrapRef<typeof import('./src/stores/locale')['useLocaleStore']>
readonly useMadeWithVuetifyStore: UnwrapRef<typeof import('./src/stores/made-with-vuetify')['useMadeWithVuetifyStore']>
readonly useOneStore: UnwrapRef<typeof import('@vuetify/one')['useOneStore']>
@@ -176,6 +281,7 @@ declare module 'vue' {
readonly useRtl: UnwrapRef<typeof import('vuetify')['useRtl']>
readonly useSettingsStore: UnwrapRef<typeof import('@vuetify/one')['useSettingsStore']>
readonly useShopifyStore: UnwrapRef<typeof import('./src/stores/shopify')['useShopifyStore']>
+ readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
readonly useSponsorsStore: UnwrapRef<typeof import('./src/stores/sponsors')['useSponsorsStore']>
readonly useSpotStore: UnwrapRef<typeof import('./src/stores/spot')['useSpotStore']>
readonly useTeamStore: UnwrapRef<typeof import('./src/stores/team')['useTeamStore']>
@@ -185,16 +291,20 @@ declare module 'vue' {
readonly waitForReadystate: UnwrapRef<typeof import('./src/utils/helpers')['waitForReadystate']>
readonly watch: UnwrapRef<typeof import('vue')['watch']>
readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
+ readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
+ readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
readonly wrapInArray: UnwrapRef<typeof import('./src/utils/helpers')['wrapInArray']>
}
}
declare module '@vue/runtime-core' {
interface GlobalComponents {}
interface ComponentCustomProperties {
+ readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly IN_BROWSER: UnwrapRef<typeof import('./src/utils/globals')['IN_BROWSER']>
readonly IS_DEBUG: UnwrapRef<typeof import('./src/utils/globals')['IS_DEBUG']>
readonly IS_PROD: UnwrapRef<typeof import('./src/utils/globals')['IS_PROD']>
readonly IS_SERVER: UnwrapRef<typeof import('./src/utils/globals')['IS_SERVER']>
+ readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
readonly anyLanguagePattern: UnwrapRef<typeof import('./src/utils/routes')['anyLanguagePattern']>
readonly camelCase: UnwrapRef<typeof import('lodash-es')['camelCase']>
readonly camelize: UnwrapRef<typeof import('vue')['camelize']>
@@ -202,42 +312,84 @@ declare module '@vue/runtime-core' {
readonly configureMarkdown: UnwrapRef<typeof import('./src/utils/markdown-it')['configureMarkdown']>
readonly copyElementContent: UnwrapRef<typeof import('./src/utils/helpers')['copyElementContent']>
readonly createAdProps: UnwrapRef<typeof import('./src/composables/ad')['createAdProps']>
+ readonly createApp: UnwrapRef<typeof import('vue')['createApp']>
readonly createOne: UnwrapRef<typeof import('@vuetify/one')['createOne']>
+ readonly createPinia: UnwrapRef<typeof import('pinia')['createPinia']>
+ readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
+ readonly defineAsyncComponent: UnwrapRef<typeof import('vue')['defineAsyncComponent']>
+ readonly defineComponent: UnwrapRef<typeof import('vue')['defineComponent']>
readonly defineStore: UnwrapRef<typeof import('pinia')['defineStore']>
readonly disabledLanguagePattern: UnwrapRef<typeof import('./src/utils/routes')['disabledLanguagePattern']>
- readonly distance: UnwrapRef<typeof import('./src/utils/helpers')['distance']>
+ readonly effectScope: UnwrapRef<typeof import('vue')['effectScope']>
readonly eventName: UnwrapRef<typeof import('./src/utils/helpers')['eventName']>
readonly genAppMetaInfo: UnwrapRef<typeof import('./src/utils/metadata')['genAppMetaInfo']>
readonly genMetaInfo: UnwrapRef<typeof import('./src/utils/metadata')['genMetaInfo']>
readonly generatedRoutes: UnwrapRef<typeof import('./src/utils/routes')['generatedRoutes']>
+ readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
readonly getBranch: UnwrapRef<typeof import('./src/utils/helpers')['getBranch']>
+ readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
+ readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+ readonly getDistance: UnwrapRef<typeof import('./src/utils/helpers')['getDistance']>
readonly getMatchMedia: UnwrapRef<typeof import('./src/utils/helpers')['getMatchMedia']>
readonly gtagClick: UnwrapRef<typeof import('./src/utils/analytics')['gtagClick']>
readonly h: UnwrapRef<typeof import('vue')['h']>
+ readonly inject: UnwrapRef<typeof import('vue')['inject']>
readonly insertLinks: UnwrapRef<typeof import('./src/utils/api')['insertLinks']>
readonly isOn: UnwrapRef<typeof import('./src/utils/helpers')['isOn']>
+ readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>
+ readonly isReactive: UnwrapRef<typeof import('vue')['isReactive']>
+ readonly isReadonly: UnwrapRef<typeof import('vue')['isReadonly']>
+ readonly isRef: UnwrapRef<typeof import('vue')['isRef']>
readonly kebabCase: UnwrapRef<typeof import('lodash-es')['kebabCase']>
readonly languagePattern: UnwrapRef<typeof import('./src/utils/routes')['languagePattern']>
readonly leadingSlash: UnwrapRef<typeof import('./src/utils/routes')['leadingSlash']>
+ readonly mapActions: UnwrapRef<typeof import('pinia')['mapActions']>
+ readonly mapGetters: UnwrapRef<typeof import('pinia')['mapGetters']>
+ readonly mapState: UnwrapRef<typeof import('pinia')['mapState']>
+ readonly mapStores: UnwrapRef<typeof import('pinia')['mapStores']>
+ readonly mapWritableState: UnwrapRef<typeof import('pinia')['mapWritableState']>
+ readonly markRaw: UnwrapRef<typeof import('vue')['markRaw']>
readonly markdownItRules: UnwrapRef<typeof import('./src/utils/markdown-it-rules')['default']>
readonly mergeProps: UnwrapRef<typeof import('vue')['mergeProps']>
readonly nextTick: UnwrapRef<typeof import('vue')['nextTick']>
+ readonly onActivated: UnwrapRef<typeof import('vue')['onActivated']>
readonly onBeforeMount: UnwrapRef<typeof import('vue')['onBeforeMount']>
readonly onBeforeRouteLeave: UnwrapRef<typeof import('vue-router')['onBeforeRouteLeave']>
readonly onBeforeRouteUpdate: UnwrapRef<typeof import('vue-router')['onBeforeRouteUpdate']>
readonly onBeforeUnmount: UnwrapRef<typeof import('vue')['onBeforeUnmount']>
+ readonly onBeforeUpdate: UnwrapRef<typeof import('vue')['onBeforeUpdate']>
+ readonly onDeactivated: UnwrapRef<typeof import('vue')['onDeactivated']>
+ readonly onErrorCaptured: UnwrapRef<typeof import('vue')['onErrorCaptured']>
readonly onMounted: UnwrapRef<typeof import('vue')['onMounted']>
+ readonly onRenderTracked: UnwrapRef<typeof import('vue')['onRenderTracked']>
+ readonly onRenderTriggered: UnwrapRef<typeof import('vue')['onRenderTriggered']>
readonly onScopeDispose: UnwrapRef<typeof import('vue')['onScopeDispose']>
readonly onServerPrefetch: UnwrapRef<typeof import('vue')['onServerPrefetch']>
+ readonly onUnmounted: UnwrapRef<typeof import('vue')['onUnmounted']>
+ readonly onUpdated: UnwrapRef<typeof import('vue')['onUpdated']>
readonly preferredLocale: UnwrapRef<typeof import('./src/utils/routes')['preferredLocale']>
readonly propsToString: UnwrapRef<typeof import('./src/utils/helpers')['propsToString']>
+ readonly provide: UnwrapRef<typeof import('vue')['provide']>
+ readonly reactive: UnwrapRef<typeof import('vue')['reactive']>
+ readonly readonly: UnwrapRef<typeof import('vue')['readonly']>
readonly redirectRoutes: UnwrapRef<typeof import('./src/utils/routes')['redirectRoutes']>
readonly ref: UnwrapRef<typeof import('vue')['ref']>
+ readonly resolveComponent: UnwrapRef<typeof import('vue')['resolveComponent']>
readonly rpath: UnwrapRef<typeof import('./src/utils/routes')['rpath']>
+ readonly setActivePinia: UnwrapRef<typeof import('pinia')['setActivePinia']>
+ readonly setMapStoreSuffix: UnwrapRef<typeof import('pinia')['setMapStoreSuffix']>
+ readonly shallowReactive: UnwrapRef<typeof import('vue')['shallowReactive']>
+ readonly shallowReadonly: UnwrapRef<typeof import('vue')['shallowReadonly']>
readonly shallowRef: UnwrapRef<typeof import('vue')['shallowRef']>
readonly storeToRefs: UnwrapRef<typeof import('pinia')['storeToRefs']>
readonly stripLinks: UnwrapRef<typeof import('./src/utils/api')['stripLinks']>
+ readonly toRaw: UnwrapRef<typeof import('vue')['toRaw']>
+ readonly toRef: UnwrapRef<typeof import('vue')['toRef']>
+ readonly toRefs: UnwrapRef<typeof import('vue')['toRefs']>
+ readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
readonly trailingSlash: UnwrapRef<typeof import('./src/utils/routes')['trailingSlash']>
+ readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
+ readonly unref: UnwrapRef<typeof import('vue')['unref']>
readonly upperFirst: UnwrapRef<typeof import('lodash-es')['upperFirst']>
readonly useAd: UnwrapRef<typeof import('./src/composables/ad')['useAd']>
readonly useAdsStore: UnwrapRef<typeof import('./src/stores/ads')['useAdsStore']>
@@ -246,13 +398,17 @@ declare module '@vue/runtime-core' {
readonly useAuthStore: UnwrapRef<typeof import('@vuetify/one')['useAuthStore']>
readonly useCommitsStore: UnwrapRef<typeof import('./src/stores/commits')['useCommitsStore']>
readonly useCosmic: UnwrapRef<typeof import('./src/composables/cosmic')['useCosmic']>
+ readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
+ readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
readonly useDate: UnwrapRef<typeof import('vuetify')['useDate']>
readonly useDisplay: UnwrapRef<typeof import('vuetify')['useDisplay']>
+ readonly useFrontmatter: UnwrapRef<typeof import('./src/composables/frontmatter')['useFrontmatter']>
readonly useGoTo: UnwrapRef<typeof import('vuetify')['useGoTo']>
readonly useGtag: UnwrapRef<typeof import('vue-gtag-next')['useGtag']>
readonly useHttpStore: UnwrapRef<typeof import('@vuetify/one')['useHttpStore']>
readonly useI18n: UnwrapRef<typeof import('vue-i18n')['useI18n']>
readonly useJobsStore: UnwrapRef<typeof import('./src/stores/jobs')['useJobsStore']>
+ readonly useLink: UnwrapRef<typeof import('vue-router')['useLink']>
readonly useLocaleStore: UnwrapRef<typeof import('./src/stores/locale')['useLocaleStore']>
readonly useMadeWithVuetifyStore: UnwrapRef<typeof import('./src/stores/made-with-vuetify')['useMadeWithVuetifyStore']>
readonly useOneStore: UnwrapRef<typeof import('@vuetify/one')['useOneStore']>
@@ -267,6 +423,7 @@ declare module '@vue/runtime-core' {
readonly useRtl: UnwrapRef<typeof import('vuetify')['useRtl']>
readonly useSettingsStore: UnwrapRef<typeof import('@vuetify/one')['useSettingsStore']>
readonly useShopifyStore: UnwrapRef<typeof import('./src/stores/shopify')['useShopifyStore']>
+ readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
readonly useSponsorsStore: UnwrapRef<typeof import('./src/stores/sponsors')['useSponsorsStore']>
readonly useSpotStore: UnwrapRef<typeof import('./src/stores/spot')['useSpotStore']>
readonly useTeamStore: UnwrapRef<typeof import('./src/stores/team')['useTeamStore']>
@@ -276,6 +433,8 @@ declare module '@vue/runtime-core' {
readonly waitForReadystate: UnwrapRef<typeof import('./src/utils/helpers')['waitForReadystate']>
readonly watch: UnwrapRef<typeof import('vue')['watch']>
readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
+ readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
+ readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
readonly wrapInArray: UnwrapRef<typeof import('./src/utils/helpers')['wrapInArray']>
}
}
diff --git a/packages/docs/build/api-plugin.ts b/packages/docs/build/api-plugin.ts
index 60433356134..536ec1d50de 100644
--- a/packages/docs/build/api-plugin.ts
+++ b/packages/docs/build/api-plugin.ts
@@ -1,163 +1,28 @@
// Imports
-import fs from 'fs'
-import path, { resolve } from 'path'
-import { createRequire } from 'module'
-import { startCase } from 'lodash-es'
-import locales from '../src/i18n/locales.json'
-import pageToApi from '../src/data/page-to-api.json'
+import fs from 'node:fs/promises'
+import path from 'node:path'
import type { Plugin } from 'vite'
-import { rimraf } from 'rimraf'
-import { mkdirp } from 'mkdirp'
-const API_ROOT = resolve('../api-generator/dist/api')
-const API_PAGES_ROOT = resolve('./node_modules/.cache/api-pages')
-
-const require = createRequire(import.meta.url)
-
-const sections = ['props', 'events', 'slots', 'exposed', 'sass', 'argument', 'modifiers', 'value'] as const
-// This can't be imported from the api-generator because it mixes the type definitions up
-type Data = {
- displayName: string // user visible name used in page titles
- fileName: string // file name for translation strings and generated types
- pathName: string // kebab-case name for use in urls
-} & Record<typeof sections[number], Record<string, any>>
-
-const localeList = locales
- .filter(item => item.enabled)
- .map(item => item.alternate || item.locale)
-
-function genApiLinks (componentName: string, header: string) {
- const section = ['<promoted-entry />', '<api-search />']
- const links = (Object.keys(pageToApi) as (keyof typeof pageToApi)[])
- .filter(page => pageToApi[page].includes(componentName))
- .reduce<string[]>((acc, href) => {
- const name = href.split('/')[1]
- acc.push(`- [${startCase(name)}](/${href})`)
- return acc
- }, [])
-
- if (links.length && header) {
- section.unshift(...[links.join('\n'), `## ${header} {#links}`])
- }
-
- return `${section.join('\n\n')}\n\n`
-}
-
-function genFrontMatter (component: string) {
- const fm = [
- `title: ${component} API`,
- `description: API for the ${component} component.`,
- `keywords: ${component}, api, vuetify`,
- ]
-
- return `---\nmeta:\n${fm.map(s => ' ' + s).join('\n')}\n---`
-}
-
-function genHeader (componentName: string) {
- const header = [
- genFrontMatter(componentName),
- `# ${componentName} API`,
- '<page-features />',
- ]
-
- return `${header.join('\n\n')}\n\n`
-}
-
-const sanitize = (str: string) => str.replace(/\$/g, '')
-
-async function loadMessages (locale: string) {
- const prefix = path.resolve('./src/i18n/messages/')
- const fallback = require(path.join(prefix, 'en.json'))
-
- try {
- const messages = require(path.join(prefix, `${locale}.json`))
-
- return {
- ...fallback['api-headers'],
- ...(messages['api-headers'] || {}),
- }
- } catch (err) {
- return fallback['api-headers']
- }
-}
-
-async function createMdFile (component: Data, locale: string) {
- const messages = await loadMessages(locale)
- let str = ''
-
- str += genHeader(component.displayName)
- str += genApiLinks(component.displayName, messages.links)
-
- for (const section of sections) {
- if (Object.keys(component[section] ?? {}).length) {
- str += `## ${messages[section]} {#${section}}\n\n`
- str += `<api-section name="${component.fileName}" section="${section}" />\n\n`
- }
- }
-
- return str
-}
-
-async function writeFile (componentApi: Data, locale: string) {
- if (!componentApi?.fileName) return
-
- const folder = resolve(API_PAGES_ROOT, locale, 'api')
-
- if (!fs.existsSync(folder)) {
- fs.mkdirSync(folder, { recursive: true })
- }
-
- fs.writeFileSync(resolve(folder, `${sanitize(componentApi.pathName)}.md`), await createMdFile(componentApi, locale))
-}
-
-function getApiData () {
- const files = fs.readdirSync(API_ROOT)
- const data: Data[] = []
-
- for (const file of files) {
- const obj = JSON.parse(fs.readFileSync(resolve(API_ROOT, file), 'utf-8'))
-
- data.push(obj)
- }
-
- return data
-}
-
-async function generateFiles () {
- // const api: Record<string, any>[] = getCompleteApi(localeList)
- const api = getApiData()
-
- for (const locale of localeList) {
- // const pages = {} as Record<string, any>
-
- for (const item of api) {
- await writeFile(item, locale)
-
- // pages[`/${locale}/api/${sanitize(kebabCase(item.name))}/`] = item.name
- }
-
- // fs.writeFileSync(resolve(API_PAGES_ROOT, `${locale}/pages.json`), JSON.stringify(pages, null, 2))
- fs.writeFileSync(resolve(API_PAGES_ROOT, `${locale}.js`), `export default require.context('./${locale}/api', true, /\\.md$/)`)
- }
-
- // for (const item of api) {
- // writeData(item.name, item)
- // }
-
- // fs.writeFileSync(resolve(API_PAGES_ROOT, 'sass.json'), JSON.stringify([
- // ...api.filter(item => item && item.sass && item.sass.length > 0).map(item => item.name),
- // ]))
-}
+const API_ROOT = path.resolve('../api-generator/dist/api')
export default function Api (): Plugin {
return {
name: 'vuetify:api',
enforce: 'pre',
- async config () {
- await rimraf(API_PAGES_ROOT)
- await mkdirp(API_PAGES_ROOT)
+ resolveId (id) {
+ return id === 'virtual:api-list' ? '\0' + id : undefined
+ },
+ async load (id) {
+ if (id === '\0virtual:api-list') {
+ const files = await fs.readdir(API_ROOT)
+
+ const names = files
+ .sort((a, b) => a.localeCompare(b))
+ .map(file => `'${file.split('.')[0]}'`)
+ .join(', ')
- await generateFiles()
+ return `export default [${names}]`
+ }
},
}
}
diff --git a/packages/docs/build/frontmatterMeta.ts b/packages/docs/build/frontmatterMeta.ts
new file mode 100644
index 00000000000..8ffb802a0d3
--- /dev/null
+++ b/packages/docs/build/frontmatterMeta.ts
@@ -0,0 +1,181 @@
+import { createBuilder } from '@yankeeinlondon/builder-api'
+import type { Pipeline } from '@yankeeinlondon/builder-api'
+import type { Plugin } from 'vite'
+import Ajv from 'ajv'
+import { md } from './markdown-it'
+import fm from 'front-matter'
+import fs from 'node:fs'
+import path from 'node:path'
+
+const ajv = new Ajv()
+const validate = ajv.compile({
+ type: 'object',
+ additionalProperties: false,
+ properties: {
+ meta: {
+ type: 'object',
+ additionalProperties: false,
+ properties: {
+ nav: { type: 'string' }, // Title used in navigation links
+ title: { type: 'string' }, // SEO title
+ description: { type: 'string' }, // SEO description
+ keywords: { type: 'string' }, // SEO keywords
+ },
+ },
+ layout: { type: 'string' },
+ related: {
+ type: 'array',
+ maxItems: 3,
+ uniqueItems: true,
+ items: { type: 'string' }, // Absolute paths to related pages
+ },
+ assets: {
+ type: 'array',
+ uniqueItems: true,
+ items: { type: 'string' }, // Additional stylesheets to load
+ },
+ disabled: { type: 'boolean' }, // The page is not published
+ emphasized: { type: 'boolean' }, // The page is emphasized in the navigation
+ fluid: { type: 'boolean' }, // Hide the Toc
+ backmatter: { type: 'boolean' }, // Hide the backmatter
+ features: {
+ type: 'object',
+ additionalProperties: false,
+ properties: {
+ figma: { type: 'boolean' },
+ label: { type: 'string' },
+ report: { type: 'boolean' },
+ github: { type: 'string' },
+ spec: { type: 'string' },
+ },
+ },
+ },
+})
+
+export const frontmatterBuilder = createBuilder('frontmatterBuilder', 'metaExtracted')
+ .options<{
+ files?: Map<string, Pipeline<'metaExtracted'>>
+ awaiting?: Map<string, ((v: Pipeline<'metaExtracted'>) => void)[]>
+ pages?: ReadonlyArray<Record<'name' | 'path' | 'component', string>>
+ }>()
+ .initializer()
+ .handler(async (payload, options) => {
+ const { frontmatter, fileName } = payload
+
+ if (!options.pages) {
+ const pagesPlugin = payload.viteConfig.plugins!
+ .find(p => p && 'name' in p && p.name === 'vite-plugin-pages') as Plugin
+ options.pages = await pagesPlugin.api.getResolvedRoutes() as []
+ }
+
+ const page = options.pages.find(p => fileName.endsWith(p.component))
+
+ if (!page) throw new Error('Unable to find page')
+
+ const locale = page.path.split('/').at(0)!
+
+ options.files ??= new Map()
+ options.files.set(page.path, payload)
+
+ const { meta, ...rest } = frontmatter
+
+ if (locale !== 'en') {
+ const originalPath = page.path.replace(`/${locale}/`, '/en/')
+ let original = options.files.get(originalPath)
+ if (!original) {
+ options.awaiting ??= new Map()
+ const awaiting = options.awaiting.get(originalPath) ?? []
+ const { promise, resolve } = Promise.withResolvers<Pipeline<'metaExtracted'>>()
+ awaiting.push(resolve)
+ options.awaiting.set(originalPath, awaiting)
+ original = await promise
+ }
+ Object.assign(rest, {
+ assets: original.frontmatter.assets,
+ related: original.frontmatter.related,
+ })
+ }
+
+ if (options.awaiting?.has(page.path)) {
+ options.awaiting.get(page.path)!.forEach(fn => fn(payload))
+ }
+
+ payload.frontmatter = {
+ meta,
+ assets: rest.assets,
+ backmatter: rest.backmatter,
+ features: rest.features,
+ fluid: rest.fluid,
+ related: rest.related,
+ toc: generateToc(payload.md),
+ }
+
+ return payload
+ })
+ .meta()
+
+export function getRouteMeta (componentPath: string, locale: string) {
+ const str = fs.readFileSync(path.resolve(componentPath.slice(1)), { encoding: 'utf-8' })
+ const { attributes } = fm(str)
+
+ const valid = validate(attributes)
+ if (!valid && locale !== 'eo-UY') {
+ throw new Error(`\nInvalid frontmatter: ${componentPath}` + validate.errors!.map(error => (
+ `\n | Property ${error.instancePath} ${error.message}`
+ )).join())
+ }
+
+ const a = attributes as any
+
+ if (locale !== 'en') {
+ const original = getRouteMeta(componentPath.replace(`/${locale}/`, '/en/'), 'en')
+ a.disabled = original.disabled
+ a.emphasized = original.emphasized
+ a.layout = original.layout
+ }
+
+ return {
+ disabled: a.disabled,
+ emphasized: a.emphasized,
+ layout: a.layout,
+ ...a.meta,
+ }
+}
+
+function generateToc (content: string) {
+ const headings = []
+ const tokens = md.parse(content, {})
+ const length = tokens.length
+
+ for (let i = 0; i < length; i++) {
+ const token = tokens[i]
+
+ if (token.type === 'inline' && token.content.startsWith('<!--') && !token.content.endsWith('-->')) {
+ do {
+ i++
+ } while (i < length && !tokens[i].content.endsWith('-->'))
+ continue
+ }
+
+ if (token.type !== 'heading_open') continue
+
+ // heading level by hash length '###' === h3
+ const level = token.markup.length
+
+ if (level <= 1) continue
+
+ const next = tokens[i + 1]
+ const link = next.children?.find(child => child.type === 'link_open')
+ const text = next.children?.filter(child => !!child.content).map(child => child.content).join('')
+ const anchor = link?.attrs?.find(([attr]) => attr === 'href')
+ const [, to] = anchor ?? []
+
+ headings.push({
+ text,
+ to,
+ level,
+ })
+ }
+
+ return headings
+}
diff --git a/packages/docs/build/markdown-it.ts b/packages/docs/build/markdown-it.ts
index ddeee9b98ab..c03866abb6b 100644
--- a/packages/docs/build/markdown-it.ts
+++ b/packages/docs/build/markdown-it.ts
@@ -1,123 +1,5 @@
-import fs from 'fs'
-import path from 'path'
-import Ajv from 'ajv'
-import fm from 'front-matter'
import MarkdownIt from 'markdown-it'
import { configureMarkdown } from '../src/utils/markdown-it'
export { configureMarkdown } from '../src/utils/markdown-it'
export const md = configureMarkdown(new MarkdownIt())
-
-const generateToc = (content: string) => {
- const headings = []
- const tokens = md.parse(content, {})
- const length = tokens.length
-
- for (let i = 0; i < length; i++) {
- const token = tokens[i]
-
- if (token.type === 'inline' && token.content.startsWith('<!--') && !token.content.endsWith('-->')) {
- do {
- i++
- } while (i < length && !tokens[i].content.endsWith('-->'))
- continue
- }
-
- if (token.type !== 'heading_open') continue
-
- // heading level by hash length '###' === h3
- const level = token.markup.length
-
- if (level <= 1) continue
-
- const next = tokens[i + 1]
- const link = next.children?.find(child => child.type === 'link_open')
- const text = next.children?.filter(child => !!child.content).map(child => child.content).join('')
- const anchor = link?.attrs?.find(([attr]) => attr === 'href')
- const [, to] = anchor ?? []
-
- headings.push({
- text,
- to,
- level,
- })
- }
-
- return headings
-}
-
-const ajv = new Ajv()
-const validate = ajv.compile({
- type: 'object',
- additionalProperties: false,
- properties: {
- meta: {
- type: 'object',
- additionalProperties: false,
- properties: {
- nav: { type: 'string' }, // Title used in navigation links
- title: { type: 'string' }, // SEO title
- description: { type: 'string' }, // SEO description
- keywords: { type: 'string' }, // SEO keywords
- },
- },
- layout: { type: 'string' },
- related: {
- type: 'array',
- maxItems: 3,
- uniqueItems: true,
- items: { type: 'string' }, // Absolute paths to related pages
- },
- assets: {
- type: 'array',
- uniqueItems: true,
- items: { type: 'string' }, // Additional stylesheets to load
- },
- disabled: { type: 'boolean' }, // The page is not published
- emphasized: { type: 'boolean' }, // The page is emphasized in the navigation
- fluid: { type: 'boolean' }, // Hide the Toc
- backmatter: { type: 'boolean' }, // Hide the backmatter
- features: {
- type: 'object',
- additionalProperties: false,
- properties: {
- figma: { type: 'boolean' },
- label: { type: 'string' },
- report: { type: 'boolean' },
- github: { type: 'string' },
- spec: { type: 'string' },
- },
- },
- },
-})
-
-export function parseMeta (componentPath: string, locale: string) {
- const str = fs.readFileSync(path.resolve(componentPath.slice(1)), { encoding: 'utf-8' })
- const { attributes, body } = fm(str)
-
- const valid = validate(attributes)
- if (!valid && locale !== 'eo-UY') {
- throw new Error(`\nInvalid frontmatter: ${componentPath}` + validate.errors!.map(error => (
- `\n | Property ${error.instancePath} ${error.message}`
- )).join())
- }
-
- const { meta, ...rest } = attributes as any
-
- if (locale !== 'en') {
- const original = parseMeta(componentPath.replace(`/${locale}/`, '/en/'), 'en')
- Object.assign(rest, {
- layout: original.layout,
- related: original.related,
- assets: original.assets,
- disabled: original.disabled,
- emphasized: original.emphasized,
- })
- }
-
- return {
- ...rest,
- ...meta,
- toc: generateToc(body),
- }
-}
diff --git a/packages/docs/build/mdi-js.ts b/packages/docs/build/mdi-js.ts
new file mode 100644
index 00000000000..0d1e5c5e770
--- /dev/null
+++ b/packages/docs/build/mdi-js.ts
@@ -0,0 +1,31 @@
+import { camelize } from 'vue'
+import type { Plugin } from 'vite'
+
+const virtual = 'virtual:mdi-js-icons'
+const resolvedVirtual = `\0${virtual}`
+
+export function MdiJs () {
+ return {
+ name: 'vuetify:mdi-js-icons',
+ enforce: 'pre',
+ resolveId (id) {
+ return id === virtual ? resolvedVirtual : undefined
+ },
+ async load (id) {
+ if (id === resolvedVirtual) {
+ const [meta, paths] = await Promise.all([
+ import('@mdi/svg/meta.json', { with: { type: 'json' } }).then(m => m.default),
+ import('@mdi/js'),
+ ])
+ const icons = meta.map(icon => ({
+ name: icon.name,
+ aliases: icon.aliases,
+ path: paths[camelize('mdi-' + icon.name) as keyof typeof paths],
+ }))
+ return `export const icons = ${JSON.stringify(icons)}`
+ }
+
+ return undefined
+ },
+ } satisfies Plugin
+}
diff --git a/packages/docs/components.d.ts b/packages/docs/components.d.ts
index a3dd894b29d..34b2633b0c7 100644
--- a/packages/docs/components.d.ts
+++ b/packages/docs/components.d.ts
@@ -1,16 +1,17 @@
/* eslint-disable */
-/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
+/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
AboutTeamMember: typeof import('./src/components/about/TeamMember.vue')['default']
AboutTeamMembers: typeof import('./src/components/about/TeamMembers.vue')['default']
Alert: typeof import('./src/components/Alert.vue')['default']
ApiApiTable: typeof import('./src/components/api/ApiTable.vue')['default']
+ ApiBacklinks: typeof import('./src/components/api/Backlinks.vue')['default']
ApiDirectiveTable: typeof import('./src/components/api/DirectiveTable.vue')['default']
ApiEventsTable: typeof import('./src/components/api/EventsTable.vue')['default']
ApiExposedTable: typeof import('./src/components/api/ExposedTable.vue')['default']
@@ -23,6 +24,7 @@ declare module 'vue' {
ApiSearch: typeof import('./src/components/api/Search.vue')['default']
ApiSection: typeof import('./src/components/api/Section.vue')['default']
ApiSlotsTable: typeof import('./src/components/api/SlotsTable.vue')['default']
+ ApiView: typeof import('./src/components/api/View.vue')['default']
AppBackToTop: typeof import('./src/components/app/BackToTop.vue')['default']
AppBarBar: typeof import('./src/components/app/bar/Bar.vue')['default']
AppBarEcosystemMenu: typeof import('./src/components/app/bar/EcosystemMenu.vue')['default']
@@ -53,10 +55,10 @@ declare module 'vue' {
AppLink: typeof import('./src/components/app/Link.vue')['default']
AppListLinkListItem: typeof import('./src/components/app/list/LinkListItem.vue')['default']
AppListList: typeof import('./src/components/app/list/List.vue')['default']
- AppMarkdown: typeof import('./src/components/app/Markdown.vue')['default']
AppMarkup: typeof import('./src/components/app/Markup.vue')['default']
AppMenuMenu: typeof import('./src/components/app/menu/Menu.vue')['default']
AppSearchSearch: typeof import('./src/components/app/search/Search.vue')['default']
+ AppSearchSearchDialog: typeof import('./src/components/app/search/SearchDialog.vue')['default']
AppSearchSearchRecent: typeof import('./src/components/app/search/SearchRecent.vue')['default']
AppSearchSearchResults: typeof import('./src/components/app/search/SearchResults.vue')['default']
AppSettingsAdvancedOptions: typeof import('./src/components/app/settings/AdvancedOptions.vue')['default']
diff --git a/packages/docs/jest.config.js b/packages/docs/jest.config.js
index 7d57ee7901a..a24743350b9 100644
--- a/packages/docs/jest.config.js
+++ b/packages/docs/jest.config.js
@@ -1,6 +1,6 @@
const os = require('os')
-const maxWorkers = Math.max(1, Math.floor(Math.min(os.cpus().length / 2, os.freemem() / 1024 / 1024 / 1024 / 2.5)))
+const maxWorkers = Math.max(1, Math.floor(Math.min(os.cpus().length / 2, os.freemem() / 1024 ** 3 / 3.1)))
module.exports = {
maxWorkers,
diff --git a/packages/docs/package.json b/packages/docs/package.json
index dc79e68a195..de38f41ec65 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -21,9 +21,10 @@
},
"dependencies": {
"@cosmicjs/sdk": "^1.0.11",
+ "@vue/compiler-dom": "^3.4.27",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
- "@vuetify/one": "^1.9.1",
+ "@vuetify/one": "^1.9.2",
"algoliasearch": "^4.23.3",
"fflate": "^0.8.2",
"isomorphic-fetch": "^3.0.0",
@@ -41,8 +42,14 @@
"vuetify": "workspace:*"
},
"devDependencies": {
+ "@babel/generator": "^7.25.0",
+ "@babel/types": "^7.25.2",
"@emailjs/browser": "^4.3.3",
"@intlify/unplugin-vue-i18n": "^4.0.0",
+ "@mdi/js": "7.4.47",
+ "@mdi/svg": "7.4.47",
+ "@octokit/openapi-types": "^22.2.0",
+ "@types/babel__generator": "^7.6.8",
"@types/lodash-es": "^4.17.12",
"@types/markdown-it": "^14.0.0",
"@types/markdown-it-container": "^2.0.10",
@@ -51,7 +58,9 @@
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.27",
"@vuetify/api-generator": "workspace:*",
+ "@yankeeinlondon/builder-api": "^1.4.1",
"ajv": "^8.12.0",
+ "algoliasearch-helper": "^3.22.3",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
"emailjs-com": "^3.2.0",
@@ -71,14 +80,14 @@
"markdownlint-cli": "^0.39.0",
"unplugin-auto-import": "0.17.5",
"unplugin-fonts": "1.0.3",
- "unplugin-vue-components": "^0.26.0",
- "vite": "^5.2.8",
+ "unplugin-vue-components": "^0.27.4",
+ "vite": "5.4.0-beta.1",
"vite-plugin-md": "^0.21.5",
"vite-plugin-pages": "^0.32.1",
"vite-plugin-pwa": "^0.17.4",
"vite-plugin-vue-layouts": "^0.11.0",
- "vite-plugin-vuetify": "^2.0.3",
- "vue-tsc": "^1.8.27"
+ "vite-plugin-vuetify": "^2.0.4",
+ "vue-tsc": "^2.0.29"
},
"publishConfig": {
"access": "public"
diff --git a/packages/docs/src/App.vue b/packages/docs/src/App.vue
index dc7b5caf2be..9412f7768b1 100644
--- a/packages/docs/src/App.vue
+++ b/packages/docs/src/App.vue
@@ -16,15 +16,16 @@
const theme = useTheme()
const { locale } = useI18n()
const auth = useAuthStore()
+ const frontmatter = useFrontmatter()
const path = computed(() => route.path.replace(`/${locale.value}/`, ''))
const meta = computed(() => {
return genAppMetaInfo({
title: `${route.meta.title}${path.value === '' ? '' : ' — Vuetify'}`,
- description: route.meta.description,
- keywords: route.meta.keywords,
- assets: route.meta.assets,
+ description: frontmatter.value?.meta.description,
+ keywords: frontmatter.value?.meta.keywords,
+ assets: frontmatter.value?.assets,
})
})
diff --git a/packages/docs/src/components/PageFeatures.vue b/packages/docs/src/components/PageFeatures.vue
index 66346b5bdc2..4a79a0064ca 100644
--- a/packages/docs/src/components/PageFeatures.vue
+++ b/packages/docs/src/components/PageFeatures.vue
@@ -12,7 +12,7 @@
</page-feature-chip>
<page-feature-chip
- v-if="route.meta?.features?.figma"
+ v-if="frontmatter?.features?.figma"
:text="t('figma-design')"
href="https://figma.vuetifyjs.com/"
prepend-icon="mdi-image"
@@ -25,7 +25,7 @@
</page-feature-chip>
<page-feature-chip
- v-if="route.meta?.features?.report"
+ v-if="frontmatter?.features?.report"
:text="t('report-a-bug')"
href="https://issues.vuetifyjs.com/"
prepend-icon="mdi-bug-outline"
@@ -51,8 +51,8 @@
</page-feature-chip>
<page-feature-chip
- v-if="route.meta?.features?.github"
- :href="`https://github.com/vuetifyjs/vuetify/tree/${branch}/packages/vuetify/src${route.meta.features.github}`"
+ v-if="frontmatter?.features?.github"
+ :href="`https://github.com/vuetifyjs/vuetify/tree/${branch}/packages/vuetify/src${frontmatter.features.github}`"
:text="t('view-in-github')"
prepend-icon="mdi-github"
rel="noopener noreferrer"
@@ -64,8 +64,8 @@
</page-feature-chip>
<page-feature-chip
- v-if="route.meta?.features?.spec"
- :href="route.meta.features.spec"
+ v-if="frontmatter?.features?.spec"
+ :href="frontmatter.features.spec"
:text="t('design-spec')"
prepend-icon="mdi-material-design"
rel="noopener noreferrer"
@@ -84,6 +84,7 @@
const route = useRoute()
const user = useUserStore()
const { t } = useI18n()
+ const frontmatter = useFrontmatter()
const branch = getBranch()
@@ -92,9 +93,9 @@
})
const label = computed(() => {
- if (!route.meta.features?.label) return false
+ if (!frontmatter.value?.features?.label) return false
- const original = encodeURIComponent(route.meta.features.label)
+ const original = encodeURIComponent(frontmatter.value.features.label)
return `https://github.com/vuetifyjs/vuetify/labels/${original}`
})
@@ -103,7 +104,7 @@
pins.toggle(!pinned.value, {
title: route.meta.title,
to: route.path,
- category: route.meta.category,
+ category: frontmatter.value?.category,
})
}
</script>
diff --git a/packages/docs/src/components/api/Backlinks.vue b/packages/docs/src/components/api/Backlinks.vue
new file mode 100644
index 00000000000..8609ca04ad8
--- /dev/null
+++ b/packages/docs/src/components/api/Backlinks.vue
@@ -0,0 +1,34 @@
+<template>
+ <div class="mb-4 d-flex flex-column">
+ <div v-for="link in links" :key="link.name">
+ <AppLink :href="link.href">{{ link.name }}</AppLink>
+ </div>
+ </div>
+</template>
+
+<script setup lang="ts">
+ import pageToApi from '@/data/page-to-api.json'
+
+ const props = defineProps({
+ name: {
+ type: String,
+ required: true,
+ },
+ })
+
+ const route = useRoute()
+ const router = useRouter()
+
+ const links = computed(() => {
+ return (Object.keys(pageToApi) as (keyof typeof pageToApi)[])
+ .filter(page => pageToApi[page].includes(props.name))
+ .map(page => {
+ const resolved = router.resolve('/' + route.meta.locale + '/' + page)
+ const name = (resolved.meta.nav ?? page.split('/').at(-1)) as string
+ return {
+ name,
+ href: resolved.href,
+ }
+ })
+ })
+</script>
diff --git a/packages/docs/src/components/api/Inline.vue b/packages/docs/src/components/api/Inline.vue
index 745aaf091ea..532a8cf466c 100644
--- a/packages/docs/src/components/api/Inline.vue
+++ b/packages/docs/src/components/api/Inline.vue
@@ -29,7 +29,6 @@
<ApiSection
:name="name"
:section="section"
- show-headline
/>
</template>
</div>
@@ -49,7 +48,7 @@
const { t, locale } = useI18n()
const user = useUserStore()
const name = ref()
- const sections = ['props', 'slots', 'events', 'functions']
+ const sections = ['props', 'slots', 'events', 'exposed'] as const
const components = computed(() => {
if (props.components) return props.components.split(/, ?/)
diff --git a/packages/docs/src/components/api/Section.vue b/packages/docs/src/components/api/Section.vue
index f586345d7ac..688da67b67e 100644
--- a/packages/docs/src/components/api/Section.vue
+++ b/packages/docs/src/components/api/Section.vue
@@ -8,7 +8,7 @@
@input="filter = $event"
/>
</div> -->
- <AppHeadline v-if="showHeadline" :path="`api-headers.${section}`" />
+ <AppHeadline :path="`api-headers.${section}`" />
<TableComponent :items="items" :name="name" />
</div>
</template>
@@ -45,7 +45,6 @@
type: String as PropType<PartKey>,
required: true,
},
- showHeadline: Boolean,
})
const store = useLocaleStore()
diff --git a/packages/docs/src/components/api/View.vue b/packages/docs/src/components/api/View.vue
new file mode 100644
index 00000000000..c71bd344f4e
--- /dev/null
+++ b/packages/docs/src/components/api/View.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+ import type { PartData } from '@vuetify/api-generator/src/types'
+
+ const emit = defineEmits(['update:name'])
+
+ const sections = ['props', 'events', 'slots', 'exposed', 'sass', 'argument', 'modifiers', 'value'] as const
+
+ const route = useRoute()
+
+ const name = computed(() => {
+ const name = route.params.name as string
+ if (name.endsWith('-directive')) return name.replace('-directive', '')
+ else if (name.startsWith('use-')) return camelCase(name)
+ else return `${name.charAt(0).toUpperCase()}${camelize(name.slice(1))}`
+ })
+ const component = shallowRef<any>({})
+ watch(name, async () => {
+ emit('update:name', name.value)
+ component.value = await getApi(name.value)
+ }, { immediate: true })
+
+ function getApi (name: string): Promise<{ default: PartData }> {
+ return import(`../../../../api-generator/dist/api/${name}.json`).then(m => m.default)
+ }
+</script>
+
+<template>
+ <template v-for="section of sections" :key="section">
+ <ApiSection
+ v-if="section in component && Object.keys(component[section]).length"
+ :name="name"
+ :section="section"
+ />
+ </template>
+</template>
diff --git a/packages/docs/src/components/app/Markdown.vue b/packages/docs/src/components/app/Markdown.vue
index 05098706840..88b551085db 100644
--- a/packages/docs/src/components/app/Markdown.vue
+++ b/packages/docs/src/components/app/Markdown.vue
@@ -7,6 +7,19 @@
<script setup>
// Utilities
import MarkdownIt from 'markdown-it'
+ import { compile } from '@vue/compiler-dom'
+ import * as vue from 'vue'
+
+ import { VWindowItem } from 'vuetify/components/VWindow'
+ import { VTab } from 'vuetify/components/VTabs'
+ import AppMarkup from '@/components/app/Markup.vue'
+ import AppFigure from '@/components/app/Figure.vue'
+ import AppDivider from '@/components/app/Divider.vue'
+ import AppHeading from '@/components/app/Heading.vue'
+ import AppLink from '@/components/app/Link.vue'
+ import AppTable from '@/components/app/Table.vue'
+ import Alert from '@/components/Alert.vue'
+ import DocTabs from '@/components/doc/Tabs.vue'
const md = configureMarkdown(MarkdownIt({
html: true,
@@ -109,5 +122,24 @@
})
const markdown = computed(() => md.render(props.content, {}))
- const template = computed(() => ({ template: markdown.value }))
+ const template = computed(() => ({
+ // These components are all used in markdown-it-rules
+ components: {
+ VWindowItem,
+ VTab,
+ AppMarkup,
+ AppFigure,
+ AppDivider,
+ AppHeading,
+ AppLink,
+ AppTable,
+ Alert,
+ DocTabs,
+ },
+ // eslint-disable-next-line no-new-func
+ render: new Function(
+ 'Vue',
+ compile(markdown.value, { hoistStatic: true }).code
+ )(vue),
+ }))
</script>
diff --git a/packages/docs/src/components/app/Toc.vue b/packages/docs/src/components/app/Toc.vue
index 5daa54a2174..b15dc95df0a 100644
--- a/packages/docs/src/components/app/Toc.vue
+++ b/packages/docs/src/components/app/Toc.vue
@@ -9,11 +9,9 @@
floating
sticky
>
- <template
- v-if="routeToc?.length"
- #prepend
- >
+ <template #prepend>
<AppHeadline
+ v-if="frontmatter?.toc?.length"
class="mt-4 mb-2 ms-4"
path="contents"
/>
@@ -21,7 +19,7 @@
<ul class="ms-5">
<router-link
- v-for="{ to, level, text } in routeToc"
+ v-for="{ to, level, text } in frontmatter?.toc"
:key="text"
v-slot="{ href }"
:to="to"
@@ -123,12 +121,6 @@
</template>
<script setup lang="ts">
- type TocItem = {
- to: string;
- text: string;
- level: number;
- }
-
const { toc: tocDrawer, scrolling } = storeToRefs(useAppStore())
const route = useRoute()
@@ -136,8 +128,7 @@
const spot = useSpotStore()
const theme = useTheme()
const user = useUserStore()
-
- const routeToc = computed(() => route.meta.toc as TocItem[] | undefined)
+ const frontmatter = useFrontmatter()
const activeStack = [] as string[]
const activeItem = ref('')
@@ -149,7 +140,7 @@
activeStack.splice(activeStack.indexOf(entry.target.id), 1)
}
})
- activeItem.value = activeStack.at(-1) || activeItem.value || routeToc.value?.[0]?.to.slice(1) || ''
+ activeItem.value = activeStack.at(-1) || activeItem.value || frontmatter.value?.toc?.[0]?.to.slice(1) || ''
}, { rootMargin: '-10% 0px -75%' })
async function observeToc () {
@@ -158,13 +149,13 @@
activeItem.value = ''
observer.disconnect()
await nextTick()
- routeToc.value?.forEach(v => {
+ frontmatter.value?.toc?.forEach(v => {
const el = document.querySelector(v.to)
el && observer.observe(el)
})
}
- watch(routeToc, observeToc)
+ watch(() => frontmatter.value?.toc, observeToc)
onMounted(() => {
observeToc()
})
@@ -180,10 +171,10 @@
scrolling.value = true
const query = route.query
- if (val === routeToc.value?.[0]?.to.slice(1) && route.hash) {
+ if (val === frontmatter.value?.toc?.[0]?.to.slice(1) && route.hash) {
router.replace({ path: route.path, query })
} else {
- const toc = routeToc.value?.find(v => v.to.slice(1) === val)
+ const toc = frontmatter.value?.toc?.find(v => v.to.slice(1) === val)
if (toc) {
await router.replace({ path: route.path, hash: toc.to, query })
}
@@ -206,8 +197,6 @@
const sponsorStore = useSponsorsStore()
- // const toc = computed(() => route.meta.toc as TocItem[])
-
const sponsors = computed(() => (
sponsorStore.sponsors
.filter(sponsor => sponsor.metadata.tier <= 1)
diff --git a/packages/docs/src/components/app/list/List.vue b/packages/docs/src/components/app/list/List.vue
index 7f4f8cf1c8e..3601092b320 100644
--- a/packages/docs/src/components/app/list/List.vue
+++ b/packages/docs/src/components/app/list/List.vue
@@ -58,8 +58,9 @@
<script setup lang="ts">
// Types
- import type { RouteLocationRaw, RouteRecordRaw } from 'vue-router'
+ import type { RouteLocationRaw } from 'vue-router'
import type { Prop } from 'vue'
+ import apiList from 'virtual:api-list'
export type Item = {
title?: string
@@ -81,15 +82,13 @@
}
function generateApiItems (locale: string) {
- return (generatedRoutes as RouteRecordRaw[])
- .filter(route => route.path.includes(`${locale}/api/`))
- .map(route => {
- return {
- title: (route.meta!.title as string).slice(0, -4),
- to: route.path,
- }
- })
- .sort((a, b) => a.title.localeCompare(b.title))
+ return apiList.map(name => {
+ const path = kebabCase(name.startsWith('v-') ? name + '-directive' : name)
+ return {
+ title: name,
+ to: `/${locale}/api/${path}`,
+ }
+ })
}
function generateListItem (item: string | Item, path = '', locale = 'en', t = (key: string) => key): any {
@@ -170,7 +169,9 @@
onClick: item?.onClick,
rel: item.href ? 'noopener noreferrer' : undefined,
target: item.href ? '_blank' : undefined,
- children: item.title === 'api' ? generateApiItems(locale.value) : generateListItems(item, item.title!, locale.value, t),
+ children: item.title === 'api'
+ ? generateApiItems(locale.value)
+ : generateListItems(item, item.title!, locale.value, t),
prependIcon: opened.value.includes(title ?? '') ? item.activeIcon : item.inactiveIcon,
value: title,
appendIcon: item.appendIcon,
diff --git a/packages/docs/src/components/app/search/Search.vue b/packages/docs/src/components/app/search/Search.vue
index 52e6f1082cb..847e9da1eb7 100644
--- a/packages/docs/src/components/app/search/Search.vue
+++ b/packages/docs/src/components/app/search/Search.vue
@@ -1,146 +1,62 @@
-<!-- eslint-disable vue/attribute-hyphenation -->
<template>
- <!-- possible bug with dialog overflow with scrollable -->
- <v-dialog
- v-model="model"
- content-class="overflow-visible align-self-start mt-16"
- max-height="900"
- width="600"
- scrollable
- @after-leave="searchString = ''"
+ <AppBtn
+ :active="model"
+ :icon="xs ? 'mdi-magnify' : undefined"
+ :loading="loading ? 'primary' : undefined"
+ :prepend-icon="smAndUp ? 'mdi-magnify' : undefined"
+ @click="shouldLoad = true"
>
- <template #activator="{ props: activatorProps }">
- <AppBtn
- :active="model"
- :icon="xs ? 'mdi-magnify' : undefined"
- :prepend-icon="smAndUp ? 'mdi-magnify' : undefined"
- v-bind="activatorProps"
+ <span :class="mdAndUp && 'me-n1'">
+ <span v-if="smAndUp">
+ {{ t('search.label') }}
+ </span>
+
+ <span
+ :class="[
+ smAndDown ? 'border-opacity-0' : 'py-1 px-2 ms-2',
+ 'border rounded text-disabled text-caption'
+ ]"
>
- <span :class="mdAndUp && 'me-n1'">
- <span v-if="smAndUp">
- {{ t('search.label') }}
- </span>
-
- <span
- :class="[
- smAndDown ? 'border-opacity-0' : 'py-1 px-2 ms-2',
- 'border rounded text-disabled text-caption'
- ]"
- >
- <span v-if="mdAndUp">
- {{ t(`search.key-hint${user.slashSearch ? '-slash' : platform.mac ? '-mac' : ''}`) }}
- </span>
- </span>
+ <span v-if="mdAndUp">
+ {{ t(`search.key-hint${user.slashSearch ? '-slash' : platform.mac ? '-mac' : ''}`) }}
</span>
- </AppBtn>
- </template>
-
- <v-card>
- <AppTextField
- v-model="searchString"
- :placeholder="`${t('search.looking') }...`"
- class="flex-grow-0 mb-4"
- variant="filled"
- autofocus
- @focus="$event.target.select()"
- >
- <template #append-inner>
- <AppBtn size="small" border>
- <span class="text-caption text-disabled">{{ t('esc') }}</span>
- </AppBtn>
- </template>
- </AppTextField>
-
- <v-card-text :class="['px-4 py-0 d-flex flex-wrap justify-center', searchString ? 'align-start' : 'align-center']">
-
- <AppSearchSearchRecent
- v-if="searches.length && !searchString"
- :searches="searches"
- @click:delete="onClickDelete"
- />
-
- <template v-else-if="!searchString">
- <div class="text-center">
- <v-icon
- class="mb-6 mx-auto text-disabled"
- icon="mdi-text-box-search-outline"
- size="150"
- />
-
- <br>
-
- <v-list-subheader class="d-inline-flex">
- {{ t('search.results') }}
- </v-list-subheader>
- </div>
- </template>
-
- <ais-instant-search
- v-else
- :search-client="searchClient"
- class="flex-grow-1"
- index-name="vuetifyjs-v3"
- @state-change="searchFunction"
- >
- <ais-configure
- :facetFilters="[`lang:${locale}`]"
- :hitsPerPage="50"
- :query="searchString"
- />
-
- <ais-hits v-slot="{ items }">
- <AppSearchSearchResults
- ref="list"
- :groups="transformItems(items)"
- @click:result="onClickResult"
- />
- </ais-hits>
- </ais-instant-search>
- </v-card-text>
-
- <v-divider class="my-4" />
-
- <AisPoweredBy class="ms-auto me-4 mb-2" />
- </v-card>
- </v-dialog>
+ </span>
+ </span>
+
+ <SearchDialog
+ v-if="shouldLoad"
+ v-model="model"
+ v-model:search="searchString"
+ @vue:mounted="onMount"
+ />
+ </AppBtn>
</template>
<script setup lang="ts">
- // Types
- import SearchResults from '@/components/app/drawer/SearchResults.vue'
-
- // Utilities
- import { AisConfigure, AisHits, AisInstantSearch, AisPoweredBy } from 'vue-instantsearch/vue3/es/src/instantsearch.js'
- import algoliasearch from 'algoliasearch'
+ import { defineAsyncComponent } from 'vue'
- // Types
- import type { AlgoliaSearchHelper } from 'algoliasearch-helper'
+ const SearchDialog = defineAsyncComponent(() => import('@/components/app/search/SearchDialog.vue'))
const { t } = useI18n()
const { smAndUp, smAndDown, mdAndUp, xs, platform } = useDisplay()
const { query } = useRoute()
const user = useUserStore()
- const list = ref<InstanceType<typeof SearchResults>>()
- const model = ref(false)
- const searchString = ref('')
- const searchClient = algoliasearch(
- 'NHT6C0IV19', // docsearch app ID
- 'ffa344297924c76b0f4155384aff7ef2' // vuetify API key
- )
- const searches = ref(JSON.parse(localStorage.getItem('searches') || '[]'))
+ const shouldLoad = shallowRef(false)
+ const loading = shallowRef(false)
+ const model = shallowRef(false)
+ const searchString = shallowRef('')
- const locale = 'en'
-
- watch(searches, val => {
- localStorage.setItem('searches', JSON.stringify(val))
+ watch(shouldLoad, () => {
+ loading.value = true
+ model.value = true
})
onMounted(() => {
document.addEventListener('keydown', onDocumentKeydown)
if (query?.search) {
searchString.value = query.search as string
- model.value = true
+ shouldLoad.value = true
}
})
onBeforeUnmount(() => {
@@ -150,50 +66,6 @@
model.value = false
})
- function searchFunction (helper: AlgoliaSearchHelper) {
- if (helper.state.query) helper.search()
- }
- function transformItems (items: any[]) {
- // const sorted = sortItems([...items], ['hierarchy.lvl0', 'hierarchy.lvl1'], [false, false], locale)
- items = items.map(item => {
- const url = new URL(item.url)
-
- return {
- ...item,
- url: url.href.split(url.origin).pop(),
- }
- })
- const groups = groupItems(items, 'lvl0')
-
- groups.forEach(group => {
- group.items = groupItems(group.items, 'lvl1')
- })
-
- // const uiIndex = groups.findIndex(val => val.name === 'UI Components')
- // if (uiIndex > 0) {
- // groups.unshift(groups.splice(uiIndex, 1)[0])
- // }
-
- return groups
- }
- function groupItems (items: any[], attribute: string) {
- const groups: any[] = []
-
- items.forEach(item => {
- const group = groups.find(val => val.name === item.hierarchy[attribute])
-
- if (group) {
- group.items.push(item)
- } else {
- groups.push({
- name: item.hierarchy[attribute],
- items: [item],
- })
- }
- })
-
- return groups
- }
function onDocumentKeydown (e: KeyboardEvent) {
const modifierKey = platform.value.mac ? e.metaKey : e.ctrlKey
const isSearchKey = user.slashSearch ? e.key === '/' : modifierKey && e.key === 'k'
@@ -205,28 +77,10 @@
} else if (model.value && ['ArrowDown', 'ArrowUp'].includes(e.key)) {
e.preventDefault()
- list.value?.rootEl?.focus()
+ // list.value?.rootEl?.focus()
}
}
- function onClickDelete (index: number) {
- const array = searches.value.slice(0, 6)
-
- array.splice(index, 1)
-
- searches.value = array
- }
-
- function onClickResult (result: any) {
- const array = searches.value.slice(0, 6)
-
- array.unshift(result)
-
- searches.value = array
+ function onMount () {
+ loading.value = false
}
</script>
-
-<style scoped>
- :deep(.v-field--variant-solo) {
- box-shadow: none;
- }
-</style>
diff --git a/packages/docs/src/components/app/search/SearchDialog.vue b/packages/docs/src/components/app/search/SearchDialog.vue
new file mode 100644
index 00000000000..46b57f2ed2b
--- /dev/null
+++ b/packages/docs/src/components/app/search/SearchDialog.vue
@@ -0,0 +1,176 @@
+<!-- eslint-disable vue/attribute-hyphenation -->
+<template>
+ <v-dialog
+ v-model="model"
+ activator="parent"
+ content-class="overflow-visible align-self-start mt-16"
+ max-height="900"
+ width="600"
+ scrollable
+ @after-leave="searchString = ''"
+ >
+ <v-card>
+ <AppTextField
+ v-model="searchString"
+ :placeholder="`${t('search.looking') }...`"
+ class="flex-grow-0 mb-4"
+ variant="filled"
+ autofocus
+ @focus="$event.target.select()"
+ >
+ <template #append-inner>
+ <AppBtn size="small" border>
+ <span class="text-caption text-disabled">{{ t('esc') }}</span>
+ </AppBtn>
+ </template>
+ </AppTextField>
+
+ <v-card-text :class="['px-4 py-0 d-flex flex-wrap justify-center', searchString ? 'align-start' : 'align-center']">
+
+ <AppSearchSearchRecent
+ v-if="searches.length && !searchString"
+ :searches="searches"
+ @click:delete="onClickDelete"
+ />
+
+ <template v-else-if="!searchString">
+ <div class="text-center">
+ <v-icon
+ class="mb-6 mx-auto text-disabled"
+ icon="mdi-text-box-search-outline"
+ size="150"
+ />
+
+ <br>
+
+ <v-list-subheader class="d-inline-flex">
+ {{ t('search.results') }}
+ </v-list-subheader>
+ </div>
+ </template>
+
+ <ais-instant-search
+ v-else
+ :search-client="searchClient"
+ class="flex-grow-1"
+ index-name="vuetifyjs-v3"
+ @state-change="searchFunction"
+ >
+ <ais-configure
+ :facetFilters="[`lang:${locale}`]"
+ :hitsPerPage="50"
+ :query="searchString"
+ />
+
+ <ais-hits v-slot="{ items }">
+ <AppSearchSearchResults
+ ref="list"
+ :groups="transformItems(items)"
+ @click:result="onClickResult"
+ />
+ </ais-hits>
+ </ais-instant-search>
+ </v-card-text>
+
+ <v-divider class="my-4" />
+
+ <AisPoweredBy class="ms-auto me-4 mb-2" />
+ </v-card>
+ </v-dialog>
+</template>
+
+<script setup lang="ts">
+ // Types
+ import SearchResults from '@/components/app/drawer/SearchResults.vue'
+
+ // Utilities
+ import { AisConfigure, AisHits, AisInstantSearch, AisPoweredBy } from 'vue-instantsearch/vue3/es/src/instantsearch.js'
+ import algoliasearch from 'algoliasearch'
+
+ // Types
+ import type { AlgoliaSearchHelper } from 'algoliasearch-helper'
+
+ const { t } = useI18n()
+
+ const model = defineModel<boolean>()
+ const searchString = defineModel('search', { type: String, default: '' })
+
+ const list = ref<InstanceType<typeof SearchResults>>()
+ const searchClient = algoliasearch(
+ 'NHT6C0IV19', // docsearch app ID
+ 'ffa344297924c76b0f4155384aff7ef2' // vuetify API key
+ )
+ const searches = ref(JSON.parse(localStorage.getItem('searches') || '[]'))
+
+ const locale = 'en'
+
+ watch(searches, val => {
+ localStorage.setItem('searches', JSON.stringify(val))
+ })
+
+ function searchFunction (helper: AlgoliaSearchHelper) {
+ if (helper.state.query) helper.search()
+ }
+ function transformItems (items: any[]) {
+ // const sorted = sortItems([...items], ['hierarchy.lvl0', 'hierarchy.lvl1'], [false, false], locale)
+ items = items.map(item => {
+ const url = new URL(item.url)
+
+ return {
+ ...item,
+ url: url.href.split(url.origin).pop(),
+ }
+ })
+ const groups = groupItems(items, 'lvl0')
+
+ groups.forEach(group => {
+ group.items = groupItems(group.items, 'lvl1')
+ })
+
+ // const uiIndex = groups.findIndex(val => val.name === 'UI Components')
+ // if (uiIndex > 0) {
+ // groups.unshift(groups.splice(uiIndex, 1)[0])
+ // }
+
+ return groups
+ }
+ function groupItems (items: any[], attribute: string) {
+ const groups: any[] = []
+
+ items.forEach(item => {
+ const group = groups.find(val => val.name === item.hierarchy[attribute])
+
+ if (group) {
+ group.items.push(item)
+ } else {
+ groups.push({
+ name: item.hierarchy[attribute],
+ items: [item],
+ })
+ }
+ })
+
+ return groups
+ }
+ function onClickDelete (index: number) {
+ const array = searches.value.slice(0, 6)
+
+ array.splice(index, 1)
+
+ searches.value = array
+ }
+
+ function onClickResult (result: any) {
+ const array = searches.value.slice(0, 6)
+
+ array.unshift(result)
+
+ searches.value = array
+ }
+</script>
+
+<style scoped>
+ :deep(.v-field--variant-solo) {
+ box-shadow: none;
+ }
+</style>
diff --git a/packages/docs/src/components/doc/Explorer.vue b/packages/docs/src/components/doc/Explorer.vue
index 639842a329e..c13806fdee8 100644
--- a/packages/docs/src/components/doc/Explorer.vue
+++ b/packages/docs/src/components/doc/Explorer.vue
@@ -34,7 +34,6 @@
<ApiSection
:name="model"
:section="section"
- show-headline
/>
</template>
</template>
@@ -56,15 +55,14 @@
</template>
<script setup>
+ import files from 'virtual:api-list'
+
const route = useRoute()
const router = useRouter()
- const files = import.meta.glob('../../../../api-generator/dist/api/*.json')
-
const search = shallowRef()
- const components = Object.keys(files).reduce((acc, cur) => {
- const name = cur.split('/').pop().split('.')[0]
+ const components = files.reduce((acc, name) => {
let prependIcon
let subtitle
diff --git a/packages/docs/src/components/doc/IconList.vue b/packages/docs/src/components/doc/IconList.vue
index 10b1b22b1f8..7d34e649fda 100644
--- a/packages/docs/src/components/doc/IconList.vue
+++ b/packages/docs/src/components/doc/IconList.vue
@@ -1,31 +1,34 @@
<template>
<v-autocomplete
v-model="selection"
+ v-model:menu="menu"
v-model:search="search"
- :item-props="itemProps"
:items="filteredIcons"
+ :loading="loading ? 'primary' : false"
:placeholder="t('search.icons')"
item-title="name"
item-value="name"
variant="outlined"
+ clearable
no-filter
+ return-object
+ @focus.once="load"
>
<template #prepend-inner>
<v-expand-x-transition>
- <v-icon v-if="selection" start>
- {{ getIcon(selection) }}
- </v-icon>
+ <v-icon v-if="selection" :icon="'mdi-' + selection.name" start />
</v-expand-x-transition>
<code class="me-n1">mdi-</code>
</template>
<template #item="{ props, item }">
- <v-list-item v-bind="props">
+ <v-list-item v-bind="props" :prepend-icon="'svg:' + item.raw.path">
<template #append>
<v-btn
icon="mdi-content-copy"
size="small"
+ tabindex="-1"
variant="plain"
@click.stop="copy(item.raw.name)"
/>
@@ -43,47 +46,59 @@
</v-autocomplete>
</template>
-<script setup>
- // Data
- import icons from '@mdi/svg/meta.json'
- import * as paths from '@mdi/js'
+<script setup lang="ts">
+ import type { IconEntry } from 'virtual:mdi-js-icons'
const { t } = useI18n()
const copied = shallowRef(false)
- const selection = shallowRef()
+ const loading = shallowRef(false)
+ const menu = shallowRef(false)
+ const icons = shallowRef<IconEntry[]>([])
+ const selection = shallowRef<IconEntry>()
const search = shallowRef('')
+
+ async function load () {
+ const _menu = menu.value
+ loading.value = true
+ // TODO: virtual loads everything if menu is open
+ menu.value = false
+ await import('virtual:mdi-js-icons')
+ .then(m => icons.value = m.icons)
+ .catch(console.error)
+ loading.value = false
+ menu.value = _menu
+ }
+
+ function * filterIcons (s: string) {
+ for (const icon of icons.value) {
+ const distance = Math.max(
+ getDistance(s, icon.name),
+ ...icon.aliases.map(v => getDistance(search.value, v))
+ )
+ if (distance > 0.7) {
+ yield {
+ name: icon.name,
+ path: icon.path,
+ distance,
+ }
+ }
+ }
+ }
+
const filteredIcons = computed(() => {
- if (!search.value) return icons
+ const s = search.value.trim()
+ if (!s.length) return icons.value
- return icons
- .map(icon => ({
- name: icon.name,
- distance: Math.max(
- distance(search.value, icon.name),
- ...icon.aliases.map(v => distance(search.value, v))
- ),
- }))
- .filter(v => v.distance > 0.7)
- .sort((a, b) => {
- return b.distance - a.distance
- })
+ return [...filterIcons(s)].sort((a, b) => b.distance - a.distance)
})
watch(selection, value => {
- value && copy(value)
+ value && copy(value.name)
})
- function getIcon (name) {
- return 'svg:' + paths[camelize('mdi-' + name)]
- }
- function itemProps (item) {
- return {
- prependIcon: getIcon(item.name),
- }
- }
- function copy (item) {
- navigator.clipboard.writeText('mdi-' + item).then(() => {
+ function copy (name: string) {
+ navigator.clipboard.writeText('mdi-' + name).then(() => {
copied.value = true
setTimeout(() => {
copied.value = false
diff --git a/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue b/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue
index 2d5ad1563f5..6aea3508262 100644
--- a/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue
+++ b/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue
@@ -40,7 +40,7 @@
>
<AppFigure
:name="project.raw.title"
- :src="project.raw.image"
+ :src="getPreviewImage(project.raw.image)"
:title="project.raw.title"
height="230"
max-height="230"
@@ -99,4 +99,8 @@
}
return array
}
+
+ function getPreviewImage (url) {
+ return url.replace(/(.*)\/([^/]+)\.([^.]+)$/g, '$1/conversions/$2-overview.$3')
+ }
</script>
diff --git a/packages/docs/src/components/doc/RelatedPages.vue b/packages/docs/src/components/doc/RelatedPages.vue
index f48ac71df57..2e893bdb708 100644
--- a/packages/docs/src/components/doc/RelatedPages.vue
+++ b/packages/docs/src/components/doc/RelatedPages.vue
@@ -16,5 +16,6 @@
</template>
<script setup>
- const related = useRoute().meta.related
+ const frontmatter = useFrontmatter()
+ const related = computed(() => frontmatter.value?.related)
</script>
diff --git a/packages/docs/src/composables/frontmatter.ts b/packages/docs/src/composables/frontmatter.ts
new file mode 100644
index 00000000000..b9a8bd2e256
--- /dev/null
+++ b/packages/docs/src/composables/frontmatter.ts
@@ -0,0 +1,39 @@
+type Frontmatter = {
+ meta: {
+ nav?: string
+ title: string
+ description?: string
+ keywords?: string[]
+ }
+ assets?: string[]
+ backmatter?: boolean
+ features?: {
+ figma?: boolean
+ label?: string
+ report?: string
+ github?: string
+ spec?: string
+ }
+ fluid?: boolean
+ related?: string[]
+ toc?: TocItem[]
+}
+
+type TocItem = {
+ to: string
+ text: string
+ level: number
+}
+
+export function useFrontmatter () {
+ const router = useRouter()
+
+ const frontmatter = shallowRef<Frontmatter>()
+ watch(router.currentRoute, route => {
+ setTimeout(() => {
+ frontmatter.value = (route.matched.at(-1)!.instances.default as any)?.frontmatter
+ })
+ }, { immediate: true })
+
+ return readonly(frontmatter)
+}
diff --git a/packages/docs/src/examples/v-overlay/misc-advanced.vue b/packages/docs/src/examples/v-overlay/misc-advanced.vue
index 0885b31ba74..84e6901fa48 100644
--- a/packages/docs/src/examples/v-overlay/misc-advanced.vue
+++ b/packages/docs/src/examples/v-overlay/misc-advanced.vue
@@ -28,7 +28,7 @@
</v-card-title>
<v-overlay
- :model-value="isHovering"
+ :model-value="!!isHovering"
class="align-center justify-center"
scrim="#036358"
contained
diff --git a/packages/docs/src/examples/v-progress-linear/misc-buffer-color.vue b/packages/docs/src/examples/v-progress-linear/misc-buffer-color.vue
index f270e6f2cb6..cc6cf2ab40c 100644
--- a/packages/docs/src/examples/v-progress-linear/misc-buffer-color.vue
+++ b/packages/docs/src/examples/v-progress-linear/misc-buffer-color.vue
@@ -6,7 +6,7 @@
rounded="lg"
>
<v-progress-linear
- :location="false"
+ :location="null"
bg-color="#92aed9"
buffer-color="#6a3e0b"
buffer-opacity="1"
diff --git a/packages/docs/src/pages/en/api/[name].md b/packages/docs/src/pages/en/api/[name].md
new file mode 100644
index 00000000000..51b2ca50747
--- /dev/null
+++ b/packages/docs/src/pages/en/api/[name].md
@@ -0,0 +1,22 @@
+---
+meta:
+ title: API
+ description: API documentation
+ keywords: api, vuetify
+---
+
+<script setup lang="ts">
+ const name = shallowRef('')
+</script>
+
+# {{ name }} API
+
+<PageFeatures />
+
+<ApiBacklinks :name="name" />
+
+<PromotedEntry />
+
+<ApiSearch />
+
+<ApiView @update:name="name = $event" />
diff --git a/packages/docs/src/plugins/global-components.ts b/packages/docs/src/plugins/global-components.ts
index f984e7ce05d..324f260af4c 100644
--- a/packages/docs/src/plugins/global-components.ts
+++ b/packages/docs/src/plugins/global-components.ts
@@ -1,102 +1,9 @@
-// Components
-import AboutTeamMembers from '@/components/about/TeamMembers.vue'
-import Alert from '@/components/Alert.vue'
-import ApiInline from '@/components/api/Inline.vue'
-import ApiSearch from '@/components/api/Search.vue'
-import ApiSection from '@/components/api/Section.vue'
-import AppDivider from '@/components/app/Divider.vue'
-import AppHeading from '@/components/app/Heading.vue'
-import AppFigure from '@/components/app/Figure.vue'
-import AppMarkup from '@/components/app/Markup.vue'
-import AppSettingsAdvancedOptions from '@/components/app/settings/AdvancedOptions.vue'
-import AppSettingsOptions from '@/components/app/settings/Options.vue'
-import AppSettingsPerksOptions from '@/components/app/settings/PerksOptions.vue'
-import AppLink from '@/components/app/Link.vue'
-import AppTable from '@/components/app/Table.vue'
-import ComponentsListItem from '@/components/components/ListItem.vue'
-import DocExplorer from '@/components/doc/Explorer.vue'
-import DocIconList from '@/components/doc/IconList.vue'
-import DocIconTable from '@/components/doc/IconTable.vue'
-import DocTabs from '@/components/doc/Tabs.vue'
-import DocVueJobs from '@/components/doc/VueJobs.vue'
-import DocMadeWithVueAttribution from '@/components/doc/MadeWithVueAttribution.vue'
-import DocMadeWithVuetifyGallery from '@/components/doc/MadeWithVuetifyGallery.vue'
-import DocMadeWithVuetifyLink from '@/components/doc/MadeWithVuetifyLink.vue'
-import DocPremiumThemesGallery from '@/components/doc/PremiumThemesGallery.vue'
-import DocReleases from '@/components/doc/Releases.vue'
-import DocThemeVendor from '@/components/doc/ThemeVendor.vue'
-import ExamplesExample from '@/components/examples/Example.vue'
-import ExamplesUsage from '@/components/examples/Usage.vue'
-import FeaturesBreakpointsTable from '@/components/features/BreakpointsTable.vue'
-import FeaturesColorPalette from '@/components/features/ColorPalette.vue'
-import FeaturesSassApi from '@/components/features/SassApi.vue'
-import GettingStartedWireframeExamples from '@/components/getting-started/WireframeExamples.vue'
-import HomeEntry from '@/components/home/Entry.vue'
-import HomeFeatures from '@/components/home/Features.vue'
-import HomeSpecialSponsor from '@/components/home/SpecialSponsor.vue'
-import HomeSponsors from '@/components/home/Sponsors.vue'
-import IntroductionSlaDeck from '@/components/introduction/SlaDeck.vue'
-import IntroductionDiscordDeck from '@/components/introduction/DiscordDeck.vue'
-import IntroductionEnterpriseDeck from '@/components/introduction/EnterpriseDeck.vue'
-import PageFeatures from '@/components/PageFeatures.vue'
-import PromotedEntry from '@/components/promoted/Entry.vue'
-import PromotedPromoted from '@/components/promoted/Promoted.vue'
-import PromotedRandom from '@/components/promoted/Random.vue'
-import ResourcesColorPalette from '@/components/resources/ColorPalette.vue'
-import ResourcesLogos from '@/components/resources/Logos.vue'
-import SponserSponsors from '@/components/sponsor/Sponsors.vue'
+import { defineAsyncComponent } from 'vue'
// Types
import type { App } from 'vue'
export function installGlobalComponents (app: App) {
app
- // Used by markdown-it to gen api pages, and needed to be globally loaded to work
- .component('AboutTeamMembers', AboutTeamMembers)
- .component('Alert', Alert)
- .component('ApiInline', ApiInline)
- .component('ApiSearch', ApiSearch)
- .component('ApiSection', ApiSection)
- .component('AppDivider', AppDivider)
- .component('AppFigure', AppFigure)
- .component('AppHeading', AppHeading)
- .component('AppLink', AppLink)
- .component('AppMarkup', AppMarkup)
- .component('AppTable', AppTable)
- .component('AppSettingsAdvancedOptions', AppSettingsAdvancedOptions)
- .component('AppSettingsOptions', AppSettingsOptions)
- .component('AppSettingsPerksOptions', AppSettingsPerksOptions)
- .component('ComponentsListItem', ComponentsListItem)
- .component('DocExplorer', DocExplorer)
- .component('DocIconList', DocIconList)
- .component('DocIconTable', DocIconTable)
- .component('DocTabs', DocTabs)
- .component('DocVueJobs', DocVueJobs)
- .component('DocMadeWithVueAttribution', DocMadeWithVueAttribution)
- .component('DocMadeWithVuetifyGallery', DocMadeWithVuetifyGallery)
- .component('DocMadeWithVuetifyLink', DocMadeWithVuetifyLink)
- .component('DocPremiumThemesGallery', DocPremiumThemesGallery)
- .component('DocReleases', DocReleases)
- .component('DocThemeVendor', DocThemeVendor)
- .component('ExamplesExample', ExamplesExample)
- .component('ExamplesUsage', ExamplesUsage)
- .component('FeaturesBreakpointsTable', FeaturesBreakpointsTable)
- .component('FeaturesColorPalette', FeaturesColorPalette)
- .component('FeaturesSassApi', FeaturesSassApi)
- .component('GettingStartedWireframeExamples', GettingStartedWireframeExamples)
- .component('HomeEntry', HomeEntry)
- .component('HomeFeatures', HomeFeatures)
- .component('HomeSpecialSponsor', HomeSpecialSponsor)
- .component('HomeSponsors', HomeSponsors)
- .component('IntroductionSlaDeck', IntroductionSlaDeck)
- .component('IntroductionDiscordDeck', IntroductionDiscordDeck)
- .component('IntroductionEnterpriseDeck', IntroductionEnterpriseDeck)
- .component('PageFeatures', PageFeatures)
- .component('PromotedEntry', PromotedEntry)
- .component('PromotedPromoted', PromotedPromoted)
- .component('PromotedRandom', PromotedRandom)
- .component('ResourcesColorPalette', ResourcesColorPalette)
- .component('ResourcesLogos', ResourcesLogos)
- .component('SponserSponsors', SponserSponsors)
- .component('UnwrapMarkdown', (props, { slots }) => slots.default?.()?.[0].children)
+ .component('AppMarkdown', defineAsyncComponent(() => import('@/components/app/Markdown.vue')))
}
diff --git a/packages/docs/src/plugins/icons.ts b/packages/docs/src/plugins/icons.ts
index 5f50e64d639..12d28b89216 100644
--- a/packages/docs/src/plugins/icons.ts
+++ b/packages/docs/src/plugins/icons.ts
@@ -118,6 +118,7 @@ export {
mdiContentSaveCogOutline,
mdiControllerClassicOutline,
mdiCookie,
+ mdiCreationOutline,
mdiCreditCardOutline,
mdiCrosshairsGps,
mdiCrown,
@@ -127,7 +128,6 @@ export {
mdiDeleteOutline,
mdiDesktopTowerMonitor,
mdiDialpad,
- mdiDiscord,
mdiDomain,
mdiDotsHorizontal,
mdiDotsVertical,
@@ -184,8 +184,6 @@ export {
mdiFormatHeader1,
mdiFormatItalic,
mdiFormatListBulletedSquare,
- mdiFormatTextdirectionLToR,
- mdiFormatTextdirectionRToL,
mdiFormatUnderline,
mdiFormatWrapInline,
mdiForum,
@@ -399,4 +397,6 @@ export {
mdiWrench,
} from '@mdi/js'
-export const mdiCreationOutline = 'M9 4L11.5 9.5L17 12L11.5 14.5L9 20L6.5 14.5L1 12L6.5 9.5L9 4M9 8.83L8 11L5.83 12L8 13L9 15.17L10 13L12.17 12L10 11L9 8.83M19 9L17.74 6.26L15 5L17.74 3.75L19 1L20.25 3.75L23 5L20.25 6.26L19 9M19 23L17.74 20.26L15 19L17.74 17.75L19 15L20.25 17.75L23 19L20.25 20.26L19 23Z'
+export const mdiDiscord = 'M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z'
+export const mdiFormatTextdirectionLToR = 'M21,18L17,14V17H5V19H17V22M9,10V15H11V4H13V15H15V4H17V2H9A4,4 0 0,0 5,6A4,4 0 0,0 9,10Z'
+export const mdiFormatTextdirectionRToL = 'M8,17V14L4,18L8,22V19H20V17M10,10V15H12V4H14V15H16V4H18V2H10A4,4 0 0,0 6,6A4,4 0 0,0 10,10Z'
diff --git a/packages/docs/src/plugins/vuetify.ts b/packages/docs/src/plugins/vuetify.ts
index 49ca8a3f19f..dc04e625a3d 100644
--- a/packages/docs/src/plugins/vuetify.ts
+++ b/packages/docs/src/plugins/vuetify.ts
@@ -3,9 +3,10 @@ import 'vuetify/styles'
// Imports
import { createVuetify } from 'vuetify'
-import * as components from 'vuetify/components'
-import * as directives from 'vuetify/directives'
-import * as labs from 'vuetify/labs/components'
+import { VChip } from 'vuetify/components/VChip'
+import { VBtn } from 'vuetify/components/VBtn'
+import { VSwitch } from 'vuetify/components/VSwitch'
+import { VSvgIcon } from 'vuetify/components/VIcon'
// Icons
import { fa } from 'vuetify/iconsets/fa'
@@ -24,17 +25,12 @@ import type { IconProps } from 'vuetify'
export function installVuetify (app: App) {
const vuetify = createVuetify({
aliases: {
- BorderChip: components.VChip,
- NewInChip: components.VChip,
- PageFeatureChip: components.VChip,
- PrimaryBtn: components.VBtn,
- SettingsSwitch: components.VSwitch,
+ BorderChip: VChip,
+ NewInChip: VChip,
+ PageFeatureChip: VChip,
+ PrimaryBtn: VBtn,
+ SettingsSwitch: VSwitch,
},
- components: {
- ...components,
- ...labs,
- },
- directives,
defaults: {
global: {
eager: false,
@@ -109,7 +105,7 @@ export function installVuetify (app: App) {
mdi: {
component: (props: IconProps) => {
const icon = mdiSvg[camelize(props.icon as string) as keyof typeof mdiSvg]
- return h(components.VSvgIcon, { ...props, icon })
+ return h(VSvgIcon, { ...props, icon })
},
},
},
diff --git a/packages/docs/src/shims.d.ts b/packages/docs/src/shims.d.ts
index 8b24f072d17..fdfa6f3c1bc 100644
--- a/packages/docs/src/shims.d.ts
+++ b/packages/docs/src/shims.d.ts
@@ -10,17 +10,31 @@ declare module '*.vue' {
export default component
}
+declare module 'virtual:mdi-js-icons' {
+ export interface IconEntry {
+ name: string
+ aliases: string[]
+ path: string
+ }
+ export const icons: IconEntry[]
+}
+
+declare module 'virtual:api-list' {
+ const list: string[]
+ export default list
+}
+
declare module 'markdown-it-header-sections' {
- import type MarkdownIt from 'markdown-it'
+ import type { PluginSimple } from 'markdown-it'
- const MarkdownItHeaderSections: MarkdownIt.PluginSimple
+ const MarkdownItHeaderSections: PluginSimple
export default MarkdownItHeaderSections
}
declare module 'markdown-it-attrs' {
- import type MarkdownIt from 'markdown-it'
+ import type { PluginWithOptions } from 'markdown-it'
- const MarkdownItAttrs: MarkdownIt.PluginWithOptions<{
+ const MarkdownItAttrs: PluginWithOptions<{
leftDelimiter?: string
rightDelimiter?: string
allowedAttributes?: string[]
@@ -29,14 +43,14 @@ declare module 'markdown-it-attrs' {
}
declare module 'markdown-it-link-attributes' {
- import type MarkdownIt from 'markdown-it'
+ import type { PluginWithOptions } from 'markdown-it'
interface Config {
pattern?: string
attrs: Record<string, string>
}
- const MarkdownItLinkAttributes: MarkdownIt.PluginWithOptions<Config | Config[]>
+ const MarkdownItLinkAttributes: PluginWithOptions<Config | Config[]>
export default MarkdownItLinkAttributes
}
@@ -51,19 +65,4 @@ declare module 'virtual:examples' {
}>
}
-declare module '@emailjs/browser' {
- interface emailjs {
- sendForm (
- service_id: string,
- template_id: string,
- el: HTMLFormElement,
- public_key: string
- ): Promise<EmailJSResponseStatus>
- }
-
- const client: emailjs
-
- export default client
-}
-
declare module 'vue-instantsearch/vue3/es/src/instantsearch.js'
diff --git a/packages/docs/src/stores/made-with-vuetify.ts b/packages/docs/src/stores/made-with-vuetify.ts
index 0397bc019cc..23323405486 100644
--- a/packages/docs/src/stores/made-with-vuetify.ts
+++ b/packages/docs/src/stores/made-with-vuetify.ts
@@ -2,7 +2,9 @@ export const useMadeWithVuetifyStore = defineStore('made-with-vuetify', () => {
const items = ref([])
onBeforeMount(async () => {
- const res = await fetch('https://madewithvuejs.com/api/tag/vuetify')
+ const res = await fetch('https://madewithvuejs.com/api/tag/vuetify', {
+ priority: 'low',
+ })
.then(res => res.json())
items.value = res.data
diff --git a/packages/docs/src/utils/helpers.ts b/packages/docs/src/utils/helpers.ts
index 0e1a740c8eb..0f8bd0e8b1d 100644
--- a/packages/docs/src/utils/helpers.ts
+++ b/packages/docs/src/utils/helpers.ts
@@ -40,7 +40,7 @@ export async function waitForReadystate () {
/** Jaro-Winkler distance between two strings */
// eslint-disable-next-line max-statements
-export function distance (s1: string, s2: string) {
+export function getDistance (s1: string, s2: string) {
// Exit early if either are empty.
if (s1.length === 0 || s2.length === 0) {
return 0
diff --git a/packages/docs/tsconfig.json b/packages/docs/tsconfig.json
index 433e6b2fe8a..33062e52aa9 100644
--- a/packages/docs/tsconfig.json
+++ b/packages/docs/tsconfig.json
@@ -9,10 +9,10 @@
"esnext"
],
"module": "esnext",
- "moduleResolution": "node",
+ "moduleResolution": "bundler",
"noUnusedLocals": true,
"paths": {
- "@/*": ["src/*"],
+ "@/*": ["src/*"]
},
"resolveJsonModule": true,
"skipLibCheck": true,
@@ -29,6 +29,12 @@
],
"outDir": "./dist"
},
- "include": ["../api-generator/src/shims.d.ts"],
+ "include": [
+ "build",
+ "src",
+ "./auto-imports.d.ts",
+ "./components.d.ts",
+ "../api-generator/src/shims.d.ts"
+ ],
"exclude": ["dist", "node_modules"],
}
diff --git a/packages/docs/vite.config.mts b/packages/docs/vite.config.mts
index 4f651b15b23..0d777aa0d4d 100644
--- a/packages/docs/vite.config.mts
+++ b/packages/docs/vite.config.mts
@@ -15,11 +15,14 @@ import VueI18n from '@intlify/unplugin-vue-i18n/vite'
import Inspect from 'vite-plugin-inspect'
import Vuetify from 'vite-plugin-vuetify'
import basicSsl from '@vitejs/plugin-basic-ssl'
+import MagicString from 'magic-string'
-import { configureMarkdown, parseMeta } from './build/markdown-it'
+import { configureMarkdown } from './build/markdown-it'
import Api from './build/api-plugin'
import { Examples } from './build/examples-plugin'
import { genAppMetaInfo } from './src/utils/metadata'
+import { MdiJs } from './build/mdi-js'
+import { frontmatterBuilder, getRouteMeta } from './build/frontmatterMeta'
const resolve = (file: string) => fileURLToPath(new URL(file, import.meta.url))
@@ -41,7 +44,7 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
alias: [
{ find: '@', replacement: `${resolve('src')}/` },
{ find: 'node-fetch', replacement: 'isomorphic-fetch' },
- { find: /^vue$/, replacement: isSsrBuild ? 'vue' : 'vue/dist/vue.esm-bundler.js' },
+ { find: /^vue$/, replacement: isSsrBuild ? 'vue' : 'vue/dist/vue.runtime.esm-bundler.js' },
{ find: /^pinia$/, replacement: 'pinia/dist/pinia.mjs' },
],
},
@@ -49,11 +52,19 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
'process.env.NODE_ENV': mode === 'production' || isSsrBuild ? '"production"' : '"development"',
__INTLIFY_PROD_DEVTOOLS__: 'false',
},
+ css: {
+ preprocessorOptions: {
+ sass: {
+ api: 'modern'
+ }
+ },
+ preprocessorMaxWorkers: true,
+ },
build: {
- sourcemap: mode === 'development',
+ sourcemap: true,
modulePreload: false,
cssCodeSplit: false,
- minify: false,
+ minify: true,
rollupOptions: {
output: isSsrBuild ? { inlineDynamicImports: true } : {
// TODO: these options currently cause a request cascade
@@ -69,15 +80,22 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
},
},
},
+ esbuild: {
+ lineLimit: 1000,
+ },
plugins: [
// https://github.com/unplugin/unplugin-auto-import
AutoImport({
+ include: [/\.[tj]sx?$/, /\.vue$/, /\.vue\?vue/, /\.md$/],
dirs: [
'./src/composables/**',
'./src/stores/**',
'./src/utils/**',
],
imports: [
+ 'vue',
+ 'vue-router',
+ 'pinia',
{
'@vuetify/one': [
'createOne',
@@ -90,16 +108,10 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
'useProductsStore',
],
'lodash-es': ['camelCase', 'kebabCase', 'upperFirst'],
- pinia: ['defineStore', 'storeToRefs'],
- vue: [
- 'camelize', 'computed', 'h', 'mergeProps', 'nextTick',
- 'onBeforeMount', 'onBeforeUnmount', 'onMounted', 'onScopeDispose', 'onServerPrefetch',
- 'ref', 'shallowRef', 'useAttrs', 'watch', 'watchEffect'
- ],
+ vue: ['camelize', 'mergeProps'],
vuetify: ['useDate', 'useDisplay', 'useGoTo', 'useRtl', 'useTheme'],
'vue-gtag-next': ['useGtag'],
'vue-i18n': ['useI18n'],
- 'vue-router': ['onBeforeRouteLeave', 'onBeforeRouteUpdate', 'useRoute', 'useRouter'],
}
],
vueTemplate: true,
@@ -120,7 +132,9 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
// https://github.com/antfu/unplugin-vue-components
Components({
directoryAsNamespace: true,
- include: [/\.vue$/, /\.vue\?vue/, /\.md$/],
+ include: [/\.vue$/, /\.vue\?vue/, /\.md$/, /\.md\?vue/],
+ exclude: [],
+ excludeNames: ['AppMarkdown'],
}),
// https://github.com/JohnCampionJr/vite-plugin-vue-layouts
@@ -133,10 +147,11 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
// https://github.com/antfu/vite-plugin-md
Markdown({
- wrapperComponent: 'unwrap-markdown',
wrapperClasses: '',
- headEnabled: true,
+ exposeFrontmatter: true,
+ exposeExcerpt: false,
markdownItSetup: configureMarkdown,
+ builders: [frontmatterBuilder()]
}),
// https://github.com/hannoeru/vite-plugin-pages
@@ -144,7 +159,6 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
extensions: ['vue', 'md'],
dirs: [
{ dir: 'src/pages', baseRoute: '' },
- { dir: 'node_modules/.cache/api-pages', baseRoute: '' },
],
extendRoute (route) {
let [locale, category, ...rest] = route.path.split('/').slice(1)
@@ -152,10 +166,7 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
const idx = route.component.toLowerCase().indexOf(locale)
locale = ~idx ? route.component.slice(idx, idx + locale.length) : locale
- const meta = {
- layout: 'default',
- ...parseMeta(route.component, locale),
- }
+ const meta = getRouteMeta(route.component, locale)
if (meta.disabled) {
return { disabled: true }
@@ -164,18 +175,26 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
return {
...route,
path: '/' + [locale, category, ...rest].filter(Boolean).join('/') + '/',
- // name: [`${category ?? meta.layout}`, ...rest].join('-'),
meta: {
...meta,
category,
- page: rest.join('-'),
locale,
},
}
},
onRoutesGenerated (routes) {
allRoutes = routes.filter(route => !route.disabled)
- return allRoutes
+ return allRoutes.map(route => ({
+ ...route,
+ meta: JSON.parse(JSON.stringify({ // remove undefined
+ category: route.meta.category,
+ emphasized: route.meta.emphasized,
+ layout: route.meta.layout,
+ locale: route.meta.locale,
+ nav: route.meta.nav,
+ title: route.meta.title,
+ }))
+ }))
},
importMode (filepath) {
return [
@@ -230,12 +249,20 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
const options = /(<script>[\w\W]*?<\/script>)/g.exec(code)
if (composition && options) {
- return code.slice(0, options.index) + code.slice(options.index + options[0].length + 1)
+ const s = new MagicString(code)
+ s.remove(options.index, options.index + options[0].length + 1)
+ return {
+ code: s.toString(),
+ map: s.generateMap({ hires: true }),
+ }
}
}
}
},
+ // mdi js names and aliases from `@mdi/svg`
+ MdiJs(),
+
Vue({
include: [/\.vue$/, /\.md$/],
// https://github.com/vuejs/vue-next/issues/3298
@@ -249,7 +276,7 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
}),
Vuetify({
- autoImport: false,
+ autoImport: { labs: true },
styles: command === 'serve' || mode === 'development' ? 'sass' : true,
}),
@@ -332,6 +359,19 @@ export default defineConfig(({ command, mode, isSsrBuild }) => {
include: [
'vue',
'vue-router',
+ 'vue-instantsearch/vue3/es/src/instantsearch.js',
+ 'algoliasearch',
+ 'markdown-it-prism',
+ 'markdown-it-link-attributes',
+ 'markdown-it-attrs',
+ 'markdown-it-anchor',
+ 'markdown-it-header-sections',
+ 'markdown-it-emoji/bare.js',
+ 'markdown-it-container',
+ 'markdown-it/lib/token.mjs',
+ 'lodash-es',
+ 'fflate',
+ '@cosmicjs/sdk',
],
},
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index cac2c082ccc..c505a16d406 100755
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -157,7 +157,7 @@
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"eslint-plugin-cypress": "^2.15.1",
- "eslint-plugin-jest": "^28.2.0",
+ "eslint-plugin-jest": "^28.7.0",
"expect": "^28.1.3",
"fast-glob": "^3.3.2",
"identity-obj-proxy": "^3.0.0",
@@ -170,7 +170,7 @@
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
"timezone-mock": "^1.3.6",
- "unplugin-vue-components": "^0.26.0",
+ "unplugin-vue-components": "^0.27.4",
"vite": "^5.2.8",
"vite-ssr": "^0.17.1",
"vue-i18n": "^9.7.1",
diff --git a/packages/vuetify/src/composables/location.ts b/packages/vuetify/src/composables/location.ts
index 3306afb5d90..88419e2a2d2 100644
--- a/packages/vuetify/src/composables/location.ts
+++ b/packages/vuetify/src/composables/location.ts
@@ -18,11 +18,11 @@ const oppositeMap = {
} as const
export interface LocationProps {
- location: Anchor | undefined
+ location: Anchor | null | undefined
}
export const makeLocationProps = propsFactory({
- location: String as PropType<Anchor>,
+ location: String as PropType<Anchor | null>,
}, 'location')
export function useLocation (props: LocationProps, opposite = false, offset?: (side: string) => number) {
diff --git a/packages/vuetify/src/util/propsFactory.ts b/packages/vuetify/src/util/propsFactory.ts
index d21b7889566..eeedd0d8cce 100644
--- a/packages/vuetify/src/util/propsFactory.ts
+++ b/packages/vuetify/src/util/propsFactory.ts
@@ -61,16 +61,21 @@ type AppendDefault<T extends ComponentObjectPropsOptions, D extends PartialKeys<
? T[P]
: T[P] extends Record<string, unknown>
? Omit<T[P], 'type' | 'default'> & {
- type: PropType<MergeDefault<T[P], D[P]>>
+ type: PropType<MergeTypeDefault<T[P], D[P]>>
default: MergeDefault<T[P], D[P]>
}
: {
- type: PropType<MergeDefault<T[P], D[P]>>
+ type: PropType<MergeTypeDefault<T[P], D[P]>>
default: MergeDefault<T[P], D[P]>
}
}
-type MergeDefault<T, D> = unknown extends D ? InferPropType<T> : (NonNullable<InferPropType<T>> | D)
+type MergeTypeDefault<T, D, P = InferPropType<T>> = unknown extends D
+ ? P
+ : (P | D)
+type MergeDefault<T, D, P = InferPropType<T>> = unknown extends D
+ ? P
+ : (NonNullable<P> | D)
/**
* Like `Partial<T>` but doesn't care what the value is
diff --git a/patches/@[email protected] b/patches/@[email protected]
new file mode 100644
index 00000000000..0cf6f5d108b
--- /dev/null
+++ b/patches/@[email protected]
@@ -0,0 +1,19 @@
+diff --git a/package.json b/package.json
+index 0d142171bd1599a549c1c2a903fc3be234d1505c..a2acafcb0ec6ef6e7800d7b9467956c60780d419 100644
+--- a/package.json
++++ b/package.json
+@@ -6,6 +6,14 @@
+ "module": "mdi.js",
+ "types": "mdi.d.ts",
+ "sideEffects": false,
++ "type": "module",
++ "exports": {
++ ".": {
++ "types": "./mdi.d.ts",
++ "import": "./mdi.js",
++ "require": "./commonjs/mdi.js"
++ }
++ },
+ "scripts": {
+ "build": "npm update && npm install && npm run buildjs && npm run es5 && npm run commonjs",
+ "buildjs": "node build.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d6a5462bdd9..51ba377e0b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,11 @@ settings:
pnpmfileChecksum: r7jdc32s7tvk6ruvmlsvbhrbpq
+patchedDependencies:
+ '@mdi/[email protected]':
+ hash: wt4lkgr52gphla2wb445bnli3i
+ path: patches/@[email protected]
+
importers:
.:
@@ -23,26 +28,26 @@ importers:
specifier: ^7.24.7
version: 7.24.7(@babel/[email protected])
'@mdi/font':
- specifier: 6.2.95
- version: 6.2.95
+ specifier: 7.4.47
+ version: 7.4.47
'@mdi/js':
- specifier: 6.2.95
- version: 6.2.95
+ specifier: 7.4.47
+ version: 7.4.47(patch_hash=wt4lkgr52gphla2wb445bnli3i)
'@mdi/svg':
- specifier: 6.2.95
- version: 6.2.95
+ specifier: 7.4.47
+ version: 7.4.47
'@octokit/core':
specifier: ^5.2.0
version: 5.2.0
'@typescript-eslint/eslint-plugin':
- specifier: ^6.21.0
- version: 6.21.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
+ specifier: ^7.18.0
+ version: 7.18.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
'@typescript-eslint/parser':
- specifier: ^6.21.0
- version: 6.21.0([email protected])([email protected])
+ specifier: ^7.18.0
+ version: 7.18.0([email protected])([email protected])
'@unhead/vue':
specifier: ^1.9.4
- version: 1.9.4([email protected]([email protected]))
+ version: 1.9.4([email protected]([email protected]))
'@vue/compiler-sfc':
specifier: ^3.4.27
version: 3.4.27
@@ -54,7 +59,7 @@ importers:
version: 3.4.27
'@vueuse/head':
specifier: ^1.3.1
- version: 1.3.1([email protected]([email protected]))
+ version: 1.3.1([email protected]([email protected]))
babel-eslint:
specifier: ^10.1.0
version: 10.1.0([email protected])
@@ -81,13 +86,13 @@ importers:
version: 8.57.0
eslint-config-standard:
specifier: ^17.1.0
- version: 17.1.0([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])
+ version: 17.1.0([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])
eslint-formatter-codeframe:
specifier: ^7.32.1
version: 7.32.1
eslint-plugin-import:
specifier: ^2.29.1
- version: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
+ version: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
eslint-plugin-local-rules:
specifier: ^2.0.1
version: 2.0.1
@@ -108,7 +113,7 @@ importers:
version: 9.24.1([email protected])
eslint-plugin-vuetify:
specifier: ^2.3.0
- version: 2.3.0([email protected])([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])))
+ version: 2.3.0([email protected])([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])))
glob:
specifier: ^11.0.0
version: 11.0.0
@@ -135,7 +140,7 @@ importers:
version: 8.1.7([email protected])
magic-string:
specifier: ^0.30.9
- version: 0.30.10
+ version: 0.30.11
mkdirp:
specifier: ^3.0.1
version: 3.0.1
@@ -158,29 +163,29 @@ importers:
specifier: ^5.0.0
version: 5.0.0
typescript:
- specifier: ~5.3.3
- version: 5.3.3
+ specifier: ~5.5.4
+ version: 5.5.4
upath:
specifier: ^2.0.1
version: 2.0.1
vite-plugin-inspect:
specifier: ^0.8.3
- version: 0.8.3([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 0.8.3([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
vite-plugin-warmup:
specifier: ^0.1.0
- version: 0.1.0([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 0.1.0([email protected](@types/[email protected])([email protected])([email protected]))
vue:
specifier: ^3.4.27
- version: 3.4.27([email protected])
+ version: 3.4.27([email protected])
vue-analytics:
specifier: ^5.16.1
version: 5.22.1
vue-router:
specifier: ^4.3.0
- version: 4.3.0([email protected]([email protected]))
+ version: 4.3.0([email protected]([email protected]))
vue-tsc:
- specifier: ^1.8.27
- version: 1.8.27([email protected])
+ specifier: ^2.0.29
+ version: 2.0.29([email protected])
yargs:
specifier: ^17.7.2
version: 17.7.2
@@ -204,11 +209,14 @@ importers:
version: 4.7.2
vue:
specifier: ^3.4.27
- version: 3.4.27([email protected])
+ version: 3.4.27([email protected])
vuetify:
specifier: workspace:*
version: link:../vuetify
devDependencies:
+ '@types/lodash-es':
+ specifier: ^4.17.12
+ version: 4.17.12
'@types/stringify-object':
specifier: ^4.0.5
version: 4.0.5
@@ -227,15 +235,18 @@ importers:
'@cosmicjs/sdk':
specifier: ^1.0.11
version: 1.0.11
+ '@vue/compiler-dom':
+ specifier: ^3.4.27
+ version: 3.4.27
'@vuelidate/core':
specifier: ^2.0.3
- version: 2.0.3([email protected]([email protected]))
+ version: 2.0.3([email protected]([email protected]))
'@vuelidate/validators':
specifier: ^2.0.4
- version: 2.0.4([email protected]([email protected]))
+ version: 2.0.4([email protected]([email protected]))
'@vuetify/one':
- specifier: ^1.9.1
- version: 1.9.1([email protected])([email protected]([email protected]))(vuetify@packages+vuetify)
+ specifier: ^1.9.2
+ version: 1.9.2(@mdi/[email protected](patch_hash=wt4lkgr52gphla2wb445bnli3i))([email protected])([email protected]([email protected]))(vuetify@packages+vuetify)
algoliasearch:
specifier: ^4.23.3
version: 4.23.3
@@ -250,7 +261,7 @@ importers:
version: 4.17.21
pinia:
specifier: ^2.1.7
- version: 2.1.7([email protected])([email protected]([email protected]))
+ version: 2.1.7([email protected])([email protected]([email protected]))
prism-theme-vars:
specifier: ^0.2.4
version: 0.2.4
@@ -262,19 +273,19 @@ importers:
version: 0.10.0
vee-validate:
specifier: ^4.12.6
- version: 4.12.6([email protected]([email protected]))
+ version: 4.12.6([email protected]([email protected]))
vue:
specifier: ^3.4.27
- version: 3.4.27([email protected])
+ version: 3.4.27([email protected])
vue-gtag-next:
specifier: ^1.14.0
- version: 1.14.0([email protected]([email protected]))
+ version: 1.14.0([email protected]([email protected]))
vue-i18n:
specifier: ^9.11.0
- version: 9.11.1([email protected]([email protected]))
+ version: 9.11.1([email protected]([email protected]))
vue-instantsearch:
specifier: ^4.16.1
- version: 4.16.1(@vue/[email protected]([email protected]([email protected])))([email protected])([email protected]([email protected]))
+ version: 4.16.1(@vue/[email protected]([email protected]([email protected])))([email protected])([email protected]([email protected]))
vue-prism-component:
specifier: ^2.0.0
version: 2.0.0
@@ -282,12 +293,30 @@ importers:
specifier: workspace:*
version: link:../vuetify
devDependencies:
+ '@babel/generator':
+ specifier: ^7.25.0
+ version: 7.25.0
+ '@babel/types':
+ specifier: ^7.25.2
+ version: 7.25.2
'@emailjs/browser':
specifier: ^4.3.3
version: 4.3.3
'@intlify/unplugin-vue-i18n':
specifier: ^4.0.0
- version: 4.0.0([email protected])([email protected]([email protected]([email protected])))
+ version: 4.0.0([email protected])([email protected]([email protected]([email protected])))
+ '@mdi/js':
+ specifier: 7.4.47
+ version: 7.4.47(patch_hash=wt4lkgr52gphla2wb445bnli3i)
+ '@mdi/svg':
+ specifier: 7.4.47
+ version: 7.4.47
+ '@octokit/openapi-types':
+ specifier: ^22.2.0
+ version: 22.2.0
+ '@types/babel__generator':
+ specifier: ^7.6.8
+ version: 7.6.8
'@types/lodash-es':
specifier: ^4.17.12
version: 4.17.12
@@ -302,19 +331,25 @@ importers:
version: 1.26.3
'@vitejs/plugin-basic-ssl':
specifier: ^1.1.0
- version: 1.1.0([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 1.1.0([email protected](@types/[email protected])([email protected])([email protected]))
'@vitejs/plugin-vue':
specifier: ^5.0.4
- version: 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
+ version: 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
'@vue/compiler-sfc':
specifier: ^3.4.27
version: 3.4.27
'@vuetify/api-generator':
specifier: workspace:*
version: link:../api-generator
+ '@yankeeinlondon/builder-api':
+ specifier: ^1.4.1
+ version: 1.4.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
ajv:
specifier: ^8.12.0
version: 8.12.0
+ algoliasearch-helper:
+ specifier: ^3.22.3
+ version: 3.22.3([email protected])
async-es:
specifier: ^3.2.5
version: 3.2.5
@@ -371,31 +406,31 @@ importers:
version: 0.17.5([email protected])
unplugin-fonts:
specifier: 1.0.3
- version: 1.0.3([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 1.0.3([email protected](@types/[email protected])([email protected])([email protected]))
unplugin-vue-components:
- specifier: ^0.26.0
- version: 0.26.0(@babel/[email protected])([email protected])([email protected]([email protected]))
+ specifier: ^0.27.4
+ version: 0.27.4(@babel/[email protected])([email protected])([email protected]([email protected]))
vite:
- specifier: ^5.2.8
- version: 5.2.8(@types/[email protected])([email protected])([email protected])
+ specifier: 5.4.0-beta.1
+ version: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
vite-plugin-md:
specifier: ^0.21.5
- version: 0.21.5(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 0.21.5([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
vite-plugin-pages:
specifier: ^0.32.1
- version: 0.32.1(@vue/[email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 0.32.1(@vue/[email protected])([email protected](@types/[email protected])([email protected])([email protected]))
vite-plugin-pwa:
specifier: ^0.17.4
- version: 0.17.5(@types/[email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ version: 0.17.5(@types/[email protected])([email protected](@types/[email protected])([email protected])([email protected]))
vite-plugin-vue-layouts:
specifier: ^0.11.0
- version: 0.11.0([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected]))
+ version: 0.11.0([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected]))
vite-plugin-vuetify:
- specifier: ^2.0.3
- version: 2.0.3([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))(vuetify@packages+vuetify)
+ specifier: ^2.0.4
+ version: 2.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))(vuetify@packages+vuetify)
vue-tsc:
- specifier: ^1.8.27
- version: 1.8.27([email protected])
+ specifier: ^2.0.29
+ version: 2.0.29([email protected])
packages/vuetify:
devDependencies:
@@ -410,7 +445,7 @@ importers:
version: 3.0.0([email protected])
'@formatjs/intl':
specifier: ^2.10.1
- version: 2.10.1([email protected])
+ version: 2.10.1([email protected])
'@fortawesome/fontawesome-svg-core':
specifier: ^6.5.2
version: 6.5.2
@@ -419,13 +454,13 @@ importers:
version: 6.5.2
'@fortawesome/vue-fontawesome':
specifier: ^3.0.6
- version: 3.0.6(@fortawesome/[email protected])([email protected]([email protected]))
+ version: 3.0.6(@fortawesome/[email protected])([email protected]([email protected]))
'@jest/globals':
specifier: ^28.1.3
version: 28.1.3
'@percy/cli':
specifier: ^1.28.2
- version: 1.28.2([email protected])
+ version: 1.28.2([email protected])
'@percy/cypress':
specifier: ^3.1.2
version: 3.1.2([email protected])
@@ -440,7 +475,7 @@ importers:
version: 15.2.3([email protected])
'@rollup/plugin-typescript':
specifier: ^11.1.6
- version: 11.1.6([email protected])([email protected])([email protected])
+ version: 11.1.6([email protected])([email protected])([email protected])
'@types/jest':
specifier: ^28.1.8
version: 28.1.8
@@ -452,10 +487,10 @@ importers:
version: 0.1.11
'@vitejs/plugin-vue':
specifier: ^5.0.4
- version: 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
+ version: 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
'@vitejs/plugin-vue-jsx':
specifier: ^3.1.0
- version: 3.1.0([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
+ version: 3.1.0([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
'@vue/babel-plugin-jsx':
specifier: ^1.2.2
version: 1.2.2(@babel/[email protected])
@@ -470,7 +505,7 @@ importers:
version: 8.3.2
autoprefixer:
specifier: ^10.4.19
- version: 10.4.19([email protected])
+ version: 10.4.19([email protected])
babel-plugin-add-import-extension:
specifier: 1.5.1
version: 1.5.1(@babel/[email protected])
@@ -488,7 +523,7 @@ importers:
version: 8.2.2
cssnano:
specifier: ^6.1.2
- version: 6.1.2([email protected])
+ version: 6.1.2([email protected])
csstype:
specifier: ^3.1.3
version: 3.1.3
@@ -514,8 +549,8 @@ importers:
specifier: ^2.15.1
version: 2.15.1([email protected])
eslint-plugin-jest:
- specifier: ^28.2.0
- version: 28.2.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected]))([email protected])
+ specifier: ^28.7.0
+ version: 28.7.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected]))([email protected])
expect:
specifier: ^28.1.3
version: 28.1.3
@@ -533,13 +568,13 @@ importers:
version: 4.0.5
postcss:
specifier: ^8.4.38
- version: 8.4.38
+ version: 8.4.40
rollup:
specifier: ^3.20.7
version: 3.29.4
rollup-plugin-dts:
specifier: ^6.1.0
- version: 6.1.0([email protected])([email protected])
+ version: 6.1.0([email protected])([email protected])
rollup-plugin-sass:
specifier: ^1.12.21
version: 1.12.21([email protected])
@@ -553,20 +588,20 @@ importers:
specifier: ^1.3.6
version: 1.3.6
unplugin-vue-components:
- specifier: ^0.26.0
- version: 0.26.0(@babel/[email protected])([email protected])([email protected]([email protected]))
+ specifier: ^0.27.4
+ version: 0.27.4(@babel/[email protected])([email protected])([email protected]([email protected]))
vite:
specifier: ^5.2.8
version: 5.2.8(@types/[email protected])([email protected])([email protected])
vite-ssr:
specifier: ^0.17.1
- version: 0.17.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))(@vueuse/[email protected]([email protected]([email protected])))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected]))
+ version: 0.17.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))(@vueuse/[email protected]([email protected]([email protected])))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected]))
vue-i18n:
specifier: ^9.7.1
- version: 9.11.1([email protected]([email protected]))
+ version: 9.11.1([email protected]([email protected]))
vue-router:
specifier: ^4.3.0
- version: 4.3.0([email protected]([email protected]))
+ version: 4.3.0([email protected]([email protected]))
packages:
@@ -626,8 +661,8 @@ packages:
resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
engines: {node: '>=6.0.0'}
- '@antfu/[email protected]':
- resolution: {integrity: sha512-gFPqTG7otEJ8uP6wrhDv6mqwGWYZKNvAcCq6u9hOj0c+IKCEsY4L1oC9trPq2SaWIzAfHvqfBDxF591JkMf+kg==}
+ '@antfu/[email protected]':
+ resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
'@apideck/[email protected]':
resolution: {integrity: sha512-6RMV31esAxqlDIvVCG/CJxY/s8dFNVOI5w8RWIfDMhjg/iwqnawko9tJXau/leqC4+T1Bu8et99QVWCwU5wk+g==}
@@ -1307,6 +1342,12 @@ packages:
cpu: [ppc64]
os: [aix]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
+ engines: {node: '>=12'}
+ cpu: [ppc64]
+ os: [aix]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
engines: {node: '>=12'}
@@ -1325,6 +1366,12 @@ packages:
cpu: [arm64]
os: [android]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [android]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
engines: {node: '>=12'}
@@ -1343,6 +1390,12 @@ packages:
cpu: [arm]
os: [android]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
+ engines: {node: '>=12'}
+ cpu: [arm]
+ os: [android]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
engines: {node: '>=12'}
@@ -1361,6 +1414,12 @@ packages:
cpu: [x64]
os: [android]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [android]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
engines: {node: '>=12'}
@@ -1379,6 +1438,12 @@ packages:
cpu: [arm64]
os: [darwin]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [darwin]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
engines: {node: '>=12'}
@@ -1397,6 +1462,12 @@ packages:
cpu: [x64]
os: [darwin]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [darwin]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
engines: {node: '>=12'}
@@ -1415,6 +1486,12 @@ packages:
cpu: [arm64]
os: [freebsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [freebsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
engines: {node: '>=12'}
@@ -1433,6 +1510,12 @@ packages:
cpu: [x64]
os: [freebsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [freebsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
engines: {node: '>=12'}
@@ -1451,6 +1534,12 @@ packages:
cpu: [arm64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
engines: {node: '>=12'}
@@ -1469,6 +1558,12 @@ packages:
cpu: [arm]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
+ engines: {node: '>=12'}
+ cpu: [arm]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
engines: {node: '>=12'}
@@ -1487,6 +1582,12 @@ packages:
cpu: [ia32]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
+ engines: {node: '>=12'}
+ cpu: [ia32]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
engines: {node: '>=12'}
@@ -1505,6 +1606,12 @@ packages:
cpu: [loong64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
+ engines: {node: '>=12'}
+ cpu: [loong64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
engines: {node: '>=12'}
@@ -1523,6 +1630,12 @@ packages:
cpu: [mips64el]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
+ engines: {node: '>=12'}
+ cpu: [mips64el]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
engines: {node: '>=12'}
@@ -1541,6 +1654,12 @@ packages:
cpu: [ppc64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
+ engines: {node: '>=12'}
+ cpu: [ppc64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
engines: {node: '>=12'}
@@ -1559,6 +1678,12 @@ packages:
cpu: [riscv64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
+ engines: {node: '>=12'}
+ cpu: [riscv64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
engines: {node: '>=12'}
@@ -1577,6 +1702,12 @@ packages:
cpu: [s390x]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
+ engines: {node: '>=12'}
+ cpu: [s390x]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
engines: {node: '>=12'}
@@ -1595,6 +1726,12 @@ packages:
cpu: [x64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
engines: {node: '>=12'}
@@ -1613,6 +1750,12 @@ packages:
cpu: [x64]
os: [netbsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [netbsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
engines: {node: '>=12'}
@@ -1631,6 +1774,12 @@ packages:
cpu: [x64]
os: [openbsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [openbsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
engines: {node: '>=12'}
@@ -1649,6 +1798,12 @@ packages:
cpu: [x64]
os: [sunos]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [sunos]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
engines: {node: '>=12'}
@@ -1667,6 +1822,12 @@ packages:
cpu: [arm64]
os: [win32]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [win32]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
engines: {node: '>=12'}
@@ -1685,6 +1846,12 @@ packages:
cpu: [ia32]
os: [win32]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
+ engines: {node: '>=12'}
+ cpu: [ia32]
+ os: [win32]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
engines: {node: '>=12'}
@@ -1703,6 +1870,12 @@ packages:
cpu: [x64]
os: [win32]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [win32]
+
'@eslint-community/[email protected]':
resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1932,8 +2105,8 @@ packages:
'@jridgewell/[email protected]':
resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
- '@jridgewell/[email protected]':
- resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+ '@jridgewell/[email protected]':
+ resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
'@jridgewell/[email protected]':
resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
@@ -1946,14 +2119,14 @@ packages:
resolution: {integrity: sha512-ch81CgU5pBNOiUCQx44F/ZtN4DxxJjUQtuytYRBFWJSHAJ+XPJtiC/yQ9zjr1I1yaUlmNYYblkopoOyziOdJ1w==}
engines: {node: '>=18.0.0'}
- '@mdi/[email protected]':
- resolution: {integrity: sha512-0RKkhabkFZP3ALwKqrjhdKdhydQpoydIjX6cvjIwLyjADCsE0pG68YkGY+S3qnfdErmhS4m8adwvgrAFXp2AYQ==}
+ '@mdi/[email protected]':
+ resolution: {integrity: sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==}
- '@mdi/[email protected]':
- resolution: {integrity: sha512-fbD22sEBathqVSQWcxshEtzhhRNFmMnV64z6T7DClRbQ9N5axorykt3Suv2zPzLDyiqH7UhNRu0VPvPCPDNpnQ==}
+ '@mdi/[email protected]':
+ resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==}
- '@mdi/[email protected]':
- resolution: {integrity: sha512-VqIqv/c7BL4hOAjStHpBaVh6k1TAvXVrUCg7dJHdnQbHHudlu0w2h3OMx/pCp0V2LaJ73oW2jRDWUyby1eo+mA==}
+ '@mdi/[email protected]':
+ resolution: {integrity: sha512-WQ2gDll12T9WD34fdRFgQVgO8bag3gavrAgJ0frN4phlwdJARpE6gO1YvLEMJR0KKgoc+/Ea/A0Pp11I00xBvw==}
'@napi-rs/[email protected]':
resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==}
@@ -2138,8 +2311,8 @@ packages:
'@octokit/[email protected]':
resolution: {integrity: sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==}
- '@octokit/[email protected]':
- resolution: {integrity: sha512-1yN5m1IMNXthoBDUXFF97N1gHop04B3H8ws7wtOr8GgRyDO1gKALjwMHARNBoMBiB/2vEe/vxstrApcJZzQbnQ==}
+ '@octokit/[email protected]':
+ resolution: {integrity: sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==}
'@octokit/[email protected]':
resolution: {integrity: sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==}
@@ -2502,8 +2675,8 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
- '@types/[email protected]':
- resolution: {integrity: sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
'@types/[email protected]':
resolution: {integrity: sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==}
@@ -2556,9 +2729,6 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==}
- '@types/[email protected]':
- resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
-
'@types/[email protected]':
resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
@@ -2628,9 +2798,6 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==}
- '@types/[email protected]':
- resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}
-
'@types/[email protected]':
resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
@@ -2661,63 +2828,90 @@ packages:
'@types/[email protected]':
resolution: {integrity: sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==}
+ engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
- '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
- eslint: ^7.0.0 || ^8.0.0
+ '@typescript-eslint/parser': ^7.0.0
+ eslint: ^8.56.0
typescript: '*'
peerDependenciesMeta:
typescript:
optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==}
+ engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
- eslint: ^7.0.0 || ^8.0.0
+ eslint: ^8.56.0
typescript: '*'
peerDependenciesMeta:
typescript:
optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==}
+ engines: {node: ^18.18.0 || >=20.0.0}
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==}
+ engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
- eslint: ^7.0.0 || ^8.0.0
+ eslint: ^8.56.0
typescript: '*'
peerDependenciesMeta:
typescript:
optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
+ engines: {node: ^18.18.0 || >=20.0.0}
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==}
+ engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
typescript: '*'
peerDependenciesMeta:
typescript:
optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- eslint: ^7.0.0 || ^8.0.0
+ typescript: '*'
+ peerDependenciesMeta:
+ typescript:
+ optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==}
- engines: {node: ^16.0.0 || >=18.0.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==}
+ engines: {node: ^18.18.0 || >=20.0.0}
+ peerDependencies:
+ eslint: ^8.56.0
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ eslint: ^8.57.0 || ^9.0.0
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
+ engines: {node: ^18.18.0 || >=20.0.0}
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@ungap/[email protected]':
resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
@@ -2765,14 +2959,14 @@ packages:
vite: ^5.0.0
vue: ^3.2.25
- '@volar/[email protected]':
- resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
+ '@volar/[email protected]':
+ resolution: {integrity: sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==}
- '@volar/[email protected]':
- resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
+ '@volar/[email protected]':
+ resolution: {integrity: sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==}
- '@volar/[email protected]':
- resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
+ '@volar/[email protected]':
+ resolution: {integrity: sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==}
'@vue/[email protected]':
resolution: {integrity: sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==}
@@ -2802,11 +2996,14 @@ packages:
'@vue/[email protected]':
resolution: {integrity: sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==}
+ '@vue/[email protected]':
+ resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
+
'@vue/[email protected]':
resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==}
- '@vue/[email protected]':
- resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
+ '@vue/[email protected]':
+ resolution: {integrity: sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ==}
peerDependencies:
typescript: '*'
peerDependenciesMeta:
@@ -2857,9 +3054,10 @@ packages:
vue: ^3.0.0
vuetify: ^3.0.0
- '@vuetify/[email protected]':
- resolution: {integrity: sha512-vp1+9n4Ehs6XP/DuuUwCpUiOKDTwAdJmYc6eqt/HRw+u7s/0W8SGvrKOhzQeXLeGrfzwpIed6iB78NyfZzM66Q==}
+ '@vuetify/[email protected]':
+ resolution: {integrity: sha512-bD8b391KpGGaKhxZ/o6F7t2SJGseWw4HC4yQuhAqq0RKrm07Dh44Pl0wPXdUbDDVdvlCA7hVyJt4J+4rOCW24A==}
peerDependencies:
+ '@mdi/js': 7.4.47
lodash-es: ^4.17.21
vue: ^3.4.0
vuetify: ^3.6.1
@@ -2926,8 +3124,8 @@ packages:
engines: {node: '>=0.4.0'}
hasBin: true
- [email protected]:
- resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
+ [email protected]:
+ resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
engines: {node: '>=0.4.0'}
hasBin: true
@@ -2957,6 +3155,11 @@ packages:
peerDependencies:
algoliasearch: '>= 3.1 < 6'
+ [email protected]:
+ resolution: {integrity: sha512-2eoEz8mG4KHE+DzfrBTrCmDPxVXv7aZZWPojAJFtARpxxMO6lkos1dJ+XDCXdPvq7q3tpYWRi6xXmVQikejtpA==}
+ peerDependencies:
+ algoliasearch: '>= 3.1 < 6'
+
[email protected]:
resolution: {integrity: sha512-Le/3YgNvjW9zxIQMRhUHuhiUjAlKY/zsdZpfq4dlLqg6mEm0nL6yk+7f2hDOtLpxsgE4jSzDmvHL7nXdBp5feg==}
@@ -3390,8 +3593,8 @@ packages:
resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
engines: {node: '>= 0.8.0'}
- [email protected]:
- resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
+ [email protected]:
+ resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
engines: {node: '>= 8.10.0'}
[email protected]:
@@ -3561,6 +3764,9 @@ packages:
engines: {node: ^14.13.0 || >=16.0.0}
hasBin: true
+ [email protected]:
+ resolution: {integrity: sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==}
+
[email protected]:
resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
@@ -3935,8 +4141,8 @@ packages:
supports-color:
optional: true
- [email protected]:
- resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+ [email protected]:
+ resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
engines: {node: '>=6.0'}
peerDependencies:
supports-color: '*'
@@ -4246,6 +4452,11 @@ packages:
engines: {node: '>=12'}
hasBin: true
+ [email protected]:
+ resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
+ engines: {node: '>=12'}
+ hasBin: true
+
[email protected]:
resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
engines: {node: '>=6'}
@@ -4338,11 +4549,11 @@ packages:
'@typescript-eslint/parser':
optional: true
- [email protected]:
- resolution: {integrity: sha512-yRDti/a+f+SMSmNTiT9/M/MzXGkitl8CfzUxnpoQcTyfq8gUrXMriVcWU36W1X6BZSUoyUCJrDAWWUA2N4hE5g==}
+ [email protected]:
+ resolution: {integrity: sha512-fzPGN7awL2ftVRQh/bsCi+16ArUZWujZnD1b8EGJqy8nr4//7tZ3BIdc/9edcJBtB3hpci3GtdMNFVDwHU0Eag==}
engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0}
peerDependencies:
- '@typescript-eslint/eslint-plugin': ^6.0.0 || ^7.0.0
+ '@typescript-eslint/eslint-plugin': ^6.0.0 || ^7.0.0 || ^8.0.0
eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
jest: '*'
peerDependenciesMeta:
@@ -5882,8 +6093,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==}
- [email protected]:
- resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
+ [email protected]:
+ resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
[email protected]:
resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
@@ -6133,8 +6344,8 @@ packages:
engines: {node: '>=10'}
hasBin: true
- [email protected]:
- resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
+ [email protected]:
+ resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
[email protected]:
resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
@@ -6156,8 +6367,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
- [email protected]:
- resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
+ [email protected]:
+ resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
[email protected]:
resolution: {integrity: sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==}
@@ -6583,8 +6794,8 @@ packages:
resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
engines: {node: '>=8'}
- [email protected]:
- resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
+ [email protected]:
+ resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
[email protected]:
resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
@@ -6652,8 +6863,8 @@ packages:
resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
engines: {node: '>=8'}
- [email protected]:
- resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
+ [email protected]:
+ resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==}
[email protected]:
resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==}
@@ -6835,8 +7046,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
- [email protected]:
- resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+ [email protected]:
+ resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==}
engines: {node: ^10 || ^12 || >=14}
[email protected]:
@@ -7787,9 +7998,9 @@ packages:
resolution: {integrity: sha512-cklgulxoLavCJlZSWdKzEuKFRFwyRUS3h4tfvSo8uSGrtrPNcAHeKmftGuA684vonXdvKgdX6cMKF8SBjywN1w==}
engines: {node: '>=0.10.0'}
- [email protected]:
- resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==}
- engines: {node: '>=16.13.0'}
+ [email protected]:
+ resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
+ engines: {node: '>=16'}
peerDependencies:
typescript: '>=4.2.0'
@@ -7887,8 +8098,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
- [email protected]:
- resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
+ [email protected]:
+ resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
engines: {node: '>=14.17'}
hasBin: true
@@ -7898,8 +8109,8 @@ packages:
[email protected]:
resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
- [email protected]:
- resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
+ [email protected]:
+ resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
[email protected]:
resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
@@ -7986,8 +8197,8 @@ packages:
'@nuxt/kit':
optional: true
- [email protected]:
- resolution: {integrity: sha512-s7IdPDlnOvPamjunVxw8kNgKNK8A5KM1YpK5j/p97jEKTjlPNrA0nZBiSfAKKlK1gWZuyWXlKL5dk3EDw874LQ==}
+ [email protected]:
+ resolution: {integrity: sha512-1XVl5iXG7P1UrOMnaj2ogYa5YTq8aoh5jwDPQhemwO/OrXW+lPQKDXd1hMz15qxQPxgb/XXlbgo3HQ2rLEbmXQ==}
engines: {node: '>=14'}
peerDependencies:
'@babel/parser': ^7.15.8
@@ -7999,8 +8210,9 @@ packages:
'@nuxt/kit':
optional: true
- [email protected]:
- resolution: {integrity: sha512-BfJEpWBu3aE/AyHx8VaNE/WgouoQxgH9baAiH82JjX8cqVyi3uJQstqwD5J+SZxIK326SZIhsSZlALXVBCknTQ==}
+ [email protected]:
+ resolution: {integrity: sha512-aXEH9c5qi3uYZHo0niUtxDlT9ylG/luMW/dZslSCkbtC31wCyFkmM0kyoBBh+Grhn7CL+/kvKLfN61/EdxPxMQ==}
+ engines: {node: '>=14.0.0'}
[email protected]:
resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
@@ -8117,8 +8329,8 @@ packages:
vue: ^3.2.4
vue-router: ^4.0.11
- [email protected]:
- resolution: {integrity: sha512-HbYajgGgb/noaVKNRhnnXIiQZrNXfNIeanUGAwXgOxL6h/KULS40Uf51Kyz8hNmdegF+DwjgXXI/8J1PNS83xw==}
+ [email protected]:
+ resolution: {integrity: sha512-A4cliYUoP/u4AWSRVRvAPKgpgR987Pss7LpFa7s1GvOe8WjgDq92Rt3eVXrvgxGCWvZsPKziVqfHHdCMqeDhfw==}
engines: {node: ^18.0.0 || >=20.0.0}
peerDependencies:
vite: '>=5'
@@ -8220,6 +8432,37 @@ packages:
terser:
optional: true
+ [email protected]:
+ resolution: {integrity: sha512-5ZfwltjV7w1GnZe2nFafXdruBMif0PAr4WYj1gQszIPUdUafxVxNjEG/CeB/Mll4Ls1NF4ZETdioMKTTGeJw/w==}
+ engines: {node: ^18.0.0 || >=20.0.0}
+ hasBin: true
+ peerDependencies:
+ '@types/node': ^18.0.0 || >=20.0.0
+ less: '*'
+ lightningcss: ^1.21.0
+ sass: '*'
+ sass-embedded: '*'
+ stylus: '*'
+ sugarss: '*'
+ terser: ^5.4.0
+ peerDependenciesMeta:
+ '@types/node':
+ optional: true
+ less:
+ optional: true
+ lightningcss:
+ optional: true
+ sass:
+ optional: true
+ sass-embedded:
+ optional: true
+ stylus:
+ optional: true
+ sugarss:
+ optional: true
+ terser:
+ optional: true
+
[email protected]:
resolution: {integrity: sha512-X75TApG2wZTJn299E/TIYevr4E9/nBo1sUtZzn0Ci5oK8qnpZAZyhwg0qCeMSakGIWtc6oRwcQFyFfW14aOFWg==}
engines: {node: '>=v14.16.0'}
@@ -8242,6 +8485,9 @@ packages:
jsdom:
optional: true
+ [email protected]:
+ resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
+
[email protected]:
resolution: {integrity: sha512-HPKQMN7gfcUqS5SxoO0VxqLRRSPkG1H1FqglsHccz6BatBatNtm/Vyy8brApktZxNCfnAkrSVDpxg3/FNDeOgQ==}
deprecated: Sorry but vue-analytics is no longer maintained. I would suggest you switch to vue-gtag, with love, the guy who made the package.
@@ -8309,14 +8555,11 @@ packages:
peerDependencies:
vue: ^3.2.0
- [email protected]:
- resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
-
- [email protected]:
- resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
+ [email protected]:
+ resolution: {integrity: sha512-MHhsfyxO3mYShZCGYNziSbc63x7cQ5g9kvijV7dRe1TTXBRLxXyL0FnXWpUF1xII2mJ86mwYpYsUmMwkmerq7Q==}
hasBin: true
peerDependencies:
- typescript: '*'
+ typescript: '>=5.0.0'
[email protected]:
resolution: {integrity: sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==}
@@ -8376,8 +8619,8 @@ packages:
resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
engines: {node: '>=10.13.0'}
- [email protected]:
- resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
+ [email protected]:
+ resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
[email protected]:
resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
@@ -8685,7 +8928,7 @@ snapshots:
'@jridgewell/gen-mapping': 0.1.1
'@jridgewell/trace-mapping': 0.3.25
- '@antfu/[email protected]': {}
+ '@antfu/[email protected]': {}
'@apideck/[email protected]([email protected])':
dependencies:
@@ -8706,7 +8949,7 @@ snapshots:
slash: 2.0.0
optionalDependencies:
'@nicolo-ribaudo/chokidar-2': 2.1.8-no-fsevents.3
- chokidar: 3.5.3
+ chokidar: 3.6.0
'@babel/[email protected]':
dependencies:
@@ -8732,7 +8975,7 @@ snapshots:
'@babel/traverse': 7.25.3
'@babel/types': 7.25.2
convert-source-map: 2.0.0
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -8790,7 +9033,7 @@ snapshots:
'@babel/core': 7.25.2
'@babel/helper-compilation-targets': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
lodash.debounce: 4.0.8
resolve: 1.22.8
transitivePeerDependencies:
@@ -9503,7 +9746,7 @@ snapshots:
'@babel/parser': 7.25.3
'@babel/template': 7.25.0
'@babel/types': 7.25.2
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -9586,6 +9829,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9595,6 +9841,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9604,6 +9853,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9613,6 +9865,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9622,6 +9877,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9631,6 +9889,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9640,6 +9901,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9649,6 +9913,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9658,6 +9925,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9667,6 +9937,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9676,6 +9949,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9685,6 +9961,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9694,6 +9973,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9703,6 +9985,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9712,6 +9997,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9721,6 +10009,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9730,6 +10021,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9739,6 +10033,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9748,6 +10045,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9757,6 +10057,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9766,6 +10069,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9775,6 +10081,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@esbuild/[email protected]':
optional: true
@@ -9784,6 +10093,9 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ '@esbuild/[email protected]':
+ optional: true
+
'@eslint-community/[email protected]([email protected])':
dependencies:
eslint: 8.57.0
@@ -9794,7 +10106,7 @@ snapshots:
'@eslint/[email protected]':
dependencies:
ajv: 6.12.6
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
espree: 9.6.1
globals: 13.24.0
ignore: 5.3.1
@@ -9843,7 +10155,7 @@ snapshots:
dependencies:
tslib: 2.6.2
- '@formatjs/[email protected]([email protected])':
+ '@formatjs/[email protected]([email protected])':
dependencies:
'@formatjs/ecma402-abstract': 1.18.2
'@formatjs/fast-memoize': 2.2.0
@@ -9853,7 +10165,7 @@ snapshots:
intl-messageformat: 10.5.11
tslib: 2.6.2
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
'@fortawesome/[email protected]': {}
@@ -9865,15 +10177,15 @@ snapshots:
dependencies:
'@fortawesome/fontawesome-common-types': 6.5.2
- '@fortawesome/[email protected](@fortawesome/[email protected])([email protected]([email protected]))':
+ '@fortawesome/[email protected](@fortawesome/[email protected])([email protected]([email protected]))':
dependencies:
'@fortawesome/fontawesome-svg-core': 6.5.2
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
'@humanwhocodes/[email protected]':
dependencies:
'@humanwhocodes/object-schema': 2.0.3
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@@ -9884,19 +10196,19 @@ snapshots:
'@hutson/[email protected]': {}
- '@intlify/[email protected]([email protected]([email protected]([email protected])))':
+ '@intlify/[email protected]([email protected]([email protected]([email protected])))':
dependencies:
'@intlify/message-compiler': 9.11.1
'@intlify/shared': 9.11.1
- acorn: 8.11.2
+ acorn: 8.12.1
escodegen: 2.1.0
estree-walker: 2.0.2
jsonc-eslint-parser: 2.4.0
- mlly: 1.4.2
+ mlly: 1.7.1
source-map-js: 1.2.0
yaml-eslint-parser: 1.2.2
optionalDependencies:
- vue-i18n: 9.11.1([email protected]([email protected]))
+ vue-i18n: 9.11.1([email protected]([email protected]))
'@intlify/[email protected]':
dependencies:
@@ -9910,22 +10222,22 @@ snapshots:
'@intlify/[email protected]': {}
- '@intlify/[email protected]([email protected])([email protected]([email protected]([email protected])))':
+ '@intlify/[email protected]([email protected])([email protected]([email protected]([email protected])))':
dependencies:
- '@intlify/bundle-utils': 8.0.0([email protected]([email protected]([email protected])))
+ '@intlify/bundle-utils': 8.0.0([email protected]([email protected]([email protected])))
'@intlify/shared': 9.11.1
'@rollup/pluginutils': 5.1.0([email protected])
'@vue/compiler-sfc': 3.4.27
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
fast-glob: 3.3.2
js-yaml: 4.1.0
json5: 2.2.3
- pathe: 1.1.1
+ pathe: 1.1.2
picocolors: 1.0.1
source-map-js: 1.2.0
- unplugin: 1.6.0
+ unplugin: 1.12.1
optionalDependencies:
- vue-i18n: 9.11.1([email protected]([email protected]))
+ vue-i18n: 9.11.1([email protected]([email protected]))
transitivePeerDependencies:
- rollup
- supports-color
@@ -10128,12 +10440,12 @@ snapshots:
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/set-array': 1.2.1
- '@jridgewell/sourcemap-codec': 1.4.15
+ '@jridgewell/sourcemap-codec': 1.5.0
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/set-array': 1.2.1
- '@jridgewell/sourcemap-codec': 1.4.15
+ '@jridgewell/sourcemap-codec': 1.5.0
'@jridgewell/trace-mapping': 0.3.25
'@jridgewell/[email protected]': {}
@@ -10145,12 +10457,12 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.5
'@jridgewell/trace-mapping': 0.3.25
- '@jridgewell/[email protected]': {}
+ '@jridgewell/[email protected]': {}
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/resolve-uri': 3.1.2
- '@jridgewell/sourcemap-codec': 1.4.15
+ '@jridgewell/sourcemap-codec': 1.5.0
'@jsdevtools/[email protected]':
dependencies:
@@ -10159,7 +10471,7 @@ snapshots:
string-argv: 0.3.1
type-detect: 4.0.8
- '@lerna/[email protected]([email protected])([email protected])':
+ '@lerna/[email protected]([email protected])([email protected])':
dependencies:
'@npmcli/arborist': 7.5.3
'@npmcli/package-json': 5.2.0
@@ -10177,7 +10489,7 @@ snapshots:
console-control-strings: 1.1.0
conventional-changelog-core: 5.0.1
conventional-recommended-bump: 7.0.1
- cosmiconfig: 8.3.6([email protected])
+ cosmiconfig: 8.3.6([email protected])
dedent: 1.5.3
execa: 5.0.0
fs-extra: 11.2.0
@@ -10242,11 +10554,11 @@ snapshots:
- supports-color
- typescript
- '@mdi/[email protected]': {}
+ '@mdi/[email protected]': {}
- '@mdi/[email protected]': {}
+ '@mdi/[email protected](patch_hash=wt4lkgr52gphla2wb445bnli3i)': {}
- '@mdi/[email protected]': {}
+ '@mdi/[email protected]': {}
'@napi-rs/[email protected]':
dependencies:
@@ -10510,7 +10822,7 @@ snapshots:
'@octokit/[email protected]': {}
- '@octokit/[email protected]': {}
+ '@octokit/[email protected]': {}
'@octokit/[email protected]': {}
@@ -10576,7 +10888,7 @@ snapshots:
'@octokit/[email protected]':
dependencies:
- '@octokit/openapi-types': 22.0.1
+ '@octokit/openapi-types': 22.2.0
'@octokit/[email protected]':
dependencies:
@@ -10584,29 +10896,29 @@ snapshots:
'@one-ini/[email protected]': {}
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-command': 1.28.2([email protected])
- '@percy/cli-exec': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-exec': 1.28.2([email protected])
transitivePeerDependencies:
- bufferutil
- supports-color
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
transitivePeerDependencies:
- bufferutil
- supports-color
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/config': 1.28.2([email protected])
- '@percy/core': 1.28.2([email protected])
+ '@percy/config': 1.28.2([email protected])
+ '@percy/core': 1.28.2([email protected])
'@percy/logger': 1.28.2
transitivePeerDependencies:
- bufferutil
@@ -10614,18 +10926,18 @@ snapshots:
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
transitivePeerDependencies:
- bufferutil
- supports-color
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
cross-spawn: 7.0.3
which: 2.0.2
transitivePeerDependencies:
@@ -10634,9 +10946,9 @@ snapshots:
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
yaml: 2.4.1
transitivePeerDependencies:
- bufferutil
@@ -10644,9 +10956,9 @@ snapshots:
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
fast-glob: 3.3.2
image-size: 1.0.0
transitivePeerDependencies:
@@ -10655,15 +10967,15 @@ snapshots:
- typescript
- utf-8-validate
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/cli-app': 1.28.2([email protected])
- '@percy/cli-build': 1.28.2([email protected])
- '@percy/cli-command': 1.28.2([email protected])
- '@percy/cli-config': 1.28.2([email protected])
- '@percy/cli-exec': 1.28.2([email protected])
- '@percy/cli-snapshot': 1.28.2([email protected])
- '@percy/cli-upload': 1.28.2([email protected])
+ '@percy/cli-app': 1.28.2([email protected])
+ '@percy/cli-build': 1.28.2([email protected])
+ '@percy/cli-command': 1.28.2([email protected])
+ '@percy/cli-config': 1.28.2([email protected])
+ '@percy/cli-exec': 1.28.2([email protected])
+ '@percy/cli-snapshot': 1.28.2([email protected])
+ '@percy/cli-upload': 1.28.2([email protected])
'@percy/client': 1.28.2
'@percy/logger': 1.28.2
transitivePeerDependencies:
@@ -10677,22 +10989,22 @@ snapshots:
'@percy/env': 1.28.2
'@percy/logger': 1.28.2
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
'@percy/logger': 1.28.2
ajv: 8.12.0
- cosmiconfig: 8.3.6([email protected])
+ cosmiconfig: 8.3.6([email protected])
yaml: 2.4.1
transitivePeerDependencies:
- typescript
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
'@percy/client': 1.28.2
- '@percy/config': 1.28.2([email protected])
+ '@percy/config': 1.28.2([email protected])
'@percy/dom': 1.28.2
'@percy/logger': 1.28.2
- '@percy/webdriver-utils': 1.28.2([email protected])
+ '@percy/webdriver-utils': 1.28.2([email protected])
content-disposition: 0.5.4
cross-spawn: 7.0.3
extract-zip: 2.0.1([email protected])
@@ -10723,9 +11035,9 @@ snapshots:
'@percy/[email protected]': {}
- '@percy/[email protected]([email protected])':
+ '@percy/[email protected]([email protected])':
dependencies:
- '@percy/config': 1.28.2([email protected])
+ '@percy/config': 1.28.2([email protected])
'@percy/sdk-utils': 1.28.2
transitivePeerDependencies:
- typescript
@@ -10796,11 +11108,11 @@ snapshots:
magic-string: 0.25.7
rollup: 3.29.4
- '@rollup/[email protected]([email protected])([email protected])([email protected])':
+ '@rollup/[email protected]([email protected])([email protected])([email protected])':
dependencies:
'@rollup/pluginutils': 5.1.0([email protected])
resolve: 1.22.8
- typescript: 5.3.3
+ typescript: 5.5.4
optionalDependencies:
rollup: 3.29.4
tslib: 2.6.2
@@ -10959,11 +11271,11 @@ snapshots:
dependencies:
'@babel/parser': 7.25.3
'@babel/types': 7.25.2
- '@types/babel__generator': 7.6.1
+ '@types/babel__generator': 7.6.8
'@types/babel__template': 7.0.2
'@types/babel__traverse': 7.0.15
- '@types/[email protected]':
+ '@types/[email protected]':
dependencies:
'@babel/types': 7.25.2
@@ -11023,8 +11335,6 @@ snapshots:
'@types/parse5': 6.0.3
'@types/tough-cookie': 4.0.2
- '@types/[email protected]': {}
-
'@types/[email protected]': {}
'@types/[email protected]':
@@ -11089,8 +11399,6 @@ snapshots:
dependencies:
'@types/node': 20.12.7
- '@types/[email protected]': {}
-
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -11118,90 +11426,123 @@ snapshots:
'@types/node': 20.12.7
optional: true
- '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':
+ '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':
dependencies:
'@eslint-community/regexpp': 4.10.0
- '@typescript-eslint/parser': 6.21.0([email protected])([email protected])
- '@typescript-eslint/scope-manager': 6.21.0
- '@typescript-eslint/type-utils': 6.21.0([email protected])([email protected])
- '@typescript-eslint/utils': 6.21.0([email protected])([email protected])
- '@typescript-eslint/visitor-keys': 6.21.0
- debug: 4.3.4([email protected])
+ '@typescript-eslint/parser': 7.18.0([email protected])([email protected])
+ '@typescript-eslint/scope-manager': 7.18.0
+ '@typescript-eslint/type-utils': 7.18.0([email protected])([email protected])
+ '@typescript-eslint/utils': 7.18.0([email protected])([email protected])
+ '@typescript-eslint/visitor-keys': 7.18.0
eslint: 8.57.0
graphemer: 1.4.0
ignore: 5.3.1
natural-compare: 1.4.0
- semver: 7.6.0
- ts-api-utils: 1.0.3([email protected])
+ ts-api-utils: 1.3.0([email protected])
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]([email protected])([email protected])':
+ '@typescript-eslint/[email protected]([email protected])([email protected])':
dependencies:
- '@typescript-eslint/scope-manager': 6.21.0
- '@typescript-eslint/types': 6.21.0
- '@typescript-eslint/typescript-estree': 6.21.0([email protected])
- '@typescript-eslint/visitor-keys': 6.21.0
- debug: 4.3.4([email protected])
+ '@typescript-eslint/scope-manager': 7.18.0
+ '@typescript-eslint/types': 7.18.0
+ '@typescript-eslint/typescript-estree': 7.18.0([email protected])
+ '@typescript-eslint/visitor-keys': 7.18.0
+ debug: 4.3.6([email protected])
eslint: 8.57.0
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]':
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 7.18.0
+ '@typescript-eslint/visitor-keys': 7.18.0
+
+ '@typescript-eslint/[email protected]':
dependencies:
- '@typescript-eslint/types': 6.21.0
- '@typescript-eslint/visitor-keys': 6.21.0
+ '@typescript-eslint/types': 8.0.1
+ '@typescript-eslint/visitor-keys': 8.0.1
- '@typescript-eslint/[email protected]([email protected])([email protected])':
+ '@typescript-eslint/[email protected]([email protected])([email protected])':
dependencies:
- '@typescript-eslint/typescript-estree': 6.21.0([email protected])
- '@typescript-eslint/utils': 6.21.0([email protected])([email protected])
- debug: 4.3.4([email protected])
+ '@typescript-eslint/typescript-estree': 7.18.0([email protected])
+ '@typescript-eslint/utils': 7.18.0([email protected])([email protected])
+ debug: 4.3.6([email protected])
eslint: 8.57.0
- ts-api-utils: 1.0.3([email protected])
+ ts-api-utils: 1.3.0([email protected])
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]': {}
+ '@typescript-eslint/[email protected]': {}
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]': {}
+
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/types': 6.21.0
- '@typescript-eslint/visitor-keys': 6.21.0
- debug: 4.3.4([email protected])
+ '@typescript-eslint/types': 7.18.0
+ '@typescript-eslint/visitor-keys': 7.18.0
+ debug: 4.3.6([email protected])
globby: 11.1.0
is-glob: 4.0.3
- minimatch: 9.0.3
+ minimatch: 9.0.5
+ semver: 7.6.0
+ ts-api-utils: 1.3.0([email protected])
+ optionalDependencies:
+ typescript: 5.5.4
+ transitivePeerDependencies:
+ - supports-color
+
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ '@typescript-eslint/types': 8.0.1
+ '@typescript-eslint/visitor-keys': 8.0.1
+ debug: 4.3.6([email protected])
+ globby: 11.1.0
+ is-glob: 4.0.3
+ minimatch: 9.0.5
semver: 7.6.0
- ts-api-utils: 1.0.3([email protected])
+ ts-api-utils: 1.3.0([email protected])
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]([email protected])([email protected])':
+ '@typescript-eslint/[email protected]([email protected])([email protected])':
dependencies:
'@eslint-community/eslint-utils': 4.4.0([email protected])
- '@types/json-schema': 7.0.15
- '@types/semver': 7.5.6
- '@typescript-eslint/scope-manager': 6.21.0
- '@typescript-eslint/types': 6.21.0
- '@typescript-eslint/typescript-estree': 6.21.0([email protected])
+ '@typescript-eslint/scope-manager': 7.18.0
+ '@typescript-eslint/types': 7.18.0
+ '@typescript-eslint/typescript-estree': 7.18.0([email protected])
eslint: 8.57.0
- semver: 7.6.0
transitivePeerDependencies:
- supports-color
- typescript
- '@typescript-eslint/[email protected]':
+ '@typescript-eslint/[email protected]([email protected])([email protected])':
dependencies:
- '@typescript-eslint/types': 6.21.0
+ '@eslint-community/eslint-utils': 4.4.0([email protected])
+ '@typescript-eslint/scope-manager': 8.0.1
+ '@typescript-eslint/types': 8.0.1
+ '@typescript-eslint/typescript-estree': 8.0.1([email protected])
+ eslint: 8.57.0
+ transitivePeerDependencies:
+ - supports-color
+ - typescript
+
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 7.18.0
+ eslint-visitor-keys: 3.4.3
+
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 8.0.1
eslint-visitor-keys: 3.4.3
'@ungap/[email protected]': {}
@@ -11234,45 +11575,49 @@ snapshots:
'@unhead/schema': 1.8.9
'@unhead/shared': 1.8.9
- '@unhead/[email protected]([email protected]([email protected]))':
+ '@unhead/[email protected]([email protected]([email protected]))':
dependencies:
'@unhead/schema': 1.9.4
'@unhead/shared': 1.9.4
hookable: 5.5.3
unhead: 1.9.4
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
- '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))':
+ '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))':
dependencies:
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
- '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))':
+ '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))':
dependencies:
'@babel/core': 7.25.2
'@babel/plugin-transform-typescript': 7.25.2(@babel/[email protected])
'@vue/babel-plugin-jsx': 1.2.2(@babel/[email protected])
vite: 5.2.8(@types/[email protected])([email protected])([email protected])
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
transitivePeerDependencies:
- supports-color
- '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))':
+ '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))':
dependencies:
vite: 5.2.8(@types/[email protected])([email protected])([email protected])
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
- '@volar/[email protected]':
+ '@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))':
dependencies:
- '@volar/source-map': 1.11.1
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
+ vue: 3.4.27([email protected])
- '@volar/[email protected]':
+ '@volar/[email protected]':
dependencies:
- muggle-string: 0.3.1
+ '@volar/source-map': 2.4.0-alpha.18
- '@volar/[email protected]':
+ '@volar/[email protected]': {}
+
+ '@volar/[email protected]':
dependencies:
- '@volar/language-core': 1.11.1
+ '@volar/language-core': 2.4.0-alpha.18
path-browserify: 1.0.1
+ vscode-uri: 3.0.8
'@vue/[email protected]': {}
@@ -11324,8 +11669,8 @@ snapshots:
'@vue/compiler-ssr': 3.4.27
'@vue/shared': 3.4.27
estree-walker: 2.0.2
- magic-string: 0.30.10
- postcss: 8.4.38
+ magic-string: 0.30.11
+ postcss: 8.4.40
source-map-js: 1.2.0
'@vue/[email protected]':
@@ -11333,21 +11678,25 @@ snapshots:
'@vue/compiler-dom': 3.4.27
'@vue/shared': 3.4.27
+ '@vue/[email protected]':
+ dependencies:
+ de-indent: 1.0.2
+ he: 1.2.0
+
'@vue/[email protected]': {}
- '@vue/[email protected]([email protected])':
+ '@vue/[email protected]([email protected])':
dependencies:
- '@volar/language-core': 1.11.1
- '@volar/source-map': 1.11.1
+ '@volar/language-core': 2.4.0-alpha.18
'@vue/compiler-dom': 3.4.27
+ '@vue/compiler-vue2': 2.7.16
'@vue/shared': 3.4.27
computeds: 0.0.1
minimatch: 9.0.5
- muggle-string: 0.3.1
+ muggle-string: 0.4.1
path-browserify: 1.0.1
- vue-template-compiler: 2.7.14
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
'@vue/[email protected]':
dependencies:
@@ -11364,11 +11713,11 @@ snapshots:
'@vue/shared': 3.4.27
csstype: 3.1.3
- '@vue/[email protected]([email protected]([email protected]))':
+ '@vue/[email protected]([email protected]([email protected]))':
dependencies:
'@vue/compiler-ssr': 3.4.27
'@vue/shared': 3.4.27
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
'@vue/[email protected]': {}
@@ -11377,51 +11726,52 @@ snapshots:
js-beautify: 1.14.11
vue-component-type-helpers: 2.0.11
- '@vuelidate/[email protected]([email protected]([email protected]))':
+ '@vuelidate/[email protected]([email protected]([email protected]))':
dependencies:
- vue: 3.4.27([email protected])
- vue-demi: 0.13.11([email protected]([email protected]))
+ vue: 3.4.27([email protected])
+ vue-demi: 0.13.11([email protected]([email protected]))
- '@vuelidate/[email protected]([email protected]([email protected]))':
+ '@vuelidate/[email protected]([email protected]([email protected]))':
dependencies:
- vue: 3.4.27([email protected])
- vue-demi: 0.13.11([email protected]([email protected]))
+ vue: 3.4.27([email protected])
+ vue-demi: 0.13.11([email protected]([email protected]))
- '@vuetify/[email protected]([email protected]([email protected]))([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])))':
+ '@vuetify/[email protected]([email protected]([email protected]))([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])))':
dependencies:
upath: 2.0.1
- vue: 3.4.27([email protected])
- vuetify: 3.6.14([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))
+ vue: 3.4.27([email protected])
+ vuetify: 3.6.14([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))
optional: true
- '@vuetify/[email protected]([email protected]([email protected]))(vuetify@packages+vuetify)':
+ '@vuetify/[email protected]([email protected]([email protected]))(vuetify@packages+vuetify)':
dependencies:
upath: 2.0.1
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
vuetify: link:packages/vuetify
- '@vuetify/[email protected]([email protected])([email protected]([email protected]))(vuetify@packages+vuetify)':
+ '@vuetify/[email protected](@mdi/[email protected](patch_hash=wt4lkgr52gphla2wb445bnli3i))([email protected])([email protected]([email protected]))(vuetify@packages+vuetify)':
dependencies:
+ '@mdi/js': 7.4.47(patch_hash=wt4lkgr52gphla2wb445bnli3i)
lodash-es: 4.17.21
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
vuetify: link:packages/vuetify
- '@vueuse/[email protected]([email protected]([email protected]))':
+ '@vueuse/[email protected]([email protected]([email protected]))':
dependencies:
'@unhead/dom': 1.9.4
'@unhead/schema': 1.9.4
'@unhead/ssr': 1.8.9
- '@unhead/vue': 1.9.4([email protected]([email protected]))
- vue: 3.4.27([email protected])
+ '@unhead/vue': 1.9.4([email protected]([email protected]))
+ vue: 3.4.27([email protected])
- '@yankeeinlondon/[email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))':
+ '@yankeeinlondon/[email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))':
dependencies:
'@types/markdown-it': 12.2.3
'@yankeeinlondon/happy-wrapper': 2.10.1([email protected])([email protected])([email protected])([email protected])
fp-ts: 2.13.1
inferred-types: 0.37.6([email protected]([email protected]))([email protected])([email protected])([email protected])
markdown-it: 13.0.2
- vite-plugin-md: 0.22.5(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ vite-plugin-md: 0.22.5(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
transitivePeerDependencies:
- '@edge-runtime/vm'
- '@vitejs/plugin-vue'
@@ -11507,9 +11857,9 @@ snapshots:
acorn: 7.4.1
acorn-walk: 7.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- acorn: 8.11.2
+ acorn: 8.12.1
[email protected]: {}
@@ -11517,19 +11867,19 @@ snapshots:
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]: {}
[email protected]:
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
transitivePeerDependencies:
- supports-color
[email protected]:
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
transitivePeerDependencies:
- supports-color
@@ -11557,6 +11907,11 @@ snapshots:
'@algolia/events': 4.0.1
algoliasearch: 4.23.3
+ [email protected]([email protected]):
+ dependencies:
+ '@algolia/events': 4.0.1
+ algoliasearch: 4.23.3
+
[email protected]:
dependencies:
'@algolia/cache-browser-local-storage': 4.23.3
@@ -11721,14 +12076,14 @@ snapshots:
[email protected]: {}
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
caniuse-lite: 1.0.30001646
fraction.js: 4.3.7
normalize-range: 0.1.2
picocolors: 1.0.1
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
[email protected]:
@@ -12094,7 +12449,7 @@ snapshots:
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
anymatch: 3.1.2
braces: 3.0.2
@@ -12254,6 +12609,8 @@ snapshots:
tree-kill: 1.2.2
yargs: 17.7.2
+ [email protected]: {}
+
[email protected]:
dependencies:
ini: 1.3.8
@@ -12534,14 +12891,14 @@ snapshots:
path-type: 4.0.0
yaml: 1.10.2
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
import-fresh: 3.3.0
js-yaml: 4.1.0
parse-json: 5.2.0
path-type: 4.0.0
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
[email protected](@jest/[email protected])([email protected]):
dependencies:
@@ -12572,9 +12929,9 @@ snapshots:
[email protected]: {}
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
[email protected]:
dependencies:
@@ -12602,49 +12959,49 @@ snapshots:
[email protected]: {}
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
- css-declaration-sorter: 7.2.0([email protected])
- cssnano-utils: 4.0.2([email protected])
- postcss: 8.4.38
- postcss-calc: 9.0.1([email protected])
- postcss-colormin: 6.1.0([email protected])
- postcss-convert-values: 6.1.0([email protected])
- postcss-discard-comments: 6.0.2([email protected])
- postcss-discard-duplicates: 6.0.3([email protected])
- postcss-discard-empty: 6.0.3([email protected])
- postcss-discard-overridden: 6.0.2([email protected])
- postcss-merge-longhand: 6.0.5([email protected])
- postcss-merge-rules: 6.1.1([email protected])
- postcss-minify-font-values: 6.1.0([email protected])
- postcss-minify-gradients: 6.0.3([email protected])
- postcss-minify-params: 6.1.0([email protected])
- postcss-minify-selectors: 6.0.4([email protected])
- postcss-normalize-charset: 6.0.2([email protected])
- postcss-normalize-display-values: 6.0.2([email protected])
- postcss-normalize-positions: 6.0.2([email protected])
- postcss-normalize-repeat-style: 6.0.2([email protected])
- postcss-normalize-string: 6.0.2([email protected])
- postcss-normalize-timing-functions: 6.0.2([email protected])
- postcss-normalize-unicode: 6.1.0([email protected])
- postcss-normalize-url: 6.0.2([email protected])
- postcss-normalize-whitespace: 6.0.2([email protected])
- postcss-ordered-values: 6.0.2([email protected])
- postcss-reduce-initial: 6.1.0([email protected])
- postcss-reduce-transforms: 6.0.2([email protected])
- postcss-svgo: 6.0.3([email protected])
- postcss-unique-selectors: 6.0.4([email protected])
-
- [email protected]([email protected]):
- dependencies:
- postcss: 8.4.38
-
- [email protected]([email protected]):
- dependencies:
- cssnano-preset-default: 6.1.2([email protected])
+ css-declaration-sorter: 7.2.0([email protected])
+ cssnano-utils: 4.0.2([email protected])
+ postcss: 8.4.40
+ postcss-calc: 9.0.1([email protected])
+ postcss-colormin: 6.1.0([email protected])
+ postcss-convert-values: 6.1.0([email protected])
+ postcss-discard-comments: 6.0.2([email protected])
+ postcss-discard-duplicates: 6.0.3([email protected])
+ postcss-discard-empty: 6.0.3([email protected])
+ postcss-discard-overridden: 6.0.2([email protected])
+ postcss-merge-longhand: 6.0.5([email protected])
+ postcss-merge-rules: 6.1.1([email protected])
+ postcss-minify-font-values: 6.1.0([email protected])
+ postcss-minify-gradients: 6.0.3([email protected])
+ postcss-minify-params: 6.1.0([email protected])
+ postcss-minify-selectors: 6.0.4([email protected])
+ postcss-normalize-charset: 6.0.2([email protected])
+ postcss-normalize-display-values: 6.0.2([email protected])
+ postcss-normalize-positions: 6.0.2([email protected])
+ postcss-normalize-repeat-style: 6.0.2([email protected])
+ postcss-normalize-string: 6.0.2([email protected])
+ postcss-normalize-timing-functions: 6.0.2([email protected])
+ postcss-normalize-unicode: 6.1.0([email protected])
+ postcss-normalize-url: 6.0.2([email protected])
+ postcss-normalize-whitespace: 6.0.2([email protected])
+ postcss-ordered-values: 6.0.2([email protected])
+ postcss-reduce-initial: 6.1.0([email protected])
+ postcss-reduce-transforms: 6.0.2([email protected])
+ postcss-svgo: 6.0.3([email protected])
+ postcss-unique-selectors: 6.0.4([email protected])
+
+ [email protected]([email protected]):
+ dependencies:
+ postcss: 8.4.40
+
+ [email protected]([email protected]):
+ dependencies:
+ cssnano-preset-default: 6.1.2([email protected])
lilconfig: 3.1.1
- postcss: 8.4.38
+ postcss: 8.4.40
[email protected]:
dependencies:
@@ -12692,7 +13049,7 @@ snapshots:
commander: 6.2.1
common-tags: 1.8.0
dayjs: 1.10.4
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
enquirer: 2.3.6
eventemitter2: 6.4.7
execa: 4.1.0
@@ -12775,7 +13132,7 @@ snapshots:
optionalDependencies:
supports-color: 8.1.1
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
ms: 2.1.2
optionalDependencies:
@@ -13192,6 +13549,32 @@ snapshots:
'@esbuild/win32-ia32': 0.20.2
'@esbuild/win32-x64': 0.20.2
+ [email protected]:
+ optionalDependencies:
+ '@esbuild/aix-ppc64': 0.21.5
+ '@esbuild/android-arm': 0.21.5
+ '@esbuild/android-arm64': 0.21.5
+ '@esbuild/android-x64': 0.21.5
+ '@esbuild/darwin-arm64': 0.21.5
+ '@esbuild/darwin-x64': 0.21.5
+ '@esbuild/freebsd-arm64': 0.21.5
+ '@esbuild/freebsd-x64': 0.21.5
+ '@esbuild/linux-arm': 0.21.5
+ '@esbuild/linux-arm64': 0.21.5
+ '@esbuild/linux-ia32': 0.21.5
+ '@esbuild/linux-loong64': 0.21.5
+ '@esbuild/linux-mips64el': 0.21.5
+ '@esbuild/linux-ppc64': 0.21.5
+ '@esbuild/linux-riscv64': 0.21.5
+ '@esbuild/linux-s390x': 0.21.5
+ '@esbuild/linux-x64': 0.21.5
+ '@esbuild/netbsd-x64': 0.21.5
+ '@esbuild/openbsd-x64': 0.21.5
+ '@esbuild/sunos-x64': 0.21.5
+ '@esbuild/win32-arm64': 0.21.5
+ '@esbuild/win32-ia32': 0.21.5
+ '@esbuild/win32-x64': 0.21.5
+
[email protected]: {}
[email protected]: {}
@@ -13216,10 +13599,10 @@ snapshots:
dependencies:
eslint: 8.57.0
- [email protected]([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected]):
+ [email protected]([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected]):
dependencies:
eslint: 8.57.0
- eslint-plugin-import: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
+ eslint-plugin-import: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
eslint-plugin-n: 16.6.2([email protected])
eslint-plugin-promise: 6.1.1([email protected])
@@ -13236,11 +13619,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
- [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]):
+ [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]):
dependencies:
debug: 3.2.7([email protected])
optionalDependencies:
- '@typescript-eslint/parser': 6.21.0([email protected])([email protected])
+ '@typescript-eslint/parser': 7.18.0([email protected])([email protected])
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
transitivePeerDependencies:
@@ -13258,7 +13641,7 @@ snapshots:
eslint: 8.57.0
eslint-compat-utils: 0.1.2([email protected])
- [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected]):
+ [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected]):
dependencies:
array-includes: 3.1.7
array.prototype.findlastindex: 1.2.3
@@ -13268,7 +13651,7 @@ snapshots:
doctrine: 2.1.0
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
- eslint-module-utils: 2.8.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
+ eslint-module-utils: 2.8.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
hasown: 2.0.2
is-core-module: 2.13.1
is-glob: 4.0.3
@@ -13279,18 +13662,18 @@ snapshots:
semver: 6.3.1
tsconfig-paths: 3.15.0
optionalDependencies:
- '@typescript-eslint/parser': 6.21.0([email protected])([email protected])
+ '@typescript-eslint/parser': 7.18.0([email protected])([email protected])
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
- supports-color
- [email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected]))([email protected]):
+ [email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected]))([email protected]):
dependencies:
- '@typescript-eslint/utils': 6.21.0([email protected])([email protected])
+ '@typescript-eslint/utils': 8.0.1([email protected])([email protected])
eslint: 8.57.0
optionalDependencies:
- '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
+ '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
jest: 28.1.3(@types/[email protected])
transitivePeerDependencies:
- supports-color
@@ -13357,12 +13740,12 @@ snapshots:
transitivePeerDependencies:
- supports-color
- [email protected]([email protected])([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))):
+ [email protected]([email protected])([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))):
dependencies:
eslint: 8.57.0
eslint-plugin-vue: 9.24.1([email protected])
requireindex: 1.2.0
- vuetify: 3.6.14([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))
+ vuetify: 3.6.14([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))
transitivePeerDependencies:
- supports-color
@@ -13388,7 +13771,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.3
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
doctrine: 3.0.0
escape-string-regexp: 4.0.0
eslint-scope: 7.2.2
@@ -13420,8 +13803,8 @@ snapshots:
[email protected]:
dependencies:
- acorn: 8.11.2
- acorn-jsx: 5.3.2([email protected])
+ acorn: 8.12.1
+ acorn-jsx: 5.3.2([email protected])
eslint-visitor-keys: 3.4.3
[email protected]:
@@ -13535,7 +13918,7 @@ snapshots:
[email protected]([email protected]):
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
get-stream: 5.2.0
yauzl: 2.10.0
optionalDependencies:
@@ -14048,14 +14431,14 @@ snapshots:
dependencies:
'@tootallnate/once': 2.0.0
agent-base: 6.0.1
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
transitivePeerDependencies:
- supports-color
[email protected]:
dependencies:
agent-base: 7.1.1
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
transitivePeerDependencies:
- supports-color
@@ -14068,14 +14451,14 @@ snapshots:
[email protected]:
dependencies:
agent-base: 6.0.1
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
transitivePeerDependencies:
- supports-color
[email protected]:
dependencies:
agent-base: 7.1.1
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
transitivePeerDependencies:
- supports-color
@@ -14505,7 +14888,7 @@ snapshots:
[email protected]:
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
istanbul-lib-coverage: 3.2.0
source-map: 0.6.1
transitivePeerDependencies:
@@ -14943,7 +15326,7 @@ snapshots:
[email protected]:
dependencies:
abab: 2.0.6
- acorn: 8.11.2
+ acorn: 8.12.1
acorn-globals: 6.0.0
cssom: 0.5.0
cssstyle: 2.3.0
@@ -15006,7 +15389,7 @@ snapshots:
[email protected]:
dependencies:
- acorn: 8.11.2
+ acorn: 8.12.1
eslint-visitor-keys: 3.4.3
espree: 9.6.1
semver: 7.6.0
@@ -15055,7 +15438,7 @@ snapshots:
[email protected]([email protected]):
dependencies:
- '@lerna/create': 8.1.7([email protected])([email protected])
+ '@lerna/create': 8.1.7([email protected])([email protected])
'@npmcli/arborist': 7.5.3
'@npmcli/package-json': 5.2.0
'@npmcli/run-script': 8.1.0
@@ -15073,7 +15456,7 @@ snapshots:
conventional-changelog-angular: 7.0.0
conventional-changelog-core: 5.0.1
conventional-recommended-bump: 7.0.1
- cosmiconfig: 8.3.6([email protected])
+ cosmiconfig: 8.3.6([email protected])
dedent: 1.5.3
envinfo: 7.13.0
execa: 5.0.0
@@ -15126,7 +15509,7 @@ snapshots:
strong-log-transformer: 2.1.0
tar: 6.2.1
temp-dir: 1.0.0
- typescript: 5.3.3
+ typescript: 5.5.4
upath: 2.0.1
uuid: 10.0.0
validate-npm-package-license: 3.0.4
@@ -15223,8 +15606,8 @@ snapshots:
[email protected]:
dependencies:
- mlly: 1.4.2
- pkg-types: 1.0.3
+ mlly: 1.7.1
+ pkg-types: 1.1.3
[email protected]:
dependencies:
@@ -15318,9 +15701,9 @@ snapshots:
dependencies:
sourcemap-codec: 1.4.8
- [email protected]:
+ [email protected]:
dependencies:
- '@jridgewell/sourcemap-codec': 1.4.15
+ '@jridgewell/sourcemap-codec': 1.5.0
[email protected]:
dependencies:
@@ -15608,12 +15991,12 @@ snapshots:
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
- acorn: 8.11.2
- pathe: 1.1.1
- pkg-types: 1.0.3
- ufo: 1.3.2
+ acorn: 8.12.1
+ pathe: 1.1.2
+ pkg-types: 1.1.3
+ ufo: 1.5.4
[email protected]: {}
@@ -15629,7 +16012,7 @@ snapshots:
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]:
dependencies:
@@ -16148,7 +16531,7 @@ snapshots:
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]: {}
@@ -16170,13 +16553,13 @@ snapshots:
[email protected]: {}
- [email protected]([email protected])([email protected]([email protected])):
+ [email protected]([email protected])([email protected]([email protected])):
dependencies:
'@vue/devtools-api': 6.5.1
- vue: 3.4.27([email protected])
- vue-demi: 0.14.6([email protected]([email protected]))
+ vue: 3.4.27([email protected])
+ vue-demi: 0.14.6([email protected]([email protected]))
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
[email protected]:
dependencies:
@@ -16194,11 +16577,11 @@ snapshots:
dependencies:
find-up: 4.1.0
- [email protected]:
+ [email protected]:
dependencies:
- jsonc-parser: 3.2.1
- mlly: 1.4.2
- pathe: 1.1.1
+ confbox: 0.1.7
+ mlly: 1.7.1
+ pathe: 1.1.2
[email protected]:
dependencies:
@@ -16210,140 +16593,140 @@ snapshots:
[email protected]: {}
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-selector-parser: 6.0.16
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
caniuse-api: 3.0.0
colord: 2.9.3
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- stylehacks: 6.1.1([email protected])
+ stylehacks: 6.1.1([email protected])
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
caniuse-api: 3.0.0
- cssnano-utils: 4.0.2([email protected])
- postcss: 8.4.38
+ cssnano-utils: 4.0.2([email protected])
+ postcss: 8.4.40
postcss-selector-parser: 6.0.16
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
colord: 2.9.3
- cssnano-utils: 4.0.2([email protected])
- postcss: 8.4.38
+ cssnano-utils: 4.0.2([email protected])
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
- cssnano-utils: 4.0.2([email protected])
- postcss: 8.4.38
+ cssnano-utils: 4.0.2([email protected])
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-selector-parser: 6.0.16
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- cssnano-utils: 4.0.2([email protected])
- postcss: 8.4.38
+ cssnano-utils: 4.0.2([email protected])
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
caniuse-api: 3.0.0
- postcss: 8.4.38
+ postcss: 8.4.40
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
[email protected]:
@@ -16351,20 +16734,20 @@ snapshots:
cssesc: 3.0.0
util-deprecate: 1.0.2
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-value-parser: 4.2.0
svgo: 3.2.0
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-selector-parser: 6.0.16
[email protected]: {}
- [email protected]:
+ [email protected]:
dependencies:
nanoid: 3.3.7
picocolors: 1.0.1
@@ -16690,11 +17073,11 @@ snapshots:
[email protected]: {}
- [email protected]([email protected])([email protected]):
+ [email protected]([email protected])([email protected]):
dependencies:
- magic-string: 0.30.10
+ magic-string: 0.30.11
rollup: 3.29.4
- typescript: 5.3.3
+ typescript: 5.5.4
optionalDependencies:
'@babel/code-frame': 7.24.7
@@ -16803,7 +17186,7 @@ snapshots:
[email protected]:
dependencies:
- chokidar: 3.5.3
+ chokidar: 3.6.0
immutable: 4.0.0
source-map-js: 1.2.0
@@ -16931,7 +17314,7 @@ snapshots:
[email protected]:
dependencies:
agent-base: 7.1.1
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
socks: 2.8.3
transitivePeerDependencies:
- supports-color
@@ -17154,7 +17537,7 @@ snapshots:
[email protected]:
dependencies:
- acorn: 8.11.2
+ acorn: 8.12.1
[email protected]:
dependencies:
@@ -17162,10 +17545,10 @@ snapshots:
minimist: 1.2.8
through: 2.3.8
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
browserslist: 4.23.3
- postcss: 8.4.38
+ postcss: 8.4.40
postcss-selector-parser: 6.0.16
[email protected]:
@@ -17242,7 +17625,7 @@ snapshots:
[email protected]:
dependencies:
'@jridgewell/source-map': 0.3.6
- acorn: 8.11.2
+ acorn: 8.12.1
commander: 2.20.3
source-map-support: 0.5.21
@@ -17334,9 +17717,9 @@ snapshots:
[email protected]: {}
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
[email protected]:
dependencies:
@@ -17370,7 +17753,7 @@ snapshots:
[email protected]:
dependencies:
'@tufjs/models': 2.0.1
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
make-fetch-happen: 13.0.1
transitivePeerDependencies:
- supports-color
@@ -17439,13 +17822,13 @@ snapshots:
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]: {}
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]:
optional: true
@@ -17480,18 +17863,18 @@ snapshots:
[email protected]([email protected]):
dependencies:
'@rollup/pluginutils': 5.1.0([email protected])
- acorn: 8.11.2
+ acorn: 8.12.1
escape-string-regexp: 5.0.0
estree-walker: 3.0.3
fast-glob: 3.3.2
local-pkg: 0.5.0
- magic-string: 0.30.10
- mlly: 1.4.2
- pathe: 1.1.1
- pkg-types: 1.0.3
+ magic-string: 0.30.11
+ mlly: 1.7.1
+ pathe: 1.1.2
+ pkg-types: 1.1.3
scule: 1.2.0
strip-literal: 1.3.0
- unplugin: 1.6.0
+ unplugin: 1.12.1
transitivePeerDependencies:
- rollup
@@ -17519,67 +17902,67 @@ snapshots:
[email protected]([email protected]):
dependencies:
- '@antfu/utils': 0.7.7
+ '@antfu/utils': 0.7.10
'@rollup/pluginutils': 5.1.0([email protected])
fast-glob: 3.3.2
local-pkg: 0.5.0
- magic-string: 0.30.10
+ magic-string: 0.30.11
minimatch: 9.0.5
unimport: 3.7.1([email protected])
- unplugin: 1.6.0
+ unplugin: 1.12.1
transitivePeerDependencies:
- rollup
- [email protected]([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected]([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
fast-glob: 3.3.2
- unplugin: 1.6.0
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ unplugin: 1.12.1
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
- [email protected](@babel/[email protected])([email protected])([email protected]([email protected])):
+ [email protected](@babel/[email protected])([email protected])([email protected]([email protected])):
dependencies:
- '@antfu/utils': 0.7.7
+ '@antfu/utils': 0.7.10
'@rollup/pluginutils': 5.1.0([email protected])
- chokidar: 3.5.3
- debug: 4.3.4([email protected])
+ chokidar: 3.6.0
+ debug: 4.3.6([email protected])
fast-glob: 3.3.2
- local-pkg: 0.4.3
- magic-string: 0.30.10
+ local-pkg: 0.5.0
+ magic-string: 0.30.11
minimatch: 9.0.5
- resolve: 1.22.8
- unplugin: 1.6.0
- vue: 3.4.27([email protected])
+ mlly: 1.7.1
+ unplugin: 1.12.1
+ vue: 3.4.27([email protected])
optionalDependencies:
'@babel/parser': 7.25.3
transitivePeerDependencies:
- rollup
- supports-color
- [email protected](@babel/[email protected])([email protected])([email protected]([email protected])):
+ [email protected](@babel/[email protected])([email protected])([email protected]([email protected])):
dependencies:
- '@antfu/utils': 0.7.7
+ '@antfu/utils': 0.7.10
'@rollup/pluginutils': 5.1.0([email protected])
- chokidar: 3.5.3
- debug: 4.3.4([email protected])
+ chokidar: 3.6.0
+ debug: 4.3.6([email protected])
fast-glob: 3.3.2
- local-pkg: 0.4.3
- magic-string: 0.30.10
+ local-pkg: 0.5.0
+ magic-string: 0.30.11
minimatch: 9.0.5
- resolve: 1.22.8
- unplugin: 1.6.0
- vue: 3.4.27([email protected])
+ mlly: 1.7.1
+ unplugin: 1.12.1
+ vue: 3.4.27([email protected])
optionalDependencies:
'@babel/parser': 7.25.3
transitivePeerDependencies:
- rollup
- supports-color
- [email protected]:
+ [email protected]:
dependencies:
- acorn: 8.11.2
- chokidar: 3.5.3
+ acorn: 8.12.1
+ chokidar: 3.6.0
webpack-sources: 3.2.3
- webpack-virtual-modules: 0.6.1
+ webpack-virtual-modules: 0.6.2
[email protected]: {}
@@ -17631,11 +18014,11 @@ snapshots:
[email protected]: {}
- [email protected]([email protected]([email protected])):
+ [email protected]([email protected]([email protected])):
dependencies:
'@vue/devtools-api': 6.5.1
type-fest: 4.15.0
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
[email protected]:
dependencies:
@@ -17643,33 +18026,32 @@ snapshots:
core-util-is: 1.0.2
extsprintf: 1.4.0
- [email protected]([email protected])([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected]([email protected])([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
- '@antfu/utils': 0.7.7
+ '@antfu/utils': 0.7.10
'@rollup/pluginutils': 5.1.0([email protected])
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
error-stack-parser-es: 0.1.1
fs-extra: 11.2.0
open: 10.1.0
perfect-debounce: 1.0.0
picocolors: 1.0.1
sirv: 2.0.4
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
transitivePeerDependencies:
- rollup
- supports-color
- [email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected]([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
- '@yankeeinlondon/builder-api': 1.4.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ '@yankeeinlondon/builder-api': 1.4.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
'@yankeeinlondon/gray-matter': 6.1.1([email protected]([email protected]))([email protected])([email protected])([email protected])
'@yankeeinlondon/happy-wrapper': 2.10.1([email protected])([email protected])([email protected])([email protected])
markdown-it: 13.0.2
source-map-js: 1.2.0
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
transitivePeerDependencies:
- '@edge-runtime/vm'
- - '@vitejs/plugin-vue'
- '@vitest/browser'
- '@vitest/ui'
- encoding
@@ -17683,15 +18065,15 @@ snapshots:
- supports-color
- terser
- [email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
- '@vitejs/plugin-vue': 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
- '@yankeeinlondon/builder-api': 1.4.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
+ '@vitejs/plugin-vue': 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
+ '@yankeeinlondon/builder-api': 1.4.1(@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))
'@yankeeinlondon/gray-matter': 6.1.1([email protected]([email protected]))([email protected])([email protected])([email protected])
'@yankeeinlondon/happy-wrapper': 2.10.1([email protected])([email protected])([email protected])([email protected])
markdown-it: 13.0.2
source-map-js: 1.2.0
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
transitivePeerDependencies:
- '@edge-runtime/vm'
- '@vitest/browser'
@@ -17707,86 +18089,86 @@ snapshots:
- supports-color
- terser
- [email protected](@vue/[email protected])([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected](@vue/[email protected])([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
'@types/debug': 4.1.12
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
deep-equal: 2.2.3
extract-comments: 1.1.0
fast-glob: 3.3.2
json5: 2.2.3
local-pkg: 0.5.0
picocolors: 1.0.1
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
yaml: 2.4.1
optionalDependencies:
'@vue/compiler-sfc': 3.4.27
transitivePeerDependencies:
- supports-color
- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
fast-glob: 3.3.2
pretty-bytes: 6.1.1
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
workbox-build: 7.0.0(@types/[email protected])
workbox-window: 7.0.0
transitivePeerDependencies:
- '@types/babel__core'
- supports-color
- [email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected])):
+ [email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected])):
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
fast-glob: 3.3.2
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
- vue: 3.4.27([email protected])
- vue-router: 4.3.0([email protected]([email protected]))
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
+ vue: 3.4.27([email protected])
+ vue-router: 4.3.0([email protected]([email protected]))
transitivePeerDependencies:
- supports-color
- [email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))([email protected]):
+ [email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))([email protected]):
dependencies:
- '@vuetify/loader-shared': 2.0.3([email protected]([email protected]))([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])))
- debug: 4.3.4([email protected])
+ '@vuetify/loader-shared': 2.0.3([email protected]([email protected]))([email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])))
+ debug: 4.3.6([email protected])
upath: 2.0.1
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
- vue: 3.4.27([email protected])
- vuetify: 3.6.14([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
+ vue: 3.4.27([email protected])
+ vuetify: 3.6.14([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]))
transitivePeerDependencies:
- supports-color
optional: true
- [email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))(vuetify@packages+vuetify):
+ [email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))(vuetify@packages+vuetify):
dependencies:
- '@vuetify/loader-shared': 2.0.3([email protected]([email protected]))(vuetify@packages+vuetify)
- debug: 4.3.4([email protected])
+ '@vuetify/loader-shared': 2.0.3([email protected]([email protected]))(vuetify@packages+vuetify)
+ debug: 4.3.6([email protected])
upath: 2.0.1
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
- vue: 3.4.27([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
+ vue: 3.4.27([email protected])
vuetify: link:packages/vuetify
transitivePeerDependencies:
- supports-color
- [email protected]([email protected](@types/[email protected])([email protected])([email protected])):
+ [email protected]([email protected](@types/[email protected])([email protected])([email protected])):
dependencies:
fast-glob: 3.3.2
- vite: 5.2.8(@types/[email protected])([email protected])([email protected])
+ vite: 5.4.0-beta.1(@types/[email protected])([email protected])([email protected])
- [email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))(@vueuse/[email protected]([email protected]([email protected])))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected])):
+ [email protected](@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected])))(@vueuse/[email protected]([email protected]([email protected])))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]([email protected])))([email protected]([email protected])):
dependencies:
'@rollup/plugin-replace': 3.0.0([email protected])
- '@vue/server-renderer': 3.4.27([email protected]([email protected]))
+ '@vue/server-renderer': 3.4.27([email protected]([email protected]))
chalk: 4.1.2
connect: 3.7.0
node-fetch: 2.6.7([email protected])
vite: 5.2.8(@types/[email protected])([email protected])([email protected])
optionalDependencies:
- '@vitejs/plugin-vue': 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
- '@vueuse/head': 1.3.1([email protected]([email protected]))
- vue: 3.4.27([email protected])
- vue-router: 4.3.0([email protected]([email protected]))
+ '@vitejs/plugin-vue': 5.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))
+ '@vueuse/head': 1.3.1([email protected]([email protected]))
+ vue: 3.4.27([email protected])
+ vue-router: 4.3.0([email protected]([email protected]))
transitivePeerDependencies:
- encoding
- rollup
@@ -17795,7 +18177,7 @@ snapshots:
[email protected](@types/[email protected])([email protected])([email protected]):
dependencies:
esbuild: 0.18.20
- postcss: 8.4.38
+ postcss: 8.4.40
rollup: 3.29.4
optionalDependencies:
'@types/node': 20.12.7
@@ -17806,7 +18188,18 @@ snapshots:
[email protected](@types/[email protected])([email protected])([email protected]):
dependencies:
esbuild: 0.20.2
- postcss: 8.4.38
+ postcss: 8.4.40
+ rollup: 4.14.1
+ optionalDependencies:
+ '@types/node': 20.12.7
+ fsevents: 2.3.3
+ sass: 1.77.8
+ terser: 5.31.3
+
+ [email protected](@types/[email protected])([email protected])([email protected]):
+ dependencies:
+ esbuild: 0.21.5
+ postcss: 8.4.40
rollup: 4.14.1
optionalDependencies:
'@types/node': 20.12.7
@@ -17819,10 +18212,10 @@ snapshots:
'@types/chai': 4.3.4
'@types/chai-subset': 1.3.3
'@types/node': 20.12.7
- acorn: 8.11.2
+ acorn: 8.12.1
acorn-walk: 8.3.2
chai: 4.3.7
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
local-pkg: 0.4.3
source-map: 0.6.1
strip-literal: 1.3.0
@@ -17842,21 +18235,23 @@ snapshots:
- supports-color
- terser
+ [email protected]: {}
+
[email protected]: {}
[email protected]: {}
- [email protected]([email protected]([email protected])):
+ [email protected]([email protected]([email protected])):
dependencies:
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
- [email protected]([email protected]([email protected])):
+ [email protected]([email protected]([email protected])):
dependencies:
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
[email protected]([email protected]):
dependencies:
- debug: 4.3.4([email protected])
+ debug: 4.3.6([email protected])
eslint: 8.57.0
eslint-scope: 7.2.2
eslint-visitor-keys: 3.4.3
@@ -17867,63 +18262,58 @@ snapshots:
transitivePeerDependencies:
- supports-color
- [email protected]([email protected]([email protected])):
+ [email protected]([email protected]([email protected])):
dependencies:
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
- [email protected]([email protected]([email protected])):
+ [email protected]([email protected]([email protected])):
dependencies:
'@intlify/core-base': 9.11.1
'@intlify/shared': 9.11.1
'@vue/devtools-api': 6.5.1
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
- [email protected](@vue/[email protected]([email protected]([email protected])))([email protected])([email protected]([email protected])):
+ [email protected](@vue/[email protected]([email protected]([email protected])))([email protected])([email protected]([email protected])):
dependencies:
algoliasearch: 4.23.3
instantsearch-ui-components: 0.5.0
instantsearch.js: 4.68.0([email protected])
mitt: 2.1.0
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
optionalDependencies:
- '@vue/server-renderer': 3.4.27([email protected]([email protected]))
+ '@vue/server-renderer': 3.4.27([email protected]([email protected]))
[email protected]: {}
- [email protected]([email protected]([email protected])):
+ [email protected]([email protected]([email protected])):
dependencies:
'@vue/devtools-api': 6.5.1
- vue: 3.4.27([email protected])
-
- [email protected]:
- dependencies:
- de-indent: 1.0.2
- he: 1.2.0
+ vue: 3.4.27([email protected])
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
- '@volar/typescript': 1.11.1
- '@vue/language-core': 1.8.27([email protected])
+ '@volar/typescript': 2.4.0-alpha.18
+ '@vue/language-core': 2.0.29([email protected])
semver: 7.6.0
- typescript: 5.3.3
+ typescript: 5.5.4
- [email protected]([email protected]):
+ [email protected]([email protected]):
dependencies:
'@vue/compiler-dom': 3.4.27
'@vue/compiler-sfc': 3.4.27
'@vue/runtime-dom': 3.4.27
- '@vue/server-renderer': 3.4.27([email protected]([email protected]))
+ '@vue/server-renderer': 3.4.27([email protected]([email protected]))
'@vue/shared': 3.4.27
optionalDependencies:
- typescript: 5.3.3
+ typescript: 5.5.4
- [email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])):
+ [email protected]([email protected])([email protected])([email protected]([email protected]([email protected])))([email protected]([email protected])):
dependencies:
- vue: 3.4.27([email protected])
+ vue: 3.4.27([email protected])
optionalDependencies:
- typescript: 5.3.3
- vite-plugin-vuetify: 2.0.3([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))([email protected])
- vue-i18n: 9.11.1([email protected]([email protected]))
+ typescript: 5.5.4
+ vite-plugin-vuetify: 2.0.4([email protected](@types/[email protected])([email protected])([email protected]))([email protected]([email protected]))([email protected])
+ vue-i18n: 9.11.1([email protected]([email protected]))
[email protected]:
dependencies:
@@ -17951,7 +18341,7 @@ snapshots:
[email protected]: {}
- [email protected]: {}
+ [email protected]: {}
[email protected]:
dependencies:
diff --git a/tsconfig.json b/tsconfig.json
index 2717b330049..a9929fc86d8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -42,6 +42,7 @@
/* Module Resolution Options */
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+ "resolveJsonModule": true,
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": { /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// },
|
bbe5b2cfa3e93c1b84a8c14124019c10ec31c7c9
|
2023-08-31 19:42:08
|
John Leider
|
fix(filter): always pass InternalItem to custom filter function (#17832)
| false
|
always pass InternalItem to custom filter function (#17832)
|
fix
|
diff --git a/packages/vuetify/src/composables/filter.ts b/packages/vuetify/src/composables/filter.ts
index a0ee0be4681..d3f6000b68a 100644
--- a/packages/vuetify/src/composables/filter.ts
+++ b/packages/vuetify/src/composables/filter.ts
@@ -16,7 +16,7 @@ import type { MaybeRef } from '@/util'
* - multiple matches (start, end), probably shouldn't overlap
*/
export type FilterMatch = boolean | number | [number, number] | [number, number][]
-export type FilterFunction = (value: string, query: string, item?: any) => FilterMatch
+export type FilterFunction = (value: string, query: string, item?: InternalItem) => FilterMatch
export type FilterKeyFunctions = Record<string, FilterFunction>
export type FilterKeys = string | string[]
export type FilterMode = 'some' | 'every' | 'union' | 'intersection'
@@ -29,6 +29,11 @@ export interface FilterProps {
noFilter?: boolean
}
+export interface InternalItem<T = any> {
+ value: any
+ raw: T
+}
+
// Composables
export const defaultFilter: FilterFunction = (value, query, item) => {
if (value == null || query == null) return -1
@@ -48,7 +53,7 @@ export const makeFilterProps = propsFactory({
}, 'filter')
export function filterItems (
- items: any[],
+ items: readonly (readonly [item: InternalItem, transformed: {}])[] | readonly InternalItem[],
query: string,
options?: {
customKeyFilter?: FilterKeyFunctions
@@ -68,17 +73,17 @@ export function filterItems (
loop:
for (let i = 0; i < items.length; i++) {
- const item = items[i]
+ const [item, transformed = item] = wrapInArray(items[i]) as readonly [InternalItem, {}]
const customMatches: Record<string, FilterMatch> = {}
const defaultMatches: Record<string, FilterMatch> = {}
let match: FilterMatch = -1
if (query && !options?.noFilter) {
if (typeof item === 'object') {
- const filterKeys = keys || Object.keys(item)
+ const filterKeys = keys || Object.keys(transformed)
for (const key of filterKeys) {
- const value = getPropertyFromItem(item as any, key, item)
+ const value = getPropertyFromItem(transformed, key, transformed)
const keyFilter = options?.customKeyFilter?.[key]
match = keyFilter
@@ -125,17 +130,21 @@ export function filterItems (
return array
}
-export function useFilter <T extends { value: unknown }> (
+export function useFilter <T extends InternalItem> (
props: FilterProps,
items: MaybeRef<T[]>,
query: Ref<string | undefined> | (() => string | undefined),
options?: {
- transform?: (item: T) => any
+ transform?: (item: T) => {}
}
) {
const filteredItems: Ref<T[]> = ref([])
const filteredMatches: Ref<Map<unknown, Record<string, FilterMatch>>> = ref(new Map())
- const transformedItems = computed(() => options?.transform ? unref(items).map(options?.transform) : unref(items))
+ const transformedItems = computed(() => (
+ options?.transform
+ ? unref(items).map(item => ([item, options.transform!(item)] as const))
+ : unref(items)
+ ))
watchEffect(() => {
const _query = typeof query === 'function' ? query() : unref(query)
diff --git a/packages/vuetify/src/composables/list-items.ts b/packages/vuetify/src/composables/list-items.ts
index fc4a61b8685..67dcfaf9fa4 100644
--- a/packages/vuetify/src/composables/list-items.ts
+++ b/packages/vuetify/src/composables/list-items.ts
@@ -4,18 +4,17 @@ import { deepEqual, getPropertyFromItem, pick, propsFactory } from '@/util'
// Types
import type { PropType, Ref } from 'vue'
+import type { InternalItem } from '@/composables/filter'
import type { SelectItemKey } from '@/util'
-export interface ListItem<T = any> {
+export interface ListItem<T = any> extends InternalItem<T> {
title: string
- value: any
props: {
[key: string]: any
title: string
value: any
}
children?: ListItem<T>[]
- raw: T
}
export interface ItemProps {
diff --git a/packages/vuetify/src/labs/VDataTable/types.ts b/packages/vuetify/src/labs/VDataTable/types.ts
index 2bfbdb9483b..ae5a9f1c562 100644
--- a/packages/vuetify/src/labs/VDataTable/types.ts
+++ b/packages/vuetify/src/labs/VDataTable/types.ts
@@ -1,6 +1,7 @@
// Types
import type { GroupableItem } from './composables/group'
import type { SelectableItem } from './composables/select'
+import type { InternalItem } from '@/composables/filter'
import type { SelectItemKey } from '@/util'
export type DataTableCompareFunction<T = any> = (a: T, b: T) => number
@@ -30,7 +31,7 @@ export type InternalDataTableHeader = DataTableHeader & {
lastFixed?: boolean
}
-export interface DataTableItem<T = any> extends GroupableItem<T>, SelectableItem {
+export interface DataTableItem<T = any> extends InternalItem<T>, GroupableItem<T>, SelectableItem {
key: any
index: number
columns: {
|
6d829efff05ff6d491a719b21f3ea88f5ce1aeaf
|
2019-10-21 22:41:44
|
Daan Roet
|
fix(theme): use new vue-meta api (#9268)
| false
|
use new vue-meta api (#9268)
|
fix
|
diff --git a/packages/vuetify/src/services/theme/__tests__/theme.spec.ts b/packages/vuetify/src/services/theme/__tests__/theme.spec.ts
index beae20b3c94..4a9a401e724 100644
--- a/packages/vuetify/src/services/theme/__tests__/theme.spec.ts
+++ b/packages/vuetify/src/services/theme/__tests__/theme.spec.ts
@@ -263,4 +263,19 @@ describe('Theme.ts', () => {
expect(theme.generatedStyles).toMatchSnapshot()
expect(spy).toHaveBeenCalledTimes(3)
})
+
+ it('should use [email protected] functionality', () => {
+ const theme = new Theme(mock)
+ const set = jest.fn()
+
+ const $meta = () => ({
+ addApp: () => ({ set }),
+ })
+
+ ;(instance as any).$meta = $meta as any
+
+ theme.init(instance)
+
+ expect(set).toHaveBeenCalled()
+ })
})
diff --git a/packages/vuetify/src/services/theme/index.ts b/packages/vuetify/src/services/theme/index.ts
index 88c9e885de1..dab1dd9e95c 100644
--- a/packages/vuetify/src/services/theme/index.ts
+++ b/packages/vuetify/src/services/theme/index.ts
@@ -50,7 +50,7 @@ export class Theme extends Service {
private vueInstance = null as Vue | null
- private vueMeta = false
+ private vueMeta = null as any | null
constructor (options: Partial<ITheme> = {}) {
super()
@@ -74,7 +74,12 @@ export class Theme extends Service {
// When setting css, check for element
// and apply new values
set css (val: string) {
- if (this.vueMeta) return
+ if (this.vueMeta) {
+ if (this.isVueMeta23) {
+ this.applyVueMeta23()
+ }
+ return
+ }
this.checkOrCreateStyleElement() && (this.styleEl!.innerHTML = val)
}
@@ -159,6 +164,7 @@ export class Theme extends Service {
// Generate the style element
// if applicable
private genStyleElement (): void {
+ /* istanbul ignore if */
if (typeof document === 'undefined') return
/* istanbul ignore next */
@@ -176,10 +182,16 @@ export class Theme extends Service {
}
private initVueMeta (root: any) {
- this.vueMeta = true
+ this.vueMeta = root.$meta()
+ if (this.isVueMeta23) {
+ // vue-meta needs to apply after mounted()
+ root.$nextTick(() => {
+ this.applyVueMeta23()
+ })
+ return
+ }
- const meta = root.$meta()
- const metaKeyName = typeof meta.getOptions === 'function' ? meta.getOptions().keyName : 'metaInfo'
+ const metaKeyName = typeof this.vueMeta.getOptions === 'function' ? this.vueMeta.getOptions().keyName : 'metaInfo'
const metaInfo = root.$options[metaKeyName] || {}
root.$options[metaKeyName] = () => {
@@ -192,7 +204,7 @@ export class Theme extends Service {
cssText: this.generatedStyles,
type: 'text/css',
id: 'vuetify-theme-stylesheet',
- nonce: (this.options && this.options.cspNonce) || undefined,
+ nonce: (this.options || {}).cspNonce,
})
} else {
vuetifyStylesheet.cssText = this.generatedStyles
@@ -202,6 +214,19 @@ export class Theme extends Service {
}
}
+ private applyVueMeta23 () {
+ const { set } = this.vueMeta.addApp('vuetify')
+
+ set({
+ style: [{
+ cssText: this.generatedStyles,
+ type: 'text/css',
+ id: 'vuetify-theme-stylesheet',
+ nonce: (this.options || {}).cspNonce,
+ }],
+ })
+ }
+
private initSSR (ssrContext?: any) {
const options = this.options || {}
// SSR
@@ -270,4 +295,10 @@ export class Theme extends Service {
const theme = this.currentTheme || {}
return ThemeUtils.parse(theme)
}
+
+ // Is using v2.3 of vue-meta
+ // https://github.com/nuxt/vue-meta/releases/tag/v2.3.0
+ private get isVueMeta23 (): boolean {
+ return typeof this.vueMeta.addApp === 'function'
+ }
}
|
133d43e4dd11c5edad59ecb3c1662bd8632165ed
|
2019-03-29 21:14:28
|
sh7dm
|
refactor(VAutocomplete): convert styles to Sass, variables to SCSS
| false
|
convert styles to Sass, variables to SCSS
|
refactor
|
diff --git a/packages/vuetify/src/stylus/components/_autocompletes.styl b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.sass
similarity index 85%
rename from packages/vuetify/src/stylus/components/_autocompletes.styl
rename to packages/vuetify/src/components/VAutocomplete/VAutocomplete.sass
index 0ce9e9fe5b5..afa32fe2a61 100644
--- a/packages/vuetify/src/stylus/components/_autocompletes.styl
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.sass
@@ -1,3 +1,5 @@
+@import './_variables.scss'
+
.v-autocomplete
&.v-input > .v-input__control > .v-input__slot
cursor: text
@@ -13,7 +15,7 @@
// selections padding
&.v-text-field--enclosed:not(.v-text-field--solo):not(.v-text-field--single-line)
.v-select__slot > input
- margin-top: 24px
+ margin-top: $autocomplete-enclosed-input-margin-top
&:not(.v-input--is-disabled).v-select.v-text-field
input
diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.ts b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.ts
index 7fd95642766..e22756fe824 100644
--- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.ts
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.ts
@@ -1,5 +1,5 @@
// Styles
-import '../../stylus/components/_autocompletes.styl'
+import './VAutocomplete.sass'
// Extensions
import VSelect, { defaultMenuProps as VSelectMenuProps } from '../VSelect/VSelect'
diff --git a/packages/vuetify/src/components/VAutocomplete/_variables.scss b/packages/vuetify/src/components/VAutocomplete/_variables.scss
new file mode 100644
index 00000000000..a1aab74c673
--- /dev/null
+++ b/packages/vuetify/src/components/VAutocomplete/_variables.scss
@@ -0,0 +1 @@
+$autocomplete-enclosed-input-margin-top: 24px;
diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.js b/packages/vuetify/src/components/VCombobox/VCombobox.js
index 61ee002b538..82fa5f82274 100644
--- a/packages/vuetify/src/components/VCombobox/VCombobox.js
+++ b/packages/vuetify/src/components/VCombobox/VCombobox.js
@@ -1,5 +1,5 @@
// Styles
-import '../../stylus/components/_autocompletes.styl'
+import '../VAutocomplete/VAutocomplete.sass'
// Extensions
import VSelect from '../VSelect/VSelect'
|
d5bfe9bced1eacb04b32d400c771604f8d878dab
|
2022-10-25 18:06:03
|
Kael
|
test(VCombobox): add nextTick before checking model
| false
|
add nextTick before checking model
|
test
|
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index b4a92816dbb..2b19eaa9884 100755
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -105,7 +105,7 @@
"test:coverage": "yarn test --coverage",
"lint": "concurrently -n \"tsc,eslint\" --kill-others-on-fail \"tsc -p tsconfig.checks.json --noEmit --pretty\" \"eslint src -f codeframe --max-warnings 0\"",
"lint:fix": "concurrently -n \"tsc,eslint\" \"tsc -p tsconfig.checks.json --noEmit --pretty\" \"eslint --fix src\"",
- "cy:open": "cypress open --component -b chrome",
+ "cy:open": "cypress open --component -b electron",
"cy:run": "percy exec -- cypress run --component"
},
"devDependencies": {
diff --git a/packages/vuetify/src/components/VCombobox/__tests__/VCombobox.spec.cy.tsx b/packages/vuetify/src/components/VCombobox/__tests__/VCombobox.spec.cy.tsx
index 01c6da4a6a6..9871dd3f94a 100644
--- a/packages/vuetify/src/components/VCombobox/__tests__/VCombobox.spec.cy.tsx
+++ b/packages/vuetify/src/components/VCombobox/__tests__/VCombobox.spec.cy.tsx
@@ -1,7 +1,7 @@
/// <reference types="../../../../types/cypress" />
import { VCombobox } from '../VCombobox'
-import { ref } from 'vue'
+import { nextTick, ref } from 'vue'
describe('VCombobox', () => {
describe('closableChips', () => {
@@ -58,7 +58,8 @@ describe('VCombobox', () => {
.get('.v-list-item')
.eq(0)
.click({ waitForAnimations: false })
- .then(() => {
+ .then(async () => {
+ await nextTick()
expect(model.value).to.deep.equal(items[0])
expect(search.value).to.deep.equal(items[0].title)
})
@@ -72,7 +73,8 @@ describe('VCombobox', () => {
.click()
.clear()
.type('Item 2')
- .then(() => {
+ .then(async () => {
+ await nextTick()
expect(model.value).to.equal('Item 2')
expect(search.value).to.equal('Item 2')
})
@@ -85,7 +87,8 @@ describe('VCombobox', () => {
.click()
.clear()
.type('item3')
- .then(() => {
+ .then(async () => {
+ await nextTick()
expect(model.value).to.equal('item3')
expect(search.value).to.equal('item3')
})
@@ -135,7 +138,8 @@ describe('VCombobox', () => {
.click()
.type('Item 2')
.blur()
- .then(() => {
+ .then(async () => {
+ await nextTick()
expect(model.value).to.deep.equal([items[0], 'Item 2'])
expect(search.value).to.equal('')
})
@@ -147,7 +151,8 @@ describe('VCombobox', () => {
.click()
.type('item3')
.blur()
- .then(() => {
+ .then(async () => {
+ await nextTick()
expect(model.value).to.deep.equal([items[0], 'Item 2', 'item3'])
expect(search.value).to.equal('')
})
|
527895c8b80077c84676d408797a010a9d18215e
|
2022-08-30 01:51:57
|
John Leider
|
fix(utilities): property target for text-opacity utility class
| false
|
property target for text-opacity utility class
|
fix
|
diff --git a/packages/vuetify/src/styles/settings/_utilities.scss b/packages/vuetify/src/styles/settings/_utilities.scss
index 4f945dabb61..fd95d6bafb7 100644
--- a/packages/vuetify/src/styles/settings/_utilities.scss
+++ b/packages/vuetify/src/styles/settings/_utilities.scss
@@ -443,12 +443,12 @@ $utilities: () !default;
values: (break: break-word)
),
"text-opacity": (
- property: opacity,
+ property: color,
class: text,
values: (
- high-emphasis: var(--v-high-emphasis-opacity),
- medium-emphasis: var(--v-medium-emphasis-opacity),
- disabled: var(--v-disabled-opacity)
+ high-emphasis: rgba(var(--v-theme-on-background), var(--v-high-emphasis-opacity)),
+ medium-emphasis: rgba(var(--v-theme-on-background), var(--v-medium-emphasis-opacity)),
+ disabled: rgba(var(--v-theme-on-background), var(--v-disabled-opacity)),
)
),
"text-overflow": (
|
5c8be69fc4044d9245cdec40c34a228f23c1339a
|
2020-02-04 00:23:01
|
John Leider
|
fix(VMessages/VCounter): resolve layout jump caused by incorrect line-height
| false
|
resolve layout jump caused by incorrect line-height
|
fix
|
diff --git a/packages/vuetify/src/components/VCounter/VCounter.sass b/packages/vuetify/src/components/VCounter/VCounter.sass
index 17b018a4a9d..d1a3f09ad03 100644
--- a/packages/vuetify/src/components/VCounter/VCounter.sass
+++ b/packages/vuetify/src/components/VCounter/VCounter.sass
@@ -8,4 +8,4 @@
flex: 0 1 auto
font-size: $counter-font-size
min-height: $counter-min-height
- line-height: 1
+ line-height: $counter-line-height
diff --git a/packages/vuetify/src/components/VCounter/_variables.scss b/packages/vuetify/src/components/VCounter/_variables.scss
index cd17ffac29f..9b9f47101b6 100644
--- a/packages/vuetify/src/components/VCounter/_variables.scss
+++ b/packages/vuetify/src/components/VCounter/_variables.scss
@@ -1,4 +1,5 @@
@import '../../styles/styles.sass';
$counter-font-size: 12px !default;
+$counter-line-height: $counter-font-size !default;
$counter-min-height: 12px !default;
diff --git a/packages/vuetify/src/components/VMessages/VMessages.sass b/packages/vuetify/src/components/VMessages/VMessages.sass
index 3b1f63059e7..5f9ff57c109 100644
--- a/packages/vuetify/src/components/VMessages/VMessages.sass
+++ b/packages/vuetify/src/components/VMessages/VMessages.sass
@@ -18,7 +18,7 @@
text-align: right
&__message
- line-height: normal
+ line-height: $messages-line-height
word-break: break-word
overflow-wrap: break-word
word-wrap: break-word
diff --git a/packages/vuetify/src/components/VMessages/_variables.scss b/packages/vuetify/src/components/VMessages/_variables.scss
index c70cbeb6696..5f80110d3a1 100644
--- a/packages/vuetify/src/components/VMessages/_variables.scss
+++ b/packages/vuetify/src/components/VMessages/_variables.scss
@@ -1,4 +1,5 @@
@import '../../styles/styles.sass';
$messages-font-size: 12px !default;
+$messages-line-height: $messages-font-size !default;
$messages-min-height: 14px !default;
|
89f1762566cc18db49d7e6db734b873e2e7987da
|
2020-04-29 03:38:55
|
John Leider
|
chore(package.json): remove webpack-copy-plugin
| false
|
remove webpack-copy-plugin
|
chore
|
diff --git a/package.json b/package.json
index 3fe2d35c787..bf52152c176 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"yarn": ">= 1.12.0"
},
"devDependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.8.8",
"@typescript-eslint/eslint-plugin": "^1.13.0",
"@typescript-eslint/parser": "^1.13.0",
"babel-jest": "^24.8.0",
diff --git a/packages/docs/build/webpack.client.config.js b/packages/docs/build/webpack.client.config.js
index 47657a5dc0d..e6b0632e799 100644
--- a/packages/docs/build/webpack.client.config.js
+++ b/packages/docs/build/webpack.client.config.js
@@ -4,7 +4,6 @@ const merge = require('webpack-merge')
const base = require('./webpack.base.config')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const VueSSRClientPlugin = require('vue-server-renderer/client-plugin')
-const CopyPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
const TerserJSPlugin = require('terser-webpack-plugin')
@@ -78,10 +77,6 @@ const config = merge(base, {
new webpack.DefinePlugin({
'process.env.VUE_ENV': '"client"'
}),
- new CopyPlugin([
- { from: 'src/public' },
- { from: 'src/themes', to: 'themes' },
- ]),
new HtmlWebpackPlugin({
filename: '_crowdin.html',
template: resolve('../src/crowdin.template.html')
diff --git a/packages/docs/package.json b/packages/docs/package.json
index e0bedbc7817..2f6c5959b50 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -57,7 +57,6 @@
"autoprefixer": "^9.6.1",
"babel-loader": "^8.0.6",
"concurrently": "^4.1.1",
- "copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.1.0",
"date-fns": "^2.12.0",
"deepmerge": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index f2b54569472..679d36f869c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -102,6 +102,13 @@
dependencies:
"@babel/types" "^7.0.0"
+"@babel/helper-annotate-as-pure@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+ integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
@@ -119,6 +126,15 @@
"@babel/traverse" "^7.4.4"
"@babel/types" "^7.4.4"
+"@babel/helper-create-regexp-features-plugin@^7.8.8":
+ version "7.8.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+ integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.8.3"
+ "@babel/helper-regex" "^7.8.3"
+ regexpu-core "^4.7.0"
+
"@babel/helper-define-map@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
@@ -204,6 +220,13 @@
dependencies:
lodash "^4.17.11"
+"@babel/helper-regex@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+ integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+ dependencies:
+ lodash "^4.17.13"
+
"@babel/helper-remap-async-to-generator@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
@@ -240,6 +263,11 @@
dependencies:
"@babel/types" "^7.4.4"
+"@babel/helper-validator-identifier@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+ integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
"@babel/helper-wrap-function@^7.1.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
@@ -763,6 +791,15 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
+"@babel/types@^7.8.3":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+ integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.9.5"
+ lodash "^4.17.13"
+ to-fast-properties "^2.0.0"
+
"@cnakazawa/watch@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -3261,27 +3298,6 @@ cacache@^12.0.0, cacache@^12.0.2:
unique-filename "^1.1.1"
y18n "^4.0.0"
-cacache@^12.0.3:
- version "12.0.3"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
- integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
- dependencies:
- bluebird "^3.5.5"
- chownr "^1.1.1"
- figgy-pudding "^3.5.1"
- glob "^7.1.4"
- graceful-fs "^4.1.15"
- infer-owner "^1.0.3"
- lru-cache "^5.1.1"
- mississippi "^3.0.0"
- mkdirp "^0.5.1"
- move-concurrently "^1.0.1"
- promise-inflight "^1.0.1"
- rimraf "^2.6.3"
- ssri "^6.0.1"
- unique-filename "^1.1.1"
- y18n "^4.0.0"
-
cacache@^13.0.1:
version "13.0.1"
resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
@@ -4067,24 +4083,6 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-copy-webpack-plugin@^5.1.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
- integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
- dependencies:
- cacache "^12.0.3"
- find-cache-dir "^2.1.0"
- glob-parent "^3.1.0"
- globby "^7.1.1"
- is-glob "^4.0.1"
- loader-utils "^1.2.3"
- minimatch "^3.0.4"
- normalize-path "^3.0.0"
- p-limit "^2.2.1"
- schema-utils "^1.0.0"
- serialize-javascript "^2.1.2"
- webpack-log "^2.0.0"
-
core-js-compat@^3.1.1:
version "3.1.4"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
@@ -4760,7 +4758,7 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
-dir-glob@^2.0.0, dir-glob@^2.2.2:
+dir-glob@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
@@ -6282,18 +6280,6 @@ globby@^6.1.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
-globby@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
- integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
- dependencies:
- array-union "^1.0.1"
- dir-glob "^2.0.0"
- glob "^7.1.2"
- ignore "^3.3.5"
- pify "^3.0.0"
- slash "^1.0.0"
-
globby@^9.2.0:
version "9.2.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
@@ -6762,11 +6748,6 @@ ignore-walk@^3.0.1:
dependencies:
minimatch "^3.0.4"
-ignore@^3.3.5:
- version "3.3.10"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
- integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
ignore@^4.0.3, ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -9629,13 +9610,6 @@ p-limit@^2.0.0, p-limit@^2.2.0:
dependencies:
p-try "^2.0.0"
-p-limit@^2.2.1:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
- integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
- dependencies:
- p-try "^2.0.0"
-
p-limit@^2.2.2:
version "2.3.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -11084,6 +11058,13 @@ regenerate-unicode-properties@^8.0.2:
dependencies:
regenerate "^1.4.0"
+regenerate-unicode-properties@^8.2.0:
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+ integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+ dependencies:
+ regenerate "^1.4.0"
+
regenerate@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -11148,6 +11129,18 @@ regexpu-core@^4.5.4:
unicode-match-property-ecmascript "^1.0.4"
unicode-match-property-value-ecmascript "^1.1.0"
+regexpu-core@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+ integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+ dependencies:
+ regenerate "^1.4.0"
+ regenerate-unicode-properties "^8.2.0"
+ regjsgen "^0.5.1"
+ regjsparser "^0.6.4"
+ unicode-match-property-ecmascript "^1.0.4"
+ unicode-match-property-value-ecmascript "^1.2.0"
+
registry-auth-token@^3.0.1:
version "3.4.0"
resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
@@ -11168,6 +11161,11 @@ regjsgen@^0.5.0:
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
+regjsgen@^0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+ integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+
regjsparser@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
@@ -11175,6 +11173,13 @@ regjsparser@^0.6.0:
dependencies:
jsesc "~0.5.0"
+regjsparser@^0.6.4:
+ version "0.6.4"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+ integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+ dependencies:
+ jsesc "~0.5.0"
+
[email protected]:
version "0.2.7"
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -12970,6 +12975,11 @@ unicode-match-property-value-ecmascript@^1.1.0:
resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+unicode-match-property-value-ecmascript@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+ integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
unicode-property-aliases-ecmascript@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
|
1f88e85e0a924de9cb4243a493c8bc555a07e901
|
2020-09-02 03:03:34
|
John Leider
|
docs(package.json): add missing serve script
| false
|
add missing serve script
|
docs
|
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 01430783414..aacaa7665f0 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -11,7 +11,8 @@
},
"scripts": {
"build": "yarn build:client && yarn build:server && yarn prerender",
- "dev": "vue-cli-service serve",
+ "dev": "yarn serve",
+ "serve": "vue-cli-service serve",
"lint": "vue-cli-service lint --no-fix && yarn lint:md",
"lint:fix": "vue-cli-service lint && yarn fix:md",
"build:client": "vue-cli-service build",
|
581bbbcab572074ab090b244d54a34c062404992
|
2024-03-28 23:21:01
|
John Leider
|
fix(VFileInput): conditionally return single File instead of File[]
| false
|
conditionally return single File instead of File[]
|
fix
|
diff --git a/packages/vuetify/src/components/VFileInput/VFileInput.tsx b/packages/vuetify/src/components/VFileInput/VFileInput.tsx
index 9ee2fa62615..1de2f79da63 100644
--- a/packages/vuetify/src/components/VFileInput/VFileInput.tsx
+++ b/packages/vuetify/src/components/VFileInput/VFileInput.tsx
@@ -66,7 +66,7 @@ export const makeVFileInputProps = propsFactory({
...makeVInputProps({ prependIcon: '$file' }),
modelValue: {
- type: Array as PropType<File[]>,
+ type: [Array, File] as PropType<File[] | File>,
default: () => ([]),
validator: (val: any) => {
return wrapInArray(val).every(v => v != null && typeof v === 'object')
@@ -92,7 +92,13 @@ export const VFileInput = genericComponent<VFileInputSlots>()({
setup (props, { attrs, emit, slots }) {
const { t } = useLocale()
- const model = useProxiedModel(props, 'modelValue')
+ const model = useProxiedModel(
+ props,
+ 'modelValue',
+ props.modelValue,
+ val => wrapInArray(val),
+ val => (props.multiple || Array.isArray(props.modelValue)) ? val : val[0],
+ )
const { isFocused, focus, blur } = useFocus(props)
const base = computed(() => typeof props.showSize !== 'boolean' ? props.showSize : undefined)
const totalBytes = computed(() => (model.value ?? []).reduce((bytes, { size = 0 }) => bytes + size, 0))
|
ae208b7b64dc032234d7d4aeaf8436fb9760fd71
|
2020-08-19 23:05:01
|
John Leider
|
docs(ReleasesMenu): hide v1 docs until it's back up
| false
|
hide v1 docs until it's back up
|
docs
|
diff --git a/packages/docs-next/src/components/menus/ReleasesMenu.vue b/packages/docs-next/src/components/menus/ReleasesMenu.vue
index f3c00fb1c38..7da47ac63eb 100644
--- a/packages/docs-next/src/components/menus/ReleasesMenu.vue
+++ b/packages/docs-next/src/components/menus/ReleasesMenu.vue
@@ -32,10 +32,10 @@
title: '1.5.x',
href: 'https://v15.vuetifyjs.com',
},
- {
- title: '1.0.x',
- href: 'https://v1.vuetifyjs.com',
- },
+ // {
+ // title: '1.0.x',
+ // href: 'https://v1.vuetifyjs.com',
+ // },
{ divider: true },
{ heading: this.$t('releases') },
{
|
40d245aa4ffceb53cc02670f5cdcffef618bc094
|
2023-12-19 21:51:31
|
John Leider
|
chore(package.json): update @vuetify/one package
| false
|
update @vuetify/one package
|
chore
|
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 508521f1b1c..d67edc5e736 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -23,7 +23,7 @@
"@cosmicjs/sdk": "^1.0.10",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
- "@vuetify/one": "^0.0.6",
+ "@vuetify/one": "^0.1.0",
"algoliasearch": "^4.20.0",
"fflate": "^0.8.1",
"isomorphic-fetch": "^3.0.0",
diff --git a/packages/docs/src/plugins/one.ts b/packages/docs/src/plugins/one.ts
index c73eed6e727..610cf09b2b0 100644
--- a/packages/docs/src/plugins/one.ts
+++ b/packages/docs/src/plugins/one.ts
@@ -1,7 +1,14 @@
-import { install } from '@vuetify/one'
+// Styles
+import '@vuetify/one/styles'
+// Plugins
+import { createOne } from '@vuetify/one'
+
+// Types
import type { App } from 'vue'
export function installOne (app: App) {
- app.use(install as any)
+ const one = createOne()
+
+ return app.use(one as any)
}
diff --git a/yarn.lock b/yarn.lock
index 303387a4dde..83df74bd251 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3917,10 +3917,10 @@
find-cache-dir "^3.3.2"
upath "^2.0.1"
-"@vuetify/one@^0.0.6":
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/@vuetify/one/-/one-0.0.6.tgz#e000d47211675d8a970373c8d65d02dfe68898d6"
- integrity sha512-VtfckfRhX8iV/87Qeb5TZTKk2yjcyeqlyg7Om+Uu8TuuFnhyVSPH7bGQsiZeK4RIFJSiAtN6jgFgJMUbkcfcUQ==
+"@vuetify/one@^0.1.0":
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/@vuetify/one/-/one-0.1.0.tgz#ab2dac01ab851b6ed4019f20604127eb4c2e3921"
+ integrity sha512-esq7ujV0d6YWUP+PLuPaqKyjxznSOXNrl1JM7qk12Sr3M+bNBfgpwPu9joVbMIUq05nKlxXi+J/vCvt26qLv7Q==
dependencies:
"@mdi/js" "6.2.95"
core-js "^3.29.0"
|
28bbb733ab00681a88d9db00a7bd87537047589e
|
2022-10-15 14:48:48
|
Albert Kaaman
|
feat(api-generator): extract component data from types (#15790)
| false
|
extract component data from types (#15790)
|
feat
|
diff --git a/packages/api-generator/.gitignore b/packages/api-generator/.gitignore
index 78dfc36da89..5eb55e946b8 100644
--- a/packages/api-generator/.gitignore
+++ b/packages/api-generator/.gitignore
@@ -1,3 +1,4 @@
/dist/
/src/locale/*
+/src/tmp/
!/src/locale/en
diff --git a/packages/api-generator/babel.config.js b/packages/api-generator/babel.config.js
deleted file mode 100644
index 62fa6f518c7..00000000000
--- a/packages/api-generator/babel.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
- presets: [
- ['@babel/preset-env', {
- targets: { node: 'current' }
- }]
- ]
-}
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index 5c8b37faf16..2ec85e30d62 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -3,19 +3,19 @@
"version": "3.0.0-beta.13",
"private": true,
"description": "",
- "main": "src/index.js",
"scripts": {
- "debug": "babel-node inspect src/index.js",
- "dev": "node src/index.js",
- "build": "node src/export.js",
- "lint": "eslint --ext .js src -f codeframe --max-warnings 0",
+ "build": "ts-node src/index.ts",
+ "lint": "eslint --ext .ts src -f codeframe --max-warnings 0",
"lint:fix": "yarn lint --fix"
},
"author": "",
"license": "ISC",
"dependencies": {
"deepmerge": "^4.0.0",
+ "piscina": "^3.2.0",
"rimraf": "^3.0.2",
+ "ts-morph": "^16.0.0",
+ "ts-node": "^10.9.1",
"vue": "^3.2.38",
"vuetify": "^3.0.0-beta.13"
},
diff --git a/packages/api-generator/src/composables.d.ts b/packages/api-generator/src/composables.d.ts
new file mode 100644
index 00000000000..b7ee20d8009
--- /dev/null
+++ b/packages/api-generator/src/composables.d.ts
@@ -0,0 +1,11 @@
+import type vuetify from '../../vuetify/lib/index'
+
+type IsComposable<T extends string | number | symbol> = T extends `use${Capitalize<infer _>}` ? T : never;
+
+type ExtractComposables<T> = T extends object
+ ? {
+ [K in keyof T as K extends IsComposable<K> ? K : never]: T[K]
+ }
+ : never
+
+export type Composables = ExtractComposables<typeof vuetify>
diff --git a/packages/api-generator/src/directives.d.ts b/packages/api-generator/src/directives.d.ts
new file mode 100644
index 00000000000..83e344a4fa6
--- /dev/null
+++ b/packages/api-generator/src/directives.d.ts
@@ -0,0 +1,24 @@
+import type { DirectiveBinding } from 'vue'
+import type * as directives from '../../vuetify/lib/directives/index'
+
+type ExtractDirectiveBindings<T> = T extends object
+ ? {
+ [K in keyof T]: T[K] extends { mounted: infer M }
+ ? M extends (first: any, second: infer B) => any
+ ? B extends object
+ ? {
+ [KK in keyof B as KK extends keyof Omit<DirectiveBinding, 'modifiers' | 'value'> ? never : KK]: B[KK]
+ }
+ : never
+ : never
+ : {}
+ }
+ : never
+
+type Plain<T> = T extends object
+ ? {
+ [K in keyof T]: T[K]
+ }
+ : never
+
+export type Directives = Plain<ExtractDirectiveBindings<typeof directives>>
diff --git a/packages/api-generator/src/export.js b/packages/api-generator/src/export.js
deleted file mode 100644
index b2bd751fa08..00000000000
--- a/packages/api-generator/src/export.js
+++ /dev/null
@@ -1,185 +0,0 @@
-const rimraf = require('rimraf')
-const { resolve } = require('path')
-const { writeJsonFile } = require('./helpers/write')
-const { capitalize, kebabCase, pascalize } = require('./helpers/text')
-const { getComponentsApi, getDirectivesApi } = require('./index')
-const pkg = require('../package.json')
-
-const createVeturApi = () => {
- const components = getComponentsApi(['en'])
-
- const tags = components.reduce((obj, component) => {
- return {
- ...obj,
- [component.name]: {
- attributes: component.props.map(p => kebabCase(p.name)).sort(),
- description: '',
- },
- }
- }, {})
-
- const attributes = components.reduce((obj, component) => {
- const attrs = component.props.reduce((a, prop) => {
- let type = prop.type || ''
-
- if (!type) type = ''
- else if (Array.isArray(type)) type = type.map(t => t.toLowerCase()).join('|')
- else type = type.toLowerCase()
-
- a[`${component.name}/${kebabCase(prop.name)}`] = {
- type,
- description: prop.description.en || '',
- }
-
- return a
- }, {})
-
- return { ...obj, ...attrs }
- }, {})
-
- writeJsonFile(tags, 'dist/tags.json')
- writeJsonFile(attributes, 'dist/attributes.json')
-}
-
-// Create web-types.json to provide autocomplete in JetBrains IDEs
-const createWebTypesApi = () => {
- const components = getComponentsApi(['en'])
- const directives = getDirectivesApi(['en'])
-
- const getDocUrl = (cmp, heading = null) => `https://vuetifyjs.com/api/${cmp}` + (heading ? `#${heading}` : '')
-
- const createTag = component => {
- const createTagSlot = slot => {
- return {
- name: slot.name,
- pattern: undefined,
- description: slot.description.en || '',
- 'doc-url': getDocUrl(component.name, 'slots'),
- 'vue-properties': slot.props && Object.keys(slot.props).map(key => createTypedEntity(key, slot.props[key])),
- }
- }
-
- const createTagEvent = event => {
- return {
- name: event.name,
- description: event.description.en || '',
- 'doc-url': getDocUrl(component.name, 'events'),
- arguments: [createTypedEntity('argument', event.value)], // TODO: value should be replaced by arguments array
- }
- }
-
- const createTagAttribute = prop => {
- return {
- name: prop.name,
- description: prop.description.en || '',
- 'doc-url': getDocUrl(component.name, 'props'),
- default: typeof prop.default !== 'string' ? JSON.stringify(prop.default) : prop.default,
- required: undefined, // TODO: implement this
- value: createTagValue(prop.type),
- type: prop.type === 'boolean' ? 'boolean' : undefined, // this is deprecated but should be const 'boolean' for compatibility with 2019.2
- }
- }
-
- const createTagValue = type => {
- return {
- kind: 'expression',
- type,
- }
- }
-
- const pascalName = pascalize(component.name)
-
- return {
- name: pascalName,
- source: {
- module: './src/components/index.ts',
- symbol: pascalName,
- },
- aliases: undefined, // TODO: are we using this? deprecated name changes?
- description: '', // TODO: we should probably include component description in locale files
- 'doc-url': getDocUrl(component.name),
- attributes: component.props.map(createTagAttribute),
- events: component.events.map(createTagEvent),
- slots: component.slots.map(createTagSlot),
- 'vue-model': { // TODO: we should expose this in api data if we can
- prop: 'modelValue',
- event: 'update:modelValue',
- },
- }
- }
-
- const createTypedEntity = (name, type) => {
- return {
- name,
- type: typeof type !== 'string' ? JSON.stringify(type) : type,
- }
- }
-
- const createAttribute = directive => {
- const createAttributeVueArgument = argument => {
- return {
- pattern: undefined,
- description: argument.description && argument.description.en ? argument.description.en : '',
- 'doc-url': getDocUrl(directive.name, 'argument'),
- required: undefined,
- }
- }
-
- const createAttributeVueModifier = modifier => {
- return {
- name: modifier.name,
- pattern: undefined,
- description: modifier.description.en || '',
- 'doc-url': getDocUrl(directive.name, 'modifiers'),
- }
- }
-
- const createAttributeValue = argument => {
- return {
- kind: 'expression',
- type: argument.type,
- }
- }
-
- return {
- name: directive.name,
- aliases: undefined,
- description: '', // TODO: we should probably include directive description in locale files
- 'doc-url': getDocUrl(directive.name),
- default: '',
- required: false,
- value: createAttributeValue(directive.argument),
- source: {
- module: './src/directives/index.ts',
- symbol: capitalize(directive.name.slice(2)),
- },
- 'vue-argument': directive.argument && createAttributeVueArgument(directive.argument), // TODO: how to use this in comparison to value?
- 'vue-modifiers': directive.modifiers && directive.modifiers.map(createAttributeVueModifier),
- }
- }
-
- const tags = components.map(createTag)
- const attributes = directives.map(createAttribute)
-
- const webTypes = {
- $schema: 'http://json.schemastore.org/web-types',
- framework: 'vue',
- name: 'vuetify',
- version: pkg.version,
- contributions: {
- html: {
- 'types-syntax': 'typescript',
- 'description-markup': 'markdown',
- tags,
- attributes,
- },
- },
- }
-
- writeJsonFile(webTypes, 'dist/web-types.json')
-}
-
-rimraf.sync(resolve('./dist'))
-
-createVeturApi()
-createWebTypesApi()
diff --git a/packages/api-generator/src/helpers/excludes.js b/packages/api-generator/src/helpers/excludes.js
deleted file mode 100644
index fc041f3efb5..00000000000
--- a/packages/api-generator/src/helpers/excludes.js
+++ /dev/null
@@ -1,132 +0,0 @@
-module.exports = {
- components: [
- 'VCalendarCategory',
- 'VColorPickerCanvas',
- 'VColorPickerSwatches',
- 'VCounter',
- 'VData',
- 'VDatePickerDateTable',
- 'VDatePickerHeader',
- 'VDatePickerMonthTable',
- 'VDatePickerTitle',
- 'VDatePickerYears',
- 'VLabel',
- 'VMessages',
- 'VPicker',
- 'VTableOverflow',
- 'VTimePickerClock',
- 'VTimePickerTitle',
- 'VVirtualTable',
- 'VTreeviewNode',
- 'VClassIcon',
- 'VComponentIcon',
- 'VSvgIcon',
- 'VLigatureIcon',
- ],
- props: {
- 'v-app': [
- 'dark',
- 'light',
- ],
- 'v-autocomplete': [
- 'activator',
- 'closeOnClick',
- 'closeOnContentClick',
- 'nudgeBottom',
- 'nudgeLeft',
- 'nudgeRight',
- 'nudgeTop',
- 'nudgeWidth',
- 'offsetX',
- 'offsetY',
- 'transition',
- ],
- 'v-bottom-sheet': [
- 'close-delay',
- 'open-delay',
- 'return-value',
- ],
- 'v-combobox': [
- 'activator',
- 'closeOnClick',
- 'closeOnContentClick',
- 'nudgeBottom',
- 'nudgeLeft',
- 'nudgeRight',
- 'nudgeTop',
- 'nudgeWidth',
- 'offsetX',
- 'offsetY',
- 'transition',
- ],
- 'v-dialog': [
- 'close-delay',
- 'open-delay',
- 'return-value',
- ],
- 'v-otp-input': [
- 'appendIcon',
- 'backgroundColor',
- 'color',
- 'rules',
- 'dense',
- 'error',
- 'errorCount',
- 'errorMessages',
- 'height',
- 'hideDetails',
- 'hint',
- 'label',
- 'light',
- 'loaderHeight',
- 'loading',
- 'messages',
- 'persistentHint',
- 'prependIcon',
- 'success',
- 'successMessages',
- 'validateOnBlur',
- ],
- 'v-overflow-btn': [
- 'activator',
- 'closeOnClick',
- 'closeOnContentClick',
- 'delimiters',
- 'nudgeBottom',
- 'nudgeLeft',
- 'nudgeRight',
- 'nudgeTop',
- 'nudgeWidth',
- 'offsetX',
- 'offsetY',
- 'transition',
- ],
- 'v-checkbox': [
- 'height',
- 'loading',
- ],
- 'v-radio': [
- 'height',
- ],
- 'v-radio-group': [
- 'color',
- 'height',
- 'loading',
- ],
- 'v-switch': [
- 'height',
- ],
- 'v-window': [
- 'mandatory',
- 'max',
- 'multiple',
- ],
- 'v-file-input': [
- 'readonly',
- ],
- 'v-tooltip': [
- 'dark',
- 'light',
- ],
- },
-}
diff --git a/packages/api-generator/src/helpers/merge.js b/packages/api-generator/src/helpers/merge.js
deleted file mode 100644
index 1436f837cd8..00000000000
--- a/packages/api-generator/src/helpers/merge.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const deepmerge = require('deepmerge')
-
-function arrayMerge (a, b) {
- const arr = a.slice()
- for (let i = 0; i < b.length; i++) {
- const found = a.findIndex(item => item.name === b[i].name)
- if (found >= 0) {
- arr[found] = deepmerge(a[found], b[i])
- } else {
- arr.push(b[i])
- }
- }
- return arr
-}
-
-module.exports = function merge (...arr) {
- return deepmerge.all(arr, { arrayMerge })
-}
diff --git a/packages/api-generator/src/helpers/parsing.js b/packages/api-generator/src/helpers/parsing.js
deleted file mode 100644
index 7b41c736754..00000000000
--- a/packages/api-generator/src/helpers/parsing.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// const Vue = require('vue')
-const fs = require('fs')
-const path = require('path')
-const { props: excludes } = require('./excludes')
-const { kebabCase, pascalize } = require('./text')
-
-function parseFunctionParams (func) {
- const [, regular] = /function\s\((.*)\)\s\{.*/i.exec(func) || []
- const [, arrow] = /\((.*)\)\s=>\s\{.*/i.exec(func) || []
- const args = regular || arrow
-
- return args ? `(${args}) => {}` : undefined
-}
-
-function getPropType (type) {
- if (Array.isArray(type)) {
- return type.map(t => getPropType(t))
- }
-
- if (!type) return 'any'
-
- return type.name.toLowerCase()
-}
-
-function getPropDefault (def, type) {
- if (typeof def === 'function' && type !== 'function') {
- return def.call({}, {})
- }
-
- if (typeof def === 'string') {
- return def ? `'${def}'` : def
- }
-
- if (type === 'function') {
- return parseFunctionParams(def)
- }
-
- if (def == null && (
- type === 'boolean' ||
- (Array.isArray(type) && type.includes('boolean'))
- )) {
- return false
- }
-
- return def
-}
-
-function getPropSource (name, mixins) {
- const source = null
- for (let i = 0; i < mixins.length; i++) {
- const mixin = mixins[i]
- // if (mixin.name !== 'VueComponent') mixin = Vue.extend(mixin)
- if (mixin.options.name) {
- const source = Object.keys(mixin.options.props || {}).find(p => p === name) && mixin.options.name
- const found = getPropSource(name, [mixin.super].concat(mixin.options.extends).concat(mixin.options.mixins).filter(m => !!m)) || source
- if (found) return kebabCase(found)
- }
- }
-
- return source
-}
-
-function genProp (name, prop, mixins, cmp) {
- const type = getPropType(prop.type)
- const propSource = getPropSource(name, mixins) || kebabCase(cmp)
- const source = (propSource.slice(-10) === 'transition') ? 'transitions' : propSource
-
- return {
- name: kebabCase(name),
- type,
- default: getPropDefault(prop.default, type),
- source,
- }
-}
-
-function parseProps (component, array = [], mixin = false) {
- const options = component.options
- const name = component.options.name
- const mixins = [component.super].concat(options.extends).concat(options.mixins).filter(m => !!m)
- const props = options.props || {}
-
- Object.keys(props).forEach(key => {
- if (excludes[name] && excludes[name].includes(key)) return
- const generated = genProp(key, props[key], mixins, name)
- array.push(generated)
- })
-
- return array.sort((a, b) => a.name.localeCompare(b.name))
-}
-
-function parseMixins (component) {
- if (!component.options.mixins) return []
-
- let mixins = []
- for (let i = 0; i < component.options.mixins.length; i++) {
- const mixin = component.options.mixins[i]
-
- // if (mixin.name !== 'VueComponent') mixin = Vue.extend(mixin)
-
- if (mixin.options.name) {
- mixins.push(mixin.options.name)
-
- if (mixin.options.mixins) {
- mixins = mixins.concat(parseMixins(mixin))
- }
- }
- }
-
- return mixins.sort((a, b) => a.localeCompare(b))
-}
-
-function processVariableFile (path) {
- if (fs.existsSync(path)) {
- const varFile = fs.readFileSync(path, 'utf8')
- const vars = varFile.split(/;[\n]*/g)
- const varValues = []
- for (const [ind, varString] of vars.entries()) {
- const varArr = varString.split(':')
- if (varArr.length >= 2 && varArr[0].charAt(0) === '$') {
- const varName = varArr.shift().trim()
- let varDefault = (vars[ind + 1].charAt(0) === '@')
- ? vars[ind + 1]
- : varArr.join(':')
- varDefault = `${varDefault.trim()};`
- const lastIndex = varValues.findIndex(item => item.name === varName)
- if (lastIndex > -1) {
- varValues[lastIndex].default = varDefault
- } else {
- varValues.push({
- name: varName,
- default: varDefault,
- })
- }
- }
- }
- return varValues
- }
-
- return []
-}
-
-const parseSassVariables = componentName => {
- const rootDir = './../vuetify/src/components'
- return processVariableFile(`${rootDir}/${pascalize(componentName)}/_variables.scss`)
-}
-
-function parseGlobalSassVariables () {
- return [
- './../vuetify/src/styles/settings/_colors.scss',
- './../vuetify/src/styles/settings/_dark.scss',
- './../vuetify/src/styles/settings/_elevations.scss',
- './../vuetify/src/styles/settings/_light.scss',
- './../vuetify/src/styles/settings/_theme.scss',
- './../vuetify/src/styles/settings/_variables.scss',
- ].reduce((acc, path) => {
- acc.push(...processVariableFile(path))
- return acc
- }, []).sort((a, b) => a.name.localeCompare(b.name))
-}
-
-function parseComponent (component) {
- return {
- props: parseProps(component),
- mixins: parseMixins(component),
- }
-}
-
-function getComponentList () {
- const components = []
- const componentMaps = fs.readdirSync(path.resolve(path.dirname('../api-generator/src/maps-alpha/components/*')))
- componentMaps.forEach(file => {
- components.push(file.split('.')[0])
- })
- return components
-}
-
-module.exports = {
- getComponentList,
- parseSassVariables,
- parseGlobalSassVariables,
- parseComponent,
- getPropType,
- getPropDefault,
-}
diff --git a/packages/api-generator/src/helpers/sass.ts b/packages/api-generator/src/helpers/sass.ts
new file mode 100644
index 00000000000..bbc414c0294
--- /dev/null
+++ b/packages/api-generator/src/helpers/sass.ts
@@ -0,0 +1,44 @@
+import fs from 'fs'
+
+function processVariableFile (filePath: string) {
+ if (fs.existsSync(filePath)) {
+ const varFile = fs.readFileSync(filePath, 'utf8')
+ const vars = varFile.replace(/\/\/.+[\r\n]+/g, '').split(/;[\n]*/g)
+ const varValues = {}
+ for (const [index, variable] of vars.entries()) {
+ const varArr = variable.split(':')
+ if (varArr.length >= 2 && varArr[0].startsWith('$')) {
+ const varName = varArr.shift().trim()
+ let varDefault = (vars[index + 1].startsWith('@'))
+ ? vars[index + 1]
+ : varArr.join(':')
+ varDefault = `${varDefault.trim()};`
+ varValues[varName] = {
+ default: varDefault,
+ }
+ }
+ }
+ return varValues
+ }
+
+ return {}
+}
+
+export const parseSassVariables = (componentName: string) => {
+ const rootDir = './../vuetify/src/components'
+ return processVariableFile(`${rootDir}/${componentName}/_variables.scss`)
+}
+
+// export function parseGlobalSassVariables () {
+// return [
+// './../vuetify/src/styles/settings/_colors.scss',
+// './../vuetify/src/styles/settings/_dark.scss',
+// './../vuetify/src/styles/settings/_elevations.scss',
+// './../vuetify/src/styles/settings/_light.scss',
+// './../vuetify/src/styles/settings/_theme.scss',
+// './../vuetify/src/styles/settings/_variables.scss',
+// ].reduce((acc, path) => {
+// acc.push(...processVariableFile(path))
+// return acc
+// }, []).sort((a, b) => a.name.localeCompare(b.name))
+// }
diff --git a/packages/api-generator/src/helpers/text.js b/packages/api-generator/src/helpers/text.ts
similarity index 54%
rename from packages/api-generator/src/helpers/text.js
rename to packages/api-generator/src/helpers/text.ts
index 7680b7addd7..b62dbd5b6fa 100644
--- a/packages/api-generator/src/helpers/text.js
+++ b/packages/api-generator/src/helpers/text.ts
@@ -1,6 +1,8 @@
-const { camelCase, capitalize } = require('lodash')
+import { capitalize } from 'lodash'
-const kebabCase = str => {
+export { camelCase, capitalize } from 'lodash'
+
+export const kebabCase = (str: string) => {
let kebab = ''
for (let i = 0; i < str.length; i++) {
const charCode = str.charCodeAt(i)
@@ -13,11 +15,4 @@ const kebabCase = str => {
return kebab
}
-const pascalize = str => str.split('-').map(capitalize).join('')
-
-module.exports = {
- camelCase,
- capitalize,
- kebabCase,
- pascalize,
-}
+export const pascalize = (str: string) => str.split('-').map(capitalize).join('')
diff --git a/packages/api-generator/src/helpers/variables.js b/packages/api-generator/src/helpers/variables.js
deleted file mode 100644
index f97f56c12eb..00000000000
--- a/packages/api-generator/src/helpers/variables.js
+++ /dev/null
@@ -1,459 +0,0 @@
-function createItems (strings, defaults) {
- return strings.map(name => ({ name, ...defaults }))
-}
-
-const Validatable = {
- props: createItems(['disabled', 'readonly'], {
- default: false,
- source: 'validatable',
- type: 'boolean',
- }),
- events: [
- {
- name: 'update:error',
- source: 'validatable',
- value: 'boolean',
- },
- ],
-}
-
-const VGridProps = [
- ...createItems([
- 'alignBaseline',
- 'alignCenter',
- 'alignContentCenter',
- 'alignContentEnd',
- 'alignContentSpaceAround',
- 'alignContentSpaceBetween',
- 'alignContentStart',
- 'alignEnd',
- 'alignStart',
- 'd-{type}',
- 'fillHeight',
- 'justifyCenter',
- 'justifyEnd',
- 'justifySpaceAround',
- 'justifySpaceBetween',
- 'justifyStart',
- ], {
- default: 'false',
- source: null,
- type: 'Boolean',
- }),
- {
- default: 'div',
- name: 'tag',
- source: null,
- type: 'String',
- },
-]
-
-const VInput = {
- events: [
- ...Validatable.events,
- ...createItems([
- 'click',
- 'mousedown',
- 'mouseup',
- ], {
- source: 'v-input',
- value: 'MouseEvent',
- }),
- ...createItems(['click:append', 'click:prepend'], {
- source: 'v-input',
- value: 'Event',
- }),
- ],
- props: [
- ...Validatable.props,
- {
- name: 'label',
- source: 'v-input',
- type: 'string',
- default: undefined,
- },
- {
- name: 'value',
- source: 'v-input',
- type: 'any',
- default: undefined,
- },
- ],
- slots: [
- ...createItems([
- 'append',
- 'default',
- 'prepend',
- 'label',
- ], {
- props: undefined,
- source: 'v-input',
- }),
- {
- name: 'message',
- props: {
- key: 'number, // the messages index',
- message: 'string, // the message',
- },
- source: 'v-input',
- },
- ],
-}
-
-const VTextField = {
- ...VInput,
- events: [
- ...VInput.events,
- ...createItems([
- 'blur',
- 'click:clear',
- 'click:append-outer',
- 'click:prepend-inner',
- 'focus',
- ], {
- source: 'v-text-field',
- value: 'Event',
- }),
- ...createItems([
- 'change',
- 'input',
- ], {
- source: 'v-text-field',
- value: 'any',
- }),
- {
- name: 'keydown',
- source: 'v-text-field',
- value: 'KeyboardEvent',
- },
- ],
- slots: [
- ...VInput.slots.filter(v => v.name !== 'default'),
- ...createItems([
- 'append-outer',
- 'prepend-inner',
- 'progress',
- ], {
- props: undefined,
- source: 'v-text-field',
- }),
- {
- name: 'counter',
- source: 'v-text-field',
- props: {
- props: {
- dark: 'boolean',
- light: 'boolean',
- max: 'string | number',
- value: 'string',
- },
- },
- },
- ],
-}
-
-const VSelect = {
- ...VTextField,
- events: [
- ...VTextField.events,
- {
- name: 'update:search-input',
- source: 'v-select',
- value: 'string',
- },
- {
- name: 'update:list-index',
- source: 'v-select',
- value: 'number',
- },
- ],
- props: [
- ...VTextField.props,
- {
- name: 'items',
- example: {
- text: 'string | number | object',
- value: 'string | number | object',
- disabled: 'boolean',
- divider: 'boolean',
- header: 'string',
- },
- source: 'v-select',
- },
- {
- name: 'valueComparator',
- default: '(a: any, b: any): boolean',
- source: 'v-select',
- },
- {
- name: 'menuProps',
- default: `{
- closeOnClick: false,
- closeOnContentClick: false,
- disableKeys: true,
- openOnClick: false,
- maxHeight: 304
-}`,
- source: 'v-select',
- },
- ],
- slots: [
- ...VTextField.slots,
- ...createItems(['append-item', 'prepend-item'], {
- props: undefined,
- source: 'v-select',
- }),
- {
- name: 'item',
- props: {
- parent: 'VueComponent',
- item: 'object',
- on: 'object // Only needed when providing your own v-list-item',
- attrs: 'object // Only needed when providing your own v-list-item',
- },
- source: 'v-select',
- },
- {
- name: 'no-data',
- props: undefined,
- source: 'v-select',
- },
- {
- name: 'selection',
- props: {
- parent: 'VueComponent',
- item: 'object',
- index: 'number',
- select: 'function',
- selected: 'boolean',
- disabled: 'boolean',
- },
- source: 'v-select',
- },
- ],
-}
-
-const VAutocomplete = {
- ...VSelect,
- props: [
- ...VSelect.props.filter(prop => prop.name !== 'menuProps'),
- {
- name: 'menuProps',
- default: `{
- closeOnClick: false,
- closeOnContentClick: false,
- disableKeys: true,
- openOnClick: false,
- maxHeight: 304,
- offsetY: true,
- offsetOverflow: true,
- transition: false
-}`,
- source: 'v-autocomplete',
- },
- ],
-}
-
-const VSlider = {
- ...VInput,
- events: [
- ...VInput.events,
- ...createItems([
- 'change',
- 'end',
- 'input',
- 'start',
- ], {
- source: 'v-slider',
- value: 'number',
- }),
- ],
- slots: [
- ...VInput.slots,
- {
- name: 'progress',
- props: undefined,
- source: 'v-slider',
- },
- {
- name: 'thumb-label',
- props: {
- value: 'number | string',
- },
- source: 'v-slider',
- },
-
- ],
-}
-
-const VRangeSlider = {
- ...VSlider,
- events: [
- ...VInput.events,
- ...createItems([
- 'change',
- 'end',
- 'input',
- 'start',
- ], {
- source: 'v-range-slider',
- value: 'array',
- }),
- ],
-}
-
-const VTreeviewScopedProps = {
- item: 'any',
- leaf: 'boolean',
- selected: 'boolean',
- indeterminate: 'boolean',
- active: 'boolean',
- open: 'boolean',
-}
-
-const VTimestamp = {
- date: 'string',
- time: 'string',
- year: 'number',
- month: 'number',
- day: 'number',
- hour: 'number',
- minute: 'number',
- weekday: 'number',
- hasDay: 'boolean',
- hasTime: 'boolean',
- past: 'boolean',
- present: 'boolean',
- future: 'boolean',
-}
-
-const VCalendarDay = {
- outside: 'boolean',
- index: 'number',
- week: [VTimestamp],
- date: 'string',
- time: 'string',
- year: 'number',
- month: 'number',
- day: 'number',
- hour: 'number',
- minute: 'number',
- weekday: 'number',
- hasDay: 'boolean',
- hasTime: 'boolean',
- past: 'boolean',
- present: 'boolean',
- future: 'boolean',
-}
-
-const VCalendarEvent = {
- input: 'any',
- start: VTimestamp,
- startIdentifier: 'number',
- startTimestampIdentifier: 'number',
- end: VTimestamp,
- endIdentifier: 'number',
- endTimestampIdentifier: 'number',
- allDay: 'boolean',
- index: 'number',
- category: 'string',
-}
-
-const VCalendarEventSlot = {
- event: 'any',
- eventParsed: VCalendarEvent,
- day: VCalendarDay,
- outside: 'boolean',
- start: 'boolean',
- end: 'boolean',
- timed: 'boolean',
- singleline: 'boolean',
- overlapsNoon: 'boolean',
- formatTime: '(time: VTimestamp, ampm: boolean): string',
- timeSummary: '(): string',
- eventSummary: '(): string',
-}
-
-const VCalendarEventEvent = {
- ...VCalendarEventSlot,
- nativeEvent: 'MouseEvent | TouchEvent',
-}
-
-const VTimestampWithTime = {
- date: 'string',
- time: 'string',
- year: 'number',
- month: 'number',
- day: 'number',
- hour: 'number',
- minute: 'number',
- weekday: 'number',
- hasDay: 'boolean',
- hasTime: 'boolean',
- past: 'boolean',
- present: 'boolean',
- future: 'boolean',
- timeToY: '(time: string | number | {hour: number, minute: number}, clamp: boolean = false): number | false',
- timeDelta: '(time: string | number | {hour: number, minute: number}): number | false',
- minutesToPixels: '(minutes: number): number',
- week: [VTimestamp],
-}
-
-const VTimestampWithCategory = {
- date: 'string',
- time: 'string',
- year: 'number',
- month: 'number',
- day: 'number',
- hour: 'number',
- minute: 'number',
- weekday: 'number',
- hasDay: 'boolean',
- hasTime: 'boolean',
- past: 'boolean',
- present: 'boolean',
- future: 'boolean',
- week: [VTimestamp],
- category: 'string | null',
-}
-
-const VTimestampWithTimeCategory = {
- date: 'string',
- time: 'string',
- year: 'number',
- month: 'number',
- day: 'number',
- hour: 'number',
- minute: 'number',
- weekday: 'number',
- hasDay: 'boolean',
- hasTime: 'boolean',
- past: 'boolean',
- present: 'boolean',
- future: 'boolean',
- timeToY: '(time: string | number | {hour: number, minute: number}, clamp: boolean = false): number | false',
- timeDelta: '(time: string | number | {hour: number, minute: number}): number | false',
- minutesToPixels: '(minutes: number): number',
- week: [VTimestamp],
- category: 'string | null',
-}
-
-module.exports = {
- createItems,
- VCalendarDay,
- VCalendarEvent,
- VCalendarEventEvent,
- VCalendarEventSlot,
- VGridProps,
- VInput,
- VSelect,
- VAutocomplete,
- VSlider,
- VRangeSlider,
- VTextField,
- VTimestamp,
- VTimestampWithCategory,
- VTimestampWithTime,
- VTimestampWithTimeCategory,
- VTreeviewScopedProps,
-}
diff --git a/packages/api-generator/src/helpers/write.js b/packages/api-generator/src/helpers/write.js
deleted file mode 100644
index c4a4ce3bdc3..00000000000
--- a/packages/api-generator/src/helpers/write.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-
-function ensureDirectoryExists (filePath) {
- const folderPath = path.resolve(path.dirname(filePath))
- if (!fs.existsSync(folderPath)) {
- fs.mkdirSync(folderPath)
- }
-}
-
-function writeApiFile (obj, file) {
- ensureDirectoryExists(file)
- const stream = fs.createWriteStream(file)
-
- const comment = `/*
- * THIS FILE HAS BEEN AUTOMATICALLY GENERATED USING THE API-GENERATOR TOOL.
- *
- * CHANGES MADE TO THIS FILE WILL BE LOST!
- */
-
-`
-
- stream.once('open', () => {
- stream.write(comment)
- stream.write('module.exports = ')
- stream.write(JSON.stringify(obj, null, 2))
- stream.write('\n')
- stream.end()
- })
-}
-
-function writeJsonFile (obj, file) {
- ensureDirectoryExists(file)
- const stream = fs.createWriteStream(file)
-
- stream.once('open', () => {
- stream.write(JSON.stringify(obj, null, 2))
- stream.end()
- })
-}
-
-function writePlainFile (content, file) {
- ensureDirectoryExists(file)
- const stream = fs.createWriteStream(file)
-
- stream.once('open', () => {
- stream.write(content)
- stream.end()
- })
-}
-
-module.exports = {
- writeApiFile,
- writeJsonFile,
- writePlainFile,
-}
diff --git a/packages/api-generator/src/index.d.ts b/packages/api-generator/src/index.d.ts
deleted file mode 100644
index f530bfa178c..00000000000
--- a/packages/api-generator/src/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function getApi (...args: any[]): any
-export function getCompleteApi (...args: any[]): any
-export function getComponentsApi (...args: any[]): any
-export function getComposablesApi (...args: any[]): any
-export function getDirectivesApi (...args: any[]): any
diff --git a/packages/api-generator/src/index.js b/packages/api-generator/src/index.js
deleted file mode 100755
index 9a553f2dbb8..00000000000
--- a/packages/api-generator/src/index.js
+++ /dev/null
@@ -1,273 +0,0 @@
-const { createApp, capitalize, camelize } = require('vue')
-const { createVuetify } = require('vuetify')
-const { components: excludes } = require('./helpers/excludes')
-const { sortBy } = require('lodash')
-const { kebabCase } = require('./helpers/text')
-const { getPropDefault, getPropType, parseSassVariables } = require('./helpers/parsing')
-const deepmerge = require('./helpers/merge')
-
-const app = createApp()
-const vuetify = createVuetify()
-
-app.use(vuetify)
-
-const warn = console.warn
-console.warn = (...args) => {
- if (args[0] === '[Vuetify] Unable to get current component instance when generating default prop value') return
- return warn.apply(console, args)
-}
-
-const loadLocale = (componentName, locale, fallback = {}) => {
- try {
- const data = require(`./locale/${locale}/${componentName}`)
- return Object.assign(fallback, data)
- } catch (err) {
- return fallback
- }
-}
-
-const loadMap = (componentName, group, fallback = {}) => {
- try {
- const data = require(`./maps/${group}/${componentName}`)
- const map = data[componentName] ? data[componentName] : data
- return Object.assign(fallback, { ...map })
- } catch (err) {
- return fallback
- }
-}
-
-const getSources = api => {
- return ['props', 'events', 'slots'].reduce((arr, category) => {
- for (const item of api[category]) {
- if (item.source && !arr.includes(item.source)) arr.push(item.source)
- }
- return arr
- }, [])
-}
-
-const addComponentApiDescriptions = (componentName, api, locales) => {
- for (const localeName of locales) {
- const sources = [
- loadLocale(componentName, localeName),
- ...getSources(api).map(source => loadLocale(source, localeName)),
- loadLocale('generic', localeName),
- ]
-
- for (const category of ['props', 'events', 'slots', 'functions', 'sass']) {
- for (const item of api[category]) {
- const name = category === 'props' ? camelize(item.name) : item.name
- let description = ''
- if (category === 'sass') {
- description = (sources[0] && sources[0][category] && sources[0][category][name]) || ''
- } else {
- description = sources.reduce((str, source) => {
- if (str) return str
- return source[category] && source[category][name]
- }, null)
- }
-
- if (!item.description) item.description = {}
-
- item.description[localeName] = description || ''
- }
- }
- }
-
- return api
-}
-
-const addComposableApiDescriptions = (componentName, api, locales) => {
- for (const localeName of locales) {
- const sources = [
- loadLocale(componentName, localeName),
- loadLocale('generic', localeName),
- ]
-
- for (const category of ['props']) {
- for (const item of api[category]) {
- const name = category === 'props' ? camelize(item.name) : item.name
- const description = sources.reduce((str, source) => {
- if (str) return str
- return source[category] && source[category][name]
- }, null)
-
- if (!item.description) item.description = {}
-
- item.description[localeName] = description || ''
- }
- }
- }
-
- return api
-}
-
-const addDirectiveApiDescriptions = (directiveName, api, locales) => {
- if (api.argument.length) {
- for (const localeName of locales) {
- const source = loadLocale(directiveName, localeName)
- if (!api.argument[0].description) api.argument[0].description = {}
-
- api.argument[0].description[localeName] = source.argument || ''
- }
- }
-
- if (api.modifiers) {
- api = addGenericApiDescriptions(directiveName, api, locales, ['modifiers'])
- }
-
- return api
-}
-
-const addGenericApiDescriptions = (name, api, locales, categories) => {
- for (const localeName of locales) {
- const source = loadLocale(name, localeName)
- for (const category of categories) {
- for (const item of api[category]) {
- if (!item.description) item.description = {}
-
- item.description[localeName] = source[category] ? source[category][item.name] : ''
- }
- }
- }
-
- return api
-}
-
-const getComponentApi = (componentName, locales) => {
- // if (!component) throw new Error(`Could not find component: ${componentName}`)
- const kebabName = kebabCase(componentName)
- const componentMap = loadMap(kebabName, 'components', { props: [], slots: [], events: [], functions: [] })
-
- const component = app._context.components[componentName]
- const props = Object.keys(component.props || {}).reduce((arr, key) => {
- if (key === '_as') return arr
-
- const prop = component.props[key]
- const type = getPropType(prop?.type)
- arr.push({
- name: kebabCase(key),
- source: prop?.source || kebabName,
- default: getPropDefault(prop?.default, type),
- type,
- })
-
- return arr
- }, [])
-
- const events = Object.keys(component.emits || []).reduce((arr, key) => {
- arr.push({
- name: key,
- })
-
- return arr
- }, [])
-
- const sassVariables = parseSassVariables(componentName)
-
- const api = deepmerge(componentMap, { name: kebabName, props, events, sass: sassVariables, component: true })
-
- // Make sure things are sorted
- const categories = ['props', 'slots', 'events', 'functions']
- for (const category of categories) {
- componentMap[category] = sortBy(componentMap[category], 'name')
- }
-
- return addComponentApiDescriptions(kebabName, api, locales)
-}
-
-const getComposableApi = (composableName, locales) => {
- // if (!composable) throw new Error(`Could not find composable: ${composableName}`)
-
- const api = deepmerge(loadMap(composableName, 'composables'), { name: composableName, composable: true })
-
- return addComposableApiDescriptions(composableName, api, locales)
-}
-
-const getDirectiveApi = (directiveName, locales) => {
- // if (!directive) throw new Error(`Could not find directive: ${directiveName}`)
-
- const api = deepmerge(loadMap(directiveName, 'directives'), { name: directiveName, directive: true })
-
- return addDirectiveApiDescriptions(directiveName, api, locales)
-}
-
-/*
-const getVuetifyApi = locales => {
- const name = '$vuetify'
- const sass = parseGlobalSassVariables()
- const api = deepmerge(loadMap(name), { name, sass })
-
- return addGenericApiDescriptions(name, api, locales, ['functions', 'sass'])
-}
-
-const getInternationalizationApi = locales => {
- const name = 'internationalization'
- const api = deepmerge(loadMap(name), { name })
-
- return addGenericApiDescriptions(name, api, locales, ['functions', 'props'])
-}
-
-const DIRECTIVES = ['v-mutate', 'v-intersect', 'v-ripple', 'v-resize', 'v-scroll', 'v-touch', 'v-click-outside']
-*/
-
-const COMPOSABLES = ['display']
-const DIRECTIVES = ['v-intersect', 'v-ripple', 'v-resize', 'v-scroll', 'v-touch']
-
-const getApi = (name, locales) => {
- // if (name === '$vuetify') return getVuetifyApi(locales)
- // if (name === 'internationalization') return getInternationalizationApi(locales)
- if (COMPOSABLES.includes(name)) return getComposableApi(name, locales)
- if (DIRECTIVES.includes(name)) return getDirectiveApi(name, locales)
- else return getComponentApi(capitalize(camelize(name)), locales)
-}
-
-const getComponentsApi = locales => {
- const components = []
- const componentList = Object.keys(app._context.components)
- .filter(name => !excludes.includes(name))
- .filter(name => !name.endsWith('Transition')) // TODO: Filter out transitions for now
-
- for (const componentName of componentList) {
- components.push(getComponentApi(componentName, locales))
- }
-
- return components
-}
-
-const getComposablesApi = locales => {
- const composables = []
-
- for (const composableName of COMPOSABLES) {
- composables.push(getComposableApi(composableName, locales))
- }
-
- return composables
-}
-
-const getDirectivesApi = locales => {
- const directives = []
-
- for (const directiveName of DIRECTIVES) {
- directives.push(getDirectiveApi(directiveName, locales))
- }
-
- return directives
-}
-
-const getCompleteApi = locales => {
- return [
- // getVuetifyApi(locales),
- // getInternationalizationApi(locales),
- ...getComponentsApi(locales),
- ...getComposablesApi(locales),
- ...getDirectivesApi(locales),
- ].sort((a, b) => a.name.localeCompare(b.name))
-}
-
-module.exports = {
- getApi,
- getCompleteApi,
- getComponentsApi,
- getComposablesApi,
- getDirectivesApi,
-}
diff --git a/packages/api-generator/src/index.ts b/packages/api-generator/src/index.ts
new file mode 100644
index 00000000000..9e8a6a6f884
--- /dev/null
+++ b/packages/api-generator/src/index.ts
@@ -0,0 +1,75 @@
+import fs from 'fs/promises'
+import path from 'path'
+import { components } from 'vuetify'
+import { kebabCase } from './helpers/text'
+import { generateComposableDataFromTypes, generateDirectiveDataFromTypes } from './types'
+import Piscina from 'piscina'
+import { addDescriptions, addDirectiveDescriptions, stringifyProps } from './utils'
+import * as os from 'os'
+import mkdirp from 'mkdirp'
+import { createVeturApi } from './vetur'
+import rimraf from 'rimraf'
+import { createWebTypesApi } from './web-types'
+
+const run = async () => {
+ const locales = ['en']
+
+ // Components
+ const pool = new Piscina({
+ filename: './src/worker.js',
+ niceIncrement: 10,
+ maxThreads: Math.max(1, Math.floor(Math.min(os.cpus().length / 2, os.freemem() / (1.1 * 1024 ** 3)))),
+ })
+
+ const template = await fs.readFile('./src/template.d.ts', 'utf-8')
+
+ await mkdirp('./src/tmp')
+ for (const component in components) {
+ await fs.writeFile(`./src/tmp/${component}.d.ts`, template.replaceAll('__component__', component))
+ }
+
+ const outPath = '../docs/src/api/data/'
+
+ const componentData = await Promise.all(
+ Object.entries(components).map(([componentName, componentInstance]) => pool.run(
+ JSON.stringify({
+ componentName,
+ componentProps: stringifyProps(componentInstance.props),
+ locales,
+ outPath,
+ })
+ ))
+ )
+
+ // Composables
+ const composables = generateComposableDataFromTypes().map(composable => {
+ const kebabName = kebabCase(composable.name)
+ const source = kebabName.split('-')[1]
+ addDescriptions(composable.name, composable.data, [source], locales)
+ return { kebabName, ...composable }
+ })
+
+ for (const composable of composables) {
+ await fs.writeFile(path.resolve(outPath, `${composable.kebabName}.json`), JSON.stringify(composable.data, null, 2))
+ }
+
+ // Directives
+ const directives = generateDirectiveDataFromTypes().map(directive => {
+ const kebabName = kebabCase(directive.name)
+ addDirectiveDescriptions(directive.name, directive, [kebabName], locales)
+
+ return { kebabName, ...directive }
+ })
+
+ for (const { kebabName, name, ...directive } of directives) {
+ await fs.writeFile(path.resolve(outPath, `${kebabName}.json`), JSON.stringify(directive, null, 2))
+ }
+
+ rimraf.sync(path.resolve('./dist'))
+ fs.mkdir(path.resolve('./dist'))
+ createVeturApi(componentData)
+ createWebTypesApi(componentData, directives)
+ rimraf.sync(path.resolve('./src/tmp'))
+}
+
+run()
diff --git a/packages/api-generator/src/locale/en/validatable.json b/packages/api-generator/src/locale/en/validation.json
similarity index 100%
rename from packages/api-generator/src/locale/en/validatable.json
rename to packages/api-generator/src/locale/en/validation.json
diff --git a/packages/api-generator/src/maps/$vuetify.js b/packages/api-generator/src/maps/$vuetify.js
deleted file mode 100644
index 98779363127..00000000000
--- a/packages/api-generator/src/maps/$vuetify.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- $vuetify: {
- functions: [
- {
- name: 'goTo',
- signature: `(target: number | string | HTMLElement | Vue, options?: {
- container?: string | HTMLElement | Vue
- duration?: number
- offset?: number
- easing?: VuetifyGoToEasing
- appOffset?: boolean
-}): Promise<number>`,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-alert.js b/packages/api-generator/src/maps/components/v-alert.js
deleted file mode 100644
index a3bfe8be202..00000000000
--- a/packages/api-generator/src/maps/components/v-alert.js
+++ /dev/null
@@ -1,36 +0,0 @@
-module.exports = {
- 'v-alert': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'append',
- props: undefined,
- },
- {
- name: 'close',
- props: {
- toggle: 'Function',
- },
- },
- {
- name: 'prepend',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'input',
- value: 'boolean',
- },
- ],
- functions: [
- {
- name: 'toggle',
- signature: '(): void',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-app-bar-nav-icon.js b/packages/api-generator/src/maps/components/v-app-bar-nav-icon.js
deleted file mode 100644
index f6974d163c0..00000000000
--- a/packages/api-generator/src/maps/components/v-app-bar-nav-icon.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-app-bar-nav-icon': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-app-bar-title.js b/packages/api-generator/src/maps/components/v-app-bar-title.js
deleted file mode 100644
index c8d3917cb85..00000000000
--- a/packages/api-generator/src/maps/components/v-app-bar-title.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-app-bar-title': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-app-bar.js b/packages/api-generator/src/maps/components/v-app-bar.js
deleted file mode 100644
index ab42ef83116..00000000000
--- a/packages/api-generator/src/maps/components/v-app-bar.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- 'v-app-bar': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'extension',
- props: undefined,
- },
- {
- name: 'img',
- props: {
- props: '{ height: string, src: string | srcObject }',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-autocomplete.js b/packages/api-generator/src/maps/components/v-autocomplete.js
deleted file mode 100644
index 1df19c2667f..00000000000
--- a/packages/api-generator/src/maps/components/v-autocomplete.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VAutocomplete } = require('../helpers/variables')
-
-module.exports = {
- 'v-autocomplete': VAutocomplete,
-}
diff --git a/packages/api-generator/src/maps/components/v-avatar.js b/packages/api-generator/src/maps/components/v-avatar.js
deleted file mode 100644
index 792e8cb55c6..00000000000
--- a/packages/api-generator/src/maps/components/v-avatar.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-avatar': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-badge.js b/packages/api-generator/src/maps/components/v-badge.js
deleted file mode 100644
index 2ee9be014d6..00000000000
--- a/packages/api-generator/src/maps/components/v-badge.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- 'v-badge': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'badge',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-bottom-navigation.js b/packages/api-generator/src/maps/components/v-bottom-navigation.js
deleted file mode 100644
index db55666835a..00000000000
--- a/packages/api-generator/src/maps/components/v-bottom-navigation.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- 'v-bottom-navigation': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'any',
- },
- {
- name: 'update:input-value',
- value: 'string | number',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-bottom-sheet.js b/packages/api-generator/src/maps/components/v-bottom-sheet.js
deleted file mode 100644
index 0040b71ddce..00000000000
--- a/packages/api-generator/src/maps/components/v-bottom-sheet.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = {
- 'v-bottom-sheet': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'activator',
- props: {
- on: '{ [eventName]: eventHandler }',
- value: 'boolean',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-breadcrumbs-item.js b/packages/api-generator/src/maps/components/v-breadcrumbs-item.js
deleted file mode 100644
index 21292ff0608..00000000000
--- a/packages/api-generator/src/maps/components/v-breadcrumbs-item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-breadcrumbs-item': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-breadcrumbs.js b/packages/api-generator/src/maps/components/v-breadcrumbs.js
deleted file mode 100644
index 4bd6fb17ccb..00000000000
--- a/packages/api-generator/src/maps/components/v-breadcrumbs.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const BreadcrumbsItem = [{
- disabled: 'boolean',
- exact: 'boolean',
- href: 'string',
- link: 'boolean',
- title: 'string | number',
- to: 'string | object',
-}]
-
-module.exports = {
- 'v-breadcrumbs': {
- props: [{
- name: 'items',
- example: BreadcrumbsItem,
- }],
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'divider',
- props: undefined,
- },
- {
- name: 'prepend',
- props: undefined,
- },
- {
- name: 'title',
- props: {
- item: 'any[]',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-btn-toggle.js b/packages/api-generator/src/maps/components/v-btn-toggle.js
deleted file mode 100644
index 46114fede34..00000000000
--- a/packages/api-generator/src/maps/components/v-btn-toggle.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-btn-toggle': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'any[] | any',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-btn.js b/packages/api-generator/src/maps/components/v-btn.js
deleted file mode 100644
index c8ed1a3f458..00000000000
--- a/packages/api-generator/src/maps/components/v-btn.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- 'v-btn': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'loader',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'click',
- value: 'Event',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-calendar.js b/packages/api-generator/src/maps/components/v-calendar.js
deleted file mode 100644
index 6306a73f57e..00000000000
--- a/packages/api-generator/src/maps/components/v-calendar.js
+++ /dev/null
@@ -1,376 +0,0 @@
-const {
- VCalendarDay,
- VCalendarEventEvent,
- VCalendarEventSlot,
- VTimestamp,
- VTimestampWithCategory,
- VTimestampWithTime,
- VTimestampWithTimeCategory,
-} = require('../helpers/variables')
-
-function createMouseEventDesc (ob, eventType) {
- return `${JSON.stringify(VTimestampWithTime, null, 2).replace(/"/g, '')}, ${eventType}`
-}
-
-module.exports = {
- 'v-calendar': {
- slots: [
- {
- name: 'category',
- props: VTimestampWithCategory,
- },
- {
- name: 'event',
- props: VCalendarEventSlot,
- },
- {
- name: 'day',
- props: VCalendarDay,
- },
- {
- name: 'day-body',
- props: VTimestampWithTime,
- },
- {
- name: 'day-header',
- props: VTimestampWithTime,
- },
- {
- name: 'day-label',
- props: VTimestamp,
- },
- {
- name: 'day-label-header',
- props: VTimestamp,
- },
- {
- name: 'day-month',
- props: VTimestamp,
- },
- {
- name: 'interval',
- props: VTimestampWithTime,
- },
- ],
- functions: [
- {
- name: 'checkChange',
- signature: '(): void',
- },
- {
- name: 'updateTimes',
- signature: '(): void',
- },
- {
- name: 'next',
- signature: '(amount: number = 1): void',
- },
- {
- name: 'prev',
- signature: '(amount: number = 1): void',
- },
- {
- name: 'move',
- signature: '(amount: number = 1): void',
- },
- {
- name: 'timeToY',
- signature: '(time: number | string | { hour: number, minute: number }, clamp: boolean = true): number | false',
- },
- {
- name: 'timeDelta',
- signature: '(time: number | string | { hour: number, minute: number }): number | false',
- },
- {
- name: 'minutesToPixels',
- signature: '(minutes: number): number',
- },
- {
- name: 'scrollToTime',
- signature: '(time: number | string | { hour: number, minute: number }): boolean',
- },
- {
- name: 'getVisibleEvents',
- signature: '(): CalendarEventParsed[]',
- },
- {
- name: 'parseEvent',
- signature: '(input: CalendarEvent, index: number = 0): CalendarEventParsed',
- },
- {
- name: 'parseTimestamp',
- signature: '(input: VTimestampInput, required?: false): CalendarTimestamp | null',
- },
- {
- name: 'timestampToDate',
- signature: '(timestamp: CalendarTimestamp): Date',
- },
- ],
- events: [
- {
- name: 'input',
- value: VTimestamp,
- },
- {
- name: 'moved',
- value: VTimestamp,
- },
- {
- name: 'change',
- value: { start: VTimestamp, end: VTimestamp },
- },
- {
- name: 'click:date',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'contextmenu:date',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'click:more',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'click:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'contextmenu:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mousedown:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mousemove:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mouseup:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mouseenter:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mouseleave:day',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'touchstart:day',
- value: createMouseEventDesc(VTimestampWithTime, 'TouchEvent'),
- },
- {
- name: 'touchmove:day',
- value: createMouseEventDesc(VTimestampWithTime, 'TouchEvent'),
- },
- {
- name: 'touchend:day',
- value: createMouseEventDesc(VTimestampWithTime, 'TouchEvent'),
- },
- {
- name: 'click:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'contextmenu:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'mousedown:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'mousemove:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'mouseup:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'mouseenter:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'mouseleave:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'touchstart:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'touchmove:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'touchend:event',
- value: VCalendarEventEvent,
- },
- {
- name: 'click:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'contextmenu:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'mousedown:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'mousemove:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'mouseup:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'mouseenter:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'mouseleave:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'MouseEvent'),
- },
- {
- name: 'touchstart:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'TouchEvent'),
- },
- {
- name: 'touchmove:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'TouchEvent'),
- },
- {
- name: 'touchend:day-category',
- value: createMouseEventDesc(VTimestampWithCategory, 'TouchEvent'),
- },
- {
- name: 'click:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'contextmenu:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mousedown:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mousemove:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mouseup:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mouseenter:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'mouseleave:time',
- value: createMouseEventDesc(VTimestampWithTime, 'MouseEvent'),
- },
- {
- name: 'touchstart:time',
- value: createMouseEventDesc(VTimestampWithTime, 'TouchEvent'),
- },
- {
- name: 'touchmove:time',
- value: createMouseEventDesc(VTimestampWithTime, 'TouchEvent'),
- },
- {
- name: 'touchend:time',
- value: createMouseEventDesc(VTimestampWithTime, 'TouchEvent'),
- },
- {
- name: 'click:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'contextmenu:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'mousedown:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'mousemove:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'mouseup:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'mouseenter:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'mouseleave:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'MouseEvent'),
- },
- {
- name: 'touchstart:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'TouchEvent'),
- },
- {
- name: 'touchmove:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'TouchEvent'),
- },
- {
- name: 'touchend:time-category',
- value: createMouseEventDesc(VTimestampWithTimeCategory, 'TouchEvent'),
- },
- {
- name: 'click:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'contextmenu:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'mousedown:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'mousemove:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'mouseup:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'mouseenter:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'mouseleave:interval',
- value: createMouseEventDesc(VTimestamp, 'MouseEvent'),
- },
- {
- name: 'touchstart:interval',
- value: createMouseEventDesc(VTimestamp, 'TouchEvent'),
- },
- {
- name: 'touchmove:interval',
- value: createMouseEventDesc(VTimestamp, 'TouchEvent'),
- },
- {
- name: 'touchend:interval',
- value: createMouseEventDesc(VTimestamp, 'TouchEvent'),
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-card-actions.js b/packages/api-generator/src/maps/components/v-card-actions.js
deleted file mode 100644
index 7b8d8ff5bec..00000000000
--- a/packages/api-generator/src/maps/components/v-card-actions.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-card-actions': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-card-subtitle.js b/packages/api-generator/src/maps/components/v-card-subtitle.js
deleted file mode 100644
index 42356dab8c4..00000000000
--- a/packages/api-generator/src/maps/components/v-card-subtitle.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-card-subtitle': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-card-text.js b/packages/api-generator/src/maps/components/v-card-text.js
deleted file mode 100644
index 35bc5f5dbf1..00000000000
--- a/packages/api-generator/src/maps/components/v-card-text.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-card-text': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-card-title.js b/packages/api-generator/src/maps/components/v-card-title.js
deleted file mode 100644
index 582de9b36f9..00000000000
--- a/packages/api-generator/src/maps/components/v-card-title.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-card-title': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-card.js b/packages/api-generator/src/maps/components/v-card.js
deleted file mode 100644
index 27d1f09e89a..00000000000
--- a/packages/api-generator/src/maps/components/v-card.js
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
- 'v-card': {
- events: [
- {
- name: 'click',
- value: 'void',
- },
- ],
- slots: [
- {
- name: 'append',
- props: undefined,
- },
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'image',
- props: undefined,
- },
- {
- name: 'prepend',
- props: undefined,
- },
- {
- name: 'subtitle',
- props: undefined,
- },
- {
- name: 'title',
- props: undefined,
- },
- {
- name: 'text',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-carousel-item.js b/packages/api-generator/src/maps/components/v-carousel-item.js
deleted file mode 100644
index 79758294418..00000000000
--- a/packages/api-generator/src/maps/components/v-carousel-item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-carousel-item': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-carousel.js b/packages/api-generator/src/maps/components/v-carousel.js
deleted file mode 100644
index 867598f87c4..00000000000
--- a/packages/api-generator/src/maps/components/v-carousel.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const { NextPrevSlots } = require('./v-window')
-
-module.exports = {
- 'v-carousel': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ...NextPrevSlots,
- ],
- events: [
- {
- name: 'change',
- value: 'number',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-checkbox.js b/packages/api-generator/src/maps/components/v-checkbox.js
deleted file mode 100644
index 22ae0bf6789..00000000000
--- a/packages/api-generator/src/maps/components/v-checkbox.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { VInput } = require('../helpers/variables')
-
-module.exports = {
- 'v-checkbox': {
- ...VInput,
- events: [
- ...VInput.events,
- {
- name: 'change',
- value: 'any',
- },
- {
- name: 'update:indeterminate',
- value: 'boolean',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-chip-group.js b/packages/api-generator/src/maps/components/v-chip-group.js
deleted file mode 100644
index be970d0f0fb..00000000000
--- a/packages/api-generator/src/maps/components/v-chip-group.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-chip-group': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'any[] | any',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-chip.js b/packages/api-generator/src/maps/components/v-chip.js
deleted file mode 100644
index b692e6a256b..00000000000
--- a/packages/api-generator/src/maps/components/v-chip.js
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = {
- 'v-chip': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'input',
- value: 'boolean',
- },
- {
- name: 'click',
- value: 'MouseEvent',
- },
- {
- name: 'click:close',
- value: 'void',
- },
- {
- name: 'update:active',
- value: 'boolean',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-click-outside.js b/packages/api-generator/src/maps/components/v-click-outside.js
deleted file mode 100644
index ff6ec770005..00000000000
--- a/packages/api-generator/src/maps/components/v-click-outside.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- 'v-click-outside': {
- argument: [{
- name: 'argument',
- type: ['((e: Event) => void)', 'ClickOutsideBindingArgs'],
- default: undefined,
- example: {
- handler: '(e: Event) => void',
- 'closeConditional?': '(e: Event) => boolean',
- 'include?': '() => HTMLElement[]',
- },
- }],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-color-picker.js b/packages/api-generator/src/maps/components/v-color-picker.js
deleted file mode 100644
index 43cceb39751..00000000000
--- a/packages/api-generator/src/maps/components/v-color-picker.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const VColorPickerColor = {
- alpha: 'number',
- hex: 'string',
- hexa: 'string',
- hsla: {
- h: 'number',
- s: 'number',
- l: 'number',
- a: 'number',
- },
- hsva: {
- h: 'number',
- s: 'number',
- v: 'number',
- a: 'number',
- },
- hue: 'number',
- rgba: {
- r: 'number',
- g: 'number',
- b: 'number',
- a: 'number',
- },
-}
-
-module.exports = {
- 'v-color-picker': {
- events: [
- {
- name: 'input',
- value: 'string | object',
- },
- {
- name: 'update:color',
- value: VColorPickerColor,
- },
- {
- name: 'update:mode',
- value: 'string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-combobox.js b/packages/api-generator/src/maps/components/v-combobox.js
deleted file mode 100644
index 885d18285a7..00000000000
--- a/packages/api-generator/src/maps/components/v-combobox.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VSelect } = require('../helpers/variables')
-
-module.exports = {
- 'v-combobox': VSelect,
-}
diff --git a/packages/api-generator/src/maps/components/v-data-footer.js b/packages/api-generator/src/maps/components/v-data-footer.js
deleted file mode 100644
index 19fb714f38c..00000000000
--- a/packages/api-generator/src/maps/components/v-data-footer.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const { DataOptions, DataPagination } = require('./v-data')
-
-const DataFooterPageTextScopedProps = {
- pageStart: 'number',
- pageStop: 'number',
- itemsLength: 'number',
-}
-
-const DataFooterSlots = [
- { name: 'prepend' },
- { name: 'page-text', props: DataFooterPageTextScopedProps },
-]
-
-const DataFooterEvents = [
- { name: 'update:options', value: DataOptions },
-]
-
-const DataFooterProps = [
- {
- name: 'options',
- example: DataOptions,
- },
- {
- name: 'pagination',
- example: DataPagination,
- },
-]
-
-module.exports = {
- 'v-data-footer': {
- props: DataFooterProps,
- slots: [
- ...DataFooterSlots,
- ],
- events: DataFooterEvents,
- },
- DataFooterSlots,
- DataFooterEvents,
- DataFooterPageTextScopedProps,
-}
diff --git a/packages/api-generator/src/maps/components/v-data-iterator.js b/packages/api-generator/src/maps/components/v-data-iterator.js
deleted file mode 100644
index 63ae1ec750d..00000000000
--- a/packages/api-generator/src/maps/components/v-data-iterator.js
+++ /dev/null
@@ -1,91 +0,0 @@
-const { DataEvents, DataProps, DataDefaultScopedSlotProps } = require('./v-data')
-const { DataFooterPageTextScopedProps } = require('./v-data-footer')
-
-const DataIteratorProps = DataProps.concat([
- { name: 'value', source: 'v-data-iterator' },
- { name: 'itemKey', source: 'v-data-iterator' },
- { name: 'singleSelect', source: 'v-data-iterator' },
- { name: 'expanded', source: 'v-data-iterator' },
- { name: 'singleExpand', source: 'v-data-iterator' },
- { name: 'loading', source: 'v-data-iterator' },
- { name: 'loadingText', source: 'v-data-iterator' },
- { name: 'noResultsText', source: 'v-data-iterator' },
- { name: 'noDataText', source: 'v-data-iterator' },
- { name: 'hideDefaultFooter', source: 'v-data-iterator' },
- { name: 'footerProps', source: 'v-data-iterator' },
-])
-
-const DataIteratorEvents = DataEvents.concat([
- { name: 'input', source: 'v-data-iterator', value: 'any[]' },
- { name: 'update:expanded', source: 'v-data-iterator', value: 'any[]' },
- { name: 'item-selected', source: 'v-data-iterator', value: '{ item: any, value: boolean }' },
- { name: 'item-expanded', source: 'v-data-iterator', value: '{ item: any, value: boolean }' },
- { name: 'toggle-select-all', source: 'v-data-iterator', value: '{ items: any[], value: boolean }' },
-])
-
-const DataIteratorSlots = [
- { name: 'default', source: 'v-data-iterator' },
- { name: 'loading', source: 'v-data-iterator' },
- { name: 'no-data', source: 'v-data-iterator' },
- { name: 'no-results', source: 'v-data-iterator' },
-]
-
-const DataIteratorItemScopedProps = {
- expand: '(v: boolean) => void',
- index: 'number',
- item: 'any',
- isExpanded: 'boolean',
- isMobile: 'boolean',
- isSelected: 'boolean',
- select: '(v: boolean) => void',
-}
-
-const DataIteratorScopedSlots = [
- {
- name: 'default',
- props: {
- ...DataDefaultScopedSlotProps,
- isSelected: '(item: any) => boolean',
- select: '(item: any, value: boolean) => void',
- isExpanded: '(item: any) => boolean',
- expand: '(item: any, value: boolean) => void',
- },
- source: 'data-iterator',
- },
- {
- name: 'footer',
- props: DataDefaultScopedSlotProps,
- source: 'data-iterator',
- },
- {
- name: 'footer.page-text',
- props: DataFooterPageTextScopedProps,
- source: 'data-iterator',
- },
- {
- name: 'header',
- props: DataDefaultScopedSlotProps,
- source: 'data-iterator',
- },
- {
- name: 'item',
- props: DataIteratorItemScopedProps,
- source: 'data-iterator',
- },
-]
-
-module.exports = {
- 'v-data-iterator': {
- props: DataIteratorProps,
- slots: [
- ...DataIteratorSlots,
- ...DataIteratorScopedSlots,
- ],
- events: DataIteratorEvents,
- },
- DataIteratorProps,
- DataIteratorEvents,
- DataIteratorSlots,
- DataIteratorScopedSlots,
- DataIteratorItemScopedProps,
-}
diff --git a/packages/api-generator/src/maps/components/v-data-table-header.js b/packages/api-generator/src/maps/components/v-data-table-header.js
deleted file mode 100644
index dd3e1b4af62..00000000000
--- a/packages/api-generator/src/maps/components/v-data-table-header.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
- 'v-data-table-header': {
- props: [
- {
- name: 'sortByText',
- default: `'Sort by'`,
- source: 'v-data-table-header',
- type: 'string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-data-table.js b/packages/api-generator/src/maps/components/v-data-table.js
deleted file mode 100644
index bd73fcbd46b..00000000000
--- a/packages/api-generator/src/maps/components/v-data-table.js
+++ /dev/null
@@ -1,194 +0,0 @@
-const deepmerge = require('../helpers/merge')
-const { DataDefaultScopedSlotProps, DataOptions } = require('./v-data')
-const { DataIteratorEvents, DataIteratorProps, DataIteratorSlots, DataIteratorItemScopedProps } = require('./v-data-iterator')
-const { DataFooterPageTextScopedProps } = require('./v-data-footer')
-
-const DataTableHeader = {
- text: 'string',
- value: 'string',
- 'align?': `'start' | 'center' | 'end'`,
- 'sortable?': 'boolean',
- 'filterable?': 'boolean',
- 'groupable?': 'boolean',
- 'divider?': 'boolean',
- 'class?': 'string | string[]',
- 'cellClass?': 'string | string[]',
- 'width?': 'string | number',
- 'filter?': '(value: any, search: string, item: any) => boolean',
- 'sort?': '(a: any, b: any) => number',
-}
-
-const dataString = `{
- expand: (value: boolean) => void,
- headers: DataTableHeader[],
- isExpanded: boolean,
- isMobile: boolean,
- isSelected: boolean,
- item: any,
- select: (value: boolean) => void
-}`
-const DataTableEvents = [
- {
- name: 'click:row',
- source: 'v-data-table',
- value: `any, ${dataString}`,
- },
- {
- name: 'contextmenu:row',
- source: 'v-data-table',
- value: `MouseEvent, ${dataString}`,
- },
- {
- name: 'dblclick:row',
- source: 'v-data-table',
- value: `MouseEvent, ${dataString}`,
- },
-].concat(DataIteratorEvents)
-
-const DataTableHeaderScopedProps = {
- isMobile: 'boolean',
- props: {
- headers: 'DataTableHeader[]',
- options: DataOptions,
- mobile: 'boolean',
- showGroupBy: 'boolean',
- someItems: 'boolean',
- everyItem: 'boolean',
- },
- on: {
- sort: DataDefaultScopedSlotProps.sort,
- group: DataDefaultScopedSlotProps.group,
- 'toggle-select-all': '(value: boolean) => void',
- },
-}
-
-const DataTableFooterScopedProps = {
- props: {
- options: DataOptions,
- pagination: DataDefaultScopedSlotProps.pagination,
- itemsPerPageText: 'string',
- },
- on: '{}',
- headers: 'DataTableHeader[]',
- widths: '[]',
-}
-
-const DataTableHeaderColumnScopedProps = {
- header: 'DataTableHeader',
-}
-
-const DataTableItemScopedProps = {
- ...DataIteratorItemScopedProps,
- headers: 'DataTableHeader[]',
- isMobile: 'boolean',
-}
-
-const DataTableItemColumnScopedProps = {
- isMobile: 'boolean',
- item: 'any',
- header: 'DataTableHeader',
- value: 'any',
-}
-
-const DataTableHeaderSelectScopedProps = {
- isMobile: 'boolean',
- props: {
- value: 'boolean',
- indeterminate: 'boolean',
- },
- on: {
- input: '(value: boolean) => void',
- },
-}
-
-const DataTableExpandedItemScopedProps = {
- isMobile: 'boolean',
- item: 'any',
- headers: 'DataTableHeader[]',
-}
-
-const DataTableBodyScopedProps = {
- ...DataDefaultScopedSlotProps,
- headers: 'DataTableHeader[]',
- isMobile: 'boolean',
- isSelected: '(item: any) => boolean',
- select: '(item: any, value: boolean) => void',
- isExpanded: '(item: any) => boolean',
- expand: '(item: any, value: boolean) => void',
-}
-
-const DataGroupScopedProps = {
- group: 'string',
- options: DataOptions,
- isMobile: 'boolean',
- items: 'any[]',
- headers: 'i DataTableHeader[]',
-}
-
-const DataGroupHeaderScopedProps = {
- group: 'string',
- groupBy: DataOptions.groupBy,
- isMobile: 'boolean',
- items: 'any[]',
- headers: 'DataTableHeader[]',
- isOpen: 'boolean',
- toggle: '() => void',
- remove: '() => void',
-}
-
-const DataGroupSummaryScopedProps = {
- group: 'string',
- groupBy: DataOptions.groupBy,
- isMobile: 'boolean',
- items: 'any[]',
- headers: 'DataTableHeader[]',
- isOpen: 'boolean',
- toggle: '() => void',
-}
-
-const DataTableSlots = [
- { name: 'body.append', props: DataTableBodyScopedProps },
- { name: 'body.prepend', props: DataTableBodyScopedProps },
- { name: 'body', props: DataTableBodyScopedProps },
- { name: 'foot', props: DataDefaultScopedSlotProps },
- { name: 'footer', props: DataTableFooterScopedProps },
- { name: 'footer.prepend' },
- { name: 'footer.page-text', props: DataFooterPageTextScopedProps },
- { name: 'header', props: DataTableHeaderScopedProps },
- { name: 'header.data-table-select', props: DataTableHeaderSelectScopedProps },
- { name: 'header.<name>', props: DataTableHeaderColumnScopedProps },
- { name: 'top', props: { ...DataDefaultScopedSlotProps, isMobile: 'boolean' } },
- { name: 'progress' },
- { name: 'group', props: DataGroupScopedProps },
- { name: 'group.header', props: DataGroupHeaderScopedProps },
- { name: 'group.summary', props: DataGroupSummaryScopedProps },
- { name: 'item', props: DataTableItemScopedProps },
- { name: 'item.data-table-select', props: DataTableItemScopedProps },
- { name: 'item.data-table-expand', props: DataTableItemScopedProps },
- { name: 'item.<name>', props: DataTableItemColumnScopedProps },
- { name: 'expanded-item', props: DataTableExpandedItemScopedProps },
- ...DataIteratorSlots.filter(slot => !['default'].includes(slot.name)),
-]
-
-module.exports = {
- 'v-data-table': {
- props: deepmerge(DataIteratorProps, [
- {
- name: 'headers',
- type: 'DataTableHeader[]',
- example: DataTableHeader,
- },
- {
- name: 'customFilter',
- default: 'gh:defaultFilter',
- example: '(value: any, search: string | null, item: any) => boolean',
- },
- ]),
- slots: DataTableSlots,
- events: DataTableEvents,
- },
- DataTableHeader,
- DataTableEvents,
- DataTableHeaderScopedProps,
- DataTableSlots,
-}
diff --git a/packages/api-generator/src/maps/components/v-data.js b/packages/api-generator/src/maps/components/v-data.js
deleted file mode 100644
index cf8db685bdb..00000000000
--- a/packages/api-generator/src/maps/components/v-data.js
+++ /dev/null
@@ -1,95 +0,0 @@
-const DataOptions = {
- page: 'number',
- itemsPerPage: 'number',
- sortBy: 'string[]',
- sortDesc: 'boolean[]',
- groupBy: 'string[]',
- groupDesc: 'boolean[]',
- multiSort: 'boolean',
- mustSort: 'boolean',
-}
-
-const DataPagination = {
- page: 'number',
- itemsPerPage: 'number',
- pageStart: 'number',
- pageStop: 'number',
- pageCount: 'number',
- itemsLength: 'number',
-}
-
-const DataProps = [
- { name: 'items', source: 'v-data' },
- { name: 'options', source: 'v-data', type: 'DataOptions', example: DataOptions },
- { name: 'sortBy', source: 'v-data' },
- { name: 'sortDesc', source: 'v-data' },
- {
- name: 'customSort',
- source: 'v-data',
- default: 'gh:sortItems',
- example: '(items: any[], sortBy: string[], sortDesc: boolean[], locale: string, customSorters?: Record<string, compareFn>) => any[]',
- },
- { name: 'mustSort', source: 'v-data' },
- { name: 'multiSort', source: 'v-data' },
- { name: 'page', source: 'v-data' },
- { name: 'itemsPerPage', source: 'v-data' },
- { name: 'groupBy', source: 'v-data' },
- { name: 'groupDesc', source: 'v-data' },
- { name: 'checkboxColor', source: 'v-data', type: 'string' },
- {
- name: 'customGroup',
- source: 'v-data',
- default: 'gh:groupItems',
- example: '(items: any[], groupBy: string[], groupDesc: boolean[]) => Record<string, any[]>',
- },
- { name: 'locale', source: 'v-data' },
- { name: 'disableSort', source: 'v-data' },
- { name: 'disablePagination', source: 'v-data' },
- { name: 'disableFiltering', source: 'v-data' },
- { name: 'search', source: 'v-data' },
- { name: 'customFilter', source: 'v-data', default: 'gh:searchItems', example: '(items: any[], search: string) => any[]' },
- { name: 'serverItemsLength', source: 'v-data' },
-]
-
-const DataDefaultScopedSlotProps = {
- items: 'any[]',
- originalItemsLength: 'number',
- pagination: DataPagination,
- options: DataOptions,
- groupedItems: 'Array<{ name: string, items: any[] }>',
- updateOptions: '(obj: any) => void',
- sort: '(value: string) => void',
- sortArray: '(sortBy: string[]) => void',
- group: '(value: string) => void',
-}
-
-const DataEvents = [
- { name: 'current-items', source: 'v-data', value: 'any[]' },
- { name: 'page-count', source: 'v-data', value: 'number' },
- { name: 'pagination', source: 'v-data', value: DataPagination },
- { name: 'update:options', source: 'v-data', value: DataOptions },
- { name: 'update:page', source: 'v-data', value: 'number' },
- { name: 'update:items-per-page', source: 'v-data', value: 'number' },
- { name: 'update:sort-by', source: 'v-data', value: 'string | string[]' },
- { name: 'update:sort-desc', source: 'v-data', value: 'boolean | boolean[]' },
- { name: 'update:group-by', source: 'v-data', value: 'string | string[]' },
- { name: 'update:group-desc', source: 'v-data', value: 'boolean | boolean[]' },
- { name: 'update:multi-sort', source: 'v-data', value: 'boolean' },
- { name: 'update:must-sort', source: 'v-data', value: 'boolean' },
-]
-
-module.exports = {
- 'v-data': {
- props: DataProps,
- events: DataEvents,
- slots: [{
- name: 'default',
- props: DataDefaultScopedSlotProps,
- }],
- },
- DataOptions,
- DataPagination,
- DataProps,
- DataDefaultScopedSlotProps,
- DataEvents,
-}
diff --git a/packages/api-generator/src/maps/components/v-date-picker.js b/packages/api-generator/src/maps/components/v-date-picker.js
deleted file mode 100644
index 5fe6a9d8bf5..00000000000
--- a/packages/api-generator/src/maps/components/v-date-picker.js
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
- 'v-date-picker': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'input',
- value: 'string',
- },
- {
- name: 'change',
- value: 'string',
- },
- {
- name: 'update:picker-date',
- value: 'string',
- },
- {
- name: 'update:active-picker',
- value: 'string',
- },
- {
- name: '<domevent>:date',
- value: 'string',
- },
- {
- name: '<domevent>:month',
- value: 'string',
- },
- {
- name: '<domevent>:year',
- value: 'number',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-defaults-provider.js b/packages/api-generator/src/maps/components/v-defaults-provider.js
deleted file mode 100644
index 41ff461eee6..00000000000
--- a/packages/api-generator/src/maps/components/v-defaults-provider.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-defaults-provider': {
- props: [
- {
- name: 'defaults',
- type: 'object',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-dialog.js b/packages/api-generator/src/maps/components/v-dialog.js
deleted file mode 100644
index b9e701b74c1..00000000000
--- a/packages/api-generator/src/maps/components/v-dialog.js
+++ /dev/null
@@ -1,31 +0,0 @@
-module.exports = {
- 'v-dialog': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'activator',
- props: {
- on: '{ [eventName]: eventHandler }',
- value: 'boolean',
- },
- },
- ],
- events: [
- {
- name: 'click:outside',
- value: 'MouseEvent',
- },
- {
- name: 'input',
- value: 'Boolean',
- },
- {
- name: 'keydown',
- value: 'KeyboardEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-edit-dialog.js b/packages/api-generator/src/maps/components/v-edit-dialog.js
deleted file mode 100644
index b17c2ae2fb8..00000000000
--- a/packages/api-generator/src/maps/components/v-edit-dialog.js
+++ /dev/null
@@ -1,32 +0,0 @@
-module.exports = {
- 'v-edit-dialog': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'input',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'cancel',
- value: 'void',
- },
- {
- name: 'close',
- value: 'void',
- },
- {
- name: 'open',
- value: 'void',
- },
- {
- name: 'save',
- value: 'void',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-expansion-panel-content.js b/packages/api-generator/src/maps/components/v-expansion-panel-content.js
deleted file mode 100644
index 63f8a8a5298..00000000000
--- a/packages/api-generator/src/maps/components/v-expansion-panel-content.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-expansion-panel-content': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-expansion-panel-header.js b/packages/api-generator/src/maps/components/v-expansion-panel-header.js
deleted file mode 100644
index cd2ed518604..00000000000
--- a/packages/api-generator/src/maps/components/v-expansion-panel-header.js
+++ /dev/null
@@ -1,22 +0,0 @@
-module.exports = {
- 'v-expansion-panel-header': {
- slots: [
- {
- name: 'actions',
- props: undefined,
- },
- {
- name: 'default',
- props: {
- open: 'boolean',
- },
- },
- ],
- events: [
- {
- name: 'click',
- value: 'MouseEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-expansion-panel.js b/packages/api-generator/src/maps/components/v-expansion-panel.js
deleted file mode 100644
index 516a6f07a57..00000000000
--- a/packages/api-generator/src/maps/components/v-expansion-panel.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- 'v-expansion-panel': {
- events: [
- {
- name: 'change',
- value: 'void',
- },
- {
- name: 'click',
- value: 'MouseEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-file-input.js b/packages/api-generator/src/maps/components/v-file-input.js
deleted file mode 100644
index 03887ca83f2..00000000000
--- a/packages/api-generator/src/maps/components/v-file-input.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const { VTextField } = require('../helpers/variables')
-
-const events = VTextField.events.slice()
-const index = VTextField.events.findIndex(event => event.name === 'change')
-events.splice(index, 1, {
- name: 'change',
- source: 'v-text-field',
- value: 'File[]',
-})
-
-const props = VTextField.props.filter(prop => !['readonly'].includes(prop.name))
-props.push({
- name: 'multiple',
- type: 'boolean',
- default: 'false',
- source: 'v-file-input',
-})
-
-module.exports = {
- 'v-file-input': {
- ...VTextField,
- props,
- slots: [
- ...VTextField.slots,
- {
- name: 'selection',
- props: {
- file: 'File',
- index: 'number',
- multiple: 'boolean',
- text: 'string',
- },
- source: 'v-file-input',
- },
- ],
- events,
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-flex.js b/packages/api-generator/src/maps/components/v-flex.js
deleted file mode 100644
index 39c00757ddb..00000000000
--- a/packages/api-generator/src/maps/components/v-flex.js
+++ /dev/null
@@ -1,66 +0,0 @@
-module.exports = {
- 'v-flex': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- props: [
- {
- name: 'offset-(size)(0-12)',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'order-(size)(1-12)',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: '(size)(1-12)',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'alignSelfStart',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'alignSelfEnd',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'alignSelfCenter',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'alignSelfBaseline',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'grow',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- {
- name: 'shrink',
- type: 'boolean',
- default: 'false',
- source: null,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-form.js b/packages/api-generator/src/maps/components/v-form.js
deleted file mode 100644
index 6f54b6a329b..00000000000
--- a/packages/api-generator/src/maps/components/v-form.js
+++ /dev/null
@@ -1,34 +0,0 @@
-module.exports = {
- 'v-form': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- functions: [
- {
- name: 'reset',
- signature: '(): void',
- },
- {
- name: 'resetValidation',
- signature: '(): void',
- },
- {
- name: 'validate',
- signature: '(): boolean',
- },
- ],
- events: [
- {
- name: 'update:modelValue',
- value: 'boolean',
- },
- {
- name: 'submit',
- value: 'SubmitEventPromise',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-hover.js b/packages/api-generator/src/maps/components/v-hover.js
deleted file mode 100644
index 69d9b3d2fc8..00000000000
--- a/packages/api-generator/src/maps/components/v-hover.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-hover': {
- slots: [
- {
- name: 'default',
- props: {
- hover: 'boolean',
- props: {
- onMouseenter: 'function',
- onMouseleave: 'function',
- },
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-input.js b/packages/api-generator/src/maps/components/v-input.js
deleted file mode 100644
index 6ac09596746..00000000000
--- a/packages/api-generator/src/maps/components/v-input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VInput } = require('../helpers/variables')
-
-module.exports = {
- 'v-input': VInput,
-}
diff --git a/packages/api-generator/src/maps/components/v-item-group.js b/packages/api-generator/src/maps/components/v-item-group.js
deleted file mode 100644
index 065ab8bad96..00000000000
--- a/packages/api-generator/src/maps/components/v-item-group.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports = {
- 'v-item-group': {
- slots: [
- {
- name: 'default',
- props: {
- isSelected: '(item: any) => boolean',
- select: '(item: any, selected: boolean) => void',
- next: '() => void',
- prev: '() => void',
- step: '(steps: number) => void',
- selected: 'string[]',
- },
- },
- ],
- events: [
- {
- name: 'update:modelValue',
- value: 'any[] | any',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-item.js b/packages/api-generator/src/maps/components/v-item.js
deleted file mode 100644
index 7def5b079cd..00000000000
--- a/packages/api-generator/src/maps/components/v-item.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = {
- 'v-item': {
- slots: [
- {
- name: 'default',
- props: {
- selected: 'boolean',
- selectedClass: 'string',
- toggle: '() => void',
- select: '(selected: boolean) => void',
- value: 'any',
- disabled: 'boolean',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-layout.js b/packages/api-generator/src/maps/components/v-layout.js
deleted file mode 100644
index f21909559b0..00000000000
--- a/packages/api-generator/src/maps/components/v-layout.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const { createItems, VGridProps } = require('../helpers/variables')
-
-module.exports = {
- 'v-layout': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- props: [
- ...VGridProps,
- ...createItems([
- 'column',
- 'reverse',
- 'wrap',
- ], {
- type: 'boolean',
- default: 'false',
- source: null,
- }),
- {
- name: 'row',
- type: 'boolean',
- default: 'true',
- source: null,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-lazy.js b/packages/api-generator/src/maps/components/v-lazy.js
deleted file mode 100644
index 6f20b816e8b..00000000000
--- a/packages/api-generator/src/maps/components/v-lazy.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-lazy': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-group.js b/packages/api-generator/src/maps/components/v-list-group.js
deleted file mode 100644
index 4c4290c5d27..00000000000
--- a/packages/api-generator/src/maps/components/v-list-group.js
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = {
- 'v-list-group': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'activator',
- props: undefined,
- },
- {
- name: 'appendIcon',
- props: undefined,
- },
- {
- name: 'prependIcon',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'click',
- value: 'MouseEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-action-text.js b/packages/api-generator/src/maps/components/v-list-item-action-text.js
deleted file mode 100644
index 32b6a73b3c9..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-action-text.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-action-text': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-action.js b/packages/api-generator/src/maps/components/v-list-item-action.js
deleted file mode 100644
index d0cdd9804e1..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-action.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-action': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-avatar.js b/packages/api-generator/src/maps/components/v-list-item-avatar.js
deleted file mode 100644
index 956a6cf3ce0..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-avatar.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-avatar': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-content.js b/packages/api-generator/src/maps/components/v-list-item-content.js
deleted file mode 100644
index 87020e07f5f..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-content.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-content': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-group.js b/packages/api-generator/src/maps/components/v-list-item-group.js
deleted file mode 100644
index 4e66e50b6d0..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-group.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-list-item-group': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'any[] | any',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-icon.js b/packages/api-generator/src/maps/components/v-list-item-icon.js
deleted file mode 100644
index af5c07a4fcd..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-icon.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-icon': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-subtitle.js b/packages/api-generator/src/maps/components/v-list-item-subtitle.js
deleted file mode 100644
index 03489751a21..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-subtitle.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-subtitle': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item-title.js b/packages/api-generator/src/maps/components/v-list-item-title.js
deleted file mode 100644
index c4fcbb5cb47..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item-title.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list-item-title': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list-item.js b/packages/api-generator/src/maps/components/v-list-item.js
deleted file mode 100644
index c02bc383318..00000000000
--- a/packages/api-generator/src/maps/components/v-list-item.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports = {
- 'v-list-item': {
- slots: [
- {
- name: 'default',
- props: {
- active: 'boolean',
- toggle: 'Function',
- },
- },
- ],
- events: [
- {
- name: 'click',
- value: 'MouseEvent | KeyboardEvent',
- },
- {
- name: 'keydown',
- value: 'KeyboardEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-list.js b/packages/api-generator/src/maps/components/v-list.js
deleted file mode 100644
index 095ff1128a5..00000000000
--- a/packages/api-generator/src/maps/components/v-list.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-list': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-menu.js b/packages/api-generator/src/maps/components/v-menu.js
deleted file mode 100644
index 41d9b1ad748..00000000000
--- a/packages/api-generator/src/maps/components/v-menu.js
+++ /dev/null
@@ -1,24 +0,0 @@
-module.exports = {
- 'v-menu': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'activator',
- props: {
- attrs: '{ role: string, aria-haspopup: boolean, aria-expanded: string }',
- on: '{ [eventName]: eventHandler }',
- value: 'boolean',
- },
- },
- ],
- events: [
- {
- name: 'input',
- value: 'boolean',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-mutate.js b/packages/api-generator/src/maps/components/v-mutate.js
deleted file mode 100644
index 36954a900d0..00000000000
--- a/packages/api-generator/src/maps/components/v-mutate.js
+++ /dev/null
@@ -1,128 +0,0 @@
-module.exports = {
- 'v-mutate': {
- argument: [{
- name: 'argument',
- default: '(): {}',
- type: ['function', 'object'],
- snippet: `
-<template>
- <div>
- // By default v-mutate enables all options
- // available in the Mutation Observer API
- <v-card v-mutate="onMutate">...</v-card>
-
- // A custom options object can be provided
- // in order to override the defaults
- <v-card v-mutate="mutate">...</v-card>
- </div>
-</template>
-
-<script>
- export default {
- data () {
- return {
- mutate: {
- options: {
- attributes: true,
- subtree: true,
- },
- handler: this.onMutate
- },
- }
- },
-
- methods: {
- onMutate (mutationsList, observer) {}
- }
- }
-</script>`,
- }],
- modifiers: [
- {
- name: 'once',
- default: false,
- type: ['boolean'],
- snippet: `
- <template>
- <div v-mutate.once="onMutate">...</div>
- </template>
-
- <script>
- export default {
- methods: {
- onMutate (mutationsList, observer) {}
- }
- }
- </script>`,
- },
- {
- name: 'attr',
- default: true,
- type: ['boolean'],
- snippet: `
- <template>
- <div v-mutate.attr="onMutate">...</div>
- </template>
-
- <script>
- export default {
- methods: {
- onMutate (mutationsList, observer) {}
- }
- }
- </script>`,
- },
- {
- name: 'char',
- default: true,
- type: ['boolean'],
- snippet: `
- <template>
- <div v-mutate.char="onMutate">...</div>
- </template>
-
- <script>
- export default {
- methods: {
- onMutate (mutationsList, observer) {}
- }
- }
- </script>`,
- },
- {
- name: 'child',
- default: true,
- type: ['boolean'],
- snippet: `
- <template>
- <div v-mutate.child="onMutate">...</div>
- </template>
-
- <script>
- export default {
- methods: {
- onMutate (mutationsList, observer) {}
- }
- }
- </script>`,
- },
- {
- name: 'sub',
- default: true,
- type: ['boolean'],
- snippet: `
- <template>
- <div v-mutate.attr.char.sub="onMutate">...</div>
- </template>
-
- <script>
- export default {
- methods: {
- onMutate (mutationsList, observer) {}
- }
- }
- </script>`,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-navigation-drawer.js b/packages/api-generator/src/maps/components/v-navigation-drawer.js
deleted file mode 100644
index 1fc6f2a3491..00000000000
--- a/packages/api-generator/src/maps/components/v-navigation-drawer.js
+++ /dev/null
@@ -1,36 +0,0 @@
-module.exports = {
- 'v-navigation-drawer': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'append',
- props: undefined,
- },
- {
- name: 'img',
- props: { height: 'string', src: 'string | srcObject' },
- },
- {
- name: 'prepend',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'input',
- value: 'boolean',
- },
- {
- name: 'transitionend',
- value: 'object',
- },
- {
- name: 'update:mini-variant',
- value: 'boolean',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-overflow-btn.js b/packages/api-generator/src/maps/components/v-overflow-btn.js
deleted file mode 100644
index e6f0a785d7c..00000000000
--- a/packages/api-generator/src/maps/components/v-overflow-btn.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VSelect } = require('../helpers/variables')
-
-module.exports = {
- 'v-overflow-btn': VSelect,
-}
diff --git a/packages/api-generator/src/maps/components/v-overlay.js b/packages/api-generator/src/maps/components/v-overlay.js
deleted file mode 100644
index 022435bedac..00000000000
--- a/packages/api-generator/src/maps/components/v-overlay.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-overlay': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-pagination.js b/packages/api-generator/src/maps/components/v-pagination.js
deleted file mode 100644
index 07b61f4b959..00000000000
--- a/packages/api-generator/src/maps/components/v-pagination.js
+++ /dev/null
@@ -1,26 +0,0 @@
-module.exports = {
- 'v-pagination': {
- events: [
- {
- name: 'update:modelValue',
- value: 'number',
- },
- {
- name: 'next',
- value: 'number',
- },
- {
- name: 'previous',
- value: 'number',
- },
- {
- name: 'first',
- value: 'number',
- },
- {
- name: 'last',
- value: 'number',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-parallax.js b/packages/api-generator/src/maps/components/v-parallax.js
deleted file mode 100644
index cbbe8a43dff..00000000000
--- a/packages/api-generator/src/maps/components/v-parallax.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-parallax': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-progress-circular.js b/packages/api-generator/src/maps/components/v-progress-circular.js
deleted file mode 100644
index e637e4292b2..00000000000
--- a/packages/api-generator/src/maps/components/v-progress-circular.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
- 'v-progress-circular': {
- slots: [
- {
- name: 'default',
- props: {
- value: 'number',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-progress-linear.js b/packages/api-generator/src/maps/components/v-progress-linear.js
deleted file mode 100644
index a93d1a007e0..00000000000
--- a/packages/api-generator/src/maps/components/v-progress-linear.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = {
- 'v-progress-linear': {
- events: [
- {
- name: 'update:modelValue',
- value: 'number',
- },
- ],
- slots: [
- {
- name: 'default',
- props: {
- value: 'number',
- buffer: 'number',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-radio-group.js b/packages/api-generator/src/maps/components/v-radio-group.js
deleted file mode 100644
index e000d297e0a..00000000000
--- a/packages/api-generator/src/maps/components/v-radio-group.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const { VInput } = require('../helpers/variables')
-
-const ClickIndex = VInput.events.findIndex(e => e.name === 'click')
-VInput.events.splice(ClickIndex, 1, {
- name: 'change',
- value: 'any',
-})
-
-module.exports = {
- 'v-radio-group': VInput,
-}
diff --git a/packages/api-generator/src/maps/components/v-radio.js b/packages/api-generator/src/maps/components/v-radio.js
deleted file mode 100644
index 58fa65b1593..00000000000
--- a/packages/api-generator/src/maps/components/v-radio.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const { VInput } = require('../helpers/variables')
-
-VInput.slots = VInput.slots.filter(slot => !['append', 'prepend'].includes(slot.name))
-
-module.exports = {
- 'v-radio': {
- ...VInput,
- events: [
- ...VInput.events,
- {
- name: 'click',
- value: 'MouseEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-range-slider.js b/packages/api-generator/src/maps/components/v-range-slider.js
deleted file mode 100644
index a870adab0e0..00000000000
--- a/packages/api-generator/src/maps/components/v-range-slider.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VRangeSlider } = require('../helpers/variables')
-
-module.exports = {
- 'v-range-slider': VRangeSlider,
-}
diff --git a/packages/api-generator/src/maps/components/v-rating.js b/packages/api-generator/src/maps/components/v-rating.js
deleted file mode 100644
index 03cc5e6cd83..00000000000
--- a/packages/api-generator/src/maps/components/v-rating.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const slotProps = {
- onMouseenter: '() => void',
- onMouseleave: '() => void',
- onMousemove: '() => void',
- onClick: '() => void',
- icon: 'string',
- color: 'string',
- size: 'string',
- disabled: 'boolean',
- ariaLabel: 'string',
- isFilled: 'boolean',
- isHalfFilled: 'boolean',
- isHovered: 'boolean',
- isHalfHovered: 'boolean',
- index: 'number',
- value: 'number',
- hasLabels: 'boolean',
- label: 'string',
- ripple: 'boolean',
- density: 'string',
- readonly: 'boolean',
- tabindex: 'number | undefined',
-}
-
-module.exports = {
- 'v-rating': {
- events: [
- {
- name: 'update:modelValue',
- value: 'Number',
- },
- ],
- slots: [
- {
- name: 'item',
- props: slotProps,
- },
- {
- name: 'item-label',
- props: slotProps,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-select.js b/packages/api-generator/src/maps/components/v-select.js
deleted file mode 100644
index f7dd54a557e..00000000000
--- a/packages/api-generator/src/maps/components/v-select.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VSelect } = require('../helpers/variables')
-
-module.exports = {
- 'v-select': VSelect,
-}
diff --git a/packages/api-generator/src/maps/components/v-simple-checkbox.js b/packages/api-generator/src/maps/components/v-simple-checkbox.js
deleted file mode 100644
index 7677fe58e2f..00000000000
--- a/packages/api-generator/src/maps/components/v-simple-checkbox.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-simple-checkbox': {
- events: [
- {
- name: 'input',
- value: 'Event',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-simple-table.js b/packages/api-generator/src/maps/components/v-simple-table.js
deleted file mode 100644
index d923d9f87a1..00000000000
--- a/packages/api-generator/src/maps/components/v-simple-table.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-simple-table': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-skeleton-loader.js b/packages/api-generator/src/maps/components/v-skeleton-loader.js
deleted file mode 100644
index de34fb85adb..00000000000
--- a/packages/api-generator/src/maps/components/v-skeleton-loader.js
+++ /dev/null
@@ -1,47 +0,0 @@
-module.exports = {
- 'v-skeleton-loader': {
- props: [
- {
- name: 'type',
- example: {
- actions: 'button@2',
- article: 'heading, paragraph',
- avatar: 'avatar',
- button: 'button',
- card: 'image, card-heading',
- 'card-avatar': 'image, list-item-avatar',
- 'card-heading': 'heading',
- chip: 'chip',
- 'date-picker': 'list-item, card-heading, divider, date-picker-options, date-picker-days, actions',
- 'date-picker-options': 'text, avatar@2',
- 'date-picker-days': 'avatar@28',
- heading: 'heading',
- image: 'image',
- 'list-item': 'text',
- 'list-item-avatar': 'avatar, text',
- 'list-item-two-line': 'sentences',
- 'list-item-avatar-two-line': 'avatar, sentences',
- 'list-item-three-line': 'paragraph',
- 'list-item-avatar-three-line': 'avatar, paragraph',
- paragraph: 'text@3',
- sentences: 'text@2',
- table: 'table-heading, table-thead, table-tbody, table-tfoot',
- 'table-heading': 'heading, text',
- 'table-thead': 'heading@6',
- 'table-tbody': 'table-row-divider@6',
- 'table-row-divider': 'table-row, divider',
- 'table-row': 'table-cell@6',
- 'table-cell': 'text',
- 'table-tfoot': 'text@2, avatar@2',
- text: 'text',
- },
- },
- ],
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-slide-group.js b/packages/api-generator/src/maps/components/v-slide-group.js
deleted file mode 100644
index 67e0ee1baf3..00000000000
--- a/packages/api-generator/src/maps/components/v-slide-group.js
+++ /dev/null
@@ -1,32 +0,0 @@
-module.exports = {
- 'v-slide-group': {
- events: [
- {
- name: 'change',
- value: 'any[] | any',
- },
- {
- name: 'click:prev',
- value: 'void',
- },
- {
- name: 'click:next',
- value: 'void',
- },
- ],
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'next',
- value: undefined,
- },
- {
- name: 'prev',
- value: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-slide-item.js b/packages/api-generator/src/maps/components/v-slide-item.js
deleted file mode 100644
index 82369125d8f..00000000000
--- a/packages/api-generator/src/maps/components/v-slide-item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-slide-item': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-slider.js b/packages/api-generator/src/maps/components/v-slider.js
deleted file mode 100644
index c3739cfaf8e..00000000000
--- a/packages/api-generator/src/maps/components/v-slider.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VSlider } = require('../helpers/variables')
-
-module.exports = {
- 'v-slider': VSlider,
-}
diff --git a/packages/api-generator/src/maps/components/v-snackbar.js b/packages/api-generator/src/maps/components/v-snackbar.js
deleted file mode 100644
index 619d6e10d8e..00000000000
--- a/packages/api-generator/src/maps/components/v-snackbar.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- 'v-snackbar': {
- events: [
- {
- name: 'input',
- value: 'boolean',
- },
- ],
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'actions',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-spacer.js b/packages/api-generator/src/maps/components/v-spacer.js
deleted file mode 100644
index ec9fcd65514..00000000000
--- a/packages/api-generator/src/maps/components/v-spacer.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-spacer': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-sparkline.js b/packages/api-generator/src/maps/components/v-sparkline.js
deleted file mode 100644
index e320d2dc6f8..00000000000
--- a/packages/api-generator/src/maps/components/v-sparkline.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-sparkline': {
- slots: [
- {
- name: 'label',
- value: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-speed-dial.js b/packages/api-generator/src/maps/components/v-speed-dial.js
deleted file mode 100644
index 0b27945658f..00000000000
--- a/packages/api-generator/src/maps/components/v-speed-dial.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- 'v-speed-dial': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'activator',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-stepper-content.js b/packages/api-generator/src/maps/components/v-stepper-content.js
deleted file mode 100644
index f1fa5a0af63..00000000000
--- a/packages/api-generator/src/maps/components/v-stepper-content.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-stepper-content': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-stepper-header.js b/packages/api-generator/src/maps/components/v-stepper-header.js
deleted file mode 100644
index 5f7f799667b..00000000000
--- a/packages/api-generator/src/maps/components/v-stepper-header.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-stepper-header': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-stepper-items.js b/packages/api-generator/src/maps/components/v-stepper-items.js
deleted file mode 100644
index ba8c7b67cba..00000000000
--- a/packages/api-generator/src/maps/components/v-stepper-items.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-stepper-items': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-stepper-step.js b/packages/api-generator/src/maps/components/v-stepper-step.js
deleted file mode 100644
index 3c6e5be330f..00000000000
--- a/packages/api-generator/src/maps/components/v-stepper-step.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-stepper-step': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'click',
- value: 'MouseEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-stepper.js b/packages/api-generator/src/maps/components/v-stepper.js
deleted file mode 100644
index f3f7f2e84a1..00000000000
--- a/packages/api-generator/src/maps/components/v-stepper.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-stepper': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'number',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-subheader.js b/packages/api-generator/src/maps/components/v-subheader.js
deleted file mode 100644
index fbf7980fb20..00000000000
--- a/packages/api-generator/src/maps/components/v-subheader.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-subheader': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-switch.js b/packages/api-generator/src/maps/components/v-switch.js
deleted file mode 100644
index d5d3e118a66..00000000000
--- a/packages/api-generator/src/maps/components/v-switch.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const { VInput } = require('../helpers/variables')
-
-module.exports = {
- 'v-switch': {
- ...VInput,
- events: [
- ...VInput.events,
- {
- name: 'click',
- value: 'MouseEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-tab-item.js b/packages/api-generator/src/maps/components/v-tab-item.js
deleted file mode 100644
index 2f3ad474661..00000000000
--- a/packages/api-generator/src/maps/components/v-tab-item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-tab-item': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-tab.js b/packages/api-generator/src/maps/components/v-tab.js
deleted file mode 100644
index da3011ea13b..00000000000
--- a/packages/api-generator/src/maps/components/v-tab.js
+++ /dev/null
@@ -1,24 +0,0 @@
-module.exports = {
- 'v-tab': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'void',
- },
- {
- name: 'click',
- value: 'ClickEvent',
- },
- {
- name: 'keydown',
- value: 'KeyboardEvent',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-tabs-items.js b/packages/api-generator/src/maps/components/v-tabs-items.js
deleted file mode 100644
index 90c6ddc5146..00000000000
--- a/packages/api-generator/src/maps/components/v-tabs-items.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-tabs-items': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-tabs.js b/packages/api-generator/src/maps/components/v-tabs.js
deleted file mode 100644
index e7f08475a02..00000000000
--- a/packages/api-generator/src/maps/components/v-tabs.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- 'v-tabs': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'change',
- value: 'number | string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-text-field.js b/packages/api-generator/src/maps/components/v-text-field.js
deleted file mode 100644
index 6f49906db24..00000000000
--- a/packages/api-generator/src/maps/components/v-text-field.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VTextField } = require('../helpers/variables')
-
-module.exports = {
- 'v-text-field': VTextField,
-}
diff --git a/packages/api-generator/src/maps/components/v-textarea.js b/packages/api-generator/src/maps/components/v-textarea.js
deleted file mode 100644
index 8c83a5d0204..00000000000
--- a/packages/api-generator/src/maps/components/v-textarea.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { VTextField } = require('../helpers/variables')
-
-module.exports = {
- 'v-textarea': VTextField,
-}
diff --git a/packages/api-generator/src/maps/components/v-theme-provider.js b/packages/api-generator/src/maps/components/v-theme-provider.js
deleted file mode 100644
index c4de5c0b372..00000000000
--- a/packages/api-generator/src/maps/components/v-theme-provider.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- 'v-theme-provider': {},
-}
diff --git a/packages/api-generator/src/maps/components/v-time-picker-clock.js b/packages/api-generator/src/maps/components/v-time-picker-clock.js
deleted file mode 100644
index a77a013e1ec..00000000000
--- a/packages/api-generator/src/maps/components/v-time-picker-clock.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-time-picker-clock': {
- props: [
- {
- name: 'format',
- default: '(val: string): string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-time-picker.js b/packages/api-generator/src/maps/components/v-time-picker.js
deleted file mode 100644
index f9355b4d4a3..00000000000
--- a/packages/api-generator/src/maps/components/v-time-picker.js
+++ /dev/null
@@ -1,36 +0,0 @@
-module.exports = {
- 'v-time-picker': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- events: [
- {
- name: 'input',
- value: 'string',
- },
- {
- name: 'change',
- value: 'string',
- },
- {
- name: 'click:hour',
- value: 'string',
- },
- {
- name: 'click:minute',
- value: 'string',
- },
- {
- name: 'click:second',
- value: 'string',
- },
- {
- name: 'update:period',
- value: 'string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-timeline-item.js b/packages/api-generator/src/maps/components/v-timeline-item.js
deleted file mode 100644
index a1791072cfb..00000000000
--- a/packages/api-generator/src/maps/components/v-timeline-item.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
- 'v-timeline-item': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'icon',
- props: {
- icon: 'string',
- iconColor: 'string',
- },
- },
- {
- name: 'opposite',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-timeline.js b/packages/api-generator/src/maps/components/v-timeline.js
deleted file mode 100644
index c9c567b2c77..00000000000
--- a/packages/api-generator/src/maps/components/v-timeline.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-timeline': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-toolbar-items.js b/packages/api-generator/src/maps/components/v-toolbar-items.js
deleted file mode 100644
index f9cb0659cf0..00000000000
--- a/packages/api-generator/src/maps/components/v-toolbar-items.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-toolbar-items': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-toolbar-title.js b/packages/api-generator/src/maps/components/v-toolbar-title.js
deleted file mode 100644
index 5596003fb83..00000000000
--- a/packages/api-generator/src/maps/components/v-toolbar-title.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-toolbar-title': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-toolbar.js b/packages/api-generator/src/maps/components/v-toolbar.js
deleted file mode 100644
index 27fb3df3a80..00000000000
--- a/packages/api-generator/src/maps/components/v-toolbar.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- 'v-toolbar': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'extension',
- props: undefined,
- },
- {
- name: 'img',
- props: {
- props: '{ height: string, src: string | srcObject }',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-tooltip.js b/packages/api-generator/src/maps/components/v-tooltip.js
deleted file mode 100644
index b730b5bc9a4..00000000000
--- a/packages/api-generator/src/maps/components/v-tooltip.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = {
- 'v-tooltip': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- {
- name: 'activator',
- props: {
- on: '{ [eventName]: eventHandler }',
- value: 'boolean',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-treeview.js b/packages/api-generator/src/maps/components/v-treeview.js
deleted file mode 100644
index 17d850d5a61..00000000000
--- a/packages/api-generator/src/maps/components/v-treeview.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const { VTreeviewScopedProps } = require('../helpers/variables')
-
-module.exports = {
- 'v-treeview': {
- slots: [
- {
- name: 'append',
- props: VTreeviewScopedProps,
- },
- {
- name: 'label',
- props: VTreeviewScopedProps,
- },
- {
- name: 'prepend',
- props: VTreeviewScopedProps,
- },
- ],
- functions: [
- {
- name: 'updateAll',
- signature: '(val: boolean): void',
- },
- ],
- events: [
- {
- name: 'input',
- value: 'array',
- },
- {
- name: 'update:active',
- value: 'array',
- },
- {
- name: 'update:open',
- value: 'array',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-virtual-scroll.js b/packages/api-generator/src/maps/components/v-virtual-scroll.js
deleted file mode 100644
index 62724ad8dc3..00000000000
--- a/packages/api-generator/src/maps/components/v-virtual-scroll.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = {
- 'v-virtual-scroll': {
- slots: [
- {
- name: 'default',
- props: {
- index: 'number',
- item: 'any',
- },
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-window-item.js b/packages/api-generator/src/maps/components/v-window-item.js
deleted file mode 100644
index beca911b70e..00000000000
--- a/packages/api-generator/src/maps/components/v-window-item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
- 'v-window-item': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/components/v-window.js b/packages/api-generator/src/maps/components/v-window.js
deleted file mode 100644
index a3bdd766e92..00000000000
--- a/packages/api-generator/src/maps/components/v-window.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const NextPrevSlots = [{
- name: 'next',
- props: {
- attrs: '{ aria-label: string }',
- on: '{ click: eventHandler }',
- },
- source: 'v-window',
-},
-{
- name: 'prev',
- props: {
- attrs: '{ aria-label: string }',
- on: '{ click: eventHandler }',
- },
- source: 'v-window',
-}]
-
-module.exports = {
- 'v-window': {
- slots: [
- {
- name: 'default',
- props: undefined,
- },
- ...NextPrevSlots,
- ],
- props: [
- {
- name: 'touch',
- example: {
- left: 'Function',
- right: 'Function',
- },
- },
- ],
- events: [
- {
- name: 'change',
- value: 'number',
- },
- ],
- },
- NextPrevSlots,
-}
diff --git a/packages/api-generator/src/maps/composables/display.js b/packages/api-generator/src/maps/composables/display.js
deleted file mode 100644
index 463069af8f3..00000000000
--- a/packages/api-generator/src/maps/composables/display.js
+++ /dev/null
@@ -1,144 +0,0 @@
-module.exports = {
- display: {
- props: [
- {
- name: 'height',
- type: 'number',
- default: 0,
- },
- {
- name: 'lg',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'lgAndDown',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'lgAndUp',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'md',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'mdAndDown',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'mdAndUp',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'mobile',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'mobileBreakpoint',
- type: 'number | string',
- default: 'md',
- },
- {
- name: 'name',
- type: 'string',
- default: '',
- },
- {
- name: 'platform',
- type: 'object',
- default: {
- android: false,
- ios: false,
- cordova: false,
- electron: false,
- edge: false,
- firefox: false,
- opera: false,
- win: false,
- mac: false,
- linux: false,
- touch: false,
- ssr: false,
- },
- },
- {
- name: 'sm',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'smAndDown',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'smAndUp',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'thresholds',
- type: 'object',
- default: {
- xs: 0,
- sm: 600,
- md: 960,
- lg: 1280,
- xl: 1920,
- xxl: 2560,
- },
- snippet: `
-import { useDisplay } from 'vuetify'
-
-export default {
- mounted () {
- const display = useDisplay()
-
- // display thresholds are not reactive
- // and do not need to use .value
- console.log(display.thresholds.md) // 1280
- }
-}
- `,
- },
- {
- name: 'width',
- type: 'number',
- default: 0,
- },
- {
- name: 'xl',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'xlAndDown',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'xlAndUp',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'xs',
- type: 'boolean',
- default: 'false',
- },
- {
- name: 'xxl',
- type: 'boolean',
- default: 'false',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/directives/v-intersect.js b/packages/api-generator/src/maps/directives/v-intersect.js
deleted file mode 100644
index 3d5d5e5786c..00000000000
--- a/packages/api-generator/src/maps/directives/v-intersect.js
+++ /dev/null
@@ -1,69 +0,0 @@
-module.exports = {
- argument: [
- {
- name: 'value',
- type: [
- 'Function',
- '{ handler: Function, options?: IntersectionObserverInit }',
- ],
- snippet: `
-<template>
-<v-card v-intersect="onIntersect">...</v-card>
-</template>
-
-<script>
-export default {
- methods: {
- // Will be invoked on DOM mount and when the element is intersected
- onIntersect (entries, observer, isIntersecting) {}
- }
-}
-</script>`,
- },
- ],
- modifiers: [
- {
- name: 'once',
- default: false,
- type: [
- 'boolean',
- ],
- snippet: `
-<template>
- <v-card v-intersect.once="onIntersect">...</v-card>
-</template>
-
-<script>
- export default {
- methods: {
- // Will be invoked once at mount and once when it intersects
- // After the intersection the callback unbinds
- // Can be used with the quiet modifier
- onIntersect (entries, observer, isIntersecting) {}
- }
- }
-</script>`,
- },
- {
- name: 'quiet',
- default: false,
- type: [
- 'boolean',
- ],
- snippet: `
-<template>
- <v-card v-intersect.quiet="onIntersect">...</v-card>
-</template>
-
-<script>
- export default {
- methods: {
- // Will only be called once the element is intersected
- onIntersect (entries, observer, isIntersecting) {}
- }
- }
-</script>`,
- },
- ],
- props: [],
-}
diff --git a/packages/api-generator/src/maps/directives/v-resize.js b/packages/api-generator/src/maps/directives/v-resize.js
deleted file mode 100644
index be13d9866d6..00000000000
--- a/packages/api-generator/src/maps/directives/v-resize.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- argument: [
- {
- name: 'argument',
- type: [
- 'Function',
- ],
- },
- ],
- modifiers: [
- {
- name: 'quiet',
- default: 'false',
- type: [
- 'boolean',
- ],
- },
- ],
- props: [],
-}
diff --git a/packages/api-generator/src/maps/directives/v-ripple.js b/packages/api-generator/src/maps/directives/v-ripple.js
deleted file mode 100644
index 78136abe504..00000000000
--- a/packages/api-generator/src/maps/directives/v-ripple.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = {
- argument: [
- {
- name: 'argument',
- type: [
- 'object',
- ],
- example: {
- center: 'boolean',
- class: 'string',
- },
- },
- ],
- props: [],
-}
diff --git a/packages/api-generator/src/maps/directives/v-scroll.js b/packages/api-generator/src/maps/directives/v-scroll.js
deleted file mode 100644
index 19d1a68d467..00000000000
--- a/packages/api-generator/src/maps/directives/v-scroll.js
+++ /dev/null
@@ -1,27 +0,0 @@
-module.exports = {
- argument: [
- {
- name: 'argument',
- type: [
- 'Function',
- ],
- },
- ],
- modifiers: [
- {
- name: '#target',
- default: 'window',
- type: [
- 'string',
- ],
- },
- {
- name: 'self',
- default: false,
- type: [
- 'boolean',
- ],
- },
- ],
- props: [],
-}
diff --git a/packages/api-generator/src/maps/directives/v-touch.js b/packages/api-generator/src/maps/directives/v-touch.js
deleted file mode 100644
index fc6debd9250..00000000000
--- a/packages/api-generator/src/maps/directives/v-touch.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- argument: [
- {
- name: 'argument',
- type: [
- 'object',
- ],
- example: {
- move: 'Function',
- start: 'Function',
- end: 'Function',
- left: 'Function',
- right: 'Function',
- up: 'Function',
- down: 'Function',
- },
- },
- ],
- props: [],
-}
diff --git a/packages/api-generator/src/maps/internationalization.js b/packages/api-generator/src/maps/internationalization.js
deleted file mode 100644
index 802f3190d8a..00000000000
--- a/packages/api-generator/src/maps/internationalization.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports = {
- internationalization: {
- props: [
- {
- name: 'locales',
- default: '{ en: VuetifyLocale }',
- type: 'Record<string, VuetifyLocale>',
- },
- {
- name: 'current',
- default: 'en',
- type: 'string',
- },
- ],
- functions: [
- {
- name: 't',
- default: '(key: string, ...params: Array<string | number>): string',
- type: 'Function',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/maps/v-otp-input.js b/packages/api-generator/src/maps/v-otp-input.js
deleted file mode 100644
index 4e64a9e4222..00000000000
--- a/packages/api-generator/src/maps/v-otp-input.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
- 'v-otp-input': {
- events: [
- {
- name: 'input',
- value: 'string',
- },
- {
- name: 'finish',
- value: 'string',
- },
- {
- name: 'change',
- value: 'string',
- },
- ],
- },
-}
diff --git a/packages/api-generator/src/template.d.ts b/packages/api-generator/src/template.d.ts
new file mode 100644
index 00000000000..64b50df60d2
--- /dev/null
+++ b/packages/api-generator/src/template.d.ts
@@ -0,0 +1,73 @@
+import type { AllowedComponentProps, ComponentPublicInstance, FunctionalComponent, RenderFunction, VNodeChild, VNodeProps } from 'vue'
+import type { __component__ } from '@/components'
+
+type Slot<T extends any[] = any[]> = (...args: T) => VNodeChild
+export type MakeSlots<T extends Record<string, any[]>> = {
+ [K in keyof T]?: Slot<T[K]>
+}
+
+type StripProps = keyof VNodeProps | keyof AllowedComponentProps | 'v-slots' | '$children'
+
+type OnEvents<K extends string | symbol | number> = K extends `on${infer E}:${infer P}` ? K : never
+
+type ExtractOnEvents<T> = T extends object ? {
+ [K in keyof T as K extends OnEvents<K> ? K : never]: T[K]
+} : never
+
+type OmitOnEvents<T> = T extends object ? {
+ [K in keyof T as K extends OnEvents<K> ? never : K]: T[K]
+} : never
+
+type Props<T> = T extends { $props: infer P }
+ ? P extends object
+ ? {
+ [K in keyof P as K extends StripProps ? never : K]: P[K]
+ }
+ : never
+ : never
+
+export type ComponentProps = OmitOnEvents<Props<__component__>>
+
+type RemoveIndex<T> = {
+ [ K in keyof T as string extends K ? never : number extends K ? never : symbol extends K ? never : K]: T[K]
+}
+
+type RemoveSlot<T> = T extends MakeSlots<infer V>
+ ? V extends object
+ ? {
+ [P in keyof V]: V[P] extends [infer U] ? U : never
+ }
+ : never
+ : never
+
+type Slots<T> = T extends { $slots: infer S }
+ ? RemoveSlot<RemoveIndex<S>>
+ : never
+
+export type ComponentSlots = Slots<__component__>
+
+type ExtractEvents<T> = T extends string[]
+ ? never
+ : T extends undefined
+ ? never
+ : T extends object
+ ? {
+ [K in keyof T]: T[K]
+ }
+ : never
+
+export type ComponentEvents = ExtractEvents<__component__['$options']['emits']>
+
+type ExtractExposed<T> = T extends (...args: any[]) => infer R
+ ? R extends Promise<any>
+ ? never
+ : R extends RenderFunction
+ ? never
+ : R extends void
+ ? never
+ : R extends object
+ ? RemoveIndex<R>
+ : never
+ : never
+
+export type ComponentExposed = ExtractExposed<__component__['$options']['setup']>
diff --git a/packages/api-generator/src/types.ts b/packages/api-generator/src/types.ts
new file mode 100644
index 00000000000..126b9520be9
--- /dev/null
+++ b/packages/api-generator/src/types.ts
@@ -0,0 +1,453 @@
+import type { Node, Type } from 'ts-morph'
+import { Project, ts } from 'ts-morph'
+
+function inspect (project: Project, node?: Node<ts.Node>) {
+ if (!node) return null
+
+ const kind = node.getKind()
+
+ if (kind === ts.SyntaxKind.TypeAliasDeclaration) {
+ return generateDefinition(node, [], project)
+ }
+
+ return null
+}
+
+export function generateComposableDataFromTypes () {
+ const project = new Project({
+ tsConfigFilePath: './tsconfig.json',
+ })
+
+ const sourceFile = project.addSourceFileAtPath('./src/composables.d.ts')
+
+ const composables = inspect(project, sourceFile.getTypeAlias('Composables')) as ObjectDefinition
+
+ return Object.entries(composables.properties).map(([name, data]) => {
+ return {
+ name,
+ data: {
+ exposed: ((data as FunctionDefinition).returnType as ObjectDefinition).properties,
+ },
+ }
+ }) as { name: string, data: { exposed: Record<string, Definition> } }[]
+}
+
+export function generateDirectiveDataFromTypes () {
+ const project = new Project({
+ tsConfigFilePath: './tsconfig.json',
+ })
+
+ const sourceFile = project.addSourceFileAtPath('./src/directives.d.ts')
+
+ const directives = inspect(project, sourceFile.getTypeAlias('Directives')) as ObjectDefinition
+
+ return Object.entries(directives.properties).map(([name, data]) => {
+ return {
+ name,
+ argument: { value: (data as ObjectDefinition).properties.value },
+ modifiers: ((data as ObjectDefinition).properties.modifiers as ObjectDefinition).properties,
+ }
+ }) as { name: string, argument: { value: Definition }, modifiers: Record<string, Definition> }[]
+}
+
+export async function generateComponentDataFromTypes (component: string) {
+ const project = new Project({
+ tsConfigFilePath: './tsconfig.json',
+ })
+
+ const sourceFile = project.addSourceFileAtPath(`./src/tmp/${component}.d.ts`)
+
+ const props = inspect(project, sourceFile.getTypeAlias('ComponentProps')) as ObjectDefinition
+ const events = inspect(project, sourceFile.getTypeAlias('ComponentEvents')) as ObjectDefinition
+ const slots = inspect(project, sourceFile.getTypeAlias('ComponentSlots')) as ObjectDefinition
+ const exposed = inspect(project, sourceFile.getTypeAlias('ComponentExposed')) as ObjectDefinition
+
+ const sections = [props, events, slots, exposed]
+
+ sections.forEach(item => {
+ item.text = undefined
+ item.source = undefined
+ })
+
+ return {
+ props: props.properties,
+ events: events.properties,
+ slots: slots.properties,
+ exposed: exposed.properties,
+ }
+}
+
+type BaseDefinition = {
+ text: string
+ formatted: string
+ source?: string
+ description?: Record<string, string>
+ default?: string
+ optional?: boolean
+}
+
+export type ObjectDefinition = {
+ type: 'object'
+ properties: Record<string, Definition>
+} & BaseDefinition
+
+type BooleanDefinition = {
+ type: 'boolean'
+ literal?: string
+} & BaseDefinition
+
+type StringDefinition = {
+ type: 'string'
+ literal?: string
+} & BaseDefinition
+
+type NumberDefinition = {
+ type: 'number'
+ literal?: string
+} & BaseDefinition
+
+type UnionDefinition = {
+ type: 'anyOf'
+ items: Definition[]
+} & BaseDefinition
+
+type IntersectionDefinition = {
+ type: 'allOf'
+ items: Definition[]
+} & BaseDefinition
+
+type ArrayDefinition = {
+ type: 'array'
+ items: Definition[]
+ length?: number
+} & BaseDefinition
+
+type FunctionDefinition = {
+ type: 'function'
+ parameters: NamedDefinition[]
+ returnType: Definition
+} & BaseDefinition
+
+type RefDefinition = {
+ type: 'ref'
+ ref: string
+} & BaseDefinition
+
+type ConstructorDefinition = {
+ type: 'constructor'
+} & BaseDefinition
+
+type RecordDefinition = {
+ type: 'record'
+ key: Definition
+ value: Definition
+} & BaseDefinition
+
+type InterfaceDefinition = {
+ type: 'interface'
+ name: string
+ parameters: NamedDefinition[]
+} & BaseDefinition
+
+type NamedDefinition = Definition & { name: string }
+
+export type Definition =
+ | ObjectDefinition
+ | BooleanDefinition
+ | StringDefinition
+ | NumberDefinition
+ | UnionDefinition
+ | IntersectionDefinition
+ | ArrayDefinition
+ | FunctionDefinition
+ | RefDefinition
+ | ConstructorDefinition
+ | RecordDefinition
+ | InterfaceDefinition
+
+function isExternalDeclaration (declaration?: Node<ts.Node>, definitionText?: string) {
+ const filePath = declaration?.getSourceFile().getFilePath()
+
+ // Some internal typescript types should be processed (Array etc)
+ if (filePath?.includes('/typescript/lib/') && (
+ definitionText?.endsWith('[]') ||
+ /(Record|Map|Set|NonNullable)<.*?>/.test(definitionText ?? '')
+ )) return false
+
+ if (filePath?.includes('/@vue/') && /^ToRefs<.*?>/.test(definitionText)) {
+ return false
+ }
+
+ return filePath?.includes('/node_modules/')
+}
+
+function getSource (declaration?: Node<ts.Node>) {
+ const filePath = declaration?.getSourceFile().getFilePath()
+ .replace(/.*\/node_modules\//, '')
+ .replace(/.*\/packages\/vuetify\//, 'vuetify/')
+ const startLine = declaration?.getStartLineNumber()
+ const endLine = declaration?.getEndLineNumber()
+
+ if (!filePath || !startLine || filePath.startsWith(process.cwd())) return undefined
+
+ return filePath && startLine ? `${filePath}#L${startLine}-L${endLine}` : undefined
+}
+
+function listFlags (flags: object, value?: number) {
+ if (!value) return []
+
+ const entries = Object.entries(flags).filter(([_, flag]) => typeof flag === 'number')
+
+ return entries.reduce<string[]>((arr, [name, flag]) => {
+ if (value & flag) {
+ arr.push(name)
+ }
+ return arr
+ }, [])
+}
+
+function getCleanText (text: string) {
+ return text.replaceAll(/import\(.*?\)\./g, '')
+}
+
+function count (arr: string[], needle: string) {
+ return arr.reduce((count, str) => {
+ return str === needle ? count + 1 : count
+ }, 0)
+}
+
+function formatDefinition (definition: Definition) {
+ let formatted = ''
+
+ switch (definition.type) {
+ case 'allOf':
+ formatted = `${definition.items.map(item => item.formatted).join(' & ')}`
+ break
+ case 'anyOf': {
+ const formattedItems = definition.items.map(item => ['function', 'constructor'].includes(item.type) ? `(${item.formatted})` : item.formatted)
+ formatted = `${formattedItems.join(' | ')}`
+ break
+ }
+ case 'array': {
+ const formattedItems = definition.items.map(item => ['function', 'constructor'].includes(item.type) ? `(${item.formatted})` : item.formatted)
+ if (definition.length) {
+ formatted = `[${formattedItems.join(', ')}]`
+ } else {
+ formatted = `${definition.items.length > 1 ? '(' : ''}${formattedItems.join(' | ')}${definition.items.length > 1 ? ')' : ''}[]`
+ }
+ break
+ }
+ case 'function':
+ const formattedParameters = definition.parameters.map(p => `${p.name}: ${p.formatted}`)
+ formatted = `(${formattedParameters.join(', ')}) => ${definition.returnType.formatted}`
+ break
+ case 'record':
+ formatted = `Record<${definition.key.formatted}, ${definition.value.formatted}>`
+ break
+ case 'object':
+ formatted = `{ ${Object.entries(definition.properties).reduce<string[]>((arr, [name, prop]) => {
+ arr.push(`${name}: ${prop.formatted}`)
+ return arr
+ }, []).join('; ')} }`
+ break
+ case 'ref':
+ if (['Component', 'ComponentPublicInstance', 'ComponentInternalInstance', 'FunctionalComponent'].includes(definition.ref)) {
+ formatted = definition.ref
+ } else {
+ formatted = definition.text
+ }
+ break
+ case 'interface':
+ case 'boolean':
+ case 'number':
+ case 'string':
+ case 'constructor':
+ default:
+ formatted = definition.text
+ break
+ }
+
+ definition.formatted = formatted
+
+ if (['SelectStrategyFn', 'OpenStrategyFn', 'OpenSelectStrategyFn'].includes(definition.text)) {
+ definition.formatted = `<a href="https://github.com/vuetifyjs/vuetify/blob/next/packages/${definition.source}" target="_blank">${definition.text}</a>`
+ }
+}
+
+// eslint-disable-next-line complexity
+function generateDefinition (node: Node<ts.Node>, recursed: string[], project: Project, type?: Type<ts.Type>): Definition {
+ const tc = project.getTypeChecker()
+ type = type ?? node.getType()
+
+ const symbol = type.getAliasSymbol() ?? type.getSymbol()
+ const declaration = symbol?.getDeclarations()?.[0]
+ const targetType = type.getTargetType()
+
+ let definition: Definition = {
+ text: getCleanText(type.getText()),
+ source: getSource(declaration),
+ } as Definition
+
+ if (count(recursed, type.getText()) > 1 || isExternalDeclaration(declaration, definition.text)) {
+ definition = definition as RefDefinition
+ definition.type = 'ref'
+
+ // TODO: Parse this better?
+ definition.ref = symbol?.getFullyQualifiedName().replace(/".*"\./, '') ?? ''
+ } else if (type.isAny() || type.isUnknown() || type.isNever()) {
+ // @ts-expect-error asd
+ definition.type = type.getText()
+ } else if (type.isBoolean() || type.isBooleanLiteral()) {
+ definition = definition as BooleanDefinition
+ definition.type = 'boolean'
+ definition.literal = type.isBooleanLiteral() ? type.getText() : undefined
+ } else if (type.isString() || type.isStringLiteral()) {
+ definition = definition as StringDefinition
+ definition.type = 'string'
+ definition.literal = type.isStringLiteral() ? type.getText() : undefined
+ } else if (type.isNumber() || type.isNumberLiteral()) {
+ definition = definition as NumberDefinition
+ definition.type = 'number'
+ definition.literal = type.isNumberLiteral() ? type.getText() : undefined
+ } else if (type.isArray()) {
+ definition = definition as ArrayDefinition
+ definition.type = 'array'
+
+ const arrayElementType = type.getArrayElementType()
+
+ const arrayType = generateDefinition(node, getRecursiveArrayTypes(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))
+
+ // 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))
+
+ // Ugly hack to get rid of explicit false and true types
+ // TODO: Do this some other way
+ let found: string | undefined
+ const foundIndices: number[] = []
+ for (let i = 0; i < definition.items.length; i++) {
+ const item = definition.items[i]
+
+ if (item.type === 'boolean' && item.literal != null && found == null) {
+ found = item.literal
+ foundIndices.push(i)
+ } else if (item.type === 'boolean' && item.literal != null && found != null && found !== item.literal) {
+ foundIndices.push(i)
+ }
+ }
+
+ if (foundIndices.length === 2) {
+ definition.items = definition.items.filter((_, i) => !foundIndices.includes(i))
+ definition.items.splice(foundIndices[0], 0, {
+ text: 'boolean',
+ type: 'boolean',
+ formatted: 'boolean',
+ })
+ }
+ } else if (type.getConstructSignatures().length) {
+ definition = definition as ConstructorDefinition
+ definition.type = 'constructor'
+ } else if (type.getCallSignatures().length) {
+ definition = definition as FunctionDefinition
+ definition.type = 'function'
+
+ const signature = type.getCallSignatures()[0]
+
+ definition.parameters = signature.getParameters().map(parameter => {
+ const parameterType = tc.getTypeOfSymbolAtLocation(parameter, node)
+ return {
+ name: parameter.getEscapedName(),
+ optional: parameter.isOptional(),
+ ...generateDefinition(node, getRecursiveObjectTypes(recursed, parameterType), project, parameterType),
+ }
+ })
+ definition.returnType = generateDefinition(node, recursed, project, signature.getReturnType())
+ } else if (targetType && /^(Map|Set)<.*>/.test(definition.text)) { // TODO: Better way to detect Map/Set type
+ definition = definition as InterfaceDefinition
+ definition.type = 'interface'
+ definition.name = targetType?.getText()
+ const instanceTypeArguments = type.getTypeArguments()
+ definition.parameters = targetType?.getTypeArguments().map((arg, i) => {
+ return { name: arg.getText(), ...generateDefinition(node, recursed, project, instanceTypeArguments[i]) }
+ })
+ } else if (/^Record<.*>/.test(definition.text)) { // TODO: Better way to detect Record type
+ definition = definition as RecordDefinition
+ definition.type = 'record'
+ definition.key = generateDefinition(node, recursed, project, type.getAliasTypeArguments()[0])
+ definition.value = generateDefinition(node, recursed, project, type.getAliasTypeArguments()[1])
+ } else if (type.isTuple()) {
+ definition = definition as ArrayDefinition
+ definition.type = 'array'
+ definition.items = type.getTupleElements().map(t => generateDefinition(node, recursed, project, t))
+ definition.length = definition.items.length
+ } else if (type.isObject()) {
+ definition = definition as ObjectDefinition
+ definition.type = 'object'
+ definition.properties = {}
+
+ for (const property of type.getProperties()) {
+ const propertyName = property.getEscapedName()
+ const propertyType = tc.getTypeOfSymbolAtLocation(property, node)
+
+ definition.properties[propertyName] = generateDefinition(node, getRecursiveObjectTypes(recursed, propertyType), project, propertyType)
+
+ definition.properties[propertyName].optional = property.isOptional()
+ }
+ } else if (ts.TypeFlags.Void & type.getFlags()) {
+ // @ts-expect-error asd
+ definition.type = 'void'
+ } else {
+ // @ts-expect-error asd
+ definition.type = 'UNSUPPORTED'
+ }
+
+ formatDefinition(definition)
+
+ return definition
+}
+
+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 findPotentialRecursiveObjectTypes (type: Type<ts.Type>) {
+ if (type == null || type.isArray()) return []
+
+ 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())
+ }
+
+ 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
+}
diff --git a/packages/api-generator/src/utils.ts b/packages/api-generator/src/utils.ts
new file mode 100644
index 00000000000..41b60828f2c
--- /dev/null
+++ b/packages/api-generator/src/utils.ts
@@ -0,0 +1,146 @@
+import type { Definition, ObjectDefinition } from './types'
+
+function parseFunctionParams (func: string) {
+ const [, regular] = /function\s\((.*)\)\s\{.*/i.exec(func) || []
+ const [, arrow] = /\((.*)\)\s=>\s\{.*/i.exec(func) || []
+ const args = regular || arrow
+
+ return args ? `(${args}) => {}` : undefined
+}
+
+function getPropType (type: any | any[]): string | string[] {
+ if (Array.isArray(type)) {
+ return type.flatMap(t => getPropType(t))
+ }
+
+ if (!type) return 'any'
+
+ return type.name.toLowerCase()
+}
+
+function getPropDefault (def: any, type: string | string[]) {
+ if (typeof def === 'function' && type !== 'function') {
+ return def.call({}, {})
+ }
+
+ if (typeof def === 'string') {
+ return def ? `'${def}'` : def
+ }
+
+ if (type === 'function') {
+ return parseFunctionParams(def)
+ }
+
+ if (def == null && (
+ type === 'boolean' ||
+ (Array.isArray(type) && type.includes('boolean'))
+ )) {
+ return false
+ }
+
+ return def
+}
+
+type ComponentData = {
+ props?: Record<string, Definition>
+ slots?: Record<string, Definition>
+ events?: Record<string, Definition>
+ exposed?: Record<string, Definition>
+}
+
+export function addPropData (
+ kebabName: string,
+ componentData: ComponentData,
+ componentProps: any
+) {
+ const sources = new Set<string>()
+ for (const [propName, propObj] of Object.entries(componentData.props ?? {})) {
+ const instancePropObj = componentProps[propName]
+
+ ;(propObj as any).default = instancePropObj?.default
+
+ sources.add(instancePropObj?.source ?? kebabName)
+ }
+
+ return [...sources.values()]
+}
+
+export function stringifyProps (props: any) {
+ return Object.fromEntries(
+ Object.entries<any>(props).map(([key, prop]) => {
+ return [key, {
+ source: prop?.source,
+ default: typeof prop === 'object'
+ ? getPropDefault(prop?.default, getPropType(prop?.type))
+ : getPropDefault(undefined, getPropType(prop)),
+ }]
+ })
+ )
+}
+
+const loadLocale = (componentName: string, locale: string, fallback = {}): Record<string, string | Record<string, string>> => {
+ try {
+ const data = require(`./locale/${locale}/${componentName}`)
+ return Object.assign(fallback, data)
+ } catch (err) {
+ return fallback
+ }
+}
+
+function getSources (kebabName: string, sources: string[], locale: string) {
+ const arr = [
+ loadLocale(kebabName, locale),
+ ...sources.map(source => loadLocale(source, locale)),
+ loadLocale('generic', locale),
+ ]
+
+ return {
+ find: (section: string, key?: string) => {
+ return arr.reduce<string | null>((str, source) => {
+ if (str) return str
+ return key ? source?.[section]?.[key] : source?.[section]
+ }, null) ?? 'MISSING DESCRIPTION'
+ },
+ }
+}
+
+export function addDescriptions (kebabName: string, componentData: ComponentData, sources: string[], locales: string[]) {
+ for (const locale of locales) {
+ const descriptions = getSources(kebabName, sources, locale)
+
+ for (const section of ['props', 'slots', 'events', 'exposed'] as const) {
+ for (const [propName, propObj] of Object.entries(componentData[section] ?? {})) {
+ (propObj as any).description = (propObj as any).description ?? {}
+
+ ;(propObj as any).description[locale] = descriptions.find(section, propName)
+ }
+ }
+ }
+}
+
+export function addDirectiveDescriptions (
+ kebabName: string,
+ componentData: { argument: { value: Definition }, modifiers: Record<string, Definition> },
+ sources: string[],
+ locales: string[]
+) {
+ for (const locale of locales) {
+ const descriptions = getSources(kebabName, sources, locale)
+
+ if (componentData.argument) {
+ for (const [name, arg] of Object.entries(componentData.argument)) {
+ arg.description = arg.description ?? {}
+
+ arg.description[locale] = descriptions.find('argument', name)
+ }
+ }
+
+ if (componentData.modifiers) {
+ for (const [name, modifier] of Object.entries(componentData.modifiers)) {
+ modifier.description = modifier.description ?? {}
+
+ modifier.description[locale] = descriptions.find('modifiers', name)
+ }
+ }
+ }
+}
diff --git a/packages/api-generator/src/vetur.ts b/packages/api-generator/src/vetur.ts
new file mode 100644
index 00000000000..7cb0c9063a9
--- /dev/null
+++ b/packages/api-generator/src/vetur.ts
@@ -0,0 +1,40 @@
+import fs from 'fs'
+import { kebabCase } from './helpers/text'
+import type { Definition } from './types'
+
+type ComponentData = {
+ props: Record<string, Definition>
+ slots: Record<string, Definition>
+ events: Record<string, Definition>
+ exposed: Record<string, Definition>
+ componentName: string
+ kebabName: string
+}
+
+export function createVeturApi (componentData: ComponentData[]) {
+ const tags = componentData.reduce((obj, component) => {
+ return {
+ ...obj,
+ [component.kebabName]: {
+ attributes: Object.keys(component.props ?? {}).map(name => kebabCase(name)).sort(),
+ description: '',
+ },
+ }
+ }, {})
+
+ const attributes = componentData.reduce((obj, component) => {
+ const attrs = Object.entries(component.props ?? {}).reduce((curr, [name, prop]) => {
+ curr[`${component.kebabName}/${kebabCase(name)}`] = {
+ type: prop.formatted,
+ description: prop.description.en || '',
+ }
+
+ return curr
+ }, {})
+
+ return { ...obj, ...attrs }
+ }, {})
+
+ fs.writeFileSync('dist/tags.json', JSON.stringify(tags, null, 2))
+ fs.writeFileSync('dist/attributes.json', JSON.stringify(attributes, null, 2))
+}
diff --git a/packages/api-generator/src/web-types.ts b/packages/api-generator/src/web-types.ts
new file mode 100644
index 00000000000..190c5a1feab
--- /dev/null
+++ b/packages/api-generator/src/web-types.ts
@@ -0,0 +1,154 @@
+import fs from 'fs'
+import { capitalize } from './helpers/text'
+import type { Definition, ObjectDefinition } from './types'
+const pkg = require('../package.json')
+
+type ComponentData = {
+ props: Definition
+ slots: Definition
+ events: Definition
+ exposed: Definition
+ componentName: string
+ kebabName: string
+}
+
+type DirectiveData = {
+ name: string
+ kebabName: string
+ argument: { value: Definition }
+ modifiers: Record<string, Definition>
+}
+
+export const createWebTypesApi = (componentData: ComponentData[], directiveData: DirectiveData[]) => {
+ const getDocUrl = (cmp, heading = null) => `https://vuetifyjs.com/api/${cmp}` + (heading ? `#${heading}` : '')
+
+ const createTypedEntity = (name: string, type: string) => {
+ return {
+ name,
+ type,
+ }
+ }
+
+ const createTag = (component: ComponentData) => {
+ const createTagSlot = ([name, slot]: [string, any]) => {
+ return {
+ name,
+ pattern: undefined,
+ description: slot.description.en || '',
+ 'doc-url': getDocUrl(component.kebabName, 'slots'),
+ 'vue-properties': slot.properties &&
+ Object.entries(slot.properties ?? {}).map(([name, prop]) => createTypedEntity(name, (prop as any).formatted)),
+ }
+ }
+
+ const createTagEvent = ([name, event]: [string, any]) => {
+ return {
+ name,
+ description: event.description.en || '',
+ 'doc-url': getDocUrl(component.kebabName, 'events'),
+ arguments: [createTypedEntity('argument', event.formatted)],
+ }
+ }
+
+ const createTagValue = type => {
+ return {
+ kind: 'expression',
+ type,
+ }
+ }
+
+ const createTagAttribute = ([name, prop]: [string, any]) => {
+ return {
+ name,
+ description: prop.description.en || '',
+ 'doc-url': getDocUrl(component.kebabName, 'props'),
+ default: typeof prop.default !== 'string' ? JSON.stringify(prop.default) : prop.default,
+ required: undefined, // TODO: implement this
+ value: createTagValue(prop.formatted),
+ type: prop.formatted === 'boolean' ? 'boolean' : undefined, // this is deprecated but should be const 'boolean' for compatibility with 2019.2
+ }
+ }
+
+ return {
+ name: component.componentName,
+ source: {
+ module: './src/components/index.ts',
+ symbol: component.componentName,
+ },
+ aliases: undefined, // TODO: are we using this? deprecated name changes?
+ description: '', // TODO: we should probably include component description in locale files
+ 'doc-url': getDocUrl(component.kebabName),
+ attributes: Object.entries(component.props ?? {}).map(createTagAttribute),
+ events: Object.entries(component.events ?? {}).map(createTagEvent),
+ slots: Object.entries(component.slots ?? {}).map(createTagSlot),
+ 'vue-model': { // TODO: we should expose this in api data if we can
+ prop: 'modelValue',
+ event: 'update:modelValue',
+ },
+ }
+ }
+
+ const createAttribute = (directive: DirectiveData) => {
+ const createAttributeVueArgument = argument => {
+ return {
+ pattern: undefined,
+ description: argument.description.en,
+ 'doc-url': getDocUrl(directive.name, 'argument'),
+ required: undefined,
+ }
+ }
+
+ const createAttributeVueModifier = ([name, modifier]: [string, any]) => {
+ return {
+ name,
+ pattern: undefined,
+ description: modifier.description.en || '',
+ 'doc-url': getDocUrl(directive.name, 'modifiers'),
+ }
+ }
+
+ const createAttributeValue = argument => {
+ return {
+ kind: 'expression',
+ type: argument.type,
+ }
+ }
+
+ return {
+ name: directive.name,
+ aliases: undefined,
+ description: '', // TODO: we should probably include directive description in locale files
+ 'doc-url': getDocUrl(directive.name),
+ default: '',
+ required: false,
+ value: createAttributeValue(directive.argument),
+ source: {
+ module: './src/directives/index.ts',
+ symbol: capitalize(directive.name.slice(2)),
+ },
+ 'vue-argument': directive.argument?.value && createAttributeVueArgument(directive.argument?.value), // TODO: how to use this in comparison to value?
+ 'vue-modifiers': directive.modifiers &&
+ Object.entries(directive.modifiers ?? {}).map(createAttributeVueModifier),
+ }
+ }
+
+ const tags = componentData.map(createTag)
+ const attributes = directiveData.map(createAttribute)
+
+ const webTypes = {
+ $schema: 'http://json.schemastore.org/web-types',
+ framework: 'vue',
+ name: 'vuetify',
+ version: pkg.version,
+ contributions: {
+ html: {
+ 'types-syntax': 'typescript',
+ 'description-markup': 'markdown',
+ tags,
+ attributes,
+ },
+ },
+ }
+
+ fs.writeFileSync('dist/web-types.json', JSON.stringify(webTypes, null, 2))
+}
diff --git a/packages/api-generator/src/worker.js b/packages/api-generator/src/worker.js
new file mode 100644
index 00000000000..26e3f132b62
--- /dev/null
+++ b/packages/api-generator/src/worker.js
@@ -0,0 +1,4 @@
+require('ts-node').register({ transpileOnly: true });
+const run = require('./worker.ts');
+
+module.exports = run.default;
diff --git a/packages/api-generator/src/worker.ts b/packages/api-generator/src/worker.ts
new file mode 100644
index 00000000000..b398c744318
--- /dev/null
+++ b/packages/api-generator/src/worker.ts
@@ -0,0 +1,33 @@
+import fs from 'fs/promises'
+import path from 'path'
+import { kebabCase } from './helpers/text'
+import { generateComponentDataFromTypes } from './types'
+import { addDescriptions, addPropData } from './utils'
+import mkdirp from 'mkdirp'
+import { parseSassVariables } from './helpers/sass'
+
+export default async (json: string) => {
+ const { componentName, componentProps, locales, outPath } = JSON.parse(json)
+
+ console.log(componentName)
+
+ try {
+ const kebabName = kebabCase(componentName)
+ const componentData = await generateComponentDataFromTypes(componentName)
+
+ const sources = addPropData(kebabName, componentData as any, componentProps)
+
+ addDescriptions(kebabName, componentData as any, sources, locales)
+
+ const sass = parseSassVariables(componentName)
+
+ await mkdirp(outPath)
+
+ await fs.writeFile(path.resolve(outPath, `${kebabName}.json`), JSON.stringify({ ...componentData, sass }, null, 2))
+
+ return { componentName, kebabName, ...componentData }
+ } catch (err) {
+ console.error(`${componentName}: ${err}`)
+ return null
+ }
+}
diff --git a/packages/api-generator/tsconfig.json b/packages/api-generator/tsconfig.json
new file mode 100644
index 00000000000..d35619541ce
--- /dev/null
+++ b/packages/api-generator/tsconfig.json
@@ -0,0 +1,15 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "strict": false,
+ "noUnusedLocals": false,
+ "module": "commonjs",
+ "noEmitOnError": false,
+ "resolveJsonModule": true,
+ "paths": {
+ "@/*": [
+ "../vuetify/src/*"
+ ]
+ }
+ }
+}
diff --git a/packages/docs/build/api-plugin.ts b/packages/docs/build/api-plugin.ts
index 325e124e109..0d9d2202054 100644
--- a/packages/docs/build/api-plugin.ts
+++ b/packages/docs/build/api-plugin.ts
@@ -1,9 +1,7 @@
// Imports
import fs from 'fs'
import path, { resolve } from 'path'
-import { startCase } from 'lodash'
-import rimraf from 'rimraf'
-import { getCompleteApi } from '@vuetify/api-generator'
+import { kebabCase, startCase } from 'lodash'
import locales from '../src/i18n/locales.json'
import pageToApi from '../src/data/page-to-api.json'
import type { Plugin } from 'vite'
@@ -84,8 +82,8 @@ function createMdFile (component: string, data: Record<string, any>, locale: str
str += genHeader(component)
str += genApiLinks(component, messages.links)
- for (const section of ['props', 'functions', 'events', 'slots', 'sass', 'options', 'argument', 'modifiers']) {
- if (Array.isArray(data[section]) && data[section].length) {
+ for (const section of ['props', 'events', 'slots', 'exposed', 'sass', 'options', 'argument', 'modifiers']) {
+ if (Object.keys(data[section] ?? {}).length) {
str += `## ${messages[section]} {#${section}}\n\n`
str += `<api-section name="${component}" section="${section}" />\n\n`
}
@@ -106,18 +104,26 @@ function writeFile (componentName: string, componentApi: Record<string, any>, lo
fs.writeFileSync(resolve(`${folder}/${sanitize(componentName)}.md`), createMdFile(componentName, componentApi, locale))
}
-function writeData (componentName: string, componentApi: Record<string, any>) {
- const folder = `src/api/data`
+function getApiData () {
+ const files = fs.readdirSync(resolve('src/api/data'))
+ const data: Record<string, any>[] = []
- if (!fs.existsSync(resolve(folder))) {
- fs.mkdirSync(resolve(folder), { recursive: true })
+ for (const file of files) {
+ const name = path.basename(file.slice(file.lastIndexOf('/') + 1), '.json')
+ const obj = JSON.parse(fs.readFileSync(resolve('src/api/data', file), 'utf-8'))
+
+ data.push({
+ name,
+ ...obj,
+ })
}
- fs.writeFileSync(resolve(`${folder}/${componentName}.json`), JSON.stringify(componentApi, null, 2))
+ return data
}
function generateFiles () {
- const api: Record<string, any>[] = getCompleteApi(localeList)
+ // const api: Record<string, any>[] = getCompleteApi(localeList)
+ const api = getApiData()
for (const locale of localeList) {
const pages = {} as Record<string, any>
@@ -125,27 +131,27 @@ function generateFiles () {
for (const item of api) {
writeFile(item.name, item, locale)
- pages[`/${locale}/api/${sanitize(item.name)}/`] = item.name
+ pages[`/${locale}/api/${sanitize(kebabCase(item.name))}/`] = item.name
}
fs.writeFileSync(resolve(`src/api/${locale}/pages.json`), JSON.stringify(pages, null, 2))
fs.writeFileSync(resolve(`src/api/${locale}.js`), `export default require.context('./${locale}', true, /\\.md$/)`)
}
- for (const item of api) {
- writeData(item.name, item)
- }
+ // for (const item of api) {
+ // writeData(item.name, item)
+ // }
- fs.writeFileSync(resolve(`src/api/sass.json`), JSON.stringify([
- ...api.filter(item => item && item.sass && item.sass.length > 0).map(item => item.name),
- ]))
+ // fs.writeFileSync(resolve(`src/api/sass.json`), JSON.stringify([
+ // ...api.filter(item => item && item.sass && item.sass.length > 0).map(item => item.name),
+ // ]))
}
export default function Api (): Plugin {
return {
name: 'vuetify:api',
configResolved () {
- rimraf.sync(resolve('src/api'))
+ // rimraf.sync(resolve('src/api'))
generateFiles()
},
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 80b2f2c116c..fd89519309b 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -25,6 +25,7 @@
"isomorphic-fetch": "^3.0.0",
"lodash-es": "^4.17.21",
"pinia": "^2.0.14",
+ "prettier": "^2.7.1",
"prism-theme-vars": "^0.2.3",
"prismjs": "^1.28.0",
"roboto-fontface": "^0.10.0",
diff --git a/packages/docs/src/components/api/EventsTable.vue b/packages/docs/src/components/api/EventsTable.vue
new file mode 100644
index 00000000000..36ae6027769
--- /dev/null
+++ b/packages/docs/src/components/api/EventsTable.vue
@@ -0,0 +1,69 @@
+<template>
+ <app-sheet>
+ <v-table
+ class="api-table"
+ >
+ <thead>
+ <tr>
+ <th
+ v-for="header in headers"
+ :key="header"
+ :class="header"
+ >
+ <div
+ class="text-capitalize"
+ v-text="header"
+ />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <template v-for="item in items" :key="item.name">
+ <tr class="bg-grey-lighten-4">
+ <td>
+ <NameCell section="exposed" :name="item.name" />
+ </td>
+ <td>
+ <PrismCell :code="getType(item)" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="text-mono">
+ <app-markdown v-if="item.description" :content="item.description" />
+ </td>
+ </tr>
+ </template>
+ </tbody>
+ </v-table>
+ </app-sheet>
+</template>
+
+<script lang="ts">
+ // Imports
+ import { defineComponent, PropType } from 'vue'
+ import { getType } from './utils'
+ import NameCell from './NameCell.vue'
+ import PrismCell from './PrismCell.vue'
+
+ export default defineComponent({
+ components: {
+ NameCell,
+ PrismCell,
+ },
+ props: {
+ items: {
+ type: Array as PropType<any[]>,
+ default: () => [],
+ },
+ },
+ setup (props) {
+ const headers = ['name', 'type']
+
+ return {
+ headers,
+ field: 'props',
+ getType,
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/ExposedTable.vue b/packages/docs/src/components/api/ExposedTable.vue
new file mode 100644
index 00000000000..0d38661f0e6
--- /dev/null
+++ b/packages/docs/src/components/api/ExposedTable.vue
@@ -0,0 +1,55 @@
+<template>
+ <app-sheet>
+ <v-table
+ class="api-table"
+ >
+ <tbody>
+ <template v-for="item in items" :key="item.name">
+ <tr class="bg-grey-lighten-4">
+ <td>
+ <NameCell section="props" :name="item.name" />
+ </td>
+ </tr>
+ <tr>
+ <app-markup :code="getType(item)" language="ts" :rounded="false" />
+ </tr>
+ <tr>
+ <td colspan="3" class="text-mono">
+ <app-markdown v-if="item.description" :content="item.description" />
+ </td>
+ </tr>
+ </template>
+ </tbody>
+ </v-table>
+ </app-sheet>
+</template>
+
+<script lang="ts">
+ // Imports
+ import { defineComponent, PropType } from 'vue'
+ import { getType } from './utils'
+ import NameCell from './NameCell.vue'
+ import PrismCell from './PrismCell.vue'
+
+ export default defineComponent({
+ components: {
+ NameCell,
+ PrismCell,
+ },
+ props: {
+ items: {
+ type: Array as PropType<any[]>,
+ default: () => [],
+ },
+ },
+ setup (props) {
+ const headers = ['name', 'type', 'description']
+
+ return {
+ headers,
+ field: 'props',
+ getType,
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/NameCell.vue b/packages/docs/src/components/api/NameCell.vue
new file mode 100644
index 00000000000..06ecec8e887
--- /dev/null
+++ b/packages/docs/src/components/api/NameCell.vue
@@ -0,0 +1,24 @@
+<template>
+ <kbd
+ :id="`${section}-${name.replace('$', '')}`"
+ class="name-item text-mono"
+ >
+ <app-link
+ :href="`#${section}-${name.replace('$', '')}`"
+ class="font-weight-bold"
+ >
+ {{ name }}
+ </app-link>
+ </kbd>
+</template>
+
+<script>
+ import { defineComponent } from 'vue'
+
+ export default defineComponent({
+ props: {
+ section: String,
+ name: String,
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/PrismCell.vue b/packages/docs/src/components/api/PrismCell.vue
new file mode 100644
index 00000000000..826a8c9eb72
--- /dev/null
+++ b/packages/docs/src/components/api/PrismCell.vue
@@ -0,0 +1,40 @@
+<template>
+ <pre
+ v-html="highlight(String(code))"
+ />
+</template>
+
+<script lang="ts">
+ import { defineComponent, PropType } from 'vue'
+ import Prism from 'prismjs'
+ import 'prismjs/themes/prism.css'
+ import 'prismjs/components/prism-scss.js'
+ import 'prismjs/components/prism-typescript.js'
+ import { insertLinks, stripLinks } from './utils'
+
+ const MAP = {
+ typescript: [Prism.languages.typescript, 'ts'] as const,
+ scss: [Prism.languages.scss, 'scss'] as const,
+ }
+
+ export default defineComponent({
+ props: {
+ code: null,
+ language: {
+ type: String as PropType<'typescript' | 'scss'>,
+ default: 'typescript',
+ },
+ },
+ setup (props) {
+ return {
+ highlight: (value: string) => {
+ const code = typeof value === 'object' ? JSON.stringify(value) : value
+ const [out, stripped] = stripLinks(code)
+ const [grammar, language] = MAP[props.language]
+ const highlighted = Prism.highlight(out, grammar, language)
+ return insertLinks(highlighted, stripped)
+ },
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/PropsTable.vue b/packages/docs/src/components/api/PropsTable.vue
new file mode 100644
index 00000000000..5f2fe724570
--- /dev/null
+++ b/packages/docs/src/components/api/PropsTable.vue
@@ -0,0 +1,74 @@
+<template>
+ <app-sheet>
+ <v-table
+ class="api-table"
+ >
+ <thead>
+ <tr>
+ <th
+ v-for="header in headers"
+ :key="header"
+ :class="header"
+ >
+ <div
+ class="text-capitalize"
+ v-text="header"
+ />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <template v-for="item in items" :key="item.name">
+ <tr class="bg-grey-lighten-4">
+ <td>
+ <NameCell section="props" :name="kebabCase(item.name)" />
+ </td>
+ <td>
+ <PrismCell :code="getType(item)" />
+ </td>
+ <td>
+ <PrismCell :code="item.default" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="text-mono">
+ <app-markdown v-if="item.description" :content="item.description" />
+ </td>
+ </tr>
+ </template>
+ </tbody>
+ </v-table>
+ </app-sheet>
+</template>
+
+<script lang="ts">
+ // Imports
+ import { defineComponent, PropType } from 'vue'
+ import { getType } from './utils'
+ import PrismCell from './PrismCell.vue'
+ import NameCell from './NameCell.vue'
+ import { kebabCase } from 'lodash'
+
+ export default defineComponent({
+ components: {
+ PrismCell,
+ NameCell,
+ },
+ props: {
+ items: {
+ type: Array as PropType<any[]>,
+ default: () => [],
+ },
+ },
+ setup (props) {
+ const headers = ['name', 'type', 'default']
+
+ return {
+ headers,
+ field: 'props',
+ getType,
+ kebabCase,
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/SassApi.vue b/packages/docs/src/components/api/SassApi.vue
deleted file mode 100644
index 5b97cc41412..00000000000
--- a/packages/docs/src/components/api/SassApi.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
- <v-row>
- <v-col cols="12">
- <api-search
- v-model="apiItem"
- :items="items"
- :label="$t('search-sass-api')"
- />
- </v-col>
- <v-col
- v-if="apiItem"
- cols="12"
- >
- <api-section
- :key="`sass-${apiItem}`"
- hide-header
- :name="apiItem"
- section="sass"
- />
- </v-col>
- </v-row>
-</template>
-
-<script>
- export default {
- name: 'SassApi',
-
- data: () => ({
- apiItem: '',
- icons: {
- component: '$mdiViewDashboardOutline',
- functional: '$mdiViewStream',
- theme: '$mdiThemeLightDark',
- },
- types: {
- $vuetify: 'functional',
- },
- // sassApi,
- }),
-
- computed: {
- // locale: get('route/params@locale'),
- items () {
- const items = []
- for (const item of this.sassApi) {
- const type = this.types[item] || 'component'
- items.push({
- text: item,
- icon: this.icons[type],
- })
- }
- return items
- },
- },
- }
-</script>
diff --git a/packages/docs/src/components/api/SassTable.vue b/packages/docs/src/components/api/SassTable.vue
new file mode 100644
index 00000000000..46a15436fe2
--- /dev/null
+++ b/packages/docs/src/components/api/SassTable.vue
@@ -0,0 +1,66 @@
+<template>
+ <app-sheet>
+ <v-table
+ class="api-table"
+ >
+ <thead>
+ <tr>
+ <th
+ v-for="header in headers"
+ :key="header"
+ :class="header"
+ >
+ <div
+ class="text-capitalize"
+ v-text="header"
+ />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <template v-for="item in items" :key="item.name">
+ <tr class="bg-grey-lighten-4">
+ <td>
+ <NameCell section="props" :name="kebabCase(item.name)" />
+ </td>
+ <td>
+ <PrismCell :code="item.default" language="scss" />
+ </td>
+ </tr>
+ </template>
+ </tbody>
+ </v-table>
+ </app-sheet>
+</template>
+
+<script lang="ts">
+ // Imports
+ import { defineComponent, PropType } from 'vue'
+ import { getType } from './utils'
+ import PrismCell from './PrismCell.vue'
+ import NameCell from './NameCell.vue'
+ import { kebabCase } from 'lodash'
+
+ export default defineComponent({
+ components: {
+ PrismCell,
+ NameCell,
+ },
+ props: {
+ items: {
+ type: Array as PropType<any[]>,
+ default: () => [],
+ },
+ },
+ setup (props) {
+ const headers = ['name', 'default']
+
+ return {
+ headers,
+ field: 'props',
+ getType,
+ kebabCase,
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/Section.vue b/packages/docs/src/components/api/Section.vue
index 5f8f14bc1eb..8edf6ed069a 100644
--- a/packages/docs/src/components/api/Section.vue
+++ b/packages/docs/src/components/api/Section.vue
@@ -1,5 +1,5 @@
<template>
- <div v-if="apiData?.length">
+ <div v-if="items?.length">
<!-- <div class="d-flex mb-2">
<app-text-field
clearable
@@ -9,17 +9,33 @@
/>
</div> -->
<app-headline v-if="showHeadline" :path="`api-headers.${section}`" />
- <api-table
- :api-data="apiData"
- class="mb-4"
- :field="section"
- :filter="filter"
- />
+ <template v-if="['props', 'argument', 'modifiers'].includes(section)">
+ <PropsTable :items="items" />
+ </template>
+ <template v-else-if="section === 'events'">
+ <EventsTable :items="items" />
+ </template>
+ <template v-else-if="section === 'slots'">
+ <SlotsTable :items="items" />
+ </template>
+ <template v-else-if="section === 'exposed'">
+ <ExposedTable :items="items" />
+ </template>
+ <template v-else-if="section === 'sass'">
+ <SassTable :items="items" />
+ </template>
</div>
</template>
<script lang="ts">
import { defineComponent, ref, watch } from 'vue'
+ import { useLocaleStore } from '@/store/locale'
+ import PropsTable from './PropsTable.vue'
+ import ExposedTable from './ExposedTable.vue'
+ import EventsTable from './EventsTable.vue'
+ import SlotsTable from './SlotsTable.vue'
+ import SassTable from './SassTable.vue'
+ import { Item } from './utils'
const getApi = (name: string) => {
return import(`../../api/data/${name}.json`)
@@ -27,7 +43,13 @@
export default defineComponent({
name: 'ApiSection',
-
+ components: {
+ PropsTable,
+ ExposedTable,
+ EventsTable,
+ SlotsTable,
+ SassTable,
+ },
props: {
name: {
type: String,
@@ -41,7 +63,8 @@
},
setup (props) {
- const apiData = ref()
+ const store = useLocaleStore()
+ const items = ref()
async function fetchApiData () {
try {
@@ -49,7 +72,15 @@
if (!api[props.section]) {
throw new Error(`API section "${props.section}" for "${props.name}" does not exist`)
}
- apiData.value = api[props.section]
+ const section = (api[props.section] ?? {}) as Record<string, Item>
+ items.value = Object.entries(section).reduce<any>((arr, [name, prop]) => {
+ arr.push({
+ ...prop,
+ name,
+ description: prop.description?.[store.locale],
+ })
+ return arr
+ }, []).sort((a: any, b: any) => a.name.localeCompare(b.name))
} catch (err) {
console.error(err)
}
@@ -61,8 +92,36 @@
return {
filter: ref(),
- apiData,
+ items,
}
},
})
</script>
+
+<style lang="sass">
+ .api-table
+ .regular-row td
+ padding: 8px 16px !important
+
+ .regular-row.has-extra-row td
+ border-bottom: none !important
+
+ .extra-row:hover
+ background: initial !important
+
+ .extra-row td
+ padding: 8px 0 !important
+
+ .v-markdown :deep(p)
+ margin-bottom: 0
+
+ :deep(.token.operator)
+ background: none
+
+ .name-item
+ white-space: nowrap
+
+ &:not(:hover):not(:focus)
+ span
+ opacity: 0
+</style>
diff --git a/packages/docs/src/components/api/SlotsTable.vue b/packages/docs/src/components/api/SlotsTable.vue
new file mode 100644
index 00000000000..d7cd9389e21
--- /dev/null
+++ b/packages/docs/src/components/api/SlotsTable.vue
@@ -0,0 +1,55 @@
+<template>
+ <app-sheet>
+ <v-table
+ class="api-table"
+ >
+ <tbody>
+ <template v-for="item in items" :key="item.name">
+ <tr class="bg-grey-lighten-4">
+ <td>
+ <NameCell section="props" :name="item.name" />
+ </td>
+ </tr>
+ <tr v-if="item.formatted !== 'never'">
+ <app-markup :code="getType(item)" language="ts" :rounded="false" />
+ </tr>
+ <tr>
+ <td colspan="3" class="text-mono">
+ <app-markdown v-if="item.description" :content="item.description" />
+ </td>
+ </tr>
+ </template>
+ </tbody>
+ </v-table>
+ </app-sheet>
+</template>
+
+<script lang="ts">
+ // Imports
+ import { defineComponent, PropType } from 'vue'
+ import { getType } from './utils'
+ import NameCell from './NameCell.vue'
+ import PrismCell from './PrismCell.vue'
+
+ export default defineComponent({
+ components: {
+ NameCell,
+ PrismCell,
+ },
+ props: {
+ items: {
+ type: Array as PropType<any[]>,
+ default: () => [],
+ },
+ },
+ setup (props) {
+ const headers = ['name', 'type', 'description']
+
+ return {
+ headers,
+ field: 'props',
+ getType,
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/components/api/Table.vue b/packages/docs/src/components/api/Table.vue
index 175a7db4db1..d21536b5bce 100644
--- a/packages/docs/src/components/api/Table.vue
+++ b/packages/docs/src/components/api/Table.vue
@@ -115,8 +115,11 @@
type Item = {
name: string
source: string
- type: string | string[]
- signature: string
+ type?: string | string[]
+ anyOf: Item[],
+ enum?: string[],
+ parameters?: Item[],
+ returnType?: Item,
default: any
description: Record<string, string>,
snippet: string
@@ -135,7 +138,7 @@
required: true,
},
filter: String,
- apiData: Array as PropType<Item[]>,
+ apiData: Object as PropType<Record<string, Item>>,
},
setup (props) {
diff --git a/packages/docs/src/components/api/utils.ts b/packages/docs/src/components/api/utils.ts
new file mode 100644
index 00000000000..8aa152d5b69
--- /dev/null
+++ b/packages/docs/src/components/api/utils.ts
@@ -0,0 +1,118 @@
+import prettier from 'prettier'
+import typescriptParser from 'prettier/parser-typescript'
+
+export type Item = {
+ name: string
+ source: string
+ type?: string | string[]
+ anyOf: Item[]
+ enum?: string[]
+ parameters?: Item[]
+ returnType?: Item
+ default: any
+ description: Record<string, string>
+ snippet: string
+ value: any
+ example: string
+ props: unknown
+ $ref?: string
+ properties?: Record<string, Item>
+ items?: Item | Item[]
+ minItems?: number
+ maxItems?: number
+ allOf?: Item[]
+}
+
+export function stripLinks (str: string): [string, Record<string, string>] {
+ let out = str.slice()
+ const obj: Record<string, string> = {}
+ const regexp = /<a.*>(.*?)<\/a>/g
+
+ let matches = regexp.exec(str)
+
+ while (matches !== null) {
+ console.log('match!', matches)
+
+ obj[matches[1]] = matches[0]
+ out = out.replace(matches[0], matches[1])
+
+ matches = regexp.exec(str)
+ }
+
+ return [out, obj]
+}
+
+export function insertLinks (str: string, stripped: Record<string, string>) {
+ for (const [key, value] of Object.entries(stripped)) {
+ str = str.replace(key, value)
+ }
+ return str
+}
+
+export function getType (item: { formatted: string }) {
+ const prefix = 'type Type = '
+ const [str, stripped] = stripLinks(item.formatted)
+ const formatted = prettier.format(prefix + str, {
+ parser: 'typescript',
+ plugins: [typescriptParser],
+ bracketSpacing: true,
+ semi: false,
+ singleQuote: true,
+ trailingComma: 'all',
+ })
+
+ return insertLinks(formatted, stripped).replace(/type\sType\s=\s+?/m, '')
+}
+
+// export function getType (item: Item): string {
+// // Simple string enum
+// if (item.enum) {
+// return item.enum.map(v => typeof v === 'string' ? `'${v}'` : v).join(' | ')
+// }
+
+// // array
+// if (item.type === 'array' && item.items) {
+// // tuple
+// if (Array.isArray(item.items)) {
+// return `[${item.items?.map(item => getType(item)).join(', ')}]`
+// }
+
+// return `${getType(item.items)}[]`
+// }
+
+// // object
+// if (item.type === 'object') {
+// return formatObject(Object.entries(item.properties ?? {}).reduce<any>((obj, [name, prop]) => {
+// obj[name] = getType(prop)
+// return obj
+// }, {}))
+// }
+
+// // function
+// if (item.type === 'function') {
+// return `(${item.parameters?.map(p => {
+// return `${p.name}: ${getType(p)}`
+// }).join(', ')}) => ${getType(item.returnType!)}`
+// }
+
+// // primitive types(s)
+// if (item.type) {
+// return Array.isArray(item.type) ? item.type.join(' | ') : item.type
+// }
+
+// // refs
+// if (item.$ref) {
+// return item.$ref.replace('#/definitions/', '')
+// }
+
+// // any of
+// if (item.anyOf) {
+// return item.anyOf.map(v => getType(v)).join(' | ')
+// }
+
+// if (item.allOf) {
+// return `(${item.allOf.map(v => getType(v)).join(' & ')})`
+// }
+
+// return ''
+// }
diff --git a/packages/docs/src/components/app/Markup.vue b/packages/docs/src/components/app/Markup.vue
index 43bb072a8df..78f70d21370 100644
--- a/packages/docs/src/components/app/Markup.vue
+++ b/packages/docs/src/components/app/Markup.vue
@@ -3,10 +3,10 @@
ref="root"
:theme="isDark ? 'dark' : 'light'"
:color="isDark ? '#1F1F1F' : 'grey-lighten-4'"
+ :rounded="rounded"
class="app-markup overflow-hidden"
dir="ltr"
outlined
- rounded
v-bind="$attrs"
>
<v-toolbar
@@ -90,6 +90,10 @@
type: String,
default: 'markup',
},
+ rounded: {
+ type: Boolean,
+ default: true,
+ },
},
setup (props) {
diff --git a/packages/docs/src/data/page-to-api.json b/packages/docs/src/data/page-to-api.json
index 3b5369361f4..969f3f84e58 100644
--- a/packages/docs/src/data/page-to-api.json
+++ b/packages/docs/src/data/page-to-api.json
@@ -186,21 +186,25 @@
"v-window",
"v-window-item"
],
- "directives/click-outside": ["v-click-outside"],
- "directives/intersect": ["v-intersect"],
- "directives/mutate": ["v-mutate"],
- "directives/resize": ["v-resize"],
- "directives/ripple": ["v-ripple"],
- "directives/scroll": ["v-scroll"],
- "directives/touch": ["v-touch"],
+ "directives/click-outside": ["click-outside"],
+ "directives/intersect": ["intersect"],
+ "directives/mutate": ["mutate"],
+ "directives/resize": ["resize"],
+ "directives/ripple": ["ripple"],
+ "directives/scroll": ["scroll"],
+ "directives/touch": ["touch"],
"features/internationalization": ["internationalization"],
"features/scrolling": ["$vuetify"],
"features/theme": ["v-theme-provider"],
"features/display-and-platform": ["display"],
"styles/transitions": [
+ "v-dialog-bottom-transition",
+ "v-dialog-top-transition",
+ "v-dialog-transition",
+ "v-expand-transition",
+ "v-expand-x-transition",
"v-fab-transition",
"v-fade-transition",
- "v-expand-transition",
"v-scale-transition",
"v-scroll-x-transition",
"v-scroll-x-reverse-transition",
diff --git a/packages/docs/src/i18n/messages/en.json b/packages/docs/src/i18n/messages/en.json
index 7ef4cf47662..1f7341475bb 100644
--- a/packages/docs/src/i18n/messages/en.json
+++ b/packages/docs/src/i18n/messages/en.json
@@ -17,7 +17,8 @@
"modifiers": "Modifiers",
"props": "Props",
"sass": "SASS Variables",
- "slots": "Slots"
+ "slots": "Slots",
+ "exposed": "Exposed"
},
"application": "Application",
"apply": "Apply",
diff --git a/packages/vuetify/dev/Playground.items.vue b/packages/vuetify/dev/Playground.items.vue
new file mode 100644
index 00000000000..dd8e484eedd
--- /dev/null
+++ b/packages/vuetify/dev/Playground.items.vue
@@ -0,0 +1,189 @@
+<template>
+ <v-card
+ max-width="450"
+ class="mx-auto"
+ >
+ <v-toolbar
+ color="cyan"
+ dark
+ >
+ <v-app-bar-nav-icon variant="text"></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Inbox</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn variant="text" icon="mdi-magnify"></v-btn>
+ </v-toolbar>
+
+ <v-list
+ lines="three"
+ :items="items"
+ item-title="subject"
+ :item-props="itemProps"
+ >
+ <template v-slot:subtitle="{ item }">
+ <div>
+ <span class="text-primary">{{ item.from }}</span>
+ <span> — {{ item.content }}</span>
+ </div>
+ </template>
+ </v-list>
+
+ <v-select
+ v-model="select"
+ :items="sitems"
+ item-title="state"
+ item-value="abbr"
+ label="Select"
+ persistent-hint
+ single-line
+ ></v-select>
+ <pre>{{ JSON.stringify(select, null, 2) }}</pre>
+
+ <v-select
+ v-model="select2"
+ :items="sitems"
+ item-title="state"
+ item-value="abbr"
+ label="Select"
+ persistent-hint
+ single-line
+ return-object
+ ></v-select>
+ <pre>{{ JSON.stringify(select2, null, 2) }}</pre>
+
+ <v-autocomplete
+ v-model="values"
+ :items="aitems"
+ outlined
+ dense
+ chips
+ small-chips
+ label="Outlined"
+ multiple
+ ></v-autocomplete>
+ <pre>{{ JSON.stringify(values, null, 2) }}</pre>
+
+ <v-autocomplete
+ v-model="ovalues"
+ :items="aoitems"
+ outlined
+ dense
+ chips
+ small-chips
+ label="Outlined"
+ multiple
+ return-object
+ ></v-autocomplete>
+ <pre>{{ JSON.stringify(ovalues, null, 2) }}</pre>
+
+ <v-combobox
+ v-model="combo"
+ v-model:items="citems"
+ label="Combobox"
+ multiple
+ outlined
+ dense
+ ></v-combobox>
+
+ <pre>{{ JSON.stringify(combo, null, 2) }}</pre>
+
+ <v-combobox
+ v-model="combosingle"
+ v-model:items="citems"
+ label="Combobox"
+ outlined
+ dense
+ ></v-combobox>
+
+ <div class="py-10" />
+ <div class="py-10" />
+ <div class="py-10" />
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ combo: ['Vuetify', 'Programming'],
+ combosingle: 'Programming',
+ citems: [
+ 'Programming',
+ 'Design',
+ 'Vue',
+ 'Vuetify',
+ ],
+ aitems: ['foo', 'bar', 'fizz', 'buzz'],
+ aoitems: [
+ { title: 'foo', value: 'foo' },
+ { title: 'bar', value: 'bar' },
+ { title: 'fizz', value: 'fizz' },
+ { title: 'buzz', value: 'buzz' },
+ ],
+ ovalues: [
+ { title: 'foo', value: 'foo' },
+ ],
+ values: ['foo', 'bar'],
+ value: null,
+ select: 'FL',
+ select2: { state: 'Georgia', abbr: 'GA' },
+ sitems: [
+ { state: 'Florida', abbr: 'FL' },
+ { state: 'Georgia', abbr: 'GA' },
+ { state: 'Nebraska', abbr: 'NE' },
+ { state: 'California', abbr: 'CA' },
+ { state: 'New York', abbr: 'NY' },
+ ],
+ items: [
+ { type: 'subheader', subject: 'Today' },
+ {
+ avatarUrl: 'https://cdn.vuetifyjs.com/images/lists/1.jpg',
+ subject: 'Brunch this weekend?',
+ from: 'Ali Connors',
+ content: 'I\'ll be in your neighborhood doing errands this weekend. Do you want to hang out?',
+ subtitle: `<span class="text-primary">Ali Connors</span> — `,
+ },
+ { type: 'divider', inset: true },
+ {
+ avatarUrl: 'https://cdn.vuetifyjs.com/images/lists/2.jpg',
+ subject: 'Summer BBQ',
+ from: 'Alex Scott',
+ content: 'Wish I could come, but I\'m out of town this weekend.',
+ subtitle: `<span class="text-primary">to Alex, Scott, Jennifer</span> — Wish I could come, but I'm out of town this weekend.`,
+ },
+ { type: 'divider', inset: true },
+ {
+ avatarUrl: 'https://cdn.vuetifyjs.com/images/lists/3.jpg',
+ subject: 'Oui oui',
+ from: 'Sandra adams',
+ content: 'Do you have Paris recommendations? Have you ever been?',
+ subtitle: '<span class="text-primary">Sandra Adams</span> — Do you have Paris recommendations? Have you ever been?',
+ },
+ { type: 'divider', inset: true },
+ {
+ avatarUrl: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
+ subject: 'Birthday gift',
+ from: 'Trevor Hansen',
+ content: 'Have any ideas about what we should get Heidi for her birthday?',
+ subtitle: '<span class="text-primary">Trevor Hansen</span> — ',
+ },
+ { type: 'divider', inset: true },
+ {
+ avatarUrl: 'https://cdn.vuetifyjs.com/images/lists/5.jpg',
+ subject: 'Recipe to try',
+ from: 'Britta Holt',
+ content: 'We should eat this: Grate, Squash, Corn, and tomatillo Tacos.',
+ subtitle: '<span class="text-primary">Britta Holt</span> — We should eat this: Grate, Squash, Corn, and tomatillo Tacos.',
+ },
+ ],
+ }),
+ methods: {
+ itemProps (item) {
+ if (item.type === 'divider') return { inset: true }
+
+ if (item.type !== 'subheader') return { prependAvatar: item.avatarUrl }
+ },
+ },
+ }
+</script>
diff --git a/packages/vuetify/dev/Playground.list.vue b/packages/vuetify/dev/Playground.list.vue
new file mode 100644
index 00000000000..2609a37e209
--- /dev/null
+++ b/packages/vuetify/dev/Playground.list.vue
@@ -0,0 +1,210 @@
+<template>
+ <div>
+ <!-- <v-autocomplete
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ item-title="name"
+ item-value="name"
+ multiple
+ >
+ <template v-slot:chip="{ props, item }">
+ <v-chip
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :text="item.raw.name"
+ ></v-chip>
+ </template>
+ <template v-slot:item="{ props, item }">
+ <v-list-item
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :title="item.raw.name"
+ :subtitle="item.raw.group"
+ ></v-list-item>
+ </template>
+ </v-autocomplete>
+ </div>
+ <div>
+ <v-autocomplete
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ item-title="name"
+ item-value="name"
+ multiple
+ >
+ <template v-slot:chip="{ props, item }">
+ <v-chip
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :text="item.raw.name"
+ ></v-chip>
+ </template>
+ </v-autocomplete>
+ </div>
+ <div>
+ <v-select
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ item-title="name"
+ item-value="name"
+ multiple
+ >
+ <template v-slot:chip="{ props, item }">
+ <v-chip
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :text="item.raw.name"
+ ></v-chip>
+ </template>
+ <template v-slot:item="{ props, item }">
+ <v-list-item
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :title="item.raw.name"
+ :subtitle="item.raw.group"
+ ></v-list-item>
+ </template>
+ </v-select>
+ </div>
+ <div>
+ <v-select
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ item-title="name"
+ item-value="name"
+ multiple
+ >
+ <template v-slot:chip="{ props, item }">
+ <v-chip
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :text="item.raw.name"
+ ></v-chip>
+ </template>
+ </v-select>
+ </div>
+
+ <div>
+ <v-combobox
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ item-title="name"
+ item-value="name"
+ multiple
+ >
+ <template v-slot:chip="{ props, item }">
+ <v-chip
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :text="item.raw.name"
+ ></v-chip>
+ </template>
+ <template v-slot:item="{ props, item }">
+ <v-list-item
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :title="item.raw.name"
+ :subtitle="item.raw.group"
+ ></v-list-item>
+ </template>
+ </v-combobox>
+ </div>
+ <div>
+ <v-combobox
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ item-title="name"
+ item-value="name"
+ multiple
+ >
+ <template v-slot:chip="{ props, item }">
+ <v-chip
+ v-bind="props"
+ :prepend-avatar="item.raw.avatar"
+ :text="item.raw.name"
+ ></v-chip>
+ </template>
+ </v-combobox> -->
+ <div>
+ <v-select
+ :items="people"
+ filled
+ chips
+ closable-chips
+ color="blue-grey-lighten-2"
+ label="Select"
+ multiple
+ ></v-select>
+
+ <v-list :items="people" />
+ </div>
+ </div>
+</template>
+
+<script>
+ const srcs = {
+ 1: 'https://cdn.vuetifyjs.com/images/lists/1.jpg',
+ 2: 'https://cdn.vuetifyjs.com/images/lists/2.jpg',
+ 3: 'https://cdn.vuetifyjs.com/images/lists/3.jpg',
+ 4: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
+ 5: 'https://cdn.vuetifyjs.com/images/lists/5.jpg',
+ }
+
+ export default {
+ data: () => ({
+ people: [
+ // { type: 'subheader', name: 'Group 1' },
+ // { name: 'Sandra Adams', group: 'Group 1', avatar: srcs[1] },
+ // { name: 'Ali Connors', group: 'Group 1', avatar: srcs[2] },
+ // { name: 'Trevor Hansen', group: 'Group 1', avatar: srcs[3] },
+ // { name: 'Tucker Smith', group: 'Group 1', avatar: srcs[2] },
+ // { type: 'divider' },
+ // { type: 'subheader', name: 'Group 2' },
+ // { name: 'Britta Holt', group: 'Group 2', avatar: srcs[4] },
+ // { name: 'Jane Smith ', group: 'Group 2', avatar: srcs[5] },
+ // { name: 'John Smith', group: 'Group 2', avatar: srcs[1] },
+ {
+ title: 'Group 1',
+ children: [
+ { title: 'Jane Smith ', group: 'Group 1', avatar: srcs[5] },
+ { type: 'divider' },
+ { title: 'Britta Holt', group: 'Group 1', avatar: srcs[4] },
+ ],
+ divider: true,
+ },
+ { type: 'divider' },
+ {
+ title: 'Group 2',
+ children: [
+ { title: 'Trevor Hansen', group: 'Group 2', avatar: srcs[3] },
+ { title: 'Ali Connors', group: 'Group 2', avatar: srcs[2] },
+ ],
+ },
+ ],
+ }),
+ }
+</script>
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index ed3b2ec0636..0e4a139cade 100755
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -33,7 +33,7 @@
"module": "lib/framework.mjs",
"jsdelivr": "dist/vuetify.js",
"unpkg": "dist/vuetify.js",
- "types": "lib/index.d.ts",
+ "types": "dist/vuetify.d.ts",
"sass": "lib/styles/main.sass",
"styles": "lib/styles/main.css",
"sideEffects": [
@@ -93,7 +93,7 @@
"watch": "yarn build:lib --watch",
"dev": "cross-env NODE_ENV=development vite",
"dev:ssr": "cross-env NODE_ENV=development VITE_SSR=true vite-ssr",
- "build": "rimraf lib dist && concurrently \"yarn build:dist\" \"yarn build:lib\" -n \"dist,lib\" --kill-others-on-fail -r && yarn build:json && yarn build:types",
+ "build": "rimraf lib dist && concurrently \"yarn build:dist\" \"yarn build:lib\" -n \"dist,lib\" --kill-others-on-fail -r && yarn build:types",
"build:dist": "rollup --config build/rollup.config.js",
"build:lib": "cross-env NODE_ENV=lib babel src --out-dir lib --source-maps --extensions \".ts\",\".tsx\",\".snap\" --copy-files --no-copy-ignored --out-file-extension .mjs",
"build:types": "rimraf types-temp && tsc --pretty --emitDeclarationOnly -p tsconfig.dist.json && rollup --config build/rollup.types.config.js && rimraf types-temp",
@@ -153,6 +153,7 @@
"rollup-plugin-sass": "^1.2.12",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
+ "ts-json-schema-generator": "^1.0.0",
"vite": "^3.0.9",
"vite-ssr": "^0.16.0",
"vue-i18n": "^9.2.2",
diff --git a/packages/vuetify/src/components/VAlert/VAlert.tsx b/packages/vuetify/src/components/VAlert/VAlert.tsx
index a136683d1fb..84565b301ed 100644
--- a/packages/vuetify/src/components/VAlert/VAlert.tsx
+++ b/packages/vuetify/src/components/VAlert/VAlert.tsx
@@ -38,7 +38,7 @@ export const VAlert = defineComponent({
props: {
border: {
- type: [Boolean, String],
+ type: [Boolean, String] as PropType<boolean | 'top' | 'end' | 'bottom' | 'start'>,
validator: (val: boolean | string) => {
return typeof val === 'boolean' || [
'top',
diff --git a/packages/vuetify/src/components/VAlert/VAlertTitle.ts b/packages/vuetify/src/components/VAlert/VAlertTitle.ts
index 0a7a6935127..c96fa9b2256 100644
--- a/packages/vuetify/src/components/VAlert/VAlertTitle.ts
+++ b/packages/vuetify/src/components/VAlert/VAlertTitle.ts
@@ -2,3 +2,5 @@
import { createSimpleFunctional } from '@/util'
export const VAlertTitle = createSimpleFunctional('v-alert-title')
+
+export type VAlert = InstanceType<typeof VAlertTitle>
diff --git a/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.tsx b/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.tsx
index 189cdeacff7..73a1dd57d53 100644
--- a/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.tsx
+++ b/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.tsx
@@ -29,3 +29,5 @@ export const VAppBarNavIcon = defineComponent({
return {}
},
})
+
+export type VAppBarNavIcon = InstanceType<typeof VAppBarNavIcon>
diff --git a/packages/vuetify/src/components/VAppBar/VAppBarTitle.tsx b/packages/vuetify/src/components/VAppBar/VAppBarTitle.tsx
index bce730e2225..5783ab562d3 100644
--- a/packages/vuetify/src/components/VAppBar/VAppBarTitle.tsx
+++ b/packages/vuetify/src/components/VAppBar/VAppBarTitle.tsx
@@ -20,3 +20,5 @@ export const VAppBarTitle = defineComponent({
return {}
},
})
+
+export type VAppBarTitle = InstanceType<typeof VAppBarTitle>
diff --git a/packages/vuetify/src/components/VBanner/VBannerActions.tsx b/packages/vuetify/src/components/VBanner/VBannerActions.tsx
index 8ac277a03f4..3f4158fac70 100644
--- a/packages/vuetify/src/components/VBanner/VBannerActions.tsx
+++ b/packages/vuetify/src/components/VBanner/VBannerActions.tsx
@@ -30,3 +30,5 @@ export const VBannerActions = defineComponent({
return {}
},
})
+
+export type VBannerActions = InstanceType<typeof VBannerActions>
diff --git a/packages/vuetify/src/components/VBanner/VBannerText.ts b/packages/vuetify/src/components/VBanner/VBannerText.ts
index 983b967a1a4..3605b8d81f2 100644
--- a/packages/vuetify/src/components/VBanner/VBannerText.ts
+++ b/packages/vuetify/src/components/VBanner/VBannerText.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VBannerText = createSimpleFunctional('v-banner-text')
+
+export type VBannerText = InstanceType<typeof VBannerText>
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx
index d844492a690..6542d9df24c 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbsDivider.tsx
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VBreadcrumbsDivider = createSimpleFunctional('v-breadcrumbs-divider', 'li')
+
+export type VBreadcrumbsDivider = InstanceType<typeof VBreadcrumbsDivider>
diff --git a/packages/vuetify/src/components/VBtnGroup/VBtnGroup.tsx b/packages/vuetify/src/components/VBtnGroup/VBtnGroup.tsx
index 7383b90b535..c1beecebb42 100644
--- a/packages/vuetify/src/components/VBtnGroup/VBtnGroup.tsx
+++ b/packages/vuetify/src/components/VBtnGroup/VBtnGroup.tsx
@@ -67,3 +67,5 @@ export const VBtnGroup = defineComponent({
})
},
})
+
+export type VBtnGroup = InstanceType<typeof VBtnGroup>
diff --git a/packages/vuetify/src/components/VBtnToggle/VBtnToggle.tsx b/packages/vuetify/src/components/VBtnToggle/VBtnToggle.tsx
index 136fc3477fb..991cf74b213 100644
--- a/packages/vuetify/src/components/VBtnToggle/VBtnToggle.tsx
+++ b/packages/vuetify/src/components/VBtnToggle/VBtnToggle.tsx
@@ -55,3 +55,5 @@ export const VBtnToggle = genericComponent<new <T>() => {
}
},
})
+
+export type VBtnToggle = InstanceType<typeof VBtnToggle>
diff --git a/packages/vuetify/src/components/VCard/VCardActions.tsx b/packages/vuetify/src/components/VCard/VCardActions.tsx
index 792bfaf035a..350168e73b2 100644
--- a/packages/vuetify/src/components/VCard/VCardActions.tsx
+++ b/packages/vuetify/src/components/VCard/VCardActions.tsx
@@ -23,3 +23,5 @@ export const VCardActions = defineComponent({
return {}
},
})
+
+export type VCardActions = InstanceType<typeof VCardActions>
diff --git a/packages/vuetify/src/components/VCard/VCardItem.tsx b/packages/vuetify/src/components/VCard/VCardItem.tsx
index f60d028c34e..6dabf87227b 100644
--- a/packages/vuetify/src/components/VCard/VCardItem.tsx
+++ b/packages/vuetify/src/components/VCard/VCardItem.tsx
@@ -99,3 +99,5 @@ export const VCardItem = defineComponent({
return {}
},
})
+
+export type VCardItem = InstanceType<typeof VCardItem>
diff --git a/packages/vuetify/src/components/VCard/VCardSubtitle.ts b/packages/vuetify/src/components/VCard/VCardSubtitle.ts
index 433070fcd92..8edf8b4ade6 100644
--- a/packages/vuetify/src/components/VCard/VCardSubtitle.ts
+++ b/packages/vuetify/src/components/VCard/VCardSubtitle.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VCardSubtitle = createSimpleFunctional('v-card-subtitle')
+
+export type VCardSubtitle = InstanceType<typeof VCardSubtitle>
diff --git a/packages/vuetify/src/components/VCard/VCardText.ts b/packages/vuetify/src/components/VCard/VCardText.ts
index b75b89dad95..f17c9d0722f 100644
--- a/packages/vuetify/src/components/VCard/VCardText.ts
+++ b/packages/vuetify/src/components/VCard/VCardText.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VCardText = createSimpleFunctional('v-card-text')
+
+export type VCardText = InstanceType<typeof VCardText>
diff --git a/packages/vuetify/src/components/VCard/VCardTitle.ts b/packages/vuetify/src/components/VCard/VCardTitle.ts
index 8c299000602..25f22a859a6 100644
--- a/packages/vuetify/src/components/VCard/VCardTitle.ts
+++ b/packages/vuetify/src/components/VCard/VCardTitle.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VCardTitle = createSimpleFunctional('v-card-title')
+
+export type VCardTitle = InstanceType<typeof VCardTitle>
diff --git a/packages/vuetify/src/components/VCarousel/VCarousel.tsx b/packages/vuetify/src/components/VCarousel/VCarousel.tsx
index cd4bc0f95f2..02123839b30 100644
--- a/packages/vuetify/src/components/VCarousel/VCarousel.tsx
+++ b/packages/vuetify/src/components/VCarousel/VCarousel.tsx
@@ -155,3 +155,5 @@ export const VCarousel = defineComponent({
return {}
},
})
+
+export type VCarousel = InstanceType<typeof VCarousel>
diff --git a/packages/vuetify/src/components/VCode/index.ts b/packages/vuetify/src/components/VCode/index.ts
index 3ea1c39573a..4af6e1e6541 100644
--- a/packages/vuetify/src/components/VCode/index.ts
+++ b/packages/vuetify/src/components/VCode/index.ts
@@ -3,3 +3,5 @@ import './VCode.sass'
import { createSimpleFunctional } from '@/util'
export const VCode = createSimpleFunctional('v-code')
+
+export type VCode = InstanceType<typeof VCode>
diff --git a/packages/vuetify/src/components/VColorPicker/VColorPickerCanvas.tsx b/packages/vuetify/src/components/VColorPicker/VColorPickerCanvas.tsx
index a3eebcb4ca1..8b55b5346f8 100644
--- a/packages/vuetify/src/components/VColorPicker/VColorPickerCanvas.tsx
+++ b/packages/vuetify/src/components/VColorPicker/VColorPickerCanvas.tsx
@@ -190,3 +190,5 @@ export const VColorPickerCanvas = defineComponent({
return {}
},
})
+
+export type VColorPickerCanvas = InstanceType<typeof VColorPickerCanvas>
diff --git a/packages/vuetify/src/components/VColorPicker/VColorPickerEdit.tsx b/packages/vuetify/src/components/VColorPicker/VColorPickerEdit.tsx
index 52913be49d1..34218c163e2 100644
--- a/packages/vuetify/src/components/VColorPicker/VColorPickerEdit.tsx
+++ b/packages/vuetify/src/components/VColorPicker/VColorPickerEdit.tsx
@@ -101,3 +101,5 @@ export const VColorPickerEdit = defineComponent({
return {}
},
})
+
+export type VColorPickerEdit = InstanceType<typeof VColorPickerEdit>
diff --git a/packages/vuetify/src/components/VColorPicker/VColorPickerPreview.tsx b/packages/vuetify/src/components/VColorPicker/VColorPickerPreview.tsx
index 146994d166e..8f5bdc79107 100644
--- a/packages/vuetify/src/components/VColorPicker/VColorPickerPreview.tsx
+++ b/packages/vuetify/src/components/VColorPicker/VColorPickerPreview.tsx
@@ -78,3 +78,5 @@ export const VColorPickerPreview = defineComponent({
return {}
},
})
+
+export type VColorPickerPreview = InstanceType<typeof VColorPickerPreview>
diff --git a/packages/vuetify/src/components/VColorPicker/VColorPickerSwatches.tsx b/packages/vuetify/src/components/VColorPicker/VColorPickerSwatches.tsx
index b327d0e1630..39e0408c40e 100644
--- a/packages/vuetify/src/components/VColorPicker/VColorPickerSwatches.tsx
+++ b/packages/vuetify/src/components/VColorPicker/VColorPickerSwatches.tsx
@@ -89,3 +89,5 @@ export const VColorPickerSwatches = defineComponent({
return {}
},
})
+
+export type VColorPickerSwatches = InstanceType<typeof VColorPickerSwatches>
diff --git a/packages/vuetify/src/components/VCounter/VCounter.tsx b/packages/vuetify/src/components/VCounter/VCounter.tsx
index db099d86209..588b3d097f4 100644
--- a/packages/vuetify/src/components/VCounter/VCounter.tsx
+++ b/packages/vuetify/src/components/VCounter/VCounter.tsx
@@ -55,3 +55,5 @@ export const VCounter = defineComponent({
return {}
},
})
+
+export type VCounter = InstanceType<typeof VCounter>
diff --git a/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx b/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx
index 6e8ac516410..412f836b166 100644
--- a/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx
+++ b/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx
@@ -30,3 +30,5 @@ export const VDefaultsProvider = defineComponent({
return () => slots.default?.()
},
})
+
+export type VDefaultsProvider = InstanceType<typeof VDefaultsProvider>
diff --git a/packages/vuetify/src/components/VDivider/VDivider.tsx b/packages/vuetify/src/components/VDivider/VDivider.tsx
index 6d967ba6e91..ba1b678ce54 100644
--- a/packages/vuetify/src/components/VDivider/VDivider.tsx
+++ b/packages/vuetify/src/components/VDivider/VDivider.tsx
@@ -70,3 +70,5 @@ export const VDivider = defineComponent({
return {}
},
})
+
+export type VDivider = InstanceType<typeof VDivider>
diff --git a/packages/vuetify/src/components/VFooter/VFooter.tsx b/packages/vuetify/src/components/VFooter/VFooter.tsx
index c09c31b23d3..bba6136a41a 100644
--- a/packages/vuetify/src/components/VFooter/VFooter.tsx
+++ b/packages/vuetify/src/components/VFooter/VFooter.tsx
@@ -79,3 +79,5 @@ export const VFooter = defineComponent({
return {}
},
})
+
+export type VFooter = InstanceType<typeof VFooter>
diff --git a/packages/vuetify/src/components/VGrid/VContainer.tsx b/packages/vuetify/src/components/VGrid/VContainer.tsx
index a13dae65f95..cca1f1dccaf 100644
--- a/packages/vuetify/src/components/VGrid/VContainer.tsx
+++ b/packages/vuetify/src/components/VGrid/VContainer.tsx
@@ -33,3 +33,5 @@ export const VContainer = defineComponent({
return {}
},
})
+
+export type VContainer = InstanceType<typeof VContainer>
diff --git a/packages/vuetify/src/components/VGrid/VSpacer.ts b/packages/vuetify/src/components/VGrid/VSpacer.ts
index bdef60afbae..ab69afb49bd 100644
--- a/packages/vuetify/src/components/VGrid/VSpacer.ts
+++ b/packages/vuetify/src/components/VGrid/VSpacer.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VSpacer = createSimpleFunctional('flex-grow-1', 'div', 'VSpacer')
+
+export type VSpacer = InstanceType<typeof VSpacer>
diff --git a/packages/vuetify/src/components/VHover/VHover.tsx b/packages/vuetify/src/components/VHover/VHover.tsx
index f1774e8fd7e..32ab56e84ba 100644
--- a/packages/vuetify/src/components/VHover/VHover.tsx
+++ b/packages/vuetify/src/components/VHover/VHover.tsx
@@ -35,3 +35,5 @@ export const VHover = defineComponent({
})
},
})
+
+export type VHover = InstanceType<typeof VHover>
diff --git a/packages/vuetify/src/components/VIcon/VIcon.tsx b/packages/vuetify/src/components/VIcon/VIcon.tsx
index 65b5900429c..99b8c23acd6 100644
--- a/packages/vuetify/src/components/VIcon/VIcon.tsx
+++ b/packages/vuetify/src/components/VIcon/VIcon.tsx
@@ -81,3 +81,5 @@ export const VIcon = defineComponent({
return {}
},
})
+
+export type VIcon = InstanceType<typeof VIcon>
diff --git a/packages/vuetify/src/components/VKbd/index.ts b/packages/vuetify/src/components/VKbd/index.ts
index 40cb0d100b4..56abcc2114a 100644
--- a/packages/vuetify/src/components/VKbd/index.ts
+++ b/packages/vuetify/src/components/VKbd/index.ts
@@ -3,3 +3,5 @@ import './VKbd.sass'
import { createSimpleFunctional } from '@/util'
export const VKbd = createSimpleFunctional('v-kbd')
+
+export type VKbd = InstanceType<typeof VKbd>
diff --git a/packages/vuetify/src/components/VLayout/VLayoutItem.tsx b/packages/vuetify/src/components/VLayout/VLayoutItem.tsx
index 29ffb12e652..f6c6cd8a598 100644
--- a/packages/vuetify/src/components/VLayout/VLayoutItem.tsx
+++ b/packages/vuetify/src/components/VLayout/VLayoutItem.tsx
@@ -50,3 +50,5 @@ export const VLayoutItem = defineComponent({
)
},
})
+
+export type VLayoutItem = InstanceType<typeof VLayoutItem>
diff --git a/packages/vuetify/src/components/VLazy/VLazy.tsx b/packages/vuetify/src/components/VLazy/VLazy.tsx
index c60190e9de2..c5275eaa2bf 100644
--- a/packages/vuetify/src/components/VLazy/VLazy.tsx
+++ b/packages/vuetify/src/components/VLazy/VLazy.tsx
@@ -72,3 +72,5 @@ export const VLazy = defineComponent({
return {}
},
})
+
+export type VLazy = InstanceType<typeof VLazy>
diff --git a/packages/vuetify/src/components/VList/VListGroup.tsx b/packages/vuetify/src/components/VList/VListGroup.tsx
index a748cb86a8e..512eb6dad4a 100644
--- a/packages/vuetify/src/components/VList/VListGroup.tsx
+++ b/packages/vuetify/src/components/VList/VListGroup.tsx
@@ -129,6 +129,8 @@ export const VListGroup = genericComponent<new <T extends InternalListItem>() =>
},
})
+export type VListGroup = InstanceType<typeof VListGroup>
+
export function filterListGroupProps (props: ExtractPropTypes<ReturnType<typeof makeVListGroupProps>>) {
return pick(props, Object.keys(VListGroup.props) as any)
}
diff --git a/packages/vuetify/src/components/VList/VListImg.ts b/packages/vuetify/src/components/VList/VListImg.ts
index d470cd50d3a..ddb64d504d8 100644
--- a/packages/vuetify/src/components/VList/VListImg.ts
+++ b/packages/vuetify/src/components/VList/VListImg.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VListImg = createSimpleFunctional('v-list-img')
+
+export type VListImg = InstanceType<typeof VListImg>
diff --git a/packages/vuetify/src/components/VList/VListItemAction.tsx b/packages/vuetify/src/components/VList/VListItemAction.tsx
index 69512211cb5..2e167624fb8 100644
--- a/packages/vuetify/src/components/VList/VListItemAction.tsx
+++ b/packages/vuetify/src/components/VList/VListItemAction.tsx
@@ -31,3 +31,5 @@ export const VListItemAction = defineComponent({
return {}
},
})
+
+export type VListItemAction = InstanceType<typeof VListItemAction>
diff --git a/packages/vuetify/src/components/VList/VListItemMedia.tsx b/packages/vuetify/src/components/VList/VListItemMedia.tsx
index 63ad0fcd516..e9bd818b70c 100644
--- a/packages/vuetify/src/components/VList/VListItemMedia.tsx
+++ b/packages/vuetify/src/components/VList/VListItemMedia.tsx
@@ -33,3 +33,5 @@ export const VListItemMedia = defineComponent({
return {}
},
})
+
+export type VListItemMedia = InstanceType<typeof VListItemMedia>
diff --git a/packages/vuetify/src/components/VList/VListItemSubtitle.ts b/packages/vuetify/src/components/VList/VListItemSubtitle.ts
index d4dff86aaa8..680e7a83df6 100644
--- a/packages/vuetify/src/components/VList/VListItemSubtitle.ts
+++ b/packages/vuetify/src/components/VList/VListItemSubtitle.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VListItemSubtitle = createSimpleFunctional('v-list-item-subtitle')
+
+export type VListItemSubtitle = InstanceType<typeof VListItemSubtitle>
diff --git a/packages/vuetify/src/components/VList/VListItemTitle.ts b/packages/vuetify/src/components/VList/VListItemTitle.ts
index 9bb5ad47fb2..6da82dbcd47 100644
--- a/packages/vuetify/src/components/VList/VListItemTitle.ts
+++ b/packages/vuetify/src/components/VList/VListItemTitle.ts
@@ -1,3 +1,5 @@
import { createSimpleFunctional } from '@/util'
export const VListItemTitle = createSimpleFunctional('v-list-item-title')
+
+export type VListItemTitle = InstanceType<typeof VListItemTitle>
diff --git a/packages/vuetify/src/components/VList/VListSubheader.tsx b/packages/vuetify/src/components/VList/VListSubheader.tsx
index 69525c9e2f3..c6c982a56db 100644
--- a/packages/vuetify/src/components/VList/VListSubheader.tsx
+++ b/packages/vuetify/src/components/VList/VListSubheader.tsx
@@ -48,3 +48,5 @@ export const VListSubheader = defineComponent({
return {}
},
})
+
+export type VListSubheader = InstanceType<typeof VListSubheader>
diff --git a/packages/vuetify/src/components/VLocaleProvider/VLocaleProvider.tsx b/packages/vuetify/src/components/VLocaleProvider/VLocaleProvider.tsx
index 655a7e23276..d2355ef3892 100644
--- a/packages/vuetify/src/components/VLocaleProvider/VLocaleProvider.tsx
+++ b/packages/vuetify/src/components/VLocaleProvider/VLocaleProvider.tsx
@@ -37,3 +37,5 @@ export const VLocaleProvider = defineComponent({
return {}
},
})
+
+export type VLocaleProvider = InstanceType<typeof VLocaleProvider>
diff --git a/packages/vuetify/src/components/VMain/VMain.tsx b/packages/vuetify/src/components/VMain/VMain.tsx
index 4f4c0af82a2..816dcf4258f 100644
--- a/packages/vuetify/src/components/VMain/VMain.tsx
+++ b/packages/vuetify/src/components/VMain/VMain.tsx
@@ -47,3 +47,5 @@ export const VMain = defineComponent({
return {}
},
})
+
+export type VMain = InstanceType<typeof VMain>
diff --git a/packages/vuetify/src/components/VMessages/VMessages.tsx b/packages/vuetify/src/components/VMessages/VMessages.tsx
index c69b75d59d6..037c5fe97ae 100644
--- a/packages/vuetify/src/components/VMessages/VMessages.tsx
+++ b/packages/vuetify/src/components/VMessages/VMessages.tsx
@@ -65,3 +65,5 @@ export const VMessages = defineComponent({
return {}
},
})
+
+export type VMessages = InstanceType<typeof VMessages>
diff --git a/packages/vuetify/src/components/VNoSsr/VNoSsr.tsx b/packages/vuetify/src/components/VNoSsr/VNoSsr.tsx
index f89a8dc4e75..a0a752664fb 100644
--- a/packages/vuetify/src/components/VNoSsr/VNoSsr.tsx
+++ b/packages/vuetify/src/components/VNoSsr/VNoSsr.tsx
@@ -16,3 +16,5 @@ export const VNoSsr = defineComponent({
return () => show.value && slots.default?.()
},
})
+
+export type VNoSsr = InstanceType<typeof VNoSsr>
diff --git a/packages/vuetify/src/components/VOverlay/locationStrategies.ts b/packages/vuetify/src/components/VOverlay/locationStrategies.ts
index 218a97b9642..929c6f85164 100644
--- a/packages/vuetify/src/components/VOverlay/locationStrategies.ts
+++ b/packages/vuetify/src/components/VOverlay/locationStrategies.ts
@@ -39,7 +39,7 @@ export interface StrategyProps {
locationStrategy: keyof typeof locationStrategies | (
(
data: LocationStrategyData,
- props: StrategyProps,
+ props: Omit<StrategyProps, 'locationStrategy'>,
contentStyles: Ref<Record<string, string>>
) => undefined | { updateLocation: (e: Event) => void }
)
diff --git a/packages/vuetify/src/components/VOverlay/scrollStrategies.ts b/packages/vuetify/src/components/VOverlay/scrollStrategies.ts
index 600cf97a87b..7021bdb5d85 100644
--- a/packages/vuetify/src/components/VOverlay/scrollStrategies.ts
+++ b/packages/vuetify/src/components/VOverlay/scrollStrategies.ts
@@ -22,7 +22,7 @@ const scrollStrategies = {
}
export interface StrategyProps {
- scrollStrategy: keyof typeof scrollStrategies | ((data: ScrollStrategyData, props?: StrategyProps) => void)
+ scrollStrategy: keyof typeof scrollStrategies | ((data: ScrollStrategyData, props?: Omit<StrategyProps, 'scrollStrategy'>) => void)
contained: boolean | undefined
}
diff --git a/packages/vuetify/src/components/VProgressCircular/VProgressCircular.tsx b/packages/vuetify/src/components/VProgressCircular/VProgressCircular.tsx
index 4f6eda7b459..4bc76e62635 100644
--- a/packages/vuetify/src/components/VProgressCircular/VProgressCircular.tsx
+++ b/packages/vuetify/src/components/VProgressCircular/VProgressCircular.tsx
@@ -141,3 +141,5 @@ export const VProgressCircular = defineComponent({
return {}
},
})
+
+export type VProgressCircular = InstanceType<typeof VProgressCircular>
diff --git a/packages/vuetify/src/components/VProgressLinear/VProgressLinear.tsx b/packages/vuetify/src/components/VProgressLinear/VProgressLinear.tsx
index 5cc11b1d715..89a25220c81 100644
--- a/packages/vuetify/src/components/VProgressLinear/VProgressLinear.tsx
+++ b/packages/vuetify/src/components/VProgressLinear/VProgressLinear.tsx
@@ -186,3 +186,5 @@ export const VProgressLinear = defineComponent({
return {}
},
})
+
+export type VProgressLinear = InstanceType<typeof VProgressLinear>
diff --git a/packages/vuetify/src/components/VRadioGroup/VRadioGroup.tsx b/packages/vuetify/src/components/VRadioGroup/VRadioGroup.tsx
index e0764b2470b..75d0966ba11 100644
--- a/packages/vuetify/src/components/VRadioGroup/VRadioGroup.tsx
+++ b/packages/vuetify/src/components/VRadioGroup/VRadioGroup.tsx
@@ -115,3 +115,5 @@ export const VRadioGroup = defineComponent({
return {}
},
})
+
+export type VRadioGroup = InstanceType<typeof VRadioGroup>
diff --git a/packages/vuetify/src/components/VResponsive/VResponsive.tsx b/packages/vuetify/src/components/VResponsive/VResponsive.tsx
index 8e0bfdaba23..7ee0c55ea72 100644
--- a/packages/vuetify/src/components/VResponsive/VResponsive.tsx
+++ b/packages/vuetify/src/components/VResponsive/VResponsive.tsx
@@ -49,3 +49,5 @@ export const VResponsive = defineComponent({
return {}
},
})
+
+export type VResponsive = InstanceType<typeof VResponsive>
diff --git a/packages/vuetify/src/components/VSheet/VSheet.tsx b/packages/vuetify/src/components/VSheet/VSheet.tsx
index 1a8d81cf124..153f73b9520 100644
--- a/packages/vuetify/src/components/VSheet/VSheet.tsx
+++ b/packages/vuetify/src/components/VSheet/VSheet.tsx
@@ -63,3 +63,5 @@ export const VSheet = defineComponent({
)
},
})
+
+export type VSheet = InstanceType<typeof VSheet>
diff --git a/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx b/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx
index 9d446ad2e6d..5d6d285d9a5 100644
--- a/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx
+++ b/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx
@@ -29,3 +29,5 @@ export const VSlideGroupItem = defineComponent({
})
},
})
+
+export type VSlideGroupItem = InstanceType<typeof VSlideGroupItem>
diff --git a/packages/vuetify/src/components/VSystemBar/VSystemBar.tsx b/packages/vuetify/src/components/VSystemBar/VSystemBar.tsx
index 8e798500d7a..6aff9e2c363 100644
--- a/packages/vuetify/src/components/VSystemBar/VSystemBar.tsx
+++ b/packages/vuetify/src/components/VSystemBar/VSystemBar.tsx
@@ -65,3 +65,5 @@ export const VSystemBar = defineComponent({
return {}
},
})
+
+export type VSystemBar = InstanceType<typeof VSystemBar>
diff --git a/packages/vuetify/src/components/VTable/VTable.sass b/packages/vuetify/src/components/VTable/VTable.sass
index ddb1fc3cb48..fb1d1aeb46a 100644
--- a/packages/vuetify/src/components/VTable/VTable.sass
+++ b/packages/vuetify/src/components/VTable/VTable.sass
@@ -25,15 +25,20 @@
th
border-bottom: $table-border
- &:hover
- background: $table-hover-color
-
> tfoot
> tr
td,
th
border-top: $table-border
+
+ &.v-table--hover
+ > table
+ > tbody
+ > tr
+ &:hover
+ background: $table-hover-color
+
&.v-table--fixed-header
thead th
background: $table-background
diff --git a/packages/vuetify/src/components/VTable/VTable.tsx b/packages/vuetify/src/components/VTable/VTable.tsx
index 59541f25da0..3b3a010c8db 100644
--- a/packages/vuetify/src/components/VTable/VTable.tsx
+++ b/packages/vuetify/src/components/VTable/VTable.tsx
@@ -16,6 +16,7 @@ export const VTable = defineComponent({
fixedHeader: Boolean,
fixedFooter: Boolean,
height: [Number, String],
+ hover: Boolean,
...makeDensityProps(),
...makeTagProps(),
@@ -36,6 +37,7 @@ export const VTable = defineComponent({
'v-table--fixed-footer': props.fixedFooter,
'v-table--has-top': !!slots.top,
'v-table--has-bottom': !!slots.bottom,
+ 'v-table--hover': props.hover,
},
themeClasses.value,
densityClasses.value,
diff --git a/packages/vuetify/src/components/VThemeProvider/VThemeProvider.tsx b/packages/vuetify/src/components/VThemeProvider/VThemeProvider.tsx
index 5990ecfe348..accce969cf2 100644
--- a/packages/vuetify/src/components/VThemeProvider/VThemeProvider.tsx
+++ b/packages/vuetify/src/components/VThemeProvider/VThemeProvider.tsx
@@ -32,3 +32,5 @@ export const VThemeProvider = defineComponent({
}
},
})
+
+export type VThemeProvider = InstanceType<typeof VThemeProvider>
diff --git a/packages/vuetify/src/components/VTimeline/VTimeline.tsx b/packages/vuetify/src/components/VTimeline/VTimeline.tsx
index 77a83505be8..ce1a8754101 100644
--- a/packages/vuetify/src/components/VTimeline/VTimeline.tsx
+++ b/packages/vuetify/src/components/VTimeline/VTimeline.tsx
@@ -120,3 +120,5 @@ export const VTimeline = defineComponent({
return {}
},
})
+
+export type VTimeline = InstanceType<typeof VTimeline>
diff --git a/packages/vuetify/src/components/VTimeline/VTimelineItem.tsx b/packages/vuetify/src/components/VTimeline/VTimelineItem.tsx
index e1c21fddb3c..84ef4d4ef81 100644
--- a/packages/vuetify/src/components/VTimeline/VTimelineItem.tsx
+++ b/packages/vuetify/src/components/VTimeline/VTimelineItem.tsx
@@ -93,3 +93,5 @@ export const VTimelineItem = defineComponent({
return {}
},
})
+
+export type VTimelineItem = InstanceType<typeof VTimelineItem>
diff --git a/packages/vuetify/src/components/VToolbar/VToolbar.tsx b/packages/vuetify/src/components/VToolbar/VToolbar.tsx
index f6837fef801..8f6644abe9d 100644
--- a/packages/vuetify/src/components/VToolbar/VToolbar.tsx
+++ b/packages/vuetify/src/components/VToolbar/VToolbar.tsx
@@ -24,10 +24,10 @@ import { convertToUnit, genericComponent, pick, propsFactory, useRender } from '
import type { ExtractPropTypes, PropType } from 'vue'
import type { MakeSlots } from '@/util'
-export type Density = typeof allowedDensities[number]
-
const allowedDensities = [null, 'prominent', 'default', 'comfortable', 'compact'] as const
+export type Density = null | 'prominent' | 'default' | 'comfortable' | 'compact'
+
export const makeVToolbarProps = propsFactory({
absolute: Boolean,
collapse: Boolean,
diff --git a/packages/vuetify/src/components/VValidation/VValidation.tsx b/packages/vuetify/src/components/VValidation/VValidation.tsx
index 355db9ddeea..4d33070d9be 100644
--- a/packages/vuetify/src/components/VValidation/VValidation.tsx
+++ b/packages/vuetify/src/components/VValidation/VValidation.tsx
@@ -21,3 +21,5 @@ export const VValidation = defineComponent({
return () => slots.default?.(validation)
},
})
+
+export type VValidation = InstanceType<typeof VValidation>
diff --git a/packages/vuetify/src/components/transitions/dialog-transition.tsx b/packages/vuetify/src/components/transitions/dialog-transition.tsx
index c1e285cd8d9..e8fafe5a6ca 100644
--- a/packages/vuetify/src/components/transitions/dialog-transition.tsx
+++ b/packages/vuetify/src/components/transitions/dialog-transition.tsx
@@ -145,3 +145,5 @@ function getDimensions (target: HTMLElement, el: HTMLElement) {
speed,
}
}
+
+export type VDialogTransition = InstanceType<typeof VDialogTransition>
diff --git a/packages/vuetify/src/components/transitions/index.ts b/packages/vuetify/src/components/transitions/index.ts
index ef0c91ca116..3d045f9155b 100644
--- a/packages/vuetify/src/components/transitions/index.ts
+++ b/packages/vuetify/src/components/transitions/index.ts
@@ -26,4 +26,20 @@ export const VSlideYReverseTransition = createCssTransition('slide-y-reverse-tra
export const VExpandTransition = createJavascriptTransition('expand-transition', ExpandTransitionGenerator())
export const VExpandXTransition = createJavascriptTransition('expand-x-transition', ExpandTransitionGenerator('', true))
-export { VDialogTransition } from './dialog-transition'
+export * from './dialog-transition'
+
+export type VFabTransition = InstanceType<typeof VFabTransition>
+export type VDialogBottomTransition = InstanceType<typeof VDialogBottomTransition>
+export type VDialogTopTransition = InstanceType<typeof VDialogTopTransition>
+export type VFadeTransition = InstanceType<typeof VFadeTransition>
+export type VScaleTransition = InstanceType<typeof VScaleTransition>
+export type VScrollXTransition = InstanceType<typeof VScrollXTransition>
+export type VScrollXReverseTransition = InstanceType<typeof VScrollXReverseTransition>
+export type VScrollYTransition = InstanceType<typeof VScrollYTransition>
+export type VScrollYReverseTransition = InstanceType<typeof VScrollYReverseTransition>
+export type VSlideXTransition = InstanceType<typeof VSlideXTransition>
+export type VSlideXReverseTransition = InstanceType<typeof VSlideXReverseTransition>
+export type VSlideYTransition = InstanceType<typeof VSlideYTransition>
+export type VSlideYReverseTransition = InstanceType<typeof VSlideYReverseTransition>
+export type VExpandTransition = InstanceType<typeof VExpandTransition>
+export type VExpandXTransition = InstanceType<typeof VExpandXTransition>
diff --git a/packages/vuetify/src/composables/density.ts b/packages/vuetify/src/composables/density.ts
index 76ade7ea409..62dc33acfdc 100644
--- a/packages/vuetify/src/composables/density.ts
+++ b/packages/vuetify/src/composables/density.ts
@@ -7,7 +7,9 @@ import type { PropType } from 'vue'
const allowedDensities = [null, 'default', 'comfortable', 'compact'] as const
-export type Density = typeof allowedDensities[number]
+// typeof allowedDensities[number] evalutes to any
+// when generating api types for whatever reason.
+export type Density = null | 'default' | 'comfortable' | 'compact'
export interface DensityProps {
density?: Density
diff --git a/packages/vuetify/src/composables/form.ts b/packages/vuetify/src/composables/form.ts
index 8d705893bc9..682d9b6962c 100644
--- a/packages/vuetify/src/composables/form.ts
+++ b/packages/vuetify/src/composables/form.ts
@@ -62,7 +62,7 @@ export const makeFormProps = propsFactory({
type: Boolean as PropType<boolean | null>,
default: null,
},
-})
+}, 'form')
export function createForm (props: FormProps) {
const model = useProxiedModel(props, 'modelValue')
diff --git a/packages/vuetify/src/composables/items.ts b/packages/vuetify/src/composables/items.ts
index ee08030727a..79f71d2608d 100644
--- a/packages/vuetify/src/composables/items.ts
+++ b/packages/vuetify/src/composables/items.ts
@@ -14,7 +14,7 @@ export interface InternalItem<T = any> {
title: string
value: any
}
- children?: InternalItem[]
+ children?: InternalItem<T>[]
raw: T
}
diff --git a/packages/vuetify/src/composables/validation.ts b/packages/vuetify/src/composables/validation.ts
index f1d14451a72..07e02b83b04 100644
--- a/packages/vuetify/src/composables/validation.ts
+++ b/packages/vuetify/src/composables/validation.ts
@@ -51,7 +51,7 @@ export const makeValidationProps = propsFactory({
},
modelValue: null,
validationValue: null,
-})
+}, 'validation')
export function useValidation (
props: ValidationProps,
diff --git a/packages/vuetify/src/directives/intersect/index.ts b/packages/vuetify/src/directives/intersect/index.ts
index fae93e93f35..801f41e6d66 100644
--- a/packages/vuetify/src/directives/intersect/index.ts
+++ b/packages/vuetify/src/directives/intersect/index.ts
@@ -4,7 +4,6 @@ import { SUPPORTS_INTERSECTION } from '@/util'
// Types
import type {
DirectiveBinding,
- ObjectDirective,
} from 'vue'
type ObserveHandler = (
@@ -72,7 +71,7 @@ function unmounted (el: HTMLElement, binding: ObserveDirectiveBinding) {
delete el._observe![binding.instance!.$.uid]
}
-export const Intersect: ObjectDirective<HTMLElement> = {
+export const Intersect = {
mounted,
unmounted,
}
diff --git a/packages/vuetify/src/directives/mutate/index.ts b/packages/vuetify/src/directives/mutate/index.ts
index 6acc7b8e6a7..b7241aacc60 100644
--- a/packages/vuetify/src/directives/mutate/index.ts
+++ b/packages/vuetify/src/directives/mutate/index.ts
@@ -1,5 +1,5 @@
// Types
-import type { DirectiveBinding, ObjectDirective } from 'vue'
+import type { DirectiveBinding } from 'vue'
import type { MutationOptions } from '@/composables/mutationObserver'
export interface MutationDirectiveBinding extends Omit<DirectiveBinding, 'modifiers' | 'value'> {
@@ -49,7 +49,7 @@ function unmounted (el: HTMLElement, binding: MutationDirectiveBinding) {
delete el._mutate[binding.instance!.$.uid]
}
-export const Mutate: ObjectDirective<HTMLElement> = {
+export const Mutate = {
mounted,
unmounted,
}
diff --git a/packages/vuetify/src/directives/ripple/index.ts b/packages/vuetify/src/directives/ripple/index.ts
index f596e41ec75..b7337090a33 100644
--- a/packages/vuetify/src/directives/ripple/index.ts
+++ b/packages/vuetify/src/directives/ripple/index.ts
@@ -7,7 +7,6 @@ import { isObject, keyCodes } from '@/util'
// Types
import type {
DirectiveBinding,
- ObjectDirective,
} from 'vue'
const stopSymbol = Symbol('rippleStop')
@@ -333,7 +332,7 @@ function removeListeners (el: HTMLElement) {
el.removeEventListener('blur', focusRippleHide)
}
-function mounted (el: HTMLElement, binding: DirectiveBinding) {
+function mounted (el: HTMLElement, binding: RippleDirectiveBinding) {
updateRipple(el, binding, false)
}
@@ -342,7 +341,7 @@ function unmounted (el: HTMLElement) {
removeListeners(el)
}
-function updated (el: HTMLElement, binding: DirectiveBinding) {
+function updated (el: HTMLElement, binding: RippleDirectiveBinding) {
if (binding.value === binding.oldValue) {
return
}
@@ -351,7 +350,7 @@ function updated (el: HTMLElement, binding: DirectiveBinding) {
updateRipple(el, binding, wasEnabled)
}
-export const Ripple: ObjectDirective = {
+export const Ripple = {
mounted,
unmounted,
updated,
diff --git a/packages/vuetify/src/directives/touch/index.ts b/packages/vuetify/src/directives/touch/index.ts
index a7d1e29ecab..935fb3951d1 100644
--- a/packages/vuetify/src/directives/touch/index.ts
+++ b/packages/vuetify/src/directives/touch/index.ts
@@ -1,23 +1,22 @@
// Types
import type {
DirectiveBinding,
- ObjectDirective,
} from 'vue'
// Utilities
import { keys } from '@/util'
export interface TouchHandlers {
- start?: (wrapperEvent: { originalEvent: TouchEvent } & TouchWrapper) => void
- end?: (wrapperEvent: { originalEvent: TouchEvent } & TouchWrapper) => void
- move?: (wrapperEvent: { originalEvent: TouchEvent } & TouchWrapper) => void
- left?: (wrapper: TouchWrapper) => void
- right?: (wrapper: TouchWrapper) => void
- up?: (wrapper: TouchWrapper) => void
- down?: (wrapper: TouchWrapper) => void
+ start?: (wrapperEvent: { originalEvent: TouchEvent } & TouchData) => void
+ end?: (wrapperEvent: { originalEvent: TouchEvent } & TouchData) => void
+ move?: (wrapperEvent: { originalEvent: TouchEvent } & TouchData) => void
+ left?: (wrapper: TouchData) => void
+ right?: (wrapper: TouchData) => void
+ up?: (wrapper: TouchData) => void
+ down?: (wrapper: TouchData) => void
}
-export interface TouchWrapper extends TouchHandlers {
+export interface TouchData {
touchstartX: number
touchstartY: number
touchmoveX: number
@@ -28,6 +27,8 @@ export interface TouchWrapper extends TouchHandlers {
offsetY: number
}
+export type TouchWrapper = TouchHandlers & TouchData
+
export interface TouchValue extends TouchHandlers {
parent?: boolean
options?: AddEventListenerOptions
@@ -146,7 +147,7 @@ function unmounted (el: HTMLElement, binding: TouchDirectiveBinding) {
delete target._touchHandlers[uid]
}
-export const Touch: ObjectDirective = {
+export const Touch = {
mounted,
unmounted,
}
diff --git a/packages/vuetify/src/styles/settings/_utilities.scss b/packages/vuetify/src/styles/settings/_utilities.scss
index fd95d6bafb7..e27cd92c10c 100644
--- a/packages/vuetify/src/styles/settings/_utilities.scss
+++ b/packages/vuetify/src/styles/settings/_utilities.scss
@@ -488,6 +488,13 @@ $utilities: () !default;
class: font,
values: italic
),
+ "text-mono": (
+ property: font-family,
+ class: text,
+ values: (
+ mono: monospace
+ )
+ ),
// Position
"position": (
property: position,
diff --git a/yarn.lock b/yarn.lock
index 5b74e61a602..953e9d73225 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,6 +23,11 @@
jsonpointer "^5.0.0"
leven "^3.1.0"
+"@assemblyscript/loader@^0.10.1":
+ version "0.10.1"
+ resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06"
+ integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
+
"@babel/cli@^7.17.10":
version "7.17.10"
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.17.10.tgz#5ea0bf6298bb78f3b59c7c06954f9bd1c79d5943"
@@ -1020,6 +1025,13 @@
exec-sh "^0.3.2"
minimist "^1.2.0"
+"@cspotcode/source-map-support@^0.8.0":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+ integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+ dependencies:
+ "@jridgewell/trace-mapping" "0.3.9"
+
"@cypress/request@^2.88.10":
version "2.88.10"
resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
@@ -1616,6 +1628,14 @@
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+"@jridgewell/[email protected]":
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+ integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.0.3"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
version "0.3.13"
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
@@ -2799,6 +2819,36 @@
resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
+"@ts-morph/common@~0.17.0":
+ version "0.17.0"
+ resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.17.0.tgz#de0d405df10857907469fef8d9363893b4163fd1"
+ integrity sha512-RMSSvSfs9kb0VzkvQ2NWobwnj7TxCA9vI/IjR9bDHqgAyVbu2T0DN4wiKVqomyDWqO7dPr/tErSfq7urQ1Q37g==
+ dependencies:
+ fast-glob "^3.2.11"
+ minimatch "^5.1.0"
+ mkdirp "^1.0.4"
+ path-browserify "^1.0.1"
+
+"@tsconfig/node10@^1.0.7":
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+ integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+ integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+ integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
version "7.1.17"
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.17.tgz#f50ac9d20d64153b510578d84f9643f9a3afbe64"
@@ -3493,7 +3543,7 @@ acorn-walk@^7.1.1:
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-acorn-walk@^8.2.0:
+acorn-walk@^8.1.1, acorn-walk@^8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -3670,6 +3720,11 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.6"
+arg@^4.1.0:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+ integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -4037,7 +4092,7 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-base64-js@^1.3.1:
+base64-js@^1.2.0, base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -4573,6 +4628,11 @@ co@^4.6.0:
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+code-block-writer@^11.0.3:
+ version "11.0.3"
+ resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz#9eec2993edfb79bfae845fbc093758c0a0b73b76"
+ integrity sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==
+
code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -4665,6 +4725,11 @@ commander@^7.2.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+commander@^9.0.0:
+ version "9.4.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c"
+ integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
+
commander@~9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-9.0.0.tgz#86d58f24ee98126568936bd1d3574e0308a99a40"
@@ -5063,6 +5128,11 @@ create-jest-runner@^0.6.0:
jest-worker "^25.1.0"
throat "^5.0.0"
+create-require@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+ integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
cross-env@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -5549,6 +5619,11 @@ diff-sequences@^26.6.2:
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
+diff@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+ integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
diffable-html@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/diffable-html/-/diffable-html-4.1.0.tgz#e7a2d1de187c4e23a59751b4e4c17483a058c696"
@@ -6345,6 +6420,11 @@ esutils@^2.0.2:
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+eventemitter-asyncresource@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz#734ff2e44bf448e627f7748f905d6bdd57bdb65b"
+ integrity sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==
+
eventemitter2@^6.4.3:
version "6.4.4"
resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b"
@@ -7130,6 +7210,18 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl
once "^1.3.0"
path-is-absolute "^1.0.0"
+glob@^7.2.0:
+ version "7.2.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+ integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.1.1"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
global-dirs@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
@@ -7325,6 +7417,20 @@ has@^1.0.3:
dependencies:
function-bind "^1.1.1"
+hdr-histogram-js@^2.0.1:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz#0b860534655722b6e3f3e7dca7b78867cf43dcb5"
+ integrity sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==
+ dependencies:
+ "@assemblyscript/loader" "^0.10.1"
+ base64-js "^1.2.0"
+ pako "^1.0.3"
+
+hdr-histogram-percentiles-obj@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c"
+ integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==
+
he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -9378,6 +9484,11 @@ make-dir@^3.0.0, make-dir@^3.0.2:
dependencies:
semver "^6.0.0"
+make-error@^1.1.1:
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+ integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
make-fetch-happen@^5.0.0:
version "5.0.2"
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
@@ -9656,7 +9767,7 @@ min-indent@^1.0.0:
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
-minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -9670,6 +9781,13 @@ minimatch@^5.0.1:
dependencies:
brace-expansion "^2.0.1"
+minimatch@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+ integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+ dependencies:
+ brace-expansion "^2.0.1"
+
minimatch@~3.0.5:
version "3.0.8"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
@@ -9884,6 +10002,14 @@ neo-async@^2.6.0:
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+nice-napi@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b"
+ integrity sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==
+ dependencies:
+ node-addon-api "^3.0.0"
+ node-gyp-build "^4.2.2"
+
nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -9896,6 +10022,11 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
+node-addon-api@^3.0.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+ integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
node-environment-flags@^1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
@@ -9920,6 +10051,11 @@ node-fetch@^2.5.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.x.x:
dependencies:
whatwg-url "^5.0.0"
+node-gyp-build@^4.2.2:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
+ integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
+
node-gyp@^5.0.2:
version "5.1.0"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz#8e31260a7af4a2e2f994b0673d4e0b3866156332"
@@ -10446,6 +10582,11 @@ p-waterfall@^1.0.0:
dependencies:
p-reduce "^1.0.0"
+pako@^1.0.3:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
parallel-transform@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
@@ -10571,6 +10712,11 @@ patch-package@^6.4.7:
slash "^2.0.0"
tmp "^0.0.33"
+path-browserify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+ integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
path-dirname@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -10704,6 +10850,17 @@ pirates@^4.0.1, pirates@^4.0.5:
resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+piscina@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.2.0.tgz#f5a1dde0c05567775690cccefe59d9223924d154"
+ integrity sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==
+ dependencies:
+ eventemitter-asyncresource "^1.0.0"
+ hdr-histogram-js "^2.0.1"
+ hdr-histogram-percentiles-obj "^3.0.0"
+ optionalDependencies:
+ nice-napi "^1.0.2"
+
pkg-dir@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -10976,6 +11133,11 @@ prettier@^2.4.1:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
+prettier@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+ integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+
pretty-bytes@^5.3.0, pretty-bytes@^5.6.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -11773,6 +11935,11 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"
+safe-stable-stringify@^2.3.1:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.0.tgz#95fadb1bcf8057a1363e11052122f5da36a69215"
+ integrity sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA==
+
"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -12847,6 +13014,45 @@ trim-off-newlines@^1.0.0:
resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
+ts-json-schema-generator@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ts-json-schema-generator/-/ts-json-schema-generator-1.0.0.tgz#33e4affd1665268899eb57afbad397bc6a58cc53"
+ integrity sha512-F5VofsyMhNSXKII32NDS8/Ur8o2K3Sh5i/U2ke3UgCKf26ybgm2cZeT2x7VJPl1trML/9QLzz/82l0mvzmb3Vw==
+ dependencies:
+ "@types/json-schema" "^7.0.9"
+ commander "^9.0.0"
+ glob "^7.2.0"
+ json5 "^2.2.0"
+ safe-stable-stringify "^2.3.1"
+ typescript "~4.6.2"
+
+ts-morph@^16.0.0:
+ version "16.0.0"
+ resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-16.0.0.tgz#35caca7c286dd70e09e5f72af47536bf3b6a27af"
+ integrity sha512-jGNF0GVpFj0orFw55LTsQxVYEUOCWBAbR5Ls7fTYE5pQsbW18ssTb/6UXx/GYAEjS+DQTp8VoTw0vqYMiaaQuw==
+ dependencies:
+ "@ts-morph/common" "~0.17.0"
+ code-block-writer "^11.0.3"
+
+ts-node@^10.9.1:
+ version "10.9.1"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+ integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ dependencies:
+ "@cspotcode/source-map-support" "^0.8.0"
+ "@tsconfig/node10" "^1.0.7"
+ "@tsconfig/node12" "^1.0.7"
+ "@tsconfig/node14" "^1.0.0"
+ "@tsconfig/node16" "^1.0.2"
+ acorn "^8.4.1"
+ acorn-walk "^8.1.1"
+ arg "^4.1.0"
+ create-require "^1.1.0"
+ diff "^4.0.1"
+ make-error "^1.1.1"
+ v8-compile-cache-lib "^3.0.1"
+ yn "3.1.1"
+
tsconfig-paths@^3.14.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -12957,6 +13163,11 @@ typescript@^4.7.2:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
+typescript@~4.6.2:
+ version "4.6.4"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
+ integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+
uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -13185,6 +13396,11 @@ uuid@^8.3.0, uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+v8-compile-cache-lib@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+ integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
v8-compile-cache@^2.0.3:
version "2.3.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -14084,3 +14300,8 @@ yauzl@^2.10.0:
dependencies:
buffer-crc32 "~0.2.3"
fd-slicer "~1.1.0"
+
[email protected]:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+ integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
|
25d948cf19d440c536b478190026f0b7f194524c
|
2023-02-11 22:18:10
|
Kael
|
docs: restore old service worker update listener
| false
|
restore old service worker update listener
|
docs
|
diff --git a/packages/docs/src/service-worker.js b/packages/docs/src/service-worker.js
index 9a9df0128f1..4596ef7aa66 100644
--- a/packages/docs/src/service-worker.js
+++ b/packages/docs/src/service-worker.js
@@ -49,7 +49,7 @@ setCatchHandler(async ({ url, request }) => {
let previousManifest
self.addEventListener('message', async event => {
- if (event.data?.type === 'SKIP_WAITING') {
+ if (event.data === 'sw:update' || event.data?.type === 'SKIP_WAITING') {
console.log('[SW] Skip waiting')
self.skipWaiting()
} else if (event.data?.type === 'GET_MANIFEST') {
|
c2cdae46762ec1ff6b2b59b8586382db29f327ec
|
2020-09-16 19:00:58
|
Kael
|
docs: add redirects for routes changed in e4d645ab
| false
|
add redirects for routes changed in e4d645ab
|
docs
|
diff --git a/packages/docs/src/router/301.json b/packages/docs/src/router/301.json
index c5097c9d348..2fdde7bd0e8 100644
--- a/packages/docs/src/router/301.json
+++ b/packages/docs/src/router/301.json
@@ -94,5 +94,11 @@
"directives/scrolling": "/directives/scroll",
"directives/touch-support": "/directives/touch",
"customization/accessibility": "/getting-started/accessibility",
- "customization/rtl": "/customization/bidirectionality"
+ "customization/rtl": "/customization/bidirectionality",
+ "introduction/why-vuetify": "/overview/why-vuetify",
+ "introduction/frequently-asked-questions": "/overview/frequently-asked-questions",
+ "introduction/meet-the-team": "/overview/meet-the-team",
+ "introduction/sponsors-and-backers": "/overview/sponsors-and-backers",
+ "introduction/roadmap": "/overview/roadmap",
+ "introduction/long-term-support": "/overview/long-term-support"
}
|
261451ab219bc8f22577d11c4411e5394d45b7b6
|
2022-03-19 10:23:51
|
John Leider
|
docs: update sponsors
| false
|
update sponsors
|
docs
|
diff --git a/packages/docs/src/components/app/drawer/Drawer.vue b/packages/docs/src/components/app/drawer/Drawer.vue
index 45148a5513f..9106e168f12 100644
--- a/packages/docs/src/components/app/drawer/Drawer.vue
+++ b/packages/docs/src/components/app/drawer/Drawer.vue
@@ -7,6 +7,8 @@
<app-drawer-prepend />
</template>
+ <v-divider />
+
<app-list :items="items" nav />
</v-navigation-drawer>
</template>
diff --git a/packages/docs/src/components/app/drawer/DrawerPrepend.vue b/packages/docs/src/components/app/drawer/DrawerPrepend.vue
index 4e688cdd593..8ae508fd6e7 100644
--- a/packages/docs/src/components/app/drawer/DrawerPrepend.vue
+++ b/packages/docs/src/components/app/drawer/DrawerPrepend.vue
@@ -1,7 +1,7 @@
<template>
- <div class="pt-3 px-2">
+ <div class="pt-2 px-2">
<app-caption
- class="ml-2 mb-2"
+ class="ml-2"
path="premiere-sponsors"
/>
@@ -9,8 +9,8 @@
v-for="sponsor of sponsors"
:key="sponsor.slug"
:sponsor="sponsor"
- width="164"
- max-height="48"
+ class="mb-n2"
+ width="146"
/>
</div>
</template>
@@ -34,7 +34,16 @@
const store = useSponsorsStore()
return {
- sponsors: computed(() => store.sponsors.filter(sponsor => sponsor.metadata.tier === 0)),
+ sponsors: computed(() => {
+ return store.sponsors
+ .filter(sponsor => sponsor.metadata.tier <= 0)
+ .sort((a, b) => {
+ const aTier = a.metadata.tier
+ const bTier = b.metadata.tier
+
+ return aTier === bTier ? 0 : aTier > bTier ? 1 : -1
+ })
+ }),
}
},
})
diff --git a/packages/docs/src/components/sponsor/Sponsors.vue b/packages/docs/src/components/sponsor/Sponsors.vue
new file mode 100644
index 00000000000..027837f754d
--- /dev/null
+++ b/packages/docs/src/components/sponsor/Sponsors.vue
@@ -0,0 +1,58 @@
+<template>
+ <v-row
+ v-if="sponsors.length"
+ align="center"
+ class="v-sponsors"
+ justify="start"
+ >
+ <v-col
+ v-for="sponsor in sponsors"
+ :key="sponsor.slug"
+ cols="auto"
+ >
+ <sponsor-card
+ :comfortable="Number() === 2"
+ :compact="Number(tier) > 2"
+ :sponsor="sponsor"
+ v-bind="$attrs"
+ />
+ </v-col>
+ </v-row>
+</template>
+
+<script lang="ts">
+ // Utilities
+ import { computed, defineComponent, onBeforeMount } from 'vue'
+ import { useSponsorsStore } from '../../store/sponsors'
+
+ import SponsorCard from '@/components/sponsor/Card.vue'
+
+ export default defineComponent({
+ name: 'Sponsors',
+
+ components: {
+ SponsorCard,
+ },
+
+ props: {
+ tier: {
+ type: [Number, String],
+ required: true,
+ },
+ },
+
+ setup (props) {
+ const sponsorStore = useSponsorsStore()
+
+ onBeforeMount(async () => sponsorStore.load())
+
+ const sponsors = computed(() => {
+ return sponsorStore.byTier[props.tier]
+ })
+
+ return {
+ sponsors,
+ }
+ },
+ })
+</script>
diff --git a/packages/docs/src/pages/en/about/sponsors-and-backers.md b/packages/docs/src/pages/en/about/sponsors-and-backers.md
index c7f7b8b2052..5980fa4f039 100644
--- a/packages/docs/src/pages/en/about/sponsors-and-backers.md
+++ b/packages/docs/src/pages/en/about/sponsors-and-backers.md
@@ -30,31 +30,35 @@ We thank all of our project sponsors for their continued support of Vuetify. If
### Special
-<page-component path="home/Sponsors" tier="0" />
+<page-component path="sponsor/Sponsors" tier="-1" />
-### Diamond
+### Palladium
-<page-component path="home/Sponsors" tier="1" />
+<page-component path="sponsor/Sponsors" tier="0" />
+
+<!-- ### Diamond
+
+<page-component path="sponsor/Sponsors" tier="1" /> -->
### Platinum
-<page-component path="home/Sponsors" tier="2" />
+<page-component path="sponsor/Sponsors" tier="2" />
### Gold
-<page-component path="home/Sponsors" tier="3" />
+<page-component path="sponsor/Sponsors" tier="3" />
### Silver
-<page-component path="home/Sponsors" tier="4" />
+<page-component path="sponsor/Sponsors" tier="4" />
### Affiliate
-<page-component path="home/Sponsors" tier="5" />
+<page-component path="sponsor/Sponsors" tier="5" />
### Service
-<page-component path="home/Sponsors" tier="6" />
+<page-component path="sponsor/Sponsors" tier="6" />
## Cursory
diff --git a/packages/docs/src/pages/en/index.md b/packages/docs/src/pages/en/index.md
index 171abca5e7a..e9774de3e8e 100644
--- a/packages/docs/src/pages/en/index.md
+++ b/packages/docs/src/pages/en/index.md
@@ -6,6 +6,7 @@ meta:
import HomeLogo from '@/components/home/Logo.vue'
import HomeActionBtns from '@/components/home/ActionBtns.vue'
import HomeSponsors from '@/components/home/Sponsors.vue'
+ import SponsorCard from '@/components/sponsor/Card.vue'
</script>
<home-logo size="300px" />
@@ -22,16 +23,22 @@ Vuetify is a Vue UI Library with beautifully handcrafted Material Components. No
<home-action-btns />
<br>
+<br>
+
+## Special Sponsor
+
+Thank you to our special sponsor:
+
+<sponsor-card height="70" slug="appeggio" />
+
<br>
<br>
<br>
-## Project Sponsors
+### Project Sponsors
The continued development and maintenance of Vuetify
<br>
is made possible by these generous sponsors:
-<br>
-
<home-sponsors />
|
e53152f610b9e1f9274079c48b0801a1cd538ea7
|
2021-11-04 19:21:25
|
Kael
|
chore(release): publish v2.5.11
| false
|
publish v2.5.11
|
chore
|
diff --git a/lerna.json b/lerna.json
index adb590700f1..48fdacce411 100644
--- a/lerna.json
+++ b/lerna.json
@@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
- "version": "2.5.10",
+ "version": "2.5.11",
"useWorkspaces": true
}
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index 0b6459a0ce7..8e0f6ecad07 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
- "version": "2.5.10",
+ "version": "2.5.11",
"private": true,
"description": "",
"main": "src/index.js",
@@ -17,7 +17,7 @@
"deepmerge": "^4.0.0",
"rimraf": "^3.0.2",
"vue": "^2.6.11",
- "vuetify": "^2.5.10"
+ "vuetify": "^2.5.11"
},
"devDependencies": {
"@babel/node": "^7.5.5",
diff --git a/packages/docs/package.json b/packages/docs/package.json
index f11a696a0ff..74181f1e99a 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.5.10",
+ "version": "2.5.11",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -30,7 +30,7 @@
"register-service-worker": "^1.7.1",
"vue-i18n": "^8.17.7",
"vue-instantsearch": "^3.4.3",
- "vuetify": "^2.5.10",
+ "vuetify": "^2.5.11",
"vuex": "^3.4.0",
"webpack-node-externals": "^2.5.1"
},
@@ -41,7 +41,7 @@
"@vue/cli-plugin-router": "~4.5.3",
"@vue/cli-plugin-vuex": "~4.5.3",
"@vue/cli-service": "~4.5.3",
- "@vuetify/api-generator": "^2.5.10",
+ "@vuetify/api-generator": "^2.5.11",
"@vuetify/vue-cli-plugin-base": "~0.3.5",
"cosmicjs": "^3.2.43",
"date-fns": "^2.14.0",
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index 018141891b0..fda54ad30c1 100644
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -1,7 +1,7 @@
{
"name": "vuetify",
"description": "Vue Material Component Framework",
- "version": "2.5.10",
+ "version": "2.5.11",
"author": {
"name": "John Leider",
"email": "[email protected]"
|
08a5e45a81d002271eb7b6733fc4502f500225d7
|
2022-04-11 19:06:09
|
Kael
|
fix(VOverlay): close on click outside if another overlay is opened
| false
|
close on click outside if another overlay is opened
|
fix
|
diff --git a/packages/vuetify/src/composables/stack.ts b/packages/vuetify/src/composables/stack.ts
index eabad4a2c8b..8f3281afd50 100644
--- a/packages/vuetify/src/composables/stack.ts
+++ b/packages/vuetify/src/composables/stack.ts
@@ -1,4 +1,4 @@
-import { computed, effectScope, onScopeDispose, ref, toRaw, watch } from 'vue'
+import { effectScope, onScopeDispose, readonly, ref, toRaw, watch, watchEffect } from 'vue'
import { getCurrentInstance } from '@/util'
// Types
@@ -25,11 +25,13 @@ export function useStack (isActive: Ref<boolean>) {
}
}, { immediate: true })
- const isTop = computed(() => {
- return toRaw(stack.value[stack.value.length - 1]) === vm
+ const isTop = ref(true)
+ watchEffect(() => {
+ const _isTop = toRaw(stack.value[stack.value.length - 1]) === vm
+ setTimeout(() => isTop.value = _isTop)
})
return {
- isTop,
+ isTop: readonly(isTop),
}
}
|
aa81899d3acf704590058632508968d6c982ed86
|
2023-12-02 00:14:16
|
John Leider
|
docs(Banner): remove app-markdown and update height
| false
|
remove app-markdown and update height
|
docs
|
diff --git a/packages/docs/src/components/app/Banner.vue b/packages/docs/src/components/app/Banner.vue
index 7eb342c17fd..994b2742f1c 100644
--- a/packages/docs/src/components/app/Banner.vue
+++ b/packages/docs/src/components/app/Banner.vue
@@ -29,8 +29,8 @@
<app-markdown :content="banner.metadata.text" />
</v-list-item-title>
- <v-list-item-subtitle v-if="banner.metadata.subtext" class="mt-n2">
- <app-markdown :content="banner.metadata.subtext" />
+ <v-list-item-subtitle v-if="banner.metadata.subtext">
+ {{ banner.metadata.subtext }}
</v-list-item-subtitle>
</v-list-item>
@@ -89,7 +89,7 @@
const banners = useBannersStore()
const banner = computed(() => banners.banner)
- const height = computed(() => banner.value?.metadata.subtext ? 72 : 48)
+ const height = computed(() => banner.value?.metadata.subtext ? 88 : 48)
const hasPromotion = computed(() => {
return !banner.value || !user.notifications.last.banner.includes(banner.value.slug)
})
|
8f417828513fa7350836d39e2e85aade62944503
|
2022-08-30 17:25:16
|
Albert Kaaman
|
fix(VSlider): properly trigger touchend event (#15672)
| false
|
properly trigger touchend event (#15672)
|
fix
|
diff --git a/packages/vuetify/src/components/VSlider/VSliderThumb.sass b/packages/vuetify/src/components/VSlider/VSliderThumb.sass
index ffcf5d69e55..8f2265cd144 100644
--- a/packages/vuetify/src/components/VSlider/VSliderThumb.sass
+++ b/packages/vuetify/src/components/VSlider/VSliderThumb.sass
@@ -7,6 +7,7 @@
// Theme
.v-slider-thumb
+ touch-action: none
color: rgb(var(--v-theme-surface-variant))
.v-input--error:not(.v-input--disabled) &
@@ -126,13 +127,10 @@
left: -$slider-thumb-label-wedge-size
// Modifiers
-.v-slider-thumb--focused, .v-slider-thumb:hover
- .v-slider-thumb__surface::before
- transform: scale(2)
-
.v-slider-thumb--focused
.v-slider-thumb__surface::before
- opacity: $slider-thumb-focus-opacity
+ transform: scale(2)
+ opacity: $slider-thumb-focus-opacity
.v-slider-thumb--pressed
transition: none
@@ -140,6 +138,11 @@
.v-slider-thumb__surface::before
opacity: $slider-thumb-pressed-opacity
-.v-slider-thumb:hover:not(.v-slider-thumb--focused)
- .v-slider-thumb__surface::before
- opacity: $slider-thumb-hover-opacity
+@media (hover: hover)
+ .v-slider-thumb:hover
+ .v-slider-thumb__surface::before
+ transform: scale(2)
+
+ .v-slider-thumb:hover:not(.v-slider-thumb--focused)
+ .v-slider-thumb__surface::before
+ opacity: $slider-thumb-hover-opacity
diff --git a/packages/vuetify/src/components/VSlider/slider.ts b/packages/vuetify/src/components/VSlider/slider.ts
index e9283784aca..e5cf96758f1 100644
--- a/packages/vuetify/src/components/VSlider/slider.ts
+++ b/packages/vuetify/src/components/VSlider/slider.ts
@@ -259,20 +259,17 @@ export const useSlider = ({
}
function onSliderTouchend (e: TouchEvent) {
- e.stopPropagation()
- e.preventDefault()
-
handleStop(e)
window.removeEventListener('touchmove', onMouseMove, moveListenerOptions)
- window.removeEventListener('touchend', onSliderTouchend)
+ e.target?.removeEventListener('touchend', onSliderTouchend as EventListener)
}
function onSliderTouchstart (e: TouchEvent) {
handleStart(e)
window.addEventListener('touchmove', onMouseMove, moveListenerOptions)
- window.addEventListener('touchend', onSliderTouchend, { passive: false })
+ e.target?.addEventListener('touchend', onSliderTouchend as EventListener, { passive: false })
}
function onSliderMousedown (e: MouseEvent) {
diff --git a/packages/vuetify/src/components/VWindow/VWindow.tsx b/packages/vuetify/src/components/VWindow/VWindow.tsx
index 3e80d9a3d0e..edbc8e4e7dc 100644
--- a/packages/vuetify/src/components/VWindow/VWindow.tsx
+++ b/packages/vuetify/src/components/VWindow/VWindow.tsx
@@ -202,9 +202,6 @@ export const VWindow = genericComponent<new () => {
right: () => {
isRtlReverse.value ? next() : prev()
},
- end: ({ originalEvent }) => {
- originalEvent.stopPropagation()
- },
start: ({ originalEvent }) => {
originalEvent.stopPropagation()
},
|
b43b3cf061425f671d674d2837d867afb3f597b6
|
2018-04-06 08:12:08
|
John Leider
|
fix(v-select-list): avatar prop requires boolean
| false
|
avatar prop requires boolean
|
fix
|
diff --git a/src/components/VSelect/VSelectList.js b/src/components/VSelect/VSelectList.js
index 585ee542766..f59c7eaed75 100644
--- a/src/components/VSelect/VSelectList.js
+++ b/src/components/VSelect/VSelectList.js
@@ -98,7 +98,7 @@ export default {
value = this.selectedItems.indexOf(item) !== -1
) {
if (item === Object(item)) {
- avatar = this.getAvatar(item)
+ avatar = !!this.getAvatar(item)
disabled = disabled != null
? disabled
: this.getDisabled(item)
|
aa7d8db07172eba4acd498237bfcc6e2bbd0f821
|
2023-09-14 18:58:27
|
Andrew Henry
|
docs(api): update missing layout props
| false
|
update missing layout props
|
docs
|
diff --git a/packages/api-generator/src/locale/en/layout.json b/packages/api-generator/src/locale/en/layout.json
index 32fa7d57e78..a14262993de 100644
--- a/packages/api-generator/src/locale/en/layout.json
+++ b/packages/api-generator/src/locale/en/layout.json
@@ -1,6 +1,7 @@
{
"props": {
- "fullHeight": "Sets the component height to 100%."
+ "fullHeight": "Sets the component height to 100%.",
+ "overlaps": "**FOR INTERNAL USE ONLY**"
},
"exposed": {
"getLayoutItem": "Function that returns position and size information about a specific layout item.",
|
6db08d4cfa41cfa9e9c8bad154f3956e7bcd12e9
|
2019-07-23 17:15:45
|
Kael
|
chore: run build script in shell context
| false
|
run build script in shell context
|
chore
|
diff --git a/scripts/build.js b/scripts/build.js
index 1c8bc12c97d..6155598ff80 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -10,7 +10,7 @@ const alias = {
target = alias[target] || target
if (!target) {
- child.spawn('yarn', ['lerna', 'run', 'build', '--stream'], { stdio:'inherit' })
+ child.spawn('yarn', ['lerna', 'run', 'build', '--stream'], { stdio:'inherit', shell: true })
} else {
- child.spawn('yarn', ['lerna', 'run', 'build', `--scope ${target}`, '--stream'], { stdio:'inherit' })
+ child.spawn('yarn', ['lerna', 'run', 'build', `--scope ${target}`, '--stream'], { stdio:'inherit', shell: true })
}
|
c8500a1939297a47f12976fe2262cf445e5d46e6
|
2025-03-10 19:14:13
|
John Leider
|
docs: replace ref with shallowRef where it makes sense
| false
|
replace ref with shallowRef where it makes sense
|
docs
|
diff --git a/packages/docs/src/components/api/Inline.vue b/packages/docs/src/components/api/Inline.vue
index 532a8cf466c..8dbb08c20be 100644
--- a/packages/docs/src/components/api/Inline.vue
+++ b/packages/docs/src/components/api/Inline.vue
@@ -47,7 +47,7 @@
const route = useRoute()
const { t, locale } = useI18n()
const user = useUserStore()
- const name = ref()
+ const name = shallowRef()
const sections = ['props', 'slots', 'events', 'exposed'] as const
const components = computed(() => {
diff --git a/packages/docs/src/components/api/PrismCell.vue b/packages/docs/src/components/api/PrismCell.vue
index f4c13d6ed93..2b93e2c6a9d 100644
--- a/packages/docs/src/components/api/PrismCell.vue
+++ b/packages/docs/src/components/api/PrismCell.vue
@@ -20,7 +20,7 @@
},
})
- const html = ref('')
+ const html = shallowRef('')
watchEffect(async () => {
html.value = highlight(String(await props.code))
})
diff --git a/packages/docs/src/components/api/Section.vue b/packages/docs/src/components/api/Section.vue
index 688da67b67e..cea50fa1b26 100644
--- a/packages/docs/src/components/api/Section.vue
+++ b/packages/docs/src/components/api/Section.vue
@@ -48,7 +48,7 @@
})
const store = useLocaleStore()
- const items = ref()
+ const items = shallowRef()
const TableComponent = computed(() => {
return {
diff --git a/packages/docs/src/components/api/View.vue b/packages/docs/src/components/api/View.vue
index b57fd80f383..7eb68cc8e21 100644
--- a/packages/docs/src/components/api/View.vue
+++ b/packages/docs/src/components/api/View.vue
@@ -9,7 +9,7 @@
const route = useRoute()
- const error = ref(false)
+ const error = shallowRef(false)
const name = computed(() => {
const name = route.params.name as string
if (name.endsWith('-directive')) return name.replace('-directive', '')
diff --git a/packages/docs/src/components/app/Markup.vue b/packages/docs/src/components/app/Markup.vue
index eb2e6babeb5..cc928ff162d 100644
--- a/packages/docs/src/components/app/Markup.vue
+++ b/packages/docs/src/components/app/Markup.vue
@@ -105,10 +105,10 @@
const user = useUserStore()
const theme = useTheme()
const { t } = useI18n()
- const clicked = ref(false)
+ const clicked = shallowRef(false)
const root = ref<ComponentPublicInstance>()
- const highlighted = ref('')
+ const highlighted = shallowRef('')
watchEffect(async () => {
highlighted.value = props.code && props.language && Prism.highlight(await props.code, Prism.languages[props.language], props.language)
})
diff --git a/packages/docs/src/components/app/Toc.vue b/packages/docs/src/components/app/Toc.vue
index ea08d92ddf9..e4c85260edf 100644
--- a/packages/docs/src/components/app/Toc.vue
+++ b/packages/docs/src/components/app/Toc.vue
@@ -132,7 +132,7 @@
const frontmatter = useFrontmatter()
const activeStack = [] as string[]
- const activeItem = ref('')
+ const activeItem = shallowRef('')
const observer = new IntersectionObserver(entries => {
entries.forEach(entry => {
if (entry.isIntersecting) {
diff --git a/packages/docs/src/components/app/bar/NotificationsMenu.vue b/packages/docs/src/components/app/bar/NotificationsMenu.vue
index 3cabc890de1..8fa748d2dbc 100644
--- a/packages/docs/src/components/app/bar/NotificationsMenu.vue
+++ b/packages/docs/src/components/app/bar/NotificationsMenu.vue
@@ -131,9 +131,9 @@
const date = useDate()
const user = useUserStore()
- const menu = ref(false)
+ const menu = shallowRef(false)
const all = ref<Notification[]>([])
- const showArchived = ref(false)
+ const showArchived = shallowRef(false)
const unread = computed(() => all.value.filter(({ slug }) => !user.notifications.read.includes(slug)))
const read = computed(() => all.value.filter(({ slug }) => user.notifications.read.includes(slug)))
diff --git a/packages/docs/src/components/app/drawer/Drawer.vue b/packages/docs/src/components/app/drawer/Drawer.vue
index c6554551771..d5d4cd3cdf9 100644
--- a/packages/docs/src/components/app/drawer/Drawer.vue
+++ b/packages/docs/src/components/app/drawer/Drawer.vue
@@ -38,8 +38,8 @@
const { mobile } = useDisplay()
- const rail = ref(user.railDrawer)
- const _opened = ref([])
+ const rail = shallowRef(user.railDrawer)
+ const _opened = shallowRef([])
const opened = computed({
get: () => rail.value ? [] : _opened.value,
set: val => {
diff --git a/packages/docs/src/components/app/search/SearchDialog.vue b/packages/docs/src/components/app/search/SearchDialog.vue
index 3bd3a0692f1..b6ef33c874b 100644
--- a/packages/docs/src/components/app/search/SearchDialog.vue
+++ b/packages/docs/src/components/app/search/SearchDialog.vue
@@ -100,7 +100,7 @@
'NHT6C0IV19', // docsearch app ID
'ffa344297924c76b0f4155384aff7ef2' // vuetify API key
)
- const searches = ref(JSON.parse(localStorage.getItem('searches') || '[]'))
+ const searches = shallowRef(JSON.parse(localStorage.getItem('searches') || '[]'))
const locale = 'en'
diff --git a/packages/docs/src/components/doc/Explorer.vue b/packages/docs/src/components/doc/Explorer.vue
index c13806fdee8..20052fae3ab 100644
--- a/packages/docs/src/components/doc/Explorer.vue
+++ b/packages/docs/src/components/doc/Explorer.vue
@@ -91,7 +91,7 @@
const name = route.params.name?.replace('/', '')
const pascalName = name ? `${name.charAt(0).toUpperCase()}${camelize(name.slice(1))}` : undefined
- const model = ref(components.some(v => v.value === name) ? name : pascalName)
+ const model = shallowRef(components.some(v => v.value === name) ? name : pascalName)
const sections = ['props', 'events', 'slots', 'exposed', 'sass', 'options', 'argument', 'modifiers']
diff --git a/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue b/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue
index 6aea3508262..84c704fa8d5 100644
--- a/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue
+++ b/packages/docs/src/components/doc/MadeWithVuetifyGallery.vue
@@ -76,7 +76,7 @@
pagination: Boolean,
})
- const page = ref(1)
+ const page = shallowRef(1)
const store = useMadeWithVuetifyStore()
const items = computed(() => {
diff --git a/packages/docs/src/components/doc/PremiumThemesGallery.vue b/packages/docs/src/components/doc/PremiumThemesGallery.vue
index 2964c122969..e987f82af57 100644
--- a/packages/docs/src/components/doc/PremiumThemesGallery.vue
+++ b/packages/docs/src/components/doc/PremiumThemesGallery.vue
@@ -76,7 +76,7 @@
},
})
- const page = ref(1)
+ const page = shallowRef(1)
const products = useProductsStore()
diff --git a/packages/docs/src/components/doc/Releases.vue b/packages/docs/src/components/doc/Releases.vue
index 3709c08558b..178105fcd10 100644
--- a/packages/docs/src/components/doc/Releases.vue
+++ b/packages/docs/src/components/doc/Releases.vue
@@ -182,9 +182,9 @@
const router = useRouter()
const store = useReleasesStore()
- const autocomplete = ref()
- const clicked = ref('copy-link')
- const model = ref<Release>()
+ const autocomplete = shallowRef()
+ const clicked = shallowRef('copy-link')
+ const model = shallowRef<Release>()
const search = shallowRef('')
let timeout = -1 as any
diff --git a/packages/docs/src/components/doc/Tabs.vue b/packages/docs/src/components/doc/Tabs.vue
index 6cab572031a..21a4748dc1c 100644
--- a/packages/docs/src/components/doc/Tabs.vue
+++ b/packages/docs/src/components/doc/Tabs.vue
@@ -14,5 +14,5 @@
</template>
<script setup>
- const model = ref()
+ const model = shallowRef()
</script>
diff --git a/packages/docs/src/components/doc/VueJobs.vue b/packages/docs/src/components/doc/VueJobs.vue
index d8193165ea4..62009558a9b 100644
--- a/packages/docs/src/components/doc/VueJobs.vue
+++ b/packages/docs/src/components/doc/VueJobs.vue
@@ -80,8 +80,8 @@
const { event } = useGtag()
const { jobs } = useJobsStore()
const { t } = useI18n()
- const view = ref(true)
- const search = ref('')
+ const view = shallowRef(true)
+ const search = shallowRef('')
const items = computed(() => {
return jobs.filter(job => {
if (!search.value) return true
diff --git a/packages/docs/src/components/features/SassApi.vue b/packages/docs/src/components/features/SassApi.vue
index befc732aab4..bc021f22039 100644
--- a/packages/docs/src/components/features/SassApi.vue
+++ b/packages/docs/src/components/features/SassApi.vue
@@ -37,8 +37,8 @@
<script setup>
const files = import.meta.glob('../../../../api-generator/dist/api/*.json')
- const variables = ref([])
- const model = ref([])
+ const variables = shallowRef([])
+ const model = shallowRef([])
const code = computed(() => {
const $parsed = model.value.map(variable => {
diff --git a/packages/docs/src/components/introduction/EnterpriseForm.vue b/packages/docs/src/components/introduction/EnterpriseForm.vue
index 470ab871892..bb2b279e301 100644
--- a/packages/docs/src/components/introduction/EnterpriseForm.vue
+++ b/packages/docs/src/components/introduction/EnterpriseForm.vue
@@ -146,16 +146,16 @@
const theme = useTheme()
const { t } = useI18n()
- const name = ref('')
- const email = ref('')
- const upgrade = ref(false)
- const review = ref(false)
- const sla = ref(false)
- const sponsor = ref(false)
- const loading = ref(false)
- const valid = ref<boolean | null>(null)
- const success = ref(false)
- const form = ref<HTMLFormElement>()
+ const name = shallowRef('')
+ const email = shallowRef('')
+ const upgrade = shallowRef(false)
+ const review = shallowRef(false)
+ const sla = shallowRef(false)
+ const sponsor = shallowRef(false)
+ const loading = shallowRef(false)
+ const valid = shallowRef<boolean | null>(null)
+ const success = shallowRef(false)
+ const form = shallowRef<HTMLFormElement>()
const rules = {
required: (v: string) => !!v || 'Field is required',
email: (v: any) => /.+@.+/.test(v) || 'E-mail must be valid',
diff --git a/packages/docs/src/components/sponsor/Card.vue b/packages/docs/src/components/sponsor/Card.vue
index 409f59be580..4c214df5e39 100644
--- a/packages/docs/src/components/sponsor/Card.vue
+++ b/packages/docs/src/components/sponsor/Card.vue
@@ -33,7 +33,7 @@
const { name } = useRoute()
const theme = useTheme()
const sponsorStore = useSponsorsStore()
- const sponsor = ref(props.sponsor)
+ const sponsor = shallowRef(props.sponsor)
const src = computed(() => {
const {
diff --git a/packages/docs/src/stores/made-with-vuetify.ts b/packages/docs/src/stores/made-with-vuetify.ts
index 23323405486..b2348dd3911 100644
--- a/packages/docs/src/stores/made-with-vuetify.ts
+++ b/packages/docs/src/stores/made-with-vuetify.ts
@@ -1,5 +1,5 @@
export const useMadeWithVuetifyStore = defineStore('made-with-vuetify', () => {
- const items = ref([])
+ const items = shallowRef([])
onBeforeMount(async () => {
const res = await fetch('https://madewithvuejs.com/api/tag/vuetify', {
diff --git a/packages/docs/src/stores/pwa.ts b/packages/docs/src/stores/pwa.ts
index 948b926e04f..d9233094850 100644
--- a/packages/docs/src/stores/pwa.ts
+++ b/packages/docs/src/stores/pwa.ts
@@ -1,16 +1,16 @@
export const usePwaStore = defineStore('pwa', () => {
- const isOffline = ref(!navigator.onLine)
- const isUpdating = ref(false)
- const nextManifest = ref()
- const pendingUpdate = ref(false)
- const prevManifest = ref()
- const progress = ref(0)
- const progressTotal = ref(0)
+ const isOffline = shallowRef(!navigator.onLine)
+ const isUpdating = shallowRef(false)
+ const nextManifest = shallowRef()
+ const pendingUpdate = shallowRef(false)
+ const prevManifest = shallowRef()
+ const progress = shallowRef(0)
+ const progressTotal = shallowRef(0)
window.addEventListener('online', () => isOffline.value = false)
window.addEventListener('offline', () => isOffline.value = true)
- const _availableOffline = ref(localStorage.getItem('vuetify:availableOffline') === 'true')
+ const _availableOffline = shallowRef(localStorage.getItem('vuetify:availableOffline') === 'true')
const availableOffline = computed({
get: () => _availableOffline.value,
set: val => {
|
3f80d8eb4309f63d6967ecd3b1d81d3c37470d80
|
2018-06-20 09:41:15
|
John Leider
|
fix(v-autocomplete): remove onEnterKey call
| false
|
remove onEnterKey call
|
fix
|
diff --git a/src/components/VAutocomplete/VAutocomplete.js b/src/components/VAutocomplete/VAutocomplete.js
index 2205631a0ae..c7354f2285e 100644
--- a/src/components/VAutocomplete/VAutocomplete.js
+++ b/src/components/VAutocomplete/VAutocomplete.js
@@ -291,6 +291,11 @@ export default {
this.activateMenu()
},
+ onEnterDown () {
+ // Avoid invoking this method
+ // will cause updateSelf to
+ // be called emptying search
+ },
onInput (e) {
if (this.selectedIndex > -1) return
diff --git a/src/components/VCombobox/VCombobox.js b/src/components/VCombobox/VCombobox.js
index 455759ea567..6f9c5a1b42c 100755
--- a/src/components/VCombobox/VCombobox.js
+++ b/src/components/VCombobox/VCombobox.js
@@ -61,6 +61,11 @@ export default {
return chip
},
+ // Requires a manual definition
+ // to overwrite removal in v-autocomplete
+ onEnterDown () {
+ VSelect.methods.onEnterDown.call(this)
+ },
onKeyDown (e) {
const keyCode = e.keyCode
diff --git a/test/unit/components/VAutocomplete/VAutocomplete.spec.js b/test/unit/components/VAutocomplete/VAutocomplete.spec.js
index b4b6c22d001..1340f74df83 100644
--- a/test/unit/components/VAutocomplete/VAutocomplete.spec.js
+++ b/test/unit/components/VAutocomplete/VAutocomplete.spec.js
@@ -424,19 +424,6 @@ test('VAutocomplete.js', ({ mount, shallow, compileToFunctions }) => {
expect(wrapper.vm.lazySearch).toBe(null)
})
- it('should call methods on blur', () => {
- const updateAutocomplete = jest.fn()
- const wrapper = shallow(VAutocomplete, {
- methods: {
- updateAutocomplete
- }
- })
-
- wrapper.vm.onEnterDown()
-
- expect(updateAutocomplete).toHaveBeenCalledTimes(1)
- })
-
it('should select input text on focus', async () => {
const wrapper = mount(VAutocomplete)
const select = jest.fn()
|
215055423b9da1ecbe530b5464b4f770c9a2375b
|
2018-11-22 22:37:38
|
Jacek Karczmarczyk
|
fix(selection-controls): use ripple even when disabled (#5710)
| false
|
use ripple even when disabled (#5710)
|
fix
|
diff --git a/packages/vuetify/src/components/VCheckbox/VCheckbox.js b/packages/vuetify/src/components/VCheckbox/VCheckbox.js
index b0467f29b0f..119e754effe 100644
--- a/packages/vuetify/src/components/VCheckbox/VCheckbox.js
+++ b/packages/vuetify/src/components/VCheckbox/VCheckbox.js
@@ -71,7 +71,7 @@ export default {
? 'mixed'
: this.isActive.toString()
}),
- !this.disabled && this.genRipple(this.setTextColor(this.computedColor)),
+ this.genRipple(this.setTextColor(this.computedColor)),
this.$createElement(VIcon, this.setTextColor(this.computedColor, {
props: {
dark: this.dark,
diff --git a/packages/vuetify/src/components/VRadioGroup/VRadio.js b/packages/vuetify/src/components/VRadioGroup/VRadio.js
index cd5df7c9d88..2dc08d06d93 100644
--- a/packages/vuetify/src/components/VRadioGroup/VRadio.js
+++ b/packages/vuetify/src/components/VRadioGroup/VRadio.js
@@ -120,7 +120,7 @@ export default {
value: this.value,
...this.$attrs
}),
- !this.isDisabled && this.genRipple(this.setTextColor(this.computedColor)),
+ this.genRipple(this.setTextColor(this.computedColor)),
this.$createElement(VIcon, this.setTextColor(this.computedColor, {
props: {
dark: this.dark,
diff --git a/packages/vuetify/src/components/VSwitch/VSwitch.js b/packages/vuetify/src/components/VSwitch/VSwitch.js
index de4d5257a62..d224e282f4b 100644
--- a/packages/vuetify/src/components/VSwitch/VSwitch.js
+++ b/packages/vuetify/src/components/VSwitch/VSwitch.js
@@ -56,7 +56,7 @@ export default {
staticClass: 'v-input--selection-controls__input'
}, [
this.genInput('checkbox', this.$attrs),
- !this.disabled && this.genRipple(this.setTextColor(this.computedColor, {
+ this.genRipple(this.setTextColor(this.computedColor, {
directives: [{
name: 'touch',
value: {
diff --git a/packages/vuetify/test/unit/components/VCheckbox/VCheckbox.spec.js b/packages/vuetify/test/unit/components/VCheckbox/VCheckbox.spec.js
index 641e8c94dc5..d8e1e10180d 100644
--- a/packages/vuetify/test/unit/components/VCheckbox/VCheckbox.spec.js
+++ b/packages/vuetify/test/unit/components/VCheckbox/VCheckbox.spec.js
@@ -134,7 +134,7 @@ test('VCheckbox.js', ({ mount }) => {
expect(change.mock.calls).toEqual([[true], [false]])
})
- it('should enable ripple based on disabled state', () => {
+ it('should enable ripple', () => {
const wrapper = mount(VCheckbox, {
propsData: {
inputValue: false,
@@ -149,24 +149,7 @@ test('VCheckbox.js', ({ mount }) => {
wrapper.setProps({ disabled: true })
- expect(wrapper.contains('.v-input--selection-controls__ripple')).toBe(false)
- })
-
- it('should set ripple centered property when enabled', () => {
- const wrapper = mount(VCheckbox, {
- propsData: {
- inputValue: false,
- disabled: true
- }
- })
-
- expect(wrapper.contains('.v-input--selection-controls__ripple')).toBe(false)
-
- wrapper.setProps({ disabled: false })
-
- const ripple = wrapper.first('.v-input--selection-controls__ripple')
- expect(ripple.element._ripple.enabled).toBe(true)
- expect(ripple.element._ripple.centered).toBe(true)
+ expect(wrapper.contains('.v-input--selection-controls__ripple')).toBe(true)
})
it('should not render ripple when ripple prop is false', () => {
|
e22e24e51ac011bbc0d4dc77ad44f6375590277f
|
2018-08-10 07:17:12
|
John Leider
|
fix(v-data-table): fix icon alignment for mdi
| false
|
fix icon alignment for mdi
|
fix
|
diff --git a/src/stylus/components/_data-table.styl b/src/stylus/components/_data-table.styl
index 0264d69ddcd..6c81ec80308 100644
--- a/src/stylus/components/_data-table.styl
+++ b/src/stylus/components/_data-table.styl
@@ -35,7 +35,6 @@ theme(v-datatable, "v-datatable")
i
font-size: 16px
- vertical-align: sub
display: inline-block
opacity: 0
transition: .3s $transition.swing
|
f6ef33c64c2fc453d4157524a3e2c587ad5de944
|
2020-01-16 04:45:42
|
John Leider
|
fix(SelectionControls): change selection-control disabled color
| false
|
change selection-control disabled color
|
fix
|
diff --git a/packages/vuetify/src/components/VRadioGroup/VRadio.sass b/packages/vuetify/src/components/VRadioGroup/VRadio.sass
index 6cb1eaf920a..484b0c8994a 100644
--- a/packages/vuetify/src/components/VRadioGroup/VRadio.sass
+++ b/packages/vuetify/src/components/VRadioGroup/VRadio.sass
@@ -8,7 +8,7 @@
.v-icon
// needed for helper override
- color: map-deep-get($material, 'buttons', 'disabled') !important
+ color: map-deep-get($material, 'selection-controls', 'disabled') !important
.v-radio
align-items: center
diff --git a/packages/vuetify/src/styles/components/_selection-controls.sass b/packages/vuetify/src/styles/components/_selection-controls.sass
index 1cdb816e39f..26a0cee4b29 100644
--- a/packages/vuetify/src/styles/components/_selection-controls.sass
+++ b/packages/vuetify/src/styles/components/_selection-controls.sass
@@ -5,7 +5,7 @@
&.v-input--is-disabled:not(.v-input--indeterminate)
.v-icon
// needed for helper override
- color: map-deep-get($material, 'buttons', 'disabled') !important
+ color: map-deep-get($material, 'selection-controls', 'disabled') !important
.v-input--selection-controls
margin-top: $input-top-spacing
diff --git a/packages/vuetify/src/styles/settings/_dark.scss b/packages/vuetify/src/styles/settings/_dark.scss
index 0c164ca5a3a..7b591f8e56b 100644
--- a/packages/vuetify/src/styles/settings/_dark.scss
+++ b/packages/vuetify/src/styles/settings/_dark.scss
@@ -49,6 +49,7 @@ $material-dark: map-deep-merge(
'focus': #494949
),
'selection-controls': (
+ 'disabled': rgba(map-get($shades, 'white'), 0.3),
'thumb': (
'inactive': map-get($grey, 'lighten-1'),
'disabled': map-get($grey, 'darken-3')
diff --git a/packages/vuetify/src/styles/settings/_light.scss b/packages/vuetify/src/styles/settings/_light.scss
index 048265dc8e6..f83bf7a8854 100644
--- a/packages/vuetify/src/styles/settings/_light.scss
+++ b/packages/vuetify/src/styles/settings/_light.scss
@@ -49,6 +49,7 @@ $material-light: map-deep-merge(
'focus': map-get($grey, 'lighten-3')
),
'selection-controls': (
+ 'disabled': rgba(map-get($shades, 'black'), 0.26),
'thumb': (
'inactive': map-get($shades, 'white'),
'disabled': map-get($grey, 'lighten-5')
|
9dc555bdb27552e965ad1352561486b2bdf064a1
|
2022-04-08 03:36:16
|
nekosaur
|
fix(VPagination): improve total-visible logic
| false
|
improve total-visible logic
|
fix
|
diff --git a/packages/vuetify/src/components/VPagination/VPagination.tsx b/packages/vuetify/src/components/VPagination/VPagination.tsx
index e31f2b9bff3..dfb4d5fcb12 100644
--- a/packages/vuetify/src/components/VPagination/VPagination.tsx
+++ b/packages/vuetify/src/components/VPagination/VPagination.tsx
@@ -149,26 +149,25 @@ export const VPagination = defineComponent({
const range = computed(() => {
if (length.value <= 0) return []
- if (totalVisible.value <= 3) {
- return [Math.min(Math.max(start.value, page.value), start.value + length.value)]
- }
+ if (totalVisible.value <= 2) return [page.value]
- if (props.length <= totalVisible.value) {
+ if (length.value <= totalVisible.value) {
return createRange(length.value, start.value)
}
- const middle = Math.ceil(totalVisible.value / 2)
- const left = middle
+ const even = totalVisible.value % 2 === 0
+ const middle = even ? totalVisible.value / 2 : Math.floor(totalVisible.value / 2)
+ const left = even ? middle : middle + 1
const right = length.value - middle
- if (page.value < left) {
- return [...createRange(Math.max(1, totalVisible.value - 2), start.value), props.ellipsis, length.value]
- } else if (page.value > right) {
- const rangeLength = totalVisible.value - 2
+ if (left - page.value >= 0) {
+ return [...createRange(Math.max(1, totalVisible.value - 1), start.value), props.ellipsis, length.value]
+ } else if (page.value - right >= 0) {
+ const rangeLength = totalVisible.value - 1
const rangeStart = length.value - rangeLength + start.value
return [start.value, props.ellipsis, ...createRange(rangeLength, rangeStart)]
} else {
- const rangeLength = Math.max(1, totalVisible.value - 4)
+ const rangeLength = Math.max(1, totalVisible.value - 3)
const rangeStart = rangeLength === 1 ? page.value : page.value - Math.ceil(rangeLength / 2) + start.value
return [start.value, props.ellipsis, ...createRange(rangeLength, rangeStart), props.ellipsis, length.value]
}
|
86bd737a574914da060adb68cf4761734c81a5c6
|
2020-09-24 22:00:12
|
Jacek Karczmarczyk
|
docs: removed unnecessary comma from click-outside.md
| false
|
removed unnecessary comma from click-outside.md
|
docs
|
diff --git a/packages/docs/src/pages/en/directives/click-outside.md b/packages/docs/src/pages/en/directives/click-outside.md
index 76dd56d64ba..c2151706960 100644
--- a/packages/docs/src/pages/en/directives/click-outside.md
+++ b/packages/docs/src/pages/en/directives/click-outside.md
@@ -1,6 +1,6 @@
---
meta:
- title: Click outside directive,
+ title: Click outside directive
description: The v-click-outside directive calls a function when something outside of the target element is clicked on.,
keyword: click outside, click directive, vue click directive, vuetify click directives
related:
|
511329179271f2e4baa1e59deec5178e33fbfcf4
|
2018-05-16 22:20:28
|
Albert Kaaman
|
fix: data-table issues (#3857)
| false
|
data-table issues (#3857)
|
fix
|
diff --git a/src/components/VDataIterator/index.js b/src/components/VDataIterator/index.js
index 79f96bb7f31..92e76a373cf 100644
--- a/src/components/VDataIterator/index.js
+++ b/src/components/VDataIterator/index.js
@@ -1,5 +1,6 @@
import VDataIterator from './VDataIterator'
+/* istanbul ignore next */
VDataIterator.install = function install (Vue) {
Vue.component(VDataIterator.name, VDataIterator)
}
diff --git a/src/mixins/data-iterable.js b/src/mixins/data-iterable.js
index a0658572bc3..f52691fff71 100644
--- a/src/mixins/data-iterable.js
+++ b/src/mixins/data-iterable.js
@@ -212,11 +212,13 @@ export default {
},
watch: {
- itemsLength (totalItems) {
- this.updatePagination({ page: 1, totalItems })
+ search () {
+ this.$nextTick(() => {
+ this.updatePagination({ page: 1, totalItems: this.itemsLength })
+ })
},
- 'computedPagination.sortBy': function () { this.updatePagination({ page: 1 }) },
- 'computedPagination.descending': function () { this.updatePagination({ page: 1 }) }
+ 'computedPagination.sortBy': 'resetPagination',
+ 'computedPagination.descending': 'resetPagination'
},
methods: {
@@ -273,6 +275,10 @@ export default {
? items
: items.slice(this.pageStart, this.pageStop)
},
+ resetPagination () {
+ this.computedPagination.page !== 1 &&
+ this.updatePagination({ page: 1 })
+ },
sort (index) {
const { sortBy, descending } = this.computedPagination
if (sortBy === null) {
diff --git a/test/unit/components/VDataTable/VDataTable.spec.js b/test/unit/components/VDataTable/VDataTable.spec.js
index 51f938bb8bd..f22d3cde646 100644
--- a/test/unit/components/VDataTable/VDataTable.spec.js
+++ b/test/unit/components/VDataTable/VDataTable.spec.js
@@ -311,6 +311,82 @@ test('VDataTable.vue', ({ mount, compileToFunctions }) => {
const wrapper = mount(VDataTable, data)
expect(wrapper.find('tr.v-datatable__progress th')[0].getAttribute('colspan')).toBe('11')
+ expect('Unable to locate target [data-app]').toHaveBeenTipped()
+ })
+
+ it('should not emit pagination event after load (#3585)', async () => {
+ const data = dataTableTestDataFilter()
+ data.propsData.totalItems = 0
+ data.propsData.search = ''
+ data.propsData.pagination = {}
+
+ const wrapper = mount(VDataTable, data)
+ const pagination = jest.fn()
+ wrapper.vm.$on('update:pagination', pagination)
+
+ await wrapper.vm.$nextTick()
+
+ expect(pagination).toHaveBeenCalledTimes(0)
+
+ expect('Unable to locate target [data-app]').toHaveBeenTipped()
+ })
+
+ it('should emit correct totalItems property in pagination when searching (#3511)', async () => {
+ const data = {
+ propsData: {
+ pagination: {
+ rowsPerPage: 5,
+ descending: false,
+ page: 1,
+ sortBy: 'calories'
+ },
+ headers: [{ text: 'Calories', value: 'calories' }],
+ items: [{ calories: 19 }, { calories: 19 }, { calories: 152 }]
+ }
+ }
+
+ const wrapper = mount(VDataTable, data)
+ const pagination = jest.fn()
+ wrapper.vm.$on('update:pagination', pagination)
+
+ await wrapper.vm.$nextTick()
+
+ wrapper.setProps({ search: '9' })
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.instance().filteredItems).toHaveLength(2)
+ expect(pagination).toHaveBeenCalledWith(Object.assign({}, data.propsData.pagination, { totalItems: 2 }))
+
+ expect('Unable to locate target [data-app]').toHaveBeenTipped()
+ })
+
+ it('should not reset page when total-items prop changes (#3766)', async () => {
+ const data = {
+ propsData: {
+ pagination: {
+ rowsPerPage: 1,
+ descending: false,
+ page: 2,
+ sortBy: 'calories'
+ },
+ totalItems: 3,
+ headers: [{ text: 'Calories', value: 'calories' }],
+ items: [{ calories: 19 }, { calories: 19 }, { calories: 152 }]
+ }
+ }
+
+ const wrapper = mount(VDataTable, data)
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.instance().computedPagination.page).toBe(2)
+
+ wrapper.setProps({ totalItems: 10 })
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.instance().computedPagination.page).toBe(2)
expect('Unable to locate target [data-app]').toHaveBeenTipped()
})
|
36ee3e911f0a58f9169fd15d7addcc3ae1c25fd3
|
2023-02-11 00:04:50
|
John Leider
|
docs(bottom-navigation): update page and examples
| false
|
update page and examples
|
docs
|
diff --git a/packages/docs/src/examples/v-bottom-navigation/prop-color.vue b/packages/docs/src/examples/v-bottom-navigation/prop-color.vue
index aae9e9c35a4..cc7e542e169 100644
--- a/packages/docs/src/examples/v-bottom-navigation/prop-color.vue
+++ b/packages/docs/src/examples/v-bottom-navigation/prop-color.vue
@@ -1,30 +1,33 @@
<template>
- <v-bottom-navigation
- :value="value"
- color="primary"
- >
- <v-btn>
- <span>Recents</span>
+ <v-layout class="overflow-visible" style="height: 56px;">
+ <v-bottom-navigation
+ v-model="value"
+ active
+ color="primary"
+ >
+ <v-btn>
+ <v-icon>mdi-history</v-icon>
- <v-icon>mdi-history</v-icon>
- </v-btn>
+ Recents
+ </v-btn>
- <v-btn>
- <span>Favorites</span>
+ <v-btn>
+ <v-icon>mdi-heart</v-icon>
- <v-icon>mdi-heart</v-icon>
- </v-btn>
+ Favorites
+ </v-btn>
- <v-btn>
- <span>Nearby</span>
+ <v-btn>
+ <v-icon>mdi-map-marker</v-icon>
- <v-icon>mdi-map-marker</v-icon>
- </v-btn>
- </v-bottom-navigation>
+ <span>Nearby</span>
+ </v-btn>
+ </v-bottom-navigation>
+ </v-layout>
</template>
<script>
export default {
- data: () => ({ value: 1 }),
+ data: () => ({ value: 0 }),
}
</script>
diff --git a/packages/docs/src/examples/v-bottom-navigation/prop-grow.vue b/packages/docs/src/examples/v-bottom-navigation/prop-grow.vue
index b268279c1e0..38e9501d637 100644
--- a/packages/docs/src/examples/v-bottom-navigation/prop-grow.vue
+++ b/packages/docs/src/examples/v-bottom-navigation/prop-grow.vue
@@ -1,27 +1,29 @@
<template>
- <v-bottom-navigation
- :value="value"
- color="teal"
- grow
- >
- <v-btn>
- <span>Recents</span>
+ <v-layout class="overflow-visible" style="height: 56px;">
+ <v-bottom-navigation
+ v-model="value"
+ color="teal"
+ grow
+ >
+ <v-btn>
+ <v-icon>mdi-history</v-icon>
- <v-icon>mdi-history</v-icon>
- </v-btn>
+ Recents
+ </v-btn>
- <v-btn>
- <span>Favorites</span>
+ <v-btn>
+ <v-icon>mdi-heart</v-icon>
- <v-icon>mdi-heart</v-icon>
- </v-btn>
+ Favorites
+ </v-btn>
- <v-btn>
- <span>Nearby</span>
+ <v-btn>
+ <v-icon>mdi-map-marker</v-icon>
- <v-icon>mdi-map-marker</v-icon>
- </v-btn>
- </v-bottom-navigation>
+ Nearby
+ </v-btn>
+ </v-bottom-navigation>
+ </v-layout>
</template>
<script>
diff --git a/packages/docs/src/examples/v-bottom-navigation/prop-horizontal.vue b/packages/docs/src/examples/v-bottom-navigation/prop-horizontal.vue
index d4bfafc0ed3..b69484cb8f8 100644
--- a/packages/docs/src/examples/v-bottom-navigation/prop-horizontal.vue
+++ b/packages/docs/src/examples/v-bottom-navigation/prop-horizontal.vue
@@ -1,27 +1,30 @@
<template>
- <v-bottom-navigation
- :value="value"
- color="primary"
- horizontal
- >
- <v-btn>
- <span>Recents</span>
- <v-icon>mdi-history</v-icon>
- </v-btn>
+ <v-layout class="overflow-visible" style="height: 56px;">
+ <v-bottom-navigation
+ v-model="value"
+ color="primary"
+ horizontal
+ >
+ <v-btn>
+ <v-icon>mdi-history</v-icon>
- <v-btn>
- <span>Favorites</span>
+ Recents
+ </v-btn>
- <v-icon>mdi-heart</v-icon>
- </v-btn>
+ <v-btn>
+ <v-icon>mdi-heart</v-icon>
- <v-btn>
- <span>Nearby</span>
+ Favorites
+ </v-btn>
- <v-icon>mdi-map-marker</v-icon>
- </v-btn>
- </v-bottom-navigation>
+ <v-btn>
+ <v-icon>mdi-map-marker</v-icon>
+
+ Nearby
+ </v-btn>
+ </v-bottom-navigation>
+ </v-layout>
</template>
<script>
diff --git a/packages/docs/src/examples/v-bottom-navigation/prop-shift.vue b/packages/docs/src/examples/v-bottom-navigation/prop-shift.vue
index 8166e211233..64a08ab466f 100644
--- a/packages/docs/src/examples/v-bottom-navigation/prop-shift.vue
+++ b/packages/docs/src/examples/v-bottom-navigation/prop-shift.vue
@@ -1,34 +1,36 @@
<template>
- <v-bottom-navigation
- v-model="value"
- :background-color="color"
- dark
- shift
- >
- <v-btn>
- <span>Video</span>
- <v-icon>mdi-television-play</v-icon>
- </v-btn>
+ <v-layout class="overflow-visible" style="height: 56px;">
+ <v-bottom-navigation
+ v-model="value"
+ :bg-color="color"
+ mode="shift"
+ >
+ <v-btn>
+ <v-icon>mdi-television-play</v-icon>
- <v-btn>
- <span>Music</span>
+ <span>Video</span>
+ </v-btn>
- <v-icon>mdi-music-note</v-icon>
- </v-btn>
+ <v-btn>
+ <v-icon>mdi-music-note</v-icon>
- <v-btn>
- <span>Book</span>
+ <span>Music</span>
+ </v-btn>
- <v-icon>mdi-book</v-icon>
- </v-btn>
+ <v-btn>
+ <v-icon>mdi-book</v-icon>
- <v-btn>
- <span>Image</span>
+ <span>Book</span>
+ </v-btn>
- <v-icon>mdi-image</v-icon>
- </v-btn>
- </v-bottom-navigation>
+ <v-btn>
+ <v-icon>mdi-image</v-icon>
+
+ <span>Image</span>
+ </v-btn>
+ </v-bottom-navigation>
+ </v-layout>
</template>
<script>
diff --git a/packages/docs/src/examples/v-bottom-navigation/prop-toggle.vue b/packages/docs/src/examples/v-bottom-navigation/prop-toggle.vue
index 6aa1d9859ca..a3450a02d4e 100644
--- a/packages/docs/src/examples/v-bottom-navigation/prop-toggle.vue
+++ b/packages/docs/src/examples/v-bottom-navigation/prop-toggle.vue
@@ -1,6 +1,6 @@
<template>
- <div class="overflow-hidden">
- <div class="text-center mb-8">
+ <v-layout style="height: 128px;" class="border rounded">
+ <div class="mx-auto my-4">
<v-btn
color="deep-purple"
variant="outlined"
@@ -11,38 +11,33 @@
</div>
<v-bottom-navigation
- v-model="value"
- :model-value="active"
+ :active="active"
color="indigo"
>
<v-btn>
- <span>Recents</span>
-
<v-icon>mdi-history</v-icon>
+
+ Recents
</v-btn>
<v-btn>
- <span>Favorites</span>
-
<v-icon>mdi-heart</v-icon>
+
+ Favorites
</v-btn>
<v-btn>
- <span>Nearby</span>
-
<v-icon>mdi-map-marker</v-icon>
+
+ Nearby
</v-btn>
</v-bottom-navigation>
- </div>
+
+ </v-layout>
</template>
<script>
export default {
- data () {
- return {
- value: 1,
- active: true,
- }
- },
+ data: () => ({ active: true }),
}
</script>
diff --git a/packages/docs/src/pages/en/components/bottom-navigation.md b/packages/docs/src/pages/en/components/bottom-navigation.md
index f645852c706..b922e28adca 100644
--- a/packages/docs/src/pages/en/components/bottom-navigation.md
+++ b/packages/docs/src/pages/en/components/bottom-navigation.md
@@ -14,9 +14,7 @@ related:
The `v-bottom-navigation` component is an alternative to the sidebar. It is primarily used for mobile applications and comes in three variants, **icons** and **text**, and **shift**.
-<!--  -->
-
----
+----
## Usage
@@ -28,7 +26,11 @@ While `v-bottom navigation` is meant to be used with [vue-router](https://router
## API
-<api-inline />
+| Component | Description |
+| - | - |
+| [v-bottom-navigation](/api/v-bottom-navigation/) | Primary Component |
+
+<api-inline hide-links />
## Examples
@@ -38,31 +40,35 @@ While `v-bottom navigation` is meant to be used with [vue-router](https://router
The **color** prop applies a color to the background of the bottom navigation. We recommend using the **light** and **dark** props to properly contrast text color.
-<!-- <example file="v-bottom-navigation/prop-color" /> -->
+<example file="v-bottom-navigation/prop-color" />
#### Grow
Using the **grow** property forces [v-btn](/components/buttons/) components to _fill_ all available space. Buttons have a maximum width of **168px** per the [Bottom Navigation MD specification](https://material.io/components/bottom-navigation#specs).
-<!-- <example file="v-bottom-navigation/prop-grow" /> -->
+<example file="v-bottom-navigation/prop-grow" />
+<!-- TODO: Fix this example when scrolling techniques is implemented
#### Hide on scroll
The `v-bottom-navigation` component hides when *scrolling up* when using the **hide-on-scroll** property. This is similar to the [scrolling techniques](https://material.io/archive/guidelines/patterns/scrolling-techniques.html) that are supported in [v-app-bar](/components/app-bars/). In the following example, scroll *up and down* to see this behavior.
-<!-- <example file="v-bottom-navigation/prop-hide-on-scroll" /> -->
+<example file="v-bottom-navigation/prop-hide-on-scroll" />
+-->
#### Horizontal
Adjust the style of buttons and icons by using the **horizontal** prop. This positions button text *inline* with the provided [v-icon](/components/icons/).
-<!-- <example file="v-bottom-navigation/prop-horizontal" /> -->
+<example file="v-bottom-navigation/prop-horizontal" />
+<!-- TODO: Fix this example when scrolling techniques is implemented
#### Scroll threshold
Modify the **scroll-threshold** property to increase the distance a user must scroll before the `v-bottom-navigation` is hidden.
-<!-- <example file="v-bottom-navigation/prop-scroll-threshold" /> -->
+<example file="v-bottom-navigation/prop-scroll-threshold" />
+-->
#### Shift
@@ -74,10 +80,10 @@ The **shift** prop hides button text when not active. This provides an alternati
</alert>
-<!-- <example file="v-bottom-navigation/prop-shift" /> -->
+<example file="v-bottom-navigation/prop-shift" />
#### Toggle
The display state of `v-bottom-navigation` can be toggled using the **input-value** prop. You can also control the currently active button using **v-model**.
-<!-- <example file="v-bottom-navigation/prop-toggle" /> -->
+<example file="v-bottom-navigation/prop-toggle" />
|
cc0135f57dd1a83b87279ab3e4020e51b70f5ed7
|
2022-10-26 22:30:58
|
Kael
|
docs(pwa): use network-first strategy for non-document requests
| false
|
use network-first strategy for non-document requests
|
docs
|
diff --git a/packages/docs/src/service-worker.js b/packages/docs/src/service-worker.js
index 3ec4c96b4d2..7a333267b8c 100644
--- a/packages/docs/src/service-worker.js
+++ b/packages/docs/src/service-worker.js
@@ -1,18 +1,18 @@
// Imports
import { matchPrecache, precacheAndRoute } from 'workbox-precaching'
import { registerRoute, setCatchHandler, setDefaultHandler } from 'workbox-routing'
-import { CacheFirst, NetworkOnly } from 'workbox-strategies'
+import { NetworkFirst, NetworkOnly } from 'workbox-strategies'
const MANIFEST = self.__WB_MANIFEST
precacheAndRoute(MANIFEST)
-const cacheFirst = new CacheFirst()
const networkOnly = new NetworkOnly()
+const networkFirst = new NetworkFirst()
registerRoute(
({ request }) => request.destination !== 'document',
- cacheFirst
+ networkFirst
)
registerRoute(
@@ -28,7 +28,7 @@ registerRoute(
}
)
-setDefaultHandler(networkOnly)
+setDefaultHandler(networkFirst)
setCatchHandler(async ({ url, request }) => {
if (
diff --git a/packages/docs/vite.config.ts b/packages/docs/vite.config.ts
index 153959d4eca..fb350f3d453 100644
--- a/packages/docs/vite.config.ts
+++ b/packages/docs/vite.config.ts
@@ -138,7 +138,7 @@ export default defineConfig(({ command, mode }) => {
{ url: '/_fallback.html', revision: Date.now().toString(16) },
],
dontCacheBustURLsMatching: /assets\/.+[A-Za-z0-9]{8}\.(js|css)$/,
- maximumFileSizeToCacheInBytes: 5 * 1024 ** 2,
+ maximumFileSizeToCacheInBytes: 15 * 1024 ** 2,
},
manifest: {
name: 'Vuetify',
@@ -200,6 +200,18 @@ export default defineConfig(({ command, mode }) => {
},
},
+ {
+ name: 'vuetify:fallback',
+ enforce: 'post',
+ transformIndexHtml (html) {
+ fs.writeFileSync(join('dist/_fallback.html'), html)
+ fs.writeFileSync(join('dist/_crowdin.html').replace(/<\/head>/, `
+<script type="text/javascript">let _jipt = [['project', 'vuetify']];</script>
+<script type="text/javascript" src="//cdn.crowdin.com/jipt/jipt.js"></script>
+$&`), html)
+ },
+ },
+
Inspect(),
],
@@ -208,14 +220,6 @@ export default defineConfig(({ command, mode }) => {
script: 'sync',
formatting: 'minify',
crittersOptions: false,
- onAfterClientBuild () {
- const index = fs.readFileSync(resolve('dist/index.html'), 'utf8')
- fs.writeFileSync(join('dist/_fallback.html'), index)
- fs.writeFileSync(join('dist/_crowdin.html').replace(/<\/head>/, `
-<script type="text/javascript">let _jipt = [['project', 'vuetify']];</script>
-<script type="text/javascript" src="//cdn.crowdin.com/jipt/jipt.js"></script>
-$&`), index)
- },
},
optimizeDeps: {
|
a1fdc23c4ef7724c8b8b55d97c983586dfb5077f
|
2019-10-03 18:16:27
|
MajesticPotatoe
|
docs(QuickStart): fix url path
| false
|
fix url path
|
docs
|
diff --git a/packages/docs/src/lang/pt-BR/getting-started/QuickStart.json b/packages/docs/src/lang/pt-BR/getting-started/QuickStart.json
index 256cf8bea93..ab21bcd776b 100644
--- a/packages/docs/src/lang/pt-BR/getting-started/QuickStart.json
+++ b/packages/docs/src/lang/pt-BR/getting-started/QuickStart.json
@@ -7,7 +7,7 @@
"vueCliText3": "**Dica**: Se você já tem **Vue CLI** instalado, você pode verificar se está na versão mais recente digitando <kbd>vue --version</kbd> em seu terminal.",
"vueCliText4": "Uma vez que o cli está instalado, você pode gerar um novo esqueleto de projeto. Selecione a _instalação padrão_ a menos que você tenha pacotes específicos que você precisa incluir (ex.: _vuex_ ou _vue-router_). Isto irá criar um novo projeto Vue que está pronto para funcionar com suas opções selecionadas.",
"vueCliText5": "Agora que você tem um projeto instanciado, você pode adicionar o [pacote Vuetify](https://github.com/vuetifyjs/vue-cli-plugin-vuetify) usando a cli.",
- "vueCliText6": "Isto irá fornecer-lhe um conjunto de opções para personalizar sua instalação. A predefinição padrão tem [a-la-carte](//customization/a-la-carte) já habilitado para você.",
+ "vueCliText6": "Isto irá fornecer-lhe um conjunto de opções para personalizar sua instalação. A predefinição padrão tem [a-la-carte](/customization/a-la-carte) já habilitado para você.",
"vueCliText7": "Após a instalação, simplesmente execute <kbd>yarn serve</kbd> ou <kbd>npm run serve</kbd> para iniciar sua aplicação.",
"uiHeader": "## Instalação Vue UI",
"uiText1": "Vuetify também pode ser instalado usando **Vue UI**, a nova aplicação visual para _@vue/cli_. Certifique-se de que você tenha a versão mais recente do Vue CLI instalada, e depois digite em seu terminal:",
|
b897800ee184263530f0e879f44704e804db280e
|
2022-07-07 14:58:25
|
Kael
|
fix: declare group:selected emits
| false
|
declare group:selected emits
|
fix
|
diff --git a/packages/vuetify/src/components/VBtn/VBtn.tsx b/packages/vuetify/src/components/VBtn/VBtn.tsx
index 30e80617ab9..7e4ac396cb1 100644
--- a/packages/vuetify/src/components/VBtn/VBtn.tsx
+++ b/packages/vuetify/src/components/VBtn/VBtn.tsx
@@ -75,6 +75,10 @@ export const VBtn = defineComponent({
...makeVariantProps({ variant: 'elevated' } as const),
},
+ emits: {
+ 'group:selected': (val: { value: boolean }) => true,
+ },
+
setup (props, { attrs, slots }) {
const { themeClasses } = provideTheme(props)
const { borderClasses } = useBorder(props)
diff --git a/packages/vuetify/src/components/VChip/VChip.tsx b/packages/vuetify/src/components/VChip/VChip.tsx
index 211c4e57709..4078443b124 100644
--- a/packages/vuetify/src/components/VChip/VChip.tsx
+++ b/packages/vuetify/src/components/VChip/VChip.tsx
@@ -82,8 +82,9 @@ export const VChip = defineComponent({
emits: {
'click:close': (e: Event) => true,
- 'update:active': (value: Boolean) => true,
- 'update:modelValue': (value: Boolean) => true,
+ 'update:active': (value: boolean) => true,
+ 'update:modelValue': (value: boolean) => true,
+ 'group:selected': (val: { value: boolean }) => true,
},
setup (props, { attrs, emit, slots }) {
diff --git a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
index c89b1417740..fad117cac70 100644
--- a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
+++ b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
@@ -31,6 +31,10 @@ export const VExpansionPanel = defineComponent({
...makeVExpansionPanelTitleProps(),
},
+ emits: {
+ 'group:selected': (val: { value: boolean }) => true,
+ },
+
setup (props, { slots }) {
const groupItem = useGroupItem(props, VExpansionPanelSymbol)
const { backgroundColorClasses, backgroundColorStyles } = useBackgroundColor(props, 'bgColor')
diff --git a/packages/vuetify/src/components/VItemGroup/VItem.tsx b/packages/vuetify/src/components/VItemGroup/VItem.tsx
index 2ff7544217d..c43a73e5265 100644
--- a/packages/vuetify/src/components/VItemGroup/VItem.tsx
+++ b/packages/vuetify/src/components/VItemGroup/VItem.tsx
@@ -18,6 +18,10 @@ export const VItem = genericComponent<new () => {
props: makeGroupItemProps(),
+ emits: {
+ 'group:selected': (val: { value: boolean }) => true,
+ },
+
setup (props, { slots }) {
const { isSelected, select, toggle, selectedClass, value, disabled } = useGroupItem(props, VItemGroupSymbol)
return () => slots.default?.({
diff --git a/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx b/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx
index 1ed6db9abb9..9d446ad2e6d 100644
--- a/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx
+++ b/packages/vuetify/src/components/VSlideGroup/VSlideGroupItem.tsx
@@ -14,6 +14,10 @@ export const VSlideGroupItem = defineComponent({
...makeGroupItemProps(),
},
+ emits: {
+ 'group:selected': (val: { value: boolean }) => true,
+ },
+
setup (props, { slots }) {
const slideGroupItem = useGroupItem(props, VSlideGroupSymbol)
diff --git a/packages/vuetify/src/components/VWindow/VWindowItem.tsx b/packages/vuetify/src/components/VWindow/VWindowItem.tsx
index d5af1f6206a..f4635890e8a 100644
--- a/packages/vuetify/src/components/VWindow/VWindowItem.tsx
+++ b/packages/vuetify/src/components/VWindow/VWindowItem.tsx
@@ -33,6 +33,10 @@ export const VWindowItem = defineComponent({
...makeLazyProps(),
},
+ emits: {
+ 'group:selected': (val: { value: boolean }) => true,
+ },
+
setup (props, { slots }) {
const window = inject(VWindowSymbol)
const groupItem = useGroupItem(props, VWindowGroupSymbol)
diff --git a/packages/vuetify/src/composables/group.ts b/packages/vuetify/src/composables/group.ts
index 73127173b2c..45ebd61beb5 100644
--- a/packages/vuetify/src/composables/group.ts
+++ b/packages/vuetify/src/composables/group.ts
@@ -71,7 +71,9 @@ export const makeGroupItemProps = propsFactory({
selectedClass: String,
}, 'group-item')
-export type GroupItemProps = ExtractPropTypes<ReturnType<typeof makeGroupItemProps>>
+export interface GroupItemProps extends ExtractPropTypes<ReturnType<typeof makeGroupItemProps>> {
+ 'onGroup:selected': ((val: { value: boolean }) => void) | undefined
+}
// Composables
export function useGroupItem (
|
fc8c2ede01c380a0053a26bd91d752ae8c55f92f
|
2019-03-11 21:46:01
|
John Leider
|
feat(VToolbar/VAppBar): update to md2 spec (#6701)
| false
|
update to md2 spec (#6701)
|
feat
|
diff --git a/packages/api-generator/src/map.js b/packages/api-generator/src/map.js
index 731e1130f84..b59c272126e 100755
--- a/packages/api-generator/src/map.js
+++ b/packages/api-generator/src/map.js
@@ -438,6 +438,15 @@ module.exports = {
'v-app': {
slots: ['default']
},
+ 'v-app-bar': {
+ slots: ['default', 'extension'],
+ scopedSlots: [{
+ name: 'img',
+ props: {
+ props: '{ height: string, src: string | srcObject }'
+ }
+ }]
+ },
'v-alert': {
slots: ['default'],
events: [
@@ -1225,7 +1234,19 @@ module.exports = {
]
},
'v-toolbar': {
- slots: ['default', 'extension']
+ slots: ['default', 'extension'],
+ scopedSlots: [{
+ name: 'img',
+ props: {
+ props: '{ height: string, src: string | srcObject }'
+ }
+ }]
+ },
+ 'v-toolbar-title': {
+ slots: ['default']
+ },
+ 'v-toolbar-items': {
+ slots: ['default']
},
'v-tooltip': {
slots: ['activator', 'default']
diff --git a/packages/docs/src/components/core/Toolbar.vue b/packages/docs/src/components/core/Toolbar.vue
index 6d118058e63..45e80b08557 100644
--- a/packages/docs/src/components/core/Toolbar.vue
+++ b/packages/docs/src/components/core/Toolbar.vue
@@ -1,7 +1,7 @@
<template>
- <v-toolbar
+ <v-app-bar
id="app-toolbar"
- :class="`elevation-${isHome ? 0 : 6}`"
+ :elevate-on-scroll="isHome"
app
clipped-left
clipped-right
@@ -10,7 +10,7 @@
fixed
height="58"
>
- <v-toolbar-side-icon
+ <v-app-bar-nav-icon
v-if="!isHome"
:aria-label="$t('Vuetify.AppToolbar.menu')"
class="hidden-lg-and-up"
@@ -55,7 +55,7 @@
<core-versions />
<core-locales />
</v-toolbar-items>
- </v-toolbar>
+ </v-app-bar>
</template>
<script>
diff --git a/packages/docs/src/components/doc/Api.vue b/packages/docs/src/components/doc/Api.vue
index 8518d4d5e91..f5bf66c7d67 100644
--- a/packages/docs/src/components/doc/Api.vue
+++ b/packages/docs/src/components/doc/Api.vue
@@ -7,8 +7,8 @@
:slider-color="computedTabs.length ? 'primary' : 'transparent'"
>
<v-tab
- v-for="(tab, i) in computedTabs"
- :key="`tab-${i}`"
+ v-for="(tab) in computedTabs"
+ :key="`tab-${tab}`"
:href="`#${tab}`"
>
{{ tab.replace(/([A-Z])/g, ' $1') }}
diff --git a/packages/docs/src/components/doc/Example.vue b/packages/docs/src/components/doc/Example.vue
index f5824984612..783b6397158 100644
--- a/packages/docs/src/components/doc/Example.vue
+++ b/packages/docs/src/components/doc/Example.vue
@@ -1,7 +1,6 @@
<template>
<v-card class="mb-5">
<v-toolbar
- card
dense
flat
>
diff --git a/packages/docs/src/data/drawerItems.json b/packages/docs/src/data/drawerItems.json
index b2db36b9362..b93e8a1d0dd 100644
--- a/packages/docs/src/data/drawerItems.json
+++ b/packages/docs/src/data/drawerItems.json
@@ -74,6 +74,15 @@
{ "text": "avatars", "to": "avatars" },
{ "text": "badges", "to": "badges" },
{ "text": "banners", "to": "banners", "new": true },
+ {
+ "group": "components",
+ "text": "bars",
+ "children": [
+ { "text": "appBars", "to": "app-bars", "new": true },
+ { "text": "toolbars", "to": "toolbars", "updated": true },
+ { "text": "systemBars", "to": "system-bars", "updated": true }
+ ]
+ },
{ "text": "bottomNavigation", "to": "bottom-navigation" },
{ "text": "bottomSheets", "to": "bottom-sheets" },
{ "text": "breadcrumbs", "to": "breadcrumbs" },
@@ -141,7 +150,6 @@
{ "text": "subheaders", "to": "subheaders" },
{ "text": "tabs", "to": "tabs" },
{ "text": "timelines", "to": "timelines" },
- { "text": "toolbars", "to": "toolbars" },
{ "text": "tooltips", "to": "tooltips" },
{ "text": "treeview", "to": "treeview", "updated": true }
]
diff --git a/packages/docs/src/data/pages/components/AppBars.json b/packages/docs/src/data/pages/components/AppBars.json
new file mode 100644
index 00000000000..cf605c37f5d
--- /dev/null
+++ b/packages/docs/src/data/pages/components/AppBars.json
@@ -0,0 +1,62 @@
+{
+ "title": "header",
+ "titleText": "headerText",
+ "mdSpec": {
+ "version": "2",
+ "link": "https://material.io/design/components/app-bars-top.html"
+ },
+ "children": [
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "usage",
+ "value": "usage"
+ }
+ ]
+ },
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "api",
+ "value": [
+ "v-app-bar"
+ ]
+ }
+ ]
+ },
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "examples",
+ "value": [
+ "dense",
+ "prominent",
+ "img",
+ "img-fade",
+ "hide",
+ "scroll-threshold",
+ "collapse",
+ "elevate-on-scroll",
+ "inverted-scroll"
+ ]
+ }
+ ]
+ },
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "up-next",
+ "value": [
+ "components/toolbars",
+ "components/buttons",
+ "components/icons"
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/packages/docs/src/data/pages/components/SystemBars.json b/packages/docs/src/data/pages/components/SystemBars.json
new file mode 100644
index 00000000000..ec3ef675e8f
--- /dev/null
+++ b/packages/docs/src/data/pages/components/SystemBars.json
@@ -0,0 +1,56 @@
+{
+ "title": "header",
+ "titleText": "headerText",
+ "mdSpec": {
+ "version": "1",
+ "link": "https://material.io/archive/guidelines/components/toolbars.html"
+ },
+ "children": [
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "usage",
+ "value": "usage"
+ }
+ ]
+ },
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "api",
+ "value": [
+ "v-system-bar"
+ ]
+ }
+ ]
+ },
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "examples",
+ "value": [
+ "window",
+ "themes",
+ "lights-out"
+ ]
+ }
+ ]
+ },
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "up-next",
+ "value": [
+ "components/buttons",
+ "components/toolbar",
+ "components/tabs"
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/packages/docs/src/data/pages/components/Toolbars.json b/packages/docs/src/data/pages/components/Toolbars.json
index 46e66866b5e..9490c7048fb 100644
--- a/packages/docs/src/data/pages/components/Toolbars.json
+++ b/packages/docs/src/data/pages/components/Toolbars.json
@@ -2,8 +2,8 @@
"title": "header",
"titleText": "headerText",
"mdSpec": {
- "version": "2",
- "link": "https://material.io/design/components/app-bars-top.html"
+ "version": "1",
+ "link": "https://material.io/archive/guidelines/components/toolbars.html"
},
"children": [
{
@@ -22,7 +22,8 @@
"type": "api",
"value": [
"v-toolbar",
- "v-system-bar"
+ "v-toolbar-title",
+ "v-toolbar-items"
]
}
]
@@ -33,18 +34,14 @@
{
"type": "examples",
"value": [
- "appBar",
- "appBarItems",
- "appBarExtension",
"columnWidthWithHierarchy",
"flexibleAndCard",
"floatingWithSearch",
"variations",
"prominent",
"dense",
- "scrolling",
- "appBarMenu",
- "systemBarsStatusWindow"
+ "contextualActionBar",
+ "background"
]
}
]
diff --git a/packages/docs/src/examples/app-bars/collapse.vue b/packages/docs/src/examples/app-bars/collapse.vue
new file mode 100644
index 00000000000..49fdeea4426
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/collapse.vue
@@ -0,0 +1,39 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ :collapse="!collapseOnScroll"
+ :collapse-on-scroll="collapseOnScroll"
+ absolute
+ color="deep-purple accent-4"
+ dark
+ scroll-target="#scrolling-techniques-6"
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Collapsing Bar</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-checkbox
+ v-model="collapseOnScroll"
+ color="white"
+ hide-details
+ ></v-checkbox>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-6"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1000px;"></v-container>
+ </v-sheet>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ collapseOnScroll: true
+ })
+ }
+</script>
diff --git a/packages/docs/src/examples/app-bars/dense.vue b/packages/docs/src/examples/app-bars/dense.vue
new file mode 100644
index 00000000000..b5a22ca7401
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/dense.vue
@@ -0,0 +1,42 @@
+<template>
+ <v-app-bar
+ color="deep-purple accent-4"
+ dense
+ dark
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Page title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>mdi-heart</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-menu
+ left
+ bottom
+ >
+ <template #activator="{ on }">
+ <v-btn icon v-on="on">
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </template>
+
+ <v-list>
+ <v-list-tile
+ v-for="n in 5"
+ :key="n"
+ @click="() => {}"
+ >
+ <v-list-tile-title>Option {{ n }}</v-list-tile-title>
+ </v-list-tile>
+ </v-list>
+ </v-menu>
+ </v-app-bar>
+</template>
diff --git a/packages/docs/src/examples/app-bars/elevate-on-scroll.vue b/packages/docs/src/examples/app-bars/elevate-on-scroll.vue
new file mode 100644
index 00000000000..4f417bf2779
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/elevate-on-scroll.vue
@@ -0,0 +1,37 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ absolute
+ color="white"
+ elevate-on-scroll
+ scroll-target="#scrolling-techniques-7"
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>favorite</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-7"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1500px;">
+
+ </v-container>
+ </v-sheet>
+ </v-card>
+</template>
diff --git a/packages/docs/src/examples/app-bars/hide.vue b/packages/docs/src/examples/app-bars/hide.vue
new file mode 100644
index 00000000000..b0c0e9fd1c9
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/hide.vue
@@ -0,0 +1,37 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ absolute
+ color="teal lighten-3"
+ dark
+ hide-on-scroll
+ prominent
+ scroll-target="#scrolling-techniques-4"
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>favorite</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-4"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1000px;"></v-container>
+ </v-sheet>
+ </v-card>
+</template>
diff --git a/packages/docs/src/examples/app-bars/img-fade.vue b/packages/docs/src/examples/app-bars/img-fade.vue
new file mode 100644
index 00000000000..1f3b2283664
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/img-fade.vue
@@ -0,0 +1,54 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ absolute
+ color="#6A76AB"
+ dark
+ shrink-on-scroll
+ prominent
+ src="https://picsum.photos/1920/1080?random"
+ fade-img-on-scroll
+ scroll-target="#scrolling-techniques-3"
+ >
+ <template v-slot:img="{ props }">
+ <v-img
+ v-bind="props"
+ gradient="to top right, rgba(100,115,201,.7), rgba(25,32,72,.7)"
+ ></v-img>
+ </template>
+
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>favorite</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+
+ <template v-slot:extension>
+ <v-tabs align-with-title>
+ <v-tab>Tab 1</v-tab>
+ <v-tab>Tab 2</v-tab>
+ <v-tab>Tab 3</v-tab>
+ </v-tabs>
+ </template>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-3"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1000px;"></v-container>
+ </v-sheet>
+ </v-card>
+</template>
diff --git a/packages/docs/src/examples/app-bars/img.vue b/packages/docs/src/examples/app-bars/img.vue
new file mode 100644
index 00000000000..993a3e0c945
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/img.vue
@@ -0,0 +1,44 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ absolute
+ color="#fcb69f"
+ dark
+ shrink-on-scroll
+ src="https://picsum.photos/1920/1080?random"
+ scroll-target="#scrolling-techniques-2"
+ >
+ <template v-slot:img="{ props }">
+ <v-img
+ v-bind="props"
+ gradient="to top right, rgba(19,84,122,.5), rgba(128,208,199,.8)"
+ ></v-img>
+ </template>
+
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>favorite</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-2"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1000px;"></v-container>
+ </v-sheet>
+ </v-card>
+</template>
diff --git a/packages/docs/src/examples/app-bars/inverted-scroll.vue b/packages/docs/src/examples/app-bars/inverted-scroll.vue
new file mode 100644
index 00000000000..81f137a2485
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/inverted-scroll.vue
@@ -0,0 +1,38 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ absolute
+ color="primary"
+ dark
+ inverted-scroll
+ scroll-target="#scrolling-techniques-8"
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>favorite</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-8"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1500px;">
+
+ </v-container>
+ </v-sheet>
+ </v-card>
+</template>
diff --git a/packages/docs/src/examples/toolbars/scrolling.vue b/packages/docs/src/examples/app-bars/prominent.vue
similarity index 65%
rename from packages/docs/src/examples/toolbars/scrolling.vue
rename to packages/docs/src/examples/app-bars/prominent.vue
index f149150cfd3..e11ea9e3185 100644
--- a/packages/docs/src/examples/toolbars/scrolling.vue
+++ b/packages/docs/src/examples/app-bars/prominent.vue
@@ -1,16 +1,14 @@
<template>
- <div
- class="hide-overflow"
- style="position: relative;"
- >
- <v-toolbar
+ <v-card class="hide-overflow">
+ <v-app-bar
absolute
- color="teal lighten-3"
+ color="indigo darken-2"
dark
- scroll-off-screen
+ shrink-on-scroll
+ prominent
scroll-target="#scrolling-techniques"
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Title</v-toolbar-title>
@@ -27,13 +25,13 @@
<v-btn icon>
<v-icon>more_vert</v-icon>
</v-btn>
- </v-toolbar>
- <div
+ </v-app-bar>
+ <v-sheet
id="scrolling-techniques"
class="scroll-y"
- style="max-height: 600px;"
+ max-height="600"
>
<v-container style="height: 1000px;"></v-container>
- </div>
- </div>
+ </v-sheet>
+ </v-card>
</template>
diff --git a/packages/docs/src/examples/app-bars/scroll-threshold.vue b/packages/docs/src/examples/app-bars/scroll-threshold.vue
new file mode 100644
index 00000000000..8aaf989f4a4
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/scroll-threshold.vue
@@ -0,0 +1,47 @@
+<template>
+ <v-card class="hide-overflow">
+ <v-app-bar
+ absolute
+ color="#43a047"
+ dark
+ shrink-on-scroll
+ prominent
+ src="https://picsum.photos/1920/1080?random"
+ fade-img-on-scroll
+ scroll-target="#scrolling-techniques-5"
+ scroll-threshold="500"
+ >
+ <template v-slot:img="{ props }">
+ <v-img
+ v-bind="props"
+ gradient="to top right, rgba(55,236,186,.7), rgba(25,32,72,.7)"
+ ></v-img>
+ </template>
+
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>favorite</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+ </v-app-bar>
+ <v-sheet
+ id="scrolling-techniques-5"
+ class="scroll-y"
+ max-height="600"
+ >
+ <v-container style="height: 1500px;"></v-container>
+ </v-sheet>
+ </v-card>
+</template>
diff --git a/packages/docs/src/examples/app-bars/usage.vue b/packages/docs/src/examples/app-bars/usage.vue
new file mode 100644
index 00000000000..ead117953f6
--- /dev/null
+++ b/packages/docs/src/examples/app-bars/usage.vue
@@ -0,0 +1,41 @@
+<template>
+ <v-app-bar
+ color="deep-purple accent-4"
+ dark
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Page title</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>mdi-heart</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-menu
+ left
+ bottom
+ >
+ <template #activator="{ on }">
+ <v-btn icon v-on="on">
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </template>
+
+ <v-list>
+ <v-list-tile
+ v-for="n in 5"
+ :key="n"
+ @click="() => {}"
+ >
+ <v-list-tile-title>Option {{ n }}</v-list-tile-title>
+ </v-list-tile>
+ </v-list>
+ </v-menu>
+ </v-app-bar>
+</template>
diff --git a/packages/docs/src/examples/autocompletes/advanced.vue b/packages/docs/src/examples/autocompletes/advanced.vue
index 568a4a473ec..0d930c0b78d 100644
--- a/packages/docs/src/examples/autocompletes/advanced.vue
+++ b/packages/docs/src/examples/autocompletes/advanced.vue
@@ -4,7 +4,7 @@
prominent
tabs
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title class="title mr-4">Cryptocurrency</v-toolbar-title>
<v-autocomplete
v-model="model"
diff --git a/packages/docs/src/examples/button-groups/appBar.vue b/packages/docs/src/examples/button-groups/appBar.vue
index c2706f3b50d..49b6e5b74d9 100644
--- a/packages/docs/src/examples/button-groups/appBar.vue
+++ b/packages/docs/src/examples/button-groups/appBar.vue
@@ -17,59 +17,53 @@
class="pa-0"
overflow
></v-overflow-btn>
+ <v-divider vertical></v-divider>
+
+ <template v-if="$vuetify.breakpoint.mdAndUp">
- <v-divider
- class="mr-2"
- vertical
- ></v-divider>
+ <v-spacer></v-spacer>
- <v-btn-toggle
- v-model="toggle_multiple"
- class="transparent"
- multiple
- >
- <v-btn :value="1" text>
- <v-icon>format_bold</v-icon>
- </v-btn>
+ <v-btn-toggle
+ v-model="toggle_multiple"
+ multiple
+ >
+ <v-btn :value="1" text>
+ <v-icon>format_bold</v-icon>
+ </v-btn>
- <v-btn :value="2" text>
- <v-icon>format_italic</v-icon>
- </v-btn>
+ <v-btn :value="2" text>
+ <v-icon>format_italic</v-icon>
+ </v-btn>
- <v-btn :value="3" text>
- <v-icon>format_underlined</v-icon>
- </v-btn>
+ <v-btn :value="3" text>
+ <v-icon>format_underlined</v-icon>
+ </v-btn>
- <v-btn :value="4" text>
- <v-icon>format_color_fill</v-icon>
- </v-btn>
- </v-btn-toggle>
+ <v-btn :value="4" text>
+ <v-icon>format_color_fill</v-icon>
+ </v-btn>
+ </v-btn-toggle>
- <v-divider
- class="mx-2"
- vertical
- ></v-divider>
+ <div class="mx-3"></div>
- <v-btn-toggle
- v-model="toggle_exclusive"
- class="transparent"
- >
- <v-btn :value="1" text>
- <v-icon>format_align_left</v-icon>
- </v-btn>
+ <v-btn-toggle v-model="toggle_exclusive">
+ <v-btn :value="1" text>
+ <v-icon>format_align_left</v-icon>
+ </v-btn>
- <v-btn :value="2" text>
- <v-icon>format_align_center</v-icon>
- </v-btn>
+ <v-btn :value="2" text>
+ <v-icon>format_align_center</v-icon>
+ </v-btn>
- <v-btn :value="3" text>
- <v-icon>format_align_right</v-icon>
- </v-btn>
+ <v-btn :value="3" text>
+ <v-icon>format_align_right</v-icon>
+ </v-btn>
- <v-btn :value="4" text>
- <v-icon>format_align_justify</v-icon>
- </v-btn>
- </v-btn-toggle>
+ <v-btn :value="4" text>
+ <v-icon>format_align_justify</v-icon>
+ </v-btn>
+ </v-btn-toggle>
+ </template>
</v-toolbar>
</template>
diff --git a/packages/docs/src/examples/cards/grids.vue b/packages/docs/src/examples/cards/grids.vue
index f976f32ea80..0b4bd36eb53 100644
--- a/packages/docs/src/examples/cards/grids.vue
+++ b/packages/docs/src/examples/cards/grids.vue
@@ -2,7 +2,7 @@
<v-layout justify-center>
<v-flex xs12 sm6>
<v-toolbar color="indigo" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Discover</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/cards/horizontal.vue b/packages/docs/src/examples/cards/horizontal.vue
index 691a4bbecf7..250725c50e0 100644
--- a/packages/docs/src/examples/cards/horizontal.vue
+++ b/packages/docs/src/examples/cards/horizontal.vue
@@ -8,7 +8,7 @@
color="pink"
dark
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>My Music</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/chips/photos.vue b/packages/docs/src/examples/chips/photos.vue
index b256e0a2c3c..0c9237e24cc 100644
--- a/packages/docs/src/examples/chips/photos.vue
+++ b/packages/docs/src/examples/chips/photos.vue
@@ -8,7 +8,7 @@
card
color="transparent"
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Photo Info</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn
diff --git a/packages/docs/src/examples/dividers/dividerList.vue b/packages/docs/src/examples/dividers/dividerList.vue
index 140a9de7204..a3348c035a2 100644
--- a/packages/docs/src/examples/dividers/dividerList.vue
+++ b/packages/docs/src/examples/dividers/dividerList.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm8 md6>
<v-card>
<v-toolbar color="orange lighten-1" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Message Board</v-toolbar-title>
diff --git a/packages/docs/src/examples/dividers/inset.vue b/packages/docs/src/examples/dividers/inset.vue
index 14dae59e615..74205ea0a70 100644
--- a/packages/docs/src/examples/dividers/inset.vue
+++ b/packages/docs/src/examples/dividers/inset.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="cyan" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/dividers/lightAndDark.vue b/packages/docs/src/examples/dividers/lightAndDark.vue
index e9e3797efe1..10902c951b7 100644
--- a/packages/docs/src/examples/dividers/lightAndDark.vue
+++ b/packages/docs/src/examples/dividers/lightAndDark.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="indigo" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Manage</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/dividers/subheaders.vue b/packages/docs/src/examples/dividers/subheaders.vue
index 52562dc7c1e..eee472f6925 100644
--- a/packages/docs/src/examples/dividers/subheaders.vue
+++ b/packages/docs/src/examples/dividers/subheaders.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="light-blue" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>My files</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn dark icon>
diff --git a/packages/docs/src/examples/dividers/usage.vue b/packages/docs/src/examples/dividers/usage.vue
index 54d18373dfe..2687243a2a1 100644
--- a/packages/docs/src/examples/dividers/usage.vue
+++ b/packages/docs/src/examples/dividers/usage.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="pink" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/dividers/vertical.vue b/packages/docs/src/examples/dividers/vertical.vue
index 052924e8da7..99ec1ce133f 100644
--- a/packages/docs/src/examples/dividers/vertical.vue
+++ b/packages/docs/src/examples/dividers/vertical.vue
@@ -35,6 +35,6 @@
<v-divider vertical></v-divider>
</v-toolbar-items>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
</v-toolbar>
</template>
diff --git a/packages/docs/src/examples/floating-action-buttons/displayAnimation.vue b/packages/docs/src/examples/floating-action-buttons/displayAnimation.vue
index 8b24c15e95e..30333ce8889 100644
--- a/packages/docs/src/examples/floating-action-buttons/displayAnimation.vue
+++ b/packages/docs/src/examples/floating-action-buttons/displayAnimation.vue
@@ -4,7 +4,7 @@
<v-flex xs12 sm12 md6 offset-md3>
<v-card>
<v-toolbar extended>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-fab-transition>
<v-btn
v-show="!hidden"
diff --git a/packages/docs/src/examples/floating-action-buttons/lateralScreens.vue b/packages/docs/src/examples/floating-action-buttons/lateralScreens.vue
index 348655cfab1..bc5b72bf4c7 100644
--- a/packages/docs/src/examples/floating-action-buttons/lateralScreens.vue
+++ b/packages/docs/src/examples/floating-action-buttons/lateralScreens.vue
@@ -1,7 +1,7 @@
<template>
<div id="lateral">
<v-toolbar dark tabs flat color="indigo">
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Page title</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/floating-action-buttons/small.vue b/packages/docs/src/examples/floating-action-buttons/small.vue
index 8841e4d3572..d846644c9a1 100644
--- a/packages/docs/src/examples/floating-action-buttons/small.vue
+++ b/packages/docs/src/examples/floating-action-buttons/small.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="light-blue" light extended>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-btn
fab
small
diff --git a/packages/docs/src/examples/floating-action-buttons/usage.vue b/packages/docs/src/examples/floating-action-buttons/usage.vue
index 99d07b29bd7..1b9b8c21ab9 100644
--- a/packages/docs/src/examples/floating-action-buttons/usage.vue
+++ b/packages/docs/src/examples/floating-action-buttons/usage.vue
@@ -4,7 +4,7 @@
<v-flex xs12 sm12 md6>
<v-card>
<v-toolbar>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
</v-toolbar>
<v-card-text style="height: 300px;" class="grey lighten-5"></v-card-text>
<v-card-text style="height: 100px; position: relative">
@@ -24,7 +24,7 @@
<v-flex xs12 sm12 md6>
<v-card>
<v-toolbar extended>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-btn
color="pink"
dark
diff --git a/packages/docs/src/examples/grid/spacer.vue b/packages/docs/src/examples/grid/spacer.vue
index b2e3c44f7f9..8a723d3cca1 100644
--- a/packages/docs/src/examples/grid/spacer.vue
+++ b/packages/docs/src/examples/grid/spacer.vue
@@ -1,6 +1,6 @@
<template>
<v-toolbar dark color="primary">
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title class="white--text">Title</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/layouts/baseline.vue b/packages/docs/src/examples/layouts/baseline.vue
index 6ce5de46cf6..3dc7898831d 100644
--- a/packages/docs/src/examples/layouts/baseline.vue
+++ b/packages/docs/src/examples/layouts/baseline.vue
@@ -25,7 +25,7 @@
</v-list>
</v-navigation-drawer>
<v-toolbar color="indigo" dark fixed app>
- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<v-toolbar-title>Application</v-toolbar-title>
</v-toolbar>
<v-content>
diff --git a/packages/docs/src/examples/layouts/baselineFlipped.vue b/packages/docs/src/examples/layouts/baselineFlipped.vue
index a468bf7e394..17dcaa0c396 100644
--- a/packages/docs/src/examples/layouts/baselineFlipped.vue
+++ b/packages/docs/src/examples/layouts/baselineFlipped.vue
@@ -28,7 +28,7 @@
<v-toolbar color="cyan" dark fixed app>
<v-spacer></v-spacer>
<v-toolbar-title>Application</v-toolbar-title>
- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
</v-toolbar>
<v-content>
<v-container fluid fill-height>
diff --git a/packages/docs/src/examples/layouts/complex.vue b/packages/docs/src/examples/layouts/complex.vue
index e5f98f295ce..944b6037a3a 100644
--- a/packages/docs/src/examples/layouts/complex.vue
+++ b/packages/docs/src/examples/layouts/complex.vue
@@ -25,10 +25,10 @@
app
clipped-right
>
- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<v-toolbar-title>Toolbar</v-toolbar-title>
<v-spacer></v-spacer>
- <v-toolbar-side-icon @click.stop="drawerRight = !drawerRight"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawerRight = !drawerRight"></v-app-bar-nav-icon>
</v-toolbar>
<v-navigation-drawer
v-model="drawer"
diff --git a/packages/docs/src/examples/layouts/dark.vue b/packages/docs/src/examples/layouts/dark.vue
index dd9280d7557..92efe119608 100644
--- a/packages/docs/src/examples/layouts/dark.vue
+++ b/packages/docs/src/examples/layouts/dark.vue
@@ -26,7 +26,7 @@
</v-list>
</v-navigation-drawer>
<v-toolbar app fixed clipped-left>
- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<v-toolbar-title>Application</v-toolbar-title>
</v-toolbar>
<v-content>
diff --git a/packages/docs/src/examples/layouts/googleContacts.vue b/packages/docs/src/examples/layouts/googleContacts.vue
index dc746eee8e1..e124d549ab9 100644
--- a/packages/docs/src/examples/layouts/googleContacts.vue
+++ b/packages/docs/src/examples/layouts/googleContacts.vue
@@ -75,7 +75,7 @@
fixed
>
<v-toolbar-title style="width: 300px" class="ml-0 pl-3">
- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<span class="hidden-sm-and-down">Google Contacts</span>
</v-toolbar-title>
<v-text-field
diff --git a/packages/docs/src/examples/layouts/googleKeep.vue b/packages/docs/src/examples/layouts/googleKeep.vue
index f4f66a97ab5..4349d0a823e 100644
--- a/packages/docs/src/examples/layouts/googleKeep.vue
+++ b/packages/docs/src/examples/layouts/googleKeep.vue
@@ -51,7 +51,7 @@
</v-list>
</v-navigation-drawer>
<v-toolbar color="amber" app absolute clipped-left>
- <v-toolbar-side-icon @click="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click="drawer = !drawer"></v-app-bar-nav-icon>
<span class="title ml-3 mr-5">Google <span class="font-weight-light">Keep</span></span>
<v-text-field
solo-inverted
diff --git a/packages/docs/src/examples/layouts/googleYoutube.vue b/packages/docs/src/examples/layouts/googleYoutube.vue
index ee6d511fc36..85881aa85c8 100644
--- a/packages/docs/src/examples/layouts/googleYoutube.vue
+++ b/packages/docs/src/examples/layouts/googleYoutube.vue
@@ -50,7 +50,7 @@
clipped-left
app
>
- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<v-icon class="mx-3">fab fa-youtube</v-icon>
<v-toolbar-title class="mr-5 align-center">
<span class="title">Youtube</span>
diff --git a/packages/docs/src/examples/layouts/sandbox.vue b/packages/docs/src/examples/layouts/sandbox.vue
index 1ba89d1d3ed..5bae1d83523 100644
--- a/packages/docs/src/examples/layouts/sandbox.vue
+++ b/packages/docs/src/examples/layouts/sandbox.vue
@@ -12,10 +12,10 @@
app
></v-navigation-drawer>
<v-toolbar :clipped-left="primaryDrawer.clipped" app absolute>
- <v-toolbar-side-icon
+ <v-app-bar-nav-icon
v-if="primaryDrawer.type !== 'permanent'"
@click.stop="primaryDrawer.model = !primaryDrawer.model"
- ></v-toolbar-side-icon>
+ ></v-app-bar-nav-icon>
<v-toolbar-title>Vuetify</v-toolbar-title>
</v-toolbar>
<v-content>
diff --git a/packages/docs/src/examples/lists/actionTitleAndSubtitle.vue b/packages/docs/src/examples/lists/actionTitleAndSubtitle.vue
index 1195ec49a59..64d2a3dcd5b 100644
--- a/packages/docs/src/examples/lists/actionTitleAndSubtitle.vue
+++ b/packages/docs/src/examples/lists/actionTitleAndSubtitle.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="purple" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Settings</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/actionWithTitleAndSubtitle.vue b/packages/docs/src/examples/lists/actionWithTitleAndSubtitle.vue
index 726a70c13b6..3b164063e87 100644
--- a/packages/docs/src/examples/lists/actionWithTitleAndSubtitle.vue
+++ b/packages/docs/src/examples/lists/actionWithTitleAndSubtitle.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="purple" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Settings</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/avatarSubheaderTitleAndAction.vue b/packages/docs/src/examples/lists/avatarSubheaderTitleAndAction.vue
index 2f73d3528b7..9fe1626262f 100644
--- a/packages/docs/src/examples/lists/avatarSubheaderTitleAndAction.vue
+++ b/packages/docs/src/examples/lists/avatarSubheaderTitleAndAction.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="teal" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title class="text-xs-center">New Chat</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/avatarThreeLines.vue b/packages/docs/src/examples/lists/avatarThreeLines.vue
index 5789a1452a6..e8e15e653d8 100644
--- a/packages/docs/src/examples/lists/avatarThreeLines.vue
+++ b/packages/docs/src/examples/lists/avatarThreeLines.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="cyan" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/avatarTitleAndAction.vue b/packages/docs/src/examples/lists/avatarTitleAndAction.vue
index bbc89136e16..0555c6155b0 100644
--- a/packages/docs/src/examples/lists/avatarTitleAndAction.vue
+++ b/packages/docs/src/examples/lists/avatarTitleAndAction.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="indigo" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/expansionLists.vue b/packages/docs/src/examples/lists/expansionLists.vue
index 1b4321aeea7..be2f20d0150 100644
--- a/packages/docs/src/examples/lists/expansionLists.vue
+++ b/packages/docs/src/examples/lists/expansionLists.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="teal" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Topics</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/iconTwoLinesAndAction.vue b/packages/docs/src/examples/lists/iconTwoLinesAndAction.vue
index 8bf85192b96..a0af9631027 100644
--- a/packages/docs/src/examples/lists/iconTwoLinesAndAction.vue
+++ b/packages/docs/src/examples/lists/iconTwoLinesAndAction.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="light-blue" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>My files</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/subheadingsAndDividers.vue b/packages/docs/src/examples/lists/subheadingsAndDividers.vue
index 70d1b70abe7..154fd58bfb5 100644
--- a/packages/docs/src/examples/lists/subheadingsAndDividers.vue
+++ b/packages/docs/src/examples/lists/subheadingsAndDividers.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="teal" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Settings</v-toolbar-title>
</v-toolbar>
diff --git a/packages/docs/src/examples/lists/titleSubtitleActionsAndActionText.vue b/packages/docs/src/examples/lists/titleSubtitleActionsAndActionText.vue
index 73d6a5cd3a8..48f623f577f 100644
--- a/packages/docs/src/examples/lists/titleSubtitleActionsAndActionText.vue
+++ b/packages/docs/src/examples/lists/titleSubtitleActionsAndActionText.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="pink" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
diff --git a/packages/docs/src/examples/lists/usage.vue b/packages/docs/src/examples/lists/usage.vue
index a59169f528a..347d7f56129 100644
--- a/packages/docs/src/examples/lists/usage.vue
+++ b/packages/docs/src/examples/lists/usage.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="cyan" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
diff --git a/packages/docs/src/examples/subheaders/menu.vue b/packages/docs/src/examples/subheaders/menu.vue
index fb811fb372e..20ab46f94ba 100644
--- a/packages/docs/src/examples/subheaders/menu.vue
+++ b/packages/docs/src/examples/subheaders/menu.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="teal" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Manage</v-toolbar-title>
diff --git a/packages/docs/src/examples/subheaders/social.vue b/packages/docs/src/examples/subheaders/social.vue
index ec6c74ed8d1..2b4db904622 100644
--- a/packages/docs/src/examples/subheaders/social.vue
+++ b/packages/docs/src/examples/subheaders/social.vue
@@ -7,7 +7,7 @@
color="cyan"
dark
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Application</v-toolbar-title>
diff --git a/packages/docs/src/examples/subheaders/usage.vue b/packages/docs/src/examples/subheaders/usage.vue
index 05cb719c9b3..5668e2f1125 100644
--- a/packages/docs/src/examples/subheaders/usage.vue
+++ b/packages/docs/src/examples/subheaders/usage.vue
@@ -3,7 +3,7 @@
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-toolbar color="cyan" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Inbox</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/examples/system-bars/lights-out.vue b/packages/docs/src/examples/system-bars/lights-out.vue
new file mode 100644
index 00000000000..b9084ded1ad
--- /dev/null
+++ b/packages/docs/src/examples/system-bars/lights-out.vue
@@ -0,0 +1,24 @@
+<template>
+ <div>
+ <v-subheader>Lights out (light)</v-subheader>
+ <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg" height="200px">
+ <v-system-bar status color="primary" lights-out>
+ <v-spacer></v-spacer>
+ <v-icon>network_wifi</v-icon>
+ <v-icon>signal_cellular_null</v-icon>
+ <v-icon>battery_full</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ <v-subheader>Lights out (dark)</v-subheader>
+ <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg" height="200px">
+ <v-system-bar status color="primary" lights-out dark>
+ <v-spacer></v-spacer>
+ <v-icon>network_wifi</v-icon>
+ <v-icon>signal_cellular_null</v-icon>
+ <v-icon>battery_full</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </div>
+</template>
diff --git a/packages/docs/src/examples/system-bars/themes.vue b/packages/docs/src/examples/system-bars/themes.vue
new file mode 100644
index 00000000000..5d30d7636d9
--- /dev/null
+++ b/packages/docs/src/examples/system-bars/themes.vue
@@ -0,0 +1,24 @@
+<template>
+ <div>
+ <v-subheader>Light status bar</v-subheader>
+ <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg" height="200px">
+ <v-system-bar status color="primary">
+ <v-spacer></v-spacer>
+ <v-icon>network_wifi</v-icon>
+ <v-icon>signal_cellular_null</v-icon>
+ <v-icon>battery_full</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ <v-subheader>Dark status bar</v-subheader>
+ <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg" height="200px">
+ <v-system-bar status color="primary" dark>
+ <v-spacer></v-spacer>
+ <v-icon>network_wifi</v-icon>
+ <v-icon>signal_cellular_null</v-icon>
+ <v-icon>battery_full</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </div>
+</template>
diff --git a/packages/docs/src/examples/system-bars/usage.vue b/packages/docs/src/examples/system-bars/usage.vue
new file mode 100644
index 00000000000..8da5ea9e74e
--- /dev/null
+++ b/packages/docs/src/examples/system-bars/usage.vue
@@ -0,0 +1,15 @@
+<template>
+ <div>
+ <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg" height="200px">
+ <v-system-bar status color="primary">
+ <v-icon>mdi-gmail</v-icon>
+ <span>10 unread emails</span>
+ <v-spacer></v-spacer>
+ <v-icon>network_wifi</v-icon>
+ <v-icon>signal_cellular_null</v-icon>
+ <v-icon>battery_full</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </div>
+</template>
diff --git a/packages/docs/src/examples/system-bars/window.vue b/packages/docs/src/examples/system-bars/window.vue
new file mode 100644
index 00000000000..a7d80ea3b44
--- /dev/null
+++ b/packages/docs/src/examples/system-bars/window.vue
@@ -0,0 +1,12 @@
+<template>
+ <div>
+ <v-system-bar window dark>
+ <v-icon>mdi-message</v-icon>
+ <span>10 unread messages</span>
+ <v-spacer></v-spacer>
+ <v-icon>remove</v-icon>
+ <v-icon>check_box_outline_blank</v-icon>
+ <v-icon>close</v-icon>
+ </v-system-bar>
+ </div>
+</template>
diff --git a/packages/docs/src/examples/tabs/alignWithTitle.vue b/packages/docs/src/examples/tabs/alignWithTitle.vue
index 2534e12660a..3f0808a81e3 100644
--- a/packages/docs/src/examples/tabs/alignWithTitle.vue
+++ b/packages/docs/src/examples/tabs/alignWithTitle.vue
@@ -6,7 +6,7 @@
flat
tabs
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Your Dashboard</v-toolbar-title>
diff --git a/packages/docs/src/examples/tabs/content.vue b/packages/docs/src/examples/tabs/content.vue
index 0736c197174..7b93989b985 100644
--- a/packages/docs/src/examples/tabs/content.vue
+++ b/packages/docs/src/examples/tabs/content.vue
@@ -6,7 +6,7 @@
card
tabs
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Page title</v-toolbar-title>
diff --git a/packages/docs/src/examples/tabs/desktop.vue b/packages/docs/src/examples/tabs/desktop.vue
index b419a72d2fd..8353f0f54a6 100644
--- a/packages/docs/src/examples/tabs/desktop.vue
+++ b/packages/docs/src/examples/tabs/desktop.vue
@@ -4,7 +4,7 @@
tabs
flat
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Contact Database</v-toolbar-title>
diff --git a/packages/docs/src/examples/tabs/overflowToMenu.vue b/packages/docs/src/examples/tabs/overflowToMenu.vue
index 6771cc96ef3..d358f209e1f 100644
--- a/packages/docs/src/examples/tabs/overflowToMenu.vue
+++ b/packages/docs/src/examples/tabs/overflowToMenu.vue
@@ -6,7 +6,7 @@
dark
tabs
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Page title</v-toolbar-title>
@@ -20,7 +20,7 @@
<v-icon>more_vert</v-icon>
</v-btn>
- <template #extension>
+ <template v-slot:extension>
<v-tabs
v-model="currentItem"
fixed-tabs
diff --git a/packages/docs/src/examples/toolbars/appBar.vue b/packages/docs/src/examples/toolbars/appBar.vue
deleted file mode 100644
index 09a82bc5305..00000000000
--- a/packages/docs/src/examples/toolbars/appBar.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
- <v-toolbar dark color="primary">
- <v-toolbar-side-icon></v-toolbar-side-icon>
-
- <v-toolbar-title class="white--text">Title</v-toolbar-title>
-
- <v-spacer></v-spacer>
-
- <v-btn icon>
- <v-icon>search</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>apps</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>refresh</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>more_vert</v-icon>
- </v-btn>
- </v-toolbar>
-</template>
diff --git a/packages/docs/src/examples/toolbars/appBarExtension.vue b/packages/docs/src/examples/toolbars/appBarExtension.vue
deleted file mode 100644
index 8d5decd446e..00000000000
--- a/packages/docs/src/examples/toolbars/appBarExtension.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
- <v-toolbar
- color="primary"
- dark
- extended
- >
- <v-toolbar-side-icon></v-toolbar-side-icon>
-
- <v-toolbar-title v-slot:extension class="white--text">Title</v-toolbar-title>
-
- <v-spacer></v-spacer>
-
- <v-btn icon>
- <v-icon>search</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>apps</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>refresh</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>more_vert</v-icon>
- </v-btn>
- </v-toolbar>
-</template>
diff --git a/packages/docs/src/examples/toolbars/appBarItems.vue b/packages/docs/src/examples/toolbars/appBarItems.vue
deleted file mode 100644
index c69938db85a..00000000000
--- a/packages/docs/src/examples/toolbars/appBarItems.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
- <v-toolbar>
- <v-spacer></v-spacer>
-
- <v-toolbar-items>
- <v-btn text>Link One</v-btn>
- <v-btn text>Link Two</v-btn>
- <v-btn text>Link Three</v-btn>
- </v-toolbar-items>
- </v-toolbar>
-</template>
diff --git a/packages/docs/src/examples/toolbars/appBarMenu.vue b/packages/docs/src/examples/toolbars/appBarMenu.vue
deleted file mode 100644
index 904d464b708..00000000000
--- a/packages/docs/src/examples/toolbars/appBarMenu.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
- <v-card
- color="grey lighten-4"
- flat
- height="200px"
- >
- <v-toolbar color="grey darken-1" dark>
- <v-toolbar-side-icon></v-toolbar-side-icon>
-
- <v-menu :nudge-width="100">
- <template v-slot:activator="{ on }">
- <v-toolbar-title v-on="on">
- <span>All</span>
- <v-icon dark>arrow_drop_down</v-icon>
- </v-toolbar-title>
- </template>
-
- <v-list>
- <v-list-tile
- v-for="item in items"
- :key="item"
- @click=""
- >
- <v-list-tile-title v-text="item"></v-list-tile-title>
- </v-list-tile>
- </v-list>
- </v-menu>
-
- <v-spacer></v-spacer>
-
- <v-btn icon>
- <v-icon>search</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>favorite</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>more_vert</v-icon>
- </v-btn>
- </v-toolbar>
- </v-card>
-</template>
-
-<script>
- export default {
- data: () => ({
- items: [
- 'All', 'Family', 'Friends', 'Coworkers'
- ]
- })
- }
-</script>
diff --git a/packages/docs/src/examples/toolbars/background.vue b/packages/docs/src/examples/toolbars/background.vue
new file mode 100644
index 00000000000..4410edcdc81
--- /dev/null
+++ b/packages/docs/src/examples/toolbars/background.vue
@@ -0,0 +1,17 @@
+<template>
+ <v-toolbar
+ dark
+ prominent
+ src="https://cdn.vuetifyjs.com/images/backgrounds/vbanner.jpg"
+ >
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
+
+ <v-toolbar-title>Vuetify</v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-btn icon>
+ <v-icon>mdi-export</v-icon>
+ </v-btn>
+ </v-toolbar>
+</template>
diff --git a/packages/docs/src/examples/toolbars/contextualActionBar.vue b/packages/docs/src/examples/toolbars/contextualActionBar.vue
new file mode 100644
index 00000000000..2572c228db2
--- /dev/null
+++ b/packages/docs/src/examples/toolbars/contextualActionBar.vue
@@ -0,0 +1,67 @@
+<template>
+ <v-card
+ max-width="500"
+ class="mx-auto"
+ >
+ <v-toolbar
+ :color="selection.length ? 'grey darken-4' : 'deep-purple accent-4'"
+ dark
+ >
+ <v-app-bar-nav-icon v-if="!selection.length"></v-app-bar-nav-icon>
+ <v-btn
+ v-else
+ icon
+ @click="selection = []"
+ >
+ <v-icon>mdi-close</v-icon>
+ </v-btn>
+
+ <v-toolbar-title>
+ {{ selection.length ? `${selection.length} selected` : 'Photos' }}
+ </v-toolbar-title>
+
+ <v-spacer></v-spacer>
+
+ <v-scale-transition>
+ <v-btn
+ v-if="selection.length"
+ key="export"
+ icon
+ >
+ <v-icon>mdi-export-variant</v-icon>
+ </v-btn>
+ </v-scale-transition>
+ <v-scale-transition>
+ <v-btn
+ v-if="selection.length"
+ key="delete"
+ icon
+ >
+ <v-icon>mdi-delete</v-icon>
+ </v-btn>
+ </v-scale-transition>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-toolbar>
+
+ <v-card-text>
+ <v-select
+ v-model="selection"
+ :items="items"
+ multiple
+ label="Select an option"
+ ></v-select>
+ </v-card-text>
+ </v-card>
+</template>
+
+<script>
+ export default {
+ data: () => ({
+ selection: [],
+ items: ['Foo', 'Bar', 'Fizz', 'Buzz']
+ })
+ }
+</script>
diff --git a/packages/docs/src/examples/toolbars/dense.vue b/packages/docs/src/examples/toolbars/dense.vue
index d1a1f3c9709..8ccf8a6bd8c 100644
--- a/packages/docs/src/examples/toolbars/dense.vue
+++ b/packages/docs/src/examples/toolbars/dense.vue
@@ -6,7 +6,7 @@
tile
>
<v-toolbar dense>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Title</v-toolbar-title>
diff --git a/packages/docs/src/examples/toolbars/flexibleAndCard.vue b/packages/docs/src/examples/toolbars/flexibleAndCard.vue
index a903cfc22e3..d7fe7dcd549 100644
--- a/packages/docs/src/examples/toolbars/flexibleAndCard.vue
+++ b/packages/docs/src/examples/toolbars/flexibleAndCard.vue
@@ -6,41 +6,35 @@
extended
flat
>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
</v-toolbar>
- <v-layout row pb-2>
- <v-flex xs8 offset-xs2>
- <v-card class="card--flex-toolbar">
- <v-toolbar card prominent>
- <v-toolbar-title class="body-2 grey--text">Title</v-toolbar-title>
+ <v-card
+ class="mx-auto"
+ max-width="700"
+ style="margin-top: -64px;"
+ >
+ <v-toolbar flat>
+ <v-toolbar-title class="grey--text">Title</v-toolbar-title>
- <v-spacer></v-spacer>
+ <v-spacer></v-spacer>
- <v-btn icon>
- <v-icon>search</v-icon>
- </v-btn>
+ <v-btn icon>
+ <v-icon>search</v-icon>
+ </v-btn>
- <v-btn icon>
- <v-icon>apps</v-icon>
- </v-btn>
+ <v-btn icon>
+ <v-icon>apps</v-icon>
+ </v-btn>
- <v-btn icon>
- <v-icon>more_vert</v-icon>
- </v-btn>
- </v-toolbar>
+ <v-btn icon>
+ <v-icon>more_vert</v-icon>
+ </v-btn>
+ </v-toolbar>
- <v-divider></v-divider>
+ <v-divider></v-divider>
- <v-card-text style="height: 200px;"></v-card-text>
- </v-card>
- </v-flex>
- </v-layout>
+ <v-card-text style="height: 200px;"></v-card-text>
+ </v-card>
</v-card>
</template>
-
-<style>
- .card--flex-toolbar {
- margin-top: -64px;
- }
-</style>
diff --git a/packages/docs/src/examples/toolbars/prominent.vue b/packages/docs/src/examples/toolbars/prominent.vue
index dda2c19d002..f7bd1771f0a 100644
--- a/packages/docs/src/examples/toolbars/prominent.vue
+++ b/packages/docs/src/examples/toolbars/prominent.vue
@@ -6,7 +6,7 @@
tile
>
<v-toolbar prominent extended>
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Title</v-toolbar-title>
diff --git a/packages/docs/src/examples/toolbars/systemBarsStatusWindow.vue b/packages/docs/src/examples/toolbars/systemBarsStatusWindow.vue
deleted file mode 100644
index 245df1daf8a..00000000000
--- a/packages/docs/src/examples/toolbars/systemBarsStatusWindow.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
- <div>
- <v-subheader>Light status bar</v-subheader>
- <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg" height="200px">
- <v-system-bar status color="primary">
- <v-spacer></v-spacer>
- <v-icon>network_wifi</v-icon>
- <v-icon>signal_cellular_null</v-icon>
- <v-icon>battery_full</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-subheader>Lights out</v-subheader>
- <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg" height="200px">
- <v-system-bar status color="primary" lights-out>
- <v-spacer></v-spacer>
- <v-icon>network_wifi</v-icon>
- <v-icon>signal_cellular_null</v-icon>
- <v-icon>battery_full</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-subheader>Dark status bar</v-subheader>
- <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg" height="200px">
- <v-system-bar status color="primary" dark>
- <v-spacer></v-spacer>
- <v-icon>network_wifi</v-icon>
- <v-icon>signal_cellular_null</v-icon>
- <v-icon>battery_full</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-subheader>Lights out</v-subheader>
- <v-card img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg" height="200px">
- <v-system-bar status color="primary" lights-out dark>
- <v-spacer></v-spacer>
- <v-icon>network_wifi</v-icon>
- <v-icon>signal_cellular_null</v-icon>
- <v-icon>battery_full</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-divider class="my-5"></v-divider>
- <v-subheader>Window bar</v-subheader>
- <v-system-bar window dark>
- <v-spacer></v-spacer>
- <v-icon>remove</v-icon>
- <v-icon>check_box_outline_blank</v-icon>
- <v-icon>close</v-icon>
- </v-system-bar>
- </div>
-</template>
diff --git a/packages/docs/src/examples/toolbars/usage.vue b/packages/docs/src/examples/toolbars/usage.vue
index 826c7d04623..7555b36c834 100644
--- a/packages/docs/src/examples/toolbars/usage.vue
+++ b/packages/docs/src/examples/toolbars/usage.vue
@@ -1,12 +1,23 @@
<template>
<v-toolbar>
- <v-toolbar-side-icon></v-toolbar-side-icon>
<v-toolbar-title>Title</v-toolbar-title>
+
<v-spacer></v-spacer>
- <v-toolbar-items class="hidden-sm-and-down">
- <v-btn text>Link One</v-btn>
- <v-btn text>Link Two</v-btn>
- <v-btn text>Link Three</v-btn>
+
+ <v-toolbar-items>
+ <v-btn text>Link 1</v-btn>
+ <v-btn text>Link 2</v-btn>
+ <v-btn text>Link 3</v-btn>
</v-toolbar-items>
+
+ <v-btn icon>
+ <v-icon>mdi-export-variant</v-icon>
+ </v-btn>
+ <v-btn icon>
+ <v-icon>mdi-delete-circle</v-icon>
+ </v-btn>
+ <v-btn icon>
+ <v-icon>mdi-plus-circle</v-icon>
+ </v-btn>
</v-toolbar>
</template>
diff --git a/packages/docs/src/examples/toolbars/variations.vue b/packages/docs/src/examples/toolbars/variations.vue
index 1e877a51336..1dee6fd0aab 100644
--- a/packages/docs/src/examples/toolbars/variations.vue
+++ b/packages/docs/src/examples/toolbars/variations.vue
@@ -10,7 +10,7 @@
>
<v-card color="grey lighten-4" flat height="200px">
<v-toolbar :color="bar.class" :dark="bar.dark">
- <v-toolbar-side-icon></v-toolbar-side-icon>
+ <v-app-bar-nav-icon></v-app-bar-nav-icon>
<v-toolbar-title>Title</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn icon>
diff --git a/packages/docs/src/lang/en/components/AppBars.json b/packages/docs/src/lang/en/components/AppBars.json
new file mode 100644
index 00000000000..566c3109ac7
--- /dev/null
+++ b/packages/docs/src/lang/en/components/AppBars.json
@@ -0,0 +1,66 @@
+{
+ "header": "# App Bars",
+ "headerText": "The `v-app-bar` component is pivotal to any gui, as it generally is the primary source of site navigation. The toolbar component works great in conjunction with a navigation drawer for hiding links and presenting an activator to open the sidebar on mobile.",
+ "examples": {
+ "usage": {
+ "desc": "An **app-bar** is composed of 5 parts. The **container**, **navigation icon** (optional), **title** (optional), **action items** (optional) and an **overflow menu** (optional)"
+ },
+ "dense": {
+ "header": "### Dense",
+ "desc": "You can make **app-bar** dense. A dense app bar has lower height than regular one"
+ },
+ "prominent": {
+ "header": "### Prominent w/ scroll shrink",
+ "desc": "An `v-app-bar` with the `prominent` prop can opt to have its height shrunk as the user scrolls down. This provides a smooth transition to taking up less visual space when the user is scrolling through content. Shrink height has 2 possible options, **dense** (48px) and **short** (56px) sizes."
+ },
+ "img": {
+ "header": "### Prominent w/ scroll shrink and image",
+ "desc": "`v-app-bar` can contain background images. You can set source via the `src` prop. If you need to customize the `v-img` properties, the app-bar provides you with an **img** scoped slot."
+ },
+ "img-fade": {
+ "header": "### Prominent w/ scroll shrink and image, fading on scroll",
+ "desc": "The background image of a `v-app-bar` can fade on scroll. Use the `fade-img-on-scroll` property for this."
+ },
+ "hide": {
+ "header": "### Hiding on scroll",
+ "desc": "`v-app-bar` can be hidden on scroll. Use the `hide-on-scroll` property for this."
+ },
+ "scroll-threshold": {
+ "header": "### Scroll threshold",
+ "desc": "`v-app-bar` can have scroll threshold. It will start reacting to scroll only after defined via `scroll-threshold` property amount of pixels."
+ },
+ "collapse": {
+ "header": "### Collapsible bars",
+ "desc": "With the **collapse** and **collapse-on-scroll** props you can easily control the state of toolbar that the user interacts with."
+ },
+ "elevate-on-scroll": {
+ "header": "### Elevate bar on scroll",
+ "desc": "When using the **elevate-on-scroll** prop, the `v-app-bar` will rest at an elevation of 0dp until the user begins to scroll down. Once scrolling, the bar raises to 4dp."
+ },
+ "inverted-scroll": {
+ "header": "### Inverted scrolling",
+ "desc": "When using the **inverted-scroll** property, the bar will hide until the user scrolls past the designated threshold. Once past the threshold, the `v-app-bar` will continue to display until the users scrolls up past the threshold. If no **scroll-threshold** value is supplied a default value of _0_ will be used."
+ }
+ },
+ "props": {
+ "clippedLeft": "Designates that the application's `v-navigation-drawer` is clipped on the left side of the toolbar",
+ "clippedRight": "Designates that the application's `v-navigation-drawer` is clipped on the right side of the toolbar",
+ "collapseOnScroll": "Collapse the toolbar when scrolling",
+ "elevateOnScroll": "Elevate the toolbar from 0dp to 4dp when scrolling",
+ "invertedScroll": "Will slide out of view when scrolling down and back into view when scrolling up",
+ "hideOnScroll": "Will transition the toolbar and extension off screen when scrolling down",
+ "fadeImgOnScroll": "When using the **src** prop or `img` scoped slot, will fade the image when scrolling",
+ "scrollTarget": "Assign the scroll target for scroll-off-screen",
+ "scrollThreshold": "The amount of scroll distance down before **hide-on-scroll** activates.",
+ "scrollOffScreen": "Scroll the entire `v-app-bar` (including extension) off screen.",
+ "shrinkOnScroll": "Shrinks a **prominent** toolbar to a **dense** or **short** (default) one",
+ "src": "Image source. See `v-img` for details",
+ "fade-img-on-scroll": "Fade image when user scrolls"
+ },
+ "slots": {
+ "extension": "Components.Toolbars.slots.extension"
+ },
+ "scopedSlots": {
+ "img": "Components.Toolbars.scopedSlots.img"
+ }
+}
diff --git a/packages/docs/src/lang/en/components/SystemBars.json b/packages/docs/src/lang/en/components/SystemBars.json
new file mode 100644
index 00000000000..103fb456278
--- /dev/null
+++ b/packages/docs/src/lang/en/components/SystemBars.json
@@ -0,0 +1,26 @@
+{
+ "header": "# System bar",
+ "headerText": "The `v-system-bar` component can be used for displaying some statuses to user. It looks like Android system bar and can contain icons, spacers and some amount of text.",
+ "examples": {
+ "usage": {
+ "desc": "A system bar is a flexible container for your data. It can be themed using multiple style variants, and even be a window bar with close, fullscreen and minify icons."
+ },
+ "window": {
+ "header": "### Window bar",
+ "desc": "A window bar with window controls and status info."
+ },
+ "themes": {
+ "header": "### Themes",
+ "desc": "Dark or light theme variants can be applied to `v-system-bar`."
+ },
+ "lights-out": {
+ "header": "### Lights out",
+ "desc": "You can reduce `v-system-bar`'s opacity using `lights-out` property."
+ }
+ },
+ "props": {
+ "lightsOut": "Reduces the system bar opacity",
+ "status": "Reduces the system bar height",
+ "window": "Increases the system bar height"
+ }
+}
diff --git a/packages/docs/src/lang/en/components/Tabs.json b/packages/docs/src/lang/en/components/Tabs.json
index e4ea70f6b1b..1cd9b68cde1 100644
--- a/packages/docs/src/lang/en/components/Tabs.json
+++ b/packages/docs/src/lang/en/components/Tabs.json
@@ -31,7 +31,7 @@
},
"alignWithTitle": {
"header": "### Align tabs with toolbar title",
- "desc": "Make `v-tabs` lined up with the `v-toolbar-title` component (`v-toolbar-side-icon` or `v-btn` must be used in `v-toolbar`)."
+ "desc": "Make `v-tabs` lined up with the `v-toolbar-title` component (`v-app-bar-nav-icon` or `v-btn` must be used in `v-toolbar`)."
},
"grow": {
"header": "### Grow",
diff --git a/packages/docs/src/lang/en/components/Toolbars.json b/packages/docs/src/lang/en/components/Toolbars.json
index 9c30a61d010..5e5e75869ee 100644
--- a/packages/docs/src/lang/en/components/Toolbars.json
+++ b/packages/docs/src/lang/en/components/Toolbars.json
@@ -1,46 +1,34 @@
{
"header": "# Toolbar",
- "headerText": "The `v-toolbar` component is pivotal to any gui, as it generally is the primary source of site navigation. The toolbar component works great in conjunction with a navigation drawer for hiding links and presenting an activator to open the sidebar on mobile.",
+ "headerText": "The `v-toolbar` component is pivotal to any gui, as it generally is the primary source of site navigation. The toolbar component works great in conjunction with [v-navigation-drawer](/components/navigation-drawers) and [v-card](/components/cards).",
"examples": {
"usage": {
- "desc": "A toolbar is a flexible container that can be utilized in a number of ways. By default, the toolbar is 64px high on desktop, 56px high on mobile portrait and 48px high on mobile landscape. There are a number of helper components available to use with the toolbar. These are `v-toolbar-side-icon`, `v-toolbar-title` and `v-toolbar-items`."
- },
- "appBar": {
- "header": "### App bar",
- "desc": "An App bar is the primary toolbar of your application. It can contain icons, menus and more."
- },
- "appBarItems": {
- "header": "### App bar with items",
- "desc": "Utilizing the `v-toolbar-items` component you can use regular `v-btn` components to create app bar items. Don't forget to apply the `flat` prop to each button."
- },
- "appBarExtension": {
- "header": "### App bar with extension",
- "desc": "An extension can be used that creates a much more prominent bar. If a title is placed within the extension, it will automatically be shifted to the right to match the normal location it would be at in the main bar."
+ "desc": "A toolbar is a flexible container that can be utilized in a number of ways. By default, the toolbar is 64px high on desktop and 56px high on mobile. There are a number of helper components available to use with the toolbar. The `v-toolbar-title` is used for displaying a title and `v-toolbar-items` allow [v-btn](/components/buttons) to extend full height."
},
"columnWidthWithHierarchy": {
"header": "### Column width with hierarchy",
- "desc": "Toolbars come in 2 variants, light and dark. Light toolbars have dark tinted buttons and dark text whereas Dark toolbars have white tinted buttons and white text."
+ "desc": "Toolbars come in **2** variants, light and dark. Light toolbars have dark tinted buttons and dark text whereas dark toolbars have white tinted buttons and white text."
},
"flexibleAndCard": {
"header": "### Flexible toolbar and card toolbar",
- "desc": "With a few custom styles, you can easily create your amazing user interfaces."
+ "desc": "In this example we offset our card onto the extended content area of a toolbar using the **extended** prop."
},
"floatingWithSearch": {
"header": "### Floating with search",
- "desc": "A floating toolbar can be placed over the content that it references."
+ "desc": "A floating toolbar is turned into an inline element that only takes up as much space as needed. This is particilarly useful when placing toolbars over content."
},
"variations": {
"header": "### Variations",
- "desc": "An app-bar has multiple variations that can be applied with themes and helper classes. These range from light and dark themes, colored and transparent.",
+ "desc": "A `v-toolbar` has multiple variations that can be applied with themes and helper classes. These range from light and dark themes, colored and transparent.",
"uninverted": true
},
"prominent": {
"header": "### Prominent toolbars",
- "desc": "Prominent toolbars add a slot where you can placed elements in the extended area. The content and extension areas will be locked to 64px in height."
+ "desc": "Prominent toolbars increase the `v-toolbar`'s height to _128px_ and positions the `v-toolbar-title` towards the bottom of the container. This is exanded upon in [v-app](/components/app-bars#prominent-w-scroll-shrink) with the ability to shrink a **prominent** toolbar to a **dense** or **short** one."
},
"dense": {
"header": "### Dense toolbars",
- "desc": "Dense toolbars reduce their height to 48px. This is also the default behavior for mobile landscape orientation."
+ "desc": "Dense toolbars reduce their height to _48px_. When using in conjunction with the **prominent** prop, will reduce height to _96px_."
},
"denseProminent": {
"header": "### Dense prominent toolbars",
@@ -50,38 +38,40 @@
"header": "### Scrolling techniques",
"desc": "A toolbar can transition off screen when scrolling. Here we demonstrate how you can specify the scroll target (default is window). Keep in mind, for this example there is special markup that will not be required in your application."
},
- "appBarMenu": {
- "header": "### App bar with menu",
- "desc": "You can add menu components to a toolbar."
- },
"systemBarsStatusWindow": {
"header": "### System bars - status/window",
"desc": "System bars are useful for notification icons on mobile and desktop. For live examples of these, head to the pre-defined layouts."
+ },
+ "contextualActionBar": {
+ "header": "### Contextual action bars",
+ "desc": "In this example we conntext various item visibility states through a `v-select`'s **v-model**."
+ },
+ "background": {
+ "header": "### Prominent w/ Background",
+ "desc": "Toolbars can display a background as opposed to a solid color. This can be modified by using the **img** scoped slot and providing your own [v-img](/components/images) component. Backgrounds can be faded using a [v-app-bar](/components/app-bars#prominent-w-scroll-shrink-and-image)."
}
},
"props": {
- "card": "Inherits border radius when used within `v-card`",
- "clippedLeft": "Designates that the applications `v-navigation-drawer` is clipped on the left side of the toolbar",
- "clippedRight": "Designates that the applications `v-navigation-drawer` is clipped on the right side of the toolbar",
- "dense": "Reduces the height of the toolbar content and extension",
+ "absolute": "Absolutely position the toolbar",
+ "bottom": "Mixins.Positionable.props.bottom",
+ "collapse": "Puts the toolbar into a collapse state",
+ "dense": "Reduces the height of the toolbar content to 48px (96px when using with prominent)",
"extended": "Force the toolbar to generate the extension without using the slot",
"extensionHeight": "Specify an explicit height for the extended slot",
"flat": "Removes the toolbar box-shadow",
"floating": "Makes the toolbar float inline",
"height": "Designates a specific height for the toolbar",
- "invertedScroll": "Will slide out of view when scrolling down and back into view when scrolling up",
"lightsOut": "Reduces the system bar opacity",
- "manualScroll": "Manually apply the **scroll-off-screen** functionality",
- "prominent": "Increases the height of the toolbar content and extension",
- "scrollOffScreen": "Will transition the toolbar and extension off screen when scrolling down",
- "scrollToolbarOffScreen": "Will transition the toolbar off screen when scrolling down",
- "scrollTarget": "Assign the scroll target for scroll-off-screen",
- "scrollThreshold": "The amount of scroll distance down before the toolbar uses scroll-off-screen",
+ "prominent": "Increases the height of the toolbar content to 128px",
+ "short": "Reduce the height of the toolbar content to 56px (112px when using with short)",
+ "src": "Specifies an image background",
"status": "Reduces the system bar height",
- "tabs": "Will set an explicit **42px** height for extension. Useful when default `v-tab`s are used in the extended slot. If you have a custom height `v-tab`, you should specify a height with **extensionHeight**.",
"window": "Increases the system bar height"
},
"slots": {
"extension": "Slot positioned directly under main content"
+ },
+ "scopedSlots": {
+ "img": "Expects a `v-img` component. Scoped **props** should be applied with `v-bind=\"props\"`"
}
}
diff --git a/packages/docs/src/lang/en/meta.json b/packages/docs/src/lang/en/meta.json
index 77bea22b129..14cd8975d28 100644
--- a/packages/docs/src/lang/en/meta.json
+++ b/packages/docs/src/lang/en/meta.json
@@ -159,6 +159,11 @@
"description": "The v-alert component is used to convey information to the user. Designed to stand out, the alerts come in four contextual styles, success, info, warning, and error.",
"keywords": "alerts, components"
},
+ "components/app-bars": {
+ "title": "AppBars Component",
+ "description": "The v-app-bar component is a supercharged toolbar with advanced scrolling techniques and application layout support.",
+ "keywords": "toolbars, system-bars, app-bars"
+ },
"components/autocompletes": {
"title": "Autocomplete Component",
"description": "The v-autocomplete component provides type-ahead autocomplete functionality.",
@@ -414,6 +419,11 @@
"description": "Subheaders are used for separating lists of content.",
"keywords": "subheader"
},
+ "components/system-bars": {
+ "title": "SystemBar Component",
+ "description": "THe v-system-bar component provides an appplication with an android style status bar.",
+ "keywords": "system-bar, android status bar, status bar"
+ },
"components/tabs": {
"title": "Tabs",
"description": "Tabs component for the Vuetify framework.",
diff --git a/packages/docs/src/lang/en/vuetify/AppDrawer.json b/packages/docs/src/lang/en/vuetify/AppDrawer.json
index f3ef88113d7..78fd167a525 100644
--- a/packages/docs/src/lang/en/vuetify/AppDrawer.json
+++ b/packages/docs/src/lang/en/vuetify/AppDrawer.json
@@ -2,11 +2,13 @@
"aLaCarte": "A-la-carte",
"alerts": "Alerts",
"apiExplorer": "API explorer",
+ "appBars": "App bars",
"aspectRatios": "Aspect ratios",
"autocompletes": "Autocompletes",
"avatars": "Avatars",
"badges": "Badges",
"banners": "Banners",
+ "bars": "Bars",
"becomeASponsor": "Become a Patron",
"bottomNavigation": "Bottom navigation",
"bottomSheets": "Bottom sheets",
@@ -88,6 +90,7 @@
"steppers": "Steppers",
"stylesAndThemes": "Styles & themes",
"subheaders": "Subheaders",
+ "systemBars": "System bars",
"tabs": "Tabs",
"textAlignment": "Text alignment",
"textFields": "Text fields",
diff --git a/packages/docs/src/lang/es-MX/components/Tabs.json b/packages/docs/src/lang/es-MX/components/Tabs.json
index f69b9413645..8f5a0a1efb3 100644
--- a/packages/docs/src/lang/es-MX/components/Tabs.json
+++ b/packages/docs/src/lang/es-MX/components/Tabs.json
@@ -36,7 +36,7 @@
},
"alignWithTitle": {
"header": "Alinear tabs con el título del toolbar",
- "desc": "Hace que los `v-tabs` se alineen con el componente `v-toolbar-title` (`v-toolbar-side-icon` o `v-btn` deben utilizarse en un `v-toolbar`). Tal vez no funcione si el texto del tab se salta a la siguiente línea (_wrapped_)."
+ "desc": "Hace que los `v-tabs` se alineen con el componente `v-toolbar-title` (`v-app-bar-nav-icon` o `v-btn` deben utilizarse en un `v-toolbar`). Tal vez no funcione si el texto del tab se salta a la siguiente línea (_wrapped_)."
},
"grow": {
"header": "Grow",
@@ -62,4 +62,4 @@
"appendIcon": "Ícono de paginación derecho",
"right": "Alinear tabs a la derecha"
}
-}
\ No newline at end of file
+}
diff --git a/packages/docs/src/lang/ko-KR/components/Tabs.json b/packages/docs/src/lang/ko-KR/components/Tabs.json
index 99709c75f8f..f9bb0aa38a7 100644
--- a/packages/docs/src/lang/ko-KR/components/Tabs.json
+++ b/packages/docs/src/lang/ko-KR/components/Tabs.json
@@ -39,7 +39,7 @@
},
"alignWithTitle": {
"header": "툴바 타이틀과 탭 정렬 (Align tabs with toolbar title)",
- "desc": "`v-tabs`을 `v-toolbar-title` 컴포넌트와 함께 나열합니다. (`v-toolbar-side-icon`나 `v-btn` 컴포넌트가 `v-toolbar` 안에 사용되어야만 합니다. May not work if the tab text is wrapped."
+ "desc": "`v-tabs`을 `v-toolbar-title` 컴포넌트와 함께 나열합니다. (`v-app-bar-nav-icon`나 `v-btn` 컴포넌트가 `v-toolbar` 안에 사용되어야만 합니다. May not work if the tab text is wrapped."
},
"grow": {
"header": "Grow",
diff --git a/packages/docs/src/lang/ko-KR/components/Toolbars.json b/packages/docs/src/lang/ko-KR/components/Toolbars.json
index 01a4ab30101..961ceb83049 100644
--- a/packages/docs/src/lang/ko-KR/components/Toolbars.json
+++ b/packages/docs/src/lang/ko-KR/components/Toolbars.json
@@ -8,7 +8,7 @@
"examples": {
"usage": {
"header": "사용법 (Usage)",
- "desc": "툴바는 여러 방법으로 쓰일 수 있는 유연한 컨테이너 입니다. 기본적으로 툴바는 데스크탑에서 64px, 세로 모바일에서 56px, 가로 모바일에서 48px 높이를 가집니다. 툴바와 함께 쓰일 수 있는 `v-toolbar-side-icon`, `v-toolbar-title`, `v-toolbar-items` 같은 여러 헬퍼 컴포넌트가 있습니다."
+ "desc": "툴바는 여러 방법으로 쓰일 수 있는 유연한 컨테이너 입니다. 기본적으로 툴바는 데스크탑에서 64px, 세로 모바일에서 56px, 가로 모바일에서 48px 높이를 가집니다. 툴바와 함께 쓰일 수 있는 `v-app-bar-nav-icon`, `v-toolbar-title`, `v-toolbar-items` 같은 여러 헬퍼 컴포넌트가 있습니다."
},
"appBar": {
"header": "앱바 (App bar)",
diff --git a/packages/docs/src/lang/pt-BR/components/Toolbars.json b/packages/docs/src/lang/pt-BR/components/Toolbars.json
index 35e1b51ea5e..9a5ba9bc100 100644
--- a/packages/docs/src/lang/pt-BR/components/Toolbars.json
+++ b/packages/docs/src/lang/pt-BR/components/Toolbars.json
@@ -4,7 +4,7 @@
"examples": {
"usage": {
"header": "Utilização",
- "desc": "Uma barra de ferramentas (toolbar) é um container flexível que pode ser utilizado em diversas maneiras. Por padrão, a barra de ferramentas possui 64px de altura em desktops, 56px de altura em dispositivos móveis na vertical (modo retrato) e 48px de altura em dispositivos móveis na horizontal (modo paisagem). Existe um número de componentes de auxílio disponíveis para serem usados com a barra de ferramentas. Estes são `v-toolbar-side-icon`, `v-toolbar-title` e `v-toolbar-items`."
+ "desc": "Uma barra de ferramentas (toolbar) é um container flexível que pode ser utilizado em diversas maneiras. Por padrão, a barra de ferramentas possui 64px de altura em desktops, 56px de altura em dispositivos móveis na vertical (modo retrato) e 48px de altura em dispositivos móveis na horizontal (modo paisagem). Existe um número de componentes de auxílio disponíveis para serem usados com a barra de ferramentas. Estes são `v-app-bar-nav-icon`, `v-toolbar-title` e `v-toolbar-items`."
},
"appBar": {
"header": "Barra de aplicativos",
diff --git a/packages/docs/src/lang/ru-RU/components/Tabs.json b/packages/docs/src/lang/ru-RU/components/Tabs.json
index 40eac37e09d..be24c47bf04 100644
--- a/packages/docs/src/lang/ru-RU/components/Tabs.json
+++ b/packages/docs/src/lang/ru-RU/components/Tabs.json
@@ -39,7 +39,7 @@
},
"alignWithTitle": {
"header": "### Выровнять вкладки с заголовком панели инструментов",
- "desc": "Создайте `v-tabs`, выровненные с компонентом `v-toolbar-title` (`v-toolbar-side-icon` или `v-btn` должны использоваться в `v-toolbar`). Может не работать, если текст вкладки завернут."
+ "desc": "Создайте `v-tabs`, выровненные с компонентом `v-toolbar-title` (`v-app-bar-nav-icon` или `v-btn` должны использоваться в `v-toolbar`). Может не работать, если текст вкладки завернут."
},
"grow": {
"header": "### Grow",
diff --git a/packages/docs/src/lang/ru-RU/components/Toolbars.json b/packages/docs/src/lang/ru-RU/components/Toolbars.json
index 7777bf6e4c0..31ef8514f90 100644
--- a/packages/docs/src/lang/ru-RU/components/Toolbars.json
+++ b/packages/docs/src/lang/ru-RU/components/Toolbars.json
@@ -8,7 +8,7 @@
"examples": {
"usage": {
"header": "### Использование",
- "desc": "Панель инструментов представляет собой гибкий контейнер, который можно использовать несколькими способами. По умолчанию панель инструментов имеет 64px на десктопе, 56px на мобиле в портретном режиме и 48px на мобиле в ландшафте. Существует ряд вспомогательных компонентов, доступных для использования с панелью инструментов. Это `v-toolbar-side-icon`, `v-toolbar-title` и `v-toolbar-items`."
+ "desc": "Панель инструментов представляет собой гибкий контейнер, который можно использовать несколькими способами. По умолчанию панель инструментов имеет 64px на десктопе, 56px на мобиле в портретном режиме и 48px на мобиле в ландшафте. Существует ряд вспомогательных компонентов, доступных для использования с панелью инструментов. Это `v-app-bar-nav-icon`, `v-toolbar-title` и `v-toolbar-items`."
},
"appBar": {
"header": "### Панель приложений",
diff --git a/packages/docs/src/lang/zh-CN/components/Tabs.json b/packages/docs/src/lang/zh-CN/components/Tabs.json
index 7bf8e933811..7ef32694ea1 100644
--- a/packages/docs/src/lang/zh-CN/components/Tabs.json
+++ b/packages/docs/src/lang/zh-CN/components/Tabs.json
@@ -35,7 +35,7 @@
},
"alignWithTitle": {
"header": "与工具栏标题对齐选项卡",
- "desc": "使`v-tabs`和`v-toolbar-title`组件已知（`v-toolbar-side-icon`或`v-btn`必须在`v-toolbar`中使用）。如果标签文本被包装，可能无法正常工作。"
+ "desc": "使`v-tabs`和`v-toolbar-title`组件已知（`v-app-bar-nav-icon`或`v-btn`必须在`v-toolbar`中使用）。如果标签文本被包装，可能无法正常工作。"
},
"grow": {
"header": "长大",
diff --git a/packages/docs/src/lang/zh-CN/components/Toolbars.json b/packages/docs/src/lang/zh-CN/components/Toolbars.json
index 78bbe5d7e18..30b6e2aee91 100644
--- a/packages/docs/src/lang/zh-CN/components/Toolbars.json
+++ b/packages/docs/src/lang/zh-CN/components/Toolbars.json
@@ -5,7 +5,7 @@
"v-toolbar",
"v-toolbar-title",
"v-toolbar-items",
- "v-toolbar-side-icon",
+ "v-app-bar-nav-icon",
"v-system-bar"
],
"examples": {
diff --git a/packages/docs/src/public/sitemap.xml b/packages/docs/src/public/sitemap.xml
index 9adaf4e90b3..313dde0ffdc 100644
--- a/packages/docs/src/public/sitemap.xml
+++ b/packages/docs/src/public/sitemap.xml
@@ -235,6 +235,12 @@
<changefreq>daily</changefreq>
<priority>0.8000</priority>
</url>
+ <url>
+ <loc>https://vuetifyjs.com/en/components/app-bars</loc>
+ <lastmod>2019-01-07</lastmod>
+ <changefreq>daily</changefreq>
+ <priority>0.8000</priority>
+ </url>
<url>
<loc>https://vuetifyjs.com/en/components/badges</loc>
<lastmod>2019-01-07</lastmod>
@@ -505,6 +511,12 @@
<changefreq>daily</changefreq>
<priority>0.8000</priority>
</url>
+ <url>
+ <loc>https://vuetifyjs.com/en/components/system-bars</loc>
+ <lastmod>2019-01-07</lastmod>
+ <changefreq>daily</changefreq>
+ <priority>0.8000</priority>
+ </url>
<url>
<loc>https://vuetifyjs.com/en/components/tabs</loc>
<lastmod>2019-01-07</lastmod>
diff --git a/packages/kitchen/src/App.vue b/packages/kitchen/src/App.vue
index 8e52cd84739..ccedbd4dcfa 100644
--- a/packages/kitchen/src/App.vue
+++ b/packages/kitchen/src/App.vue
@@ -1,6 +1,6 @@
<template>
<v-app :dark="$vuetify.theme.dark">
- <v-toolbar
+ <v-app-bar
color="blue-grey"
dark
fixed
@@ -8,7 +8,7 @@
clipped-right
dir="ltr"
>
- <v-toolbar-side-icon @click.stop="drawer = !drawer" />
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer" />
<v-toolbar-title class="white--text headline">
🍣
<span class="font-weight-black">
@@ -51,7 +51,7 @@
>
<v-icon>mdi-pencil</v-icon>
</v-btn>
- </v-toolbar>
+ </v-app-bar>
<v-navigation-drawer
v-model="drawer"
app
diff --git a/packages/kitchen/src/pan/App Bars.vue b/packages/kitchen/src/pan/App Bars.vue
new file mode 100644
index 00000000000..2b97b4e61a7
--- /dev/null
+++ b/packages/kitchen/src/pan/App Bars.vue
@@ -0,0 +1,439 @@
+<template>
+ <v-container>
+ <v-layout column>
+ <core-title>
+ With icons
+ </core-title>
+ <core-section>
+ <v-app-bar
+ dark
+ color="primary"
+ >
+ <v-app-bar-nav-icon />
+
+ <v-toolbar-title class="white--text">
+ Title
+ </v-toolbar-title>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+ </core-section>
+
+ <core-title>
+ Dense
+ </core-title>
+ <core-section>
+ <v-app-bar
+ dark
+ dense
+ color="primary"
+ >
+ <v-app-bar-nav-icon />
+
+ <v-toolbar-title class="white--text">
+ Title
+ </v-toolbar-title>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+ </core-section>
+
+ <core-title>
+ With items
+ </core-title>
+ <core-section>
+ <v-app-bar>
+ <v-spacer />
+
+ <v-toolbar-items>
+ <v-btn text>
+ Link One
+ </v-btn>
+ <v-btn text>
+ Link Two
+ </v-btn>
+ <v-btn text>
+ Link Three
+ </v-btn>
+ </v-toolbar-items>
+ </v-app-bar>
+ </core-section>
+
+ <core-title>
+ With extension
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ extended
+ >
+ <v-app-bar-nav-icon />
+
+ <template #extension>
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+ </template>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+ </core-section>
+
+ <core-title>
+ With extension and background image
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ extended
+ src="https://picsum.photos/1920/1080?random"
+ >
+ <v-app-bar-nav-icon />
+
+ <template #extension>
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+ </template>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+ </core-section>
+
+ <core-title>
+ With extension and background image scoped slot
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ extended
+ src="https://picsum.photos/1920/1080?random"
+ >
+ <template #img="{ props }">
+ <v-img v-bind="props" gradient="to top right, rgba(100,115,201,.7), rgba(25,32,72,.7)" />
+ </template>
+
+ <v-app-bar-nav-icon />
+
+ <template #extension>
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+ </template>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+ </core-section>
+
+ <core-title>
+ With extension and fading background image
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ extended
+ src="https://picsum.photos/1920/1080?random"
+ fade-img-on-scroll
+ scroll-target="#scroll-1"
+ scroll-threshold="500"
+ >
+ <v-app-bar-nav-icon />
+
+ <template #extension>
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+ </template>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+
+ <v-sheet
+ id="scroll-1"
+ class="scroll-y"
+ max-height="100"
+ >
+ <v-container style="height: 1500px;" />
+ </v-sheet>
+ </core-section>
+
+ <core-title>
+ With extension and fading background image scoped slot
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ extended
+ src="https://picsum.photos/1920/1080?random"
+ fade-img-on-scroll
+ scroll-target="#scroll-2"
+ scroll-threshold="500"
+ >
+ <template #img="{ props }">
+ <v-img v-bind="props" gradient="to top right, rgba(100,115,201,.7), rgba(25,32,72,.7)" />
+ </template>
+
+ <v-app-bar-nav-icon />
+
+ <template #extension>
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+ </template>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+
+ <v-sheet
+ id="scroll-2"
+ class="scroll-y"
+ max-height="100"
+ >
+ <v-container style="height: 1500px;" />
+ </v-sheet>
+ </core-section>
+
+ <core-title>
+ Shrink on scroll
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ src="https://picsum.photos/1920/1080?random"
+ shrink-on-scroll
+ scroll-target="#scroll-3"
+ scroll-threshold="500"
+ extended
+ >
+ <template #img="{ props }">
+ <v-img v-bind="props" gradient="to top right, rgba(100,115,201,.7), rgba(25,32,72,.7)" />
+ </template>
+
+ <v-app-bar-nav-icon />
+
+ <template #extension>
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+ </template>
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+
+ <v-sheet
+ id="scroll-3"
+ class="scroll-y"
+ max-height="100"
+ >
+ <v-container style="height: 1500px;" />
+ </v-sheet>
+ </core-section>
+
+ <core-title>
+ Collapsing on scroll
+ </core-title>
+ <core-section>
+ <v-app-bar
+ color="primary"
+ dark
+ src="https://picsum.photos/1920/1080?random"
+ collapse-on-scroll
+ scroll-target="#scroll-4"
+ scroll-threshold="500"
+ >
+ <template #img="{ props }">
+ <v-img v-bind="props" gradient="to top right, rgba(100,115,201,.7), rgba(25,32,72,.7)" />
+ </template>
+
+ <v-toolbar-title
+ class="white--text"
+ >
+ Title
+ </v-toolbar-title>
+
+ <v-app-bar-nav-icon />
+
+ <v-spacer />
+
+ <v-btn icon>
+ <v-icon>mdi-magnify</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-apps</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-refresh</v-icon>
+ </v-btn>
+
+ <v-btn icon>
+ <v-icon>mdi-dots-vertical</v-icon>
+ </v-btn>
+ </v-app-bar>
+
+ <v-sheet
+ id="scroll-4"
+ class="scroll-y"
+ max-height="100"
+ >
+ <v-container style="height: 1500px;" />
+ </v-sheet>
+ </core-section>
+ </v-layout>
+ </v-container>
+</template>
+
+<script>
+ export default {
+ name: 'AppBars',
+
+ data: () => ({})
+ }
+</script>
diff --git a/packages/kitchen/src/pan/Dividers.vue b/packages/kitchen/src/pan/Dividers.vue
index 25e2dc31647..a8533e30b0a 100644
--- a/packages/kitchen/src/pan/Dividers.vue
+++ b/packages/kitchen/src/pan/Dividers.vue
@@ -68,7 +68,7 @@
<v-divider vertical />
</v-toolbar-items>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
</v-toolbar>
</core-section>
@@ -87,7 +87,7 @@
color="orange lighten-1"
dark
>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Message Board</v-toolbar-title>
diff --git a/packages/kitchen/src/pan/System bars.vue b/packages/kitchen/src/pan/System bars.vue
new file mode 100644
index 00000000000..c20d4d7f61d
--- /dev/null
+++ b/packages/kitchen/src/pan/System bars.vue
@@ -0,0 +1,108 @@
+<template>
+ <v-container>
+ <v-layout column>
+ <main-header>Toolbars</main-header>
+
+ <core-title>Light status bar</core-title>
+ <core-section>
+ <v-card
+ img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg"
+ height="200px"
+ >
+ <v-system-bar
+ status
+ color="primary"
+ >
+ <v-spacer />
+ <v-icon>mdi-wifi-strength-4</v-icon>
+ <v-icon>mdi-signal-off</v-icon>
+ <v-icon>mdi-battery</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </core-section>
+
+ <core-title>Lights out</core-title>
+ <core-section>
+ <v-card
+ img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg"
+ height="200px"
+ >
+ <v-system-bar
+ status
+ color="primary"
+ lights-out
+ >
+ <v-spacer />
+ <v-icon>mdi-wifi-strength-4</v-icon>
+ <v-icon>mdi-signal-off</v-icon>
+ <v-icon>mdi-battery</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </core-section>
+
+ <core-title>Dark status bar</core-title>
+ <core-section>
+ <v-card
+ img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg"
+ height="200px"
+ >
+ <v-system-bar
+ status
+ color="primary"
+ dark
+ >
+ <v-spacer />
+ <v-icon>mdi-wifi-strength-4</v-icon>
+ <v-icon>mdi-signal-off</v-icon>
+ <v-icon>mdi-battery</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </core-section>
+
+ <core-title>Lights out</core-title>
+ <core-section>
+ <v-card
+ img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg"
+ height="200px"
+ >
+ <v-system-bar
+ status
+ color="primary"
+ lights-out
+ dark
+ >
+ <v-spacer />
+ <v-icon>mdi-wifi-strength-4</v-icon>
+ <v-icon>mdi-signal-off</v-icon>
+ <v-icon>mdi-battery</v-icon>
+ <span>12:30</span>
+ </v-system-bar>
+ </v-card>
+ </core-section>
+
+ <core-title>Window bar</core-title>
+ <core-section>
+ <v-system-bar
+ window
+ dark
+ >
+ <v-spacer />
+ <v-icon>mdi-minus</v-icon>
+ <v-icon>mdi-checkbox-blank-outline</v-icon>
+ <v-icon>mdi-close</v-icon>
+ </v-system-bar>
+ </core-section>
+ </v-layout>
+ </v-container>
+</template>
+
+<script>
+ export default {
+ name: 'SystemBars',
+
+ data: () => ({})
+ }
+</script>
diff --git a/packages/kitchen/src/pan/Toolbars.vue b/packages/kitchen/src/pan/Toolbars.vue
index 499dd65e8c2..aa3603e1721 100644
--- a/packages/kitchen/src/pan/Toolbars.vue
+++ b/packages/kitchen/src/pan/Toolbars.vue
@@ -8,7 +8,7 @@
</core-title>
<core-section>
<v-toolbar>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Title</v-toolbar-title>
<v-spacer />
<v-toolbar-items class="hidden-sm-and-down">
@@ -30,7 +30,7 @@
</core-title>
<core-section>
<v-toolbar color="primary lighten-2">
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Title</v-toolbar-title>
<v-spacer />
<v-toolbar-items class="hidden-sm-and-down">
@@ -48,7 +48,7 @@
</core-section>
<core-section class="mt-5">
<v-toolbar color="success">
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Title</v-toolbar-title>
<v-spacer />
<v-toolbar-items class="hidden-sm-and-down">
@@ -65,100 +65,6 @@
</v-toolbar>
</core-section>
- <core-title>
- App bar with icons
- </core-title>
- <core-section>
- <v-toolbar
- dark
- color="primary"
- >
- <v-toolbar-side-icon />
-
- <v-toolbar-title class="white--text">
- Title
- </v-toolbar-title>
-
- <v-spacer />
-
- <v-btn icon>
- <v-icon>mdi-magnify</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>mdi-apps</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>mdi-refresh</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>mdi-dots-vertical</v-icon>
- </v-btn>
- </v-toolbar>
- </core-section>
-
- <core-title>
- App bar with items
- </core-title>
- <core-section>
- <v-toolbar>
- <v-spacer />
-
- <v-toolbar-items>
- <v-btn flat>
- Link One
- </v-btn>
- <v-btn flat>
- Link Two
- </v-btn>
- <v-btn flat>
- Link Three
- </v-btn>
- </v-toolbar-items>
- </v-toolbar>
- </core-section>
-
- <core-title>
- App bar with extension
- </core-title>
- <core-section>
- <v-toolbar
- color="primary"
- dark
- extended
- >
- <v-toolbar-side-icon />
-
- <template #extension>
- <v-toolbar-title
- class="white--text"
- >
- Title
- </v-toolbar-title>
- </template>
-
- <v-spacer />
-
- <v-btn icon>
- <v-icon>mdi-magnify</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>mdi-apps</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>mdi-refresh</v-icon>
- </v-btn>
-
- <v-btn icon>
- <v-icon>mdi-dots-vertical</v-icon>
- </v-btn>
- </v-toolbar>
- </core-section>
-
<core-title>
Using with cards
</core-title>
@@ -170,7 +76,7 @@
extended
flat
>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
</v-toolbar>
<v-layout
@@ -270,7 +176,7 @@
:color="bar.class"
:dark="bar.dark"
>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Title</v-toolbar-title>
<v-spacer />
<v-btn icon>
@@ -296,7 +202,7 @@
prominent
extended
>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Title</v-toolbar-title>
@@ -321,7 +227,7 @@
</core-title>
<core-section>
<v-toolbar dense>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-toolbar-title>Title</v-toolbar-title>
@@ -349,7 +255,7 @@
color="grey darken-1"
dark
>
- <v-toolbar-side-icon />
+ <v-app-bar-nav-icon />
<v-menu :nudge-width="100">
<template #activator>
@@ -386,93 +292,6 @@
</v-btn>
</v-toolbar>
</core-section>
-
- <core-title>
- System / window bar
- </core-title>
- <core-section>
- <div>
- <v-subheader>Light status bar</v-subheader>
- <v-card
- img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg"
- height="200px"
- >
- <v-system-bar
- status
- color="primary"
- >
- <v-spacer />
- <v-icon>mdi-wifi-strength-4</v-icon>
- <v-icon>mdi-signal-off</v-icon>
- <v-icon>mdi-battery</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-subheader>Lights out</v-subheader>
- <v-card
- img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg"
- height="200px"
- >
- <v-system-bar
- status
- color="primary"
- lights-out
- >
- <v-spacer />
- <v-icon>mdi-wifi-strength-4</v-icon>
- <v-icon>mdi-signal-off</v-icon>
- <v-icon>mdi-battery</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-subheader>Dark status bar</v-subheader>
- <v-card
- img="https://cdn.vuetifyjs.com/images/home/vuetify_layout1.svg"
- height="200px"
- >
- <v-system-bar
- status
- color="primary"
- dark
- >
- <v-spacer />
- <v-icon>mdi-wifi-strength-4</v-icon>
- <v-icon>mdi-signal-off</v-icon>
- <v-icon>mdi-battery</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-subheader>Lights out</v-subheader>
- <v-card
- img="https://cdn.vuetifyjs.com/images/home/vuetify_layout2.svg"
- height="200px"
- >
- <v-system-bar
- status
- color="primary"
- lights-out
- dark
- >
- <v-spacer />
- <v-icon>mdi-wifi-strength-4</v-icon>
- <v-icon>mdi-signal-off</v-icon>
- <v-icon>mdi-battery</v-icon>
- <span>12:30</span>
- </v-system-bar>
- </v-card>
- <v-divider class="my-5" />
- <v-subheader>Window bar</v-subheader>
- <v-system-bar
- window
- dark
- >
- <v-spacer />
- <v-icon>mdi-minus</v-icon>
- <v-icon>mdi-checkbox-blank-outline</v-icon>
- <v-icon>mdi-close</v-icon>
- </v-system-bar>
- </div>
- </core-section>
</v-layout>
</v-container>
</template>
diff --git a/packages/vuetify/src/components/VAppBar/VAppBar.sass b/packages/vuetify/src/components/VAppBar/VAppBar.sass
new file mode 100644
index 00000000000..e1098898e26
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/VAppBar.sass
@@ -0,0 +1,39 @@
+@import '../../styles/styles.sass'
+@import './_variables.scss'
+
+// Block
+.v-app-bar
+ contain: content
+
+// Modifier
+.v-app-bar.v-app-bar--fixed
+ position: fixed
+ top: 0
+ width: 100%
+ z-index: 5
+
+.v-app-bar.v-app-bar--hide-shadow
+ +elevation(0)
+
+.v-app-bar--fade-img-on-scroll
+ .v-toolbar__image .v-image__image
+ transition: $app-bar-transition
+
+.v-app-bar.v-toolbar--prominent.v-app-bar--shrink-on-scroll
+ .v-toolbar__content
+ will-change: height
+
+ .v-toolbar__image
+ will-change: opacity
+
+ &.v-app-bar--collapse-on-scroll
+ .v-toolbar__extension
+ display: none
+
+ &.v-app-bar--is-scrolled
+ .v-toolbar__title
+ padding-bottom: $app-bar-scrolled-title-padding-bottom
+
+.v-app-bar.v-app-bar--shrink-on-scroll
+ .v-toolbar__title
+ font-size: inherit
diff --git a/packages/vuetify/src/components/VAppBar/VAppBar.ts b/packages/vuetify/src/components/VAppBar/VAppBar.ts
new file mode 100644
index 00000000000..eea5a090211
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/VAppBar.ts
@@ -0,0 +1,289 @@
+// Styles
+import './VAppBar.sass'
+
+// Extensions
+import VToolbar from '../VToolbar/VToolbar'
+
+// Directives
+import Scroll from '../../directives/scroll'
+
+// Mixins
+import Applicationable from '../../mixins/applicationable'
+import SSRBootable from '../../mixins/ssr-bootable'
+import Toggleable from '../../mixins/toggleable'
+
+// Utilities
+import { convertToUnit } from '../../util/helpers'
+import { consoleWarn } from '../../util/console'
+import mixins from '../../util/mixins'
+
+// Types
+import { VNode } from 'vue'
+
+const baseMixins = mixins(
+ VToolbar,
+ SSRBootable,
+ Toggleable,
+ Applicationable('top', [
+ 'clippedLeft',
+ 'clippedRight',
+ 'invertedScroll',
+ 'isExtended',
+ 'isProminent',
+ 'value'
+ ])
+)
+
+/* @vue/component */
+export default baseMixins.extend({
+ name: 'v-app-bar',
+
+ directives: { Scroll },
+
+ props: {
+ clippedLeft: Boolean,
+ clippedRight: Boolean,
+ collapseOnScroll: Boolean,
+ fadeImgOnScroll: Boolean,
+ elevateOnScroll: Boolean,
+ hideOnScroll: Boolean,
+ invertedScroll: Boolean,
+ scrollOffScreen: Boolean,
+ scrollTarget: String,
+ scrollThreshold: [String, Number],
+ shrinkOnScroll: Boolean,
+ value: {
+ type: Boolean,
+ default: true
+ }
+ },
+
+ data: () => ({
+ currentScroll: 0,
+ currentThreshold: 0,
+ isScrollingUp: false,
+ previousScroll: 0,
+ savedScroll: 0,
+ target: null as Element | null
+ }),
+
+ computed: {
+ applicationProperty (): string {
+ return !this.bottom ? 'top' : 'bottom'
+ },
+ canScroll (): boolean {
+ return (
+ typeof window !== 'undefined' &&
+ (
+ this.invertedScroll ||
+ this.elevateOnScroll ||
+ this.hideOnScroll ||
+ this.collapseOnScroll ||
+ this.isBooted ||
+ // If falsey, user has provided an
+ // explicit value which should
+ // overwrite anything we do
+ !this.value
+ )
+ )
+ },
+ classes (): object {
+ return {
+ ...VToolbar.options.computed.classes.call(this),
+ 'v-toolbar--collapse': this.collapse || this.collapseOnScroll,
+ 'v-app-bar': true,
+ 'v-app-bar--clipped': this.clippedLeft || this.clippedRight,
+ 'v-app-bar--fade-img-on-scroll': this.fadeImgOnScroll,
+ 'v-app-bar--elevate-on-scroll': this.elevateOnScroll,
+ 'v-app-bar--fixed': !this.absolute && (this.app || this.fixed),
+ 'v-app-bar--hide-shadow': this.hideShadow,
+ 'v-app-bar--is-scrolled': this.currentScroll > 0,
+ 'v-app-bar--shrink-on-scroll': this.shrinkOnScroll
+ }
+ },
+ computedContentHeight (): number {
+ if (!this.shrinkOnScroll) return VToolbar.options.computed.computedContentHeight.call(this)
+
+ const height = this.computedOriginalHeight
+
+ const min = this.dense ? 48 : 56
+ const max = height
+ const difference = max - min
+ const iteration = difference / this.computedScrollThreshold
+ const offset = this.currentScroll * iteration
+
+ return Math.max(min, max - offset)
+ },
+ computedFontSize (): number | undefined {
+ if (!this.isProminent) return undefined
+
+ const max = this.dense ? 96 : 128
+ const difference = max - this.computedContentHeight
+ const increment = 0.00347
+
+ // 1.5rem to a minimum of 1.25rem
+ return Number((1.50 - difference * increment).toFixed(2))
+ },
+ computedLeft (): number {
+ if (!this.app || this.clippedLeft) return 0
+
+ return this.$vuetify.application.left
+ },
+ computedMarginTop (): number {
+ if (!this.app) return 0
+
+ return this.$vuetify.application.bar
+ },
+ computedOpacity (): number | undefined {
+ if (!this.fadeImgOnScroll) return undefined
+
+ const opacity = Math.max(
+ (this.computedScrollThreshold - this.currentScroll) / this.computedScrollThreshold,
+ 0
+ )
+
+ return Number(parseFloat(opacity).toFixed(2))
+ },
+ computedOriginalHeight (): number {
+ let height = VToolbar.options.computed.computedContentHeight.call(this)
+ if (this.isExtended) height += parseInt(this.extensionHeight)
+ return height
+ },
+ computedRight (): number {
+ if (!this.app || this.clippedRight) return 0
+
+ return this.$vuetify.application.right
+ },
+ computedScrollThreshold (): number {
+ if (this.scrollThreshold) return Number(this.scrollThreshold)
+
+ return this.computedOriginalHeight - (this.dense ? 48 : 56)
+ },
+ computedTransform (): number {
+ if (!this.canScroll || this.elevateOnScroll) return 0
+
+ if (this.isActive) return 0
+
+ return this.scrollOffScreen
+ ? -this.computedHeight
+ : -this.computedContentHeight
+ },
+ hideShadow (): boolean {
+ if (this.elevateOnScroll) return this.currentScroll === 0
+
+ return (
+ !this.isExtended ||
+ this.scrollOffScreen
+ ) && this.computedTransform !== 0
+ },
+ isCollapsed (): boolean {
+ if (!this.collapseOnScroll) {
+ return VToolbar.options.computed.isCollapsed.call(this)
+ }
+
+ return this.currentScroll > 0
+ },
+ isProminent (): boolean {
+ return (
+ VToolbar.options.computed.isProminent.call(this) ||
+ this.shrinkOnScroll
+ )
+ },
+ styles (): object {
+ return {
+ ...VToolbar.options.computed.styles.call(this),
+ fontSize: convertToUnit(this.computedFontSize, 'rem'),
+ marginTop: convertToUnit(this.computedMarginTop),
+ transform: `translateY(${convertToUnit(this.computedTransform)})`,
+ left: convertToUnit(this.computedLeft),
+ right: convertToUnit(this.computedRight)
+ }
+ }
+ },
+
+ watch: {
+ canScroll: 'onScroll',
+ currentThreshold (val: number) {
+ if (this.invertedScroll) {
+ this.isActive = this.currentScroll > this.computedScrollThreshold
+ return
+ }
+
+ if (val < this.computedScrollThreshold) return
+
+ if (this.hideOnScroll) {
+ this.isActive = this.isScrollingUp
+ }
+
+ this.savedScroll = this.currentScroll
+ },
+ invertedScroll (val: boolean) {
+ this.isActive = !val
+ },
+ isActive () {
+ this.savedScroll = 0
+ },
+ isScrollingUp () {
+ this.savedScroll = this.savedScroll || this.currentScroll
+ }
+ },
+
+ created () {
+ if (this.invertedScroll) this.isActive = false
+ },
+
+ mounted () {
+ if (this.scrollTarget) {
+ this.target = document.querySelector(this.scrollTarget)
+
+ if (!this.target) {
+ consoleWarn(`Unable to locate element with identifier ${this.scrollTarget}`, this)
+ }
+ }
+ },
+
+ methods: {
+ genBackground () {
+ const render = VToolbar.options.methods.genBackground.call(this)
+
+ render.data = this._b(render.data || {}, render.tag!, {
+ style: { opacity: this.computedOpacity }
+ })
+
+ return render
+ },
+ onScroll () {
+ if (!this.canScroll) return
+
+ this.previousScroll = this.currentScroll
+ this.currentScroll = this.target
+ ? this.target.scrollTop
+ : window.pageYOffset
+
+ this.isScrollingUp = this.currentScroll < this.previousScroll
+ this.currentThreshold = Math.abs(this.currentScroll - this.computedScrollThreshold)
+ },
+ updateApplication (): number {
+ return this.invertedScroll
+ ? 0
+ : this.$el ? this.$el.clientHeight : 0
+ }
+ },
+
+ render (h): VNode {
+ const render = VToolbar.options.render.call(this, h)
+
+ render.data = render.data || {}
+
+ if (this.canScroll) {
+ render.data.directives = render.data.directives || []
+ render.data.directives.push({
+ arg: this.scrollTarget,
+ name: 'scroll',
+ value: this.onScroll
+ })
+ }
+
+ return render
+ }
+})
diff --git a/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.ts b/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.ts
new file mode 100644
index 00000000000..1195391446a
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/VAppBarNavIcon.ts
@@ -0,0 +1,28 @@
+// Components
+import VIcon from '../VIcon'
+import VBtn from '../VBtn/VBtn'
+
+// Types
+import Vue from 'vue'
+
+/* @vue/component */
+export default Vue.extend({
+ name: 'v-app-bar-nav-icon',
+
+ functional: true,
+
+ render (h, { slots, listeners, props, data }) {
+ const d = Object.assign(data, {
+ staticClass: (`v-app-bar__nav-icon ${data.staticClass || ''}`).trim(),
+ props: {
+ ...props,
+ icon: true
+ },
+ on: listeners
+ })
+
+ const defaultSlot = slots().default
+
+ return h(VBtn, d, defaultSlot || [h(VIcon, '$vuetify.icons.menu')])
+ }
+})
diff --git a/packages/vuetify/src/components/VAppBar/__tests__/VAppBar.spec.ts b/packages/vuetify/src/components/VAppBar/__tests__/VAppBar.spec.ts
new file mode 100644
index 00000000000..6177e43198b
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/__tests__/VAppBar.spec.ts
@@ -0,0 +1,270 @@
+// Libraries
+import Vue from 'vue'
+
+// Components
+import VAppBar from '../VAppBar'
+
+// Utilities
+import {
+ mount,
+ Wrapper
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../util/mixins'
+import { rafPolyfill, resizeWindow } from '../../../../test'
+
+const scrollWindow = (y: number) => {
+ (global as any).pageYOffset = y
+ ;(global as any).dispatchEvent(new Event('scroll'))
+
+ return new Promise(resolve => setTimeout(resolve, 200))
+}
+
+describe('AppBar.ts', () => {
+ type Instance = ExtractVue<typeof VAppBar>
+ let mountFunction: (options?: object) => Wrapper<Instance>
+
+ rafPolyfill(window)
+
+ beforeEach(() => {
+ mountFunction = (options = {}) => {
+ return mount(VAppBar, {
+ mocks: {
+ $vuetify: {
+ application: {
+ top: 0,
+ register: () => {},
+ unregister: () => {}
+ },
+ breakpoint: {}
+ }
+ },
+ ...options
+ })
+ }
+ })
+
+ it('should calculate paddings ', () => {
+ const wrapper = mountFunction()
+
+ wrapper.vm.$vuetify.application.left = 42
+ wrapper.vm.$vuetify.application.right = 84
+
+ wrapper.setProps({ app: false, clippedLeft: false, clippedRight: false })
+ expect(wrapper.vm.computedLeft).toBe(0)
+ expect(wrapper.vm.computedRight).toBe(0)
+ wrapper.setProps({ app: false, clippedLeft: true, clippedRight: true })
+ expect(wrapper.vm.computedLeft).toBe(0)
+ expect(wrapper.vm.computedRight).toBe(0)
+ wrapper.setProps({ app: true, clippedLeft: false, clippedRight: false })
+ expect(wrapper.vm.computedLeft).toBe(42)
+ expect(wrapper.vm.computedRight).toBe(84)
+ wrapper.setProps({ app: true, clippedLeft: true, clippedRight: true })
+ expect(wrapper.vm.computedLeft).toBe(0)
+ expect(wrapper.vm.computedRight).toBe(0)
+ })
+
+ it('should scroll off screen', async () => {
+ const wrapper = mountFunction({
+ attachToDocument: true,
+ propsData: { hideOnScroll: true, scrollThreshold: 300 }
+ })
+
+ expect(wrapper.vm.isActive).toBe(true)
+ expect(wrapper.vm.currentScroll).toBe(0)
+
+ await scrollWindow(100)
+
+ expect(wrapper.vm.isActive).toBe(true)
+ expect(wrapper.vm.currentScroll).toBe(100)
+
+ await scrollWindow(600)
+
+ expect(wrapper.vm.isActive).toBe(false)
+ expect(wrapper.vm.currentScroll).toBe(600)
+
+ await scrollWindow(475)
+ await scrollWindow(0)
+
+ expect(wrapper.vm.currentScroll).toBe(0)
+
+ expect(wrapper.vm.isActive).toBe(true)
+ expect(wrapper.vm.currentScroll).toBe(0)
+
+ wrapper.setProps({ invertedScroll: true })
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.vm.isActive).toBe(false)
+
+ await scrollWindow(500)
+
+ expect(wrapper.vm.isActive).toBe(true)
+ })
+
+ it('should set isScrollingUp', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ hideOnScroll: true
+ }
+ })
+
+ await scrollWindow(1000)
+ expect(wrapper.vm.isScrollingUp).toBe(false)
+ await scrollWindow(0)
+ expect(wrapper.vm.isScrollingUp).toBe(true)
+ })
+
+ it('should set a custom target', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ scrollTarget: 'body'
+ }
+ })
+
+ wrapper.vm.onScroll()
+ expect(wrapper.vm.target).toBe(document.body)
+ })
+
+ it('should warn if target isn\'t present', async () => {
+ mountFunction({
+ propsData: {
+ scrollTarget: '#test'
+ }
+ })
+
+ expect('Unable to locate element with identifier #test').toHaveBeenTipped()
+ })
+
+ it('should set active based on value', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ hideOnScroll: true
+ }
+ })
+
+ expect(wrapper.vm.isActive).toBe(true)
+ wrapper.setProps({ value: false })
+ await wrapper.vm.$nextTick()
+ expect(wrapper.vm.isActive).toBe(false)
+ })
+
+ it('should set margin top', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ app: true
+ }
+ })
+
+ Vue.set(wrapper.vm.$vuetify.application, 'bar', 24)
+ expect(wrapper.vm.computedMarginTop).toBe(24)
+ })
+
+ it('should set isActive false when created and vertical-scroll', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ invertedScroll: true
+ }
+ })
+
+ expect(wrapper.vm.isActive).toBe(false)
+ })
+
+ it('should hide shadow when using elevate-on-scroll', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ elevateOnScroll: true
+ }
+ })
+
+ expect(wrapper.vm.hideShadow).toBe(true)
+
+ wrapper.setData({ currentScroll: 100 })
+
+ expect(wrapper.vm.hideShadow).toBe(false)
+ })
+
+ it('should collapse-on-scroll', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ collapseOnScroll: true
+ }
+ })
+
+ wrapper.setData({ currentScroll: 0 })
+ expect(wrapper.vm.isCollapsed).toBeFalsy()
+ wrapper.setData({ currentScroll: 100 })
+ expect(wrapper.vm.isCollapsed).toBeTruthy()
+ })
+
+ it('should calculate font size', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ shrinkOnScroll: false,
+ prominent: false
+ }
+ })
+
+ expect(wrapper.vm.computedFontSize).toBeUndefined()
+ wrapper.setProps({
+ shrinkOnScroll: true,
+ prominent: true
+ })
+ expect(wrapper.vm.computedFontSize).toBeDefined()
+ expect(wrapper.vm.computedFontSize).toBe(1.5)
+ })
+
+ it('should render with background', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ src: '/test.jpg'
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should calculate opacity', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ src: '/test.jpg',
+ fadeImgOnScroll: true
+ }
+ })
+
+ expect(wrapper.vm.computedOpacity).toBe(1)
+
+ wrapper.setProps({ fadeImgOnScroll: true })
+ expect(wrapper.vm.computedOpacity).toBe(1)
+
+ wrapper.setData({ currentScroll: 5 })
+ expect(wrapper.vm.computedOpacity).toBe(0.38)
+
+ wrapper.setData({ currentScroll: 100 })
+ expect(wrapper.vm.computedOpacity).toBe(0)
+ })
+
+ // https://github.com/vuetifyjs/vuetify/issues/4985
+ it('should scroll toolbar and extension completely off screen', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ hideOnScroll: true,
+ extended: true
+ }
+ })
+
+ expect(wrapper.vm.computedTransform).toBe(0)
+
+ await scrollWindow(500)
+
+ expect(wrapper.vm.computedTransform).toBe(-64)
+
+ wrapper.setProps({ scrollOffScreen: true })
+
+ expect(wrapper.vm.computedTransform).toBe(-112)
+ expect(wrapper.vm.hideShadow).toBe(true)
+
+ wrapper.setProps({ scrollOffScreen: false })
+
+ expect(wrapper.vm.hideShadow).toBe(false)
+ })
+})
diff --git a/packages/vuetify/src/components/VAppBar/__tests__/VAppBarNavIcon.spec.ts b/packages/vuetify/src/components/VAppBar/__tests__/VAppBarNavIcon.spec.ts
new file mode 100644
index 00000000000..fe0c34fe7fe
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/__tests__/VAppBarNavIcon.spec.ts
@@ -0,0 +1,30 @@
+// Libraries
+import Vue from 'vue'
+
+// Components
+import VAppBarNavIcon from '../VAppBarNavIcon'
+
+// Utilities
+import {
+ mount,
+ Wrapper
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../util/mixins'
+
+describe('AppBarNavIcon.ts', () => {
+ type Instance = ExtractVue<typeof VAppBarNavIcon>
+ let mountFunction: (options?: object) => Wrapper<Instance>
+
+ beforeEach(() => {
+ mountFunction = (options = {}) => {
+ return mount(VAppBarNavIcon, {
+ ...options
+ })
+ }
+ })
+
+ it('should render correctly', () => {
+ const wrapper = mountFunction()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+})
diff --git a/packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBar.spec.ts.snap b/packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBar.spec.ts.snap
new file mode 100644
index 00000000000..5434827e428
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBar.spec.ts.snap
@@ -0,0 +1,28 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AppBar.ts should render with background 1`] = `
+
+<nav class="v-sheet v-sheet--tile theme--light v-toolbar v-app-bar"
+ style="margin-top: 0px; left: 0px; right: 0px;"
+>
+ <div class="v-toolbar__image">
+ <div class="v-responsive v-image"
+ style="height: 64px;"
+ >
+ <div class="v-image__image v-image__image--cover"
+ style="background-image: url(/test.jpg); background-position: center center;"
+ name="fade-transition"
+ mode="in-out"
+ >
+ </div>
+ <div class="v-responsive__content">
+ </div>
+ </div>
+ </div>
+ <div class="v-toolbar__content"
+ style="height: 64px;"
+ >
+ </div>
+</nav>
+
+`;
diff --git a/packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBarNavIcon.spec.ts.snap b/packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBarNavIcon.spec.ts.snap
new file mode 100644
index 00000000000..4f56b0aa212
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBarNavIcon.spec.ts.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AppBarNavIcon.ts should render correctly 1`] = `
+
+<button type="button"
+ class="v-app-bar__nav-icon v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--default"
+>
+ <span class="v-btn__content">
+ <i aria-hidden="true"
+ class="v-icon material-icons theme--light"
+ >
+ $vuetify.icons.menu
+ </i>
+ </span>
+</button>
+
+`;
diff --git a/packages/vuetify/src/components/VAppBar/_variables.scss b/packages/vuetify/src/components/VAppBar/_variables.scss
new file mode 100644
index 00000000000..619ff85bc14
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/_variables.scss
@@ -0,0 +1,2 @@
+$app-bar-transition: .4s opacity map-get($transition, 'fast-out-slow-in') !default;
+$app-bar-scrolled-title-padding-bottom: 8px !default;
diff --git a/packages/vuetify/src/components/VAppBar/index.ts b/packages/vuetify/src/components/VAppBar/index.ts
new file mode 100644
index 00000000000..7debcba6070
--- /dev/null
+++ b/packages/vuetify/src/components/VAppBar/index.ts
@@ -0,0 +1,11 @@
+import VAppBar from './VAppBar'
+import VAppBarNavIcon from './VAppBarNavIcon'
+
+export { VAppBar, VAppBarNavIcon }
+
+export default {
+ $_vuetify_subcomponents: {
+ VAppBar,
+ VAppBarNavIcon
+ }
+}
diff --git a/packages/vuetify/src/components/VSystemBar/VSystemBar.sass b/packages/vuetify/src/components/VSystemBar/VSystemBar.sass
new file mode 100644
index 00000000000..604bf24aea9
--- /dev/null
+++ b/packages/vuetify/src/components/VSystemBar/VSystemBar.sass
@@ -0,0 +1,40 @@
+@import '../../styles/styles.sass'
+@import './_variables.scss'
+@import './_mixins.sass'
+
+/* Theme */
+.v-system-bar.theme--light
+ +system-bar-theme($material-light)
+.v-system-bar.theme--dark
+ +system-bar-theme($material-dark)
+
+.v-system-bar
+ align-items: center
+ display: flex
+ font-size: $system-bar-font-size
+ font-weight: $system-bar-font-weight
+ padding: $system-bar-padding
+
+ .v-icon
+ font-size: $system-bar-icon-font-size
+
+ &--fixed, &--absolute
+ left: 0
+ top: 0
+ width: 100%
+ z-index: 3
+
+ &--fixed
+ position: fixed
+
+ &--absolute
+ position: absolute
+
+ &--status
+ .v-icon
+ margin-right: $system-bar-status-icon-margin-right
+
+ &--window
+ .v-icon
+ font-size: $system-bar-window-icon-font-size
+ margin-right: $system-bar-window-icon-margin-right
diff --git a/packages/vuetify/src/components/VSystemBar/VSystemBar.ts b/packages/vuetify/src/components/VSystemBar/VSystemBar.ts
index ea5b533691f..ab08f59c24a 100644
--- a/packages/vuetify/src/components/VSystemBar/VSystemBar.ts
+++ b/packages/vuetify/src/components/VSystemBar/VSystemBar.ts
@@ -1,12 +1,17 @@
-import '../../stylus/components/_system-bars.styl'
+// Styles
+import './VSystemBar.sass'
+// Mixins
import Applicationable from '../../mixins/applicationable'
import Colorable from '../../mixins/colorable'
import Themeable from '../../mixins/themeable'
+// Utilities
+import mixins from '../../util/mixins'
+import { convertToUnit, getSlot } from '../../util/helpers'
+
// Types
import { VNode } from 'vue/types'
-import mixins from '../../util/mixins'
export default mixins(
Applicationable('bar', [
@@ -20,10 +25,7 @@ export default mixins(
name: 'v-system-bar',
props: {
- height: {
- type: [Number, String],
- validator: (v: any) => !isNaN(parseInt(v))
- },
+ height: [Number, String],
lightsOut: Boolean,
status: Boolean,
window: Boolean
@@ -40,33 +42,35 @@ export default mixins(
...this.themeClasses
}
},
- computedHeight (): number {
- if (this.height) return parseInt(this.height)
+ computedHeight (): number | string {
+ if (this.height) {
+ return isNaN(parseInt(this.height)) ? this.height : parseInt(this.height)
+ }
return this.window ? 32 : 24
+ },
+ styles (): object {
+ return {
+ height: convertToUnit(this.computedHeight)
+ }
}
},
methods: {
- /**
- * Update the application layout
- *
- * @return {number}
- */
updateApplication () {
- return this.computedHeight
+ return this.$el
+ ? this.$el.clientHeight
+ : this.computedHeight
}
},
render (h): VNode {
const data = {
staticClass: 'v-system-bar',
- 'class': this.classes,
- style: {
- height: `${this.computedHeight}px`
- }
+ class: this.classes,
+ style: this.styles
}
- return h('div', this.setBackgroundColor(this.color, data), this.$slots.default)
+ return h('div', this.setBackgroundColor(this.color, data), getSlot(this))
}
})
diff --git a/packages/vuetify/src/components/VSystemBar/__tests__/VSystemBar.spec.ts b/packages/vuetify/src/components/VSystemBar/__tests__/VSystemBar.spec.ts
new file mode 100644
index 00000000000..b8defdd3043
--- /dev/null
+++ b/packages/vuetify/src/components/VSystemBar/__tests__/VSystemBar.spec.ts
@@ -0,0 +1,56 @@
+// Libraries
+import Vue from 'vue'
+
+// Components
+import VSystemBar from '../VSystemBar'
+
+// Utilities
+import {
+ createLocalVue,
+ mount,
+ Wrapper
+} from '@vue/test-utils'
+
+describe('VSystemBar.ts', () => {
+ type Instance = InstanceType<typeof VSystemBar>
+ let mountFunction: (options?: object) => Wrapper<Instance>
+
+ beforeEach(() => {
+ mountFunction = (options = {}) => {
+ return mount(VSystemBar, {
+ mocks: {
+ $vuetify: {
+ application: {
+ register: () => {},
+ unregister: () => {}
+ }
+ }
+ },
+ ...options
+ })
+ }
+ })
+
+ it('should return the correct height', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ app: true,
+ height: 56
+ }
+ })
+
+ expect(wrapper.vm.computedHeight).toBe(56)
+
+ wrapper.setProps({ height: '48' })
+ expect(wrapper.vm.computedHeight).toBe(48)
+
+ wrapper.setProps({ height: 'auto' })
+ expect(wrapper.vm.computedHeight).toBe('auto')
+
+ wrapper.setProps({ height: undefined })
+ expect(wrapper.vm.computedHeight).toBe(24)
+
+ wrapper.setProps({ window: true })
+ expect(wrapper.vm.computedHeight).toBe(32)
+ })
+})
diff --git a/packages/vuetify/src/components/VSystemBar/_mixins.sass b/packages/vuetify/src/components/VSystemBar/_mixins.sass
new file mode 100644
index 00000000000..3f2cd4b150e
--- /dev/null
+++ b/packages/vuetify/src/components/VSystemBar/_mixins.sass
@@ -0,0 +1,9 @@
+@mixin system-bar-theme($material)
+ background-color: map-deep-get($material, 'status-bar', 'regular')
+ color: map-deep-get($material, 'text', 'secondary')
+
+ .v-icon
+ color: map-deep-get($material, 'text', 'secondary')
+
+ &--lights-out
+ background-color: map-deep-get($material, 'status-bar', 'lights-out') !important
diff --git a/packages/vuetify/src/components/VSystemBar/_variables.scss b/packages/vuetify/src/components/VSystemBar/_variables.scss
new file mode 100644
index 00000000000..0fccc5c265d
--- /dev/null
+++ b/packages/vuetify/src/components/VSystemBar/_variables.scss
@@ -0,0 +1,7 @@
+$system-bar-font-size: map-deep-get($headings, 'body-2', 'size') !default;
+$system-bar-font-weight: map-deep-get($headings, 'body-2', 'weight') !default;
+$system-bar-icon-font-size: map-deep-get($headings, 'subtitle-1', 'size') !default;
+$system-bar-padding: 0 8px !default;
+$system-bar-status-icon-margin-right: 4px !default;
+$system-bar-window-icon-margin-right: 8px !default;
+$system-bar-window-icon-font-size: map-deep-get($headings, 'h6', 'size') !default;
diff --git a/packages/vuetify/src/components/VTabs/VTabs.sass b/packages/vuetify/src/components/VTabs/VTabs.sass
index bf8e070d178..2b03dd1865b 100644
--- a/packages/vuetify/src/components/VTabs/VTabs.sass
+++ b/packages/vuetify/src/components/VTabs/VTabs.sass
@@ -19,17 +19,6 @@
.v-menu__activator
height: 100%
-.v-toolbar
- > .v-toolbar__content,
- > .v-toolbar__extension
- > .v-tabs
- margin-left: -#{map-get($grid-gutters, 'xl')}
- margin-right: -#{map-get($grid-gutters, 'xl')}
-
- @media #{map-get($display-breakpoints, 'sm-and-down')}
- margin-left: -#{map-get($grid-gutters, 'lg')}
- margin-right: -#{map-get($grid-gutters, 'lg')}
-
// Element
.v-tabs-bar
border-radius: inherit
@@ -84,7 +73,7 @@
transition: $primary-transition
// Modifier
-.v-tabs--align-with-title
+.v-tabs--align-with-title > .v-tabs-bar
padding-left: $tabs-item-align-with-title-padding
.v-tabs--fixed-tabs,
diff --git a/packages/vuetify/src/components/VTabs/_variables.scss b/packages/vuetify/src/components/VTabs/_variables.scss
index b6a27d7a039..4c26100d3e2 100644
--- a/packages/vuetify/src/components/VTabs/_variables.scss
+++ b/packages/vuetify/src/components/VTabs/_variables.scss
@@ -1,6 +1,6 @@
$tabs-bar-height: 48px !default;
$tabs-icons-and-text-bar-height: 72px !default;
-$tabs-item-align-with-title-padding: 80px !default;
+$tabs-item-align-with-title-padding: 60px !default;
$tabs-item-min-width: 90px !default;
$tabs-item-man-width: 300px !default;
$tabs-item-padding: 0 16px !default;
diff --git a/packages/vuetify/src/components/VToolbar/VToolbar.sass b/packages/vuetify/src/components/VToolbar/VToolbar.sass
new file mode 100644
index 00000000000..263ed3b8c90
--- /dev/null
+++ b/packages/vuetify/src/components/VToolbar/VToolbar.sass
@@ -0,0 +1,127 @@
+@import '../../styles/styles.sass'
+@import './_variables.scss'
+
+// Block
+.v-toolbar
+ transition: $toolbar-transition
+
+ +elevation(4)
+
+ .v-input
+ padding-top: 0
+ margin-top: 0
+
+// Element
+.v-toolbar__content,
+.v-toolbar__extension
+ padding: $toolbar-content-padding-y $toolbar-content-padding-x
+
+ > .v-btn.v-btn--icon
+ height: $toolbar-btn-icon-size
+ width: $toolbar-btn-icon-size
+
+ &:first-child
+ margin-left: -#{$toolbar-btn-icon-size / 4}
+
+ + .v-toolbar__title
+ padding-left: $toolbar-title-padding
+
+ &:last-child
+ margin-right: -#{$toolbar-btn-icon-size / 4}
+
+ +rtl()
+ &:first-child
+ margin-right: -#{$toolbar-btn-icon-size / 4}
+
+ + .v-toolbar__title
+ padding-right: $toolbar-title-padding
+
+ &:last-child
+ margin-left: -#{$toolbar-btn-icon-size / 4}
+
+ > .v-tabs
+ height: inherit
+ margin-top: -#{$toolbar-content-padding-y}
+ margin-bottom: -#{$toolbar-content-padding-y}
+
+ .v-tabs-bar
+ height: inherit
+
+ &:first-child
+ margin-left: -#{$toolbar-content-padding-x}
+
+ &:last-child
+ margin-right: -#{$toolbar-content-padding-x}
+
+.v-toolbar__content,
+.v-toolbar__extension
+ align-items: center
+ display: flex
+
+.v-toolbar__image
+ border-radius: inherit
+ position: absolute
+ top: 0
+ bottom: 0
+ width: 100%
+ z-index: -1
+ contain: strict
+
+ .v-image
+ border-radius: inherit
+
+.v-toolbar__items
+ display: flex
+ height: inherit
+
+ > .v-btn
+ border-radius: 0
+ height: 100% !important
+ max-height: none
+
+.v-toolbar__title
+ font-size: 1.25rem
+ overflow: hidden
+ text-overflow: ellipsis
+ white-space: nowrap
+
+// Modifier
+.v-toolbar.v-toolbar--absolute
+ position: absolute
+ top: 0
+ width: 100%
+ z-index: 1
+
+.v-toolbar.v-toolbar--bottom
+ top: initial
+ bottom: 0
+
+.v-toolbar.v-toolbar--collapse
+ .v-toolbar__title
+ white-space: nowrap
+
+.v-toolbar.v-toolbar--collapsed
+ border-bottom-right-radius: 24px
+ width: 112px
+
+ .v-toolbar__title,
+ .v-toolbar__extension
+ display: none
+
+.v-toolbar--dense
+ .v-toolbar__content,
+ .v-toolbar__extension
+ padding-top: 0
+ padding-bottom: 0
+
+.v-toolbar--floating
+ display: inline-flex
+
+.v-toolbar--prominent
+ .v-toolbar__content
+ align-items: flex-start
+
+ .v-toolbar__title
+ align-self: flex-end
+ font-size: 1.5rem
+ padding-bottom: 6px
diff --git a/packages/vuetify/src/components/VToolbar/VToolbar.ts b/packages/vuetify/src/components/VToolbar/VToolbar.ts
index 638694a2444..6e2d531c5b2 100644
--- a/packages/vuetify/src/components/VToolbar/VToolbar.ts
+++ b/packages/vuetify/src/components/VToolbar/VToolbar.ts
@@ -1,265 +1,144 @@
// Styles
-import '../../stylus/components/_toolbar.styl'
+import './VToolbar.sass'
-// Mixins
-import Applicationable from '../../mixins/applicationable'
-import Colorable from '../../mixins/colorable'
-import Themeable from '../../mixins/themeable'
-import SSRBootable from '../../mixins/ssr-bootable'
+// Extensions
+import VSheet from '../VSheet/VSheet'
-// Directives
-import Scroll from '../../directives/scroll'
-import { deprecate } from '../../util/console'
+// Components
+import VImg, { srcObject } from '../VImg/VImg'
// Types
-import mixins from '../../util/mixins'
import { VNode } from 'vue'
+import { convertToUnit, getSlot } from '../../util/helpers'
+import { PropValidator } from 'vue/types/options'
-export default mixins(
- Applicationable('top', [
- 'clippedLeft',
- 'clippedRight',
- 'computedHeight',
- 'invertedScroll',
- 'manualScroll'
- ]),
- Colorable,
- SSRBootable,
- Themeable
/* @vue/component */
-).extend({
+export default VSheet.extend({
name: 'v-toolbar',
- directives: { Scroll },
-
props: {
- card: Boolean,
- clippedLeft: Boolean,
- clippedRight: Boolean,
+ absolute: Boolean,
+ bottom: Boolean,
dense: Boolean,
+ collapse: Boolean,
extended: Boolean,
extensionHeight: {
- type: [Number, String],
- validator: (v: any) => !isNaN(parseInt(v))
+ default: 48,
+ type: [Number, String]
},
flat: Boolean,
floating: Boolean,
- height: {
- type: [Number, String],
- validator: (v: any) => !isNaN(parseInt(v))
- },
- invertedScroll: Boolean,
- manualScroll: Boolean,
prominent: Boolean,
- scrollOffScreen: Boolean,
- /* @deprecated */
- scrollToolbarOffScreen: Boolean,
- scrollTarget: String,
- scrollThreshold: {
- type: Number,
- default: 300
- },
- tabs: Boolean
+ short: Boolean,
+ src: {
+ type: [String, Object],
+ default: ''
+ } as PropValidator<string | srcObject>,
+ tile: {
+ type: Boolean,
+ default: true
+ }
},
data: () => ({
- activeTimeout: null,
- currentScroll: 0,
- heights: {
- mobileLandscape: 48,
- mobile: 56,
- desktop: 64,
- dense: 48
- },
- isActive: true,
- isExtended: false,
- isScrollingUp: false,
- previousScroll: 0,
- savedScroll: 0,
- target: null as Element | null
+ isExtended: false
}),
computed: {
- canScroll (): boolean {
- // TODO: remove
- if (this.scrollToolbarOffScreen) {
- deprecate('scrollToolbarOffScreen', 'scrollOffScreen', this)
+ computedHeight (): number {
+ const height = this.computedContentHeight
- return true
- }
+ if (!this.isExtended) return height
+
+ const extensionHeight = parseInt(this.extensionHeight)
- return this.scrollOffScreen || this.invertedScroll
+ return this.isCollapsed
+ ? height
+ : height + (!isNaN(extensionHeight) ? extensionHeight : 0)
},
computedContentHeight (): number {
if (this.height) return parseInt(this.height)
- if (this.dense) return this.heights.dense
-
- if (this.prominent ||
- this.$vuetify.breakpoint.mdAndUp
- ) return this.heights.desktop
-
- if (this.$vuetify.breakpoint.smAndDown &&
- this.$vuetify.breakpoint.width >
- this.$vuetify.breakpoint.height
- ) return this.heights.mobileLandscape
-
- return this.heights.mobile
- },
- computedExtensionHeight (): number {
- if (this.tabs) return 48
- if (this.extensionHeight) return parseInt(this.extensionHeight)
-
- return this.computedContentHeight
- },
- computedHeight (): number {
- if (!this.isExtended) return this.computedContentHeight
-
- return this.computedContentHeight + this.computedExtensionHeight
- },
- computedMarginTop (): number {
- if (!this.app) return 0
-
- return this.$vuetify.application.bar
+ if (this.isProminent && this.dense) return 96
+ if (this.isProminent && this.short) return 112
+ if (this.isProminent) return 128
+ if (this.dense) return 48
+ if (this.short || this.$vuetify.breakpoint.smAndDown) return 56
+ return 64
},
classes (): object {
return {
+ ...VSheet.options.computed.classes.call(this),
'v-toolbar': true,
- 'elevation-0': this.flat || (
- !this.isActive &&
- !this.tabs &&
- this.canScroll
- ),
'v-toolbar--absolute': this.absolute,
- 'v-toolbar--card': this.card,
- 'v-toolbar--clipped': this.clippedLeft || this.clippedRight,
+ 'v-toolbar--bottom': this.bottom,
+ 'v-toolbar--collapse': this.collapse,
+ 'v-toolbar--collapsed': this.isCollapsed,
'v-toolbar--dense': this.dense,
'v-toolbar--extended': this.isExtended,
- 'v-toolbar--fixed': !this.absolute && (this.app || this.fixed),
'v-toolbar--floating': this.floating,
- 'v-toolbar--prominent': this.prominent,
- ...this.themeClasses
+ 'v-toolbar--prominent': this.isProminent,
+ 'elevation-0': this.isFlat
}
},
- computedPaddingLeft (): number {
- if (!this.app || this.clippedLeft) return 0
-
- return this.$vuetify.application.left
+ isCollapsed (): boolean {
+ return this.collapse
},
- computedPaddingRight (): number {
- if (!this.app || this.clippedRight) return 0
-
- return this.$vuetify.application.right
+ isFlat (): boolean {
+ return this.flat
},
- computedTransform (): number {
- return !this.isActive
- ? this.canScroll
- ? -this.computedContentHeight
- : -this.computedHeight
- : 0
- },
- currentThreshold (): number {
- return Math.abs(this.currentScroll - this.savedScroll)
+ isProminent (): boolean {
+ return this.prominent
},
styles (): object {
- return {
- marginTop: `${this.computedMarginTop}px`,
- paddingRight: `${this.computedPaddingRight}px`,
- paddingLeft: `${this.computedPaddingLeft}px`,
- transform: `translateY(${this.computedTransform}px)`
- }
+ return this.measurableStyles
}
},
- watch: {
- currentThreshold (val: number) {
- if (this.invertedScroll) {
- this.isActive = this.currentScroll > this.scrollThreshold
- return
+ methods: {
+ genBackground () {
+ const props = {
+ height: convertToUnit(this.computedHeight),
+ src: this.src
}
- if (val < this.scrollThreshold ||
- !this.isBooted
- ) return
+ const image = this.$scopedSlots.img
+ ? this.$scopedSlots.img({ props })
+ : this.$createElement(VImg, { props })
- this.isActive = this.isScrollingUp
- this.savedScroll = this.currentScroll
- },
- isActive () {
- this.savedScroll = 0
+ return this.$createElement('div', {
+ staticClass: 'v-toolbar__image'
+ }, [image])
},
- invertedScroll (val: boolean) {
- this.isActive = !val
- },
- manualScroll (val: boolean) {
- this.isActive = !val
- },
- isScrollingUp () {
- this.savedScroll = this.savedScroll || this.currentScroll
- }
- },
-
- created () {
- if (this.invertedScroll ||
- this.manualScroll
- ) this.isActive = false
- },
-
- mounted () {
- if (this.scrollTarget) {
- this.target = document.querySelector(this.scrollTarget)
- }
- },
-
- methods: {
- onScroll () {
- if (!this.canScroll ||
- this.manualScroll ||
- typeof window === 'undefined'
- ) return
-
- this.currentScroll = this.target
- ? this.target.scrollTop
- : window.pageYOffset
-
- this.isScrollingUp = this.currentScroll < this.previousScroll
-
- this.previousScroll = this.currentScroll
+ genContent () {
+ return this.$createElement('div', {
+ staticClass: 'v-toolbar__content',
+ style: {
+ height: convertToUnit(this.computedContentHeight)
+ }
+ }, getSlot(this))
},
- updateApplication (): number {
- return this.invertedScroll || this.manualScroll
- ? 0
- : this.computedHeight
+ genExtension () {
+ return this.$createElement('div', {
+ staticClass: 'v-toolbar__extension',
+ style: {
+ height: convertToUnit(this.extensionHeight)
+ }
+ }, getSlot(this, 'extension'))
}
},
render (h): VNode {
- this.isExtended = this.extended || !!this.$slots.extension
+ this.isExtended = this.extended || !!this.$scopedSlots.extension
- const children = []
+ const children = [this.genContent()]
const data = this.setBackgroundColor(this.color, {
- 'class': this.classes,
+ class: this.classes,
style: this.styles,
on: this.$listeners
})
- data.directives = [{
- arg: this.scrollTarget,
- name: 'scroll',
- value: this.onScroll
- }]
-
- children.push(h('div', {
- staticClass: 'v-toolbar__content',
- style: { height: `${this.computedContentHeight}px` },
- ref: 'content'
- }, this.$slots.default))
-
- if (this.isExtended) {
- children.push(h('div', {
- staticClass: 'v-toolbar__extension',
- style: { height: `${this.computedExtensionHeight}px` }
- }, this.$slots.extension))
- }
+ if (this.isExtended) children.push(this.genExtension())
+ if (this.src || this.$scopedSlots.img) children.unshift(this.genBackground())
return h('nav', data, children)
}
diff --git a/packages/vuetify/src/components/VToolbar/VToolbarSideIcon.ts b/packages/vuetify/src/components/VToolbar/VToolbarSideIcon.ts
index c0ceaf043d8..4b8df25176e 100644
--- a/packages/vuetify/src/components/VToolbar/VToolbarSideIcon.ts
+++ b/packages/vuetify/src/components/VToolbar/VToolbarSideIcon.ts
@@ -1,30 +1,19 @@
-import VBtn from '../VBtn'
-import VIcon from '../VIcon'
+// Components
+import VAppBarNavIcon from '../VAppBar/VAppBarNavIcon'
-import Vue from 'vue'
+// Utilities
+import { deprecate } from '../../util/console'
-/* @vue/component */
-export default Vue.extend({
- name: 'v-toolbar-side-icon',
-
- functional: true,
+// Types
+import { VNode } from 'vue'
- render (h, { slots, listeners, props, data }) {
- const classes = data.staticClass
- ? `${data.staticClass} v-toolbar__side-icon`
- : 'v-toolbar__side-icon'
-
- const d = Object.assign(data, {
- staticClass: classes,
- props: Object.assign(props, {
- fab: true,
- text: true
- }),
- on: listeners
- })
+/* @vue/component */
+export default VAppBarNavIcon.extend({
+ name: 'v-app-bar-nav-icon',
- const defaultSlot = slots().default
+ render (h, context): VNode {
+ deprecate('<v-toolbar-side-icon>', '<v-app-bar-nav-icon>', this)
- return h(VBtn, d, defaultSlot || [h(VIcon, '$vuetify.icons.menu')])
+ return VAppBarNavIcon.options.render.call(this, h, context)
}
})
diff --git a/packages/vuetify/src/components/VToolbar/__tests__/VToolbar.spec.ts b/packages/vuetify/src/components/VToolbar/__tests__/VToolbar.spec.ts
new file mode 100644
index 00000000000..d7b8a7a52ef
--- /dev/null
+++ b/packages/vuetify/src/components/VToolbar/__tests__/VToolbar.spec.ts
@@ -0,0 +1,91 @@
+// Libraries
+import Vue from 'vue'
+
+// Components
+import VToolbar from '../VToolbar'
+import { ExtractVue } from '../../../util/mixins'
+
+// Utilities
+import {
+ mount,
+ Wrapper
+} from '@vue/test-utils'
+
+describe('VToolbar.ts', () => {
+ type Instance = ExtractVue<typeof VToolbar>
+ let mountFunction: (options?: object) => Wrapper<Instance>
+
+ beforeEach(() => {
+ mountFunction = (options = {}) => {
+ return mount(VToolbar, {
+ mocks: {
+ $vuetify: {
+ breakpoint: {}
+ }
+ },
+ ...options
+ })
+ }
+ })
+
+ it('should render an extended toolbar', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ extended: true
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render an extended toolbar with specific height', () => {
+ const wrapper = mountFunction({
+ propsData: {
+ extended: true,
+ extensionHeight: 42
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should properly calculate content height', () => {
+ const wrapper = mountFunction()
+
+ wrapper.setProps({
+ height: 999
+ })
+ expect(wrapper.vm.computedContentHeight).toBe(999)
+
+ wrapper.setProps({
+ height: null,
+ dense: true
+ })
+ expect(wrapper.vm.computedContentHeight).toBe(48)
+
+ wrapper.setProps({
+ height: null,
+ dense: false,
+ prominent: true
+ })
+ expect(wrapper.vm.computedContentHeight).toBe(128)
+
+ wrapper.setProps({
+ height: null,
+ dense: false,
+ prominent: false
+ })
+ Vue.set(wrapper.vm.$vuetify.breakpoint, 'smAndDown', true)
+ expect(wrapper.vm.computedContentHeight).toBe(56)
+ Vue.set(wrapper.vm.$vuetify.breakpoint, 'smAndDown', false)
+ expect(wrapper.vm.computedContentHeight).toBe(64)
+ })
+
+ it('should have a custom extension height', () => {
+ const wrapper = mountFunction({
+ propsData: { tabs: true }
+ })
+
+ expect(wrapper.vm.extensionHeight).toBe(48)
+ })
+})
diff --git a/packages/vuetify/src/components/VToolbar/__tests__/VToolbarSideIcon.spec.ts b/packages/vuetify/src/components/VToolbar/__tests__/VToolbarSideIcon.spec.ts
new file mode 100644
index 00000000000..6232fa91de3
--- /dev/null
+++ b/packages/vuetify/src/components/VToolbar/__tests__/VToolbarSideIcon.spec.ts
@@ -0,0 +1,30 @@
+// Libraries
+import Vue from 'vue'
+
+// Components
+import VToolbarSideIcon from '../VToolbarSideIcon'
+
+// Utilities
+import {
+ mount,
+ Wrapper
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../util/mixins'
+
+describe('ToolbarSideIcon.ts', () => {
+ type Instance = ExtractVue<typeof VToolbarSideIcon>
+ let mountFunction: (options?: object) => Wrapper<Instance>
+
+ beforeEach(() => {
+ mountFunction = (options = {}) => {
+ return mount(VToolbarSideIcon, {
+ ...options
+ })
+ }
+ })
+
+ it('should render correctly', () => {
+ const wrapper = mountFunction()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+})
diff --git a/packages/vuetify/src/components/VToolbar/__tests__/__snapshots__/VToolbar.spec.ts.snap b/packages/vuetify/src/components/VToolbar/__tests__/__snapshots__/VToolbar.spec.ts.snap
new file mode 100644
index 00000000000..f9980ea30fd
--- /dev/null
+++ b/packages/vuetify/src/components/VToolbar/__tests__/__snapshots__/VToolbar.spec.ts.snap
@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`VToolbar.ts should render an extended toolbar 1`] = `
+
+<nav class="v-sheet v-sheet--tile theme--light v-toolbar v-toolbar--extended">
+ <div class="v-toolbar__content"
+ style="height: 64px;"
+ >
+ </div>
+ <div class="v-toolbar__extension"
+ style="height: 48px;"
+ >
+ </div>
+</nav>
+
+`;
+
+exports[`VToolbar.ts should render an extended toolbar with specific height 1`] = `
+
+<nav class="v-sheet v-sheet--tile theme--light v-toolbar v-toolbar--extended">
+ <div class="v-toolbar__content"
+ style="height: 64px;"
+ >
+ </div>
+ <div class="v-toolbar__extension"
+ style="height: 42px;"
+ >
+ </div>
+</nav>
+
+`;
diff --git a/packages/vuetify/src/components/VToolbar/__tests__/__snapshots__/VToolbarSideIcon.spec.ts.snap b/packages/vuetify/src/components/VToolbar/__tests__/__snapshots__/VToolbarSideIcon.spec.ts.snap
new file mode 100644
index 00000000000..c9ddae3b755
--- /dev/null
+++ b/packages/vuetify/src/components/VToolbar/__tests__/__snapshots__/VToolbarSideIcon.spec.ts.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ToolbarSideIcon.ts should render correctly 1`] = `
+
+<button type="button"
+ class="v-app-bar__nav-icon v-btn v-btn--fab v-btn--flat v-btn--icon v-btn--round theme--light v-size--default"
+>
+ <span class="v-btn__content">
+ <i aria-hidden="true"
+ class="v-icon material-icons theme--light"
+ >
+ $vuetify.icons.menu
+ </i>
+ </span>
+</button>
+
+`;
diff --git a/packages/vuetify/src/components/VToolbar/_variables.scss b/packages/vuetify/src/components/VToolbar/_variables.scss
new file mode 100644
index 00000000000..6c90f425771
--- /dev/null
+++ b/packages/vuetify/src/components/VToolbar/_variables.scss
@@ -0,0 +1,8 @@
+$toolbar-btn-icon-size: 48px !default;
+$toolbar-content-padding-y: 4px !default;
+$toolbar-content-padding-x: 16px !default;
+$toolbar-title-padding: 20px !default;
+$toolbar-transition: 0.2s map-get($transition, 'fast-out-slow-in') transform,
+ 0.2s map-get($transition, 'fast-out-slow-in') background-color,
+ 280ms map-get($transition, 'fast-out-slow-in') box-shadow,
+ 0.25s map-get($transition, 'fast-out-slow-in') width !default;
diff --git a/packages/vuetify/src/components/VToolbar/index.ts b/packages/vuetify/src/components/VToolbar/index.ts
index a08d4d58219..11bc1c79b01 100644
--- a/packages/vuetify/src/components/VToolbar/index.ts
+++ b/packages/vuetify/src/components/VToolbar/index.ts
@@ -1,12 +1,122 @@
-import { createSimpleFunctional } from '../../util/helpers'
-
+// Components
import VToolbar from './VToolbar'
import VToolbarSideIcon from './VToolbarSideIcon'
+import VAppBar from '../VAppBar/VAppBar'
+
+// Utilities
+import { createSimpleFunctional } from '../../util/helpers'
+import rebuildSlots from '../../util/rebuildFunctionalSlots'
+import dedupeModelListeners from '../../util/dedupeModelListeners'
+import { deprecate } from '../../util/console'
+
+// Types
+import Vue, { VNode } from 'vue'
const VToolbarTitle = createSimpleFunctional('v-toolbar__title')
const VToolbarItems = createSimpleFunctional('v-toolbar__items')
-export { VToolbar, VToolbarSideIcon, VToolbarTitle, VToolbarItems }
+/* @vue/component */
+const wrapper = Vue.extend({
+ functional: true,
+
+ $_wrapperFor: VToolbar,
+
+ props: {
+ app: Boolean,
+ /* @deprecated */
+ card: Boolean,
+ clippedLeft: Boolean,
+ clippedRight: Boolean,
+ invertedScroll: Boolean,
+ /* @deprecated */
+ manualScroll: Boolean,
+ /* @deprecated */
+ scrollOffScreen: Boolean,
+ scrollTarget: String,
+ scrollThreshold: {
+ type: Number,
+ default: 300
+ },
+ /* @deprecated */
+ tabs: Boolean
+ },
+
+ render (h, { props, data, slots }): VNode { // eslint-disable-line max-statements
+ dedupeModelListeners(data)
+ const children = rebuildSlots(slots(), h)
+
+ data.attrs = data.attrs || {}
+
+ if (props.app) {
+ deprecate('manual-scroll', 'value')
+ deprecate('<v-toolbar app>', '<v-app-bar app>')
+ data.attrs.app = props.app
+ }
+
+ if (props.manualScroll) {
+ deprecate('manual-scroll', 'value')
+ deprecate('<v-toolbar manual-scroll>', '<v-app-bar :value="false">')
+ data.attrs.value = !props.manualScroll
+ }
+
+ if (props.clippedLeft) {
+ deprecate('<v-toolbar clipped-left>', '<v-app-bar clipped-left>')
+ data.attrs.clippedLeft = props.clippedLeft
+ }
+
+ if (props.clippedRight) {
+ deprecate('<v-toolbar clipped-right>', '<v-app-bar clipped-right>')
+ data.attrs.clippedRight = props.clippedRight
+ }
+
+ if (props.invertedScroll) {
+ deprecate('<v-toolbar inverted-scroll>', '<v-app-bar inverted-scroll>')
+ data.attrs.invertedScroll = props.invertedScroll
+ }
+
+ if (props.scrollOffScreen) {
+ deprecate('<v-toolbar scroll-off-screen>', '<v-app-bar hide-on-scroll scroll-off-screen>')
+ data.attrs.scrollOffScreen = props.scrollOffScreen
+ }
+
+ if (props.scrollTarget) {
+ deprecate('<v-toolbar scroll-target>', '<v-app-bar scroll-target>')
+ data.attrs.scrollTarget = props.scrollTarget
+ }
+
+ if (props.scrollThreshold !== 300) {
+ deprecate('<v-toolbar scroll-threshold>', '<v-app-bar scroll-threshold>')
+ data.attrs.scrollThreshold = props.scrollThreshold
+ }
+
+ if (props.card) {
+ deprecate('<v-toolbar card>', '<v-toolbar flat>')
+ data.attrs.flat = props.card
+ }
+
+ if (
+ props.app ||
+ props.manualScroll ||
+ props.clippedLeft ||
+ props.clippedRight ||
+ props.invertedScroll ||
+ props.scrollOffScreen ||
+ props.scrollTarget ||
+ props.scrollThreshold
+ ) {
+ return h(VAppBar, data, children)
+ }
+
+ return h(VToolbar, data, children)
+ }
+})
+
+export {
+ wrapper as VToolbar,
+ VToolbarSideIcon,
+ VToolbarTitle,
+ VToolbarItems
+}
export default {
$_vuetify_subcomponents: {
diff --git a/packages/vuetify/src/components/index.ts b/packages/vuetify/src/components/index.ts
index 8cae1b073e4..2451350dc72 100644
--- a/packages/vuetify/src/components/index.ts
+++ b/packages/vuetify/src/components/index.ts
@@ -1,4 +1,5 @@
export * from './VApp'
+export * from './VAppBar'
export * from './VAlert'
export * from './VAutocomplete'
export * from './VAvatar'
diff --git a/packages/vuetify/src/stylus/components/_selection-controls.styl b/packages/vuetify/src/stylus/components/_selection-controls.styl
index 9eb3adeec5a..f662f502473 100644
--- a/packages/vuetify/src/stylus/components/_selection-controls.styl
+++ b/packages/vuetify/src/stylus/components/_selection-controls.styl
@@ -85,11 +85,14 @@ rtl(v-selection-control-rtl, "v-input--selection-controls")
.v-ripple__container
transform: scale(1.4)
- &.v-input .v-label
- align-items: center
- display: inline-flex
- top: 0
- height: auto
+ &.v-input
+ flex: 0 1 auto
+
+ .v-label
+ align-items: center
+ display: inline-flex
+ top: 0
+ height: auto
&.v-input--is-focused,
.v-radio--is-focused
diff --git a/packages/vuetify/src/stylus/components/_system-bars.styl b/packages/vuetify/src/stylus/components/_system-bars.styl
deleted file mode 100644
index 571373a586f..00000000000
--- a/packages/vuetify/src/stylus/components/_system-bars.styl
+++ /dev/null
@@ -1,46 +0,0 @@
-@import '../bootstrap'
-@import '../theme'
-
-/* Theme */
-v-system-bar($material)
- background-color: $material.status-bar.regular
- color: $material.text.secondary
-
- .v-icon
- color: $material.text.secondary
-
- &--lights-out
- background-color: $material.status-bar.lights-out !important
-
-theme(v-system-bar, "v-system-bar")
-
-.v-system-bar
- align-items: center
- display: flex
- font-size: $headings.body-2.size
- font-weight: $headings.body-2.weight
- padding: 0 8px
-
- .v-icon
- font-size: $headings.subtitle-1.size
-
- &--fixed, &--absolute
- left: 0
- top: 0
- width: 100%
- z-index: 3
-
- &--fixed
- position: fixed
-
- &--absolute
- position: absolute
-
- &--status
- .v-icon
- margin-right: 4px
-
- &--window
- .v-icon
- font-size: $headings.h6.size
- margin-right: 8px
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index 492a2f5e60c..54216cfb1f6 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -1,5 +1,5 @@
import Vue from 'vue'
-import { VNode, VNodeDirective, FunctionalComponentOptions, VNodeChildrenArrayContents } from 'vue/types'
+import { VNode, VNodeDirective, FunctionalComponentOptions } from 'vue/types'
import { VuetifyIcon } from 'vuetify'
export function createSimpleFunctional (
@@ -355,18 +355,6 @@ export function groupByProperty (xs: any[], key: string): Record<string, any[]>
export function wrapInArray<T> (v: T | T[]): T[] { return Array.isArray(v) ? v : [v] }
-export function computeSlots (cmp: Vue, name: string, props: object) {
- const slots: VNodeChildrenArrayContents = []
-
- if (cmp.$slots[name]) slots.push(...cmp.$slots[name]!)
- if (cmp.$scopedSlots[name]) {
- const scoped = cmp.$scopedSlots[name]!(props)
- Array.isArray(scoped) ? slots.push(...scoped) : slots.push(scoped)
- }
-
- return slots
-}
-
export type compareFn<T = any> = (a: T, b: T) => number
export function sortItems (
@@ -443,3 +431,12 @@ export function getSlotType<T extends boolean = false> (vm: Vue, name: string, s
if (vm.$slots[name]) return 'normal'
if (vm.$scopedSlots[name]) return 'scoped'
}
+
+export function getSlot (vm: Vue, name = 'default', data?: object) {
+ if (vm.$scopedSlots[name]) {
+ return vm.$scopedSlots[name]!(data)
+ } else if (vm.$slots[name] && !data) {
+ return vm.$slots[name]
+ }
+ return undefined
+}
diff --git a/packages/vuetify/test/unit/components/VSystemBar/VSystemBar.spec.js b/packages/vuetify/test/unit/components/VSystemBar/VSystemBar.spec.js
deleted file mode 100644
index 31e9c296624..00000000000
--- a/packages/vuetify/test/unit/components/VSystemBar/VSystemBar.spec.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { test } from '@/test'
-import VSystemBar from '@/components/VSystemBar'
-
-test('VSystemBar.vue', ({ mount }) => {
- it('should render a colored system bar', () => {
- const wrapper = mount(VSystemBar, {
- propsData: {
- color: 'blue lighten-1'
- }
- })
-
- expect(wrapper.element.classList).toContain('blue')
- expect(wrapper.element.classList).toContain('lighten-1')
- })
-
- it('should render system bar with fixed prop', () => {
- const wrapper = mount(VSystemBar, {
- propsData: {
- fixed: true
- }
- })
-
- expect(wrapper.element.classList).toContain('v-system-bar--fixed')
- })
-
- it('should render system bar with absolute prop', () => {
- const wrapper = mount(VSystemBar, {
- propsData: {
- absolute: true
- }
- })
-
- expect(wrapper.element.classList).toContain('v-system-bar--absolute')
- })
-
- it('should update height when window prop change', async () => {
- const wrapper = mount(VSystemBar, {
- propsData: {
- app: true
- }
- })
-
- expect(wrapper.vm.$vuetify.application.bar).toBe(24)
-
- wrapper.setProps({
- window: true
- })
- expect(wrapper.vm.$vuetify.application.bar).toBe(32)
-
- wrapper.setProps({
- height: 90
- })
- expect(wrapper.vm.$vuetify.application.bar).toBe(90)
- })
-
- it('should warn for improper height', () => {
- const wrapper = mount(VSystemBar, {
- propsData: {
- height: 'foo'
- }
- })
-
- expect('custom validator check failed for prop "height"').toHaveBeenWarned()
- })
-})
diff --git a/packages/vuetify/test/unit/components/VToolbar/VToolbar.spec.js b/packages/vuetify/test/unit/components/VToolbar/VToolbar.spec.js
deleted file mode 100644
index 1d575e4e3f3..00000000000
--- a/packages/vuetify/test/unit/components/VToolbar/VToolbar.spec.js
+++ /dev/null
@@ -1,257 +0,0 @@
-import Vue from 'vue'
-import { test, resizeWindow } from '@/test'
-import VApp from '@/components/VApp/VApp'
-import VToolbar from '@/components/VToolbar/VToolbar'
-
-const scrollWindow = y => {
- global.pageYOffset = y
- global.dispatchEvent(new Event('scroll'))
-
- return new Promise(resolve => setTimeout(resolve, 200))
-}
-
-const deprecateScrollToolbarOffScreen = `'scrollToolbarOffScreen' is deprecated, use 'scrollOffScreen' instead`
-
-test('VToolbar.vue', ({ mount }) => {
- it('should render a colored toolbar', () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- color: 'blue lighten-1'
- }
- })
-
- expect(wrapper.element.classList).toContain('blue')
- expect(wrapper.element.classList).toContain('lighten-1')
- })
-
- it('should render an extended toolbar', () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- extended: true
- }
- })
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should render an extended toolbar with specific height', () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- extended: true,
- extensionHeight: 42
- }
- })
-
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should calculate paddings ', () => {
- const wrapper = mount(VToolbar)
-
- wrapper.vm.$vuetify.application.left = 42
- wrapper.vm.$vuetify.application.right = 84
-
- wrapper.setProps({ app: false, clippedLeft: false, clippedRight: false })
- expect(wrapper.vm.computedPaddingLeft).toBe(0)
- expect(wrapper.vm.computedPaddingRight).toBe(0)
- wrapper.setProps({ app: false, clippedLeft: true, clippedRight: true })
- expect(wrapper.vm.computedPaddingLeft).toBe(0)
- expect(wrapper.vm.computedPaddingRight).toBe(0)
- wrapper.setProps({ app: true, clippedLeft: false, clippedRight: false })
- expect(wrapper.vm.computedPaddingLeft).toBe(42)
- expect(wrapper.vm.computedPaddingRight).toBe(84)
- wrapper.setProps({ app: true, clippedLeft: true, clippedRight: true })
- expect(wrapper.vm.computedPaddingLeft).toBe(0)
- expect(wrapper.vm.computedPaddingRight).toBe(0)
- })
-
- it('should calculate application top', async () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- app: true,
- fixed: true,
- height: 21
- }
- })
-
- expect(wrapper.vm.$vuetify.application.top).toBe(21)
- wrapper.setProps({
- height: 42
- })
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.$vuetify.application.top).toBe(42)
-
- wrapper.setProps({
- invertedScroll: true
- })
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.$vuetify.application.top).toBe(0)
-
- wrapper.setProps({
- invertedScroll: false
- })
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.$vuetify.application.top).toBe(42)
-
- wrapper.setProps({
- manualScroll: true
- })
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.$vuetify.application.top).toBe(0)
- })
-
- it('should properly calculate content height', () => {
- const wrapper = mount(VToolbar)
-
- wrapper.setProps({
- height: 999
- })
- expect(wrapper.vm.computedContentHeight).toBe(999)
-
- wrapper.setProps({
- height: null,
- dense: true
- })
- expect(wrapper.vm.computedContentHeight).toBe(wrapper.vm.heights.dense)
-
- wrapper.setProps({
- height: null,
- dense: false,
- prominent: true
- })
- expect(wrapper.vm.computedContentHeight).toBe(wrapper.vm.heights.desktop)
-
- wrapper.setProps({
- height: null,
- dense: false,
- prominent: false
- })
- Vue.set(wrapper.vm.$vuetify.breakpoint, 'width', 200)
- Vue.set(wrapper.vm.$vuetify.breakpoint, 'height', 100)
- expect(wrapper.vm.computedContentHeight).toBe(wrapper.vm.heights.desktop)
- Vue.set(wrapper.vm.$vuetify.breakpoint, 'width', 100)
- Vue.set(wrapper.vm.$vuetify.breakpoint, 'height', 200)
- expect(wrapper.vm.computedContentHeight).toBe(wrapper.vm.heights.desktop)
- })
-
- it('should set margin top', () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- app: true
- }
- })
-
- Vue.set(wrapper.vm.$vuetify.application, 'bar', 24)
- expect(wrapper.vm.computedMarginTop).toBe(24)
- })
-
- it('should set active based on manual scroll', async () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- scrollOffScreen: true
- }
- })
-
- expect(wrapper.vm.isActive).toBe(true)
- wrapper.setProps({ manualScroll: true })
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.isActive).toBe(false)
- })
-
- it.skip('should set a custom target', async () => {
- const wrapper = mount(VToolbar, {
- propsData: {
- target: 'body'
- }
- })
-
- wrapper.vm.onScroll()
- expect(wrapper.vm.target).toBe('body')
- })
-
- it.skip('should set isScrollingUp', async () => {
- const wrapper = mount(VToolbar)
-
- await scrollWindow(100)
- expect(wrapper.vm.isScrollingUp).toBe(false)
- await scrollWindow(0)
- expect(wrapper.vm.isScrollingUp).toBe(true)
- })
-
- it('should update the application content height if screen size changes', async () => {
- const app = mount(VApp)
- const wrapper = mount(VToolbar, {
- propsData: {
- app: true
- }
- })
-
- await resizeWindow(1920)
- expect(wrapper.vm.$vuetify.application.top).toBe(64)
-
- await resizeWindow(200)
- expect(wrapper.vm.$vuetify.application.top).toBe(56)
- })
-
- it('should return different heights for scroll-{toolbar}-off-screen', async () => {
- const app = mount(VApp)
- const wrapper = mount(VToolbar, {
- propsData: {
- app: true,
- extended: true
- }
- })
-
- expect(wrapper.vm.computedTransform).toBe(0)
-
- wrapper.setData({ isActive: false })
-
- expect(wrapper.vm.computedTransform).toBe(-112)
-
- wrapper.setProps({ scrollToolbarOffScreen: true })
-
- expect(wrapper.vm.computedTransform).toBe(-56)
- expect(deprecateScrollToolbarOffScreen).toHaveBeenTipped()
- })
-
- it('should have a custom extension height', () => {
- const wrapper = mount(VToolbar, {
- propsData: { tabs: true }
- })
-
- expect(wrapper.vm.computedExtensionHeight).toBe(48)
- })
-
- it('should scroll off screen', async () => {
- const wrapper = mount(VToolbar, {
- attachToDocument: true,
- propsData: { scrollOffScreen: true }
- })
-
- expect(wrapper.vm.isActive).toBe(true)
-
- await scrollWindow(100)
-
- expect(wrapper.vm.currentScroll).toBe(100)
-
- await scrollWindow(500)
-
- expect(wrapper.vm.currentScroll).toBe(500)
- expect(wrapper.vm.isActive).toBe(false)
-
- await scrollWindow(0)
-
- expect(wrapper.vm.isScrollingUp).toBe(true)
- expect(wrapper.vm.isActive).toBe(true)
-
- wrapper.setProps({ invertedScroll: true })
-
- await wrapper.vm.$nextTick()
-
- expect(wrapper.vm.isActive).toBe(false)
-
- await scrollWindow(500)
-
- expect(wrapper.vm.isActive).toBe(true)
- })
-})
diff --git a/packages/vuetify/test/unit/components/VToolbar/VToolbarSideIcon.spec.js b/packages/vuetify/test/unit/components/VToolbar/VToolbarSideIcon.spec.js
deleted file mode 100644
index 99eaba97e55..00000000000
--- a/packages/vuetify/test/unit/components/VToolbar/VToolbarSideIcon.spec.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { test } from '@/test'
-import VIcon from '@/components/VIcon'
-import { VToolbarSideIcon } from '@/components/VToolbar'
-
-test('VToolbarSideIcon.js', ({ mount, functionalContext }) => {
- it('should create default icon when no slot used', () => {
- const context = functionalContext()
- const wrapper = mount(VToolbarSideIcon, context)
-
- expect(wrapper.find('i')[0].hasClass('material-icons')).toBe(true)
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should create slot icon when present', () => {
- const iconWrapper = mount(VIcon, functionalContext({}, 'fa-add'))
-
- const context = functionalContext({}, iconWrapper.vNode)
- const wrapper = mount(VToolbarSideIcon, context)
-
- expect(wrapper.find('i')[0].hasClass('fa-add')).toBe(true)
- expect(wrapper.html()).toMatchSnapshot()
- })
-
- it('should pass through events properly', () => {
- const click = jest.fn()
- const context = functionalContext({
- on: { click }
- })
- const wrapper = mount(VToolbarSideIcon, context)
-
- wrapper.trigger('click')
-
- expect(click).toBeCalled()
- })
-
- it('should pass through props to button component', () => {
- const context = functionalContext({
- props: {
- dark: true
- }
- })
- const wrapper = mount(VToolbarSideIcon, context)
-
- expect(wrapper.hasClass('theme--dark')).toBe(true)
- })
-
- it('should pass through css classes to button component', () => {
- const context = functionalContext({
- staticClass: 'hidden-sm-and-up'
- })
- const wrapper = mount(VToolbarSideIcon, context)
-
- expect(wrapper.hasClass('hidden-sm-and-up')).toBe(true)
- })
-
- it('should pass through directives to button component', () => {
- const context = functionalContext({
- directives: [
- {
- name: 'show',
- value: false
- }
- ]
- })
- const wrapper = mount(VToolbarSideIcon, context)
-
- expect(wrapper.hasStyle('display', 'none')).toBe(true)
- })
-})
diff --git a/packages/vuetify/test/unit/components/VToolbar/__snapshots__/VToolbar.spec.js.snap b/packages/vuetify/test/unit/components/VToolbar/__snapshots__/VToolbar.spec.js.snap
deleted file mode 100644
index 92d8ca4e55c..00000000000
--- a/packages/vuetify/test/unit/components/VToolbar/__snapshots__/VToolbar.spec.js.snap
+++ /dev/null
@@ -1,35 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`VToolbar.vue should render an extended toolbar 1`] = `
-
-<nav class="v-toolbar v-toolbar--extended theme--light"
- style="margin-top: 0px; padding-right: 0px; padding-left: 0px;"
->
- <div class="v-toolbar__content"
- style="height: 64px;"
- >
- </div>
- <div class="v-toolbar__extension"
- style="height: 64px;"
- >
- </div>
-</nav>
-
-`;
-
-exports[`VToolbar.vue should render an extended toolbar with specific height 1`] = `
-
-<nav class="v-toolbar v-toolbar--extended theme--light"
- style="margin-top: 0px; padding-right: 0px; padding-left: 0px;"
->
- <div class="v-toolbar__content"
- style="height: 64px;"
- >
- </div>
- <div class="v-toolbar__extension"
- style="height: 42px;"
- >
- </div>
-</nav>
-
-`;
diff --git a/packages/vuetify/test/unit/components/VToolbar/__snapshots__/VToolbarSideIcon.spec.js.snap b/packages/vuetify/test/unit/components/VToolbar/__snapshots__/VToolbarSideIcon.spec.js.snap
deleted file mode 100644
index 1bfdc40c278..00000000000
--- a/packages/vuetify/test/unit/components/VToolbar/__snapshots__/VToolbarSideIcon.spec.js.snap
+++ /dev/null
@@ -1,32 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`VToolbarSideIcon.js should create default icon when no slot used 1`] = `
-
-<button type="button"
- class="v-toolbar__side-icon v-btn v-btn--fab v-btn--flat v-btn--round v-btn--text theme--light v-size--default"
->
- <span class="v-btn__content">
- <i aria-hidden="true"
- class="v-icon material-icons theme--light"
- >
- menu
- </i>
- </span>
-</button>
-
-`;
-
-exports[`VToolbarSideIcon.js should create slot icon when present 1`] = `
-
-<button type="button"
- class="v-toolbar__side-icon v-btn v-btn--fab v-btn--flat v-btn--round v-btn--text theme--light v-size--default"
->
- <span class="v-btn__content">
- <i aria-hidden="true"
- class="v-icon fa fa-add theme--light"
- >
- </i>
- </span>
-</button>
-
-`;
|
477164c0597b27184cbfe2e8bd7e05bdc076d631
|
2019-02-25 00:08:04
|
John Leider
|
chore(VJumbotron): remove deprecated component
| false
|
remove deprecated component
|
chore
|
diff --git a/packages/docs/src/data/drawerItems.json b/packages/docs/src/data/drawerItems.json
index 1e241d8e01b..b2db36b9362 100644
--- a/packages/docs/src/data/drawerItems.json
+++ b/packages/docs/src/data/drawerItems.json
@@ -119,7 +119,6 @@
{ "text": "textFields", "to": "text-fields" }
]
},
- { "text": "jumbotrons", "to": "jumbotrons", "deprecated": true },
{ "text": "lists", "to": "lists" },
{ "text": "menus", "to": "menus" },
{ "text": "navigationDrawers", "to": "navigation-drawers" },
diff --git a/packages/docs/src/data/pages/components/Jumbotrons.json b/packages/docs/src/data/pages/components/Jumbotrons.json
deleted file mode 100644
index 0ec79cbada9..00000000000
--- a/packages/docs/src/data/pages/components/Jumbotrons.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "title": "header",
- "titleText": "headerText",
- "children": [
- {
- "type": "section",
- "children": [
- {
- "type": "usage",
- "value": "usage"
- }
- ]
- },
- {
- "type": "section",
- "children": [
- {
- "type": "api",
- "value": ["v-jumbotron"]
- }
- ]
- },
- {
- "type": "section",
- "children": [
- {
- "type": "examples",
- "value": [
- "color",
- "gradient",
- "gradientWithImage"
- ]
- }
- ]
- },
- {
- "type": "section",
- "children": [
- {
- "type": "up-next",
- "value": [
- "framework/aspect-ratios",
- "components/images",
- "framework/typography"
- ]
- }
- ]
- }
- ]
-}
diff --git a/packages/docs/src/examples/jumbotrons/color.vue b/packages/docs/src/examples/jumbotrons/color.vue
deleted file mode 100644
index 20032989cfc..00000000000
--- a/packages/docs/src/examples/jumbotrons/color.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
- <v-jumbotron color="primary" dark>
- <v-container fill-height>
- <v-layout align-center>
- <v-flex text-xs-center>
- <h3 class="display-3">Custom Color</h3>
- </v-flex>
- </v-layout>
- </v-container>
- </v-jumbotron>
-</template>
diff --git a/packages/docs/src/examples/jumbotrons/gradient.vue b/packages/docs/src/examples/jumbotrons/gradient.vue
deleted file mode 100644
index 124e48f6926..00000000000
--- a/packages/docs/src/examples/jumbotrons/gradient.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
- <div>
- <v-text-field
- v-model="gradient"
- label="Gradient"
- ></v-text-field>
-
- <v-jumbotron :gradient="gradient" dark>
- <v-container fill-height>
- <v-layout align-center>
- <v-flex text-xs-center>
- <h3 class="display-3">Gradient</h3>
- </v-flex>
- </v-layout>
- </v-container>
- </v-jumbotron>
- </div>
-</template>
-
-<script>
- export default {
- data: () => ({
- gradient: 'to top, #7B1FA2, #E1BEE7'
- })
- }
-</script>
diff --git a/packages/docs/src/examples/jumbotrons/gradientWithImage.vue b/packages/docs/src/examples/jumbotrons/gradientWithImage.vue
deleted file mode 100644
index 47fb13814f4..00000000000
--- a/packages/docs/src/examples/jumbotrons/gradientWithImage.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
- <v-jumbotron
- :gradient="gradient"
- dark
- src="https://cdn.vuetifyjs.com/images/parallax/material2.jpg"
- >
- <v-container fill-height>
- <v-layout align-center>
- <v-flex text-xs-center>
- <h3 class="display-3">Gradient over Image</h3>
- </v-flex>
- </v-layout>
- </v-container>
- </v-jumbotron>
-</template>
-
-<script>
- export default {
- data: () => ({
- gradient: 'to top right, rgba(63,81,181, .7), rgba(25,32,72, .7)'
- })
- }
-</script>
diff --git a/packages/docs/src/examples/jumbotrons/usage.vue b/packages/docs/src/examples/jumbotrons/usage.vue
deleted file mode 100644
index e683f2be964..00000000000
--- a/packages/docs/src/examples/jumbotrons/usage.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
- <v-jumbotron>
- <v-container fill-height>
- <v-layout align-center>
- <v-flex>
- <h3 class="display-3">Welcome to the site</h3>
-
- <span class="subheading">Lorem ipsum dolor sit amet, pri veniam forensibus id. Vis maluisset molestiae id, ad semper lobortis cum. At impetus detraxit incorrupte usu, repudiare assueverit ex eum, ne nam essent vocent admodum.</span>
-
- <v-divider class="my-3"></v-divider>
-
- <div class="title mb-3">Check out our newest features!</div>
-
- <v-btn
- class="mx-0"
- color="primary"
- large
- >
- See more
- </v-btn>
- </v-flex>
- </v-layout>
- </v-container>
- </v-jumbotron>
-</template>
diff --git a/packages/docs/src/lang/en/components/Jumbotrons.json b/packages/docs/src/lang/en/components/Jumbotrons.json
deleted file mode 100644
index 8274f685722..00000000000
--- a/packages/docs/src/lang/en/components/Jumbotrons.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "header": "Jumbotron",
- "headerText": "The jumbotron is a flexible call to action component. Supports background images, gradient overlays and much more.\n\nJumbotrons have been deprecated since v1.2, it is recommended that you use [v-img](/components/images), [v-responsive](/layout/aspect-ratios), or a plain div instead.",
- "examples": {
- "usage": {
- "header": "Usage",
- "desc": ""
- },
- "color": {
- "header": "Custom color",
- "desc": "Apply a custom background-color"
- },
- "gradient": {
- "header": "Gradient",
- "desc": "More information on writing gradients can be found [here](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)"
- },
- "gradientWithImage": {
- "header": "Gradient with image",
- "desc": "More information on writing gradients can be found [here](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)"
- }
- },
- "props": {
- "gradient": "Apply a gradient background. If used with the **src** prop, will overlay it",
- "src": "The img src"
- }
-}
diff --git a/packages/docs/src/lang/en/meta.json b/packages/docs/src/lang/en/meta.json
index 52d587c4207..77bea22b129 100644
--- a/packages/docs/src/lang/en/meta.json
+++ b/packages/docs/src/lang/en/meta.json
@@ -329,11 +329,6 @@
"description": "List component for Vuetify Framework",
"keywords": "list, lists"
},
- "components/jumbotrons": {
- "title": "Jumbotron Component",
- "description": "Jumbotron component for Vuetify Framework",
- "keywords": "jumbotrons"
- },
"components/menus": {
"title": "Menu Component",
"description": "Menu component for Vuetify Framework",
diff --git a/packages/docs/src/lang/en/vuetify/AppDrawer.json b/packages/docs/src/lang/en/vuetify/AppDrawer.json
index 857e755c998..f3ef88113d7 100644
--- a/packages/docs/src/lang/en/vuetify/AppDrawer.json
+++ b/packages/docs/src/lang/en/vuetify/AppDrawer.json
@@ -55,7 +55,6 @@
"inputs": "Inputs",
"inputsAndControls": "Inputs & controls",
"itemGroups": "Item groups",
- "jumbotrons": "Jumbotrons",
"layout": "Application layout",
"lists": "Lists",
"meetTheTeam": "Meet the team",
diff --git a/packages/docs/src/lang/eo-UY/components/Jumbotrons.json b/packages/docs/src/lang/eo-UY/components/Jumbotrons.json
deleted file mode 100644
index bece0fb0822..00000000000
--- a/packages/docs/src/lang/eo-UY/components/Jumbotrons.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "header": "crwdns12544:0crwdne12544:0",
- "headerText": "crwdns12546:0[v-img]crwdnd12546:0[v-responsive]crwdne12546:0",
- "examples": {
- "usage": {
- "header": "crwdns12548:0crwdne12548:0",
- "desc": "crwdns12550:0crwdne12550:0"
- },
- "color": {
- "header": "crwdns12552:0crwdne12552:0",
- "desc": "crwdns12554:0crwdne12554:0"
- },
- "gradient": {
- "header": "crwdns12556:0crwdne12556:0",
- "desc": "crwdns12558:0[here]crwdne12558:0"
- },
- "gradientWithImage": {
- "header": "crwdns12560:0crwdne12560:0",
- "desc": "crwdns12562:0[here]crwdne12562:0"
- }
- },
- "props": {
- "gradient": "crwdns12564:0crwdne12564:0",
- "src": "crwdns12566:0crwdne12566:0"
- }
-}
diff --git a/packages/docs/src/lang/eo-UY/meta.json b/packages/docs/src/lang/eo-UY/meta.json
index 87a590eebdb..9bd31041570 100644
--- a/packages/docs/src/lang/eo-UY/meta.json
+++ b/packages/docs/src/lang/eo-UY/meta.json
@@ -319,11 +319,6 @@
"description": "crwdns10818:0crwdne10818:0",
"keywords": "crwdns10820:0crwdne10820:0"
},
- "components/jumbotrons": {
- "title": "crwdns10822:0crwdne10822:0",
- "description": "crwdns10824:0crwdne10824:0",
- "keywords": "crwdns10826:0crwdne10826:0"
- },
"components/menus": {
"title": "crwdns10828:0crwdne10828:0",
"description": "crwdns10830:0crwdne10830:0",
diff --git a/packages/docs/src/lang/eo-UY/vuetify/AppDrawer.json b/packages/docs/src/lang/eo-UY/vuetify/AppDrawer.json
index b5940861523..6e52d704bb4 100644
--- a/packages/docs/src/lang/eo-UY/vuetify/AppDrawer.json
+++ b/packages/docs/src/lang/eo-UY/vuetify/AppDrawer.json
@@ -51,7 +51,6 @@
"inputs": "crwdns15916:0crwdne15916:0",
"inputsAndControls": "crwdns15918:0crwdne15918:0",
"itemGroups": "crwdns15920:0crwdne15920:0",
- "jumbotrons": "crwdns15922:0crwdne15922:0",
"layout": "crwdns15924:0crwdne15924:0",
"lists": "crwdns15926:0crwdne15926:0",
"meetTheTeam": "crwdns15928:0crwdne15928:0",
diff --git a/packages/docs/src/lang/es-MX/components/Jumbotrons.json b/packages/docs/src/lang/es-MX/components/Jumbotrons.json
deleted file mode 100644
index 48f53fc556b..00000000000
--- a/packages/docs/src/lang/es-MX/components/Jumbotrons.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "header": "Jumbotron",
- "headerText": "El _jumbotron_ es un componente flexible para llamar a la acción. Tiene soporte para imágenes de fondo, _overlays_ con degradado y mucho más.",
- "components": [
- "v-jumbotron"
- ],
- "examples": [
- {
- "usage": {
- "header": "Uso",
- "desc": ""
- },
- "color": {
- "header": "Color personalizado",
- "desc": "Aplica un background-color personalizado."
- },
- "gradient": {
- "header": "Degradado",
- "desc": "Puedes encontrar más información acerca de los degradados [aquí](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)"
- },
- "gradientWithImage": {
- "header": "Degradado con imagen",
- "desc": "Puedes encontrar más información acerca de escribir degradados [aquí](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)"
- }
- }
- ],
- "props": {
- "gradient": "Aplica un fondo de degradado. Si se utiliza con la prop *src*, lo colocará por encima",
- "src": "El src de la imagen"
- }
-}
\ No newline at end of file
diff --git a/packages/docs/src/lang/es-MX/components/Parallax.json b/packages/docs/src/lang/es-MX/components/Parallax.json
index 296d51708ac..8dc6c85c8ca 100644
--- a/packages/docs/src/lang/es-MX/components/Parallax.json
+++ b/packages/docs/src/lang/es-MX/components/Parallax.json
@@ -17,10 +17,6 @@
"customHeight": {
"header": "Altura personalizada",
"desc": "Puedes especificar una altura personalizada en un parallax. Toma en cuenta que podrías romper el efecto si la imagen no tiene el tamaño adecuado."
- },
- "jumbotron": {
- "header": "Jumbotron",
- "desc": "El parallax puede tener el efecto deshabilitado para ser usado como un **jumbotron** estándar."
}
}
],
@@ -28,4 +24,4 @@
"alt": "Agrega una propiedad _alt_ a la imagen en el parallax",
"src": "La imagen parallax"
}
-}
\ No newline at end of file
+}
diff --git a/packages/docs/src/lang/es-MX/meta.json b/packages/docs/src/lang/es-MX/meta.json
index a6004e52db2..be6c1582ada 100644
--- a/packages/docs/src/lang/es-MX/meta.json
+++ b/packages/docs/src/lang/es-MX/meta.json
@@ -234,11 +234,6 @@
"description": "List component for Vuetify Framework",
"keywords": "list, lists"
},
- "components/jumbotrons": {
- "title": "Jumbotron Component",
- "description": "Jumbotron component for Vuetify Framework",
- "keywords": "jumbotrons"
- },
"components/menus": {
"title": "Menu Component",
"description": "Menu component for Vuetify Framework",
diff --git a/packages/docs/src/lang/ja-JP/meta.json b/packages/docs/src/lang/ja-JP/meta.json
index 628b684ef31..c6eb58e5881 100644
--- a/packages/docs/src/lang/ja-JP/meta.json
+++ b/packages/docs/src/lang/ja-JP/meta.json
@@ -219,11 +219,6 @@
"description": "List component for Vuetify Framework",
"keywords": "list, lists"
},
- "components/jumbotrons": {
- "title": "Jumbotron Component",
- "description": "Jumbotron component for Vuetify Framework",
- "keywords": "jumbotrons"
- },
"components/menus": {
"title": "Menu Component",
"description": "Menu component for Vuetify Framework",
diff --git a/packages/docs/src/lang/ko-KR/components/Jumbotrons.json b/packages/docs/src/lang/ko-KR/components/Jumbotrons.json
deleted file mode 100644
index a26993a2340..00000000000
--- a/packages/docs/src/lang/ko-KR/components/Jumbotrons.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "header": "점보트론 (Jumbotron)",
- "headerText": "점포트론은 유연한 액션컴포넌트 입니다. 배경 이미지와 그래디언트 오버레이, 그리고 여러가지를 지원합니다.",
- "components": [
- "v-jumbotron"
- ],
- "examples": {
- "usage": {
- "header": "사용법 (Usage)",
- "desc": ""
- },
- "color": {
- "header": "커스텀 색상 (Custom color)",
- "desc": "커스텀 배경색을 적용해보세요."
- },
- "gradient": {
- "header": "그래디언트 (Gradient)",
- "desc": "그래디언트를 작성하기 위한 더 자세한 정보는 [여기](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)에서 찾을 수 있습니다."
- },
- "gradientWithImage": {
- "header": "그래디언트와 이미지 (Gradient with image)",
- "desc": "그래디언트를 작성하기 위한 더 자세한 정보는 [여기](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)에서 찾을 수 있습니다."
- }
- },
- "props": {
- "gradient": "그래디언트 배경을 적용 **src** prop과 함께 쓰이면 **src** 를 대체합니다.",
- "src": "이미지 소스 (img src)"
- }
-}
diff --git a/packages/docs/src/lang/ko-KR/meta.json b/packages/docs/src/lang/ko-KR/meta.json
index c3f49bb9826..13acecdd55d 100644
--- a/packages/docs/src/lang/ko-KR/meta.json
+++ b/packages/docs/src/lang/ko-KR/meta.json
@@ -229,11 +229,6 @@
"description": "List component for Vuetify Framework",
"keywords": "list, lists"
},
- "components/jumbotrons": {
- "title": "Jumbotron Component",
- "description": "Jumbotron component for Vuetify Framework",
- "keywords": "jumbotrons"
- },
"components/menus": {
"title": "Menu Component",
"description": "Menu component for Vuetify Framework",
diff --git a/packages/docs/src/lang/ru-RU/components/Jumbotrons.json b/packages/docs/src/lang/ru-RU/components/Jumbotrons.json
deleted file mode 100644
index 16a48a27ed7..00000000000
--- a/packages/docs/src/lang/ru-RU/components/Jumbotrons.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "header": "# Jumbotron",
- "headerText": "Jumbotron представляет собой гибкий вызов компонента действия. Поддержка фоновых изображений, наложения градиента и многое другое.",
- "components": [
- "v-jumbotron"
- ],
- "examples": {
- "usage": {
- "header": "### Использование",
- "desc": ""
- },
- "color": {
- "header": "### Пользовательский цвет",
- "desc": "Применение специального фонового цвета"
- },
- "gradient": {
- "header": "### Градиент",
- "desc": "Более подробную информацию о градиентах можно найти [здесь](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)"
- },
- "gradientWithImage": {
- "header": "### Градиент с изображением",
- "desc": "Более подробную информацию о градиентах можно найти [здесь](https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient)"
- }
- },
- "props": {
- "gradient": "Применение градиентного фона. Если используется с **src** prop, наложите его",
- "src": "Img src"
- }
-}
diff --git a/packages/docs/src/lang/ru-RU/components/Parallax.json b/packages/docs/src/lang/ru-RU/components/Parallax.json
index b5ee5438e60..e4132e44049 100644
--- a/packages/docs/src/lang/ru-RU/components/Parallax.json
+++ b/packages/docs/src/lang/ru-RU/components/Parallax.json
@@ -14,10 +14,6 @@
"customHeight": {
"header": "### Пользовательская высота",
"desc": "Вы можете указать произвольную высоту параллакса. Имейте в виду, что это может сломать параллакс, если ваше изображение не имеет подходящего размера"
- },
- "jumbotron": {
- "header": "### Jumbotron",
- "desc": "Параллакс может быть отключён для использования в качестве стандартного **jumbotron**"
}
},
"props": {
diff --git a/packages/docs/src/lang/ru-RU/meta.json b/packages/docs/src/lang/ru-RU/meta.json
index 628b684ef31..c6eb58e5881 100644
--- a/packages/docs/src/lang/ru-RU/meta.json
+++ b/packages/docs/src/lang/ru-RU/meta.json
@@ -219,11 +219,6 @@
"description": "List component for Vuetify Framework",
"keywords": "list, lists"
},
- "components/jumbotrons": {
- "title": "Jumbotron Component",
- "description": "Jumbotron component for Vuetify Framework",
- "keywords": "jumbotrons"
- },
"components/menus": {
"title": "Menu Component",
"description": "Menu component for Vuetify Framework",
diff --git a/packages/docs/src/public/sitemap.xml b/packages/docs/src/public/sitemap.xml
index 43ef883c239..9adaf4e90b3 100644
--- a/packages/docs/src/public/sitemap.xml
+++ b/packages/docs/src/public/sitemap.xml
@@ -421,12 +421,6 @@
<changefreq>daily</changefreq>
<priority>0.8000</priority>
</url>
- <url>
- <loc>https://vuetifyjs.com/en/components/jumbotrons</loc>
- <lastmod>2019-01-07</lastmod>
- <changefreq>daily</changefreq>
- <priority>0.8000</priority>
- </url>
<url>
<loc>https://vuetifyjs.com/en/components/lists</loc>
<lastmod>2019-01-07</lastmod>
diff --git a/packages/vuetify/src/components/VJumbotron/VJumbotron.js b/packages/vuetify/src/components/VJumbotron/VJumbotron.js
deleted file mode 100644
index 5429e71a663..00000000000
--- a/packages/vuetify/src/components/VJumbotron/VJumbotron.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import '../../stylus/components/_jumbotrons.styl'
-
-// Mixins
-import Colorable from '../../mixins/colorable'
-import Routable from '../../mixins/routable'
-import Themeable from '../../mixins/themeable'
-
-// Utils
-import { deprecate } from '../../util/console'
-
-/* @vue/component */
-export default {
- name: 'v-jumbotron',
-
- mixins: [
- Colorable,
- Routable,
- Themeable
- ],
-
- props: {
- gradient: String,
- height: {
- type: [Number, String],
- default: '400px'
- },
- src: String,
- tag: {
- type: String,
- default: 'div'
- }
- },
-
- computed: {
- backgroundStyles () {
- const styles = {}
-
- if (this.gradient) {
- styles.background = `linear-gradient(${this.gradient})`
- }
-
- return styles
- },
- classes () {
- return this.themeClasses
- },
- styles () {
- return {
- height: this.height
- }
- }
- },
-
- mounted () {
- deprecate('v-jumbotron', this.src ? 'v-img' : 'v-responsive', this)
- },
-
- methods: {
- genBackground () {
- return this.$createElement('div', this.setBackgroundColor(this.color, {
- staticClass: 'v-jumbotron__background',
- style: this.backgroundStyles
- }))
- },
- genContent () {
- return this.$createElement('div', {
- staticClass: 'v-jumbotron__content'
- }, this.$slots.default)
- },
- genImage () {
- if (!this.src) return null
- if (this.$slots.img) return this.$slots.img({ src: this.src })
-
- return this.$createElement('img', {
- staticClass: 'v-jumbotron__image',
- attrs: { src: this.src }
- })
- },
- genWrapper () {
- return this.$createElement('div', {
- staticClass: 'v-jumbotron__wrapper'
- }, [
- this.genImage(),
- this.genBackground(),
- this.genContent()
- ])
- }
- },
-
- render (h) {
- const { tag, data } = this.generateRouteLink(this.classes)
- data.staticClass = 'v-jumbotron'
- data.style = this.styles
-
- return h(tag, data, [this.genWrapper()])
- }
-}
diff --git a/packages/vuetify/src/components/VJumbotron/index.js b/packages/vuetify/src/components/VJumbotron/index.js
deleted file mode 100644
index cba3fb99e32..00000000000
--- a/packages/vuetify/src/components/VJumbotron/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import VJumbotron from './VJumbotron'
-
-export { VJumbotron }
-export default VJumbotron
diff --git a/packages/vuetify/src/components/index.ts b/packages/vuetify/src/components/index.ts
index 8c4360a0f11..8cae1b073e4 100644
--- a/packages/vuetify/src/components/index.ts
+++ b/packages/vuetify/src/components/index.ts
@@ -32,7 +32,6 @@ export * from './VIcon'
export * from './VImg'
export * from './VInput'
export * from './VItemGroup'
-export * from './VJumbotron'
export * from './VLabel'
export * from './VList'
export * from './VMenu'
diff --git a/packages/vuetify/src/stylus/components/_jumbotrons.styl b/packages/vuetify/src/stylus/components/_jumbotrons.styl
deleted file mode 100644
index a6db74de7d2..00000000000
--- a/packages/vuetify/src/stylus/components/_jumbotrons.styl
+++ /dev/null
@@ -1,44 +0,0 @@
-@import '../bootstrap'
-@import '../theme'
-
-v-jumbotron($material)
- .v-jumbotron__content
- color: $material.text.primary
-
-theme(v-jumbotron, 'v-jumbotron')
-
-.v-jumbotron
- display: block
- top: 0
- transition: .3s $transition.swing
- width: 100%
-
- &__wrapper
- height: 100%
- overflow: hidden
- position: relative
- transition: inherit
- width: 100%
-
- &__background
- position: absolute
- top: 0
- left: 0
- right: 0
- bottom: 0
- contain: strict
- transition: inherit
-
- &__image
- position: absolute
- top: 50%
- left: 50%
- transform: translate(-50%, -50%)
- min-width: 100%
- will-change: transform
- transition: inherit
-
- &__content
- height: 100%
- position: relative
- transition: inherit
diff --git a/packages/vuetify/types/lib.d.ts b/packages/vuetify/types/lib.d.ts
index c4f9ec7b295..19fef77d47a 100644
--- a/packages/vuetify/types/lib.d.ts
+++ b/packages/vuetify/types/lib.d.ts
@@ -67,7 +67,6 @@ declare module 'vuetify/lib' {
const VInput: Component
const VItem: Component
const VItemGroup: Component
- const VJumbotron: Component
const VLabel: Component
const VLayout: Component
const VList: Component
@@ -201,7 +200,6 @@ declare module 'vuetify/lib' {
VInput,
VItem,
VItemGroup,
- VJumbotron,
VLabel,
VLayout,
VList,
|
666484ae265194dc1512cb4f84f53ab928f5482b
|
2024-06-12 23:41:13
|
John Leider
|
fix(VExpansionPanel): propagate defaults provided by VExpansionPanels
| false
|
propagate defaults provided by VExpansionPanels
|
fix
|
diff --git a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
index 881a6f6c0c4..45c22192410 100644
--- a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
+++ b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
@@ -2,6 +2,7 @@
import { VExpansionPanelSymbol } from './shared'
import { makeVExpansionPanelTextProps, VExpansionPanelText } from './VExpansionPanelText'
import { makeVExpansionPanelTitleProps, VExpansionPanelTitle } from './VExpansionPanelTitle'
+import { VDefaultsProvider } from '@/components/VDefaultsProvider'
// Composables
import { useBackgroundColor } from '@/composables/color'
@@ -11,7 +12,7 @@ import { makeRoundedProps, useRounded } from '@/composables/rounded'
import { makeTagProps } from '@/composables/tag'
// Utilities
-import { computed, provide } from 'vue'
+import { computed, provide, toRef } from 'vue'
import { genericComponent, propsFactory, useRender } from '@/util'
export const makeVExpansionPanelProps = propsFactory({
@@ -101,25 +102,30 @@ export const VExpansionPanel = genericComponent<VExpansionPanelSlots>()({
]}
/>
- { hasTitle && (
- <VExpansionPanelTitle
- key="title"
- { ...expansionPanelTitleProps }
- >
- { slots.title ? slots.title() : props.title }
- </VExpansionPanelTitle>
- )}
-
- { hasText && (
- <VExpansionPanelText
- key="text"
- { ...expansionPanelTextProps }
- >
- { slots.text ? slots.text() : props.text }
- </VExpansionPanelText>
- )}
-
- { slots.default?.() }
+ <VDefaultsProvider
+ defaults={{
+ VExpansionPanelTitle: {
+ ...expansionPanelTitleProps,
+ },
+ VExpansionPanelText: {
+ ...expansionPanelTextProps,
+ },
+ }}
+ >
+ { hasTitle && (
+ <VExpansionPanelTitle key="title">
+ { slots.title ? slots.title() : props.title }
+ </VExpansionPanelTitle>
+ )}
+
+ { hasText && (
+ <VExpansionPanelText key="text">
+ { slots.text ? slots.text() : props.text }
+ </VExpansionPanelText>
+ )}
+
+ { slots.default?.() }
+ </VDefaultsProvider>
</props.tag>
)
})
|
3e02eb24f75acc815a4b1e51fa751a8eb191d0d4
|
2019-12-31 10:32:52
|
Abner Soares Alves Junior
|
fix(VSelect): remove duplicate item ids (#9961)
| false
|
remove duplicate item ids (#9961)
|
fix
|
diff --git a/packages/vuetify/src/components/VSelect/VSelectList.ts b/packages/vuetify/src/components/VSelect/VSelectList.ts
index 492f82bc58b..90c8df659dd 100644
--- a/packages/vuetify/src/components/VSelect/VSelectList.ts
+++ b/packages/vuetify/src/components/VSelect/VSelectList.ts
@@ -31,6 +31,8 @@ import mixins from '../../util/mixins'
import { VNode } from 'vue'
import { PropValidator } from 'vue/types/options'
+type ListTile = { item: any, disabled?: null | boolean, value?: boolean, index: number };
+
/* @vue/component */
export default mixins(Colorable, Themeable).extend({
name: 'v-select-list',
@@ -127,9 +129,7 @@ export default mixins(Colorable, Themeable).extend({
return `<span class="v-list-item__mask">${escapeHTML(text)}</span>`
},
genLabelledBy (item: object) {
- const text = escapeHTML(this.getText(item).split(' ').join('-').toLowerCase())
-
- return `${text}-list-item-${this._uid}`
+ return `list-item-${this._uid}`
},
getMaskedCharacters (text: string): {
start: string
@@ -146,11 +146,12 @@ export default mixins(Colorable, Themeable).extend({
const end = text.slice(index + searchInput.length)
return { start, middle, end }
},
- genTile (
- item: object,
- disabled = null as null | boolean,
- value = false
- ): VNode | VNode[] | undefined {
+ genTile ({
+ item,
+ index,
+ disabled = null,
+ value = false,
+ }: ListTile): VNode | VNode[] | undefined {
if (!value) value = this.hasItem(item)
if (item === Object(item)) {
@@ -164,7 +165,7 @@ export default mixins(Colorable, Themeable).extend({
// Default behavior in list does not
// contain aria-selected by default
'aria-selected': String(value),
- 'aria-labelledby': this.genLabelledBy(item),
+ 'aria-labelledby': `${this.genLabelledBy(item)}-${index}`,
role: 'option',
},
on: {
@@ -187,7 +188,7 @@ export default mixins(Colorable, Themeable).extend({
this.action && !this.hideSelected && this.items.length > 0
? this.genAction(item, value)
: null,
- this.genTileContent(item),
+ this.genTileContent(item, index),
])
}
@@ -206,12 +207,12 @@ export default mixins(Colorable, Themeable).extend({
? this.$createElement(VListItem, tile, scopedSlot)
: scopedSlot
},
- genTileContent (item: any): VNode {
+ genTileContent (item: any, index = 0): VNode {
const innerHTML = this.genFilteredText(this.getText(item))
return this.$createElement(VListItemContent,
[this.$createElement(VListItemTitle, {
- attrs: { id: this.genLabelledBy(item) },
+ attrs: { id: `${this.genLabelledBy(item)}-${index}` },
domProps: { innerHTML },
})]
)
@@ -237,15 +238,18 @@ export default mixins(Colorable, Themeable).extend({
render (): VNode {
const children = []
- for (const item of this.items) {
+ const itemsLength = this.items.length
+ for (let index = 0; index < itemsLength; index++) {
+ const item = this.items[index]
+
if (this.hideSelected &&
this.hasItem(item)
) continue
- if (item == null) children.push(this.genTile(item))
+ if (item == null) children.push(this.genTile({ item, index }))
else if (item.header) children.push(this.genHeader(item))
else if (item.divider) children.push(this.genDivider(item))
- else children.push(this.genTile(item))
+ else children.push(this.genTile({ item, index }))
}
children.length || children.push(this.$slots['no-data'] || this.staticNoDataTile)
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 0534062a5f0..1a5f6751dca 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
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`VSelect.ts should escape items in menu 1`] = `
-<div id="&lt;strong&gt;foo&lt;/strong&gt;-list-item-95"
+<div id="list-item-95-0"
class="v-list-item__title"
>
<strong>foo</strong>
@@ -371,12 +371,12 @@ exports[`VSelect.ts should use slotted no-data 1`] = `
>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="foo-list-item-162"
+ aria-labelledby="list-item-162-0"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="foo-list-item-162"
+ <div id="list-item-162-0"
class="v-list-item__title"
>
foo
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 c75ab745b99..4f3a2ff0828 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
@@ -188,12 +188,12 @@ exports[`VSelect.ts should use slotted append-item 1`] = `
>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="foo-list-item-18"
+ aria-labelledby="list-item-18-0"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="foo-list-item-18"
+ <div id="list-item-18-0"
class="v-list-item__title"
>
foo
@@ -217,12 +217,12 @@ exports[`VSelect.ts should use slotted prepend-item 1`] = `
</div>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="foo-list-item-6"
+ aria-labelledby="list-item-6-0"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="foo-list-item-6"
+ <div id="list-item-6-0"
class="v-list-item__title"
>
foo
diff --git a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelectList.spec.ts.snap b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelectList.spec.ts.snap
index b5b581826fe..7aa801117e6 100644
--- a/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelectList.spec.ts.snap
+++ b/packages/vuetify/src/components/VSelect/__tests__/__snapshots__/VSelectList.spec.ts.snap
@@ -8,12 +8,12 @@ exports[`VSelectList.ts should display falsy items 1`] = `
>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="0-list-item-29"
+ aria-labelledby="list-item-29-0"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="0-list-item-29"
+ <div id="list-item-29-0"
class="v-list-item__title"
>
0
@@ -22,12 +22,12 @@ exports[`VSelectList.ts should display falsy items 1`] = `
</div>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="null-list-item-29"
+ aria-labelledby="list-item-29-1"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="null-list-item-29"
+ <div id="list-item-29-1"
class="v-list-item__title"
>
null
@@ -36,12 +36,12 @@ exports[`VSelectList.ts should display falsy items 1`] = `
</div>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="false-list-item-29"
+ aria-labelledby="list-item-29-2"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="false-list-item-29"
+ <div id="list-item-29-2"
class="v-list-item__title"
>
false
@@ -50,12 +50,12 @@ exports[`VSelectList.ts should display falsy items 1`] = `
</div>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="undefined-list-item-29"
+ aria-labelledby="list-item-29-3"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="undefined-list-item-29"
+ <div id="list-item-29-3"
class="v-list-item__title"
>
undefined
@@ -64,12 +64,12 @@ exports[`VSelectList.ts should display falsy items 1`] = `
</div>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="-list-item-29"
+ aria-labelledby="list-item-29-4"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="-list-item-29"
+ <div id="list-item-29-4"
class="v-list-item__title"
>
</div>
@@ -89,7 +89,7 @@ exports[`VSelectList.ts should display no-data-text when item slot is provided 1
class="v-list-item theme--light"
>
<div class="v-list-item__content">
- <div id="undefined-list-item-10"
+ <div id="list-item-10-0"
class="v-list-item__title"
>
undefined
@@ -115,12 +115,12 @@ exports[`VSelectList.ts should generate children 1`] = `
>
<div tabindex="0"
aria-selected="false"
- aria-labelledby="foo-list-item-14"
+ aria-labelledby="list-item-14-2"
role="option"
class="v-list-item v-list-item--link theme--light"
>
<div class="v-list-item__content">
- <div id="foo-list-item-14"
+ <div id="list-item-14-2"
class="v-list-item__title"
>
foo
|
57f55144df74220cea3361836bed61380ce61f3d
|
2024-09-18 04:34:53
|
John Leider
|
docs(blog): add author / date to preview
| false
|
add author / date to preview
|
docs
|
diff --git a/packages/docs/src/pages/en/blog/index.md b/packages/docs/src/pages/en/blog/index.md
index c2874da6032..bfcf00b31ee 100644
--- a/packages/docs/src/pages/en/blog/index.md
+++ b/packages/docs/src/pages/en/blog/index.md
@@ -20,6 +20,10 @@ Latest news, updates, and stories about Vuetify.
## State of the Union 2024
+🖊️ John Leider • 📅 September 8th, 2024
+
It's been a long road to get where we are today, and looking back, I can’t help but feel proud of how far Vuetify has come. From humble beginnings to now surpassing Vuetify 2’s usage, the journey has been anything but easy, but we’ve always had our community to lean on. Today, I want to take some time to reflect on our past, acknowledge our wins and challenges, and share where we're headed... { .text-medium-emphasis }
[Read More](/blog/state-of-the-union-2024/) { .text-end }
+
+---
|
e121bc249f1ecd1f23bc778f899882c344ef348c
|
2020-08-25 20:45:17
|
Dashty Frya
|
feat(locale): add Central Kurdish locale (#12100)
| false
|
add Central Kurdish locale (#12100)
|
feat
|
diff --git a/packages/vuetify/src/locale/ckb.ts b/packages/vuetify/src/locale/ckb.ts
new file mode 100644
index 00000000000..b850a6720e9
--- /dev/null
+++ b/packages/vuetify/src/locale/ckb.ts
@@ -0,0 +1,64 @@
+export default {
+ badge: 'باج',
+ close: 'داخستن',
+ dataIterator: {
+ noResultsText: 'هیچ تۆمارێکی هاوتا نەدۆزرایەوە',
+ loadingText: 'بارکردنی ئایتمەکان...',
+ },
+ dataTable: {
+ itemsPerPageText: 'ڕیزەکان بۆ هەر پەڕەیەک:',
+ ariaLabel: {
+ sortDescending: '.سەر بەرەو خوار ڕیزکراوە',
+ sortAscending: '.سەر بەرەو ژوور ڕیزکراوە',
+ sortNone: 'ڕیزنەکراوە.',
+ activateNone: 'چالاککردن بۆ لابردنی ڕیزکردن.',
+ activateDescending: 'چالاککردن بۆ ڕیزکردنی سەربەرەوخوار.',
+ activateAscending: 'چالاککردن بۆ ڕیزکردنی سەر بەرەو ژوور.',
+ },
+ sortBy: 'ڕیزکردن بەپێی',
+ },
+ dataFooter: {
+ itemsPerPageText: 'ئایتمەکان بۆ هەر پەڕەیەک:',
+ itemsPerPageAll: 'هەمووی',
+ nextPage: 'پەڕەی دواتر',
+ prevPage: 'پەڕەی پێشوو',
+ firstPage: 'پەڕەی یەکەم',
+ lastPage: 'پەڕەی کۆتایی',
+ pageText: '{0}-{1} لە {2}',
+ },
+ datePicker: {
+ itemsSelected: '{0} دەسنیشانکراوە',
+ nextMonthAriaLabel: 'مانگی داهاتوو',
+ nextYearAriaLabel: 'ساڵی داهاتوو',
+ prevMonthAriaLabel: 'مانگی پێشوو',
+ prevYearAriaLabel: 'ساڵی پێشوو',
+ },
+ noDataText: 'هیچ داتایەک بەردەست نیە',
+ carousel: {
+ prev: 'بینراوی پێشوو',
+ next: 'بینراوی داهاتوو',
+ ariaLabel: {
+ delimiter: 'سلایدی کارۆسێل {0} لە {1}',
+ },
+ },
+ calendar: {
+ moreEvents: '{0} زیاتر',
+ },
+ fileInput: {
+ counter: '{0} فایل',
+ counterSize: '{0} فایل ({1} لە کۆی گشتی)',
+ },
+ timePicker: {
+ am: 'پێش نیوەڕۆژ',
+ pm: 'دوای نیوەڕۆژ',
+ },
+ pagination: {
+ ariaLabel: {
+ wrapper: 'ڕێنیشاندەری پەڕەگۆڕکێ',
+ next: 'پەڕەی دواتر',
+ previous: 'پەڕەی پێشوو',
+ page: 'بڕۆ بۆ پەڕەی {0}',
+ currentPage: 'پەڕەی ئێستا، پەڕە{0}',
+ },
+ },
+}
diff --git a/packages/vuetify/src/locale/index.ts b/packages/vuetify/src/locale/index.ts
index 577d8bdbccb..4681b31513e 100755
--- a/packages/vuetify/src/locale/index.ts
+++ b/packages/vuetify/src/locale/index.ts
@@ -1,6 +1,7 @@
export { default as af } from './af'
export { default as ar } from './ar'
export { default as ca } from './ca'
+export { default as ckb } from './ckb'
export { default as cs } from './cs'
export { default as de } from './de'
export { default as el } from './el'
|
d4732ec0b8b5d80578c4c6d8ce0cc4bf3447a307
|
2018-06-27 03:43:11
|
John Leider
|
fix(v-autocomplete): show menu when items update
| false
|
show menu when items update
|
fix
|
diff --git a/src/components/VAutocomplete/VAutocomplete.js b/src/components/VAutocomplete/VAutocomplete.js
index 5f0153c7ae8..5df6848d0d6 100644
--- a/src/components/VAutocomplete/VAutocomplete.js
+++ b/src/components/VAutocomplete/VAutocomplete.js
@@ -176,6 +176,17 @@ export default {
this.lazySearch = null
},
+ items (val) {
+ // If we are focused, the menu
+ // is not active and items change
+ // User is probably async loading
+ // items, try to activate the menu
+ if (
+ this.isFocused &&
+ !this.isMenuActive &&
+ val.length
+ ) this.activateMenu()
+ },
searchInput (val) {
this.lazySearch = val
},
diff --git a/test/unit/components/VAutocomplete/VAutocomplete.spec.js b/test/unit/components/VAutocomplete/VAutocomplete.spec.js
index 1340f74df83..63f4c70cfc1 100644
--- a/test/unit/components/VAutocomplete/VAutocomplete.spec.js
+++ b/test/unit/components/VAutocomplete/VAutocomplete.spec.js
@@ -226,7 +226,9 @@ test('VAutocomplete.js', ({ mount, shallow, compileToFunctions }) => {
const input = wrapper.first('input')
input.trigger('focus')
+
await wrapper.vm.$nextTick()
+
expect(wrapper.vm.isMenuActive).toBe(false)
wrapper.setProps({
@@ -236,13 +238,12 @@ test('VAutocomplete.js', ({ mount, shallow, compileToFunctions }) => {
]
})
- input.trigger('blur')
- await wrapper.vm.$nextTick()
-
- input.trigger('focus')
await wrapper.vm.$nextTick()
- expect(wrapper.vm.isMenuActive).toBe(false)
+ // Once items refresh active will
+ // be updated to openif already
+ // focused
+ expect(wrapper.vm.isMenuActive).toBe(true)
})
it('should change selected index', async () => {
@@ -717,4 +718,28 @@ test('VAutocomplete.js', ({ mount, shallow, compileToFunctions }) => {
await wrapper.vm.$nextTick()
expect(input.element.value).toBe('foo')
})
+
+ it('should show menu when items are added and hide-no-data', async () => {
+ const wrapper = mount(VAutocomplete, {
+ propsData: {
+ hideNoData: true,
+ items: []
+ }
+ })
+
+ const input = wrapper.first('input')
+
+ input.trigger('focus')
+
+ expect(wrapper.vm.isMenuActive).toBe(false)
+ expect(wrapper.vm.isFocused).toBe(true)
+
+ wrapper.setProps({
+ items: ['Foo', 'Bar']
+ })
+
+ await wrapper.vm.$nextTick()
+
+ expect(wrapper.vm.isMenuActive).toBe(true)
+ })
})
|
161b7f87949ec8dc5d20a70149399335bd7016d4
|
2020-01-13 23:42:50
|
John Leider
|
docs(VMenu): add information regarding accessibility
| false
|
add information regarding accessibility
|
docs
|
diff --git a/packages/docs/src/data/pages/components/Menus.json b/packages/docs/src/data/pages/components/Menus.json
index 940cbfb7acc..6d32fe7febd 100644
--- a/packages/docs/src/data/pages/components/Menus.json
+++ b/packages/docs/src/data/pages/components/Menus.json
@@ -56,6 +56,15 @@
}
]
},
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "accessibility",
+ "value": "accessibility"
+ }
+ ]
+ },
{
"type": "section",
"children": [
diff --git a/packages/docs/src/lang/en/components/Menus.json b/packages/docs/src/lang/en/components/Menus.json
index e44735cb4dd..748b34e814a 100644
--- a/packages/docs/src/lang/en/components/Menus.json
+++ b/packages/docs/src/lang/en/components/Menus.json
@@ -67,6 +67,9 @@
"uninverted": true
}
},
+ "accessibility": {
+ "desc": "By default, `v-menu` components are _detached_ and moved to the root of your application. In order to properly support [inserting dynamic content into the DOM](https://www.w3.org/WAI/WCAG21/Techniques/client-side-script/SCR26), you _must_ use the **attach** prop. This will ensure that focus transfers from the activator to the content when pressing the <kbd>tab</kbd> key."
+ },
"props": {
"closeOnClick": "Designates if menu should close on outside-activator click",
"closeOnContentClick": "Designates if menu should close when its content is clicked",
|
7f38e4a7f173fcb2f34e84fa25d89abf90097ce6
|
2018-08-05 12:11:23
|
Kael
|
fix(theme): lighten-1 should be darker than lighten-5
| false
|
lighten-1 should be darker than lighten-5
|
fix
|
diff --git a/src/util/theme.ts b/src/util/theme.ts
index 6e093e5fd16..965c89571c2 100644
--- a/src/util/theme.ts
+++ b/src/util/theme.ts
@@ -113,8 +113,8 @@ export function genVariations (name: string, value: RGB): Record<string, string>
base: intToHex(value)
}
- for (let i = 1, n = 5; i <= 5; ++i, --n) {
- values[`lighten${i}`] = intToHex(lighten(value, n))
+ for (let i = 5; i > 0; --i) {
+ values[`lighten${i}`] = intToHex(lighten(value, i))
}
for (let i = 1; i <= 4; ++i) {
diff --git a/test/unit/components/VApp/__snapshots__/VApp.spec.js.snap b/test/unit/components/VApp/__snapshots__/VApp.spec.js.snap
index 5a46c18a013..bf3a3723fd4 100644
--- a/test/unit/components/VApp/__snapshots__/VApp.spec.js.snap
+++ b/test/unit/components/VApp/__snapshots__/VApp.spec.js.snap
@@ -41,26 +41,26 @@ exports[`VApp.js should watch theme 1`] = `
.primary--text textarea {
caret-color: #1976d2 !important;
}
-.primary.lighten-1 {
+.primary.lighten-5 {
background-color: #c7fdff !important;
border-color: #c7fdff !important;
}
-.primary--text.text--lighten-1 {
+.primary--text.text--lighten-5 {
color: #c7fdff !important;
}
-.primary--text.text--lighten-1 input,
-.primary--text.text--lighten-1 textarea {
+.primary--text.text--lighten-5 input,
+.primary--text.text--lighten-5 textarea {
caret-color: #c7fdff !important;
}
-.primary.lighten-2 {
+.primary.lighten-4 {
background-color: #a8e0ff !important;
border-color: #a8e0ff !important;
}
-.primary--text.text--lighten-2 {
+.primary--text.text--lighten-4 {
color: #a8e0ff !important;
}
-.primary--text.text--lighten-2 input,
-.primary--text.text--lighten-2 textarea {
+.primary--text.text--lighten-4 input,
+.primary--text.text--lighten-4 textarea {
caret-color: #a8e0ff !important;
}
.primary.lighten-3 {
@@ -74,26 +74,26 @@ exports[`VApp.js should watch theme 1`] = `
.primary--text.text--lighten-3 textarea {
caret-color: #8ac5ff !important;
}
-.primary.lighten-4 {
+.primary.lighten-2 {
background-color: #6aaaff !important;
border-color: #6aaaff !important;
}
-.primary--text.text--lighten-4 {
+.primary--text.text--lighten-2 {
color: #6aaaff !important;
}
-.primary--text.text--lighten-4 input,
-.primary--text.text--lighten-4 textarea {
+.primary--text.text--lighten-2 input,
+.primary--text.text--lighten-2 textarea {
caret-color: #6aaaff !important;
}
-.primary.lighten-5 {
+.primary.lighten-1 {
background-color: #488fef !important;
border-color: #488fef !important;
}
-.primary--text.text--lighten-5 {
+.primary--text.text--lighten-1 {
color: #488fef !important;
}
-.primary--text.text--lighten-5 input,
-.primary--text.text--lighten-5 textarea {
+.primary--text.text--lighten-1 input,
+.primary--text.text--lighten-1 textarea {
caret-color: #488fef !important;
}
.primary.darken-1 {
@@ -151,26 +151,26 @@ exports[`VApp.js should watch theme 1`] = `
.secondary--text textarea {
caret-color: #424242 !important;
}
-.secondary.lighten-1 {
+.secondary.lighten-5 {
background-color: #c1c1c1 !important;
border-color: #c1c1c1 !important;
}
-.secondary--text.text--lighten-1 {
+.secondary--text.text--lighten-5 {
color: #c1c1c1 !important;
}
-.secondary--text.text--lighten-1 input,
-.secondary--text.text--lighten-1 textarea {
+.secondary--text.text--lighten-5 input,
+.secondary--text.text--lighten-5 textarea {
caret-color: #c1c1c1 !important;
}
-.secondary.lighten-2 {
+.secondary.lighten-4 {
background-color: #a6a6a6 !important;
border-color: #a6a6a6 !important;
}
-.secondary--text.text--lighten-2 {
+.secondary--text.text--lighten-4 {
color: #a6a6a6 !important;
}
-.secondary--text.text--lighten-2 input,
-.secondary--text.text--lighten-2 textarea {
+.secondary--text.text--lighten-4 input,
+.secondary--text.text--lighten-4 textarea {
caret-color: #a6a6a6 !important;
}
.secondary.lighten-3 {
@@ -184,26 +184,26 @@ exports[`VApp.js should watch theme 1`] = `
.secondary--text.text--lighten-3 textarea {
caret-color: #8b8b8b !important;
}
-.secondary.lighten-4 {
+.secondary.lighten-2 {
background-color: #727272 !important;
border-color: #727272 !important;
}
-.secondary--text.text--lighten-4 {
+.secondary--text.text--lighten-2 {
color: #727272 !important;
}
-.secondary--text.text--lighten-4 input,
-.secondary--text.text--lighten-4 textarea {
+.secondary--text.text--lighten-2 input,
+.secondary--text.text--lighten-2 textarea {
caret-color: #727272 !important;
}
-.secondary.lighten-5 {
+.secondary.lighten-1 {
background-color: #595959 !important;
border-color: #595959 !important;
}
-.secondary--text.text--lighten-5 {
+.secondary--text.text--lighten-1 {
color: #595959 !important;
}
-.secondary--text.text--lighten-5 input,
-.secondary--text.text--lighten-5 textarea {
+.secondary--text.text--lighten-1 input,
+.secondary--text.text--lighten-1 textarea {
caret-color: #595959 !important;
}
.secondary.darken-1 {
@@ -261,26 +261,26 @@ exports[`VApp.js should watch theme 1`] = `
.accent--text textarea {
caret-color: #82b1ff !important;
}
-.accent.lighten-1 {
+.accent.lighten-5 {
background-color: #ffffff !important;
border-color: #ffffff !important;
}
-.accent--text.text--lighten-1 {
+.accent--text.text--lighten-5 {
color: #ffffff !important;
}
-.accent--text.text--lighten-1 input,
-.accent--text.text--lighten-1 textarea {
+.accent--text.text--lighten-5 input,
+.accent--text.text--lighten-5 textarea {
caret-color: #ffffff !important;
}
-.accent.lighten-2 {
+.accent.lighten-4 {
background-color: #f8ffff !important;
border-color: #f8ffff !important;
}
-.accent--text.text--lighten-2 {
+.accent--text.text--lighten-4 {
color: #f8ffff !important;
}
-.accent--text.text--lighten-2 input,
-.accent--text.text--lighten-2 textarea {
+.accent--text.text--lighten-4 input,
+.accent--text.text--lighten-4 textarea {
caret-color: #f8ffff !important;
}
.accent.lighten-3 {
@@ -294,26 +294,26 @@ exports[`VApp.js should watch theme 1`] = `
.accent--text.text--lighten-3 textarea {
caret-color: #daffff !important;
}
-.accent.lighten-4 {
+.accent.lighten-2 {
background-color: #bce8ff !important;
border-color: #bce8ff !important;
}
-.accent--text.text--lighten-4 {
+.accent--text.text--lighten-2 {
color: #bce8ff !important;
}
-.accent--text.text--lighten-4 input,
-.accent--text.text--lighten-4 textarea {
+.accent--text.text--lighten-2 input,
+.accent--text.text--lighten-2 textarea {
caret-color: #bce8ff !important;
}
-.accent.lighten-5 {
+.accent.lighten-1 {
background-color: #9fccff !important;
border-color: #9fccff !important;
}
-.accent--text.text--lighten-5 {
+.accent--text.text--lighten-1 {
color: #9fccff !important;
}
-.accent--text.text--lighten-5 input,
-.accent--text.text--lighten-5 textarea {
+.accent--text.text--lighten-1 input,
+.accent--text.text--lighten-1 textarea {
caret-color: #9fccff !important;
}
.accent.darken-1 {
@@ -371,26 +371,26 @@ exports[`VApp.js should watch theme 1`] = `
.error--text textarea {
caret-color: #ff5252 !important;
}
-.error.lighten-1 {
+.error.lighten-5 {
background-color: #ffe4d5 !important;
border-color: #ffe4d5 !important;
}
-.error--text.text--lighten-1 {
+.error--text.text--lighten-5 {
color: #ffe4d5 !important;
}
-.error--text.text--lighten-1 input,
-.error--text.text--lighten-1 textarea {
+.error--text.text--lighten-5 input,
+.error--text.text--lighten-5 textarea {
caret-color: #ffe4d5 !important;
}
-.error.lighten-2 {
+.error.lighten-4 {
background-color: #ffc6b9 !important;
border-color: #ffc6b9 !important;
}
-.error--text.text--lighten-2 {
+.error--text.text--lighten-4 {
color: #ffc6b9 !important;
}
-.error--text.text--lighten-2 input,
-.error--text.text--lighten-2 textarea {
+.error--text.text--lighten-4 input,
+.error--text.text--lighten-4 textarea {
caret-color: #ffc6b9 !important;
}
.error.lighten-3 {
@@ -404,26 +404,26 @@ exports[`VApp.js should watch theme 1`] = `
.error--text.text--lighten-3 textarea {
caret-color: #ffa99e !important;
}
-.error.lighten-4 {
+.error.lighten-2 {
background-color: #ff8c84 !important;
border-color: #ff8c84 !important;
}
-.error--text.text--lighten-4 {
+.error--text.text--lighten-2 {
color: #ff8c84 !important;
}
-.error--text.text--lighten-4 input,
-.error--text.text--lighten-4 textarea {
+.error--text.text--lighten-2 input,
+.error--text.text--lighten-2 textarea {
caret-color: #ff8c84 !important;
}
-.error.lighten-5 {
+.error.lighten-1 {
background-color: #ff6f6a !important;
border-color: #ff6f6a !important;
}
-.error--text.text--lighten-5 {
+.error--text.text--lighten-1 {
color: #ff6f6a !important;
}
-.error--text.text--lighten-5 input,
-.error--text.text--lighten-5 textarea {
+.error--text.text--lighten-1 input,
+.error--text.text--lighten-1 textarea {
caret-color: #ff6f6a !important;
}
.error.darken-1 {
@@ -481,26 +481,26 @@ exports[`VApp.js should watch theme 1`] = `
.info--text textarea {
caret-color: #2196f3 !important;
}
-.info.lighten-1 {
+.info.lighten-5 {
background-color: #d4ffff !important;
border-color: #d4ffff !important;
}
-.info--text.text--lighten-1 {
+.info--text.text--lighten-5 {
color: #d4ffff !important;
}
-.info--text.text--lighten-1 input,
-.info--text.text--lighten-1 textarea {
+.info--text.text--lighten-5 input,
+.info--text.text--lighten-5 textarea {
caret-color: #d4ffff !important;
}
-.info.lighten-2 {
+.info.lighten-4 {
background-color: #b5ffff !important;
border-color: #b5ffff !important;
}
-.info--text.text--lighten-2 {
+.info--text.text--lighten-4 {
color: #b5ffff !important;
}
-.info--text.text--lighten-2 input,
-.info--text.text--lighten-2 textarea {
+.info--text.text--lighten-4 input,
+.info--text.text--lighten-4 textarea {
caret-color: #b5ffff !important;
}
.info.lighten-3 {
@@ -514,26 +514,26 @@ exports[`VApp.js should watch theme 1`] = `
.info--text.text--lighten-3 textarea {
caret-color: #95e8ff !important;
}
-.info.lighten-4 {
+.info.lighten-2 {
background-color: #75ccff !important;
border-color: #75ccff !important;
}
-.info--text.text--lighten-4 {
+.info--text.text--lighten-2 {
color: #75ccff !important;
}
-.info--text.text--lighten-4 input,
-.info--text.text--lighten-4 textarea {
+.info--text.text--lighten-2 input,
+.info--text.text--lighten-2 textarea {
caret-color: #75ccff !important;
}
-.info.lighten-5 {
+.info.lighten-1 {
background-color: #51b0ff !important;
border-color: #51b0ff !important;
}
-.info--text.text--lighten-5 {
+.info--text.text--lighten-1 {
color: #51b0ff !important;
}
-.info--text.text--lighten-5 input,
-.info--text.text--lighten-5 textarea {
+.info--text.text--lighten-1 input,
+.info--text.text--lighten-1 textarea {
caret-color: #51b0ff !important;
}
.info.darken-1 {
@@ -591,26 +591,26 @@ exports[`VApp.js should watch theme 1`] = `
.success--text textarea {
caret-color: #4caf50 !important;
}
-.success.lighten-1 {
+.success.lighten-5 {
background-color: #dcffd6 !important;
border-color: #dcffd6 !important;
}
-.success--text.text--lighten-1 {
+.success--text.text--lighten-5 {
color: #dcffd6 !important;
}
-.success--text.text--lighten-1 input,
-.success--text.text--lighten-1 textarea {
+.success--text.text--lighten-5 input,
+.success--text.text--lighten-5 textarea {
caret-color: #dcffd6 !important;
}
-.success.lighten-2 {
+.success.lighten-4 {
background-color: #beffba !important;
border-color: #beffba !important;
}
-.success--text.text--lighten-2 {
+.success--text.text--lighten-4 {
color: #beffba !important;
}
-.success--text.text--lighten-2 input,
-.success--text.text--lighten-2 textarea {
+.success--text.text--lighten-4 input,
+.success--text.text--lighten-4 textarea {
caret-color: #beffba !important;
}
.success.lighten-3 {
@@ -624,26 +624,26 @@ exports[`VApp.js should watch theme 1`] = `
.success--text.text--lighten-3 textarea {
caret-color: #a2ff9e !important;
}
-.success.lighten-4 {
+.success.lighten-2 {
background-color: #85e783 !important;
border-color: #85e783 !important;
}
-.success--text.text--lighten-4 {
+.success--text.text--lighten-2 {
color: #85e783 !important;
}
-.success--text.text--lighten-4 input,
-.success--text.text--lighten-4 textarea {
+.success--text.text--lighten-2 input,
+.success--text.text--lighten-2 textarea {
caret-color: #85e783 !important;
}
-.success.lighten-5 {
+.success.lighten-1 {
background-color: #69cb69 !important;
border-color: #69cb69 !important;
}
-.success--text.text--lighten-5 {
+.success--text.text--lighten-1 {
color: #69cb69 !important;
}
-.success--text.text--lighten-5 input,
-.success--text.text--lighten-5 textarea {
+.success--text.text--lighten-1 input,
+.success--text.text--lighten-1 textarea {
caret-color: #69cb69 !important;
}
.success.darken-1 {
@@ -701,26 +701,26 @@ exports[`VApp.js should watch theme 1`] = `
.warning--text textarea {
caret-color: #ffc107 !important;
}
-.warning.lighten-1 {
+.warning.lighten-5 {
background-color: #ffffae !important;
border-color: #ffffae !important;
}
-.warning--text.text--lighten-1 {
+.warning--text.text--lighten-5 {
color: #ffffae !important;
}
-.warning--text.text--lighten-1 input,
-.warning--text.text--lighten-1 textarea {
+.warning--text.text--lighten-5 input,
+.warning--text.text--lighten-5 textarea {
caret-color: #ffffae !important;
}
-.warning.lighten-2 {
+.warning.lighten-4 {
background-color: #ffff91 !important;
border-color: #ffff91 !important;
}
-.warning--text.text--lighten-2 {
+.warning--text.text--lighten-4 {
color: #ffff91 !important;
}
-.warning--text.text--lighten-2 input,
-.warning--text.text--lighten-2 textarea {
+.warning--text.text--lighten-4 input,
+.warning--text.text--lighten-4 textarea {
caret-color: #ffff91 !important;
}
.warning.lighten-3 {
@@ -734,26 +734,26 @@ exports[`VApp.js should watch theme 1`] = `
.warning--text.text--lighten-3 textarea {
caret-color: #ffff74 !important;
}
-.warning.lighten-4 {
+.warning.lighten-2 {
background-color: #fff956 !important;
border-color: #fff956 !important;
}
-.warning--text.text--lighten-4 {
+.warning--text.text--lighten-2 {
color: #fff956 !important;
}
-.warning--text.text--lighten-4 input,
-.warning--text.text--lighten-4 textarea {
+.warning--text.text--lighten-2 input,
+.warning--text.text--lighten-2 textarea {
caret-color: #fff956 !important;
}
-.warning.lighten-5 {
+.warning.lighten-1 {
background-color: #ffdd37 !important;
border-color: #ffdd37 !important;
}
-.warning--text.text--lighten-5 {
+.warning--text.text--lighten-1 {
color: #ffdd37 !important;
}
-.warning--text.text--lighten-5 input,
-.warning--text.text--lighten-5 textarea {
+.warning--text.text--lighten-1 input,
+.warning--text.text--lighten-1 textarea {
caret-color: #ffdd37 !important;
}
.warning.darken-1 {
@@ -820,26 +820,26 @@ exports[`VApp.js should watch theme 2`] = `
.primary--text textarea {
caret-color: #000000 !important;
}
-.primary.lighten-1 {
+.primary.lighten-5 {
background-color: #777777 !important;
border-color: #777777 !important;
}
-.primary--text.text--lighten-1 {
+.primary--text.text--lighten-5 {
color: #777777 !important;
}
-.primary--text.text--lighten-1 input,
-.primary--text.text--lighten-1 textarea {
+.primary--text.text--lighten-5 input,
+.primary--text.text--lighten-5 textarea {
caret-color: #777777 !important;
}
-.primary.lighten-2 {
+.primary.lighten-4 {
background-color: #5e5e5e !important;
border-color: #5e5e5e !important;
}
-.primary--text.text--lighten-2 {
+.primary--text.text--lighten-4 {
color: #5e5e5e !important;
}
-.primary--text.text--lighten-2 input,
-.primary--text.text--lighten-2 textarea {
+.primary--text.text--lighten-4 input,
+.primary--text.text--lighten-4 textarea {
caret-color: #5e5e5e !important;
}
.primary.lighten-3 {
@@ -853,26 +853,26 @@ exports[`VApp.js should watch theme 2`] = `
.primary--text.text--lighten-3 textarea {
caret-color: #474747 !important;
}
-.primary.lighten-4 {
+.primary.lighten-2 {
background-color: #303030 !important;
border-color: #303030 !important;
}
-.primary--text.text--lighten-4 {
+.primary--text.text--lighten-2 {
color: #303030 !important;
}
-.primary--text.text--lighten-4 input,
-.primary--text.text--lighten-4 textarea {
+.primary--text.text--lighten-2 input,
+.primary--text.text--lighten-2 textarea {
caret-color: #303030 !important;
}
-.primary.lighten-5 {
+.primary.lighten-1 {
background-color: #1b1b1b !important;
border-color: #1b1b1b !important;
}
-.primary--text.text--lighten-5 {
+.primary--text.text--lighten-1 {
color: #1b1b1b !important;
}
-.primary--text.text--lighten-5 input,
-.primary--text.text--lighten-5 textarea {
+.primary--text.text--lighten-1 input,
+.primary--text.text--lighten-1 textarea {
caret-color: #1b1b1b !important;
}
.primary.darken-1 {
@@ -930,26 +930,26 @@ exports[`VApp.js should watch theme 2`] = `
.secondary--text textarea {
caret-color: #424242 !important;
}
-.secondary.lighten-1 {
+.secondary.lighten-5 {
background-color: #c1c1c1 !important;
border-color: #c1c1c1 !important;
}
-.secondary--text.text--lighten-1 {
+.secondary--text.text--lighten-5 {
color: #c1c1c1 !important;
}
-.secondary--text.text--lighten-1 input,
-.secondary--text.text--lighten-1 textarea {
+.secondary--text.text--lighten-5 input,
+.secondary--text.text--lighten-5 textarea {
caret-color: #c1c1c1 !important;
}
-.secondary.lighten-2 {
+.secondary.lighten-4 {
background-color: #a6a6a6 !important;
border-color: #a6a6a6 !important;
}
-.secondary--text.text--lighten-2 {
+.secondary--text.text--lighten-4 {
color: #a6a6a6 !important;
}
-.secondary--text.text--lighten-2 input,
-.secondary--text.text--lighten-2 textarea {
+.secondary--text.text--lighten-4 input,
+.secondary--text.text--lighten-4 textarea {
caret-color: #a6a6a6 !important;
}
.secondary.lighten-3 {
@@ -963,26 +963,26 @@ exports[`VApp.js should watch theme 2`] = `
.secondary--text.text--lighten-3 textarea {
caret-color: #8b8b8b !important;
}
-.secondary.lighten-4 {
+.secondary.lighten-2 {
background-color: #727272 !important;
border-color: #727272 !important;
}
-.secondary--text.text--lighten-4 {
+.secondary--text.text--lighten-2 {
color: #727272 !important;
}
-.secondary--text.text--lighten-4 input,
-.secondary--text.text--lighten-4 textarea {
+.secondary--text.text--lighten-2 input,
+.secondary--text.text--lighten-2 textarea {
caret-color: #727272 !important;
}
-.secondary.lighten-5 {
+.secondary.lighten-1 {
background-color: #595959 !important;
border-color: #595959 !important;
}
-.secondary--text.text--lighten-5 {
+.secondary--text.text--lighten-1 {
color: #595959 !important;
}
-.secondary--text.text--lighten-5 input,
-.secondary--text.text--lighten-5 textarea {
+.secondary--text.text--lighten-1 input,
+.secondary--text.text--lighten-1 textarea {
caret-color: #595959 !important;
}
.secondary.darken-1 {
@@ -1040,26 +1040,26 @@ exports[`VApp.js should watch theme 2`] = `
.accent--text textarea {
caret-color: #82b1ff !important;
}
-.accent.lighten-1 {
+.accent.lighten-5 {
background-color: #ffffff !important;
border-color: #ffffff !important;
}
-.accent--text.text--lighten-1 {
+.accent--text.text--lighten-5 {
color: #ffffff !important;
}
-.accent--text.text--lighten-1 input,
-.accent--text.text--lighten-1 textarea {
+.accent--text.text--lighten-5 input,
+.accent--text.text--lighten-5 textarea {
caret-color: #ffffff !important;
}
-.accent.lighten-2 {
+.accent.lighten-4 {
background-color: #f8ffff !important;
border-color: #f8ffff !important;
}
-.accent--text.text--lighten-2 {
+.accent--text.text--lighten-4 {
color: #f8ffff !important;
}
-.accent--text.text--lighten-2 input,
-.accent--text.text--lighten-2 textarea {
+.accent--text.text--lighten-4 input,
+.accent--text.text--lighten-4 textarea {
caret-color: #f8ffff !important;
}
.accent.lighten-3 {
@@ -1073,26 +1073,26 @@ exports[`VApp.js should watch theme 2`] = `
.accent--text.text--lighten-3 textarea {
caret-color: #daffff !important;
}
-.accent.lighten-4 {
+.accent.lighten-2 {
background-color: #bce8ff !important;
border-color: #bce8ff !important;
}
-.accent--text.text--lighten-4 {
+.accent--text.text--lighten-2 {
color: #bce8ff !important;
}
-.accent--text.text--lighten-4 input,
-.accent--text.text--lighten-4 textarea {
+.accent--text.text--lighten-2 input,
+.accent--text.text--lighten-2 textarea {
caret-color: #bce8ff !important;
}
-.accent.lighten-5 {
+.accent.lighten-1 {
background-color: #9fccff !important;
border-color: #9fccff !important;
}
-.accent--text.text--lighten-5 {
+.accent--text.text--lighten-1 {
color: #9fccff !important;
}
-.accent--text.text--lighten-5 input,
-.accent--text.text--lighten-5 textarea {
+.accent--text.text--lighten-1 input,
+.accent--text.text--lighten-1 textarea {
caret-color: #9fccff !important;
}
.accent.darken-1 {
@@ -1150,26 +1150,26 @@ exports[`VApp.js should watch theme 2`] = `
.error--text textarea {
caret-color: #ff5252 !important;
}
-.error.lighten-1 {
+.error.lighten-5 {
background-color: #ffe4d5 !important;
border-color: #ffe4d5 !important;
}
-.error--text.text--lighten-1 {
+.error--text.text--lighten-5 {
color: #ffe4d5 !important;
}
-.error--text.text--lighten-1 input,
-.error--text.text--lighten-1 textarea {
+.error--text.text--lighten-5 input,
+.error--text.text--lighten-5 textarea {
caret-color: #ffe4d5 !important;
}
-.error.lighten-2 {
+.error.lighten-4 {
background-color: #ffc6b9 !important;
border-color: #ffc6b9 !important;
}
-.error--text.text--lighten-2 {
+.error--text.text--lighten-4 {
color: #ffc6b9 !important;
}
-.error--text.text--lighten-2 input,
-.error--text.text--lighten-2 textarea {
+.error--text.text--lighten-4 input,
+.error--text.text--lighten-4 textarea {
caret-color: #ffc6b9 !important;
}
.error.lighten-3 {
@@ -1183,26 +1183,26 @@ exports[`VApp.js should watch theme 2`] = `
.error--text.text--lighten-3 textarea {
caret-color: #ffa99e !important;
}
-.error.lighten-4 {
+.error.lighten-2 {
background-color: #ff8c84 !important;
border-color: #ff8c84 !important;
}
-.error--text.text--lighten-4 {
+.error--text.text--lighten-2 {
color: #ff8c84 !important;
}
-.error--text.text--lighten-4 input,
-.error--text.text--lighten-4 textarea {
+.error--text.text--lighten-2 input,
+.error--text.text--lighten-2 textarea {
caret-color: #ff8c84 !important;
}
-.error.lighten-5 {
+.error.lighten-1 {
background-color: #ff6f6a !important;
border-color: #ff6f6a !important;
}
-.error--text.text--lighten-5 {
+.error--text.text--lighten-1 {
color: #ff6f6a !important;
}
-.error--text.text--lighten-5 input,
-.error--text.text--lighten-5 textarea {
+.error--text.text--lighten-1 input,
+.error--text.text--lighten-1 textarea {
caret-color: #ff6f6a !important;
}
.error.darken-1 {
@@ -1260,26 +1260,26 @@ exports[`VApp.js should watch theme 2`] = `
.info--text textarea {
caret-color: #2196f3 !important;
}
-.info.lighten-1 {
+.info.lighten-5 {
background-color: #d4ffff !important;
border-color: #d4ffff !important;
}
-.info--text.text--lighten-1 {
+.info--text.text--lighten-5 {
color: #d4ffff !important;
}
-.info--text.text--lighten-1 input,
-.info--text.text--lighten-1 textarea {
+.info--text.text--lighten-5 input,
+.info--text.text--lighten-5 textarea {
caret-color: #d4ffff !important;
}
-.info.lighten-2 {
+.info.lighten-4 {
background-color: #b5ffff !important;
border-color: #b5ffff !important;
}
-.info--text.text--lighten-2 {
+.info--text.text--lighten-4 {
color: #b5ffff !important;
}
-.info--text.text--lighten-2 input,
-.info--text.text--lighten-2 textarea {
+.info--text.text--lighten-4 input,
+.info--text.text--lighten-4 textarea {
caret-color: #b5ffff !important;
}
.info.lighten-3 {
@@ -1293,26 +1293,26 @@ exports[`VApp.js should watch theme 2`] = `
.info--text.text--lighten-3 textarea {
caret-color: #95e8ff !important;
}
-.info.lighten-4 {
+.info.lighten-2 {
background-color: #75ccff !important;
border-color: #75ccff !important;
}
-.info--text.text--lighten-4 {
+.info--text.text--lighten-2 {
color: #75ccff !important;
}
-.info--text.text--lighten-4 input,
-.info--text.text--lighten-4 textarea {
+.info--text.text--lighten-2 input,
+.info--text.text--lighten-2 textarea {
caret-color: #75ccff !important;
}
-.info.lighten-5 {
+.info.lighten-1 {
background-color: #51b0ff !important;
border-color: #51b0ff !important;
}
-.info--text.text--lighten-5 {
+.info--text.text--lighten-1 {
color: #51b0ff !important;
}
-.info--text.text--lighten-5 input,
-.info--text.text--lighten-5 textarea {
+.info--text.text--lighten-1 input,
+.info--text.text--lighten-1 textarea {
caret-color: #51b0ff !important;
}
.info.darken-1 {
@@ -1370,26 +1370,26 @@ exports[`VApp.js should watch theme 2`] = `
.success--text textarea {
caret-color: #4caf50 !important;
}
-.success.lighten-1 {
+.success.lighten-5 {
background-color: #dcffd6 !important;
border-color: #dcffd6 !important;
}
-.success--text.text--lighten-1 {
+.success--text.text--lighten-5 {
color: #dcffd6 !important;
}
-.success--text.text--lighten-1 input,
-.success--text.text--lighten-1 textarea {
+.success--text.text--lighten-5 input,
+.success--text.text--lighten-5 textarea {
caret-color: #dcffd6 !important;
}
-.success.lighten-2 {
+.success.lighten-4 {
background-color: #beffba !important;
border-color: #beffba !important;
}
-.success--text.text--lighten-2 {
+.success--text.text--lighten-4 {
color: #beffba !important;
}
-.success--text.text--lighten-2 input,
-.success--text.text--lighten-2 textarea {
+.success--text.text--lighten-4 input,
+.success--text.text--lighten-4 textarea {
caret-color: #beffba !important;
}
.success.lighten-3 {
@@ -1403,26 +1403,26 @@ exports[`VApp.js should watch theme 2`] = `
.success--text.text--lighten-3 textarea {
caret-color: #a2ff9e !important;
}
-.success.lighten-4 {
+.success.lighten-2 {
background-color: #85e783 !important;
border-color: #85e783 !important;
}
-.success--text.text--lighten-4 {
+.success--text.text--lighten-2 {
color: #85e783 !important;
}
-.success--text.text--lighten-4 input,
-.success--text.text--lighten-4 textarea {
+.success--text.text--lighten-2 input,
+.success--text.text--lighten-2 textarea {
caret-color: #85e783 !important;
}
-.success.lighten-5 {
+.success.lighten-1 {
background-color: #69cb69 !important;
border-color: #69cb69 !important;
}
-.success--text.text--lighten-5 {
+.success--text.text--lighten-1 {
color: #69cb69 !important;
}
-.success--text.text--lighten-5 input,
-.success--text.text--lighten-5 textarea {
+.success--text.text--lighten-1 input,
+.success--text.text--lighten-1 textarea {
caret-color: #69cb69 !important;
}
.success.darken-1 {
@@ -1480,26 +1480,26 @@ exports[`VApp.js should watch theme 2`] = `
.warning--text textarea {
caret-color: #ffc107 !important;
}
-.warning.lighten-1 {
+.warning.lighten-5 {
background-color: #ffffae !important;
border-color: #ffffae !important;
}
-.warning--text.text--lighten-1 {
+.warning--text.text--lighten-5 {
color: #ffffae !important;
}
-.warning--text.text--lighten-1 input,
-.warning--text.text--lighten-1 textarea {
+.warning--text.text--lighten-5 input,
+.warning--text.text--lighten-5 textarea {
caret-color: #ffffae !important;
}
-.warning.lighten-2 {
+.warning.lighten-4 {
background-color: #ffff91 !important;
border-color: #ffff91 !important;
}
-.warning--text.text--lighten-2 {
+.warning--text.text--lighten-4 {
color: #ffff91 !important;
}
-.warning--text.text--lighten-2 input,
-.warning--text.text--lighten-2 textarea {
+.warning--text.text--lighten-4 input,
+.warning--text.text--lighten-4 textarea {
caret-color: #ffff91 !important;
}
.warning.lighten-3 {
@@ -1513,26 +1513,26 @@ exports[`VApp.js should watch theme 2`] = `
.warning--text.text--lighten-3 textarea {
caret-color: #ffff74 !important;
}
-.warning.lighten-4 {
+.warning.lighten-2 {
background-color: #fff956 !important;
border-color: #fff956 !important;
}
-.warning--text.text--lighten-4 {
+.warning--text.text--lighten-2 {
color: #fff956 !important;
}
-.warning--text.text--lighten-4 input,
-.warning--text.text--lighten-4 textarea {
+.warning--text.text--lighten-2 input,
+.warning--text.text--lighten-2 textarea {
caret-color: #fff956 !important;
}
-.warning.lighten-5 {
+.warning.lighten-1 {
background-color: #ffdd37 !important;
border-color: #ffdd37 !important;
}
-.warning--text.text--lighten-5 {
+.warning--text.text--lighten-1 {
color: #ffdd37 !important;
}
-.warning--text.text--lighten-5 input,
-.warning--text.text--lighten-5 textarea {
+.warning--text.text--lighten-1 input,
+.warning--text.text--lighten-1 textarea {
caret-color: #ffdd37 !important;
}
.warning.darken-1 {
|
4cd7327d213ce09b8fe4c2148513d20cd4dfc763
|
2023-03-15 04:14:03
|
John Leider
|
refactor(defaults): improve component performance (#16775)
| false
|
improve component performance (#16775)
|
refactor
|
diff --git a/packages/api-generator/src/locale/en/v-defaults-provider.json b/packages/api-generator/src/locale/en/v-defaults-provider.json
index eab4cab2e86..5052762b128 100644
--- a/packages/api-generator/src/locale/en/v-defaults-provider.json
+++ b/packages/api-generator/src/locale/en/v-defaults-provider.json
@@ -1,8 +1,9 @@
{
"props": {
"defaults": "Specify new default prop values for components. Keep in mind that this will be merged with previously defined values",
- "reset": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-defaults-provider.json))",
- "root": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-defaults-provider.json))",
- "scoped": "MISSING DESCRIPTION ([edit in github](https://github.com/vuetifyjs/vuetify/tree/master/packages/api-generator/src/locale/en/v-defaults-provider.json))"
+ "disabled": "Turns off all calcuations of new default values for improved performance in situations where defaults propagation isn't necessary",
+ "reset": "Reset the default values up the nested chain by {n} amount",
+ "root": "Force current defaults to match the application root defaults",
+ "scoped": "Prevents the ability for default values to be inherited from parent components"
}
}
diff --git a/packages/vuetify/src/components/VAlert/VAlert.tsx b/packages/vuetify/src/components/VAlert/VAlert.tsx
index 5ea655db552..b37bd9af91b 100644
--- a/packages/vuetify/src/components/VAlert/VAlert.tsx
+++ b/packages/vuetify/src/components/VAlert/VAlert.tsx
@@ -96,10 +96,11 @@ export const VAlert = genericComponent<VAlertSlots>()({
},
emits: {
+ 'click:close': (e: MouseEvent) => true,
'update:modelValue': (value: boolean) => true,
},
- setup (props, { slots }) {
+ setup (props, { emit, slots }) {
const isActive = useProxiedModel(props, 'modelValue')
const icon = computed(() => {
if (props.icon === false) return undefined
@@ -127,6 +128,8 @@ export const VAlert = genericComponent<VAlertSlots>()({
'aria-label': t(props.closeLabel),
onClick (e: MouseEvent) {
isActive.value = false
+
+ emit('click:close', e)
},
}))
@@ -176,35 +179,39 @@ export const VAlert = genericComponent<VAlertSlots>()({
)}
{ hasPrepend && (
- <VDefaultsProvider
- key="prepend"
- defaults={{
- VIcon: {
- density: props.density,
- icon: icon.value,
- size: props.prominent ? 44 : 28,
- },
- }}
- >
- <div class="v-alert__prepend">
- { slots.prepend
- ? slots.prepend()
- : icon.value && (<VIcon />)
- }
- </div>
- </VDefaultsProvider>
+ <div key="prepend" class="v-alert__prepend">
+ { !slots.prepend ? (
+ <VIcon
+ key="prepend-icon"
+ density={ props.density }
+ icon={ icon.value }
+ size={ props.prominent ? 44 : 28 }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="prepend-defaults"
+ disabled={ !icon.value }
+ defaults={{
+ VIcon: {
+ density: props.density,
+ icon: icon.value,
+ size: props.prominent ? 44 : 28,
+ },
+ }}
+ v-slots:default={ slots.prepend }
+ />
+ )}
+ </div>
)}
<div class="v-alert__content">
{ hasTitle && (
<VAlertTitle key="title">
- { slots.title ? slots.title() : props.title }
+ { slots.title?.() ?? props.title }
</VAlertTitle>
)}
- { hasText && (
- slots.text ? slots.text() : props.text
- )}
+ { hasText && (slots.text?.() ?? props.text) }
{ slots.default?.() }
</div>
@@ -216,20 +223,30 @@ export const VAlert = genericComponent<VAlertSlots>()({
)}
{ hasClose && (
- <VDefaultsProvider
- key="close"
- defaults={{
- VBtn: {
- icon: props.closeIcon,
- size: 'x-small',
- variant: 'text',
- },
- }}
- >
- <div class="v-alert__close">
- { slots.close?.({ props: closeProps.value }) ?? <VBtn { ...closeProps.value } /> }
- </div>
- </VDefaultsProvider>
+ <div key="close" class="v-alert__close">
+ { !slots.close ? (
+ <VBtn
+ key="close-btn"
+ icon={ props.closeIcon }
+ size="x-small"
+ variant="text"
+ { ...closeProps.value }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="close-defaults"
+ defaults={{
+ VBtn: {
+ icon: props.closeIcon,
+ size: 'x-small',
+ variant: 'text',
+ },
+ }}
+ >
+ { slots.close?.({ props: closeProps.value }) }
+ </VDefaultsProvider>
+ )}
+ </div>
)}
</props.tag>
)
diff --git a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
index 0f443dcef52..94451e3cfa8 100644
--- a/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
+++ b/packages/vuetify/src/components/VAutocomplete/VAutocomplete.tsx
@@ -364,31 +364,37 @@ export const VAutocomplete = genericComponent<new <
return (
<div key={ item.value } class="v-autocomplete__selection">
{ hasChips ? (
- <VDefaultsProvider
- defaults={{
- VChip: {
- closable: props.closableChips,
- size: 'small',
- text: item.title,
- },
- }}
- >
- { slots.chip
- ? slots.chip({ item, index, props: slotProps })
- : (<VChip { ...slotProps } />)
- }
- </VDefaultsProvider>
+ !slots.chip ? (
+ <VChip
+ key="chip"
+ closable={ props.closableChips }
+ size="small"
+ text={ item.title }
+ { ...slotProps }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="chip-defaults"
+ defaults={{
+ VChip: {
+ closable: props.closableChips,
+ size: 'small',
+ text: item.title,
+ },
+ }}
+ >
+ { slots.chip?.({ item, index, props: slotProps }) }
+ </VDefaultsProvider>
+ )
) : (
- slots.selection
- ? slots.selection({ item, index })
- : (
- <span class="v-autocomplete__selection-text">
- { item.title }
- { props.multiple && (index < selections.value.length - 1) && (
- <span class="v-autocomplete__selection-comma">,</span>
- )}
- </span>
- )
+ slots.selection?.({ item, index }) ?? (
+ <span class="v-autocomplete__selection-text">
+ { item.title }
+ { props.multiple && (index < selections.value.length - 1) && (
+ <span class="v-autocomplete__selection-comma">,</span>
+ )}
+ </span>
+ )
)}
</div>
)
diff --git a/packages/vuetify/src/components/VBanner/VBanner.tsx b/packages/vuetify/src/components/VBanner/VBanner.tsx
index e5126f5d722..8d1049e03c6 100644
--- a/packages/vuetify/src/components/VBanner/VBanner.tsx
+++ b/packages/vuetify/src/components/VBanner/VBanner.tsx
@@ -78,7 +78,8 @@ export const VBanner = genericComponent<VBannerSlots>()({
useRender(() => {
const hasText = !!(props.text || slots.text)
- const hasPrepend = !!(slots.prepend || props.avatar || props.icon)
+ const hasPrependMedia = !!(props.avatar || props.icon)
+ const hasPrepend = !!(hasPrependMedia || slots.prepend)
return (
<props.tag
@@ -103,30 +104,37 @@ export const VBanner = genericComponent<VBannerSlots>()({
role="banner"
>
{ hasPrepend && (
- <VDefaultsProvider
- key="prepend"
- defaults={{
- VAvatar: {
- color: color.value,
- density: density.value,
- icon: props.icon,
- image: props.avatar,
- },
- }}
- >
- <div class="v-banner__prepend">
- { slots.prepend
- ? slots.prepend()
- : (props.avatar || props.icon) && (<VAvatar />)
- }
- </div>
- </VDefaultsProvider>
+ <div key="prepend" class="v-banner__prepend">
+ { !slots.prepend ? (
+ <VAvatar
+ key="prepend-avatar"
+ color={ color.value }
+ density={ density.value }
+ icon={ props.icon }
+ image={ props.avatar }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="prepend-defaults"
+ disabled={ !hasPrependMedia }
+ defaults={{
+ VAvatar: {
+ color: color.value,
+ density: density.value,
+ icon: props.icon,
+ image: props.avatar,
+ },
+ }}
+ v-slots:default={ slots.prepend }
+ />
+ )}
+ </div>
)}
<div class="v-banner__content">
{ hasText && (
<VBannerText key="text">
- { slots.text ? slots.text() : props.text }
+ { slots.text?.() ?? props.text }
</VBannerText>
)}
@@ -134,9 +142,7 @@ export const VBanner = genericComponent<VBannerSlots>()({
</div>
{ slots.actions && (
- <VBannerActions>
- { slots.actions() }
- </VBannerActions>
+ <VBannerActions key="actions" v-slots:default={ slots.actions } />
)}
</props.tag>
)
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx
index 58ff22719ff..9d025b36926 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.tsx
@@ -93,22 +93,27 @@ export const VBreadcrumbs = genericComponent<new <T>() => {
style={ backgroundColorStyles.value }
>
{ hasPrepend && (
- <VDefaultsProvider
- key="prepend"
- defaults={{
- VIcon: {
- icon: props.icon,
- start: true,
- },
- }}
- >
- <div class="v-breadcrumbs__prepend">
- { slots.prepend
- ? slots.prepend()
- : props.icon && (<VIcon />)
- }
- </div>
- </VDefaultsProvider>
+ <div key="prepend" class="v-breadcrumbs__prepend">
+ { !slots.prepend ? (
+ <VIcon
+ key="prepend-icon"
+ start
+ icon={ props.icon }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="prepend-defaults"
+ disabled={ !props.icon }
+ defaults={{
+ VIcon: {
+ icon: props.icon,
+ start: true,
+ },
+ }}
+ v-slots:default={ slots.prepend }
+ />
+ )}
+ </div>
)}
{ props.items.map((item, index, array) => (
diff --git a/packages/vuetify/src/components/VBtn/VBtn.tsx b/packages/vuetify/src/components/VBtn/VBtn.tsx
index 24b4d8b57da..71a99c999e8 100644
--- a/packages/vuetify/src/components/VBtn/VBtn.tsx
+++ b/packages/vuetify/src/components/VBtn/VBtn.tsx
@@ -190,50 +190,67 @@ export const VBtn = genericComponent<VBtnSlots>()({
{ genOverlays(true, 'v-btn') }
{ !props.icon && hasPrepend && (
- <VDefaultsProvider
- key="prepend"
- defaults={{
- VIcon: {
- icon: props.prependIcon,
- },
- }}
- >
- <span class="v-btn__prepend">
- { slots.prepend?.() ?? (<VIcon />) }
- </span>
- </VDefaultsProvider>
+ <span key="prepend" class="v-btn__prepend">
+ { !slots.prepend ? (
+ <VIcon
+ key="prepend-icon"
+ icon={ props.prependIcon }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="prepend-defaults"
+ disabled={ !props.prependIcon }
+ defaults={{
+ VIcon: {
+ icon: props.prependIcon,
+ },
+ }}
+ v-slots:default={ slots.prepend }
+ />
+ )}
+ </span>
)}
<span class="v-btn__content" data-no-activator="">
- <VDefaultsProvider
- key="content"
- defaults={{
- VIcon: {
- icon: hasIcon ? props.icon : undefined,
- },
- }}
- >
- { slots.default?.() ?? (
- hasIcon && (
- <VIcon key="icon" />
- )
- )}
- </VDefaultsProvider>
+ { (!slots.default && hasIcon) ? (
+ <VIcon
+ key="content-icon"
+ icon={ props.icon }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="content-defaults"
+ disabled={ !hasIcon }
+ defaults={{
+ VIcon: {
+ icon: props.icon,
+ },
+ }}
+ v-slots:default={ slots.default }
+ />
+ )}
</span>
{ !props.icon && hasAppend && (
- <VDefaultsProvider
- key="append"
- defaults={{
- VIcon: {
- icon: props.appendIcon,
- },
- }}
- >
- <span class="v-btn__append">
- { slots.append?.() ?? (<VIcon />) }
- </span>
- </VDefaultsProvider>
+ <span key="append" class="v-btn__append">
+ { !slots.append ? (
+ <VIcon
+ key="append-icon"
+ icon={ props.appendIcon }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="append-defaults"
+ disabled={ !props.appendIcon }
+ defaults={{
+ VIcon: {
+ icon: props.appendIcon,
+ },
+ }}
+ v-slots:default={ slots.append }
+ />
+ )}
+ </span>
)}
{ !!props.loading && (
diff --git a/packages/vuetify/src/components/VCard/VCard.tsx b/packages/vuetify/src/components/VCard/VCard.tsx
index a6a81a47404..92247136006 100644
--- a/packages/vuetify/src/components/VCard/VCard.tsx
+++ b/packages/vuetify/src/components/VCard/VCard.tsx
@@ -149,19 +149,27 @@ export const VCard = genericComponent<VCardSlots>()({
tabindex={ props.disabled ? -1 : undefined }
>
{ hasImage && (
- <VDefaultsProvider
- key="image"
- defaults={{
- VImg: {
- cover: true,
- src: props.image,
- },
- }}
- >
- <div class="v-card__image">
- { slots.image?.() ?? <VImg /> }
- </div>
- </VDefaultsProvider>
+ <div key="image" class="v-card__image">
+ { !slots.image ? (
+ <VImg
+ key="image-img"
+ cover
+ src={ props.image }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="image-defaults"
+ disabled={ !props.image }
+ defaults={{
+ VImg: {
+ cover: true,
+ src: props.image,
+ },
+ }}
+ v-slots:default={ slots.image }
+ />
+ )}
+ </div>
)}
<LoaderSlot
diff --git a/packages/vuetify/src/components/VCard/VCardItem.tsx b/packages/vuetify/src/components/VCard/VCardItem.tsx
index 127f205e97c..158ecb0b672 100644
--- a/packages/vuetify/src/components/VCard/VCardItem.tsx
+++ b/packages/vuetify/src/components/VCard/VCardItem.tsx
@@ -1,8 +1,8 @@
// Components
-import { VAvatar } from '../VAvatar'
+import { VAvatar } from '@/components/VAvatar'
import { VCardSubtitle } from './VCardSubtitle'
import { VCardTitle } from './VCardTitle'
-import { VDefaultsProvider } from '../VDefaultsProvider'
+import { VDefaultsProvider } from '@/components/VDefaultsProvider'
// Composables
import { IconValue } from '@/composables/icons'
@@ -38,32 +38,41 @@ export const VCardItem = genericComponent<VCardItemSlots>()({
setup (props, { slots }) {
useRender(() => {
- const hasPrepend = !!(props.prependAvatar || props.prependIcon || slots.prepend)
- const hasAppend = !!(props.appendAvatar || props.appendIcon || slots.append)
+ const hasPrependMedia = !!(props.prependAvatar || props.prependIcon)
+ const hasPrepend = !!(hasPrependMedia || slots.prepend)
+ const hasAppendMedia = !!(props.appendAvatar || props.appendIcon)
+ const hasAppend = !!(hasAppendMedia || slots.append)
const hasTitle = !!(props.title || slots.title)
const hasSubtitle = !!(props.subtitle || slots.subtitle)
return (
<div class="v-card-item">
{ hasPrepend && (
- <VDefaultsProvider
- key="prepend"
- defaults={{
- VAvatar: {
- density: props.density,
- icon: props.prependIcon,
- image: props.prependAvatar,
- },
- VIcon: {
- density: props.density,
- icon: props.prependIcon,
- },
- }}
- >
- <div class="v-card-item__prepend">
- { slots.prepend?.() ?? (<VAvatar />) }
- </div>
- </VDefaultsProvider>
+ <div key="prepend" class="v-card-item__prepend">
+ { !slots.prepend ? (
+ hasPrependMedia && (
+ <VAvatar
+ key="prepend-avatar"
+ density={ props.density }
+ icon={ props.prependIcon }
+ image={ props.prependAvatar }
+ />
+ )
+ ) : (
+ <VDefaultsProvider
+ key="prepend-defaults"
+ disabled={ !hasPrependMedia }
+ defaults={{
+ VAvatar: {
+ density: props.density,
+ icon: props.prependIcon,
+ image: props.prependAvatar,
+ },
+ }}
+ v-slots:default={ slots.prepend }
+ />
+ )}
+ </div>
)}
<div class="v-card-item__content">
@@ -83,24 +92,31 @@ export const VCardItem = genericComponent<VCardItemSlots>()({
</div>
{ hasAppend && (
- <VDefaultsProvider
- key="append"
- defaults={{
- VAvatar: {
- density: props.density,
- icon: props.appendIcon,
- image: props.appendAvatar,
- },
- VIcon: {
- density: props.density,
- icon: props.appendIcon,
- },
- }}
- >
- <div class="v-card-item__append">
- { slots.append?.() ?? (<VAvatar />) }
- </div>
- </VDefaultsProvider>
+ <div key="append" class="v-card-item__append">
+ { !slots.append ? (
+ hasAppendMedia && (
+ <VAvatar
+ key="append-avatar"
+ density={ props.density }
+ icon={ props.appendIcon }
+ image={ props.appendAvatar }
+ />
+ )
+ ) : (
+ <VDefaultsProvider
+ key="append-defaults"
+ disabled={ !hasAppendMedia }
+ defaults={{
+ VAvatar: {
+ density: props.density,
+ icon: props.appendIcon,
+ image: props.appendAvatar,
+ },
+ }}
+ v-slots:default={ slots.append }
+ />
+ )}
+ </div>
)}
</div>
)
diff --git a/packages/vuetify/src/components/VChip/VChip.tsx b/packages/vuetify/src/components/VChip/VChip.tsx
index 8c6416aa085..0fb4507991f 100644
--- a/packages/vuetify/src/components/VChip/VChip.tsx
+++ b/packages/vuetify/src/components/VChip/VChip.tsx
@@ -99,7 +99,7 @@ export const VChip = genericComponent<VChipSlots>()({
},
emits: {
- 'click:close': (e: Event) => true,
+ 'click:close': (e: MouseEvent) => true,
'update:modelValue': (value: boolean) => true,
'group:selected': (val: { value: boolean }) => true,
click: (e: MouseEvent | KeyboardEvent) => true,
@@ -124,12 +124,14 @@ export const VChip = genericComponent<VChipSlots>()({
props.link !== false &&
(!!group || props.link || link.isClickable.value)
)
+ const closeProps = computed(() => ({
+ 'aria-label': t(props.closeLabel),
+ onClick (e: MouseEvent) {
+ isActive.value = false
- function onCloseClick (e: Event) {
- isActive.value = false
-
- emit('click:close', e)
- }
+ emit('click:close', e)
+ },
+ }))
function onClick (e: MouseEvent) {
emit('click', e)
@@ -149,10 +151,12 @@ export const VChip = genericComponent<VChipSlots>()({
return () => {
const Tag = (link.isLink.value) ? 'a' : props.tag
- const hasAppend = !!(slots.append || props.appendIcon || props.appendAvatar)
+ const hasAppendMedia = !!(props.appendIcon || props.appendAvatar)
+ const hasAppend = !!(hasAppendMedia || slots.append)
const hasClose = !!(slots.close || props.closable)
const hasFilter = !!(slots.filter || props.filter) && group
- const hasPrepend = !!(slots.prepend || props.prependIcon || props.prependAvatar)
+ const hasPrependMedia = !!(props.prependIcon || props.prependAvatar)
+ const hasPrepend = !!(hasPrependMedia || slots.prepend)
const hasColor = !group || group.isSelected.value
return isActive.value && (
@@ -190,46 +194,68 @@ export const VChip = genericComponent<VChipSlots>()({
{ genOverlays(isClickable.value, 'v-chip') }
{ hasFilter && (
- <VDefaultsProvider
- key="filter"
- defaults={{
- VIcon: { icon: props.filterIcon },
- }}
- >
- <VExpandXTransition>
- <div
- class="v-chip__filter"
- v-show={ group.isSelected.value }
- >
- { slots.filter ? slots.filter() : (<VIcon />) }
- </div>
- </VExpandXTransition>
- </VDefaultsProvider>
+ <VExpandXTransition key="filter">
+ <div
+ class="v-chip__filter"
+ v-show={ group.isSelected.value }
+ >
+ { !slots.filter ? (
+ <VIcon
+ key="filter-icon"
+ icon={ props.filterIcon }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="filter-defaults"
+ disabled={ !props.filterIcon }
+ defaults={{
+ VIcon: { icon: props.filterIcon },
+ }}
+ v-slot:default={ slots.filter }
+ />
+ )}
+ </div>
+ </VExpandXTransition>
)}
{ hasPrepend && (
- <VDefaultsProvider
- key="prepend"
- defaults={{
- VAvatar: {
- image: props.prependAvatar,
- },
- VIcon: {
- icon: props.prependIcon,
- },
- }}
- >
- { slots.prepend
- ? (
- <div class="v-chip__prepend">
- { slots.prepend() }
- </div>
- )
- : props.prependAvatar ? (<VAvatar start />)
- : props.prependIcon ? (<VIcon start />)
- : undefined
- }
- </VDefaultsProvider>
+ <div key="prepend" class="v-chip__prepend">
+ { !slots.prepend ? (
+ <>
+ { props.prependIcon && (
+ <VIcon
+ key="prepend-icon"
+ icon={ props.prependIcon }
+ start
+ />
+ )}
+
+ { props.prependAvatar && (
+ <VAvatar
+ key="prepend-avatar"
+ image={ props.prependAvatar }
+ start
+ />
+ )}
+ </>
+ ) : (
+ <VDefaultsProvider
+ key="prepend-defaults"
+ disabled={ !hasPrependMedia }
+ defaults={{
+ VAvatar: {
+ image: props.prependAvatar,
+ start: true,
+ },
+ VIcon: {
+ icon: props.prependIcon,
+ start: true,
+ },
+ }}
+ v-slots:default={ slots.prepend }
+ />
+ )}
+ </div>
)}
{ slots.default?.({
@@ -242,48 +268,70 @@ export const VChip = genericComponent<VChipSlots>()({
}) ?? props.text }
{ hasAppend && (
- <VDefaultsProvider
- key="append"
- defaults={{
- VAvatar: {
- image: props.appendAvatar,
- },
- VIcon: {
- icon: props.appendIcon,
- },
- }}
- >
- { slots.append
- ? (
- <div class="v-chip__append">
- { slots.append() }
- </div>
- )
- : props.appendAvatar ? (<VAvatar end />)
- : props.appendIcon ? (<VIcon end />)
- : undefined
- }
- </VDefaultsProvider>
+ <div key="append" class="v-chip__append">
+ { !slots.append ? (
+ <>
+ { props.appendIcon && (
+ <VIcon
+ key="append-icon"
+ end
+ icon={ props.appendIcon }
+ />
+ )}
+
+ { props.appendAvatar && (
+ <VAvatar
+ key="append-avatar"
+ end
+ image={ props.appendAvatar }
+ />
+ )}
+ </>
+ ) : (
+ <VDefaultsProvider
+ key="append-defaults"
+ disabled={ !hasAppendMedia }
+ defaults={{
+ VAvatar: {
+ end: true,
+ image: props.appendAvatar,
+ },
+ VIcon: {
+ end: true,
+ icon: props.appendIcon,
+ },
+ }}
+ v-slots:default={ slots.append }
+ />
+ )}
+ </div>
)}
{ hasClose && (
- <VDefaultsProvider
+ <div
key="close"
- defaults={{
- VIcon: {
- icon: props.closeIcon,
- size: 'x-small',
- },
- }}
+ class="v-chip__close"
+ { ...closeProps.value }
>
- <div
- class="v-chip__close"
- aria-label={ t(props.closeLabel) }
- onClick={ onCloseClick }
- >
- { slots.close ? slots.close() : (<VIcon />) }
- </div>
- </VDefaultsProvider>
+ { !slots.close ? (
+ <VIcon
+ key="close-icon"
+ icon={ props.closeIcon }
+ size="x-small"
+ />
+ ) : (
+ <VDefaultsProvider
+ key="close-defaults"
+ defaults={{
+ VIcon: {
+ icon: props.closeIcon,
+ size: 'x-small',
+ },
+ }}
+ v-slots:default={ slots.close }
+ />
+ )}
+ </div>
)}
</Tag>
)
diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.tsx b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
index 2952b357ddd..4421991235c 100644
--- a/packages/vuetify/src/components/VCombobox/VCombobox.tsx
+++ b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
@@ -454,31 +454,37 @@ export const VCombobox = genericComponent<new <
style={ index === selectionIndex.value ? textColorStyles.value : {} }
>
{ hasChips ? (
- <VDefaultsProvider
- defaults={{
- VChip: {
- closable: props.closableChips,
- size: 'small',
- text: item.title,
- },
- }}
- >
- { slots.chip
- ? slots.chip({ item, index, props: slotProps })
- : (<VChip { ...slotProps } />)
- }
- </VDefaultsProvider>
+ !slots.chip ? (
+ <VChip
+ key="chip"
+ closable={ props.closableChips }
+ size="small"
+ text={ item.title }
+ { ...slotProps }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="chip-defaults"
+ defaults={{
+ VChip: {
+ closable: props.closableChips,
+ size: 'small',
+ text: item.title,
+ },
+ }}
+ >
+ { slots.chip?.({ item, index, props: slotProps }) }
+ </VDefaultsProvider>
+ )
) : (
- slots.selection
- ? slots.selection({ item, index })
- : (
- <span class="v-combobox__selection-text">
- { item.title }
- { props.multiple && (index < selections.value.length - 1) && (
- <span class="v-combobox__selection-comma">,</span>
- )}
- </span>
- )
+ slots.selection?.({ item, index }) ?? (
+ <span class="v-combobox__selection-text">
+ { item.title }
+ { props.multiple && (index < selections.value.length - 1) && (
+ <span class="v-combobox__selection-comma">,</span>
+ )}
+ </span>
+ )
)}
</div>
)
diff --git a/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx b/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx
index ae02a77b925..238f03b35e4 100644
--- a/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx
+++ b/packages/vuetify/src/components/VDefaultsProvider/VDefaultsProvider.tsx
@@ -14,18 +14,20 @@ export const VDefaultsProvider = genericComponent(false)({
props: {
defaults: Object as PropType<DefaultsOptions>,
+ disabled: Boolean,
reset: [Number, String],
root: Boolean,
scoped: Boolean,
},
setup (props, { slots }) {
- const { defaults, reset, root, scoped } = toRefs(props)
+ const { defaults, disabled, reset, root, scoped } = toRefs(props)
provideDefaults(defaults, {
reset,
root,
scoped,
+ disabled,
})
return () => slots.default?.()
diff --git a/packages/vuetify/src/components/VList/VListItem.tsx b/packages/vuetify/src/components/VList/VListItem.tsx
index d76b2670e96..6d30e96973b 100644
--- a/packages/vuetify/src/components/VList/VListItem.tsx
+++ b/packages/vuetify/src/components/VList/VListItem.tsx
@@ -173,8 +173,10 @@ export const VListItem = genericComponent<VListItemSlots>()({
const hasColor = !list || isSelected.value || isActive.value
const hasTitle = (slots.title || props.title)
const hasSubtitle = (slots.subtitle || props.subtitle)
- const hasAppend = !!(slots.append || props.appendAvatar || props.appendIcon)
- const hasPrepend = !!(slots.prepend || props.prependAvatar || props.prependIcon)
+ const hasAppendMedia = !!(props.prependAvatar || props.prependIcon)
+ const hasAppend = !!(hasAppendMedia || slots.append)
+ const hasPrependMedia = !!(props.prependAvatar || props.prependIcon)
+ const hasPrepend = !!(hasPrependMedia || slots.prepend)
list?.updateHasPrepend(hasPrepend)
@@ -213,17 +215,28 @@ export const VListItem = genericComponent<VListItemSlots>()({
{ hasPrepend && (
<div key="prepend" class="v-list-item__prepend">
- { props.prependAvatar && (
- <VAvatar key="prepend-avatar" density={ props.density } image={ props.prependAvatar } />
- )}
-
- { props.prependIcon && (
- <VIcon key="prepend-icon" density={ props.density } icon={ props.prependIcon } />
- )}
-
- { slots.prepend && (
+ { !slots.prepend ? (
+ <>
+ { props.prependAvatar && (
+ <VAvatar
+ key="prepend-avatar"
+ density={ props.density }
+ image={ props.prependAvatar }
+ />
+ )}
+
+ { props.prependIcon && (
+ <VIcon
+ key="prepend-icon"
+ density={ props.density }
+ icon={ props.prependIcon }
+ />
+ )}
+ </>
+ ) : (
<VDefaultsProvider
- key="prepend"
+ key="prepend-defaults"
+ disabled={ !hasPrependMedia }
defaults={{
VAvatar: {
density: props.density,
@@ -238,7 +251,7 @@ export const VListItem = genericComponent<VListItemSlots>()({
},
}}
>
- { slots.prepend(slotProps.value) }
+ { slots.prepend?.(slotProps.value) }
</VDefaultsProvider>
)}
</div>
@@ -262,9 +275,28 @@ export const VListItem = genericComponent<VListItemSlots>()({
{ hasAppend && (
<div key="append" class="v-list-item__append">
- { slots.append && (
+ { !slots.append ? (
+ <>
+ { props.appendIcon && (
+ <VIcon
+ key="append-icon"
+ density={ props.density }
+ icon={ props.appendIcon }
+ />
+ )}
+
+ { props.appendAvatar && (
+ <VAvatar
+ key="append-avatar"
+ density={ props.density }
+ image={ props.appendAvatar }
+ />
+ )}
+ </>
+ ) : (
<VDefaultsProvider
- key="append"
+ key="append-defaults"
+ disabled={ !hasAppendMedia }
defaults={{
VAvatar: {
density: props.density,
@@ -279,17 +311,9 @@ export const VListItem = genericComponent<VListItemSlots>()({
},
}}
>
- { slots.append(slotProps.value) }
+ { slots.append?.(slotProps.value) }
</VDefaultsProvider>
)}
-
- { props.appendIcon && (
- <VIcon key="append-icon" density={ props.density } icon={ props.appendIcon } />
- )}
-
- { props.appendAvatar && (
- <VAvatar key="append-avatar" density={ props.density } image={ props.appendAvatar } />
- )}
</div>
)}
</Tag>
diff --git a/packages/vuetify/src/components/VSelect/VSelect.tsx b/packages/vuetify/src/components/VSelect/VSelect.tsx
index 5515b404125..d1f1e572393 100644
--- a/packages/vuetify/src/components/VSelect/VSelect.tsx
+++ b/packages/vuetify/src/components/VSelect/VSelect.tsx
@@ -318,31 +318,37 @@ export const VSelect = genericComponent<new <
return (
<div key={ item.value } class="v-select__selection">
{ hasChips ? (
- <VDefaultsProvider
- defaults={{
- VChip: {
- closable: props.closableChips,
- size: 'small',
- text: item.title,
- },
- }}
- >
- { slots.chip
- ? slots.chip({ item, index, props: slotProps })
- : (<VChip { ...slotProps } />)
- }
- </VDefaultsProvider>
+ !slots.chip ? (
+ <VChip
+ key="chip"
+ closable={ props.closableChips }
+ size="small"
+ text={ item.title }
+ { ...slotProps }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="chip-defaults"
+ defaults={{
+ VChip: {
+ closable: props.closableChips,
+ size: 'small',
+ text: item.title,
+ },
+ }}
+ >
+ { slots.chip?.({ item, index, props: slotProps }) }
+ </VDefaultsProvider>
+ )
) : (
- slots.selection
- ? slots.selection({ item, index })
- : (
- <span class="v-select__selection-text">
- { item.title }
- { props.multiple && (index < selections.value.length - 1) && (
- <span class="v-select__selection-comma">,</span>
- )}
- </span>
- )
+ slots.selection?.({ item, index }) ?? (
+ <span class="v-select__selection-text">
+ { item.title }
+ { props.multiple && (index < selections.value.length - 1) && (
+ <span class="v-select__selection-comma">,</span>
+ )}
+ </span>
+ )
)}
</div>
)
diff --git a/packages/vuetify/src/components/VTabs/VTabs.tsx b/packages/vuetify/src/components/VTabs/VTabs.tsx
index e6a474a68af..05b64cdd427 100644
--- a/packages/vuetify/src/components/VTabs/VTabs.tsx
+++ b/packages/vuetify/src/components/VTabs/VTabs.tsx
@@ -2,13 +2,13 @@
import './VTabs.sass'
// Components
+import { VDefaultsProvider } from '@/components/VDefaultsProvider'
import { VSlideGroup } from '@/components/VSlideGroup'
import { VTab } from './VTab'
// Composables
import { makeDensityProps, useDensity } from '@/composables/density'
import { makeTagProps } from '@/composables/tag'
-import { provideDefaults } from '@/composables/defaults'
import { useBackgroundColor } from '@/composables/color'
import { useProxiedModel } from '@/composables/proxiedModel'
@@ -79,17 +79,6 @@ export const VTabs = genericComponent()({
const { densityClasses } = useDensity(props)
const { backgroundColorClasses, backgroundColorStyles } = useBackgroundColor(toRef(props, 'bgColor'))
- provideDefaults({
- VTab: {
- color: toRef(props, 'color'),
- direction: toRef(props, 'direction'),
- stacked: toRef(props, 'stacked'),
- fixed: toRef(props, 'fixedTabs'),
- sliderColor: toRef(props, 'sliderColor'),
- hideSlider: toRef(props, 'hideSlider'),
- },
- })
-
useRender(() => (
<VSlideGroup
v-model={ model.value }
@@ -114,9 +103,35 @@ export const VTabs = genericComponent()({
mandatory={ props.mandatory }
direction={ props.direction }
>
- { slots.default ? slots.default() : parsedItems.value.map(item => (
- <VTab { ...item } key={ item.title } />
- ))}
+ { !slots.default ? (
+ parsedItems.value.map(item => (
+ <VTab
+ key={ item.title }
+ color={ props.color }
+ direction={ props.direction }
+ fixed={ props.fixedTabs }
+ hideSlider={ props.hideSlider }
+ sliderColor={ props.sliderColor }
+ stacked={ props.stacked }
+ { ...item }
+ />
+ ))
+ ) : (
+ <VDefaultsProvider
+ key="tabs-defaults"
+ defaults={{
+ VTab: {
+ color: props.color,
+ direction: props.direction,
+ fixed: props.fixedTabs,
+ hideSlider: props.hideSlider,
+ sliderColor: props.sliderColor,
+ stacked: props.stacked,
+ },
+ }}
+ v-slots:default={ slots.default }
+ />
+ )}
</VSlideGroup>
))
diff --git a/packages/vuetify/src/components/VTimeline/VTimelineDivider.tsx b/packages/vuetify/src/components/VTimeline/VTimelineDivider.tsx
index 3cf79e9beec..7ceaad6bcb9 100644
--- a/packages/vuetify/src/components/VTimeline/VTimelineDivider.tsx
+++ b/packages/vuetify/src/components/VTimeline/VTimelineDivider.tsx
@@ -1,4 +1,5 @@
// Components
+import { VDefaultsProvider } from '@/components/VDefaultsProvider'
import { VIcon } from '@/components/VIcon'
// Composables
@@ -6,7 +7,6 @@ import { IconValue } from '@/composables/icons'
import { makeElevationProps, useElevation } from '@/composables/elevation'
import { makeRoundedProps, useRounded } from '@/composables/rounded'
import { makeSizeProps, useSize } from '@/composables/size'
-import { provideDefaults } from '@/composables/defaults'
import { useBackgroundColor } from '@/composables/color'
// Utilities
@@ -39,14 +39,6 @@ export const VTimelineDivider = genericComponent()({
backgroundColorStyles: lineColorStyles,
} = useBackgroundColor(toRef(props, 'lineColor'))
- provideDefaults({
- VIcon: {
- color: toRef(props, 'iconColor'),
- icon: toRef(props, 'icon'),
- size: toRef(props, 'size'),
- },
- })
-
useRender(() => (
<div
class={[
@@ -83,7 +75,27 @@ export const VTimelineDivider = genericComponent()({
]}
style={ backgroundColorStyles.value }
>
- { slots.default?.() ?? (props.icon ? (<VIcon />) : undefined) }
+ { !slots.default ? (
+ <VIcon
+ key="icon"
+ color={ props.iconColor }
+ icon={ props.icon }
+ size={ props.size }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="icon-defaults"
+ disabled={ !props.icon }
+ defaults={{
+ VIcon: {
+ color: props.iconColor,
+ icon: props.icon,
+ size: props.size,
+ },
+ }}
+ v-slots:default={ slots.default }
+ />
+ )}
</div>
</div>
)}
diff --git a/packages/vuetify/src/components/VToolbar/VToolbar.tsx b/packages/vuetify/src/components/VToolbar/VToolbar.tsx
index 0505e0631ff..9d350449e1a 100644
--- a/packages/vuetify/src/components/VToolbar/VToolbar.tsx
+++ b/packages/vuetify/src/components/VToolbar/VToolbar.tsx
@@ -132,16 +132,25 @@ export const VToolbar = genericComponent<VToolbarSlots>()({
>
{ hasImage && (
<div key="image" class="v-toolbar__image">
- <VDefaultsProvider
- defaults={{
- VImg: {
- cover: true,
- src: props.image,
- },
- }}
- >
- { slots.image ? slots.image?.() : (<VImg />) }
- </VDefaultsProvider>
+ { !slots.image ? (
+ <VImg
+ key="image-img"
+ cover
+ src={ props.image }
+ />
+ ) : (
+ <VDefaultsProvider
+ key="image-defaults"
+ disabled={ !props.image }
+ defaults={{
+ VImg: {
+ cover: true,
+ src: props.image,
+ },
+ }}
+ v-slots:default={ slots.image }
+ />
+ )}
</div>
)}
diff --git a/packages/vuetify/src/composables/defaults.ts b/packages/vuetify/src/composables/defaults.ts
index 5afe9b4d204..4934b7bde36 100644
--- a/packages/vuetify/src/composables/defaults.ts
+++ b/packages/vuetify/src/composables/defaults.ts
@@ -30,6 +30,7 @@ export function useDefaults () {
export function provideDefaults (
defaults?: MaybeRef<DefaultsInstance | undefined>,
options?: {
+ disabled?: MaybeRef<boolean | undefined>
reset?: MaybeRef<number | string | undefined>
root?: MaybeRef<boolean | undefined>
scoped?: MaybeRef<boolean | undefined>
@@ -39,6 +40,10 @@ export function provideDefaults (
const providedDefaults = ref(defaults)
const newDefaults = computed(() => {
+ const disabled = unref(options?.disabled)
+
+ if (disabled) return {}
+
const scoped = unref(options?.scoped)
const reset = unref(options?.reset)
const root = unref(options?.root)
|
32ac0a1f1f20fb9f43a5b72f23e91848ea8c36c3
|
2023-12-01 07:30:54
|
John Leider
|
feat(VImg): add rounded and color support
| false
|
add rounded and color support
|
feat
|
diff --git a/packages/vuetify/src/components/VImg/VImg.sass b/packages/vuetify/src/components/VImg/VImg.sass
index 5842debb773..bc96991c7fa 100644
--- a/packages/vuetify/src/components/VImg/VImg.sass
+++ b/packages/vuetify/src/components/VImg/VImg.sass
@@ -8,6 +8,9 @@
&--booting .v-responsive__sizer
transition: none
+ &--rounded
+ @include tools.rounded($img-rounded-border-radius)
+
.v-img__img,
.v-img__picture,
.v-img__gradient,
diff --git a/packages/vuetify/src/components/VImg/VImg.tsx b/packages/vuetify/src/components/VImg/VImg.tsx
index bc97d4fda37..00e0af5096d 100644
--- a/packages/vuetify/src/components/VImg/VImg.tsx
+++ b/packages/vuetify/src/components/VImg/VImg.tsx
@@ -5,7 +5,9 @@ import './VImg.sass'
import { makeVResponsiveProps, VResponsive } from '@/components/VResponsive/VResponsive'
// Composables
+import { useBackgroundColor } from '@/composables/color'
import { makeComponentProps } from '@/composables/component'
+import { makeRoundedProps, useRounded } from '@/composables/rounded'
import { makeTransitionProps, MaybeTransition } from '@/composables/transition'
// Directives
@@ -18,6 +20,7 @@ import {
onBeforeMount,
ref,
shallowRef,
+ toRef,
vShow,
watch,
withDirectives,
@@ -51,6 +54,7 @@ export type VImgSlots = {
export const makeVImgProps = propsFactory({
alt: String,
cover: Boolean,
+ color: String,
draggable: {
type: [Boolean, String] as PropType<boolean | 'true' | 'false'>,
default: undefined,
@@ -89,6 +93,7 @@ export const makeVImgProps = propsFactory({
...makeVResponsiveProps(),
...makeComponentProps(),
+ ...makeRoundedProps(),
...makeTransitionProps(),
}, 'VImg')
@@ -106,6 +111,9 @@ export const VImg = genericComponent<VImgSlots>()({
},
setup (props, { emit, slots }) {
+ const { backgroundColorClasses, backgroundColorStyles } = useBackgroundColor(toRef(props, 'color'))
+ const { roundedClasses } = useRounded(props)
+
const currentSrc = shallowRef('') // Set from srcset
const image = ref<HTMLImageElement>()
const state = shallowRef<'idle' | 'loading' | 'loaded' | 'error'>(props.eager ? 'loading' : 'idle')
@@ -328,10 +336,13 @@ export const VImg = genericComponent<VImgSlots>()({
class={[
'v-img',
{ 'v-img--booting': !isBooted.value },
+ backgroundColorClasses.value,
+ roundedClasses.value,
props.class,
]}
style={[
{ width: convertToUnit(props.width === 'auto' ? naturalWidth.value : props.width) },
+ backgroundColorStyles.value,
props.style,
]}
{ ...responsiveProps }
diff --git a/packages/vuetify/src/components/VImg/_variables.scss b/packages/vuetify/src/components/VImg/_variables.scss
index fe51e4e0816..88de0f67d15 100644
--- a/packages/vuetify/src/components/VImg/_variables.scss
+++ b/packages/vuetify/src/components/VImg/_variables.scss
@@ -1,3 +1,6 @@
+@use '../../styles/settings';
+
// Defaults
+$img-rounded-border-radius: settings.$border-radius-root !default;
$img-preload-filter: blur(4px) !default;
$img-card-media-height: 200px !default;
|
c71f48cbe926153b73f973a7249b86bcf980c4d4
|
2023-10-10 16:19:07
|
Kael
|
fix(VCombobox): don't allow search to be null
| false
|
don't allow search to be null
|
fix
|
diff --git a/packages/vuetify/src/components/VCombobox/VCombobox.tsx b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
index 445089c8256..21decb7e1ad 100644
--- a/packages/vuetify/src/components/VCombobox/VCombobox.tsx
+++ b/packages/vuetify/src/components/VCombobox/VCombobox.tsx
@@ -150,8 +150,8 @@ export const VCombobox = genericComponent<new <
get: () => {
return _search.value
},
- set: val => {
- _search.value = val
+ set: (val: string | null) => {
+ _search.value = val ?? ''
if (!props.multiple) {
model.value = [transformItem(props, val)]
}
|
a89bd66f925dc7476c83c95889b03ba5f646159b
|
2020-04-10 05:05:01
|
John Leider
|
docs: fix improper markup
| false
|
fix improper markup
|
docs
|
diff --git a/packages/docs/build/pug-to-json.js b/packages/docs/build/pug-to-json.js
index 91c22fda1e2..27817e32324 100644
--- a/packages/docs/build/pug-to-json.js
+++ b/packages/docs/build/pug-to-json.js
@@ -33,7 +33,17 @@ module.exports = function (content) {
const parents = []
walk(ast, node => {
- if (!pageSection || ['h2'].includes(node.name)) {
+ if (!pageSection || [
+ 'h2',
+ 'accessibility',
+ 'api',
+ 'examples',
+ 'parameters',
+ 'supplemental',
+ 'up-next',
+ 'usage',
+ 'usage-new',
+ ].includes(node.name)) {
startSection()
}
switch (node.type) {
diff --git a/packages/docs/src/components/doc/Api.vue b/packages/docs/src/components/doc/Api.vue
index 52a16e9a8b1..a09065f40a2 100644
--- a/packages/docs/src/components/doc/Api.vue
+++ b/packages/docs/src/components/doc/Api.vue
@@ -1,6 +1,6 @@
<template>
- <section>
- <base-heading id="api">{{ computedHeading }}</base-heading>
+ <div>
+ <base-heading>{{ computedHeading }}</base-heading>
<base-markdown>Generic.Pages.apiText</base-markdown>
@@ -8,7 +8,7 @@
:lang="lang"
:value="value"
/>
- </section>
+ </div>
</template>
<script>
diff --git a/packages/docs/src/components/doc/Examples.vue b/packages/docs/src/components/doc/Examples.vue
index 9912f83ec44..c1549ca3d4e 100644
--- a/packages/docs/src/components/doc/Examples.vue
+++ b/packages/docs/src/components/doc/Examples.vue
@@ -1,6 +1,6 @@
<template>
- <section>
- <base-heading id="examples">Generic.Pages.examples</base-heading>
+ <div>
+ <base-heading>Generic.Pages.examples</base-heading>
<base-markdown>Generic.Pages.examplesText</base-markdown>
@@ -23,7 +23,7 @@
:key="`ad-${i}`"
/>
</section>
- </section>
+ </div>
</template>
<script>
diff --git a/packages/docs/src/components/doc/UpNext.vue b/packages/docs/src/components/doc/UpNext.vue
index 9df9c9089fb..9125f7b6427 100644
--- a/packages/docs/src/components/doc/UpNext.vue
+++ b/packages/docs/src/components/doc/UpNext.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <base-heading id="up-next">Generic.Pages.upNext</base-heading>
+ <base-heading>Generic.Pages.upNext</base-heading>
<base-markdown>Generic.Pages.upNextText</base-markdown>
diff --git a/packages/docs/src/components/doc/UpNextHeading.vue b/packages/docs/src/components/doc/UpNextHeading.vue
new file mode 100644
index 00000000000..88bca776999
--- /dev/null
+++ b/packages/docs/src/components/doc/UpNextHeading.vue
@@ -0,0 +1,9 @@
+<template>
+ <base-heading id="up-next">Generic.Pages.upNext</base-heading>
+</template>
+
+<script>
+ export default {
+ name: 'UpNextHeading',
+ }
+</script>
diff --git a/packages/docs/src/components/doc/Usage.vue b/packages/docs/src/components/doc/Usage.vue
index aa10274d496..9e39a8cb196 100644
--- a/packages/docs/src/components/doc/Usage.vue
+++ b/packages/docs/src/components/doc/Usage.vue
@@ -1,13 +1,15 @@
<template>
- <section>
- <base-heading id="usage">Generic.Pages.usage</base-heading>
+ <div>
+ <base-heading>Generic.Pages.usage</base-heading>
+
<doc-text>{{ `${namespace}.${page}.examples.${internalValue.file}.desc` }}</doc-text>
+
<doc-example
:id="`usage-${-1}`"
:value="internalValue"
eager
/>
- </section>
+ </div>
</template>
<script>
diff --git a/packages/docs/src/components/doc/UsageNew.vue b/packages/docs/src/components/doc/UsageNew.vue
index fd090292016..e58ecbd07fe 100644
--- a/packages/docs/src/components/doc/UsageNew.vue
+++ b/packages/docs/src/components/doc/UsageNew.vue
@@ -1,6 +1,6 @@
<template>
- <section>
- <base-heading id="usage">Generic.Pages.usage</base-heading>
+ <div>
+ <base-heading>Generic.Pages.usage</base-heading>
<doc-text>{{ `${namespace}.${page}.usageText` }}</doc-text>
@@ -9,7 +9,7 @@
:value="value"
eager
/>
- </section>
+ </div>
</template>
<script>
|
e60e5a99261b062aa16a3f4e5e398d94ab49aa70
|
2022-06-15 18:43:56
|
Kareem Dabbeet
|
docs(flex): switch examples to plain markup (#14559)
| false
|
switch examples to plain markup (#14559)
|
docs
|
diff --git a/packages/docs/src/examples/flex/flex-align-self.vue b/packages/docs/src/examples/flex/flex-align-self.vue
index ff9f8eea557..7d5d6db90dc 100644
--- a/packages/docs/src/examples/flex/flex-align-self.vue
+++ b/packages/docs/src/examples/flex/flex-align-self.vue
@@ -1,39 +1,87 @@
<template>
<div>
- <v-card
- v-for="j in justify"
- :key="j"
- class="d-flex mb-6"
- color="grey lighten-2"
- flat
- height="100"
- tile
- >
- <v-card
- v-for="n in 3"
- :key="n"
- class="pa-2"
- :class="[n === 2 && `align-self-${j}`]"
- outlined
- tile
- >
- {{ n === 2 ? 'Aligned flex item' : 'Flex item' }}
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat height="100" tile>
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+
+ <v-card class="pa-2 align-self-start" outlined tile>
+ Aligned start
+ </v-card>
+
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+ </v-card>
+
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat height="100" tile>
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+
+ <v-card class="pa-2 align-self-center" outlined tile>
+ Aligned center
+ </v-card>
+
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+ </v-card>
+
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat height="100" tile>
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+
+ <v-card class="pa-2 align-self-end" outlined tile>
+ Aligned end
+ </v-card>
+
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+ </v-card>
+
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat height="100" tile>
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+
+ <v-card class="pa-2 align-self-baseline" outlined tile>
+ Aligned baseline
+ </v-card>
+
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+ </v-card>
+
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat height="100" tile>
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+
+ <v-card class="pa-2 align-self-auto" outlined tile>
+ Aligned auto
+ </v-card>
+
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+ </v-card>
+
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat height="100" tile>
+ <v-card class="pa-2" outlined tile>
+ flex item
+ </v-card>
+
+ <v-card class="pa-2 align-self-stretch" outlined tile>
+ Aligned stretch
+ </v-card>
+
+ <v-card class="pa-2" outlined tile>
+ flex item
</v-card>
</v-card>
</div>
</template>
-
-<script>
- export default {
- data: () => ({
- justify: [
- 'start',
- 'end',
- 'center',
- 'baseline',
- 'auto',
- 'stretch',
- ],
- }),
- }
-</script>
diff --git a/packages/docs/src/examples/flex/flex-order.vue b/packages/docs/src/examples/flex/flex-order.vue
index d04da7a8240..fc5bc23bade 100644
--- a/packages/docs/src/examples/flex/flex-order.vue
+++ b/packages/docs/src/examples/flex/flex-order.vue
@@ -1,32 +1,11 @@
<template>
<div>
- <v-card
- class="d-flex flex-wrap-reverse"
- color="grey lighten-2"
- flat
- tile
- >
- <v-card
- class="order-3 pa-2"
- outlined
- tile
- >
- First flex item
- </v-card>
- <v-card
- class="order-2 pa-2"
- outlined
- tile
- >
- Second flex item
- </v-card>
- <v-card
- class="order-1 pa-2"
- outlined
- tile
- >
- Third flex item
- </v-card>
+ <v-card class="d-flex flex-wrap-reverse" color="grey lighten-2" flat tile>
+ <v-card class="order-3 pa-2" outlined tile> First flex item </v-card>
+
+ <v-card class="order-2 pa-2" outlined tile> Second flex item </v-card>
+
+ <v-card class="order-1 pa-2" outlined tile> Third flex item </v-card>
</v-card>
</div>
</template>
diff --git a/packages/docs/src/examples/flex/margins-align-items.vue b/packages/docs/src/examples/flex/margins-align-items.vue
index ebf31ca8819..6130fc01728 100644
--- a/packages/docs/src/examples/flex/margins-align-items.vue
+++ b/packages/docs/src/examples/flex/margins-align-items.vue
@@ -7,17 +7,13 @@
tile
height="200"
>
- <v-card
- v-for="n in 3"
- :key="n"
- :class="n === 1 && 'mb-auto'"
- class="pa-2"
- outlined
- tile
- >
- Flex item
- </v-card>
+ <v-card class="pa-2 mb-auto" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
</v-card>
+
<v-card
class="d-flex align-end flex-column"
color="grey lighten-2"
@@ -25,16 +21,11 @@
tile
height="200"
>
- <v-card
- v-for="n in 3"
- :key="n"
- :class="n === 3 && 'mt-auto'"
- class="pa-2"
- outlined
- tile
- >
- Flex item
- </v-card>
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2 mt-auto" outlined tile> Flex item </v-card>
</v-card>
</div>
</template>
diff --git a/packages/docs/src/examples/flex/margins.vue b/packages/docs/src/examples/flex/margins.vue
index 3023e5659cc..eb2f8ab5bb6 100644
--- a/packages/docs/src/examples/flex/margins.vue
+++ b/packages/docs/src/examples/flex/margins.vue
@@ -1,56 +1,25 @@
<template>
<div>
- <v-card
- class="d-flex mb-6"
- color="grey lighten-2"
- flat
- tile
- >
- <v-card
- v-for="n in 3"
- :key="n"
- class="pa-2"
- outlined
- tile
- >
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat tile>
+ <v-card v-for="n in 3" :key="n" class="pa-2" outlined tile>
Flex item
</v-card>
</v-card>
- <v-card
- class="d-flex mb-6"
- color="grey lighten-2"
- flat
- tile
- >
- <v-card
- v-for="n in 3"
- :key="n"
- :class="n === 1 && 'mr-auto'"
- class="pa-2"
- outlined
- tile
- >
- Flex item
- </v-card>
+ <v-card class="d-flex mb-6" color="grey lighten-2" flat tile>
+ <v-card class="pa-2 mr-auto" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
</v-card>
- <v-card
- class="d-flex mb-6"
- color="grey lighten-2"
- flat
- tile
- >
- <v-card
- v-for="n in 3"
- :key="n"
- :class="n === 3 && 'ml-auto'"
- class="pa-2"
- outlined
- tile
- >
- Flex item
- </v-card>
+ <v-card class="d-flex" color="grey lighten-2" flat tile>
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2" outlined tile> Flex item </v-card>
+
+ <v-card class="pa-2 ml-auto" outlined tile> Flex item </v-card>
</v-card>
</div>
</template>
|
d7d77a3aef1d5e6699a4fdd797e3c3052b2954a6
|
2020-10-08 16:51:20
|
Kael
|
fix(VTextField): show label slot when filled prop is used (#12371)
| false
|
show label slot when filled prop is used (#12371)
|
fix
|
diff --git a/packages/vuetify/src/components/VTextField/VTextField.ts b/packages/vuetify/src/components/VTextField/VTextField.ts
index 57b10aa726e..7de7a26ee8d 100644
--- a/packages/vuetify/src/components/VTextField/VTextField.ts
+++ b/packages/vuetify/src/components/VTextField/VTextField.ts
@@ -196,7 +196,7 @@ export default baseMixins.extend<options>().extend({
},
watch: {
- labelValue: 'setLabelWidth',
+ // labelValue: 'setLabelWidth', // moved to mounted, see #11533
outlined: 'setLabelWidth',
label () {
this.$nextTick(this.setLabelWidth)
@@ -228,6 +228,9 @@ export default baseMixins.extend<options>().extend({
},
mounted () {
+ // #11533
+ this.$watch(() => this.labelValue, this.setLabelWidth)
+
this.autofocus && this.tryAutofocus()
requestAnimationFrame(() => (this.isBooted = true))
|
a1f50eec6390d8455446ec55458cc08bd46f0669
|
2019-07-20 00:06:04
|
John Leider
|
docs(VAppBar): fix examples
| false
|
fix examples
|
docs
|
diff --git a/packages/docs/src/examples/app-bars/complex/img-fade.vue b/packages/docs/src/examples/app-bars/complex/img-fade.vue
index 1f3b2283664..93e5e6e8d6c 100644
--- a/packages/docs/src/examples/app-bars/complex/img-fade.vue
+++ b/packages/docs/src/examples/app-bars/complex/img-fade.vue
@@ -36,7 +36,10 @@
</v-btn>
<template v-slot:extension>
- <v-tabs align-with-title>
+ <v-tabs
+ align-with-title
+ background-color="transparent"
+ >
<v-tab>Tab 1</v-tab>
<v-tab>Tab 2</v-tab>
<v-tab>Tab 3</v-tab>
diff --git a/packages/docs/src/examples/app-bars/complex/menu.vue b/packages/docs/src/examples/app-bars/complex/menu.vue
index 5d5f8755396..e66e3743170 100644
--- a/packages/docs/src/examples/app-bars/complex/menu.vue
+++ b/packages/docs/src/examples/app-bars/complex/menu.vue
@@ -31,9 +31,16 @@
<v-icon>favorite</v-icon>
</v-btn>
- <v-menu bottom left>
+ <v-menu
+ bottom
+ left
+ >
<template v-slot:activator="{ on }">
- <v-btn icon color="yellow" v-on="on">
+ <v-btn
+ icon
+ color="yellow"
+ v-on="on"
+ >
<v-icon>more_vert</v-icon>
</v-btn>
</template>
@@ -49,7 +56,10 @@
</v-menu>
<template v-slot:extension>
- <v-tabs align-with-title>
+ <v-tabs
+ align-with-title
+ background-color="transparent"
+ >
<v-tab>Tab 1</v-tab>
<v-tab>Tab 2</v-tab>
<v-tab>Tab 3</v-tab>
|
b44e5b49c6050f6d6d32529f4707661b4d84640c
|
2017-12-30 08:51:01
|
John Leider
|
fix(v-select): fixed menu positioning when filtering
| false
|
fixed menu positioning when filtering
|
fix
|
diff --git a/src/mixins/menuable.js b/src/mixins/menuable.js
index bbfb2c3b35d..6e5e99808cc 100644
--- a/src/mixins/menuable.js
+++ b/src/mixins/menuable.js
@@ -217,7 +217,6 @@ export default {
return top < 12 ? 12 : top
},
callActivate () {
- this.checkForWindow()
if (!this.hasWindow) return
this.activate()
@@ -306,6 +305,8 @@ export default {
return el.style.display !== 'none'
},
updateDimensions () {
+ this.checkForWindow()
+
const dimensions = {}
// Activator should already be shown
|
247de3457442eca6b4cd98b38ef4abee3e367fe2
|
2018-04-05 08:09:27
|
John Leider
|
feat(v-label): added left prop
| false
|
added left prop
|
feat
|
diff --git a/src/components/VLabel/VLabel.js b/src/components/VLabel/VLabel.js
index ba22f9bc259..df380581333 100755
--- a/src/components/VLabel/VLabel.js
+++ b/src/components/VLabel/VLabel.js
@@ -17,6 +17,10 @@ export default {
},
focused: Boolean,
for: String,
+ left: {
+ type: [Number, String],
+ default: 0
+ },
value: Boolean
},
@@ -30,6 +34,7 @@ export default {
for: props.for
},
style: {
+ left: `${parseInt(props.left)}px`,
position: props.absolute ? 'absolute' : 'relative'
}
}
|
21329126116353421b694b999a604630aca15877
|
2022-03-18 00:26:33
|
John Leider
|
docs(installation): update for beta
| false
|
update for beta
|
docs
|
diff --git a/packages/docs/src/pages/en/getting-started/installation.md b/packages/docs/src/pages/en/getting-started/installation.md
index e4a24fd2aae..3b69ddc6c99 100644
--- a/packages/docs/src/pages/en/getting-started/installation.md
+++ b/packages/docs/src/pages/en/getting-started/installation.md
@@ -1,54 +1,61 @@
---
nav: Installation
meta:
- title: Get started with Vuetify 3 Alpha
- description: Details for v3 alpha release - faq, changes, and upgrading.
- keywords: migration, releases, upgrading vuetify, alpha, v3
+ title: Get started with Vuetify 3 Beta
+ description: Details for v3 beta release - faq, changes, and upgrading.
+ keywords: migration, releases, upgrading vuetify, beta, v3
related:
- /getting-started/contributing/
- /introduction/roadmap/
- /getting-started/release-notes/
---
-# Vuetify 3 Alpha
+# Vuetify 3 Beta
-Vuetify 3 Alpha is here! Below is a collection of information to help you get started and answer some frequently asked questions regarding the alpha.
+Welcome to the Vuetify 3 Beta release. To get started, select an installation method below or review some of the most [Frequently Asked Questions](#frequently-asked-questions)
<alert type="error">
- Before proceeding, it is important to note that this installation is intended primarily for testing purposes, and should not be considered for production applications.
+ The Vuetify 3 Beta is for testing purposes only and is not intended for production applications.
</alert>
## Installation
-Installation of the alpha is limited to new cli projects at this time and intended primarily for testing. If you have any questions or run into issues, please reach out to our [Discord community](https://community.vuetifyjs.com/).
-
### vue-cli
-In order for the installation to proceed correctly, **vue-cli 5.0** is required. Further instructions are available at [vue-cli](https://github.com/vuejs/vue-cli).
+<alert type="warning">
+
+ Vuetify 3 requires **vue-cli 5.0** in order to install properly. For more information, visit the vue-cli [installation guide](https://cli.vuejs.org/guide/installation.html).
-Once installed, generate a project with the following command using the **vue-cli 5.0**:
+</alert>
+
+Generate a new Vue 3 application by entering the following command into your terminal:
```bash
-vue create my-app
+vue create my-beta-app
```
-When prompted, choose **Vue 3** (possibly **Vue 3 Preview** depending on the exact version of vue-cli):
+When prompted, select the **Vue 3 Preview** preset:
```bash
-? Please pick a preset: (Use arrow keys)
+? Please pick a preset:
Default ([Vue 2] babel, eslint)
- ❯ Default (Vue 3) ([Vue 3] babel, eslint)
+ ❯ Default (Vue 3 Preview) ([Vue 3] babel, eslint)
Manually select features
```
-It is recommended to commit or stash your changes at this point, in case you need to rollback the changes.
+After choosing your option, **vue-cli** generates a new Vue 3 project located in the **my-beta-app** folder; or whatever name you provided. Once complete, navigate to your new project's folder by typing `cd my-beta-app`.
+
+<alert type="info">
+
+ Before installing Vuetify, we **recommend** a pristine `.git` status. This allows you to rollback changes if you encounter an issue.
+
+</alert>
-Next, navigate to your project directory and add Vuetify to your project:
+Using **vue-cli**, add the `vuetify` cli package by running the following command:
```bash
-cd my-app
vue add vuetify
```
@@ -69,19 +76,18 @@ Installing Vuetify 3 using vite can be done using [vue-cli](#vue-cli). To start,
```bash
# npm 6.x
-npm init @vitejs/app my-app --template vue
+npm init @vitejs/app my-beta-app --template vue
# npm 7+, extra double-dash is needed:
-npm init @vitejs/app my-app -- --template vue
+npm init @vitejs/app my-beta-app -- --template vue
# yarn
-yarn create @vitejs/app my-app --template vue
+yarn create @vitejs/app my-beta-app --template vue
```
-Next, navigate to your project directory and add Vuetify to your project:
+Next, navigate to your project directory by typing `cd my-beta-app` in your terminal; then add Vuetify to your project using the following:
```bash
-cd my-app
vue add vuetify
```
@@ -130,7 +136,7 @@ const vuetify = createVuetify({
### Table of Contents
-- [What is included in the Alpha?](#included)
+- [What is included in the Beta?](#included)
- [When will Vuetify 3 be released?](#version-3)
- [Can I use it with Vite?](#use-vite)
@@ -140,13 +146,13 @@ Have a question that belongs here? Tell us in our [Discord Community](https://co
---
-- **What is included in the alpha?** { #included }
+- **What is included in the Beta?** { #included }
- Currently most base functionality of Vuetify is included in the alpha. This includes core services such as theme, configuration, and layout. A small subset of base components are also included such as grid system, sheets, and buttons. For full list of available components, visit the **UI Component** and **API** sections.
+ Currently most base functionality of Vuetify is included in the beta. This includes core services such as theme, configuration, and layout. A small subset of base components are also included such as grid system, sheets, and buttons. For full list of available components, visit the **UI Component** and **API** sections.
- **When will Vuetify 3 be released?** { #version-3 }
- Version 3 is currently under development - Alpha is the first step toward this. Follow our progress via our project on [Github](https://github.com/orgs/vuetifyjs/projects/7) or read an overview of what's to come on our [Roadmap](/introduction/roadmap/).
+ Beta could take upwards of 2 months. Immediately following is a Release Candidate and then final release. Follow our progress via our project on [Github](https://github.com/orgs/vuetifyjs/projects/7) or read an overview of what's to come on our [Roadmap](/introduction/roadmap/).
- **Can I use it with Vite?** { #use-vite }
@@ -154,9 +160,9 @@ Have a question that belongs here? Tell us in our [Discord Community](https://co
## How to report an issue or bug
-For bugs related to the Alpha, please create an issue via our [Issue Generator](https://issues.vuetifyjs.com/) using the following [Reproduction Template](https://v3-template.vuetifyjs.com/). At this time we are only accepting bugs for the following:
+For bugs related to the Beta, please create an issue via our [Issue Generator](https://issues.vuetifyjs.com/) using the following [Reproduction Template](https://v3-template.vuetifyjs.com/). At this time we are only accepting bugs for the following:
-- Vuetify components and functions available in the Alpha
+- Vuetify components and functions available in the Beta
- Documentation content
<alert type="info">
|
c8cf57c4ebd702064613f51253721f4fe8145351
|
2019-07-02 06:28:30
|
Dmitry Sharshakov
|
docs(VBottomNavigation): api update for 2.0 (#7716)
| false
|
api update for 2.0 (#7716)
|
docs
|
diff --git a/packages/api-generator/src/maps/v-bottom-navigation.js b/packages/api-generator/src/maps/v-bottom-navigation.js
index 7da28429365..b945521a619 100644
--- a/packages/api-generator/src/maps/v-bottom-navigation.js
+++ b/packages/api-generator/src/maps/v-bottom-navigation.js
@@ -3,8 +3,8 @@ module.exports = {
slots: ['default'],
events: [
{
- name: 'input',
- value: 'boolean',
+ name: 'change',
+ value: 'any',
},
{
name: 'update:inputValue',
diff --git a/packages/docs/src/lang/en/components/BottomNavigation.json b/packages/docs/src/lang/en/components/BottomNavigation.json
index 3467e0fb43a..62a5a3ce924 100644
--- a/packages/docs/src/lang/en/components/BottomNavigation.json
+++ b/packages/docs/src/lang/en/components/BottomNavigation.json
@@ -37,6 +37,7 @@
"props": {
"absolute": "Mixins.Positionable.props.absolute",
"activeClass": "Components.ItemGroups.props.activeClass",
+ "backgroundColor": "Background color for component",
"fixed": "Mixins.Positionable.props.fixed",
"grow": "Force `v-btn`s to take up all available space",
"hideOnScroll": "Will transition the navigation off screen when scrolling up",
@@ -45,6 +46,7 @@
"mandatory": "Components.ItemGroups.props.mandatory"
},
"events": {
+ "change": "The value of selected item",
"update:inputValue": "The event used for `input-value.sync`"
}
}
diff --git a/packages/vuetify/src/components/VBottomNavigation/VBottomNavigation.ts b/packages/vuetify/src/components/VBottomNavigation/VBottomNavigation.ts
index a489f79f138..c9b6ef2f77b 100644
--- a/packages/vuetify/src/components/VBottomNavigation/VBottomNavigation.ts
+++ b/packages/vuetify/src/components/VBottomNavigation/VBottomNavigation.ts
@@ -40,18 +40,18 @@ export default mixins(
},
backgroundColor: String,
grow: Boolean,
- hideOnScroll: Boolean,
- horizontal: Boolean,
- mandatory: Boolean,
height: {
type: [Number, String],
default: 56,
},
- shift: Boolean,
+ hideOnScroll: Boolean,
+ horizontal: Boolean,
inputValue: {
type: Boolean,
default: true,
},
+ mandatory: Boolean,
+ shift: Boolean,
},
data () {
|
b2a7a02d7f366111ec578a2025a2c4acafb844ca
|
2018-03-09 13:17:11
|
Kael
|
refactor(theme): use metaInfo() and nuxt() instead of hacking $options (#3488)
| false
|
use metaInfo() and nuxt() instead of hacking $options (#3488)
|
refactor
|
diff --git a/src/components/VApp/mixins/app-theme.js b/src/components/VApp/mixins/app-theme.js
index e92c074c0e0..9a4ce972155 100644
--- a/src/components/VApp/mixins/app-theme.js
+++ b/src/components/VApp/mixins/app-theme.js
@@ -42,33 +42,38 @@ export default {
}
return css
+ },
+ vueMeta () {
+ return {
+ style: [{
+ cssText: this.generatedStyles,
+ type: 'text/css',
+ id: 'vuetify-theme-stylesheet'
+ }]
+ }
}
},
+ // Regular vue-meta
+ metaInfo () {
+ return this.vueMeta
+ },
+
+ // Nuxt
+ head () {
+ return this.vueMeta
+ },
+
watch: {
generatedStyles () {
!this.meta && this.applyTheme()
}
},
- beforeCreate () {
- if (this.$meta) {
- // Vue-meta
- const keyName = this.$nuxt ? 'head' : 'metaInfo'
- this.$options[keyName] = () => ({
- style: [{
- cssText: this.generatedStyles,
- type: 'text/css',
- id: 'vuetify-theme-stylesheet'
- }]
- })
- }
- },
-
created () {
if (this.$meta) {
// Vue-meta
- // Handled by beforeCreate hook
+ // Handled by metaInfo()/nuxt()
} else if (typeof document === 'undefined' && this.$ssrContext) {
// SSR
this.$ssrContext.head = this.$ssrContext.head || ''
|
43984945c061dc102b097eebed19ccbb5c03bbfd
|
2018-10-28 15:16:31
|
John Leider
|
feat($home-page): changed layout
| false
|
changed layout
|
feat
|
diff --git a/packages/vuetifyjs.com/components/misc/HomeFooter.vue b/packages/vuetifyjs.com/components/misc/HomeFooter.vue
deleted file mode 100644
index b7dabe0debb..00000000000
--- a/packages/vuetifyjs.com/components/misc/HomeFooter.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template lang="pug">
- v-footer#home-footer
- v-layout(row wrap).ma-0
- v-flex(xs12 sm6 md3).px-5.blue-grey.darken-2.vuetify
- h5.mb-3
- img(src="/static/doc-images/logo.svg")
- span Vuetify
- ul
- li
- router-link(:to="{ name: 'getting-started/QuickStart' }")
- v-icon.hidden-sm-only(dark) fa-book
- span.hidden-sm-only Documentation
- span.hidden-md-and-up.hidden-xs-only Docs
- li
- a(href="https://github.com/vuetifyjs/vuetify" target="_blank")
- v-icon.hidden-sm-only(dark) fa-github
- | GitHub
- li
- a(href="https://twitter.com/vuetifyjs" target="_blank")
- v-icon.hidden-sm-only(dark) fa-twitter
- | Twitter
- li
- a(href="https://www.facebook.com/vuetifyjs" target="_blank")
- v-icon.hidden-sm-only(dark) fa-facebook
- | Facebook
-
- v-flex(xs12 sm6 md3).blue-grey.darken-3
- h5.title.mb-3 Donate
- ul
- li
- a(href="https://www.patreon.com/vuetify" target="_blank") Patreon
- li
- a(href="https://www.paypal.me/vuetify" target="_blank") PayPal
-
- v-flex(xs12 sm6 md3).blue-grey.darken-3
- h5.title.mb-3 Sponsors
- ul
- li
- a(href="https://www.cloudflare.com/" target="_blank") CloudFlare
-
- v-flex(xs12 sm6 md3).blue-grey.darken-3
- h5.title.mb-3 Links
- ul
- li
- a( href="https://vuejs.org/" target="_blank") Vue.js
- li
- a( href="https://material.io/guidelines/" target="_blank") Material Design
-
- v-flex(xs12).blue-grey.darken-4.text-xs-center.pa-3
- span © {{ new Date().getFullYear() }} Vuetify LLC. Distributed under the
- a(
- href="https://opensource.org/licenses/MIT"
- target="_blank"
- ) MIT License.
-</template>
-
-<script>
- export default {
- name: 'HomeFooter'
- }
-</script>
diff --git a/packages/vuetifyjs.com/components/misc/index.js b/packages/vuetifyjs.com/components/misc/index.js
index d03fb429a45..39884f4b878 100644
--- a/packages/vuetifyjs.com/components/misc/index.js
+++ b/packages/vuetifyjs.com/components/misc/index.js
@@ -1,6 +1,5 @@
import CtaBtn from './CtaBtn'
import Grid from './Grid'
-import HomeFooter from './HomeFooter'
import MaskTable from './MaskTable'
import PatreonBtn from './PatreonBtn'
import SupportVuetify from './SupportVuetify'
@@ -9,7 +8,6 @@ import TemplateList from './TemplateList'
export default {
CtaBtn,
Grid,
- HomeFooter,
MaskTable,
PatreonBtn,
SupportVuetify,
diff --git a/packages/vuetifyjs.com/lang/en/vuetify/Home.js b/packages/vuetifyjs.com/lang/en/vuetify/Home.js
index 7a4e1c32089..0a341e89fe6 100644
--- a/packages/vuetifyjs.com/lang/en/vuetify/Home.js
+++ b/packages/vuetifyjs.com/lang/en/vuetify/Home.js
@@ -34,6 +34,7 @@ export default {
'Transition Components',
'Blazing Fast'
],
+ componentFramework: 'Component Framework',
letterFromAuthor: [
'Hey there,',
'I know choosing a UI framework can be a daunting task -- there are so many options to choose from and every one of them claims that they are the best. So you have to decide for yourself: what are the metrics for success?',
@@ -48,5 +49,8 @@ export default {
},
becomeSponsor: 'Become a Sponsor',
proudlySponsoredBy: 'Patreon Sponsors',
- callout: 'Supercharge your development with the power of Vue and Material Design'
+ callout: 'Supercharge your Development',
+ madeWithVuetify: 'Projects Made With Vuetify',
+ materialDesign: 'Material Design',
+ mit: 'MIT License'
}
diff --git a/packages/vuetifyjs.com/pages/HomePage.vue b/packages/vuetifyjs.com/pages/HomePage.vue
index 47729557df7..9222c52e661 100755
--- a/packages/vuetifyjs.com/pages/HomePage.vue
+++ b/packages/vuetifyjs.com/pages/HomePage.vue
@@ -1,164 +1,211 @@
<template lang="pug">
div#home
v-jumbotron(
+ dark
gradient="to bottom, #1867c0, #5CBBF6"
height="auto"
- dark
)
- v-container(fill-height)
- v-layout(align-center wrap).text-xs-center
- v-flex(xs12)
- img(
- src="/static/vuetify-logo-300.png"
- alt="Logo"
- width="196px"
- height="196px"
+ v-container(fill-height).mt-5.mb-3
+ v-layout(
+ align-center
+ justify-center
+ wrap
+ )
+ img(
+ src="/static/vuetify-logo-300.png"
+ alt="Logo"
+ height="256px"
+ width="256px"
+ :class="{ 'mr-5': $vuetify.breakpoint.mdAndUp }"
+ )
+ div.text-xs-center.text-md-left
+ h1(
+ class="mb-4"
+ :class="[$vuetify.breakpoint.mdAndUp ? 'display-3' : 'display-1']"
+ style="font-weight: 300;"
)
- h1.display-3 {{ $t("Vuetify.Home.heading1") }}
- div.headline.mb-3 {{ $t("Vuetify.Home.heading1cont") }}
- div.mb-5
- v-btn(
- icon
- color="white"
- v-for="(social, i) in socials"
- :key="i"
- :href="social.href"
- target="_blank"
- rel="noopener"
- ).mx-3
- v-icon(color="primary") {{ social.icon }}
+ div(v-text="$t('Vuetify.Home.materialDesign')")
+ div(v-text="$t('Vuetify.Home.componentFramework')")
v-btn(
- color="white"
- class="primary--text"
:to="{ name: 'getting-started/QuickStart' }"
+ class="primary--text"
+ color="white"
large
- ).mb-2
- strong {{ $t("Vuetify.Home.getStarted") }}
- div version {{ $store.state.currentVersion }}
+ style="min-width: 128px;"
+ )
+ | {{ $t("Vuetify.Home.getStarted") }}
+ v-btn(
+ color="white"
+ href="https://github.com/vuetifyjs/vuetify"
+ large
+ outline
+ rel="noopener"
+ target="_blank"
+ )
+ v-icon(left) mdi-github-circle
+ | Github
- section#features
- v-container
- v-layout(row wrap)
+ v-container(grid-list-xl).mb-5
+ v-layout(row wrap justify-center)
v-flex(
- xs12 sm12 md4 lg4
+ xs12 sm6 md4 lg4
v-for="(feature, i) in features"
:key="i"
)
-
- img(:src="feature.img")
- h3(v-text="feature.title").mb-4
- p(v-text="feature.text").text-xs-justify
-
- section#checkFeatures
+ v-card(light).elevation-24.hide-overflow
+ img(
+ :src="feature.img"
+ width="100%"
+ ).mb-3
+ v-card-text
+ h3(
+ v-text="feature.title"
+ style="font-size: 18px; font-weight: 500;"
+ ).mb-3.text-xs-center
+ p(v-text="feature.text").text-xs-center
+
+ section#sponsors-and-backers.my-5
v-container
- h2.text-xs-center
+ v-layout
+ v-flex(xs12)
+ h2(v-text="$t('Vuetify.Home.proudlySponsoredBy')").text-xs-center.headline.mb-3.grey--text
+ v-layout(row wrap justify-center align-center)
+ template(v-for="(supporter, i) in supporters")
+ v-flex(
+ xs12
+ v-if="supporter.break"
+ :key="i"
+ )
+ a(
+ target="_blank"
+ rel="noopener"
+ class="ma-3"
+ :href="`${supporter.href}?ref=vuetifyjs.com`"
+ :title="supporter.title"
+ :key="i"
+ @click="$ga.event('home sponsor click', 'click', supporter.title)"
+ v-else
+ )
+ img(
+ :src="`/static/doc-images/${supporter.src}`"
+ :height="supporter.size || 'auto'"
+ :style="{ maxHeight: `${supporter.size}px` }"
+ )
+ v-flex(xs12).text-xs-center.mt-3
+ v-btn(
+ :to="{ name: 'getting-started/SponsorsAndBackers' }"
+ color="primary"
+ large
+ outline
+ ) {{ $t("Vuetify.Home.becomeSponsor") }}
+ v-icon(right color="primary") chevron_right
+
+ section#checked-features.mb-5
+ v-container
+ h2.text-xs-center.headline.mb-5.grey--text
span {{ $t("Vuetify.Home.checkFeaturesTitle") }}
| {{ $t("Vuetify.Home.checkFeaturesTitleCtd") }}
v-layout(row wrap justify-center)
v-flex(
- xs12
- md5
- lg5
- xl3
- offset-lg1
- :pl-5="$vuetify.breakpoint.smAndDown"
+ mx-3
+ shrink
)
- ul
- li(v-for="(feature, i) in checkFeatures" :key="i") {{feature}}
+ v-layout(
+ v-for="(feature, i) in checkFeatures"
+ :key="i"
+ align-center
+ ).my-2
+ v-icon(
+ color="green"
+ size="36px"
+ ).mr-3 check
+ span.subheading {{ feature }}
v-flex(
- xs12
- md4
- lg4
- xl3
- offset-xl3
- :pl-5="$vuetify.breakpoint.smAndDown"
+ mx-3
+ shrink
)
- ul
- li(v-for="(feature, i) in checkFeaturesCtd" :key="i") {{feature}}
-
- section#letterFromAuthor
- v-container
- v-layout
+ v-layout(
+ v-for="(feature, i) in checkFeaturesCtd"
+ :key="i"
+ align-center
+ ).my-2
+ v-icon(
+ color="green"
+ size="36px"
+ ).mr-3 check
+ span.subheading {{ feature }}
+
+ section#using-vuetify.mb-5
+ v-container(grid-list-xl)
+ h2.text-xs-center.headline.mb-5.grey--text
+ span {{ $t("Vuetify.Home.madeWithVuetify") }}
+ v-layout(wrap)
v-flex(
+ v-for="(feature, i) in computedFeatured"
+ :key="i"
xs12
- xl8
- offset-xl1
+ sm6
+ md4
)
- v-card
- p(v-for="(p, i) in letterFromAuthor" :key="i") {{p}}
- v-flex(xs3 xl2).text-xs-center.hidden-xs-only
- v-avatar
- img(src="/static/doc-images/john.jpg")
- p.john John Leider
- p.authorOfVuetify {{ $t("Vuetify.Home.authorOfVuetify") }}
-
- section#support
- v-container
- v-layout(row wrap)
- v-flex(
- xs6
- offset-xs3
- md3
- offset-md0
- offset-xl1
- ).text-xs-center
- a(
- href="https://www.patreon.com/vuetify"
+ v-card(
+ :href="feature.url"
+ :img="feature.image"
+ height="300px"
target="_blank"
rel="noopener"
- )
- img(src="/static/doc-images/patreon_logo.png" width="75%")
- v-flex(xs12 md9 xl7).mb-5
- p {{ $t("Vuetify.Home.support.hasVuetifyHelped") }}
- p {{ $t("Vuetify.Home.support.showYourSupport") }} <a href="https://www.patreon.com/vuetify" target="_blank">{{ $t("Vuetify.Home.support.becomingAPatron") }}</a>.
-
- section.sponsors-and-backers.my-5
- v-container
- v-card(
- :class="{ 'pa-5': $vuetify.breakpoint.mdAndUp, 'py-5 px-2': $vuetify.breakpoint.smAndDown }"
+ ).elevation-24
+ v-layout(
+ justify-center
+ pt-3
)
- h2.text-xs-center.text-md-left {{ $t("Vuetify.Home.proudlySponsoredBy") }}
- v-layout(row wrap justify-center align-center)
- template(v-for="(supporter, i) in supporters")
- v-flex(
- xs12
- v-if="supporter.break"
- :key="i"
- )
- a(
- target="_blank"
- rel="noopener"
- class="ma-3"
- :href="`${supporter.href}?ref=vuetifyjs.com`"
- :title="supporter.title"
- :key="i"
- @click="$ga.event('home sponsor click', 'click', supporter.title)"
- v-else
- )
- img(
- :src="`/static/doc-images/${supporter.src}`"
- :height="supporter.size || 'auto'"
- :style="{ maxHeight: `${supporter.size}px` }"
- ).supporter
- v-flex(xs12).text-xs-center.mt-5
- v-btn(:to="{ name: 'getting-started/SponsorsAndBackers' }" large).white.primary--text {{ $t("Vuetify.Home.becomeSponsor") }}
- v-icon(right color="primary") chevron_right
-
- section#callout
- v-container
- v-layout(flex xs12 md8 lg10 align-center justify-center mx-auto wrap)
- img(src="/static/v-alt.svg" height="75px")
- h2.mx-4 {{ $t("Vuetify.Home.callout") }}
+ img(
+ src="/static/doc-images/powered-by-madewithvue-1.svg"
+ height="65px"
+ )
- home-footer
+ v-jumbotron(
+ dark
+ gradient="to top, #1867c0, #5CBBF6"
+ height="auto"
+ )
+ v-container.mt-4.mb-3
+ v-layout(row wrap)
+ v-flex(xs12)
+ h5.mb-3
+ v-layout(align-center justify-center column)
+ img(
+ src="/static/v-alt.svg"
+ height="64px"
+ width="64px"
+ ).mb-2
+ span(v-text="$t('Vuetify.Home.callout')").subheading
+
+ v-layout(justify-center).mb-3
+ a(
+ v-for="(social, i) in socials"
+ :href="social.href"
+ :key="i"
+ :title="social.title"
+ target="_blank"
+ rel="noopener"
+ ).social.mx-3
+ v-icon(v-text="social.icon")
+
+ v-layout(column text-xs-center)
+ div Released under the
+ a(
+ href="https://opensource.org/licenses/MIT"
+ rel="noopener"
+ style="text-decoration: none;"
+ target="_blank"
+ v-text="$t('Vuetify.Home.mit')"
+ ).body-2.white--text
+ div Copyright © 2016-{{ (new Date()).getFullYear() }} Vuetify, LLC
</template>
<script>
import supporters from '@/assets/supporters'
- // Components
- import HomeFooter from '@/components/misc/HomeFooter'
-
// Mixins
import Message from '@/mixins/message'
@@ -168,31 +215,37 @@
export default {
name: 'HomePage',
- components: {
- HomeFooter
- },
-
mixins: [Message],
data: () => ({
diamond: supporters.diamond,
+ featured: [],
palladium: supporters.palladium,
socials: [
{
- icon: 'fa-github',
- href: 'https://github.com/vuetifyjs/vuetify'
+ icon: 'mdi-reddit',
+ href: 'https://www.reddit.com/r/vuetifyjs',
+ title: 'Reddit'
},
{
- icon: 'fa-reddit',
- href: 'https://www.reddit.com/r/vuetifyjs/'
+ icon: 'mdi-medium',
+ href: 'https://medium.com/vuetify',
+ title: 'Medium'
},
{
- icon: 'fa-twitter',
- href: 'https://twitter.com/vuetifyjs'
+ icon: 'mdi-github-circle',
+ href: 'https://github.com/vuetifyjs/vuetify',
+ title: 'Github'
},
{
- icon: 'fa-facebook',
- href: 'https://www.facebook.com/vuetifyjs/'
+ icon: 'mdi-twitter',
+ href: 'https://twitter.com/vuetifyjs',
+ title: 'Twitter'
+ },
+ {
+ icon: 'mdi-facebook',
+ href: 'https://www.facebook.com/vuetifyjs',
+ title: 'Facebook'
}
]
}),
@@ -204,8 +257,11 @@
checkFeaturesCtd () {
return this.$t('Vuetify.Home.checkFeaturesCtd')
},
+ computedFeatured () {
+ return this.featured.slice(0, 6)
+ },
features () {
- return this.$t('Vuetify.Home.features')
+ return this.$t('Vuetify.Home.features').reverse()
},
letterFromAuthor () {
return this.$t('Vuetify.Home.letterFromAuthor')
@@ -227,14 +283,57 @@
msg: 'Vuetify is now on Reddit!',
href: 'https://www.reddit.com/r/vuetifyjs/',
text: 'Check it out',
- timeout: 0
+ timeout: 10
+ })
+
+ this.$http({
+ method: 'GET',
+ url: 'https://madewithvuejs.com/api/tag/vuetify',
+ headers: {
+ 'Access-Control-Allow-Origin': '*',
+ 'Content-Type': 'application/json'
+ }
})
+ .then(res => {
+ this.featured = this.setFeatured(res.data)
+ })
+ .catch(err => console.log(err))
},
methods: {
...mapMutations('app', {
snackbar: 'SNACKBAR'
}),
+ setFeatured (data) {
+ if (!data) return []
+
+ const featured = data.data.map(f => {
+ f.hover = false
+
+ return f
+ })
+
+ return this.shuffle(featured)
+ },
+ shuffle (array) {
+ let currentIndex = array.length
+ let temporaryValue
+ let randomIndex
+
+ // While there remain elements to shuffle...
+ while (currentIndex !== 0) {
+ // Pick a remaining element...
+ randomIndex = Math.floor(Math.random() * currentIndex)
+ currentIndex -= 1
+
+ // And swap it with the current element.
+ temporaryValue = array[currentIndex]
+ array[currentIndex] = array[randomIndex]
+ array[randomIndex] = temporaryValue
+ }
+
+ return array
+ },
snackHandler () {
this.$router.push({ name: 'store/Index' })
}
@@ -242,294 +341,7 @@
}
</script>
-<style lang="stylus">
- @import '~vuetify/src/stylus/settings/_variables'
-
- #home
- background white
- color #455163
-
- #features
- padding 5vh 0 0
- margin 5vh 0 0
-
- .layout
- margin 0 -1em
- .flex
- padding-left: 1em
- padding-right: 1em
- margin-bottom: 4em
- text-align: center
- &:last-child
- margin-bottom 0
- img
- box-shadow: 0 1px 3px rgba(0,0,0,0.18) !important;
- max-width 75%
- margin-bottom 1.75em
- h3
- font-size 21px
- color #455163
- line-height 1.2em
- font-weight 400
- p
- font-size 18px
- line-height 1.5em
- font-weight 300
- color #455163
-
- @media $display-breakpoints.md-and-up
- .layout
- .flex
- margin-bottom: 0
- text-align left
- img
- max-width 90%
-
- @media $display-breakpoints.xl-only
- .layout
- margin 0 -1.5em
- .flex
- padding-left: 1.5em
- padding-right: 1.5em
- h3
- font-size 24px
- p
- font-size 21px
- img
- max-width 75%
-
- #checkFeatures
- padding 8em 0
- h2
- font-size 42px
- font-weight 400
- margin-bottom .75em
- display block
- line-height 1.2em
- span
- font-size 36px
- font-weight 300
- display block
- ul
- list-style: none;
- li
- &::before
- content: '✓'
- position relative
- left: -10px
- color: #00c100
- font-size 21px
- margin-bottom .5em
- font-weight 300
-
- @media $display-breakpoints.xs-only
- padding 2em 0
- h2
- font-size 36px
- span
- font-size 28px
- ul
- li
- font-size 18px
- @media $display-breakpoints.sm-only
- padding 3em 0
-
- #letterFromAuthor
- .card
- padding 3em
- position relative
- &:before {
- content: "";
- position: absolute;
- width: 0;
- height: 0;
- top: 30px
- right: -15px
- box-sizing: border-box;
- border: 1.25em solid black;
- border-color: transparent transparent white white
- transform: rotate(-135deg);
- box-shadow: -3px 3px 3px -1px rgba(0,0,0,0.08) !important;
- }
- box-shadow: 0 1px 3px rgba(0,0,0,0.18) !important;
-
- .avatar
- margin-top 0
- width: 100px !important
- height: 100px !important
- p
- font-size 21px
- font-weight 300
- line-height 1.7em
- &.john, &.authorOfVuetify
- font-size 21px
- margin-bottom: 0
- line-height 1.2em
- &.john
- font-weight 500
- margin-top .5em
-
- @media $display-breakpoints.sm-and-down
- .card
- padding 2em
- .avatar
- margin-top 1em
- width: 50px !important
- height: 50px !important
- p
- font-size: 18px
- &.john, &.authorOfVuetify
- font-size 14px
-
- #support
- margin 1em
- position: relative
- z-index: 1
-
- img
- margin-bottom 2em
- p
- font-weight 400
- text-align: center
- font-size: 21px
- @media $display-breakpoints.md-and-down
- p
- margin-bottom .5em
- line-height 1.2em
- @media $display-breakpoints.md-and-up
- p
- margin-bottom 0
- text-align: left
- line-height 1.5em
- @media $display-breakpoints.sm-only
- p
- font-size: 24px
- text-align: center
- margin 2em
- @media $display-breakpoints.md-only
- margin 4em
- p
- text-align: left
- font-size 24px
- @media $display-breakpoints.lg-only
- margin 7em
- p
- font-size 28px
- @media $display-breakpoints.xl-only
- margin 10em
- p
- font-size 36px
-
- .sponsors-and-backers
- .card
- z-index 1
-
- h2
- font-size 24px
- color #666666
- font-weight 300
- margin-bottom 1.5em
- .supporter
- max-width: 100%
- height: auto
-
- #callout
- position: relative
- color rgba(255,255,255,.98)
-
- @media $display-breakpoints.md-and-up
- padding: 2em 0;
-
- &:before
- content ''
- position absolute
- left 0
- right 0
- bottom 0
- height 100vw
- min-height 100%
- background url('/static/doc-images/slant-footer.svg') no-repeat 50% 100%
- background-size 100%
- width: 100%
-
- @media $display-breakpoints.xs-only
- background-position 50% 100%
- background-size 375%
-
- @media $display-breakpoints.sm-only
- background-size 175%
-
- @media $display-breakpoints.md-only
- background-size 140%
-
- @media $display-breakpoints.lg-only
- background-size 100%
- background-position 50% 109%
-
- @media $display-breakpoints.xl-only
- background-size 100%
- background-position 50% 110%
-
- img
- position relative
- h2
- position: relative
- font-size 32px
- color white
- font-weight 300
- @media $display-breakpoints.lg-and-up
- font-size 40px
- width: 70%
-
- #home-footer
- background: #37424b
- color: white
- display: block // todo: default of display flex causing issues
-
- a
- text-decoration: none
- color: #cfd8dc
-
- &:hover
- color: white
- cursor: pointer
-
- .flex
- padding: 2.5em 3em
-
- &.vuetify
- background: #303c42
-
- h5
- font-size: 21px
-
- img
- height: 32px
- margin-right: 10px
- vertical-align: middle
-
- span
- position: relative
- top: 3px
-
- h5
- color: white
- font-size: 16px
-
- ul
- list-style: none
- margin: 0
- padding: 0
-
- li:not(:last-child)
- margin-bottom: 12px
-
- li a
- font-size: 16px
- display: inline-block
-
- .icon
- margin-right: 8px
- font-size: 18px
- width: 25px
+<style lang="stylus" scoped>
+ .social
+ text-decoration: none
</style>
diff --git a/packages/vuetifyjs.com/static/doc-images/feature1.svg b/packages/vuetifyjs.com/static/doc-images/feature1.svg
index 2da1adfb53d..853ce44bfd7 100644
--- a/packages/vuetifyjs.com/static/doc-images/feature1.svg
+++ b/packages/vuetifyjs.com/static/doc-images/feature1.svg
@@ -1 +1,203 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 350 139"><defs><style>.cls-1{isolation:isolate;}.cls-2{fill:#1697f6;}.cls-3{opacity:0.2;}.cls-3,.cls-6{mix-blend-mode:multiply;}.cls-4{fill:#1e1e1e;}.cls-5{fill:#d5d5d5;}.cls-6{opacity:0.15;}.cls-7{fill:#ff5c51;}.cls-8{fill:#ffc106;}.cls-9{fill:#1fcb38;}.cls-10{opacity:0.95;}.cls-11{fill:#fff;}</style></defs><title>feature1</title><g class="cls-1"><g id="Layer_1" data-name="Layer 1"><polygon class="cls-2" points="2831 2590.74 -532 1345.12 2831 99.5 2831 2590.74"/><image class="cls-3" width="360" height="123" transform="translate(-4.5 22.5)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWkAAAB8CAYAAACrF0HSAAAACXBIWXMAAAsSAAALEgHS3X78AAADxUlEQVR4Xu3ZPWpVURSG4ZOEIIKKvaUW/gxB55BaC60cSsaglWQIDkPb4BCshZSCENeXe2NyQxrhBL7iKZ7iwNm7fFmsvZyfny8AdNr9WJa9rf2tAwDu3GVzLxp8a6SXqzgfjvvjwXg4HgFwZ9LZ9DbdTX8vYr0T6eUq0PfG4/FkPBvPx8vxCoDVpa/pbHqb7qa/6fC/UF+P9OH2h6fj9Tgab8f78QGA1aWv6Wx6m+6mv+lwerwT6VQ7o3ZK/mZ8HMfj8/gyTgBYXfqazh4vm+6mv+lwerx/M9LZiWTkPtoe+Dq+j9PxA4DVpa/pbHqb7qa/6XB6vBPpvC5mef1ivBufxrfxc/waZwCsLn1NZ9PbdDf9TYfT44Obkc4rY5bY2ZFkBD/dXvB7/AFgdelrOpveprvpbzqcHt8a6bw2Zpl9smxG8bPtRecArC59TWfT25Nl0990WKQBCog0QDGRBigm0gDFRBqgmEgDFBNpgGIiDVBMpAGKiTRAMZEGKCbSAMVEGqCYSAMUE2mAYiINUEykAYqJNEAxkQYoJtIAxUQaoJhIAxQTaYBiIg1QTKQBiok0QDGRBigm0gDFRBqgmEgDFBNpgGIiDVBMpAGKiTRAMZEGKCbSAMVEGqCYSAMUE2mAYiINUEykAYqJNEAxkQYoJtIAxUQaoJhIAxQTaYBiIg1QTKQBiok0QDGRBigm0gDFRBqgmEgDFBNpgGIiDVBMpAGKiTRAMZEGKCbSAMVEGqCYSAMUE2mAYiINUEykAYqJNEAxkQYoJtIAxUQaoJhIAxQTaYBiIg1QTKQBiok0QDGRBigm0gDFRBqgmEgDFBNpgGIiDVBMpAGKiTRAMZEGKCbSAMVEGqCYSAMUE2mAYiINUEykAYqJNEAxkQYoJtIAxUQaoJhIAxQTaYBiIg1QTKQBiok0QDGRBigm0gDFRBqgmEgDFBNpgGIiDVBMpAGK/XekX47348s4Hb/G7+1FAKwrfU1n09t0N/1Nh2+N9MPxYrwbn8a38XN7wRkAq0tf09n0Nt1Nf9Ph9Hgn0vvjwXg2jsbx+Dq+L5vC/wBgdelrOpveprvpbzqcHu/fjPT98WS8GR+3Bz4vmxH8BIDVpa/p7PGy6W76mw6nxzuR3huH4/F4Ol4vm6K/XTY7kg8ArC59TWfT23Q3/U2H0+O9m5HONH1v+0NKnpH7+bJZYr8CYHXpazqb3qa76W86nB5fRfpGqFPwjNrZiWR5/QiAO5POprfpbvr7L9A7kb4W6stYxwEAd+6yuRcN3uny9Q8AuvwFPwkmBpKL1lQAAAAASUVORK5CYII="/><rect class="cls-4" x="0.5" y="26.41" width="350" height="112.7"/><rect class="cls-5" x="0.5" y="-0.11" width="350" height="26.52"/><image class="cls-6" width="16" height="15" transform="translate(12.5 5.5)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAYAAADwMZRfAAAACXBIWXMAAAsSAAALEgHS3X78AAAArElEQVQ4T82TwQ2DMAxF3QGySbizQwfoigzQGci9m4QBahz6kVJsJ6BeivQuOHpxnB9iZvoV+yfRrUVXIl8QojA6lFpwJRDchUlIDhPWBCVBqwMWZeHtUGrPWnTs4iG8sJgbZGwWt82rLiIKS0fA2GSmz4y+JCMKvS52SfIk6W8kV45jzmQfbD4h0bdzCFrJQOuGFvJyYoiswKmgtd6OF30VeVNSiaxHqB5fYQULDVa33qiOrgAAAABJRU5ErkJggg=="/><circle class="cls-7" cx="20.55" cy="13.15" r="5.68"/><image class="cls-6" width="16" height="15" transform="translate(32.5 5.5)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAYAAADwMZRfAAAACXBIWXMAAAsSAAALEgHS3X78AAAArUlEQVQ4T7WTwQ2DMAxF3QGySXpnhw7QFRmAGZp7N0kGwLWrT4lIbCKhIr0LMS/Y+SFmpqv0XxLdPE4l8gQhCpOBrgVTAsFDmIVkMKMmNJJKsAhZWA0yRHdCa/UMIha1iB1U9Bae29/UEu33hSJPohRsGL/fHiRpULJiw+mqJP1VMjoTs53R02Haj3kfbCcnxREU1PwCZyXWClw+Cry7Y0W/iXxXUol6l7C5fMoHg1pWt6tRppAAAAAASUVORK5CYII="/><circle class="cls-8" cx="40.43" cy="13.15" r="5.68"/><image class="cls-6" width="16" height="15" transform="translate(51.5 5.5)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAYAAADwMZRfAAAACXBIWXMAAAsSAAALEgHS3X78AAAAsUlEQVQ4T7WTwQ3DIAxFzb3ZhAGyQwfIch0gA2SGcu8m4Z64dvPVpq5BRFGR3gWsZxsMMTOdxd8kCiWaJLI6IQq9Q8R5KEoQcBVGITno/gDZ5UeyE0zCLKwOWXgIN4jCW0JbvxGZVMAVFoi0os5KtOc7MtYkSkbCVzVWkholKxL2ZyXpr5LWOym20/o6jJjvi3XmJFcEGTEa+3niAwM3W0Ht75RGf7QCV7ITeZ8wWoHyBLNPWLOdnJtkAAAAAElFTkSuQmCC"/><circle class="cls-9" cx="59.38" cy="13.15" r="5.68"/><g class="cls-10"><path class="cls-11" d="M37.44,62.93V61.84l6.35,2.51v1l-6.35,2.51v-1.1l5.11-1.91Z"/><path class="cls-11" d="M59.75,62H60.9l2,5.65,2-5.65H66l-2.39,6.73H62.14Z"/><path class="cls-11" d="M67.73,66.16V62h1.11v4.17a2.23,2.23,0,0,0,.32,1.33,1.17,1.17,0,0,0,1,.43,1.41,1.41,0,0,0,1.2-.55,2.58,2.58,0,0,0,.42-1.58V62h1.11v6.72H71.77v-1a2.09,2.09,0,0,1-.8.88,2.29,2.29,0,0,1-1.19.3,1.8,1.8,0,0,1-1.54-.68A3.41,3.41,0,0,1,67.73,66.16Z"/><path class="cls-11" d="M80.71,64.79v.54H75.92v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13,3.2,3.2,0,0,1-2.45-.94,3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,80.71,64.79Zm-1.11-.32a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53A1.86,1.86,0,0,0,76,64.47Z"/><path class="cls-11" d="M90.7,62h2.83v5.85h2.19v.86H90.23v-.86h2.19v-5H90.7Zm1.73-2.62h1.11v1.39H92.42Z"/><path class="cls-11" d="M102.53,64.54v4.17h-1.11V64.54a2.24,2.24,0,0,0-.32-1.33,1.16,1.16,0,0,0-1-.43,1.41,1.41,0,0,0-1.19.55,2.57,2.57,0,0,0-.42,1.58v3.81H97.38V62h1.11v1a2.08,2.08,0,0,1,.8-.87,2.31,2.31,0,0,1,1.2-.3,1.8,1.8,0,0,1,1.54.68A3.39,3.39,0,0,1,102.53,64.54Z"/><path class="cls-11" d="M105.52,62h2.83v5.85h2.19v.86h-5.49v-.86h2.19v-5h-1.73Zm1.73-2.62h1.11v1.39h-1.11Z"/><path class="cls-11" d="M114.73,60.07V62h2.51v.86h-2.51v3.65a1.49,1.49,0,0,0,.28,1,1.33,1.33,0,0,0,1,.29h1.24v.88h-1.35a2.47,2.47,0,0,1-1.76-.5,2.35,2.35,0,0,1-.51-1.72V62.84h-1.8V62h1.8V60.07Z"/><path class="cls-11" d="M126.46,62h1.15l2,5.65,2-5.65h1.15l-2.39,6.73h-1.42Z"/><path class="cls-11" d="M134.44,66.16V62h1.11v4.17a2.23,2.23,0,0,0,.32,1.33,1.17,1.17,0,0,0,1,.43,1.41,1.41,0,0,0,1.2-.55,2.58,2.58,0,0,0,.42-1.58V62h1.11v6.72h-1.11v-1a2.09,2.09,0,0,1-.8.88,2.29,2.29,0,0,1-1.19.3,1.8,1.8,0,0,1-1.54-.68A3.41,3.41,0,0,1,134.44,66.16Z"/><path class="cls-11" d="M147.42,64.79v.54h-4.79v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13,3.2,3.2,0,0,1-2.45-.94,3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,147.42,64.79Zm-1.11-.32a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53,1.86,1.86,0,0,0-.56,1.19Z"/><path class="cls-11" d="M151.79,60.07V62h2.51v.86h-2.51v3.65a1.49,1.49,0,0,0,.28,1,1.33,1.33,0,0,0,1,.29h1.24v.88h-1.35a2.47,2.47,0,0,1-1.76-.5,2.35,2.35,0,0,1-.51-1.72V62.84h-1.8V62h1.8V60.07Z"/><path class="cls-11" d="M157.41,62h2.83v5.85h2.19v.86h-5.49v-.86h2.19v-5h-1.73Zm1.73-2.62h1.11v1.39h-1.11Z"/><path class="cls-11" d="M169.31,59.36v.92h-1.26a1.12,1.12,0,0,0-.83.24,1.25,1.25,0,0,0-.23.86V62h2.31v.86H167v5.87h-1.11V62.84h-1.8V62h1.8v-.47a2.27,2.27,0,0,1,.51-1.63,2.12,2.12,0,0,1,1.58-.52Z"/><path class="cls-11" d="M175.49,66.55q-.28.7-.7,1.85a18,18,0,0,1-.8,1.94,1.88,1.88,0,0,1-.69.7,1.93,1.93,0,0,1-1,.23h-.89v-.93h.66a1,1,0,0,0,.76-.28,4.86,4.86,0,0,0,.7-1.46L171,62h1.17l2,5.27,2-5.27h1.17Z"/><path class="cls-11" d="M181.35,68.83v-6h-1.91V62h3v6.85a2.72,2.72,0,0,1-.54,1.81,1.9,1.9,0,0,1-1.53.63h-1.53v-.94h1.41a.93.93,0,0,0,.81-.38A1.93,1.93,0,0,0,181.35,68.83Zm0-9.47h1.11v1.4h-1.11Z"/><path class="cls-11" d="M191,62.21v1.08a4.19,4.19,0,0,0-1-.42,3.51,3.51,0,0,0-1-.14A2.06,2.06,0,0,0,188,63a.83.83,0,0,0-.37.74.81.81,0,0,0,.28.67,3.75,3.75,0,0,0,1.38.43l.44.08a2.16,2.16,0,0,1,1.25.63,1.75,1.75,0,0,1,.42,1.22,1.88,1.88,0,0,1-.71,1.56,3.1,3.1,0,0,1-2,.56,5.53,5.53,0,0,1-1-.11,9.71,9.71,0,0,1-1.18-.32V67.32a6.32,6.32,0,0,0,1.18.48,3.94,3.94,0,0,0,1.07.16,1.88,1.88,0,0,0,1.14-.3,1,1,0,0,0,.4-.83q0-.77-1.47-1.06h0l-.41-.08a2.65,2.65,0,0,1-1.4-.63,1.64,1.64,0,0,1-.44-1.21,1.81,1.81,0,0,1,.66-1.49,2.92,2.92,0,0,1,1.87-.53,5.31,5.31,0,0,1,1,.1A5.22,5.22,0,0,1,191,62.21Z"/><path class="cls-11" d="M197.92,59.74h1.14l-4.73,10.12h-1.15Z"/><path class="cls-11" d="M205.83,62.21v1.08a4.19,4.19,0,0,0-1-.42,3.51,3.51,0,0,0-1-.14,2.06,2.06,0,0,0-1.12.24.83.83,0,0,0-.37.74.81.81,0,0,0,.28.67,3.75,3.75,0,0,0,1.38.43l.44.08a2.16,2.16,0,0,1,1.25.63,1.75,1.75,0,0,1,.42,1.22,1.88,1.88,0,0,1-.71,1.56,3.1,3.1,0,0,1-2,.56,5.53,5.53,0,0,1-1-.11,9.71,9.71,0,0,1-1.18-.32V67.32a6.32,6.32,0,0,0,1.18.48,3.94,3.94,0,0,0,1.07.16,1.88,1.88,0,0,0,1.14-.3,1,1,0,0,0,.4-.83q0-.77-1.47-1.06h0l-.41-.08a2.65,2.65,0,0,1-1.4-.63,1.64,1.64,0,0,1-.44-1.21,1.81,1.81,0,0,1,.66-1.49,2.92,2.92,0,0,1,1.87-.53,5.31,5.31,0,0,1,1,.1A5.22,5.22,0,0,1,205.83,62.21Z"/><path class="cls-11" d="M209.3,62h2.83v5.85h2.19v.86h-5.49v-.86H211v-5H209.3ZM211,59.39h1.11v1.39H211Z"/><path class="cls-11" d="M218.87,62.66a1.51,1.51,0,0,1,.52-.64,1.35,1.35,0,0,1,.76-.21,1.19,1.19,0,0,1,1.15.63,5.67,5.67,0,0,1,.33,2.37v3.9h-1V64.86a5.67,5.67,0,0,0-.16-1.77.58.58,0,0,0-.58-.35.66.66,0,0,0-.66.37,5.14,5.14,0,0,0-.18,1.75v3.85h-1V64.86a5.3,5.3,0,0,0-.17-1.78.63.63,0,0,0-.62-.34.62.62,0,0,0-.61.37,5.31,5.31,0,0,0-.17,1.75v3.85h-1V62h1v.58A1.47,1.47,0,0,1,217,62a1.23,1.23,0,0,1,.68-.19,1.3,1.3,0,0,1,.76.21A1.35,1.35,0,0,1,218.87,62.66Z"/><path class="cls-11" d="M224.47,67.86v3.41h-1.11V62h1.11v.86a1.92,1.92,0,0,1,.74-.76,2.1,2.1,0,0,1,1.06-.26,2.24,2.24,0,0,1,1.91.94,4.33,4.33,0,0,1,.69,2.61,4.22,4.22,0,0,1-.7,2.58,2.26,2.26,0,0,1-1.91.94,2.14,2.14,0,0,1-1.07-.26A1.85,1.85,0,0,1,224.47,67.86Zm3.25-2.51a3.74,3.74,0,0,0-.41-1.94,1.33,1.33,0,0,0-1.21-.66,1.35,1.35,0,0,0-1.22.66,4.73,4.73,0,0,0,0,3.87,1.35,1.35,0,0,0,1.22.66,1.33,1.33,0,0,0,1.21-.66A3.74,3.74,0,0,0,227.72,65.35Z"/><path class="cls-11" d="M234,66.28a1.92,1.92,0,0,0,.27,1.12.93.93,0,0,0,.81.38h1.29v.93h-1.4a1.91,1.91,0,0,1-1.54-.63,2.69,2.69,0,0,1-.54-1.8V60.19h-1.77v-.87H234Z"/><path class="cls-11" d="M243.78,64.79v.54H239v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13,3.2,3.2,0,0,1-2.45-.94,3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,243.78,64.79Zm-1.11-.32a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53,1.86,1.86,0,0,0-.56,1.19Z"/><path class="cls-11" d="M255.93,62.66a1.51,1.51,0,0,1,.52-.64,1.35,1.35,0,0,1,.76-.21,1.19,1.19,0,0,1,1.15.63,5.67,5.67,0,0,1,.33,2.37v3.9h-1V64.86a5.67,5.67,0,0,0-.16-1.77.58.58,0,0,0-.58-.35.66.66,0,0,0-.66.37,5.14,5.14,0,0,0-.18,1.75v3.85h-1V64.86a5.3,5.3,0,0,0-.17-1.78.63.63,0,0,0-.62-.34.62.62,0,0,0-.61.37,5.31,5.31,0,0,0-.17,1.75v3.85h-1V62h1v.58A1.47,1.47,0,0,1,254,62a1.23,1.23,0,0,1,.68-.19,1.3,1.3,0,0,1,.76.21A1.35,1.35,0,0,1,255.93,62.66Z"/><path class="cls-11" d="M264.44,66.55q-.28.7-.7,1.85a18,18,0,0,1-.8,1.94,1.88,1.88,0,0,1-.69.7,1.93,1.93,0,0,1-1,.23h-.89v-.93H261a1,1,0,0,0,.76-.28,4.86,4.86,0,0,0,.7-1.46L259.91,62h1.17l2,5.27L265,62h1.17Z"/><path class="cls-11" d="M273.06,64.87v3.84h-1.11v-1a2.28,2.28,0,0,1-.89.89,2.76,2.76,0,0,1-1.31.29,2.29,2.29,0,0,1-1.64-.58,2.29,2.29,0,0,1,.14-3.26,3.57,3.57,0,0,1,2.21-.58h1.48v-.17a1.52,1.52,0,0,0-.41-1.17,1.89,1.89,0,0,0-1.29-.36,4.2,4.2,0,0,0-1.14.16,5,5,0,0,0-1.12.47V62.28a7.7,7.7,0,0,1,1.18-.35,5.34,5.34,0,0,1,1.09-.12,3.7,3.7,0,0,1,1.43.25,2.24,2.24,0,0,1,1,.74,1.86,1.86,0,0,1,.32.74A6.75,6.75,0,0,1,273.06,64.87Zm-2.15.46h-.37a2.56,2.56,0,0,0-1.46.34,1.15,1.15,0,0,0-.49,1,1.22,1.22,0,0,0,.37.94,1.44,1.44,0,0,0,1,.34,1.76,1.76,0,0,0,1.44-.63,2.7,2.7,0,0,0,.53-1.75v-.25Z"/><path class="cls-11" d="M276.36,67.86v3.41h-1.11V62h1.11v.86a1.92,1.92,0,0,1,.74-.76,2.1,2.1,0,0,1,1.06-.26,2.24,2.24,0,0,1,1.91.94,4.33,4.33,0,0,1,.69,2.61,4.22,4.22,0,0,1-.7,2.58,2.26,2.26,0,0,1-1.91.94,2.14,2.14,0,0,1-1.07-.26A1.85,1.85,0,0,1,276.36,67.86Zm3.25-2.51a3.74,3.74,0,0,0-.41-1.94,1.33,1.33,0,0,0-1.21-.66,1.35,1.35,0,0,0-1.22.66,4.73,4.73,0,0,0,0,3.87,1.35,1.35,0,0,0,1.22.66,1.33,1.33,0,0,0,1.21-.66A3.74,3.74,0,0,0,279.61,65.35Z"/><path class="cls-11" d="M283.77,67.86v3.41h-1.11V62h1.11v.86a1.92,1.92,0,0,1,.74-.76,2.1,2.1,0,0,1,1.06-.26,2.24,2.24,0,0,1,1.91.94,4.33,4.33,0,0,1,.69,2.61,4.22,4.22,0,0,1-.7,2.58,2.26,2.26,0,0,1-1.91.94,2.14,2.14,0,0,1-1.07-.26A1.85,1.85,0,0,1,283.77,67.86ZM287,65.35a3.74,3.74,0,0,0-.41-1.94,1.33,1.33,0,0,0-1.21-.66,1.35,1.35,0,0,0-1.22.66,4.73,4.73,0,0,0,0,3.87,1.35,1.35,0,0,0,1.22.66,1.33,1.33,0,0,0,1.21-.66A3.74,3.74,0,0,0,287,65.35Z"/></g><g class="cls-10"><path class="cls-11" d="M37.44,92.29V91.2l6.35,2.51v1l-6.35,2.51v-1.1l5.11-1.91Z"/><path class="cls-11" d="M59.75,91.34H60.9l2,5.65,2-5.65H66l-2.39,6.73H62.14Z"/><path class="cls-11" d="M67.73,95.52V91.35h1.11v4.17a2.23,2.23,0,0,0,.32,1.33,1.17,1.17,0,0,0,1,.43,1.41,1.41,0,0,0,1.2-.55,2.58,2.58,0,0,0,.42-1.58v-3.8h1.11v6.72H71.77v-1a2.09,2.09,0,0,1-.8.88,2.29,2.29,0,0,1-1.19.3,1.8,1.8,0,0,1-1.54-.68A3.41,3.41,0,0,1,67.73,95.52Z"/><path class="cls-11" d="M80.71,94.15v.54H75.92v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13,3.2,3.2,0,0,1-2.45-.94,3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,80.71,94.15Zm-1.11-.32a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53A1.86,1.86,0,0,0,76,93.83Z"/><path class="cls-11" d="M82,93.72h6.37v1H82Z"/><path class="cls-11" d="M95.18,97.73a3.82,3.82,0,0,1-.92.39,3.65,3.65,0,0,1-1,.13,3.19,3.19,0,0,1-2.44-.94,4.27,4.27,0,0,1,0-5.19,3.19,3.19,0,0,1,2.44-.94,3.6,3.6,0,0,1,.95.13,4.11,4.11,0,0,1,.93.39v1.16a3,3,0,0,0-.88-.57,2.71,2.71,0,0,0-1-.17,2,2,0,0,0-1.6.67,3.58,3.58,0,0,0,0,3.84,2,2,0,0,0,1.6.68,2.84,2.84,0,0,0,1-.18,2.58,2.58,0,0,0,.85-.55Z"/><path class="cls-11" d="M100.53,95.63a1.92,1.92,0,0,0,.27,1.12.93.93,0,0,0,.81.38h1.29v.93h-1.4a1.91,1.91,0,0,1-1.54-.63,2.69,2.69,0,0,1-.54-1.8V89.54H97.65v-.87h2.88Z"/><path class="cls-11" d="M105.52,91.36h2.83v5.85h2.19v.86h-5.49v-.86h2.19v-5h-1.73Zm1.73-2.62h1.11v1.39h-1.11Z"/><path class="cls-11" d="M125.08,97.33A3.35,3.35,0,0,1,124,98a3.71,3.71,0,0,1-1.32.23A3.17,3.17,0,0,1,120,97a6.63,6.63,0,0,1,0-6.86,3.21,3.21,0,0,1,2.67-1.23,3.68,3.68,0,0,1,1.08.16,3.76,3.76,0,0,1,1,.48v1.24a3.43,3.43,0,0,0-1-.68,2.73,2.73,0,0,0-1.08-.22,2,2,0,0,0-1.78.92,5.15,5.15,0,0,0-.59,2.76,5.25,5.25,0,0,0,.57,2.77,2,2,0,0,0,1.76.9,2.43,2.43,0,0,0,.71-.09,1.65,1.65,0,0,0,.55-.29V94.46h-1.3v-1h2.46Z"/><path class="cls-11" d="M132.59,94.15v.54H127.8v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13,3.2,3.2,0,0,1-2.45-.94,3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,132.59,94.15Zm-1.11-.32a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53,1.86,1.86,0,0,0-.56,1.19Z"/><path class="cls-11" d="M139.59,93.9v4.17h-1.11V93.9a2.24,2.24,0,0,0-.32-1.33,1.16,1.16,0,0,0-1-.43,1.41,1.41,0,0,0-1.19.55,2.57,2.57,0,0,0-.42,1.58v3.81h-1.11V91.34h1.11v1a2.08,2.08,0,0,1,.8-.87,2.31,2.31,0,0,1,1.2-.3,1.8,1.8,0,0,1,1.54.68A3.39,3.39,0,0,1,139.59,93.9Z"/><path class="cls-11" d="M147.42,94.15v.54h-4.79v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13,3.2,3.2,0,0,1-2.45-.94,3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,147.42,94.15Zm-1.11-.32a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53,1.86,1.86,0,0,0-.56,1.19Z"/><path class="cls-11" d="M155,92.72a2.52,2.52,0,0,0-.72-.4,2.47,2.47,0,0,0-.81-.13,2,2,0,0,0-1.58.65,2.84,2.84,0,0,0-.55,1.88v3.35h-1.11V91.34h1.11v1.32a2.24,2.24,0,0,1,.85-1.1,2.4,2.4,0,0,1,1.36-.38,2.74,2.74,0,0,1,.76.1,2.44,2.44,0,0,1,.68.32Z"/><path class="cls-11" d="M161.88,94.23v3.84h-1.11v-1a2.28,2.28,0,0,1-.89.89,2.76,2.76,0,0,1-1.31.29,2.29,2.29,0,0,1-1.64-.58,2.29,2.29,0,0,1,.14-3.26,3.57,3.57,0,0,1,2.21-.58h1.48v-.17a1.52,1.52,0,0,0-.41-1.17,1.89,1.89,0,0,0-1.29-.36,4.2,4.2,0,0,0-1.14.16,5,5,0,0,0-1.12.47V91.64a7.7,7.7,0,0,1,1.18-.35,5.34,5.34,0,0,1,1.09-.12,3.7,3.7,0,0,1,1.43.25,2.24,2.24,0,0,1,1,.74,1.86,1.86,0,0,1,.32.74A6.75,6.75,0,0,1,161.88,94.23Zm-2.15.46h-.37a2.56,2.56,0,0,0-1.46.34,1.15,1.15,0,0,0-.49,1,1.22,1.22,0,0,0,.37.94,1.44,1.44,0,0,0,1,.34,1.76,1.76,0,0,0,1.44-.63,2.7,2.7,0,0,0,.53-1.75v-.25Z"/><path class="cls-11" d="M166.61,89.42v1.91h2.51v.86h-2.51v3.65a1.49,1.49,0,0,0,.28,1,1.33,1.33,0,0,0,1,.29h1.24v.88h-1.35a2.47,2.47,0,0,1-1.76-.5,2.35,2.35,0,0,1-.51-1.72V92.2h-1.8v-.86h1.8V89.42Z"/><path class="cls-11" d="M177.07,94.15v.54h-4.79v0a2.67,2.67,0,0,0,.53,2,2.14,2.14,0,0,0,1.62.6,3.94,3.94,0,0,0,1.11-.17,6.77,6.77,0,0,0,1.23-.51v1.1a7.39,7.39,0,0,1-1.22.39,5.27,5.27,0,0,1-1.13.13A3.2,3.2,0,0,1,172,97.3a3.64,3.64,0,0,1-.88-2.59,3.7,3.7,0,0,1,.87-2.57,3,3,0,0,1,2.31-1,2.53,2.53,0,0,1,2,.87A3.35,3.35,0,0,1,177.07,94.15ZM176,93.83a2.15,2.15,0,0,0-.51-1.21,1.56,1.56,0,0,0-1.25-.51,1.76,1.76,0,0,0-1.32.53,1.86,1.86,0,0,0-.56,1.19Z"/><path class="cls-11" d="M182.9,92.2V88.71H184v9.35H182.9v-.85a1.92,1.92,0,0,1-.74.76,2.11,2.11,0,0,1-1.06.26,2.26,2.26,0,0,1-1.92-.95,4.31,4.31,0,0,1-.7-2.61,4.2,4.2,0,0,1,.7-2.58,2.27,2.27,0,0,1,1.92-.93,2.13,2.13,0,0,1,1.07.26A1.84,1.84,0,0,1,182.9,92.2Zm-3.25,2.51a3.71,3.71,0,0,0,.41,1.94,1.33,1.33,0,0,0,1.21.66,1.35,1.35,0,0,0,1.22-.66,4.7,4.7,0,0,0,0-3.87,1.35,1.35,0,0,0-1.22-.66,1.33,1.33,0,0,0-1.21.66A3.71,3.71,0,0,0,179.65,94.71Z"/><path class="cls-11" d="M195.37,92.26h-1.53V91l1.2-2.3H196l-.59,2.3Zm2.76,0h-1.51V91l1.18-2.3h.93l-.59,2.3Z"/><path class="cls-11" d="M204,92a1.51,1.51,0,0,1,.52-.64,1.35,1.35,0,0,1,.76-.21,1.19,1.19,0,0,1,1.15.63,5.67,5.67,0,0,1,.33,2.37v3.9h-1V94.22a5.67,5.67,0,0,0-.16-1.77.58.58,0,0,0-.58-.35.66.66,0,0,0-.66.37,5.14,5.14,0,0,0-.18,1.75v3.85h-1V94.22a5.3,5.3,0,0,0-.17-1.78.63.63,0,0,0-.62-.34.62.62,0,0,0-.61.37,5.31,5.31,0,0,0-.17,1.75v3.85h-1V91.34h1v.58a1.47,1.47,0,0,1,.5-.55,1.23,1.23,0,0,1,.68-.19,1.3,1.3,0,0,1,.76.21A1.35,1.35,0,0,1,204,92Z"/><path class="cls-11" d="M212.55,95.91q-.28.7-.7,1.85a18,18,0,0,1-.8,1.94,1.88,1.88,0,0,1-.69.7,1.93,1.93,0,0,1-1,.23h-.89V99.7h.66a1,1,0,0,0,.76-.28,4.86,4.86,0,0,0,.7-1.46L208,91.34h1.17l2,5.27,2-5.27h1.17Z"/><path class="cls-11" d="M221.17,94.23v3.84h-1.11v-1a2.28,2.28,0,0,1-.89.89,2.76,2.76,0,0,1-1.31.29,2.29,2.29,0,0,1-1.64-.58,2.29,2.29,0,0,1,.14-3.26,3.57,3.57,0,0,1,2.21-.58h1.48v-.17a1.52,1.52,0,0,0-.41-1.17,1.89,1.89,0,0,0-1.29-.36,4.2,4.2,0,0,0-1.14.16,5,5,0,0,0-1.12.47V91.64a7.7,7.7,0,0,1,1.18-.35,5.34,5.34,0,0,1,1.09-.12,3.7,3.7,0,0,1,1.43.25,2.24,2.24,0,0,1,1,.74,1.86,1.86,0,0,1,.32.74A6.75,6.75,0,0,1,221.17,94.23Zm-2.15.46h-.37a2.56,2.56,0,0,0-1.46.34,1.15,1.15,0,0,0-.49,1,1.22,1.22,0,0,0,.37.94,1.44,1.44,0,0,0,1,.34,1.76,1.76,0,0,0,1.44-.63,2.7,2.7,0,0,0,.53-1.75v-.25Z"/><path class="cls-11" d="M224.47,97.22v3.41h-1.11V91.34h1.11v.86a1.92,1.92,0,0,1,.74-.76,2.1,2.1,0,0,1,1.06-.26,2.24,2.24,0,0,1,1.91.94,4.33,4.33,0,0,1,.69,2.61,4.22,4.22,0,0,1-.7,2.58,2.26,2.26,0,0,1-1.91.94A2.14,2.14,0,0,1,225.2,98,1.85,1.85,0,0,1,224.47,97.22Zm3.25-2.51a3.74,3.74,0,0,0-.41-1.94,1.33,1.33,0,0,0-1.21-.66,1.35,1.35,0,0,0-1.22.66,4.73,4.73,0,0,0,0,3.87,1.35,1.35,0,0,0,1.22.66,1.33,1.33,0,0,0,1.21-.66A3.74,3.74,0,0,0,227.72,94.71Z"/><path class="cls-11" d="M231.89,97.22v3.41h-1.11V91.34h1.11v.86a1.92,1.92,0,0,1,.74-.76,2.1,2.1,0,0,1,1.06-.26,2.24,2.24,0,0,1,1.91.94,4.33,4.33,0,0,1,.69,2.61,4.22,4.22,0,0,1-.7,2.58,2.26,2.26,0,0,1-1.91.94,2.14,2.14,0,0,1-1.07-.26A1.85,1.85,0,0,1,231.89,97.22Zm3.25-2.51a3.74,3.74,0,0,0-.41-1.94,1.33,1.33,0,0,0-1.21-.66,1.35,1.35,0,0,0-1.22.66,4.73,4.73,0,0,0,0,3.87,1.35,1.35,0,0,0,1.22.66,1.33,1.33,0,0,0,1.21-.66A3.74,3.74,0,0,0,235.13,94.71Z"/><path class="cls-11" d="M238.9,88.71h1.52V90l-1.18,2.3h-.93l.59-2.3Zm2.76,0h1.52V90L242,92.26h-.92l.59-2.3Z"/></g></g></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 350 139" style="enable-background:new 0 0 350 139;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#1697F6;}
+ .st1{fill:#1E1E1E;}
+ .st2{fill:#D5D5D5;}
+ .st3{fill:#FF5C51;}
+ .st4{fill:#FFC106;}
+ .st5{fill:#1FCB38;}
+ .st6{opacity:0.95;}
+ .st7{fill:#FFFFFF;}
+</style>
+<title>feature1</title>
+<g>
+ <g id="Layer_1_1_">
+ <polygon class="st0" points="2831,2590.7 -532,1345.1 2831,99.5 "/>
+
+ <image style="overflow:visible;opacity:0.2;enable-background:new ;" width="361" height="124" xlink:href="500EDF0A.png" transform="matrix(0.9919 0 0 0.9919 -3.5444 22.5)">
+ </image>
+ <rect y="26.4" class="st1" width="350.5" height="112.7"/>
+ <rect y="-0.1" class="st2" width="350.5" height="26.5"/>
+
+ <image style="overflow:visible;opacity:0.15;enable-background:new ;" width="17" height="16" xlink:href="500EDF0D.png" transform="matrix(0.9375 0 0 0.9375 12.5313 5.5)">
+ </image>
+ <circle class="st3" cx="20.5" cy="13.1" r="5.7"/>
+
+ <image style="overflow:visible;opacity:0.15;enable-background:new ;" width="17" height="16" xlink:href="500EDF0C.png" transform="matrix(0.9375 0 0 0.9375 32.5313 5.5)">
+ </image>
+ <circle class="st4" cx="40.4" cy="13.1" r="5.7"/>
+
+ <image style="overflow:visible;opacity:0.15;enable-background:new ;" width="17" height="16" xlink:href="500EDF03.png" transform="matrix(0.9375 0 0 0.9375 51.5313 5.5)">
+ </image>
+ <circle class="st5" cx="59.4" cy="13.1" r="5.7"/>
+ <g class="st6">
+ <path class="st7" d="M37.4,62.9v-1.1l6.3,2.5v1l-6.3,2.5v-1.1l5.1-1.9L37.4,62.9z"/>
+ <path class="st7" d="M59.8,62h1.2l2,5.7l2-5.7H66l-2.4,6.7h-1.5L59.8,62z"/>
+ <path class="st7" d="M67.7,66.2V62h1.1v4.2c0,0.5,0.1,0.9,0.3,1.3c0.2,0.3,0.6,0.5,1,0.4c0.5,0,0.9-0.2,1.2-0.6
+ c0.3-0.5,0.5-1,0.4-1.6V62h1.1v6.7h-1.1v-1c-0.2,0.4-0.5,0.7-0.8,0.9c-0.4,0.2-0.8,0.3-1.2,0.3c-0.6,0-1.2-0.2-1.5-0.7
+ C67.9,67.6,67.7,66.9,67.7,66.2z"/>
+ <path class="st7" d="M80.7,64.8v0.5h-4.8l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0.1-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C80.4,63.2,80.7,64,80.7,64.8z
+ M79.6,64.5c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5C76.2,63.6,76,64,76,64.5H79.6z"/>
+ <path class="st7" d="M90.7,62h2.8v5.8h2.2v0.9h-5.5v-0.9h2.2v-5h-1.7V62z M92.4,59.4h1.1v1.4h-1.1L92.4,59.4z"/>
+ <path class="st7" d="M102.5,64.5v4.2h-1.1v-4.2c0-0.5-0.1-0.9-0.3-1.3c-0.2-0.3-0.6-0.5-1-0.4c-0.5,0-0.9,0.2-1.2,0.5
+ c-0.3,0.5-0.5,1-0.4,1.6v3.8h-1.1V62h1.1v1c0.2-0.4,0.5-0.7,0.8-0.9c0.4-0.2,0.8-0.3,1.2-0.3c0.6,0,1.2,0.2,1.5,0.7
+ C102.4,63.1,102.6,63.8,102.5,64.5z"/>
+ <path class="st7" d="M105.5,62h2.8v5.8h2.2v0.9h-5.5v-0.9h2.2v-5h-1.7L105.5,62z M107.3,59.4h1.1v1.4h-1.1V59.4z"/>
+ <path class="st7" d="M114.7,60.1V62h2.5v0.9h-2.5v3.7c0,0.4,0.1,0.7,0.3,1c0.3,0.2,0.6,0.3,1,0.3h1.2v0.9h-1.3
+ c-0.6,0.1-1.3-0.1-1.8-0.5c-0.4-0.5-0.6-1.1-0.5-1.7v-3.6h-1.8V62h1.8v-1.9H114.7z"/>
+ <path class="st7" d="M126.5,62h1.2l2,5.7l2-5.7h1.1l-2.4,6.7h-1.4L126.5,62z"/>
+ <path class="st7" d="M134.4,66.2V62h1.1v4.2c0,0.5,0.1,0.9,0.3,1.3c0.2,0.3,0.6,0.5,1,0.4c0.5,0,0.9-0.2,1.2-0.6
+ c0.3-0.5,0.5-1,0.4-1.6V62h1.1v6.7h-1.1v-1c-0.2,0.4-0.5,0.7-0.8,0.9c-0.4,0.2-0.8,0.3-1.2,0.3c-0.6,0-1.2-0.2-1.5-0.7
+ C134.6,67.6,134.4,66.9,134.4,66.2z"/>
+ <path class="st7" d="M147.4,64.8v0.5h-4.8l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0.1-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C147.1,63.2,147.4,64,147.4,64.8z
+ M146.3,64.5c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5c-0.3,0.3-0.5,0.7-0.6,1.2H146.3z"/>
+ <path class="st7" d="M151.8,60.1V62h2.5v0.9h-2.5v3.7c0,0.4,0.1,0.7,0.3,1c0.3,0.2,0.6,0.3,1,0.3h1.2v0.9H153
+ c-0.6,0.1-1.3-0.1-1.8-0.5c-0.4-0.5-0.6-1.1-0.5-1.7v-3.6h-1.8V62h1.8v-1.9H151.8z"/>
+ <path class="st7" d="M157.4,62h2.8v5.8h2.2v0.9h-5.5v-0.9h2.2v-5h-1.7L157.4,62z M159.1,59.4h1.1v1.4h-1.1V59.4z"/>
+ <path class="st7" d="M169.3,59.4v0.9h-1.3c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.2-0.3,0.6-0.2,0.9V62h2.3v0.9H167v5.9h-1.1v-5.9h-1.8
+ V62h1.8v-0.5c0-0.6,0.1-1.2,0.5-1.6c0.4-0.4,1-0.6,1.6-0.5L169.3,59.4z"/>
+ <path class="st7" d="M175.5,66.6c-0.2,0.5-0.4,1.1-0.7,1.8c-0.2,0.7-0.5,1.3-0.8,1.9c-0.2,0.3-0.4,0.5-0.7,0.7
+ c-0.3,0.2-0.7,0.2-1,0.2h-0.9v-0.9h0.7c0.3,0,0.6-0.1,0.8-0.3c0.3-0.4,0.5-0.9,0.7-1.5L171,62h1.2l2,5.3l2-5.3h1.2L175.5,66.6z"
+ />
+ <path class="st7" d="M181.4,68.8v-6h-1.9V62h3v6.8c0,0.6-0.1,1.3-0.5,1.8c-0.4,0.4-1,0.7-1.5,0.6h-1.5v-0.9h1.4
+ c0.3,0,0.6-0.1,0.8-0.4C181.3,69.6,181.4,69.2,181.4,68.8z M181.4,59.4h1.1v1.4h-1.1V59.4z"/>
+ <path class="st7" d="M191,62.2v1.1c-0.3-0.2-0.6-0.3-1-0.4c-0.3-0.1-0.7-0.1-1-0.1c-0.4,0-0.7,0.1-1,0.3
+ c-0.2,0.2-0.4,0.4-0.4,0.7c0,0.3,0.1,0.5,0.3,0.7c0.4,0.2,0.9,0.4,1.4,0.4l0.4,0.1c0.5,0.1,0.9,0.3,1.3,0.6
+ c0.3,0.3,0.4,0.8,0.4,1.2c0,0.6-0.2,1.2-0.7,1.6c-0.6,0.4-1.3,0.6-2,0.6c-0.3,0-0.7,0-1-0.1c-0.4-0.1-0.8-0.2-1.2-0.3v-1.1
+ c0.4,0.2,0.8,0.4,1.2,0.5c0.3,0.1,0.7,0.2,1.1,0.2c0.4,0,0.8-0.1,1.1-0.3c0.3-0.2,0.4-0.5,0.4-0.8c0-0.5-0.5-0.9-1.5-1.1l0,0
+ l-0.4-0.1c-0.5-0.1-1-0.3-1.4-0.6c-0.3-0.3-0.5-0.8-0.4-1.2c0-0.6,0.2-1.1,0.7-1.5c0.5-0.4,1.2-0.6,1.9-0.5c0.3,0,0.7,0,1,0.1
+ C190.4,62,190.7,62.1,191,62.2z"/>
+ <path class="st7" d="M197.9,59.7h1.1l-4.7,10.1h-1.1L197.9,59.7z"/>
+ <path class="st7" d="M205.8,62.2v1.1c-0.3-0.2-0.6-0.3-1-0.4c-0.3-0.1-0.7-0.1-1-0.1c-0.4,0-0.8,0.1-1.1,0.2
+ c-0.2,0.2-0.4,0.4-0.4,0.7c0,0.3,0.1,0.5,0.3,0.7c0.4,0.2,0.9,0.4,1.4,0.4l0.4,0.1c0.5,0.1,0.9,0.3,1.3,0.6
+ c0.3,0.3,0.4,0.8,0.4,1.2c0,0.6-0.2,1.2-0.7,1.6c-0.6,0.4-1.3,0.6-2,0.6c-0.3,0-0.7,0-1-0.1c-0.4-0.1-0.8-0.2-1.2-0.3v-1.1
+ c0.4,0.2,0.8,0.4,1.2,0.5c0.3,0.1,0.7,0.2,1.1,0.2c0.4,0,0.8-0.1,1.1-0.3c0.3-0.2,0.4-0.5,0.4-0.8c0-0.5-0.5-0.9-1.5-1.1l0,0
+ l-0.4-0.1c-0.5-0.1-1-0.3-1.4-0.6c-0.3-0.3-0.5-0.8-0.4-1.2c0-0.6,0.2-1.1,0.7-1.5c0.5-0.4,1.2-0.6,1.9-0.5c0.3,0,0.7,0,1,0.1
+ C205.2,62,205.5,62.1,205.8,62.2z"/>
+ <path class="st7" d="M209.3,62h2.8v5.8h2.2v0.9h-5.5v-0.9h2.2v-5h-1.7V62z M211,59.4h1.1v1.4H211V59.4z"/>
+ <path class="st7" d="M218.9,62.7c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.1,0.5-0.2,0.8-0.2c0.5,0,0.9,0.2,1.1,0.6
+ c0.3,0.8,0.4,1.6,0.3,2.4v3.9h-1v-3.9c0-0.6,0-1.2-0.2-1.8c-0.1-0.2-0.3-0.4-0.6-0.3c-0.3,0-0.5,0.1-0.7,0.4
+ c-0.2,0.6-0.2,1.2-0.2,1.8v3.8h-1v-3.8c0-0.6,0-1.2-0.2-1.8c-0.1-0.2-0.4-0.4-0.6-0.3c-0.3,0-0.5,0.1-0.6,0.4
+ c-0.2,0.6-0.2,1.2-0.2,1.8v3.8h-1V62h1v0.6c0.1-0.2,0.3-0.4,0.5-0.6c0.2-0.1,0.4-0.2,0.7-0.2c0.3,0,0.5,0.1,0.8,0.2
+ C218.6,62.2,218.8,62.4,218.9,62.7z"/>
+ <path class="st7" d="M224.5,67.9v3.4h-1.1V62h1.1v0.9c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.3,1.1-0.3c0.8,0,1.5,0.3,1.9,0.9
+ c0.5,0.8,0.7,1.7,0.7,2.6c0.1,0.9-0.2,1.8-0.7,2.6c-0.4,0.6-1.2,1-1.9,0.9c-0.4,0-0.7-0.1-1.1-0.3
+ C224.9,68.5,224.6,68.2,224.5,67.9z M227.7,65.3c0-0.7-0.1-1.3-0.4-1.9c-0.2-0.4-0.7-0.7-1.2-0.7c-0.5,0-1,0.2-1.2,0.7
+ c-0.6,1.2-0.6,2.6,0,3.9c0.3,0.4,0.7,0.7,1.2,0.7c0.5,0,1-0.2,1.2-0.7C227.6,66.7,227.8,66,227.7,65.3z"/>
+ <path class="st7" d="M234,66.3c0,0.4,0.1,0.8,0.3,1.1c0.2,0.3,0.5,0.4,0.8,0.4h1.3v0.9H235c-0.6,0-1.1-0.2-1.5-0.6
+ c-0.4-0.5-0.6-1.2-0.5-1.8v-6.1h-1.8v-0.9h2.9V66.3z"/>
+ <path class="st7" d="M243.8,64.8v0.5H239l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0.1-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C243.5,63.2,243.8,64,243.8,64.8z
+ M242.7,64.5c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5c-0.3,0.3-0.5,0.7-0.6,1.2H242.7z"/>
+ <path class="st7" d="M255.9,62.7c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.1,0.5-0.2,0.8-0.2c0.5,0,0.9,0.2,1.1,0.6
+ c0.3,0.8,0.4,1.6,0.3,2.4v3.9h-1v-3.9c0-0.6,0-1.2-0.2-1.8c-0.1-0.2-0.3-0.4-0.6-0.3c-0.3,0-0.5,0.1-0.7,0.4
+ c-0.2,0.6-0.2,1.2-0.2,1.8v3.8h-1v-3.8c0-0.6,0-1.2-0.2-1.8c-0.1-0.2-0.4-0.4-0.6-0.3c-0.3,0-0.5,0.1-0.6,0.4
+ c-0.2,0.6-0.2,1.2-0.2,1.8v3.8h-1V62h1v0.6c0.1-0.2,0.3-0.4,0.5-0.6c0.2-0.1,0.4-0.2,0.7-0.2c0.3,0,0.5,0.1,0.8,0.2
+ C255.7,62.2,255.8,62.4,255.9,62.7z"/>
+ <path class="st7" d="M264.4,66.6c-0.2,0.5-0.4,1.1-0.7,1.8c-0.2,0.7-0.5,1.3-0.8,1.9c-0.2,0.3-0.4,0.5-0.7,0.7
+ c-0.3,0.2-0.7,0.2-1,0.2h-0.9v-0.9h0.6c0.3,0,0.6-0.1,0.8-0.3c0.3-0.4,0.5-0.9,0.7-1.5l-2.6-6.6h1.2l2,5.3L265,62h1.2L264.4,66.6
+ z"/>
+ <path class="st7" d="M273.1,64.9v3.8H272v-1c-0.2,0.4-0.5,0.7-0.9,0.9c-0.4,0.2-0.9,0.3-1.3,0.3c-0.6,0-1.2-0.2-1.6-0.6
+ c-0.9-0.9-0.8-2.4,0.1-3.2c0,0,0,0,0,0c0.7-0.4,1.4-0.6,2.2-0.6h1.5v-0.2c0-0.4-0.1-0.9-0.4-1.2c-0.4-0.3-0.8-0.4-1.3-0.4
+ c-0.4,0-0.8,0.1-1.1,0.2c-0.4,0.1-0.8,0.3-1.1,0.5v-1.1c0.4-0.1,0.8-0.3,1.2-0.3c0.4-0.1,0.7-0.1,1.1-0.1c0.5,0,1,0.1,1.4,0.3
+ c0.4,0.1,0.7,0.4,1,0.7c0.2,0.2,0.3,0.5,0.3,0.7C273.1,64,273.1,64.4,273.1,64.9z M270.9,65.3h-0.4c-0.5,0-1,0.1-1.5,0.3
+ c-0.3,0.2-0.5,0.6-0.5,1c0,0.4,0.1,0.7,0.4,0.9c0.3,0.2,0.6,0.4,1,0.3c0.6,0,1.1-0.2,1.4-0.6c0.4-0.5,0.6-1.1,0.5-1.8v-0.3
+ L270.9,65.3z"/>
+ <path class="st7" d="M276.4,67.9v3.4h-1.1V62h1.1v0.9c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.3,1.1-0.3c0.8,0,1.5,0.3,1.9,0.9
+ c0.5,0.8,0.7,1.7,0.7,2.6c0.1,0.9-0.2,1.8-0.7,2.6c-0.4,0.6-1.2,1-1.9,0.9c-0.4,0-0.7-0.1-1.1-0.3
+ C276.8,68.5,276.5,68.2,276.4,67.9z M279.6,65.3c0-0.7-0.1-1.3-0.4-1.9c-0.2-0.4-0.7-0.7-1.2-0.7c-0.5,0-1,0.2-1.2,0.7
+ c-0.6,1.2-0.6,2.6,0,3.9c0.3,0.4,0.7,0.7,1.2,0.7c0.5,0,1-0.2,1.2-0.7C279.5,66.7,279.6,66,279.6,65.3z"/>
+ <path class="st7" d="M283.8,67.9v3.4h-1.1V62h1.1v0.9c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.3,1.1-0.3c0.8,0,1.5,0.3,1.9,0.9
+ c0.5,0.8,0.7,1.7,0.7,2.6c0.1,0.9-0.2,1.8-0.7,2.6c-0.4,0.6-1.2,1-1.9,0.9c-0.4,0-0.7-0.1-1.1-0.3
+ C284.2,68.5,283.9,68.2,283.8,67.9z M287,65.3c0-0.7-0.1-1.3-0.4-1.9c-0.2-0.4-0.7-0.7-1.2-0.7c-0.5,0-1,0.2-1.2,0.7
+ c-0.6,1.2-0.6,2.6,0,3.9c0.3,0.4,0.7,0.7,1.2,0.7c0.5,0,1-0.2,1.2-0.7C286.9,66.7,287,66,287,65.3z"/>
+ </g>
+ <g class="st6">
+ <path class="st7" d="M37.4,92.3v-1.1l6.3,2.5v1l-6.3,2.5v-1.1l5.1-1.9L37.4,92.3z"/>
+ <path class="st7" d="M59.8,91.3h1.2l2,5.7l2-5.7H66l-2.4,6.7h-1.5L59.8,91.3z"/>
+ <path class="st7" d="M67.7,95.5v-4.2h1.1v4.2c0,0.5,0.1,0.9,0.3,1.3c0.2,0.3,0.6,0.5,1,0.4c0.5,0,0.9-0.2,1.2-0.6
+ c0.3-0.5,0.5-1,0.4-1.6v-3.8h1.1v6.7h-1.1v-1c-0.2,0.4-0.5,0.7-0.8,0.9c-0.4,0.2-0.8,0.3-1.2,0.3c-0.6,0-1.2-0.2-1.5-0.7
+ C67.9,97,67.7,96.2,67.7,95.5z"/>
+ <path class="st7" d="M80.7,94.2v0.5h-4.8l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0.1-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C80.4,92.6,80.7,93.4,80.7,94.2z
+ M79.6,93.8c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5C76.2,93,76,93.4,76,93.8H79.6z"/>
+ <path class="st7" d="M82,93.7h6.4v1H82V93.7z"/>
+ <path class="st7" d="M95.2,97.7c-0.3,0.2-0.6,0.3-0.9,0.4c-0.3,0.1-0.7,0.1-1,0.1c-0.9,0-1.8-0.3-2.4-0.9c-1.2-1.5-1.2-3.7,0-5.2
+ c0.6-0.6,1.5-1,2.4-0.9c0.3,0,0.6,0,0.9,0.1c0.3,0.1,0.6,0.2,0.9,0.4v1.2c-0.3-0.2-0.6-0.4-0.9-0.6c-0.3-0.1-0.7-0.2-1-0.2
+ c-0.6,0-1.2,0.2-1.6,0.7c-0.7,1.2-0.7,2.7,0,3.8c0.4,0.5,1,0.7,1.6,0.7c0.3,0,0.7-0.1,1-0.2c0.3-0.1,0.6-0.3,0.8-0.6L95.2,97.7z"
+ />
+ <path class="st7" d="M100.5,95.6c0,0.4,0.1,0.8,0.3,1.1c0.2,0.3,0.5,0.4,0.8,0.4h1.3v0.9h-1.4c-0.6,0-1.1-0.2-1.5-0.6
+ c-0.4-0.5-0.6-1.2-0.5-1.8v-6.1h-1.8v-0.9h2.9V95.6z"/>
+ <path class="st7" d="M105.5,91.4h2.8v5.8h2.2v0.9h-5.5v-0.9h2.2v-5h-1.7L105.5,91.4z M107.3,88.7h1.1v1.4h-1.1V88.7z"/>
+ <path class="st7" d="M125.1,97.3c-0.3,0.3-0.7,0.5-1.1,0.7c-0.4,0.2-0.9,0.2-1.3,0.2c-1,0.1-2-0.4-2.7-1.2
+ c-1.3-2.1-1.3-4.8,0-6.9c0.6-0.8,1.6-1.3,2.7-1.2c0.4,0,0.7,0.1,1.1,0.2c0.4,0.1,0.7,0.3,1,0.5v1.2c-0.3-0.3-0.6-0.5-1-0.7
+ c-0.3-0.1-0.7-0.2-1.1-0.2c-0.7,0-1.4,0.3-1.8,0.9c-0.4,0.8-0.7,1.8-0.6,2.8c-0.1,1,0.1,1.9,0.6,2.8c0.4,0.6,1.1,0.9,1.8,0.9
+ c0.2,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.6-0.3v-2.4h-1.3v-1h2.5L125.1,97.3z"/>
+ <path class="st7" d="M132.6,94.2v0.5h-4.8l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0.1-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C132.3,92.6,132.6,93.4,132.6,94.2z
+ M131.5,93.8c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5c-0.3,0.3-0.5,0.7-0.6,1.2H131.5z"/>
+ <path class="st7" d="M139.6,93.9v4.2h-1.1v-4.2c0-0.5-0.1-0.9-0.3-1.3c-0.2-0.3-0.6-0.5-1-0.4c-0.5,0-0.9,0.2-1.2,0.6
+ c-0.3,0.5-0.5,1-0.4,1.6v3.8h-1.1v-6.7h1.1v1c0.2-0.4,0.5-0.7,0.8-0.9c0.4-0.2,0.8-0.3,1.2-0.3c0.6,0,1.2,0.2,1.5,0.7
+ C139.5,92.5,139.6,93.2,139.6,93.9z"/>
+ <path class="st7" d="M147.4,94.2v0.5h-4.8l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0.1-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C147.1,92.6,147.4,93.4,147.4,94.2z
+ M146.3,93.8c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5c-0.3,0.3-0.5,0.7-0.6,1.2H146.3z"/>
+ <path class="st7" d="M155,92.7c-0.2-0.2-0.5-0.3-0.7-0.4c-0.3-0.1-0.5-0.1-0.8-0.1c-0.6,0-1.2,0.2-1.6,0.7
+ c-0.4,0.5-0.6,1.2-0.6,1.9v3.3h-1.1v-6.7h1.1v1.3c0.2-0.4,0.5-0.8,0.9-1.1c0.4-0.3,0.9-0.4,1.4-0.4c0.3,0,0.5,0,0.8,0.1
+ c0.2,0.1,0.5,0.2,0.7,0.3L155,92.7z"/>
+ <path class="st7" d="M161.9,94.2v3.8h-1.1v-1c-0.2,0.4-0.5,0.7-0.9,0.9c-0.4,0.2-0.9,0.3-1.3,0.3c-0.6,0-1.2-0.2-1.6-0.6
+ c-0.9-0.9-0.8-2.4,0.1-3.2c0,0,0,0,0,0c0.7-0.4,1.4-0.6,2.2-0.6h1.5v-0.2c0-0.4-0.1-0.9-0.4-1.2c-0.4-0.3-0.8-0.4-1.3-0.4
+ c-0.4,0-0.8,0.1-1.1,0.2c-0.4,0.1-0.8,0.3-1.1,0.5v-1.1c0.4-0.1,0.8-0.3,1.2-0.3c0.4-0.1,0.7-0.1,1.1-0.1c0.5,0,1,0.1,1.4,0.3
+ c0.4,0.1,0.7,0.4,1,0.7c0.2,0.2,0.3,0.5,0.3,0.7C161.9,93.3,161.9,93.8,161.9,94.2z M159.7,94.7h-0.4c-0.5,0-1,0.1-1.5,0.3
+ c-0.3,0.2-0.5,0.6-0.5,1c0,0.4,0.1,0.7,0.4,0.9c0.3,0.2,0.6,0.4,1,0.3c0.6,0,1.1-0.2,1.4-0.6c0.4-0.5,0.6-1.1,0.5-1.8v-0.3
+ L159.7,94.7z"/>
+ <path class="st7" d="M166.6,89.4v1.9h2.5v0.9h-2.5v3.7c0,0.4,0.1,0.7,0.3,1c0.3,0.2,0.6,0.3,1,0.3h1.2V98h-1.4
+ c-0.6,0.1-1.3-0.1-1.8-0.5c-0.4-0.5-0.6-1.1-0.5-1.7v-3.6h-1.8v-0.9h1.8v-1.9H166.6z"/>
+ <path class="st7" d="M177.1,94.2v0.5h-4.8l0,0c-0.1,0.7,0.1,1.4,0.5,2c0.4,0.4,1,0.6,1.6,0.6c0.4,0,0.8-0.1,1.1-0.2
+ c0.4-0.1,0.8-0.3,1.2-0.5v1.1c-0.4,0.2-0.8,0.3-1.2,0.4c-0.4,0.1-0.7,0.1-1.1,0.1c-0.9,0-1.8-0.3-2.4-0.9
+ c-0.6-0.7-0.9-1.6-0.9-2.6c0-0.9,0.3-1.9,0.9-2.6c0.6-0.7,1.4-1,2.3-1c0.8,0,1.5,0.3,2,0.9C176.8,92.6,177.1,93.4,177.1,94.2z
+ M176,93.8c0-0.4-0.2-0.9-0.5-1.2c-0.3-0.4-0.8-0.5-1.3-0.5c-0.5,0-1,0.2-1.3,0.5c-0.3,0.3-0.5,0.7-0.6,1.2H176z"/>
+ <path class="st7" d="M182.9,92.2v-3.5h1.1v9.3h-1.1v-0.8c-0.2,0.3-0.4,0.6-0.7,0.8c-0.3,0.2-0.7,0.3-1.1,0.3
+ c-0.8,0-1.5-0.3-1.9-0.9c-0.5-0.8-0.8-1.7-0.7-2.6c-0.1-0.9,0.2-1.8,0.7-2.6c0.4-0.6,1.2-1,1.9-0.9c0.4,0,0.7,0.1,1.1,0.3
+ C182.5,91.6,182.7,91.9,182.9,92.2z M179.6,94.7c0,0.7,0.1,1.3,0.4,1.9c0.2,0.4,0.7,0.7,1.2,0.7c0.5,0,1-0.2,1.2-0.7
+ c0.6-1.2,0.6-2.6,0-3.9c-0.3-0.4-0.7-0.7-1.2-0.7c-0.5,0-1,0.2-1.2,0.7C179.8,93.4,179.6,94,179.6,94.7z"/>
+ <path class="st7" d="M195.4,92.3h-1.5V91l1.2-2.3h1l-0.6,2.3L195.4,92.3z M198.1,92.3h-1.5V91l1.2-2.3h0.9l-0.6,2.3L198.1,92.3z"
+ />
+ <path class="st7" d="M204,92c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.1,0.5-0.2,0.8-0.2c0.5,0,0.9,0.2,1.1,0.6c0.3,0.8,0.4,1.6,0.3,2.4
+ v3.9h-1v-3.8c0-0.6,0-1.2-0.2-1.8c-0.1-0.2-0.3-0.4-0.6-0.3c-0.3,0-0.5,0.1-0.7,0.4c-0.2,0.6-0.2,1.2-0.2,1.8v3.8h-1v-3.9
+ c0-0.6,0-1.2-0.2-1.8c-0.1-0.2-0.4-0.4-0.6-0.3c-0.3,0-0.5,0.1-0.6,0.4c-0.2,0.6-0.2,1.2-0.2,1.8v3.8h-1v-6.7h1v0.6
+ c0.1-0.2,0.3-0.4,0.5-0.6c0.2-0.1,0.4-0.2,0.7-0.2c0.3,0,0.5,0.1,0.8,0.2C203.8,91.5,203.9,91.8,204,92z"/>
+ <path class="st7" d="M212.6,95.9c-0.2,0.5-0.4,1.1-0.7,1.8c-0.2,0.7-0.5,1.3-0.8,1.9c-0.2,0.3-0.4,0.5-0.7,0.7
+ c-0.3,0.2-0.7,0.2-1,0.2h-0.9v-0.9h0.7c0.3,0,0.6-0.1,0.8-0.3c0.3-0.4,0.5-0.9,0.7-1.5l-2.6-6.6h1.2l2,5.3l2-5.3h1.2L212.6,95.9z
+ "/>
+ <path class="st7" d="M221.2,94.2v3.8h-1.1v-1c-0.2,0.4-0.5,0.7-0.9,0.9c-0.4,0.2-0.9,0.3-1.3,0.3c-0.6,0-1.2-0.2-1.6-0.6
+ c-0.9-0.9-0.8-2.4,0.1-3.2c0,0,0,0,0,0c0.7-0.4,1.4-0.6,2.2-0.6h1.5v-0.2c0-0.4-0.1-0.9-0.4-1.2c-0.4-0.3-0.8-0.4-1.3-0.4
+ c-0.4,0-0.8,0.1-1.1,0.2c-0.4,0.1-0.8,0.3-1.1,0.5v-1.1c0.4-0.1,0.8-0.3,1.2-0.3c0.4-0.1,0.7-0.1,1.1-0.1c0.5,0,1,0.1,1.4,0.3
+ c0.4,0.1,0.7,0.4,1,0.7c0.2,0.2,0.3,0.5,0.3,0.7C221.2,93.3,221.2,93.8,221.2,94.2z M219,94.7h-0.4c-0.5,0-1,0.1-1.5,0.3
+ c-0.3,0.2-0.5,0.6-0.5,1c0,0.4,0.1,0.7,0.4,0.9c0.3,0.2,0.6,0.4,1,0.3c0.6,0,1.1-0.2,1.4-0.6c0.4-0.5,0.6-1.1,0.5-1.8v-0.3
+ L219,94.7z"/>
+ <path class="st7" d="M224.5,97.2v3.4h-1.1v-9.3h1.1v0.9c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.3,1.1-0.3c0.8,0,1.5,0.3,1.9,0.9
+ c0.5,0.8,0.7,1.7,0.7,2.6c0.1,0.9-0.2,1.8-0.7,2.6c-0.4,0.6-1.2,1-1.9,0.9c-0.4,0-0.7-0.1-1.1-0.3
+ C224.9,97.8,224.6,97.5,224.5,97.2z M227.7,94.7c0-0.7-0.1-1.3-0.4-1.9c-0.2-0.4-0.7-0.7-1.2-0.7c-0.5,0-1,0.2-1.2,0.7
+ c-0.6,1.2-0.6,2.6,0,3.9c0.3,0.4,0.7,0.7,1.2,0.7c0.5,0,1-0.2,1.2-0.7C227.6,96,227.8,95.4,227.7,94.7z"/>
+ <path class="st7" d="M231.9,97.2v3.4h-1.1v-9.3h1.1v0.9c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.3,1.1-0.3c0.8,0,1.5,0.3,1.9,0.9
+ c0.5,0.8,0.7,1.7,0.7,2.6c0.1,0.9-0.2,1.8-0.7,2.6c-0.4,0.6-1.2,1-1.9,0.9c-0.4,0-0.7-0.1-1.1-0.3
+ C232.3,97.8,232.1,97.5,231.9,97.2z M235.1,94.7c0-0.7-0.1-1.3-0.4-1.9c-0.2-0.4-0.7-0.7-1.2-0.7c-0.5,0-1,0.2-1.2,0.7
+ c-0.6,1.2-0.6,2.6,0,3.9c0.3,0.4,0.7,0.7,1.2,0.7c0.5,0,1-0.2,1.2-0.7C235,96,235.2,95.4,235.1,94.7L235.1,94.7z"/>
+ <path class="st7" d="M238.9,88.7h1.5V90l-1.2,2.3h-0.9l0.6-2.3L238.9,88.7z M241.7,88.7h1.5V90l-1.2,2.3h-0.9l0.6-2.3L241.7,88.7
+ z"/>
+ </g>
+ </g>
+</g>
+</svg>
diff --git a/packages/vuetifyjs.com/static/doc-images/powered-by-madewithvue-1.svg b/packages/vuetifyjs.com/static/doc-images/powered-by-madewithvue-1.svg
new file mode 100644
index 00000000000..223bbf96599
--- /dev/null
+++ b/packages/vuetifyjs.com/static/doc-images/powered-by-madewithvue-1.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="973px" height="241px" viewBox="0 0 973 241" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+ <title>powered-by-madewithvue-1</title>
+ <desc>Created with Sketch.</desc>
+ <defs></defs>
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="powered-by-madewithvue-1">
+ <g id="Text" transform="translate(276.000000, 33.000000)">
+ <path d="M0.627938729,108.76113 L0.627938729,65.0515807 C0.624730833,63.9436032 1.22111929,62.9205676 2.18685269,62.3774437 C3.40599205,61.639931 4.81665969,61.2810038 6.24002897,61.3461622 C7.51858912,61.3107083 8.77630142,61.6754449 9.83752272,62.3894353 C10.7739972,62.9554083 11.3469009,63.9693569 11.3484701,65.0635724 L11.3484701,68.9968322 C14.1080864,63.6546521 19.7328291,60.4157378 25.7384451,60.7106049 C28.8283831,60.6860373 31.8288814,61.7470338 34.2165387,63.7085164 C36.7680717,65.7991691 38.7243012,68.5246559 39.8885871,71.611011 C41.450118,68.3200898 43.8796708,65.5173975 46.9156916,63.5046584 C49.6588166,61.7018978 52.8668026,60.7353357 56.1492589,60.7225966 C61.1657593,60.6970242 65.9584469,62.7970928 69.3400692,66.5025699 C73.0414906,70.347891 74.8961985,75.5122931 74.9041929,81.9957763 L74.9041929,108.76113 C74.8043273,109.861227 74.15446,110.836027 73.1773959,111.351325 C72.0026513,112.154987 70.6073239,112.574005 69.1841779,112.55049 C67.7961603,112.562677 66.4385889,112.143673 65.2988846,111.351325 C64.323655,110.839985 63.6737074,109.869577 63.5720876,108.773121 L63.5720876,82.0677261 C63.7419383,79.0083832 62.6496471,76.0132516 60.5501929,73.7814989 C58.7231534,71.8448867 56.173474,70.754649 53.5110968,70.7715958 C50.8414112,70.7703095 48.286529,71.857217 46.4360257,73.7814989 C44.3167864,75.9191252 43.1865612,78.8446696 43.3181978,81.8518765 L43.3181978,108.869055 C43.3533987,110.033202 42.7003519,111.109085 41.6513591,111.615141 C40.4026512,112.254707 39.0125213,112.568208 37.6101744,112.526506 C36.2595821,112.549211 34.9245036,112.236045 33.7248812,111.615141 C32.6503091,111.129308 31.9703755,110.048025 31.9980842,108.869055 L31.9980842,81.9598013 C32.105243,79.017965 31.0398687,76.1539629 29.0361477,73.9973485 C27.2321756,71.9941174 24.6567838,70.859199 21.9610766,70.8795206 C19.2862234,70.8525399 16.7215809,71.9435997 14.8860056,73.8894237 C12.8324629,76.1022628 11.7637594,79.0530959 11.9240691,82.0677261 L11.9240691,108.76113 C11.8224493,109.857585 11.1725017,110.827993 10.1972721,111.339334 C9.02184017,112.141557 7.6269809,112.560433 6.20405403,112.538498 C4.77798726,112.58371 3.37606486,112.162712 2.21083598,111.339334 C1.29540351,110.788406 0.705006378,109.826774 0.627938729,108.76113 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M83.0824954,99.1558214 C83.0824954,93.3998314 85.2409916,89.4026162 89.5579841,87.1641756 C93.8749766,84.925735 100.134616,83.7945231 108.336901,83.7705398 L113.13356,83.7705398 L113.13356,81.73196 C113.202537,78.7178617 112.27056,75.7658992 110.483406,73.337808 C108.716637,70.979451 106.034505,69.8002725 102.437012,69.8002725 C99.6205996,69.7381515 96.8297667,70.3464627 94.2946842,71.575036 C93.0686556,72.2705078 91.7895583,72.8679545 90.4693492,73.3617913 C89.2262319,73.3536265 88.0863254,72.6687633 87.495421,71.575036 C86.744719,70.3972357 86.3530519,69.026401 86.3682063,67.6297846 C86.3682063,65.7590878 88.1109922,64.1602017 91.5965639,62.8331262 C95.1241348,61.4593695 98.879274,60.763672 102.664853,60.7825548 C110.07569,60.7825548 115.559869,62.7811624 119.117391,66.7783777 C122.732818,70.8990598 124.644938,76.2409909 124.465665,81.7199684 L124.465665,108.809096 C124.425367,109.898606 123.839443,110.894678 122.906751,111.45925 C121.747856,112.252229 120.36472,112.651614 118.9615,112.598456 C117.646503,112.631518 116.357124,112.231221 115.292056,111.45925 C114.380881,110.880334 113.815166,109.888088 113.781109,108.809096 L113.781109,104.983761 C108.98445,110.579863 103.552235,113.377913 97.484462,113.377913 C93.7036311,113.521598 90.0119661,112.208052 87.1716466,109.70847 C84.4455458,107.278163 83.0824954,103.760613 83.0824954,99.1558214 Z M94.5225255,97.7527989 C94.3827237,99.6981865 95.091072,101.608978 96.4651721,102.993148 C97.8633093,104.217675 99.6810556,104.853671 101.537638,104.767912 C104.496904,104.675677 107.304592,103.43737 109.368183,101.314318 C111.846456,99.0119217 113.085593,96.5656259 113.085593,93.9754304 L113.085593,89.9582291 L110.387473,89.9582291 C107.734638,89.9243454 105.08252,90.0685693 102.449003,90.3899283 C100.449333,90.6573533 98.5530276,91.4381849 96.9448379,92.6563494 C95.3385035,93.8453094 94.4301489,95.7564515 94.5225255,97.7527989 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M134.023007,91.924859 L134.023007,81.9957763 C133.913572,76.4540128 135.940221,71.082534 139.683064,66.9942273 C143.083936,62.9943354 148.079407,60.7029156 153.329557,60.7345882 C156.303209,60.686366 159.224385,61.5209879 161.723709,63.1329174 C164.048766,64.6058428 165.976028,66.6278205 167.335799,69.0208155 L167.335799,34.7127168 C167.355089,33.6042431 167.97514,32.5937898 168.954671,32.0745547 C170.195417,31.3467713 171.618397,30.9889459 173.055814,31.0432732 C174.477392,30.9802255 175.886348,31.3345487 177.10899,32.0625631 C178.06355,32.599352 178.658169,33.6056308 178.667904,34.7007252 L178.667904,108.749138 C178.586787,109.82613 177.981569,110.794479 177.049032,111.339334 C175.883031,112.161126 174.481651,112.58196 173.055814,112.538498 C171.75577,112.555655 170.488061,112.133085 169.45832,111.339334 C168.546149,110.766009 167.965889,109.788495 167.899406,108.713163 L167.899406,104.887828 C166.555753,107.4122 164.51106,109.494372 162.011508,110.883651 C159.299881,112.537539 156.181949,113.405246 153.005782,113.389905 C147.969291,113.389905 143.544374,111.21542 139.73103,106.86645 C136.023539,102.776979 133.986464,97.4446344 134.023007,91.924859 Z M145.355112,91.924859 C145.362392,94.8734164 146.524717,97.7017415 148.592856,99.8033703 C150.519053,102.024234 153.315715,103.297831 156.255518,103.292939 C159.142219,103.258251 161.897551,102.08109 163.91818,100.01922 C166.220576,97.8447348 167.371774,95.9700408 167.371774,94.395138 L167.371774,82.0197595 C167.477304,78.9791571 166.256356,76.0427561 164.026105,73.9733652 C161.976722,71.9752477 159.225678,70.8601923 156.363443,70.8675289 C153.423012,70.864784 150.619908,72.1115766 148.652815,74.2971396 C146.562984,76.3253328 145.374896,79.1076178 145.355112,82.0197595 L145.355112,91.924859 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M188.740887,91.924859 L188.740887,81.6720018 C188.714475,76.0414007 191.11306,70.6718917 195.3243,66.9342691 C199.587184,62.847342 205.296876,60.6178022 211.201239,60.7345882 C216.786204,60.6153309 222.2081,62.6212182 226.370671,66.3466785 C230.489076,69.8888917 232.803647,75.0900747 232.678277,80.5208038 C232.736224,82.32983 232.480627,84.1352368 231.922803,85.8570862 C231.52604,87.0877115 230.665883,88.1155988 229.524474,88.7230896 C228.577922,89.2267155 227.558231,89.5787517 226.502579,89.7663627 C225.286558,89.9300553 224.059962,90.002208 222.833136,89.9822124 L200.049009,89.9822124 L200.049009,92.4764747 C199.932889,95.8208442 201.399185,99.0244779 204.006252,101.122451 C206.881851,103.354237 210.454217,104.496884 214.091226,104.348204 C217.016442,104.36249 219.899894,103.653985 222.485378,102.285641 C223.973752,101.365243 225.59015,100.670192 227.282036,100.223078 C228.538633,100.251641 229.700448,100.897592 230.387873,101.949875 C231.173362,102.898394 231.628053,104.077224 231.68297,105.307536 C231.68297,107.082299 229.956173,108.877049 226.502579,110.691785 C222.541249,112.618918 218.170471,113.553162 213.767451,113.413888 C206.428564,113.413888 200.432741,111.415281 195.779983,107.418065 C191.16879,103.616385 188.571059,97.8987208 188.740887,91.924859 L188.740887,91.924859 Z M200.061,82.7632416 L217.976519,82.7632416 C219.079454,82.8760424 220.190825,82.6546038 221.166297,82.1276844 C221.800182,81.4378668 222.094581,80.5019426 221.969737,79.5734638 C221.999783,76.8386385 220.861115,74.221011 218.839918,72.3784763 C216.751298,70.388453 213.952895,69.317459 211.069331,69.4045481 C208.218637,69.3437722 205.4478,70.3486285 203.298745,72.2225849 C201.18061,74.0030801 199.988845,76.6514465 200.061,79.4175724 L200.061,82.7632416 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M258.556249,65.6991296 C258.672371,64.2250667 259.595872,62.9367825 260.954578,62.3534604 C262.398333,61.4632422 264.055321,60.9785732 265.751236,60.9504378 C267.236674,60.7600695 268.66089,61.6056977 269.20483,63.0010093 L281.196476,96.5776176 L290.346102,66.7783777 C290.849751,65.1235306 292.180823,64.296107 294.33932,64.296107 C296.497816,64.296107 297.828889,65.1235306 298.332538,66.7783777 L307.398222,96.7574923 L319.485801,62.977026 C319.9175,61.6099784 321.032723,60.9264546 322.83147,60.9264546 C324.526232,60.9621307 326.18128,61.4462322 327.628128,62.3294771 C329.010667,62.9414011 329.935994,64.273873 330.026458,65.7830711 C330.019441,66.3844921 329.871589,66.9759008 329.594758,67.5098681 L312.806454,111.327342 C312.230855,112.838289 310.719908,113.593763 308.273612,113.593763 C305.827316,113.593763 304.280394,112.874264 303.632845,111.435267 L294.243387,83.5906651 L284.961853,111.171451 C284.314304,112.826298 282.695432,113.653721 280.105236,113.653721 C277.706907,113.653721 276.19596,112.826298 275.572394,111.171451 L258.78409,67.5698263 C258.622134,66.9597715 258.545458,66.330224 258.556249,65.6991296 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M336.262113,42.6032198 C336.248446,40.9804566 336.96101,39.4365687 338.20476,38.3941521 C340.870192,36.0915955 344.820862,36.0915955 347.486294,38.3941521 C348.730349,39.4330956 349.449394,40.9704023 349.449394,42.5912281 C349.449394,44.2120539 348.730349,45.7493606 347.486294,46.7883041 C344.849102,49.1655403 340.841952,49.1655403 338.20476,46.7883041 C336.972884,45.7471321 336.26223,44.2161541 336.262113,42.6032198 L336.262113,42.6032198 Z M337.233437,108.76113 L337.233437,65.0515807 C337.238881,63.9521871 337.834087,62.9403385 338.792351,62.401427 C340.01149,61.6639143 341.422158,61.304987 342.845527,61.3701455 C344.283014,61.3151461 345.70618,61.6730181 346.94667,62.401427 C347.929926,62.9227237 348.550595,63.938783 348.565542,65.0515807 L348.565542,108.76113 C348.473628,109.85072 347.843781,110.822484 346.886712,111.351325 C345.700341,112.168312 344.285501,112.588146 342.845527,112.55049 C341.41946,112.595701 340.017538,112.174704 338.852309,111.351325 C337.919772,110.806471 337.314554,109.838122 337.233437,108.76113 L337.233437,108.76113 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M360.329347,95.7022274 L360.329347,41.6318964 C360.394534,40.5198729 361.054732,39.5295755 362.056144,39.0417009 C363.221896,38.3189705 364.569943,37.9445131 365.941437,37.9624528 C367.331312,37.9481886 368.697608,38.3219473 369.886688,39.0417009 C370.908472,39.5143538 371.589568,40.5083859 371.661452,41.6318964 L371.661452,61.3821371 L384.852262,61.3821371 C385.763697,61.3654588 386.619731,61.8183869 387.118683,62.5813017 C388.296656,64.4063362 388.296656,66.7520901 387.118683,68.5771246 C386.619731,69.3400394 385.763697,69.7929674 384.852262,69.7762892 L371.661452,69.7762892 L371.661452,95.6782441 C371.661452,98.2684396 372.221062,100.103161 373.340282,101.18241 C374.459503,102.261658 376.422135,102.801282 379.22818,102.801282 L383.005549,102.801282 C384.352098,102.720935 385.666432,103.233526 386.603043,104.204304 C388.32984,106.182926 388.32984,109.132871 386.603043,111.111492 C385.667351,112.083649 384.352355,112.596498 383.005549,112.514515 L379.22818,112.514515 C366.628958,112.530504 360.329347,106.926408 360.329347,95.7022274 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M396.052459,108.76113 L396.052459,34.7127168 C396.062194,33.6176224 396.656814,32.6113436 397.611373,32.0745547 C398.833745,31.3458852 400.2429,30.9915119 401.66455,31.0552648 C403.085381,31.0139853 404.489403,31.3712216 405.717726,32.0865464 C406.722334,32.5875968 407.368145,33.6024421 407.396556,34.7247085 L407.396556,69.0208155 C410.039786,63.8460507 415.401117,60.6301828 421.210932,60.7345882 C426.321289,60.7498445 431.158159,63.0451593 434.401743,66.9942273 C438.084309,71.1118768 440.068409,76.4728051 439.953875,81.9957763 L439.953875,108.76113 C439.942768,109.929058 439.274881,110.991185 438.227078,111.507217 C437.015268,112.209457 435.634167,112.566138 434.23386,112.538498 C432.869995,112.559798 431.526327,112.207292 430.348567,111.519208 C429.298816,111.00534 428.630082,109.941868 428.62177,108.773121 L428.62177,82.0677261 C428.60568,79.1597218 427.442071,76.3756782 425.384025,74.3211229 C423.444168,72.1245612 420.651866,70.8704285 417.721363,70.8795206 C415.00628,70.8862723 412.410044,71.9939995 410.526376,73.9493819 C408.394616,76.1042298 407.259985,79.0516626 407.396556,82.0797178 L407.396556,108.773121 C407.2928,109.868817 406.643473,110.838299 405.669759,111.351325 C404.49467,112.154266 403.099578,112.573213 401.676541,112.55049 C400.250589,112.594825 398.848939,112.173909 397.683323,111.351325 C396.746185,110.809321 396.136171,109.840477 396.052459,108.76113 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M472.632801,64.180659 C472.674337,63.2452991 473.183575,62.3935641 473.987857,61.914238 C474.810077,61.2921434 475.810863,60.9515395 476.841869,60.9429146 C477.971339,60.8375537 479.031834,61.5003634 479.432064,62.5617868 L493.678139,101.414719 L507.924215,63.0414527 C508.499814,61.674405 509.327237,60.9908812 510.406485,60.9908812 C511.415661,61.0386858 512.389767,61.375876 513.21253,61.9622045 C514.058697,62.3683162 514.631524,63.1866402 514.723478,64.1207008 C514.716908,64.7221793 514.56903,65.3136896 514.291779,65.8474978 L496.915884,111.415752 C496.484185,112.56695 495.404936,113.142549 493.678139,113.142549 C491.951342,113.142549 490.872094,112.56695 490.440395,111.415752 L473.0645,65.8474978 C472.752434,65.3495769 472.601671,64.7674653 472.632801,64.180659 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M522.601989,92.6728095 L522.601989,63.8928595 C522.644707,63.1550579 523.025189,62.4781533 523.633271,62.0581377 C524.347454,61.4706998 525.251281,61.1637399 526.1755,61.1947392 C527.051536,61.1919207 527.900606,61.4975856 528.573829,62.0581377 C529.200137,62.4678232 529.599296,63.1463937 529.653077,63.8928595 L529.653077,92.6728095 C529.653793,96.2747012 531.091045,99.7275588 533.646295,102.266126 C536.080118,104.939783 539.528165,106.463734 543.143678,106.463734 C546.759191,106.463734 550.207239,104.939783 552.641062,102.266126 C555.196312,99.7275588 556.633564,96.2747012 556.63428,92.6728095 L556.63428,63.6890015 C556.653482,62.9322112 557.061396,62.2387583 557.713528,61.8542797 C558.44147,61.3488231 559.309693,61.0845813 560.195799,61.098806 C561.055737,61.0857905 561.896899,61.3507564 562.594128,61.8542797 C563.218387,62.2578014 563.600602,62.9457893 563.613418,63.6890015 L563.613418,92.6128512 C563.638893,98.0017887 561.428822,103.160069 557.50967,106.858926 C551.686308,112.648634 542.967956,114.400587 535.360077,111.309885 C527.752197,108.219184 522.725737,100.883402 522.589998,92.6728095 L522.601989,92.6728095 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M574.729674,92.4689515 L574.729674,80.3693809 C574.675294,75.0732826 576.851392,69.9986217 580.725496,66.3871218 C588.713349,58.6381563 601.376883,58.5220739 609.505446,66.1233056 C613.437418,69.7190497 615.623442,74.8387177 615.501269,80.1655229 C615.553166,81.7928609 615.317724,83.4166038 614.805754,84.9621812 C614.419775,86.0867994 613.605198,87.0134343 612.539333,87.5403851 C611.638622,87.9972731 610.677744,88.3242949 609.685321,88.5117084 C608.493737,88.6785353 607.29081,88.7507109 606.087827,88.727558 L581.732795,88.727558 L581.732795,92.720776 C581.592436,96.6483297 583.290524,100.416932 586.325595,102.913675 C589.674783,105.568796 593.86719,106.930796 598.137366,106.751002 C600.324522,106.795222 602.500593,106.429154 604.552897,105.671754 C606.042016,105.134208 607.45646,104.408852 608.761964,103.513257 C609.414285,102.932357 610.223555,102.556923 611.088344,102.434009 C611.925822,102.46023 612.702594,102.877467 613.186882,103.561224 C613.735482,104.174695 614.057156,104.957717 614.098247,105.779678 C614.098247,107.290626 612.551324,108.857534 609.45748,110.480404 C605.857813,112.199169 601.895905,113.021995 597.909525,112.878733 C591.074287,112.878733 585.498171,110.992047 581.181179,107.218676 C576.925398,103.51997 574.556789,98.1047484 574.729674,92.4689515 L574.729674,92.4689515 Z M581.744786,83.6191169 L603.329749,83.6191169 C604.804179,83.749468 606.287856,83.5104311 607.646741,82.9236014 C608.481784,82.1857811 608.887743,81.0761584 608.725989,79.9736565 C608.745628,76.4464203 607.370683,73.0543144 604.900654,70.5362313 C602.41698,67.8478537 598.894152,66.3617972 595.235388,66.4590717 C591.645349,66.3867922 588.180995,67.7811949 585.642071,70.3203817 C583.093156,72.7057826 581.661922,76.0511278 581.69682,79.5419573 L581.744786,83.6191169 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M623.607622,107.506475 C623.562864,106.088303 624.045685,104.703929 624.962678,103.621182 C625.81047,102.600343 627.077607,102.021964 628.40428,102.050276 C629.689989,102.068217 630.898275,102.66795 631.689991,103.68114 C632.620662,104.736094 633.125114,106.099823 633.105005,107.506475 C633.113212,108.878676 632.60856,110.204457 631.689991,111.223886 C630.895884,112.232575 629.687961,112.82772 628.40428,112.842758 C627.077607,112.87107 625.81047,112.292691 624.962678,111.271852 C624.059654,110.22821 623.576707,108.886216 623.607622,107.506475 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M633.752554,134.008013 C633.7203,133.127141 634.029637,132.26787 634.615953,131.609683 C635.160509,130.990997 635.950442,130.644305 636.774449,130.662343 C639.972221,130.662343 642.058768,129.495157 643.034088,127.160783 C644.009409,124.826409 644.513058,121.328846 644.545035,116.668093 L644.545035,63.6890015 C644.524396,62.9363632 644.891049,62.2256912 645.516359,61.8063131 C647.046975,60.8382553 648.99825,60.8382553 650.528867,61.8063131 C651.167293,62.219143 651.551467,62.9287346 651.548157,63.6890015 L651.548157,116.788009 C651.548157,130.378541 646.799465,137.173807 637.302081,137.173807 C636.308674,137.25795 635.326715,136.913173 634.603961,136.226467 C634.053336,135.619094 633.749657,134.827819 633.752554,134.008013 L633.752554,134.008013 Z M644.545035,44.6942346 C643.64494,43.8789415 643.134687,42.7188791 643.142013,41.5044568 C643.130026,40.3063208 643.64261,39.1628641 644.545035,38.3746372 C645.483193,37.5089183 646.722558,37.0441562 647.998629,37.0795395 C649.227314,37.0501166 650.416036,37.5169602 651.296332,38.3746372 C652.17318,39.1772909 652.666099,40.3158025 652.651388,41.5044568 C652.663802,42.7076428 652.177631,43.8622992 651.308324,44.6942346 C650.444387,45.5834218 649.250146,46.0741461 648.010621,46.0492905 C646.72015,46.0823425 645.470829,45.5938535 644.545035,44.6942346 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M661.92093,105.192088 C661.942097,104.411521 662.206184,103.656989 662.676404,103.033591 C663.032246,102.404772 663.68204,101.998651 664.403201,101.954343 C665.298308,102.124132 666.128634,102.539295 666.80153,103.153508 C668.241477,104.17983 669.799576,105.029337 671.442297,105.683745 C673.728829,106.595952 676.176181,107.036476 678.637285,106.978843 C682.450628,106.978843 685.248679,106.259344 687.031437,104.820347 C688.761459,103.524483 689.764917,101.477428 689.729557,99.3161812 C689.824481,96.9322882 688.810529,94.638722 686.98347,93.1045087 C685.03183,91.4952031 682.770751,90.303443 680.340098,89.6029481 L672.521545,87.204619 C669.956507,86.4467381 667.644349,85.0088906 665.830207,83.0435179 C663.919638,80.8538202 662.93495,78.0072539 663.08412,75.1050483 C663.080274,71.2601413 664.62815,67.5763695 667.377129,64.8881661 C670.215152,61.9781934 674.476183,60.5192098 680.160224,60.5112154 C683.527032,60.4853367 686.872004,61.0536572 690.04134,62.1900458 C693.095212,63.3092661 694.626146,64.5084307 694.63414,65.7875395 C694.590656,66.6549367 694.290109,67.4897895 693.770742,68.1858687 C693.362564,68.9481666 692.583898,69.4399555 691.72017,69.4809665 C690.356985,69.066658 689.022952,68.5618886 687.726952,67.9700191 C685.383985,66.9834369 682.870247,66.4660224 680.328107,66.4470801 C676.730613,66.4470801 674.032493,67.2944897 672.233746,68.989309 C670.557157,70.4168125 669.574492,72.4956952 669.535625,74.6973324 C669.497024,76.7939095 670.556531,78.7583168 672.329679,79.8777234 C674.38865,81.2367692 676.645915,82.268315 679.021017,82.9355931 L686.91152,85.273964 C689.557879,86.0852854 691.873944,87.7246058 693.518917,89.9507059 C695.408223,92.5896826 696.358219,95.7858914 696.217037,99.0283817 C696.392555,102.963539 694.693255,106.749152 691.636229,109.233272 C688.574362,111.711546 684.309333,112.950683 678.841142,112.950683 C674.69839,113.071678 670.586786,112.200018 666.849497,110.408454 C663.563786,108.729623 661.92093,106.990835 661.92093,105.192088 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M1.275,28.9715563 L1.275,9.98603364 C1.275,9.61558256 1.45507768,9.31716812 1.81523845,9.09078135 C2.17539922,8.86439458 2.62302089,8.7512029 3.15811688,8.7512029 C3.69321288,8.7512029 4.13568947,8.86439458 4.48555993,9.09078135 C4.83543039,9.31716812 5.010363,9.61558256 5.010363,9.98603364 L5.010363,10.9121567 C5.40139469,10.253577 5.96220804,9.69790873 6.69281989,9.24513519 C7.42343173,8.79236166 8.25178907,8.56597828 9.17791676,8.56597828 C10.7214629,8.56597828 12.0283124,9.1782424 13.0985044,10.402789 C14.1686964,11.6273356 14.7037843,13.1039726 14.7037843,14.8327443 L14.7037843,17.3641473 C14.7037843,19.0311772 14.1584062,20.5026691 13.0676336,21.7786672 C11.976861,23.0546654 10.7214623,23.6926549 9.30139983,23.6926549 C8.41643337,23.6926549 7.59836619,23.4508363 6.84717373,22.9671918 C6.09598127,22.4835474 5.56603838,21.9124439 5.25732915,21.2538642 L5.25732915,28.9715563 C5.25732915,29.3008462 5.05667116,29.5941155 4.65534916,29.8513732 C4.25402716,30.1086309 3.77553503,30.2372578 3.21985842,30.2372578 C2.66418181,30.2372578 2.20112491,30.1086309 1.83067383,29.8513732 C1.46022276,29.5941155 1.275,29.3008462 1.275,28.9715563 Z M5.25732915,17.9198212 C5.25732915,18.3314335 5.53516329,18.8150707 6.0908399,19.3707473 C6.64651651,19.9264239 7.27421586,20.204258 7.97395678,20.204258 C8.69427832,20.204258 9.33226782,19.9109887 9.88794443,19.3244411 C10.443621,18.7378936 10.7214552,18.0844689 10.7214552,17.3641473 L10.7214552,14.8327443 C10.7214552,14.1124228 10.443621,13.4692882 9.88794443,12.9033213 C9.33226782,12.3373543 8.67369801,12.0543751 7.91221524,12.0543751 C7.21247432,12.0543751 6.59506513,12.311629 6.05996913,12.8261443 C5.52487313,13.3406597 5.25732915,14.0095197 5.25732915,14.8327443 L5.25732915,17.9198212 Z M16.7103843,17.3641473 L16.7103843,14.8327443 C16.7103843,13.1451339 17.3689541,11.678787 18.6861135,10.4336598 C20.0032729,9.18853256 21.5776663,8.56597828 23.4093411,8.56597828 C25.1998546,8.56597828 26.7639579,9.18338748 28.1016979,10.4182244 C29.4394379,11.6530613 30.1082978,13.1245532 30.1082978,14.8327443 L30.1082978,17.3641473 C30.1082978,19.0311772 29.4394379,20.5026691 28.1016979,21.7786672 C26.7639579,23.0546654 25.1998546,23.6926549 23.4093411,23.6926549 C21.6188275,23.6926549 20.0547242,23.0546654 18.7169842,21.7786672 C17.3792443,20.5026691 16.7103843,19.0311772 16.7103843,17.3641473 Z M20.6927134,17.3641473 C20.6927134,18.1050495 20.9602574,18.7636193 21.4953534,19.3398765 C22.0304494,19.9161337 22.6684389,20.204258 23.4093411,20.204258 C24.1296626,20.204258 24.762507,19.9161337 25.3078933,19.3398765 C25.8532796,18.7636193 26.1259687,18.1050495 26.1259687,17.3641473 L26.1259687,14.8327443 C26.1259687,14.1330034 25.8532796,13.4950139 25.3078933,12.9187567 C24.762507,12.3424994 24.1296626,12.0543751 23.4093411,12.0543751 C22.6684389,12.0543751 22.0304494,12.3373543 21.4953534,12.9033213 C20.9602574,13.4692882 20.6927134,14.1124228 20.6927134,14.8327443 L20.6927134,17.3641473 Z M31.3122578,10.2329998 C31.3122578,9.78022625 31.6003821,9.3943455 32.1766393,9.07534597 C32.7528966,8.75634643 33.3291452,8.59684905 33.9054024,8.59684905 C34.5022402,8.59684905 34.8829759,8.81294227 35.0476208,9.24513519 L38.1346977,18.0124335 L40.4500053,10.3873536 C40.6146502,9.85225763 41.067417,9.58471365 41.8083191,9.58471365 C42.5492213,9.58471365 43.001988,9.85225763 43.166633,10.3873536 L45.4510698,18.0433042 L48.5690175,9.24513519 C48.7336624,8.81294227 49.1143981,8.59684905 49.7112359,8.59684905 C50.2669125,8.59684905 50.8328709,8.76149151 51.4091282,9.09078135 C51.9853854,9.42007119 52.2735097,9.81109702 52.2735097,10.2638706 C52.2735097,10.4902573 52.2323491,10.6754801 52.1500266,10.8195444 L47.3959283,23.0443687 C47.2107027,23.5177229 46.6859049,23.7543964 45.8215191,23.7543964 C44.915972,23.7543964 44.3705939,23.5177229 44.1853683,23.0443687 L41.8083191,16.3145412 L39.4621407,23.013498 C39.2769152,23.5074327 38.7109568,23.7543964 37.7642485,23.7543964 C36.9204432,23.7543964 36.4059356,23.5074327 36.22071,23.013498 L31.4666117,10.8195444 C31.3637086,10.6137382 31.3122578,10.4182253 31.3122578,10.2329998 Z M53.4774697,17.3641473 L53.4774697,14.740132 C53.4774697,13.0525215 54.1360395,11.6016099 55.4531989,10.3873536 C56.7703582,9.17309733 58.365332,8.56597828 60.238168,8.56597828 C61.9875203,8.56597828 63.4847376,9.11650148 64.7298648,10.2175644 C65.974992,11.3186273 66.5975463,12.7026529 66.5975463,14.3696828 C66.5975463,14.9871012 66.5203702,15.4964638 66.3660155,15.8977858 C66.2116609,16.2991078 65.9749874,16.582087 65.6559879,16.746732 C65.3369883,16.9113769 65.043719,17.0142784 64.776171,17.0554396 C64.508623,17.0966009 64.1587577,17.1171812 63.7265648,17.1171812 L57.4597988,17.1171812 L57.4597988,17.5802427 C57.4597988,18.4652092 57.7890837,19.1803748 58.4476634,19.7257611 C59.1062431,20.2711474 59.9809061,20.5438365 61.0716787,20.5438365 C61.8537421,20.5438365 62.6255036,20.3483236 63.3869864,19.9572919 C64.1484691,19.5662602 64.6423965,19.3707473 64.8687833,19.3707473 C65.3009762,19.3707473 65.6611316,19.5714053 65.9492602,19.9727273 C66.2373888,20.3740493 66.3814509,20.75993 66.3814509,21.1303811 C66.3814509,21.7066383 65.8617982,22.2777418 64.8224771,22.8437088 C63.783156,23.4096757 62.4917418,23.6926549 60.9481957,23.6926549 C58.7460698,23.6926549 56.9504381,23.1112612 55.5612465,21.9484565 C54.172055,20.7856517 53.4774697,19.2575639 53.4774697,17.3641473 Z M57.4597988,14.7710028 L61.966931,14.7710028 C62.2962209,14.7710028 62.5277493,14.7144069 62.6615233,14.6012135 C62.7952973,14.4880202 62.8621833,14.2667819 62.8621833,13.937492 C62.8621833,13.2171705 62.5997844,12.6306317 62.0749787,12.1778582 C61.550173,11.7250847 60.9070384,11.4987013 60.1455557,11.4987013 C59.4252341,11.4987013 58.7975348,11.7199396 58.2624388,12.1624228 C57.7273428,12.6049061 57.4597988,13.1862997 57.4597988,13.9066212 L57.4597988,14.7710028 Z M68.9745955,22.1491165 L68.9745955,9.98603364 C68.9745955,9.61558256 69.1546732,9.31716812 69.5148339,9.09078135 C69.8749947,8.86439458 70.3431967,8.7512029 70.9194539,8.7512029 C71.4339693,8.7512029 71.8610107,8.86439458 72.2005908,9.09078135 C72.540171,9.31716812 72.7099585,9.61558256 72.7099585,9.98603364 L72.7099585,11.2517352 C73.0392483,10.5314136 73.553756,9.90371426 74.2534969,9.36861827 C74.9532378,8.83352227 75.704419,8.56597828 76.507063,8.56597828 L77.4640568,8.56597828 C77.8345079,8.56597828 78.1689379,8.74091089 78.4673568,9.09078135 C78.7657757,9.44065181 78.914983,9.84196779 78.914983,10.2947413 C78.914983,10.7680955 78.7657757,11.1797016 78.4673568,11.5295721 C78.1689379,11.8794425 77.8345079,12.0543751 77.4640568,12.0543751 L76.507063,12.0543751 C75.5603547,12.0543751 74.7319974,12.4762714 74.0219661,13.3200766 C73.3119349,14.1638819 72.9569246,15.2649283 72.9569246,16.6232489 L72.9569246,22.1491165 C72.9569246,22.4578257 72.7511216,22.74595 72.3395093,23.013498 C71.927897,23.281046 71.4545499,23.414818 70.9194539,23.414818 C70.3637773,23.414818 69.9007204,23.2861911 69.5302693,23.0289334 C69.1598182,22.7716757 68.9745955,22.4784063 68.9745955,22.1491165 Z M79.7484937,17.3641473 L79.7484937,14.740132 C79.7484937,13.0525215 80.4070635,11.6016099 81.7242229,10.3873536 C83.0413823,9.17309733 84.636356,8.56597828 86.509192,8.56597828 C88.2585443,8.56597828 89.7557616,9.11650148 91.0008889,10.2175644 C92.2460161,11.3186273 92.8685704,12.7026529 92.8685704,14.3696828 C92.8685704,14.9871012 92.7913942,15.4964638 92.6370396,15.8977858 C92.482685,16.2991078 92.2460115,16.582087 91.9270119,16.746732 C91.6080124,16.9113769 91.314743,17.0142784 91.047195,17.0554396 C90.779647,17.0966009 90.4297818,17.1171812 89.9975889,17.1171812 L83.7308229,17.1171812 L83.7308229,17.5802427 C83.7308229,18.4652092 84.0601078,19.1803748 84.7186875,19.7257611 C85.3772671,20.2711474 86.2519302,20.5438365 87.3427028,20.5438365 C88.1247662,20.5438365 88.8965277,20.3483236 89.6580104,19.9572919 C90.4194932,19.5662602 90.9134206,19.3707473 91.1398073,19.3707473 C91.5720002,19.3707473 91.9321556,19.5714053 92.2202842,19.9727273 C92.5084128,20.3740493 92.652475,20.75993 92.652475,21.1303811 C92.652475,21.7066383 92.1328222,22.2777418 91.0935012,22.8437088 C90.0541801,23.4096757 88.7627659,23.6926549 87.2192197,23.6926549 C85.0170939,23.6926549 83.2214621,23.1112612 81.8322706,21.9484565 C80.4430791,20.7856517 79.7484937,19.2575639 79.7484937,17.3641473 Z M83.7308229,14.7710028 L88.2379551,14.7710028 C88.5672449,14.7710028 88.7987734,14.7144069 88.9325474,14.6012135 C89.0663214,14.4880202 89.1332074,14.2667819 89.1332074,13.937492 C89.1332074,13.2171705 88.8708085,12.6306317 88.3460028,12.1778582 C87.8211971,11.7250847 87.1780625,11.4987013 86.4165797,11.4987013 C85.6962582,11.4987013 85.0685588,11.7199396 84.5334628,12.1624228 C83.9983669,12.6049061 83.7308229,13.1862997 83.7308229,13.9066212 L83.7308229,14.7710028 Z M94.7208165,17.3641473 L94.7208165,14.8327443 C94.7208165,13.1245532 95.2610495,11.6530613 96.3415318,10.4182244 C97.4220141,9.18338748 98.7134284,8.56597828 100.215813,8.56597828 C101.12136,8.56597828 101.918847,8.79236166 102.608298,9.24513519 C103.297748,9.69790873 103.827691,10.253577 104.198142,10.9121567 L104.198142,1.43483074 C104.198142,1.06437967 104.38851,0.765965222 104.769252,0.539578454 C105.149993,0.313191686 105.628485,0.2 106.204742,0.2 C106.781,0.2 107.254347,0.313191686 107.624798,0.539578454 C107.995249,0.765965222 108.180472,1.06437967 108.180472,1.43483074 L108.180472,22.1491165 C108.180472,22.4784063 107.990104,22.7716757 107.609362,23.0289334 C107.228621,23.2861911 106.760419,23.414818 106.204742,23.414818 C105.731388,23.414818 105.314637,23.281046 104.954476,23.013498 C104.594315,22.74595 104.414238,22.4578257 104.414238,22.1491165 L104.414238,21.2538642 C104.084948,21.9124439 103.524135,22.4835474 102.731781,22.9671918 C101.939427,23.4508363 101.069909,23.6926549 100.123201,23.6926549 C98.7031385,23.6926549 97.4477398,23.0546654 96.3569672,21.7786672 C95.2661946,20.5026691 94.7208165,19.0311772 94.7208165,17.3641473 Z M98.7031456,17.3641473 C98.7031456,18.0844689 98.9706896,18.7378936 99.5057856,19.3244411 C100.040882,19.9109887 100.668581,20.204258 101.388902,20.204258 C102.109224,20.204258 102.757504,19.9212788 103.333761,19.3553119 C103.910018,18.789345 104.198142,18.3108529 104.198142,17.9198212 L104.198142,14.8327443 C104.198142,14.0095197 103.915163,13.3406597 103.349196,12.8261443 C102.783229,12.311629 102.140095,12.0543751 101.419773,12.0543751 C100.678871,12.0543751 100.040882,12.3373543 99.5057856,12.9033213 C98.9706896,13.4692882 98.7031456,14.1124228 98.7031456,14.8327443 L98.7031456,17.3641473 Z M117.503444,22.1491165 L117.503444,1.43483074 C117.503444,1.06437967 117.683521,0.765965222 118.043682,0.539578454 C118.403843,0.313191686 118.872045,0.2 119.448302,0.2 C120.024559,0.2 120.508197,0.313191686 120.899228,0.539578454 C121.29026,0.765965222 121.485773,1.06437967 121.485773,1.43483074 L121.485773,10.9121567 C121.835643,10.253577 122.355296,9.69790873 123.044747,9.24513519 C123.734197,8.79236166 124.531684,8.56597828 125.437231,8.56597828 C126.939616,8.56597828 128.23103,9.18338748 129.311513,10.4182244 C130.391995,11.6530613 130.932228,13.1245532 130.932228,14.8327443 L130.932228,17.3641473 C130.932228,19.0311772 130.38685,20.5026691 129.296077,21.7786672 C128.205305,23.0546654 126.949906,23.6926549 125.529844,23.6926549 C124.603716,23.6926549 123.739343,23.4508363 122.936699,22.9671918 C122.134055,22.4835474 121.568097,21.9124439 121.238807,21.2538642 L121.238807,22.1491165 C121.238807,22.4578257 121.058729,22.74595 120.698568,23.013498 C120.338407,23.281046 119.921656,23.414818 119.448302,23.414818 C118.892625,23.414818 118.429569,23.2861911 118.059118,23.0289334 C117.688666,22.7716757 117.503444,22.4784063 117.503444,22.1491165 Z M121.485773,17.9198212 C121.485773,18.3108529 121.768752,18.789345 122.334719,19.3553119 C122.900686,19.9212788 123.54382,20.204258 124.264142,20.204258 C124.984464,20.204258 125.612163,19.9109887 126.147259,19.3244411 C126.682355,18.7378936 126.949899,18.0844689 126.949899,17.3641473 L126.949899,14.8327443 C126.949899,14.1124228 126.682355,13.4692882 126.147259,12.9033213 C125.612163,12.3373543 124.974173,12.0543751 124.233271,12.0543751 C123.53353,12.0543751 122.900686,12.311629 122.334719,12.8261443 C121.768752,13.3406597 121.485773,14.0095197 121.485773,14.8327443 L121.485773,17.9198212 Z M132.012705,28.5393656 C132.012705,27.4280123 132.35228,26.872344 133.03144,26.872344 C133.998729,26.872344 134.950568,26.5224788 135.886986,25.8227379 C136.823404,25.122997 137.343057,23.9602097 137.44596,22.3343411 L132.136188,10.9738982 C132.053866,10.7680921 132.012705,10.5931595 132.012705,10.4490952 C132.012705,9.9551604 132.316264,9.51268381 132.923393,9.12165212 C133.530521,8.73062043 134.111914,8.53510752 134.667591,8.53510752 C135.285009,8.53510752 135.665745,8.76149089 135.809809,9.21426442 L139.514302,18.4446242 L142.508766,9.21426442 C142.652831,8.76149089 143.002696,8.53510752 143.558372,8.53510752 C144.093468,8.53510752 144.680007,8.7357655 145.318006,9.1370875 C145.956005,9.5384095 146.275,9.99632132 146.275,10.5108367 C146.275,10.6754816 146.24413,10.8298339 146.182388,10.9738982 L141.675255,22.4886949 L141.150452,23.8470087 C140.903485,24.5467496 140.723407,25.0303869 140.610214,25.2979349 C140.497021,25.5654829 140.301508,25.9822341 140.023669,26.548201 C139.745831,27.1141679 139.498867,27.525774 139.282771,27.7830317 C139.066674,28.0402894 138.763115,28.3592842 138.372083,28.7400255 C137.981052,29.1207669 137.584881,29.3986011 137.183559,29.5735363 C136.782237,29.7484715 136.293454,29.9028238 135.717197,30.0365978 C135.14094,30.1703718 134.513241,30.2372578 133.83408,30.2372578 C133.237242,30.2372578 132.784476,30.1240661 132.475766,29.8976794 C132.167057,29.6712926 132.012705,29.2185259 132.012705,28.5393656 Z" id="powered-by" fill="#3D5B72"></path>
+ </g>
+ <g id="Shape" fill-rule="nonzero">
+ <path d="M61.5573292,190.707218 C63.7142154,192.519813 65.9926163,194.251398 68.3216483,195.861468 C70.6506804,197.471538 73.141732,199.02085 75.6125312,200.418269 L75.6834148,200.418269 C97.5028789,212.606282 123.355931,215.346332 147.245456,208.002813 C148.136563,207.729405 149.027671,207.435744 149.908653,207.131957 L149.908653,207.131957 L149.96941,207.131957 C150.799761,206.848423 151.619985,206.544636 152.44021,206.240849 L152.855385,206.07883 C153.584473,205.795296 154.323688,205.511761 155.052776,205.207974 L155.386941,205.076333 C157.078021,204.367498 158.758975,203.608031 160.389297,202.818185 L160.612074,202.706797 C161.341162,202.352379 162.060124,201.977708 162.779087,201.603038 L163.153757,201.400513 C163.889596,201.008966 164.618684,200.607292 165.341022,200.195492 L165.492915,200.114483 C167.052354,199.223375 168.621919,198.271509 170.161105,197.269013 L170.424387,197.096867 C171.099469,196.651313 171.774551,196.202384 172.449633,195.750079 L172.733167,195.557681 C174.940684,194.008368 177.117823,192.337541 179.193699,190.59583 L179.436729,190.383179 C180.071306,189.843114 180.702507,189.296298 181.330333,188.742731 L181.461974,188.621216 C182.829014,187.395942 184.175803,186.109912 185.512464,184.803629 L185.563096,184.752997 C186.17742,184.131922 186.781618,183.500721 187.37569,182.859393 L187.53771,182.687247 C189.411061,180.662002 191.203404,178.555747 192.874231,176.388735 L192.934988,176.307725 C193.481804,175.598889 194.018494,174.879927 194.545058,174.160965 L194.615942,174.069829 C196.236138,171.831933 197.785451,169.482648 199.203122,167.092859 L199.26388,167.001723 C201.170219,163.780825 202.877982,160.44646 204.377624,157.017264 C205.525263,154.377694 206.537885,151.724623 207.415492,149.05805 L207.415492,149.05805 L207.415492,148.956788 C214.423687,127.546279 213.295278,104.303929 204.245983,83.6730073 C203.081467,81.019936 201.78531,78.4377483 200.398017,75.9365704 L200.347386,75.8353082 C198.970219,73.3746352 197.461411,70.9443409 195.861468,68.6153089 L195.770332,68.4836679 C195.26402,67.7478288 194.744207,67.0187406 194.210893,66.2964031 L194.210893,66.2255195 C193.002496,64.6795823 191.814353,63.1944024 190.646461,61.76998 L190.545199,61.6484652 C189.991632,60.9733835 189.431314,60.325305 188.864245,59.7042298 L188.641468,59.4612004 C187.395942,58.0637812 186.109912,56.7169931 184.823881,55.4107099 L184.752997,55.3398263 C184.145424,54.7390036 183.527724,54.1449316 182.899898,53.5576105 L182.555606,53.2436975 C181.968285,52.6968813 181.370838,52.1568159 180.763264,51.6235013 L180.550614,51.431103 C179.203825,50.2564607 177.79628,49.102071 176.358356,47.9881861 L175.922928,47.6540206 C175.342358,47.2084667 174.755037,46.7696635 174.160965,46.3376112 L173.725537,46.0236982 C172.277487,45.0110756 170.778805,43.9984529 169.29025,42.9858303 L168.804191,42.6820435 L167.001723,41.5884111 L166.414402,41.2441194 C165.73932,40.852572 165.064238,40.4711508 164.389156,40.0998558 L164.08537,39.92771 C163.302275,39.5024085 162.512429,39.0872332 161.715833,38.6821842 L161.250026,38.449281 L159.33617,37.5176682 L158.647586,37.1936289 L156.774234,36.3531521 L156.197039,36.0999965 C155.380191,35.748954 154.556591,35.4114131 153.72624,35.0873739 L153.422454,34.9759854 C152.700116,34.692451 151.974403,34.4190429 151.245315,34.155761 L150.5061,33.8924792 L148.632748,33.2545269 L147.913786,33.0216237 C128.16306,26.7756991 106.879064,27.4039036 87.5310995,34.8038395 C84.7970184,35.8164621 82.093316,37.0417355 79.4807496,38.3480187 L79.3997398,38.3480187 C76.8378046,39.6239232 74.3366267,41.0517211 71.8557013,42.5807813 L71.754439,42.6415386 C69.3342709,44.1503463 66.964734,45.8009212 64.6660807,47.5325059 L64.5344397,47.6337682 C62.2864175,49.3552266 60.0890264,51.208326 58.01315,53.132309 L57.8713829,53.2639499 C57.1963011,53.8985268 56.5212194,54.536479 55.8461376,55.1778067 C54.4959741,56.5279702 53.1795647,57.9118878 51.8969094,59.3295594 L51.745016,59.5017053 C51.1576949,60.176787 50.5771246,60.8518688 50.0033051,61.5269505 L49.9020428,61.6484652 C48.6970219,63.0863894 47.5223797,64.5850708 46.4084948,66.1040048 L46.2667276,66.2964031 C45.7536655,66.9714848 45.2507296,67.6769453 44.7579199,68.4127844 L44.6060265,68.6254351 C43.5427728,70.1747477 42.5200239,71.7746915 41.5681586,73.3746352 L41.4466439,73.5771597 C41.0078408,74.3129988 40.5791639,75.0589642 40.1606132,75.8150557 L39.9985936,76.0985901 C39.0872332,77.7491649 38.2163778,79.4402447 37.4062797,81.1617032 L37.3252699,81.333849 C36.9505995,82.1236947 36.5961816,82.9135403 36.2417637,83.703386 L36.0898703,84.0476776 C35.3304033,85.7995148 34.6215675,87.5817306 33.9836152,89.3335677 L33.9836152,89.4449562 C33.6798284,90.285433 33.3962941,91.1259098 33.122886,91.9663866 L33.0013713,92.3511832 C32.7245877,93.2017862 32.4613059,94.05914 32.2115256,94.9232446 L32.2013994,95.1865265 C27.222507,112.604067 27.5114307,131.105757 33.0317499,148.35934 L33.1633909,148.774516 C33.4199219,149.55086 33.6832038,150.323828 33.9532365,151.093421 L34.0544988,151.387082 C34.6823248,153.118667 35.3709082,154.860378 36.079744,156.561584 L36.211385,156.86537 C36.5354242,157.60796 36.8729651,158.347175 37.2240076,159.083014 L37.3961534,159.437432 C38.1961253,161.128512 39.0467283,162.789213 39.9175838,164.37903 L39.9175838,164.46004 C40.332759,165.209381 40.7681868,165.968848 41.2137407,166.728315 L41.3757603,167.011849 C41.8415668,167.801695 42.2871207,168.520657 42.7428009,169.249745 L42.8136845,169.37126 C43.8263071,170.910446 44.8389297,172.409128 45.9325621,173.968567 L46.0945818,174.191343 C46.5873914,174.866425 47.0903273,175.541507 47.6033895,176.216589 L47.7552829,176.419113 C48.8995464,177.897542 50.0944411,179.345593 51.3095883,180.732886 C51.9272881,181.431595 52.5247354,182.099926 53.1424352,182.758131 L53.3145811,182.940403 C55.1980591,184.965648 57.2131782,186.92001 59.2789283,188.773109 L59.400443,188.874372 C60.0789002,189.481945 60.7674836,190.079392 61.4256883,190.666714 L61.4256883,190.666714 L61.5573292,190.707218 Z" fill="#FFFFFF"></path>
+ <path d="M119.94515,240.892796 C117.127754,240.891 114.524055,239.390498 113.109947,236.953694 L104.492528,222.027636 L103.864702,221.9365 C58.9930231,214.957353 23.880033,179.598158 17.2145846,134.678809 L17.1234485,134.050983 L3.95935445,126.425934 C1.51953295,125.019245 0.0161764248,122.41715 0.0161764248,119.600858 C0.0161764248,116.784565 1.51953295,114.182471 3.95935445,112.775781 L17.1740797,105.140607 L17.2652157,104.512781 C24.111934,59.0760817 59.9948745,23.5349619 105.495025,17.1234485 L106.132977,17.0323125 L113.130199,4.88084104 C114.536889,2.44101953 117.138983,0.937663011 119.955276,0.937663011 C122.771568,0.937663011 125.373663,2.44101953 126.780352,4.88084104 L133.868711,17.0930699 L134.496537,17.1842059 C179.568238,23.7924434 215.050227,59.0402685 221.956753,104.067227 L222.047889,104.695053 L235.941071,112.816286 C238.380892,114.222975 239.884249,116.82507 239.884249,119.641363 C239.884249,122.457655 238.380892,125.05975 235.941071,126.466439 L222.01751,134.506663 L221.926374,135.134489 C215.106364,179.564029 180.442292,214.542932 136.076228,221.764354 L135.458528,221.865617 L126.770226,236.953694 C125.357936,239.387376 122.758927,240.887397 119.94515,240.892796 Z M60.8586196,189.927499 C63.0155058,191.740094 65.2939067,193.471678 67.6229387,195.081748 C69.9519707,196.691818 72.4430224,198.241131 74.9138216,199.63855 L74.9847052,199.63855 C96.8041693,211.826562 122.657221,214.566613 146.546746,207.223093 C147.437854,206.949685 148.328962,206.656025 149.209943,206.352238 L149.209943,206.352238 L149.270701,206.352238 C150.101051,206.068704 150.921276,205.764917 151.7415,205.46113 L152.156675,205.29911 C152.885764,205.015576 153.624978,204.732042 154.354066,204.428255 L154.688232,204.296614 C156.379312,203.587778 158.060265,202.828311 159.690588,202.038466 L159.913365,201.927077 C160.642453,201.572659 161.361415,201.197989 162.080377,200.823318 L162.455047,200.620794 C163.190886,200.229247 163.919975,199.827573 164.642312,199.415773 L164.794206,199.334763 C166.353644,198.443655 167.923209,197.49179 169.462396,196.489294 L169.725678,196.317148 C170.400759,195.871594 171.075841,195.422664 171.750923,194.97036 L172.034457,194.777961 C174.241975,193.228649 176.419113,191.557821 178.49499,189.816111 L178.738019,189.60346 C179.372596,189.063394 180.003797,188.516578 180.631623,187.963011 L180.763264,187.841496 C182.130305,186.616223 183.477093,185.330192 184.813755,184.023909 L184.864386,183.973278 C185.47871,183.352203 186.082908,182.721001 186.67698,182.079674 L186.839,181.907528 C188.712352,179.882283 190.504694,177.776028 192.175521,175.609015 L192.236279,175.528005 C192.783095,174.81917 193.319785,174.100207 193.846349,173.381245 L193.917232,173.290109 C195.537428,171.052213 197.086741,168.702929 198.504413,166.313139 L198.56517,166.222003 C200.471509,163.001106 202.179272,159.66674 203.678914,156.237544 C204.826553,153.597975 205.839176,150.944903 206.716782,148.278331 L206.716782,148.278331 L206.716782,148.177068 C213.726958,126.759163 212.594894,103.508598 203.537147,82.8730354 C202.372631,80.2199641 201.076474,77.6377764 199.689181,75.1365986 L199.63855,75.0353363 C198.261383,72.5746633 196.752576,70.144369 195.152632,67.815337 L195.061496,67.6836961 C194.555184,66.947857 194.035371,66.2187687 193.502057,65.4964312 L193.502057,65.4255476 C192.361169,63.8728596 191.193277,62.3843043 189.998383,60.9598819 L189.89712,60.8383671 C189.343553,60.1632854 188.783235,59.5152069 188.216167,58.8941317 L187.99339,58.6511023 C186.747864,57.2536831 185.461833,55.906895 184.175803,54.6006118 L184.104919,54.5297282 C183.497345,53.9289055 182.879646,53.3348335 182.25182,52.7475124 L181.907528,52.4335994 C181.320207,51.8867832 180.722759,51.3467178 180.115186,50.8134032 L179.902535,50.6210049 C178.555747,49.4463626 177.148202,48.2919729 175.710277,47.178088 L175.27485,46.8439225 C174.694279,46.3983686 174.106958,45.9595654 173.512886,45.5275131 L173.077459,45.2136001 C171.629408,44.2009775 170.130727,43.1883548 168.642172,42.1757322 L168.156113,41.8719454 L166.353644,40.778313 L165.766323,40.4340213 C165.091242,40.0424739 164.41616,39.6610527 163.741078,39.2897577 L163.437291,39.1176119 C162.654196,38.6923104 161.864351,38.2771351 161.067754,37.8720861 L160.601948,37.6391829 L158.688091,36.7075701 L157.969129,36.4544144 L156.095777,35.6139376 L155.518582,35.360782 C154.701733,35.0097395 153.878134,34.6721986 153.047783,34.3481593 L152.743996,34.2367709 C152.021659,33.9532365 151.295946,33.6798284 150.566858,33.4165465 L149.827643,33.1532647 L147.954291,32.5153124 L147.235329,32.2824092 C127.484603,26.0364846 106.200607,26.6646891 86.8526423,34.064625 C84.1185612,35.0772476 81.4148588,36.302521 78.8022925,37.6088042 L78.7212827,37.6088042 C76.1593474,38.8847087 73.6581695,40.3125066 71.1772441,41.8415668 L71.0759819,41.9023241 C68.6558138,43.4111318 66.2862769,45.0617067 63.9876235,46.7932914 L63.8559826,46.8945536 C61.6079603,48.6160121 59.4105692,50.4691115 57.3346929,52.3930945 L57.1929257,52.5247354 C56.517844,53.1593123 55.8427622,53.7972645 55.1676805,54.4385922 C53.817517,55.7887557 52.5011076,57.1726733 51.2184522,58.5903449 L51.0665588,58.7624908 C50.4792377,59.4375725 49.8986674,60.1126543 49.3248479,60.787736 L49.2235857,60.9092507 C48.0185647,62.3471749 46.8439225,63.8458563 45.7300376,65.3647903 L45.5882705,65.5571886 C45.0752083,66.2322703 44.5722724,66.9377307 44.0794627,67.6735698 L43.9275694,67.8862206 C42.8643156,69.4355332 41.8415668,71.035477 40.8897015,72.6354207 L40.7681868,72.8379452 C40.3293836,73.5737843 39.9007067,74.3197497 39.482156,75.0758412 L39.3201364,75.3593755 C38.4087761,77.0099504 37.5379206,78.7010302 36.7278225,80.4224887 L36.6468127,80.5946345 C36.2721423,81.3844802 35.9177244,82.1743258 35.5633065,82.9641714 L35.4114131,83.3084631 C34.7430822,85.0603003 34.0342463,86.8323899 33.4165465,88.584227 L33.4165465,88.6956155 C33.1127597,89.5360923 32.8292254,90.376569 32.5558173,91.2170458 L32.4343026,91.6018424 C32.1575191,92.4524454 31.8942372,93.3097992 31.6444569,94.1739039 L31.5735734,94.4371858 C26.5946809,111.854726 26.8836047,130.356416 32.4039239,147.61 L32.5355649,148.025175 C32.7920959,148.801519 33.0553778,149.574488 33.3254105,150.344081 L33.4266728,150.637741 C34.0544988,152.369326 34.7430822,154.111037 35.451918,155.812243 L35.5835589,156.11603 C35.9075982,156.85862 36.2451391,157.597834 36.5961816,158.333673 L36.7683274,158.688091 C37.5682993,160.379171 38.4189023,162.039872 39.2897577,163.62969 L39.2897577,163.710699 C39.704933,164.46004 40.1403607,165.219507 40.5859147,165.978974 L40.7479343,166.262508 C41.2137407,167.052354 41.6592947,167.771316 42.1149749,168.500404 L42.1858584,168.621919 C43.1984811,170.161105 44.2111037,171.659787 45.3047361,173.219226 L45.4667557,173.442003 C45.9595654,174.117084 46.4625013,174.792166 46.9755634,175.467248 L47.1274568,175.669773 C48.2717204,177.148202 49.4666151,178.596252 50.6817622,179.983545 C51.299462,180.682254 51.8969094,181.350585 52.5146092,182.00879 L52.686755,182.191062 C54.5702331,184.216307 56.5853521,186.170669 58.6511023,188.023769 L58.772617,188.125031 C59.4510742,188.732604 60.1396575,189.330052 60.7978622,189.917373 L60.7978622,189.917373 L60.8586196,189.927499 Z" fill="#435B71"></path>
+ <polygon fill="#435B71" points="159.528568 97.5155585 163.082873 58.5599662 127.570198 74.9644527 92.0575226 91.3689392 111.43912 105.039345 125.119651 98.7205794 138.790057 92.4018143 137.423016 107.408882 136.055976 122.415949 155.984389 136.471151"></polygon>
+ <path d="M178.95067,148.642875 L190.089519,23.4827186 C190.164837,22.6901796 189.809557,21.9180785 189.158639,21.4597152 C188.507721,21.0013518 187.661054,20.9270653 186.940262,21.2650751 L72.7569354,73.7088007 C72.0412158,74.0378542 71.5577225,74.7263487 71.4911571,75.5112689 C71.4151658,76.304717 71.7708355,77.077912 72.4227699,77.5365142 L92.0676488,91.3993179 L127.59045,74.934074 L163.103126,58.5295876 L159.528568,97.5155585 L155.943884,136.471151 L175.446996,150.232692 C176.091496,150.685702 176.927943,150.762793 177.644387,150.435217 C178.37289,150.119191 178.872884,149.433152 178.95067,148.642875 L178.95067,148.642875 Z" fill="#42B983"></path>
+ <polygon fill="#435B71" points="112.077072 166.6068 76.6859112 183.264442 79.9566823 144.288597 83.2274533 105.302626 102.700186 118.841391 101.444534 133.848458 100.178756 148.865652 113.808657 142.445624 127.448683 136.035723 147.468232 149.949158"></polygon>
+ <path d="M166.758693,167.366267 L52.9500369,220.630217 C52.2344226,220.964591 51.3949706,220.893091 50.7462144,220.442508 C50.0974583,219.991925 49.7373357,219.230279 49.8007806,218.442952 L60.0181428,93.1612812 C60.0827542,92.3786068 60.5620078,91.6906459 61.2737949,91.358813 C61.9884729,91.0282896 62.8248219,91.1015183 63.471186,91.5512113 L83.2173271,105.312753 L79.9971872,144.288597 L76.6859112,183.284695 L112.127703,166.627052 L147.569495,149.96941 L167.082733,163.558806 C167.7385,164.014998 168.098237,164.788627 168.024472,165.584051 C167.950943,166.361484 167.468513,167.040745 166.758693,167.366267 Z" fill="#42B983"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/vuetifyjs.com/static/doc-images/powered-by-madewithvue-2.svg b/packages/vuetifyjs.com/static/doc-images/powered-by-madewithvue-2.svg
new file mode 100644
index 00000000000..f8ad4a1e0a6
--- /dev/null
+++ b/packages/vuetifyjs.com/static/doc-images/powered-by-madewithvue-2.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="676px" height="241px" viewBox="0 0 676 241" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+ <title>powered-by-madewithvue-2</title>
+ <desc>Created with Sketch.</desc>
+ <defs></defs>
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="powered-by-madewithvue-2">
+ <g id="Text" transform="translate(273.000000, 9.000000)">
+ <path d="M3.56979625,105.468433 L3.56979625,65.806064 C3.56688539,64.8006769 4.10805269,63.8723669 4.98436633,63.3795322 C6.09062241,62.7103078 7.37067268,62.3846145 8.66224851,62.4437397 C9.82242346,62.4115687 10.9636809,62.7425333 11.926641,63.3904136 C12.7764049,63.9039816 13.2962619,64.8240461 13.2976858,65.8169453 L13.2976858,69.3860144 C15.8017821,64.5384806 20.9057153,61.5994657 26.3552557,61.8670304 C29.1590884,61.8447375 31.8817628,62.8074937 34.0483406,64.5873575 C36.3636206,66.4844313 38.1387177,68.9575581 39.1951994,71.7581396 C40.6121441,68.7719334 42.8167383,66.2287496 45.5716461,64.4023752 C48.0607781,62.7665369 50.9717283,61.8894713 53.9502534,61.8779117 C58.502263,61.8547071 62.8511833,63.7603249 65.9196925,67.1227023 C69.2783896,70.6119751 70.9613653,75.2981919 70.9686195,81.1813525 L70.9686195,105.468433 C70.8780007,106.466669 70.2883063,107.35121 69.4017111,107.818795 C68.3357391,108.548044 67.0696087,108.928263 65.7782355,108.906926 C64.5187381,108.917984 63.2868677,108.537778 62.2526916,107.818795 C61.3677611,107.354801 60.7779938,106.474246 60.6857832,105.479314 L60.6857832,81.2466404 C60.8399069,78.47057 59.8487539,75.7527653 57.9436935,73.7276564 C56.2858244,71.9703602 53.9722264,70.9810704 51.5563656,70.996448 C49.1338731,70.9952809 46.8155541,71.9815488 45.1363937,73.7276564 C43.2133803,75.6673544 42.1878056,78.322015 42.3072536,81.0507768 L42.3072536,105.566364 C42.3391952,106.622721 41.7466156,107.598985 40.7947517,108.058184 C39.661665,108.638531 38.4002508,108.923004 37.1277509,108.885163 C35.9022134,108.905766 34.6907533,108.621596 33.602207,108.058184 C32.6271324,107.617335 32.0101556,106.636171 32.0352986,105.566364 L32.0352986,81.1487086 C32.1325353,78.4792646 31.1658068,75.8804478 29.3476155,73.9235199 C27.7106779,72.1057732 25.3737482,71.0759398 22.9276436,71.0943798 C20.500462,71.0698974 18.1732864,72.0599331 16.5076718,73.8255882 C14.6442719,75.8335348 13.6745224,78.5111426 13.8199886,81.2466404 L13.8199886,105.468433 C13.7277781,106.463364 13.1380108,107.34392 12.2530802,107.807914 C11.1864846,108.535857 9.92077896,108.915949 8.62960459,108.896045 C7.33558103,108.93707 6.06346626,108.555054 5.00612894,107.807914 C4.17545874,107.307998 3.63972801,106.435406 3.56979625,105.468433 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M78.3896717,96.7525046 C78.3896717,91.5294767 80.3483072,87.9023739 84.2655782,85.8711964 C88.1828491,83.8400188 93.862892,82.8135488 101.305707,82.7917861 L105.65823,82.7917861 L105.65823,80.9419637 C105.720821,78.2069485 104.875138,75.5283159 103.253461,73.325048 C101.650282,71.1850574 99.2164957,70.115062 95.9521032,70.115062 C93.39647,70.0586931 90.8640476,70.6106791 88.5636949,71.7254957 C87.4511875,72.3565719 86.2905252,72.8986994 85.0925576,73.3468106 C83.9645438,73.3394018 82.9301841,72.7179519 82.3939931,71.7254957 C81.7128005,70.6567509 81.357399,69.4128454 81.3711502,68.1455453 C81.3711502,66.4480612 82.952567,64.9972201 86.1154006,63.793022 C89.3163446,62.5464649 92.7237857,61.9151838 96.1588481,61.9323183 C102.883497,61.9323183 107.859882,63.7458696 111.088003,67.3729724 C114.368668,71.1121098 116.10374,75.9594177 115.941066,80.9310824 L115.941066,105.511958 C115.9045,106.500587 115.372828,107.40443 114.526496,107.916727 C113.474906,108.636282 112.219839,108.998687 110.946546,108.950451 C109.753308,108.980451 108.583317,108.617219 107.616866,107.916727 C106.790059,107.391414 106.276725,106.491043 106.245821,105.511958 L106.245821,102.04082 C101.893298,107.118764 96.9640649,109.657736 91.4581229,109.657736 C88.027369,109.788117 84.6775248,108.596195 82.1001978,106.328056 C79.6265137,104.122777 78.3896717,100.930927 78.3896717,96.7525046 Z M88.7704398,95.4793916 C88.6435826,97.2446507 89.2863431,98.9785172 90.5332117,100.234523 C91.8018918,101.345668 93.4513283,101.922776 95.1360051,101.844957 C97.8212647,101.761262 100.368982,100.637614 102.241499,98.7111401 C104.490303,96.6219289 105.614705,94.402142 105.614705,92.0517795 L105.614705,88.4065412 L103.166411,88.4065412 C100.759208,88.3757949 98.352657,88.5066647 95.9629845,88.7982683 C94.1484686,89.0409317 92.4277473,89.749464 90.968464,90.8548356 C89.5108643,91.9337067 88.6866166,93.6678912 88.7704398,95.4793916 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M124.613469,90.1910757 L124.613469,81.1813525 C124.514168,76.1527153 126.353164,71.2785956 129.749447,67.5688359 C132.835424,63.9393044 137.368351,61.860053 142.132375,61.888793 C144.830689,61.8450358 147.481387,62.6023779 149.749291,64.0650547 C151.859066,65.4015981 153.607877,67.2363556 154.841743,69.407777 L154.841743,38.2763541 C154.859248,37.2705169 155.421886,36.3536241 156.31072,35.8824663 C157.436582,35.2220703 158.727805,34.8973769 160.032127,34.9466738 C161.322078,34.8894639 162.600575,35.2109794 163.71001,35.871585 C164.576184,36.3586713 165.115746,37.2717761 165.12458,38.2654728 L165.12458,105.457551 C165.050974,106.434822 164.501794,107.313509 163.655603,107.807914 C162.597565,108.553614 161.325943,108.935482 160.032127,108.896045 C158.852458,108.911613 157.702129,108.52817 156.767735,107.807914 C155.940024,107.287675 155.413492,106.400671 155.353165,105.424907 L155.353165,101.95377 C154.133924,104.244404 152.278555,106.133782 150.010443,107.394424 C147.549892,108.895175 144.720657,109.682538 141.83858,109.668617 C137.268431,109.668617 133.253228,107.695474 129.792972,103.749186 C126.428767,100.03837 124.58031,95.1997609 124.613469,90.1910757 Z M134.896305,90.1910757 C134.902911,92.8666186 135.957614,95.4330618 137.834259,97.3400953 C139.582104,99.355323 142.119815,100.510994 144.787415,100.506556 C147.406829,100.475079 149.907037,99.406915 151.740571,97.5359588 C153.829782,95.5628149 154.874387,93.8617037 154.874387,92.4326252 L154.874387,81.2031151 C154.970146,78.4440499 153.862249,75.779538 151.838502,73.9017573 C149.978877,72.0886507 147.48256,71.0768412 144.885346,71.0834985 C142.217177,71.0810077 139.67362,72.2123565 137.888665,74.1955526 C135.992337,76.0359501 134.914258,78.5606161 134.896305,81.2031151 L134.896305,90.1910757 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M174.264879,90.1910757 L174.264879,80.8875572 C174.240913,75.778308 176.417406,70.9059758 180.238717,67.5144294 C184.106889,63.8059215 189.287906,61.7828205 194.645569,61.888793 C199.713407,61.7805781 204.633276,63.600735 208.410424,66.9812453 C212.147495,70.1954758 214.247754,74.9150678 214.133992,79.8429516 C214.186574,81.4844753 213.954643,83.1227148 213.44847,84.6851338 C213.088444,85.8018123 212.307931,86.7345248 211.272208,87.2857664 C210.4133,87.7427604 209.488025,88.0622006 208.530118,88.2324403 C207.426692,88.3809761 206.313669,88.446448 205.200438,88.4283038 L184.525952,88.4283038 L184.525952,90.6916159 C184.420584,93.7263216 185.751112,96.6333226 188.116784,98.5370392 C190.726124,100.562178 193.967715,101.599025 197.267964,101.464111 C199.922327,101.477075 202.538793,100.834172 204.88488,99.5925261 C206.235442,98.75735 207.702173,98.1266554 209.237403,97.720941 C210.377648,97.7468598 211.431888,98.3330006 212.055662,99.2878494 C212.768421,100.148543 213.181012,101.218222 213.230843,102.334616 C213.230843,103.945049 211.663935,105.573618 208.530118,107.220323 C204.935578,108.969018 200.969501,109.816758 196.974169,109.69038 C190.314808,109.69038 184.874154,107.876829 180.652207,104.249726 C176.467976,100.800053 174.110776,95.6118022 174.264879,90.1910757 L174.264879,90.1910757 Z M184.536834,81.8777563 L200.793508,81.8777563 C201.794319,81.9801126 202.802786,81.7791775 203.687936,81.3010469 C204.263128,80.6751014 204.530268,79.8258368 204.416984,78.9833283 C204.444247,76.5017275 203.411012,74.1264729 201.576962,72.4545433 C199.681734,70.6487814 197.142442,69.6769536 194.525875,69.7559789 C191.939134,69.7008303 189.424855,70.6126444 187.474787,72.3130863 C185.552775,73.9287209 184.471359,76.3318681 184.536834,78.8418713 L184.536834,81.8777563 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M237.615855,66.3936546 C237.721225,65.056079 238.559217,63.8870804 239.792117,63.3577696 C241.102191,62.549979 242.605754,62.1101868 244.14464,62.0846566 C245.492537,61.911915 246.784881,62.6792442 247.278457,63.9453603 L258.159765,94.4130233 L266.462203,67.3729724 C266.919218,65.8713518 268.127043,65.1205416 270.085679,65.1205416 C272.044314,65.1205416 273.25214,65.8713518 273.709155,67.3729724 L281.935424,94.576243 L292.903782,63.9235977 C293.295509,62.6831285 294.307471,62.0628939 295.939667,62.0628939 C297.477507,62.0952667 298.97931,62.5345441 300.292191,63.336007 C301.546716,63.8912714 302.386365,65.1003662 302.468452,66.4698238 C302.462086,67.0155577 302.327924,67.5522062 302.076725,68.0367322 L286.842894,107.797032 C286.320591,109.168077 284.949546,109.8536 282.729759,109.8536 C280.509972,109.8536 279.106283,109.200721 278.518693,107.894964 L269.998628,82.6285665 L261.576496,107.655575 C260.988905,109.157196 259.519929,109.908006 257.169566,109.908006 C254.993304,109.908006 253.62226,109.157196 253.056432,107.655575 L237.8226,68.0911387 C237.67564,67.5375704 237.606064,66.9663143 237.615855,66.3936546 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M308.126733,45.436255 C308.114331,43.9637477 308.760916,42.5628124 309.889505,41.6169158 C312.308137,39.5275589 315.893004,39.5275589 318.311637,41.6169158 C319.440502,42.5596608 320.092968,43.9546243 320.092968,45.4253737 C320.092968,46.896123 319.440502,48.2910865 318.311637,49.2338315 C315.91863,51.3909533 312.282512,51.3909533 309.889505,49.2338315 C308.771691,48.2890643 308.126838,46.8998435 308.126733,45.436255 L308.126733,45.436255 Z M309.008119,105.468433 L309.008119,65.806064 C309.013059,64.8084661 309.553153,63.8903072 310.422689,63.4012949 C311.528945,62.7320704 312.808995,62.4063771 314.100571,62.4655024 C315.404957,62.4155955 316.696348,62.7403313 317.821978,63.4012949 C318.714192,63.8743234 319.277392,64.7963031 319.290955,65.806064 L319.290955,105.468433 C319.207551,106.457135 318.636024,107.33892 317.767572,107.818795 C316.69105,108.560135 315.407214,108.941095 314.100571,108.906926 C312.806547,108.947951 311.534432,108.565935 310.477095,107.818795 C309.630904,107.32439 309.081725,106.445703 309.008119,105.468433 L309.008119,105.468433 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M329.965518,93.6186878 L329.965518,44.554869 C330.02467,43.5458106 330.623739,42.6472074 331.532427,42.2045064 C332.590239,41.5486954 333.813467,41.20891 335.05797,41.2251887 C336.319154,41.2122452 337.558941,41.5513966 338.637921,42.2045064 C339.565095,42.6333952 340.183127,43.5353872 340.248354,44.554869 L340.248354,62.4763837 L352.217794,62.4763837 C353.044836,62.4612497 353.821608,62.8722399 354.274361,63.5645145 C355.343262,65.2205643 355.343262,67.3491188 354.274361,69.0051686 C353.821608,69.6974432 353.044836,70.1084334 352.217794,70.0932994 L340.248354,70.0932994 L340.248354,93.5969252 C340.248354,95.9472878 340.756149,97.612128 341.771738,98.5914457 C342.787326,99.5707635 344.568234,100.060422 347.11446,100.060422 L350.542072,100.060422 C351.763941,99.9875153 352.956578,100.452644 353.806465,101.333535 C355.373373,103.128951 355.373373,105.805753 353.806465,107.601169 C352.957411,108.483311 351.764174,108.948674 350.542072,108.874282 L347.11446,108.874282 C335.681832,108.88879 329.965518,103.803592 329.965518,93.6186878 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M362.380935,105.468433 L362.380935,38.2763541 C362.389769,37.2826574 362.929331,36.3695526 363.795506,35.8824663 C364.904695,35.2212662 366.183372,34.8997052 367.473388,34.9575551 C368.762661,34.9200978 370.036681,35.2442567 371.15127,35.8933476 C372.062859,36.3480045 372.648872,37.2688826 372.674653,38.2872354 L372.674653,69.407777 C375.073139,64.7121571 379.938051,61.7940548 385.20992,61.888793 C389.847095,61.9026367 394.236107,63.9854223 397.179359,67.5688359 C400.520947,71.3052215 402.321334,76.1697676 402.217405,81.1813525 L402.217405,105.468433 C402.207327,106.528219 401.601281,107.492001 400.650497,107.960252 C399.550891,108.59747 398.29767,108.921125 397.027021,108.896045 C395.78944,108.915372 394.570186,108.595506 393.501477,107.971133 C392.548925,107.504846 391.942111,106.539843 391.934569,105.479314 L391.934569,81.2466404 C391.919969,78.6078957 390.864101,76.0816339 388.996615,74.2173153 C387.236375,72.2241389 384.702619,71.0861295 382.043459,71.0943798 C379.579772,71.1005063 377.223929,72.1056662 375.514674,73.8799947 C373.5803,75.8353196 372.550727,78.509842 372.674653,81.2575217 L372.674653,105.479314 C372.580504,106.473556 371.9913,107.353271 371.107745,107.818795 C370.04146,108.54739 368.775543,108.927545 367.484269,108.906926 C366.19035,108.947156 364.918482,108.565214 363.860793,107.818795 C363.010427,107.326977 362.456896,106.44784 362.380935,105.468433 Z" id="Shape" fill="#435B71" fill-rule="nonzero"></path>
+ <path d="M0.870504659,153.015783 C0.908194237,152.167031 1.37028087,151.39416 2.10009249,150.959216 C2.84618059,150.394723 3.75430187,150.085656 4.68984385,150.07783 C5.71473342,149.982225 6.67703486,150.583663 7.04020643,151.546807 L19.9672006,186.802245 L32.8941948,151.982059 C33.4164976,150.74159 34.1673079,150.121355 35.1466256,150.121355 C36.0623595,150.164733 36.9462696,150.470702 37.6928517,151.002741 C38.4606697,151.37125 38.9804569,152.113803 39.0638966,152.961377 C39.0579348,153.507163 38.9237496,154.043904 38.6721695,154.528285 L22.9051538,195.877256 C22.5134267,196.921862 21.534109,197.444165 19.9672006,197.444165 C18.4002922,197.444165 17.4209745,196.921862 17.0292474,195.877256 L1.26223176,154.528285 C0.97906027,154.076468 0.842257075,153.548256 0.870504659,153.015783 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M46.2129161,178.869772 L46.2129161,152.754632 C46.2516786,152.085145 46.596931,151.470917 47.1487086,151.089792 C47.7967641,150.556746 48.6169029,150.278208 49.4555459,150.306337 C50.2504681,150.30378 51.0209198,150.581143 51.6318076,151.089792 C52.2001239,151.461543 52.5623239,152.077283 52.6111253,152.754632 L52.6111253,178.869772 C52.6117754,182.138155 53.9159485,185.271303 56.234601,187.574818 C58.44307,190.000914 61.5718538,191.383759 64.8525971,191.383759 C68.1333404,191.383759 71.2621242,190.000914 73.4705932,187.574818 C75.7892457,185.271303 77.0934188,182.138155 77.0940689,178.869772 L77.0940689,152.56965 C77.1114932,151.882932 77.4816369,151.253688 78.0733866,150.904809 C78.7339264,150.446154 79.5217586,150.206379 80.3258174,150.219287 C81.1061322,150.207477 81.8694084,150.447909 82.5020791,150.904809 C83.068536,151.270968 83.4153611,151.895253 83.4269903,152.56965 L83.4269903,178.815365 C83.4501066,183.705327 81.4446716,188.385989 77.8884044,191.742359 C72.6042426,196.995983 64.6931454,198.585717 57.7896992,195.781192 C50.8862531,192.976667 46.325206,186.320124 46.2020348,178.869772 L46.2129161,178.869772 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M93.513963,178.684789 L93.513963,167.705549 C93.4646188,162.899831 95.4392264,158.295046 98.9546171,155.017944 C106.202854,147.986475 117.693839,147.881141 125.069757,154.778555 C128.637657,158.04136 130.621272,162.686985 130.510411,167.520567 C130.557503,168.997226 130.34386,170.470622 129.879295,171.87309 C129.529055,172.893577 128.789902,173.734413 127.822728,174.212572 C127.005416,174.627155 126.133508,174.923897 125.232977,175.093958 C124.151724,175.245338 123.06018,175.31083 121.968584,175.289821 L99.868647,175.289821 L99.868647,178.913297 C99.7412846,182.477188 101.282142,185.896846 104.036188,188.162409 C107.075266,190.571685 110.879488,191.807574 114.754277,191.644427 C116.738918,191.684554 118.713501,191.352381 120.575777,190.66511 C121.927014,190.177337 123.210492,189.519144 124.395116,188.706474 C124.987036,188.179361 125.721374,187.838689 126.50609,187.727156 C127.266023,187.750949 127.970872,188.129554 128.410319,188.749999 C128.908122,189.306667 129.200012,190.017188 129.237298,190.763041 C129.237298,192.134086 127.833609,193.555911 125.026232,195.028514 C121.759868,196.588135 118.164803,197.334773 114.547532,197.204776 C108.345186,197.204776 103.285378,195.492783 99.3681068,192.068798 C95.5063795,188.712566 93.3570859,183.798753 93.513963,178.684789 L93.513963,178.684789 Z M99.8795283,170.654384 L119.465883,170.654384 C120.803792,170.772665 122.150092,170.555762 123.383154,170.023268 C124.140878,169.353764 124.509248,168.346884 124.362472,167.346466 C124.380292,164.145826 123.132656,161.067804 120.891335,158.782877 C118.63763,156.343423 115.440989,154.994964 112.121,155.083232 C108.863372,155.017645 105.719791,156.282936 103.415954,158.587013 C101.103049,160.751543 99.8043367,163.787134 99.8360031,166.954739 L99.8795283,170.654384 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M137.866175,192.32995 C137.825562,191.043089 138.263677,189.786899 139.095763,188.804406 C139.865057,187.878089 141.014865,187.353264 142.218699,187.378955 C143.38536,187.395234 144.481768,187.939436 145.200177,188.858813 C146.044675,189.816085 146.502418,191.053543 146.484172,192.32995 C146.491618,193.575095 146.033693,194.778119 145.200177,195.703155 C144.479598,196.618448 143.38352,197.158486 142.218699,197.172132 C141.014865,197.197823 139.865057,196.672998 139.095763,195.746681 C138.276353,194.799672 137.838123,193.581937 137.866175,192.32995 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M147.071762,216.377641 C147.042494,215.578331 147.323189,214.798623 147.855216,214.201379 C148.34935,213.639979 149.066141,213.325388 149.813852,213.341756 C152.715534,213.341756 154.608882,212.282642 155.493895,210.164414 C156.378908,208.046186 156.835923,204.872471 156.86494,200.643269 L156.86494,152.56965 C156.846212,151.8867 157.178915,151.241831 157.746326,150.861284 C159.135218,149.982861 160.90582,149.982861 162.294712,150.861284 C162.874025,151.235889 163.222627,151.879778 163.219624,152.56965 L163.219624,200.752082 C163.219624,213.084232 158.910626,219.250306 150.292629,219.250306 C149.391205,219.326658 148.500167,219.013805 147.844335,218.390683 C147.344694,217.839548 147.069133,217.121539 147.071762,216.377641 L147.071762,216.377641 Z M156.86494,135.333657 C156.048186,134.593854 155.585179,133.541205 155.591827,132.439229 C155.580949,131.352032 156.046072,130.314451 156.86494,129.599208 C157.716231,128.813648 158.84084,128.39192 159.998756,128.424027 C161.113674,128.397328 162.192329,128.820945 162.991116,129.599208 C163.786775,130.327542 164.234053,131.360636 164.220704,132.439229 C164.231968,133.531009 163.790813,134.578753 163.001997,135.333657 C162.218055,136.140512 161.134392,136.585799 160.009638,136.563245 C158.838655,136.593237 157.705011,136.149978 156.86494,135.333657 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M172.631955,190.229857 C172.651163,189.521565 172.890796,188.836898 173.317478,188.271222 C173.640371,187.700627 174.229999,187.332109 174.884386,187.291904 C175.696613,187.445972 176.450057,187.822694 177.060648,188.380035 C178.367266,189.311327 179.781097,190.082176 181.271714,190.675991 C183.34653,191.503735 185.567276,191.903469 187.800499,191.851172 C191.260755,191.851172 193.799727,191.198294 195.417415,189.892537 C196.98725,188.716661 197.897795,186.859148 197.865709,184.898016 C197.951843,182.734854 197.031777,180.653655 195.373889,179.261499 C193.602957,177.801203 191.551237,176.719791 189.345645,176.084157 L182.251032,173.907895 C179.923497,173.220188 177.825428,171.915475 176.179262,170.132081 C174.445597,168.145133 173.552084,165.562138 173.687442,162.928655 C173.683952,159.439758 175.088506,156.097076 177.58295,153.65778 C180.158193,151.01725 184.024685,149.693357 189.182425,149.686103 C192.237492,149.66262 195.272744,150.178319 198.148623,151.209486 C200.91973,152.225075 202.30891,153.313206 202.316164,154.473878 C202.276706,155.260961 202.003988,156.018513 201.53271,156.65014 C201.162326,157.341855 200.455759,157.788108 199.672006,157.825321 C198.435042,157.449375 197.22453,156.991343 196.048531,156.454277 C193.922505,155.559045 191.641521,155.089539 189.334763,155.07235 C186.070371,155.07235 183.622077,155.841296 181.98988,157.379188 C180.468531,158.674515 179.576853,160.560909 179.541586,162.558691 C179.506559,164.46114 180.467963,166.243658 182.076931,167.259416 C183.945257,168.492624 185.993516,169.428656 188.148701,170.034149 L195.308602,172.156004 C197.709927,172.892203 199.811542,174.379735 201.304202,176.399715 C203.018573,178.794342 203.880606,181.694605 203.752497,184.636865 C203.911763,188.207655 202.369805,191.642749 199.595837,193.896858 C196.817476,196.145662 192.947358,197.270064 187.985481,197.270064 C184.226317,197.379856 180.495417,196.588906 177.104173,194.963226 C174.122694,193.439843 172.631955,191.862054 172.631955,190.229857 Z" id="Shape" fill="#42B983" fill-rule="nonzero"></path>
+ <path d="M4.275,27.3841601 L4.275,9.44611454 C4.275,9.09610215 4.44514236,8.81415195 4.78543219,8.60025548 C5.12572202,8.38635902 5.54864732,8.27941239 6.05422078,8.27941239 C6.55979424,8.27941239 6.97785833,8.38635902 7.30842559,8.60025548 C7.63899285,8.81415195 7.804274,9.09610215 7.804274,9.44611454 L7.804274,10.3211412 C8.17373153,9.6988969 8.70360346,9.17388618 9.39390568,8.74609325 C10.0842079,8.31830032 10.8668628,8.10440707 11.7418938,8.10440707 C13.2002787,8.10440707 14.4350262,8.6828911 15.4461731,9.83987652 C16.45732,10.9968619 16.9628859,12.3920293 16.9628859,14.0254205 L16.9628859,16.4171599 C16.9628859,17.9922157 16.4475976,19.3825218 15.4170055,20.5881201 C14.3864135,21.7937183 13.2002782,22.3965084 11.858564,22.3965084 C11.0224233,22.3965084 10.2494908,22.1680315 9.53974345,21.7110709 C8.8299961,21.2541103 8.32929143,20.7145159 8.03761443,20.0922717 L8.03761443,27.3841601 C8.03761443,27.6952822 7.84802723,27.9723712 7.46884714,28.2154354 C7.08966704,28.4584995 6.63757448,28.5800298 6.11255589,28.5800298 C5.58753729,28.5800298 5.15002836,28.4584995 4.80001597,28.2154354 C4.45000357,27.9723712 4.275,27.6952822 4.275,27.3841601 Z M8.03761443,16.9421759 C8.03761443,17.3310785 8.30011979,17.7880323 8.82513839,18.3130509 C9.35015698,18.8380695 9.94322464,19.1005748 10.6043592,19.1005748 C11.2849388,19.1005748 11.8877289,18.8234858 12.4127475,18.2692996 C12.9377661,17.7151133 13.2002714,17.0977395 13.2002714,16.4171599 L13.2002714,14.0254205 C13.2002714,13.3448408 12.9377661,12.7371895 12.4127475,12.2024484 C11.8877289,11.6677072 11.265494,11.4003406 10.5460241,11.4003406 C9.88488953,11.4003406 9.30154429,11.6434012 8.79597083,12.1295295 C8.29039737,12.6156578 8.03761443,13.2476152 8.03761443,14.0254205 L8.03761443,16.9421759 Z M18.8587769,16.4171599 L18.8587769,14.0254205 C18.8587769,12.4309196 19.4810118,11.0454746 20.7255003,9.86904407 C21.9699888,8.69261352 23.4575192,8.10440707 25.188136,8.10440707 C26.8798626,8.10440707 28.3576706,8.68775231 29.6216042,9.85446029 C30.8855379,11.0211683 31.5174952,12.4114744 31.5174952,14.0254205 L31.5174952,16.4171599 C31.5174952,17.9922157 30.8855379,19.3825218 29.6216042,20.5881201 C28.3576706,21.7937183 26.8798626,22.3965084 25.188136,22.3965084 C23.4964095,22.3965084 22.0186015,21.7937183 20.7546679,20.5881201 C19.4907342,19.3825218 18.8587769,17.9922157 18.8587769,16.4171599 Z M22.6213913,16.4171599 C22.6213913,17.1171847 22.8741743,17.7394196 23.3797477,18.2838833 C23.8853212,18.8283471 24.4881113,19.1005748 25.188136,19.1005748 C25.8687157,19.1005748 26.4666446,18.8283471 26.9819406,18.2838833 C27.4972366,17.7394196 27.7548808,17.1171847 27.7548808,16.4171599 L27.7548808,14.0254205 C27.7548808,13.364286 27.4972366,12.7614959 26.9819406,12.2170321 C26.4666446,11.6725684 25.8687157,11.4003406 25.188136,11.4003406 C24.4881113,11.4003406 23.8853212,11.6677072 23.3797477,12.2024484 C22.8741743,12.7371895 22.6213913,13.3448408 22.6213913,14.0254205 L22.6213913,16.4171599 Z M32.6550298,9.67945497 C32.6550298,9.25166204 32.9272576,8.88707127 33.4717213,8.58567171 C34.016185,8.28427214 34.5606406,8.13357462 35.1051043,8.13357462 C35.6690132,8.13357462 36.0287427,8.33774546 36.1843038,8.74609325 L39.1010592,17.0296785 L41.2886257,9.82529274 C41.4441868,9.31971928 41.8719733,9.06693634 42.5719981,9.06693634 C43.2720229,9.06693634 43.6998094,9.31971928 43.8553704,9.82529274 L46.0137694,17.0588461 L48.9596924,8.74609325 C49.1152534,8.33774546 49.474983,8.13357462 50.0388918,8.13357462 C50.5639104,8.13357462 51.0986436,8.28913335 51.6431073,8.60025548 C52.187571,8.91137761 52.4597988,9.2808296 52.4597988,9.70862253 C52.4597988,9.92251899 52.4209091,10.0975226 52.3431286,10.2336385 L47.8513253,21.7839898 C47.6763191,22.2312278 47.1804757,22.4548435 46.3637801,22.4548435 C45.5081942,22.4548435 44.9929059,22.2312278 44.8178997,21.7839898 L42.5719981,15.4254631 L40.355264,21.7548222 C40.1802578,22.2215054 39.6455247,22.4548435 38.7510485,22.4548435 C37.9537981,22.4548435 37.4676771,22.2215054 37.2926709,21.7548222 L32.8008676,10.2336385 C32.7036419,10.0391872 32.6550298,9.85446117 32.6550298,9.67945497 Z M53.5973334,16.4171599 L53.5973334,13.9379178 C53.5973334,12.3434169 54.2195683,10.9725556 55.4640568,9.82529274 C56.7085454,8.67802989 58.2155206,8.10440707 59.9850277,8.10440707 C61.637864,8.10440707 63.0524762,8.62455658 64.2289067,9.66487119 C65.4053373,10.7051858 65.9935438,12.0128514 65.9935438,13.5879072 C65.9935438,14.1712612 65.9206256,14.652521 65.7747871,15.0317011 C65.6289486,15.4108812 65.4053329,15.6782477 65.1039334,15.8338088 C64.8025338,15.9893699 64.5254448,16.0865941 64.2726581,16.1254844 C64.0198713,16.1643746 63.689309,16.1838195 63.2809613,16.1838195 L57.3599478,16.1838195 L57.3599478,16.6213328 C57.3599478,17.4574735 57.6710653,18.1331817 58.2933096,18.6484778 C58.9155538,19.1637738 59.7419596,19.4214179 60.7725516,19.4214179 C61.5114667,19.4214179 62.2406482,19.2366919 62.9601182,18.8672344 C63.6795881,18.4977769 64.1462643,18.3130509 64.3601607,18.3130509 C64.7685085,18.3130509 65.1087933,18.5026381 65.3810251,18.8818182 C65.653257,19.2609983 65.7893709,19.6255891 65.7893709,19.9756014 C65.7893709,20.5200652 65.2983886,21.0596595 64.3164094,21.5944007 C63.3344302,22.1291418 62.1142664,22.3965084 60.6558814,22.3965084 C58.5752522,22.3965084 56.8786898,21.8471916 55.5661433,20.7485416 C54.2535968,19.6498916 53.5973334,18.2061121 53.5973334,16.4171599 Z M57.3599478,13.9670854 L61.6184107,13.9670854 C61.9295328,13.9670854 62.1482873,13.9136121 62.2746806,13.8066638 C62.401074,13.6997156 62.4642697,13.4906836 62.4642697,13.1795614 C62.4642697,12.4989818 62.216348,11.9448038 61.7204971,11.5170109 C61.2246462,11.0892179 60.6169949,10.8753247 59.897525,10.8753247 C59.2169454,10.8753247 58.6238777,11.0843567 58.1183042,11.5024271 C57.6127308,11.9204974 57.3599478,12.4698142 57.3599478,13.1503939 L57.3599478,13.9670854 Z M68.2394454,20.9381307 L68.2394454,9.44611454 C68.2394454,9.09610215 68.4095878,8.81415195 68.7498776,8.60025548 C69.0901674,8.38635902 69.5325376,8.27941239 70.0770013,8.27941239 C70.5631296,8.27941239 70.9666101,8.38635902 71.2874548,8.60025548 C71.6082995,8.81415195 71.7687194,9.09610215 71.7687194,9.44611454 L71.7687194,10.6419842 C72.0798415,9.96140459 72.5659626,9.36833693 73.2270971,8.86276347 C73.8882316,8.35719001 74.5979683,8.10440707 75.3563285,8.10440707 L76.2605227,8.10440707 C76.6105351,8.10440707 76.9265137,8.26968822 77.2084682,8.60025548 C77.4904226,8.93082274 77.6313977,9.30999715 77.6313977,9.73779008 C77.6313977,10.1850281 77.4904226,10.573925 77.2084682,10.9044922 C76.9265137,11.2350595 76.6105351,11.4003406 76.2605227,11.4003406 L75.3563285,11.4003406 C74.4618524,11.4003406 73.6791975,11.7989599 73.0083404,12.5962103 C72.3374833,13.3934608 72.0020598,14.4337598 72.0020598,15.7171386 L72.0020598,20.9381307 C72.0020598,21.2298077 71.8076114,21.5020355 71.4187088,21.7548222 C71.0298061,22.007609 70.5825747,22.1340004 70.0770013,22.1340004 C69.5519827,22.1340004 69.1144738,22.0124702 68.7644614,21.769406 C68.414449,21.5263418 68.2394454,21.2492529 68.2394454,20.9381307 Z M78.4189217,16.4171599 L78.4189217,13.9379178 C78.4189217,12.3434169 79.0411566,10.9725556 80.2856451,9.82529274 C81.5301336,8.67802989 83.0371088,8.10440707 84.8066159,8.10440707 C86.4594522,8.10440707 87.8740644,8.62455658 89.050495,9.66487119 C90.2269255,10.7051858 90.815132,12.0128514 90.815132,13.5879072 C90.815132,14.1712612 90.7422138,14.652521 90.5963753,15.0317011 C90.4505368,15.4108812 90.2269212,15.6782477 89.9255216,15.8338088 C89.624122,15.9893699 89.3470331,16.0865941 89.0942463,16.1254844 C88.8414596,16.1643746 88.5108973,16.1838195 88.1025495,16.1838195 L82.1815361,16.1838195 L82.1815361,16.6213328 C82.1815361,17.4574735 82.4926535,18.1331817 83.1148978,18.6484778 C83.7371421,19.1637738 84.5635478,19.4214179 85.5941399,19.4214179 C86.3330549,19.4214179 87.0622365,19.2366919 87.7817064,18.8672344 C88.5011763,18.4977769 88.9678525,18.3130509 89.181749,18.3130509 C89.5900968,18.3130509 89.9303815,18.5026381 90.2026134,18.8818182 C90.4748452,19.2609983 90.6109591,19.6255891 90.6109591,19.9756014 C90.6109591,20.5200652 90.1199769,21.0596595 89.1379977,21.5944007 C88.1560184,22.1291418 86.9358546,22.3965084 85.4774697,22.3965084 C83.3968404,22.3965084 81.700278,21.8471916 80.3877315,20.7485416 C79.075185,19.6498916 78.4189217,18.2061121 78.4189217,16.4171599 Z M82.1815361,13.9670854 L86.4399989,13.9670854 C86.7511211,13.9670854 86.9698755,13.9136121 87.0962689,13.8066638 C87.2226623,13.6997156 87.285858,13.4906836 87.285858,13.1795614 C87.285858,12.4989818 87.0379363,11.9448038 86.5420854,11.5170109 C86.0462345,11.0892179 85.4385832,10.8753247 84.7191133,10.8753247 C84.0385336,10.8753247 83.4454659,11.0843567 82.9398925,11.5024271 C82.434319,11.9204974 82.1815361,12.4698142 82.1815361,13.1503939 L82.1815361,13.9670854 Z M92.5651852,16.4171599 L92.5651852,14.0254205 C92.5651852,12.4114744 93.0756123,11.0211683 94.0964818,9.85446029 C95.1173513,8.68775231 96.3375151,8.10440707 97.7570098,8.10440707 C98.6125956,8.10440707 99.3660833,8.31830032 100.017495,8.74609325 C100.668907,9.17388618 101.169612,9.6988969 101.519624,10.3211412 L101.519624,1.36670215 C101.519624,1.01668976 101.699489,0.734739555 102.059224,0.520843091 C102.418959,0.306946628 102.871051,0.2 103.415515,0.2 C103.959979,0.2 104.40721,0.306946628 104.757223,0.520843091 C105.107235,0.734739555 105.282239,1.01668976 105.282239,1.36670215 L105.282239,20.9381307 C105.282239,21.2492529 105.102374,21.5263418 104.742639,21.769406 C104.382904,22.0124702 103.940534,22.1340004 103.415515,22.1340004 C102.968277,22.1340004 102.574519,22.007609 102.234229,21.7548222 C101.893939,21.5020355 101.723797,21.2298077 101.723797,20.9381307 L101.723797,20.0922717 C101.412675,20.7145159 100.882803,21.2541103 100.134165,21.7110709 C99.3855278,22.1680315 98.5639833,22.3965084 97.6695071,22.3965084 C96.327793,22.3965084 95.1416576,21.7937183 94.1110656,20.5881201 C93.0804735,19.3825218 92.5651852,17.9922157 92.5651852,16.4171599 Z M96.3277997,16.4171599 C96.3277997,17.0977395 96.5805826,17.7151133 97.0861561,18.2692996 C97.5917295,18.8234858 98.1847972,19.1005748 98.8653768,19.1005748 C99.5459565,19.1005748 100.158469,18.8332083 100.702933,18.2984671 C101.247396,17.7637259 101.519624,17.3116334 101.519624,16.9421759 L101.519624,14.0254205 C101.519624,13.2476152 101.252258,12.6156578 100.717516,12.1295295 C100.182775,11.6434012 99.575124,11.4003406 98.8945444,11.4003406 C98.1945196,11.4003406 97.5917295,11.6677072 97.0861561,12.2024484 C96.5805826,12.7371895 96.3277997,13.3448408 96.3277997,14.0254205 L96.3277997,16.4171599 Z M114.09084,20.9381307 L114.09084,1.36670215 C114.09084,1.01668976 114.260982,0.734739555 114.601272,0.520843091 C114.941562,0.306946628 115.383932,0.2 115.928396,0.2 C116.47286,0.2 116.929813,0.306946628 117.299271,0.520843091 C117.668728,0.734739555 117.853454,1.01668976 117.853454,1.36670215 L117.853454,10.3211412 C118.184022,9.6988969 118.675004,9.17388618 119.326416,8.74609325 C119.977828,8.31830032 120.731315,8.10440707 121.586901,8.10440707 C123.006396,8.10440707 124.22656,8.68775231 125.247429,9.85446029 C126.268299,11.0211683 126.778726,12.4114744 126.778726,14.0254205 L126.778726,16.4171599 C126.778726,17.9922157 126.263437,19.3825218 125.232845,20.5881201 C124.202253,21.7937183 123.016118,22.3965084 121.674404,22.3965084 C120.799373,22.3965084 119.98269,22.1680315 119.224329,21.7110709 C118.465969,21.2541103 117.931236,20.7145159 117.620114,20.0922717 L117.620114,20.9381307 C117.620114,21.2298077 117.449972,21.5020355 117.109682,21.7548222 C116.769392,22.007609 116.375634,22.1340004 115.928396,22.1340004 C115.403377,22.1340004 114.965868,22.0124702 114.615856,21.769406 C114.265843,21.5263418 114.09084,21.2492529 114.09084,20.9381307 Z M117.853454,16.9421759 C117.853454,17.3116334 118.120821,17.7637259 118.655562,18.2984671 C119.190303,18.8332083 119.797955,19.1005748 120.478534,19.1005748 C121.159114,19.1005748 121.752181,18.8234858 122.257755,18.2692996 C122.763328,17.7151133 123.016111,17.0977395 123.016111,16.4171599 L123.016111,14.0254205 C123.016111,13.3448408 122.763328,12.7371895 122.257755,12.2024484 C121.752181,11.6677072 121.149391,11.4003406 120.449367,11.4003406 C119.788232,11.4003406 119.190303,11.6434012 118.655562,12.1295295 C118.120821,12.6156578 117.853454,13.2476152 117.853454,14.0254205 L117.853454,16.9421759 Z M127.79959,26.9758143 C127.79959,25.9257772 128.12043,25.4007664 128.762119,25.4007664 C129.676041,25.4007664 130.575365,25.0702041 131.460118,24.4090696 C132.344872,23.7479351 132.835854,22.6493016 132.93308,21.113136 L127.91626,10.3794763 C127.83848,10.1850249 127.79959,10.0197438 127.79959,9.88362785 C127.79959,9.41694465 128.086402,8.99888056 128.660033,8.62942304 C129.233664,8.25996551 129.782981,8.07523951 130.308,8.07523951 C130.891354,8.07523951 131.251083,8.28913277 131.387199,8.7169257 L134.887306,17.4380243 L137.716558,8.7169257 C137.852674,8.28913277 138.183237,8.07523951 138.708255,8.07523951 C139.213829,8.07523951 139.768007,8.26482672 140.370806,8.64400681 C140.973605,9.02318691 141.275,9.45583463 141.275,9.94196296 C141.275,10.097524 141.245833,10.2433603 141.187497,10.3794763 L136.929034,21.2589738 L136.433186,22.5423462 C136.199844,23.2034807 136.029702,23.6604345 135.922754,23.9132212 C135.815806,24.1660079 135.63108,24.559766 135.36857,25.0945071 C135.106061,25.6292483 134.872723,26.0181451 134.668549,26.2612093 C134.464375,26.5042734 134.177564,26.8056685 133.808106,27.1654034 C133.438649,27.5251384 133.064336,27.7876438 132.685155,27.9529274 C132.305975,28.118211 131.84416,28.2640473 131.299697,28.3904407 C130.755233,28.5168341 130.162165,28.5800298 129.520476,28.5800298 C128.956567,28.5800298 128.52878,28.4730832 128.237103,28.2591867 C127.945426,28.0452903 127.79959,27.6175037 127.79959,26.9758143 Z" id="powered-by" fill="#3D5B72"></path>
+ </g>
+ <g id="Shapes" fill-rule="nonzero">
+ <path d="M61.5594937,190.713924 C63.7164557,192.526582 65.9949367,194.258228 68.3240506,195.868354 C70.6531646,197.478481 73.1443038,199.027848 75.6151899,200.425316 L75.6860759,200.425316 C97.5063073,212.613757 123.360268,215.353904 147.250633,208.010127 C148.141772,207.736709 149.032911,207.443038 149.913924,207.139241 L149.913924,207.139241 L149.974684,207.139241 C150.805063,206.855696 151.625316,206.551899 152.44557,206.248101 L152.860759,206.086076 C153.589873,205.802532 154.329114,205.518987 155.058228,205.21519 L155.392405,205.083544 C157.083544,204.374684 158.764557,203.61519 160.394937,202.825316 L160.617722,202.713924 C161.346835,202.359494 162.065823,201.98481 162.78481,201.610127 L163.159494,201.407595 C163.895359,201.016034 164.624473,200.614346 165.346835,200.202532 L165.498734,200.121519 C167.058228,199.23038 168.627848,198.278481 170.167089,197.275949 L170.43038,197.103797 C171.105485,196.658228 171.780591,196.209283 172.455696,195.756962 L172.739241,195.564557 C174.946835,194.01519 177.124051,192.344304 179.2,190.602532 L179.443038,190.389873 C180.077637,189.849789 180.708861,189.302954 181.336709,188.749367 L181.468354,188.627848 C182.835443,187.402532 184.182278,186.116456 185.518987,184.810127 L185.56962,184.759494 C186.183966,184.138397 186.788186,183.507173 187.382278,182.865823 L187.544304,182.693671 C189.417722,180.668354 191.210127,178.562025 192.881013,176.394937 L192.941772,176.313924 C193.488608,175.605063 194.025316,174.886076 194.551899,174.167089 L194.622785,174.075949 C196.243038,171.837975 197.792405,169.488608 199.210127,167.098734 L199.270886,167.007595 C201.177292,163.786584 202.885115,160.452101 204.38481,157.022785 C205.532489,154.383122 206.545148,151.729958 207.422785,149.063291 L207.422785,149.063291 L207.422785,148.962025 C214.431227,127.550764 213.302778,104.307597 204.253165,83.6759494 C203.088608,81.0227848 201.792405,78.4405063 200.405063,75.9392405 L200.35443,75.8379747 C198.977215,73.3772152 197.468354,70.9468354 195.868354,68.6177215 L195.777215,68.4860759 C195.270886,67.750211 194.751055,67.021097 194.217722,66.2987342 L194.217722,66.2278481 C193.009283,64.6818565 191.821097,63.1966245 190.653165,61.7721519 L190.551899,61.6506329 C189.998312,60.9755274 189.437975,60.3274262 188.870886,59.7063291 L188.648101,59.4632911 C187.402532,58.0658228 186.116456,56.7189873 184.83038,55.4126582 L184.759494,55.3417722 C184.151899,54.7409283 183.534177,54.1468354 182.906329,53.5594937 L182.562025,53.2455696 C181.974684,52.6987342 181.377215,52.1586498 180.76962,51.6253165 L180.556962,51.4329114 C179.210127,50.2582278 177.802532,49.1037975 176.364557,47.9898734 L175.929114,47.6556962 C175.348523,47.2101266 174.761181,46.771308 174.167089,46.3392405 L173.731646,46.0253165 C172.283544,45.0126582 170.78481,44 169.296203,42.9873418 L168.810127,42.6835443 L167.007595,41.5898734 L166.420253,41.2455696 C165.745148,40.8540084 165.070042,40.4725738 164.394937,40.1012658 L164.091139,39.9291139 C163.308017,39.5037975 162.518143,39.0886076 161.721519,38.6835443 L161.255696,38.4506329 L159.341772,37.5189873 L158.653165,37.1949367 L156.779747,36.3544304 L156.202532,36.1012658 C155.385654,35.750211 154.562025,35.4126582 153.731646,35.0886076 L153.427848,34.9772152 C152.705485,34.6936709 151.979747,34.4202532 151.250633,34.156962 L150.511392,33.8936709 L148.637975,33.2556962 L147.918987,33.0227848 C128.167566,26.7766406 106.882822,27.4048672 87.5341772,34.8050633 C84.8,35.8177215 82.0962025,37.043038 79.4835443,38.3493671 L79.4025316,38.3493671 C76.8405063,39.6253165 74.3392405,41.0531646 71.8582278,42.5822785 L71.756962,42.643038 C69.3367089,44.1518987 66.9670886,45.8025316 64.6683544,47.5341772 L64.5367089,47.635443 C62.2886076,49.356962 60.0911392,51.2101266 58.0151899,53.1341772 L57.8734177,53.2658228 C57.1983122,53.9004219 56.5232068,54.5383966 55.8481013,55.1797468 C54.4978903,56.5299578 53.1814346,57.9139241 51.8987342,59.3316456 L51.7468354,59.5037975 C51.1594937,60.178903 50.578903,60.8540084 50.0050633,61.5291139 L49.9037975,61.6506329 C48.6987342,63.0886076 47.5240506,64.5873418 46.4101266,66.1063291 L46.2683544,66.2987342 C45.7552743,66.9738397 45.2523207,67.6793249 44.7594937,68.4151899 L44.6075949,68.6278481 C43.5443038,70.1772152 42.521519,71.7772152 41.5696203,73.3772152 L41.4481013,73.5797468 C41.0092827,74.3156118 40.5805907,75.0616034 40.1620253,75.8177215 L40,76.1012658 C39.0886076,77.7518987 38.2177215,79.443038 37.4075949,81.164557 L37.3265823,81.3367089 C36.9518987,82.1265823 36.5974684,82.9164557 36.243038,83.7063291 L36.0911392,84.0506329 C35.3316456,85.8025316 34.6227848,87.5848101 33.9848101,89.3367089 L33.9848101,89.4481013 C33.6810127,90.2886076 33.3974684,91.1291139 33.1240506,91.9696203 L33.0025316,92.3544304 C32.7257384,93.2050633 32.4624473,94.0624473 32.2126582,94.9265823 L32.2025316,95.1898734 C27.2234641,112.608026 27.512398,131.110367 33.0329114,148.364557 L33.164557,148.779747 C33.421097,149.556118 33.6843882,150.329114 33.9544304,151.098734 L34.0556962,151.392405 C34.6835443,153.124051 35.3721519,154.865823 36.0810127,156.567089 L36.2126582,156.870886 C36.5367089,157.613502 36.8742616,158.352743 37.2253165,159.088608 L37.3974684,159.443038 C38.1974684,161.134177 39.0481013,162.794937 39.9189873,164.38481 L39.9189873,164.465823 C40.3341772,165.21519 40.7696203,165.974684 41.2151899,166.734177 L41.3772152,167.017722 C41.843038,167.807595 42.2886076,168.526582 42.7443038,169.255696 L42.8151899,169.377215 C43.8278481,170.916456 44.8405063,172.41519 45.9341772,173.974684 L46.0962025,174.197468 C46.5890295,174.872574 47.0919831,175.547679 47.6050633,176.222785 L47.756962,176.425316 C48.9012658,177.903797 50.0962025,179.351899 51.3113924,180.739241 C51.9291139,181.437975 52.5265823,182.106329 53.1443038,182.764557 L53.3164557,182.946835 C55.2,184.972152 57.2151899,186.926582 59.2810127,188.779747 L59.4025316,188.881013 C60.0810127,189.488608 60.7696203,190.086076 61.4278481,190.673418 L61.4278481,190.673418 L61.5594937,190.713924 Z" id="Shape" fill="#FFFFFF"></path>
+ <path d="M119.949367,240.901266 C117.131873,240.89947 114.528082,239.398916 113.113924,236.962025 L104.496203,222.035443 L103.868354,221.944304 C58.9950974,214.964911 23.8808727,179.604473 17.2151899,134.683544 L17.1240506,134.055696 L3.95949367,126.43038 C1.51958638,125.023641 0.0161769936,122.421455 0.0161769936,119.605063 C0.0161769936,116.788672 1.51958638,114.186485 3.95949367,112.779747 L17.1746835,105.144304 L17.2658228,104.516456 C24.1127818,59.0781589 59.996984,23.5357895 105.498734,17.1240506 L106.136709,17.0329114 L113.134177,4.88101266 C114.540916,2.44110536 117.143102,0.937695981 119.959494,0.937695981 C122.775885,0.937695981 125.378072,2.44110536 126.78481,4.88101266 L133.873418,17.0936709 L134.501266,17.1848101 C179.574552,23.7932799 215.057789,59.0423444 221.964557,104.070886 L222.055696,104.698734 L235.949367,112.820253 C238.389274,114.226992 239.892684,116.829178 239.892684,119.64557 C239.892684,122.461961 238.389274,125.064147 235.949367,126.470886 L222.025316,134.511392 L221.934177,135.139241 C215.113928,179.570343 180.448636,214.550476 136.081013,221.772152 L135.463291,221.873418 L126.774684,236.962025 C125.362344,239.395793 122.763243,240.895867 119.949367,240.901266 Z M60.8607595,189.934177 C63.0177215,191.746835 65.2962025,193.478481 67.6253165,195.088608 C69.9544304,196.698734 72.4455696,198.248101 74.9164557,199.64557 L74.9873418,199.64557 C96.8075731,211.83401 122.661534,214.574157 146.551899,207.23038 C147.443038,206.956962 148.334177,206.663291 149.21519,206.359494 L149.21519,206.359494 L149.275949,206.359494 C150.106329,206.075949 150.926582,205.772152 151.746835,205.468354 L152.162025,205.306329 C152.891139,205.022785 153.63038,204.739241 154.359494,204.435443 L154.693671,204.303797 C156.38481,203.594937 158.065823,202.835443 159.696203,202.04557 L159.918987,201.934177 C160.648101,201.579747 161.367089,201.205063 162.086076,200.83038 L162.460759,200.627848 C163.196624,200.236287 163.925738,199.834599 164.648101,199.422785 L164.8,199.341772 C166.359494,198.450633 167.929114,197.498734 169.468354,196.496203 L169.731646,196.324051 C170.406751,195.878481 171.081857,195.429536 171.756962,194.977215 L172.040506,194.78481 C174.248101,193.235443 176.425316,191.564557 178.501266,189.822785 L178.744304,189.610127 C179.378903,189.070042 180.010127,188.523207 180.637975,187.96962 L180.76962,187.848101 C182.136709,186.622785 183.483544,185.336709 184.820253,184.03038 L184.870886,183.979747 C185.485232,183.35865 186.089451,182.727426 186.683544,182.086076 L186.84557,181.913924 C188.718987,179.888608 190.511392,177.782278 192.182278,175.61519 L192.243038,175.534177 C192.789873,174.825316 193.326582,174.106329 193.853165,173.387342 L193.924051,173.296203 C195.544304,171.058228 197.093671,168.708861 198.511392,166.318987 L198.572152,166.227848 C200.478558,163.006837 202.186381,159.672355 203.686076,156.243038 C204.833755,153.603376 205.846414,150.950211 206.724051,148.283544 L206.724051,148.283544 L206.724051,148.182278 C213.734473,126.763621 212.60237,103.512237 203.544304,82.8759494 C202.379747,80.2227848 201.083544,77.6405063 199.696203,75.1392405 L199.64557,75.0379747 C198.268354,72.5772152 196.759494,70.1468354 195.159494,67.8177215 L195.068354,67.6860759 C194.562025,66.950211 194.042194,66.221097 193.508861,65.4987342 L193.508861,65.4278481 C192.367932,63.8751055 191.2,62.3864979 190.005063,60.9620253 L189.903797,60.8405063 C189.350211,60.1654008 188.789873,59.5172996 188.222785,58.8962025 L188,58.6531646 C186.75443,57.2556962 185.468354,55.9088608 184.182278,54.6025316 L184.111392,54.5316456 C183.503797,53.9308017 182.886076,53.3367089 182.258228,52.7493671 L181.913924,52.435443 C181.326582,51.8886076 180.729114,51.3485232 180.121519,50.8151899 L179.908861,50.6227848 C178.562025,49.4481013 177.15443,48.2936709 175.716456,47.1797468 L175.281013,46.8455696 C174.700422,46.4 174.11308,45.9611814 173.518987,45.5291139 L173.083544,45.2151899 C171.635443,44.2025316 170.136709,43.1898734 168.648101,42.1772152 L168.162025,41.8734177 L166.359494,40.7797468 L165.772152,40.435443 C165.097046,40.0438819 164.421941,39.6624473 163.746835,39.2911392 L163.443038,39.1189873 C162.659916,38.6936709 161.870042,38.278481 161.073418,37.8734177 L160.607595,37.6405063 L158.693671,36.7088608 L157.974684,36.4556962 L156.101266,35.6151899 L155.524051,35.3620253 C154.707173,35.0109705 153.883544,34.6734177 153.053165,34.3493671 L152.749367,34.2379747 C152.027004,33.9544304 151.301266,33.6810127 150.572152,33.4177215 L149.832911,33.1544304 L147.959494,32.5164557 L147.240506,32.2835443 C127.489085,26.0374001 106.204341,26.6656267 86.8556962,34.0658228 C84.121519,35.078481 81.4177215,36.3037975 78.8050633,37.6101266 L78.7240506,37.6101266 C76.1620253,38.8860759 73.6607595,40.3139241 71.1797468,41.843038 L71.078481,41.9037975 C68.6582278,43.4126582 66.2886076,45.0632911 63.9898734,46.7949367 L63.8582278,46.8962025 C61.6101266,48.6177215 59.4126582,50.4708861 57.3367089,52.3949367 L57.1949367,52.5265823 C56.5198312,53.1611814 55.8447257,53.7991561 55.1696203,54.4405063 C53.8194093,55.7907173 52.5029536,57.1746835 51.2202532,58.5924051 L51.0683544,58.764557 C50.4810127,59.4396624 49.9004219,60.1147679 49.3265823,60.7898734 L49.2253165,60.9113924 C48.0202532,62.3493671 46.8455696,63.8481013 45.7316456,65.3670886 L45.5898734,65.5594937 C45.0767932,66.2345992 44.5738397,66.9400844 44.0810127,67.6759494 L43.9291139,67.8886076 C42.8658228,69.4379747 41.843038,71.0379747 40.8911392,72.6379747 L40.7696203,72.8405063 C40.3308017,73.5763713 39.9021097,74.3223629 39.4835443,75.078481 L39.321519,75.3620253 C38.4101266,77.0126582 37.5392405,78.7037975 36.7291139,80.4253165 L36.6481013,80.5974684 C36.2734177,81.3873418 35.9189873,82.1772152 35.564557,82.9670886 L35.4126582,83.3113924 C34.7443038,85.0632911 34.035443,86.835443 33.4177215,88.5873418 L33.4177215,88.6987342 C33.1139241,89.5392405 32.8303797,90.3797468 32.556962,91.2202532 L32.435443,91.6050633 C32.1586498,92.4556962 31.8953586,93.3130802 31.6455696,94.1772152 L31.5746835,94.4405063 C26.595616,111.858659 26.8845499,130.361 32.4050633,147.61519 L32.5367089,148.03038 C32.7932489,148.806751 33.0565401,149.579747 33.3265823,150.349367 L33.4278481,150.643038 C34.0556962,152.374684 34.7443038,154.116456 35.4531646,155.817722 L35.5848101,156.121519 C35.9088608,156.864135 36.2464135,157.603376 36.5974684,158.339241 L36.7696203,158.693671 C37.5696203,160.38481 38.4202532,162.04557 39.2911392,163.635443 L39.2911392,163.716456 C39.7063291,164.465823 40.1417722,165.225316 40.5873418,165.98481 L40.7493671,166.268354 C41.2151899,167.058228 41.6607595,167.777215 42.1164557,168.506329 L42.1873418,168.627848 C43.2,170.167089 44.2126582,171.665823 45.3063291,173.225316 L45.4683544,173.448101 C45.9611814,174.123207 46.464135,174.798312 46.9772152,175.473418 L47.1291139,175.675949 C48.2734177,177.15443 49.4683544,178.602532 50.6835443,179.989873 C51.3012658,180.688608 51.8987342,181.356962 52.5164557,182.01519 L52.6886076,182.197468 C54.5721519,184.222785 56.5873418,186.177215 58.6531646,188.03038 L58.7746835,188.131646 C59.4531646,188.739241 60.1417722,189.336709 60.8,189.924051 L60.8,189.924051 L60.8607595,189.934177 Z" id="Shape" fill="#435B71"></path>
+ <polygon id="Shape" fill="#435B71" points="159.534177 97.5189873 163.088608 58.5620253 127.574684 74.9670886 92.0607595 91.3721519 111.443038 105.043038 125.124051 98.7240506 138.794937 92.4050633 137.427848 107.412658 136.060759 122.420253 155.989873 136.475949"></polygon>
+ <path d="M178.956962,148.648101 L190.096203,23.4835443 C190.171524,22.6909774 189.816231,21.9188492 189.16529,21.4604697 C188.514349,21.0020903 187.667652,20.9278012 186.946835,21.2658228 L72.7594937,73.7113924 C72.0437489,74.0404575 71.5602386,74.7289762 71.4936709,75.5139241 C71.4176769,76.3074 71.7733591,77.0806222 72.4253165,77.5392405 L92.0708861,91.4025316 L127.594937,74.9367089 L163.108861,58.5316456 L159.534177,97.5189873 L155.949367,136.475949 L175.453165,150.237975 C176.097687,150.691 176.934164,150.768095 177.650633,150.440506 C178.379161,150.12447 178.879174,149.438406 178.956962,148.648101 L178.956962,148.648101 Z" id="Shape" fill="#42B983"></path>
+ <polygon id="Shape" fill="#435B71" points="112.081013 166.612658 76.6886076 183.270886 79.9594937 144.293671 83.2303797 105.306329 102.703797 118.84557 101.448101 133.853165 100.182278 148.870886 113.812658 142.450633 127.453165 136.040506 147.473418 149.95443"></polygon>
+ <path d="M166.764557,167.372152 L52.9518987,220.637975 C52.2362593,220.97236 51.3967777,220.900858 50.7479988,220.450259 C50.0992199,219.99966 49.7390845,219.237988 49.8025316,218.450633 L60.0202532,93.164557 C60.0848668,92.381855 60.5641373,91.6938699 61.2759494,91.3620253 C61.9906525,91.0314903 62.8270309,91.1047216 63.4734177,91.5544304 L83.2202532,105.316456 L80,144.293671 L76.6886076,183.291139 L112.131646,166.632911 L147.574684,149.974684 L167.088608,163.564557 C167.744398,164.020765 168.104147,164.794421 168.03038,165.589873 C167.956848,166.367334 167.474402,167.046619 166.764557,167.372152 Z" id="Shape" fill="#42B983"></path>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
|
6d957d3c5fba9f4ee49e306d7e3381f706abf94b
|
2025-02-14 22:31:24
|
John Leider
|
chore(README.md): update sponsors
| false
|
update sponsors
|
chore
|
diff --git a/README.md b/README.md
index fac88317900..3c9adee54b8 100644
--- a/README.md
+++ b/README.md
@@ -98,11 +98,6 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<table>
<tbody>
<tr>
- <td>
- <a href="http://crossword-solver.io/">
- <img height="35px" src="https://cdn.cosmicjs.com/098aa4e0-9749-11eb-bf6a-1ffd0f06b0f7-crossword-solver-logo-light.svg">
- </a>
- </td>
<td style="text-align: center;">
<a href="https://www.muenchen.de/">
<img height="30px" src="https://imgix.cosmicjs.com/af2ce530-eaa2-11ed-ba82-019c4666da06-itm-logo.png">
@@ -118,32 +113,19 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/vuemastery.svg">
</a>
</td>
- </tr>
- <tr></tr>
- <tr>
<td>
<a href="https://views4you.com/buy-instagram-followers/">
<img height="30px" src="https://cdn.cosmicjs.com/861b0ce0-50e4-11ef-b1ea-f56c65dfade9-views-4-you-light.png">
</a>
</td>
- <td>
- <a href="https://uk.nongamstopcasinos.net/">
- <img height="30px" src="https://cdn.cosmicjs.com/dddf2570-6925-11ef-a492-5bdc7520fe60-logo_dark-bg.png.webp">
- </a>
- </td>
- <td style="text-align: center;">
- <a href="https://poprey.com/buy-instagram-followers">
- <img height="30px" src="https://cdn.cosmicjs.com/69ea08d0-7b20-11ef-915f-61acd7484848-256-1.png">
- </a>
- </td>
+ </tr>
+ <tr></tr>
+ <tr>
<td>
<a href="https://www.mediamister.com/">
<img height="30px" src="https://cdn.cosmicjs.com/750cbe80-8d34-11ef-b5a0-93db72e2be98-logo-1.svg">
</a>
</td>
- </tr>
- <tr></tr>
- <tr>
<td style="text-align: center;">
<a href="https://www.slotozilla.com/">
<img height="30px" src="https://cdn.cosmicjs.com/21525470-ab03-11ef-bee4-3bb1d3c55332-256-2.png">
@@ -155,7 +137,6 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
</a>
</td>
<td></td>
- <td></td>
</tr>
</tbody>
</table>
|
c2fc0fd74b27c943a3395beda082f8e6e9fded8d
|
2018-05-07 21:28:37
|
Kael
|
feat(VExpansionPanel): add disabled and readonly props (#3969)
| false
|
add disabled and readonly props (#3969)
|
feat
|
diff --git a/src/components/VExpansionPanel/VExpansionPanel.js b/src/components/VExpansionPanel/VExpansionPanel.js
index 3354dbc4b71..c2a2e5afb99 100644
--- a/src/components/VExpansionPanel/VExpansionPanel.js
+++ b/src/components/VExpansionPanel/VExpansionPanel.js
@@ -10,19 +10,18 @@ export default {
provide () {
return {
- panelClick: this.panelClick,
- focusable: this.focusable
+ expansionPanel: this
}
},
- data () {
- return {
- items: [],
- open: []
- }
- },
+ data: () => ({
+ items: [],
+ open: []
+ }),
props: {
+ disabled: Boolean,
+ readonly: Boolean,
expand: Boolean,
focusable: Boolean,
inset: Boolean,
@@ -33,10 +32,37 @@ export default {
}
},
+ computed: {
+ classes () {
+ return {
+ 'v-expansion-panel--focusable': this.focusable,
+ 'v-expansion-panel--popout': this.popout,
+ 'v-expansion-panel--inset': this.inset,
+ ...this.themeClasses
+ }
+ }
+ },
+
watch: {
- expand (v) {
- this.open = Array(this.items.length).fill(false)
- this.$emit('input', v ? this.open : null)
+ expand (val) {
+ let openIndex
+ if (!val) {
+ // Close all panels unless only one is open
+ const openCount = this.open.reduce((acc, val) => acc + val, 0)
+ const open = Array(this.items.length).fill(false)
+
+ if (openCount === 1) {
+ openIndex = this.open.indexOf(true)
+ }
+
+ if (openIndex > -1) {
+ open[openIndex] = true
+ }
+
+ this.open = open
+ }
+
+ this.$emit('input', val ? this.open : (openIndex > -1 ? openIndex : null))
},
value (v) {
this.updateFromValue(v)
@@ -93,12 +119,7 @@ export default {
render (h) {
return h('ul', {
staticClass: 'v-expansion-panel',
- 'class': {
- 'v-expansion-panel--focusable': this.focusable,
- 'v-expansion-panel--popout': this.popout,
- 'v-expansion-panel--inset': this.inset,
- ...this.themeClasses
- }
+ class: this.classes
}, this.$slots.default)
}
}
diff --git a/src/components/VExpansionPanel/VExpansionPanelContent.js b/src/components/VExpansionPanel/VExpansionPanelContent.js
index c58148905ae..53ce87b48e9 100644
--- a/src/components/VExpansionPanel/VExpansionPanelContent.js
+++ b/src/components/VExpansionPanel/VExpansionPanelContent.js
@@ -20,15 +20,15 @@ export default {
ClickOutside
},
- inject: ['focusable', 'panelClick'],
+ inject: ['expansionPanel'],
- data () {
- return {
- height: 'auto'
- }
- },
+ data: () => ({
+ height: 'auto'
+ }),
props: {
+ disabled: Boolean,
+ readonly: Boolean,
expandIcon: {
type: String,
default: '$vuetify.icons.expand'
@@ -40,17 +40,40 @@ export default {
}
},
+ computed: {
+ containerClasses () {
+ return {
+ 'v-expansion-panel__container--active': this.isActive,
+ 'v-expansion-panel__container--disabled': this.isDisabled
+ }
+ },
+ isDisabled () {
+ return this.expansionPanel.disabled || this.disabled
+ },
+ isReadonly () {
+ return this.expansionPanel.readonly || this.readonly
+ }
+ },
+
methods: {
+ onKeydown (e) {
+ // Ensure element is the activeElement
+ if (
+ e.keyCode === 13 &&
+ this.$el === document.activeElement
+ ) this.expansionPanel.panelClick(this._uid)
+ },
+ onHeaderClick () {
+ this.isReadonly || this.expansionPanel.panelClick(this._uid)
+ },
genBody () {
return this.$createElement('div', {
ref: 'body',
class: 'v-expansion-panel__body',
- directives: [
- {
- name: 'show',
- value: this.isActive
- }
- ]
+ directives: [{
+ name: 'show',
+ value: this.isActive
+ }]
}, this.showLazyContent(this.$slots.default))
},
genHeader () {
@@ -61,7 +84,7 @@ export default {
value: this.ripple
}],
on: {
- click: () => this.panelClick(this._uid)
+ click: this.onHeaderClick
}
}, [
this.$slots.header,
@@ -74,9 +97,17 @@ export default {
const icon = this.$slots.actions ||
this.$createElement(VIcon, this.expandIcon)
- return this.$createElement('div', {
- staticClass: 'header__icon'
- }, [icon])
+ return this.$createElement('transition', {
+ attrs: { name: 'fade-transition' }
+ }, [
+ this.$createElement('div', {
+ staticClass: 'header__icon',
+ directives: [{
+ name: 'show',
+ value: !this.isDisabled
+ }]
+ }, [icon])
+ ])
},
toggle (active) {
if (active) this.isBooted = true
@@ -106,20 +137,12 @@ export default {
return h('li', {
staticClass: 'v-expansion-panel__container',
- 'class': {
- 'v-expansion-panel__container--active': this.isActive
- },
+ class: this.containerClasses,
attrs: {
- tabindex: 0
+ tabindex: this.isReadonly || this.isDisabled ? null : 0
},
on: {
- keydown: e => {
- // Ensure element is focusable and the activeElement
- if (this.focusable &&
- this.$el === document.activeElement &&
- e.keyCode === 13
- ) this.panelClick(this._uid)
- }
+ keydown: this.onKeydown
}
}, children)
}
diff --git a/src/stylus/components/_expansion-panel.styl b/src/stylus/components/_expansion-panel.styl
index 8e75a22964d..4c1cbaec3a7 100755
--- a/src/stylus/components/_expansion-panel.styl
+++ b/src/stylus/components/_expansion-panel.styl
@@ -9,8 +9,12 @@ v-expansion-panel($material)
color: $material.text.primary
.v-expansion-panel__header
- .v-icon
- color: $material.icons.active
+ .header__icon
+ .v-icon
+ color: $material.icons.active
+
+ &--disabled
+ color: $material.text.disabled
&--focusable
.v-expansion-panel__container
@@ -45,6 +49,10 @@ theme(v-expansion-panel, "v-expansion-panel")
// Edge rendering issue TODO: revisit later
transition: none
+ &--disabled
+ .v-expansion-panel__header
+ pointer-events: none
+
&--active
> .v-expansion-panel__header
.header__icon .v-icon
@@ -56,6 +64,7 @@ theme(v-expansion-panel, "v-expansion-panel")
align-items: center
position: relative
padding: 12px 24px
+ height: 48px
> *:not(.header__icon)
flex: 1 1 auto
diff --git a/test/unit/components/VExpansionPanel/VExpansionPanel.spec.js b/test/unit/components/VExpansionPanel/VExpansionPanel.spec.js
index 9747fd28b0a..2cb50219e00 100644
--- a/test/unit/components/VExpansionPanel/VExpansionPanel.spec.js
+++ b/test/unit/components/VExpansionPanel/VExpansionPanel.spec.js
@@ -98,8 +98,30 @@ test('VExpansionPanel.js', ({ mount, compileToFunctions }) => {
expect(wrapper.find('.v-expansion-panel__container--active').length).toBe(2)
})
- it('should reset v-model when switching expand', async () => {
+ it('should reset v-model when disabling expand', async () => {
const fn = jest.fn()
+ const wrapper = mount(VExpansionPanel, {
+ propsData: {
+ expand: true,
+ value: [true, true]
+ },
+ slots: {
+ default: [VExpansionPanelContent, VExpansionPanelContent]
+ }
+ })
+
+ wrapper.instance().$on('input', fn)
+
+ await wrapper.vm.$nextTick()
+ expect(wrapper.find('.v-expansion-panel__container--active').length).toBe(2)
+
+ wrapper.setProps({ expand: false })
+ await wrapper.vm.$nextTick()
+ expect(fn).toHaveBeenCalledWith(null)
+ })
+
+ it('should reset v-model when disabling expand', async () => {
+ const input = jest.fn()
const wrapper = mount(VExpansionPanel, {
propsData: {
expand: true,
@@ -110,14 +132,50 @@ test('VExpansionPanel.js', ({ mount, compileToFunctions }) => {
}
})
- wrapper.instance().$on('input', fn)
+ wrapper.instance().$on('input', input)
+ await wrapper.vm.$nextTick()
expect(wrapper.find('.v-expansion-panel__container--active').length).toBe(0)
wrapper.setProps({ expand: false })
+ await wrapper.vm.$nextTick()
+ expect(input).toHaveBeenCalledWith(null)
+ })
+
+ it('should keep a single item open when disabling expand', async () => {
+ const input = jest.fn()
+ const wrapper = mount(VExpansionPanel, {
+ propsData: {
+ expand: true,
+ value: [false, true]
+ },
+ slots: {
+ default: [VExpansionPanelContent, VExpansionPanelContent]
+ }
+ })
+ wrapper.vm.$on('input', input)
+ wrapper.setProps({ expand: false })
await wrapper.vm.$nextTick()
+ expect(input).toHaveBeenCalledWith(1)
+ })
- expect(fn).toHaveBeenCalledWith(null)
+ it('should keep the current item open when enabling expand', async () => {
+ const input = jest.fn()
+ const wrapper = mount(VExpansionPanel, {
+ propsData: {
+ expand: false,
+ value: 1
+ },
+ slots: {
+ default: [VExpansionPanelContent, VExpansionPanelContent]
+ }
+ })
+ wrapper.vm.$on('input', input)
+
+ wrapper.setProps({ expand: true })
+ await wrapper.vm.$nextTick()
+ expect(input).toHaveBeenCalledWith([false, true])
+ expect(wrapper.find('.v-expansion-panel__container--active').length).toBe(1)
})
})
diff --git a/test/unit/components/VExpansionPanel/VExpansionPanelContent.spec.js b/test/unit/components/VExpansionPanel/VExpansionPanelContent.spec.js
index 21b557d4676..88a52a71f74 100644
--- a/test/unit/components/VExpansionPanel/VExpansionPanelContent.spec.js
+++ b/test/unit/components/VExpansionPanel/VExpansionPanelContent.spec.js
@@ -3,6 +3,15 @@ import VExpansionPanelContent from '@/components/VExpansionPanel/VExpansionPanel
const registrableWarning = '[Vuetify] The v-expansion-panel component must be used inside a v-expansion-panel-content'
+function expansionPanelProvide (additional) {
+ return Object.assign({
+ data: {},
+ focusable: true,
+ panelClick: () => null,
+ register: () => null
+ }, additional)
+}
+
test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
it('should render component and match snapshot', () => {
const wrapper = mount(VExpansionPanelContent, {
@@ -12,13 +21,11 @@ test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
header: [compileToFunctions('<span>header</span>')]
},
provide: {
- focusable: true,
- panelClick: jest.fn()
+ expansionPanel: expansionPanelProvide()
}
})
expect(wrapper.html()).toMatchSnapshot()
- expect(registrableWarning).toHaveBeenTipped()
})
it('should respect hideActions prop', () => {
@@ -31,16 +38,14 @@ test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
header: [compileToFunctions('<span>header</span>')]
},
provide: {
- focusable: true,
- panelClick: jest.fn()
+ expansionPanel: expansionPanelProvide()
}
})
expect(wrapper.html()).toMatchSnapshot()
- expect(registrableWarning).toHaveBeenTipped()
})
- it('should render proper expand-icon', () => {
+ it('should render proper expand-icon', async () => {
const wrapper = mount(VExpansionPanelContent, {
propsData: {
expandIcon: 'block'
@@ -49,13 +54,11 @@ test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
header: [compileToFunctions('<span>header</span>')]
},
provide: {
- focusable: true,
- panelClick: jest.fn()
+ expansionPanel: expansionPanelProvide()
}
})
expect(wrapper.find('.v-icon')[0].element.textContent).toBe('block')
- expect(registrableWarning).toHaveBeenTipped()
})
it('should toggle panel on header click', async () => {
@@ -64,15 +67,15 @@ test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
header: [compileToFunctions('<span>header</span>')]
},
provide: {
- focusable: true,
- panelClick: uid => wrapper.vm.toggle(uid)
+ expansionPanel: expansionPanelProvide({
+ panelClick: uid => wrapper.vm.toggle(uid)
+ })
}
})
- wrapper.find('.v-expansion-panel__header')[0].trigger('click')
+ wrapper.first('.v-expansion-panel__header').trigger('click')
await wrapper.vm.$nextTick()
expect(wrapper.html()).toMatchSnapshot()
- expect(registrableWarning).toHaveBeenTipped()
})
it('should render an expanded component and match snapshot', () => {
@@ -81,13 +84,11 @@ test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
ripple: true
},
provide: {
- focusable: true,
- panelClick: jest.fn()
+ expansionPanel: expansionPanelProvide()
}
})
expect(wrapper.html()).toMatchSnapshot()
- expect(registrableWarning).toHaveBeenTipped()
})
it('should render an expanded component with lazy prop and match snapshot', () => {
@@ -96,12 +97,10 @@ test('VExpansionPanelContent.js', ({ mount, compileToFunctions }) => {
lazy: true
},
provide: {
- focusable: true,
- panelClick: jest.fn()
+ expansionPanel: expansionPanelProvide()
}
})
expect(wrapper.html()).toMatchSnapshot()
- expect(registrableWarning).toHaveBeenTipped()
})
})
|
e0888d37be0a571884075aee626c9931a0eb8623
|
2018-12-16 05:50:29
|
John Leider
|
feat(Theme): change default warning color
| false
|
change default warning color
|
feat
|
diff --git a/packages/vuetify/src/components/Vuetify/mixins/theme.ts b/packages/vuetify/src/components/Vuetify/mixins/theme.ts
index 56bf1eb43c7..8629ee957b9 100644
--- a/packages/vuetify/src/components/Vuetify/mixins/theme.ts
+++ b/packages/vuetify/src/components/Vuetify/mixins/theme.ts
@@ -8,7 +8,7 @@ const THEME_DEFAULTS = {
error: '#FF5252', // red.accent2
info: '#2196F3', // blue.base
success: '#4CAF50', // green.base
- warning: '#FFC107' // amber.base
+ warning: '#FB8C00' // orange.darken1
}
export default function theme (theme: VuetifyUseOptions['theme'] = {}): VuetifyTheme | false {
|
f6536a32e57ec1b9929926f16d7671bd58b7ad26
|
2019-07-05 03:05:00
|
John Leider
|
docs(VBtn): add alert regarding dark prop and disabled prop
| false
|
add alert regarding dark prop and disabled prop
|
docs
|
diff --git a/packages/docs/src/data/pages/components/Buttons.json b/packages/docs/src/data/pages/components/Buttons.json
index 5de21deaa90..93096de5162 100644
--- a/packages/docs/src/data/pages/components/Buttons.json
+++ b/packages/docs/src/data/pages/components/Buttons.json
@@ -40,6 +40,11 @@
{
"type": "section",
"children": [
+ {
+ "type": "alert",
+ "lang": "alert",
+ "value": "warning"
+ },
{
"type": "examples",
"value": [
diff --git a/packages/docs/src/lang/en/components/Buttons.json b/packages/docs/src/lang/en/components/Buttons.json
index 649507c1cf5..89f31769ef9 100644
--- a/packages/docs/src/lang/en/components/Buttons.json
+++ b/packages/docs/src/lang/en/components/Buttons.json
@@ -1,6 +1,7 @@
{
"header": "# Buttons",
"headerText": "The `v-btn` component replaces the standard html button with a material design theme and a multitude of options. Any color helper class can be used to alter the background or text color.",
+ "alert": "`v-btn` is the only component that behaves differently when using the **dark** prop. Normally components use the **dark** prop to denote that they have a dark colored background and need their text to be white. While this will work for `v-btn`, it is advised to only use the prop when the button **IS ON** a colored background due to the disabled state blending in with white backgrounds. If you need white text, simply add the **white--text** class.",
"examples": {
"usage": {
"desc": "Buttons in their simplest form contain uppercase text, a slight elevation, hover effect, and a ripple effect on click."
|
f44ee2474aefb68b87471597ac165ba006adcb00
|
2019-09-19 04:55:45
|
MajesticPotatoe
|
docs(VTooltip): add position prop alert
| false
|
add position prop alert
|
docs
|
diff --git a/packages/docs/src/data/pages/components/Tooltips.json b/packages/docs/src/data/pages/components/Tooltips.json
index 93007e1afdf..6dfb5afe30c 100644
--- a/packages/docs/src/data/pages/components/Tooltips.json
+++ b/packages/docs/src/data/pages/components/Tooltips.json
@@ -7,6 +7,16 @@
"link": "https://material.io/design/components/tooltips.html"
},
"children": [
+ {
+ "type": "section",
+ "children": [
+ {
+ "type": "alert",
+ "lang": "headerAlert1",
+ "value": "info"
+ }
+ ]
+ },
{
"type": "section",
"children": [
diff --git a/packages/docs/src/lang/en/components/Tooltips.json b/packages/docs/src/lang/en/components/Tooltips.json
index 1e3ffbcc168..5df8541ee57 100644
--- a/packages/docs/src/lang/en/components/Tooltips.json
+++ b/packages/docs/src/lang/en/components/Tooltips.json
@@ -1,6 +1,7 @@
{
"header": "# Tooltips",
"headerText": "The `v-tooltip` component is useful for conveying information when a user hovers over an element. You can also programmatically control the display of tooltips through a `v-model`. When activated, tooltips display a text label identifying an element, such as a description of its function.",
+ "headerAlert1" : "In order for `v-tooltip` to be positioned correctly a position prop ( `top` | `bottom` | `left` | `right` ) is required",
"examples": {
"usage": {
"desc": "Tooltips can wrap any element."
|
5ccad8796115f976a17fce33adfae809cc546570
|
2018-04-05 08:11:45
|
John Leider
|
fix(v-radio-group): fixed row wrap on smaller screens
| false
|
fixed row wrap on smaller screens
|
fix
|
diff --git a/src/stylus/components/_radio-group.styl b/src/stylus/components/_radio-group.styl
index fcf43896404..e42bb924325 100644
--- a/src/stylus/components/_radio-group.styl
+++ b/src/stylus/components/_radio-group.styl
@@ -14,6 +14,7 @@ theme(radiogroup, "radio-group")
&--row
.v-input--radio-group__input
flex-direction: row
+ flex-wrap: wrap
&--column
.v-input--radio-group__input
|
aab947da6a033bc7d2a16c2e9a438dad51247e88
|
2020-01-15 04:55:35
|
John Leider
|
chore(release): publish v2.2.4
| false
|
publish v2.2.4
|
chore
|
diff --git a/lerna.json b/lerna.json
index 39828a021a7..b961201c192 100644
--- a/lerna.json
+++ b/lerna.json
@@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
- "version": "2.2.3",
+ "version": "2.2.4",
"useWorkspaces": true
}
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index e33e83ab166..fcfc67796c1 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
- "version": "2.2.3",
+ "version": "2.2.4",
"private": true,
"description": "",
"main": "dist/api.js",
@@ -15,7 +15,7 @@
"dependencies": {
"deepmerge": "^4.0.0",
"vue": "^2.6.10",
- "vuetify": "^2.2.3"
+ "vuetify": "^2.2.4"
},
"devDependencies": {
"@babel/node": "^7.5.5",
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 73e255a186f..d9c6ea56915 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.3",
+ "version": "2.2.4",
"scripts": {
"dev": "cross-env node --max_old_space_size=4096 server",
"start": "cross-env NODE_ENV=production node server",
@@ -12,7 +12,7 @@
"lint:fix": "yarn lint --fix"
},
"dependencies": {
- "@vuetify/api-generator": "^2.2.3",
+ "@vuetify/api-generator": "^2.2.4",
"babel-polyfill": "^6.26.0",
"chokidar": "^3.0.2",
"compression": "^1.7.4",
@@ -42,7 +42,7 @@
"vue-router": "^3.0.7",
"vue-server-renderer": "^2.6.10",
"vuelidate": "^0.7.4",
- "vuetify": "^2.2.3",
+ "vuetify": "^2.2.4",
"vuex": "^3.1.1",
"vuex-pathify": "^1.4.0",
"vuex-router-sync": "^5.0.0",
diff --git a/packages/kitchen/package.json b/packages/kitchen/package.json
index 427cc14181e..708aea46b6f 100644
--- a/packages/kitchen/package.json
+++ b/packages/kitchen/package.json
@@ -1,6 +1,6 @@
{
"name": "@vuetify/kitchen",
- "version": "2.2.3",
+ "version": "2.2.4",
"private": true,
"scripts": {
"dev": "vue-cli-service serve",
@@ -12,7 +12,7 @@
"dependencies": {
"sass-loader": "^7.1.0",
"vue-router": "^3.0.7",
- "vuetify": "^2.2.3"
+ "vuetify": "^2.2.4"
},
"devDependencies": {
"@applitools/eyes-cypress": "^3.6.40",
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index 7a8e88c2ff7..925c660a717 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.3",
+ "version": "2.2.4",
"author": {
"name": "John Leider",
"email": "[email protected]"
|
a8e37f87b43f8cfb3cc3a5f0530711f4a8f616c4
|
2022-10-14 00:33:18
|
John Leider
|
fix(VField): label opacity flicker (#15840)
| false
|
label opacity flicker (#15840)
|
fix
|
diff --git a/packages/vuetify/src/components/VField/VField.sass b/packages/vuetify/src/components/VField/VField.sass
index 38d3128d16b..cd2d97e599c 100644
--- a/packages/vuetify/src/components/VField/VField.sass
+++ b/packages/vuetify/src/components/VField/VField.sass
@@ -207,7 +207,6 @@
.v-field--active &
visibility: hidden
- .v-field--disabled &,
.v-field--focused &,
.v-field--error &
opacity: 1
|
5d8ec6ca76003807f20cf94ba85e98867718acb3
|
2019-12-31 01:02:12
|
Andrew Henry
|
docs(VNavigationDrawer): reference v-row
| false
|
reference v-row
|
docs
|
diff --git a/packages/docs/src/lang/en/components/NavigationDrawers.json b/packages/docs/src/lang/en/components/NavigationDrawers.json
index 881ea2a04d7..78e6494b97a 100644
--- a/packages/docs/src/lang/en/components/NavigationDrawers.json
+++ b/packages/docs/src/lang/en/components/NavigationDrawers.json
@@ -23,7 +23,7 @@
},
"combined": {
"heading": "### Combined drawers",
- "desc": "In this example we define a custom width to accommodate our nested drawer. Using `v-layout` we ensure that the drawer and list stack horizontally next to each other."
+ "desc": "In this example we define a custom width to accommodate our nested drawer. Using `v-row` we ensure that the drawer and list stack horizontally next to each other."
},
"right": {
"heading": "### Right positioned",
|
13ba9d74ba7b4e8fd4923a27c11148458910a0d8
|
2023-03-19 20:33:57
|
Yuchao
|
fix(VSlider): respect decimals from min (#16667)
| false
|
respect decimals from min (#16667)
|
fix
|
diff --git a/packages/vuetify/src/components/VSlider/__tests__/VSlider.spec.cy.tsx b/packages/vuetify/src/components/VSlider/__tests__/VSlider.spec.cy.tsx
index 9d4f7a27cc0..34ccdc5809d 100644
--- a/packages/vuetify/src/components/VSlider/__tests__/VSlider.spec.cy.tsx
+++ b/packages/vuetify/src/components/VSlider/__tests__/VSlider.spec.cy.tsx
@@ -1,7 +1,7 @@
/// <reference types="../../../../types/cypress" />
import { VApp } from '@/components/VApp'
-import { CenteredGrid } from '@/../cypress/templates'
+import { Application, CenteredGrid } from '@/../cypress/templates'
import { VSlider } from '..'
describe('VSlider', () => {
@@ -176,4 +176,36 @@ describe('VSlider', () => {
</VApp>
))
})
+
+ // https://github.com/vuetifyjs/vuetify/issues/16634
+ it('should respect the decimals from both step and min', () => {
+ cy.mount(() => (
+ <Application>
+ <CenteredGrid width="360px">
+ <VSlider
+ modelValue={ 1.001 }
+ step={ 1.001 }
+ min={ 1.0001 }
+ max={ 10 }
+ thumb-label
+ />
+ </CenteredGrid>
+ </Application>
+ ))
+
+ cy.get('.v-slider-thumb')
+ .trigger('mouseover')
+ .trigger('mousedown', { which: 1 })
+ .trigger('mousemove', 35, 0, { force: true }) // move to second step
+ .trigger('mousemove', 190, 0, { force: true }) // move to fifth step
+ .trigger('mousemove', 360, 0, { force: true }) // move to the final step
+ .trigger('mouseup')
+
+ cy.emitted(VSlider, 'update:modelValue')
+ .should('deep.equal', [
+ [2.0011],
+ [6.0051],
+ [10],
+ ])
+ })
})
diff --git a/packages/vuetify/src/components/VSlider/slider.ts b/packages/vuetify/src/components/VSlider/slider.ts
index 351b0a79df9..3f5f1b33bf7 100644
--- a/packages/vuetify/src/components/VSlider/slider.ts
+++ b/packages/vuetify/src/components/VSlider/slider.ts
@@ -5,7 +5,7 @@ import { makeRoundedProps } from '@/composables/rounded'
import { useRtl } from '@/composables/locale'
// Utilities
-import { clamp, createRange, propsFactory } from '@/util'
+import { clamp, createRange, getDecimals, propsFactory } from '@/util'
import { computed, provide, ref, toRef } from 'vue'
// Types
@@ -157,12 +157,7 @@ export const useSlider = ({
const min = computed(() => parseFloat(props.min))
const max = computed(() => parseFloat(props.max))
const step = computed(() => props.step > 0 ? parseFloat(props.step) : 0)
- const decimals = computed(() => {
- const trimmedStep = step.value.toString().trim()
- return trimmedStep.includes('.')
- ? (trimmedStep.length - trimmedStep.indexOf('.') - 1)
- : 0
- })
+ const decimals = computed(() => Math.max(getDecimals(step.value), getDecimals(min.value)))
const thumbSize = computed(() => parseInt(props.thumbSize, 10))
const tickSize = computed(() => parseInt(props.tickSize, 10))
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index 0af2409666d..d80eead909f 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -338,6 +338,13 @@ export function clamp (value: number, min = 0, max = 1) {
return Math.max(min, Math.min(max, value))
}
+export function getDecimals (value: number) {
+ const trimmedStr = value.toString().trim()
+ return trimmedStr.includes('.')
+ ? (trimmedStr.length - trimmedStr.indexOf('.') - 1)
+ : 0
+}
+
export function padEnd (str: string, length: number, char = '0') {
return str + char.repeat(Math.max(0, length - str.length))
}
|
87561c941cc960a6be610fa31fcd451b03e9ebfa
|
2022-11-29 22:30:03
|
Zerio
|
docs(theme.md): Fix js & ts conflicts / inaccuracy (#16123)
| false
|
Fix js & ts conflicts / inaccuracy (#16123)
|
docs
|
diff --git a/packages/docs/src/pages/en/features/theme.md b/packages/docs/src/pages/en/features/theme.md
index 6fc2a4ed4a4..fa5f2ed9fdd 100644
--- a/packages/docs/src/pages/en/features/theme.md
+++ b/packages/docs/src/pages/en/features/theme.md
@@ -23,6 +23,10 @@ Customize your application's default text colors, surfaces, and more. Easily mod
Vuetify comes with two themes pre-installed, `light` and `dark`. To set the default theme of your application, use the **defaultTheme** option.
+### Javascript
+
+Example with only the **defaultTheme** value
+
```js { resource="src/plugins/vuetify.js" }
import { createApp } from 'vue'
import { createVuetify } from 'vuetify'
@@ -34,9 +38,55 @@ export default createVuetify({
})
```
-Adding new themes is as easy as defining a new property in the **theme.themes** object. A theme is a collection of colors and options that change the overall look and feel of your application. One of these options designates the theme as being either a **light** or **dark** variation. This makes it possible for Vuetify to implement Material Design concepts such as elevated surfaces having a lighter overlay color the higher up they are. Find out more about dark themes on the official [Material Design](https://material.io/design/color/dark-theme.html) page.
+Adding new themes is as easy as defining a new property in the **theme.themes** object. A theme is a collection of colors and options that change the overall look and feel of your application. One of these options designates the theme as being either a **light** or **dark** variation.
+This makes it possible for Vuetify to implement Material Design concepts such as elevated surfaces having a lighter overlay color the higher up they are. Find out more about dark themes on the official [Material Design](https://material.io/design/color/dark-theme.html) page.
+
+```js { resource="src/plugins/vuetify.js" }
+import { createApp } from 'vue'
+import { createVuetify, ThemeDefinition } from 'vuetify'
+
+const myCustomLightTheme = {
+ dark: false,
+ colors: {
+ background: '#FFFFFF',
+ surface: '#FFFFFF',
+ primary: '#6200EE',
+ 'primary-darken-1': '#3700B3',
+ secondary: '#03DAC6',
+ 'secondary-darken-1': '#018786',
+ error: '#B00020',
+ info: '#2196F3',
+ success: '#4CAF50',
+ warning: '#FB8C00',
+ }
+}
+
+export default createVuetify({
+ theme: {
+ defaultTheme: 'myCustomLightTheme',
+ themes: {
+ myCustomLightTheme,
+ }
+ }
+})
+```
+
+### Typescript
+
+Example with only the **defaultTheme** value
+
+```ts { resource="src/plugins/vuetify.ts" }
+import { createApp } from 'vue'
+import { createVuetify } from 'vuetify'
+
+export default createVuetify({
+ theme: {
+ defaultTheme: 'dark'
+ }
+})
+```
-Use the `ThemeDefinition` type to get type hints for the structure of the theme object.
+When using Typescript you may use the `ThemeDefinition` type to get type hints for the structure of the theme object.
```ts { resource="src/plugins/vuetify.ts" }
import { createApp } from 'vue'
@@ -70,7 +120,7 @@ export default createVuetify({
## Changing theme
-To dynamically change theme during runtime.
+This is used when you need to change the theme during runtime
```html
<template>
@@ -96,7 +146,7 @@ export default {
</script>
```
-Most components support the **theme** prop. When used, a new context is created for _that_ specific component and **all** of its children. In the following example, the [v-btn](/components/buttons/) uses the **dark** theme applied by its parent [v-card](/components/cards/).
+You should keep in mind that most of the Vuetify components support the **theme** prop. When used a new context is created for _that_ specific component and **all** of its children. In the following example, the [v-btn](/components/buttons/) uses the **dark** theme because it is applied to its parent [v-card](/components/cards/).
```html
<template>
|
90347f50aeae3ce8fb8d0d92e10e24d877ca10c8
|
2023-09-14 23:26:08
|
John Leider
|
fix(VDatePicker): don't apply color to current day
| false
|
don't apply color to current day
|
fix
|
diff --git a/packages/vuetify/src/labs/VDatePicker/VDatePickerMonth.tsx b/packages/vuetify/src/labs/VDatePicker/VDatePickerMonth.tsx
index 4c78ac8f7fe..732c3667d65 100644
--- a/packages/vuetify/src/labs/VDatePicker/VDatePickerMonth.tsx
+++ b/packages/vuetify/src/labs/VDatePicker/VDatePickerMonth.tsx
@@ -357,7 +357,7 @@ export const VDatePickerMonth = genericComponent()({
{ (props.showAdjacentMonths || !item.isAdjacent) && (
<VBtn
active={ item.isSelected }
- color={ color }
+ color={ !item.isToday ? color : undefined }
disabled={ item.isDisabled }
icon
ripple={ false } /* ripple not working correctly since we preventDefault in touchend */
|
01ed536be5f20de604f0b39305c72601db696cb9
|
2023-03-24 07:25:50
|
John Leider
|
docs(PremiumThemes): fix incorrect component name
| false
|
fix incorrect component name
|
docs
|
diff --git a/packages/docs/src/components/doc/PremiumThemes.vue b/packages/docs/src/components/doc/PremiumThemes.vue
index fd228062432..94cfe877b57 100644
--- a/packages/docs/src/components/doc/PremiumThemes.vue
+++ b/packages/docs/src/components/doc/PremiumThemes.vue
@@ -2,7 +2,7 @@
<v-row>
<template v-if="products.length === 0">
<v-col>
- <app-alert type="error">Problem fetching themes</app-alert>
+ <alert type="error">Problem fetching themes</alert>
</v-col>
</template>
|
1224416f6a2d69b375b63e6b9d198654ca21fc58
|
2023-07-18 22:56:07
|
Mostafa Y Shalaby
|
fix(VOverlay): position on LTR/RTL after locale switch (#17338)
| false
|
position on LTR/RTL after locale switch (#17338)
|
fix
|
diff --git a/packages/vuetify/src/components/VOverlay/locationStrategies.ts b/packages/vuetify/src/components/VOverlay/locationStrategies.ts
index 47e6530539d..f463b6c9884 100644
--- a/packages/vuetify/src/components/VOverlay/locationStrategies.ts
+++ b/packages/vuetify/src/components/VOverlay/locationStrategies.ts
@@ -131,6 +131,12 @@ function getIntrinsicSize (el: HTMLElement, isRtl: boolean) {
// el.style.removeProperty('max-width')
// el.style.removeProperty('max-height')
+ if (isRtl) {
+ el.style.removeProperty('left')
+ } else {
+ el.style.removeProperty('right')
+ }
+
/* eslint-disable-next-line sonarjs/prefer-immediate-return */
const contentBox = nullifyTransforms(el)
|
0aa692aa8a7a13de2e9c8f51cd9f52f8d10143df
|
2021-07-25 01:12:37
|
Kael
|
fix(VAppBar): increase elevation override specificity
| false
|
increase elevation override specificity
|
fix
|
diff --git a/packages/vuetify/src/components/VAppBar/VAppBar.sass b/packages/vuetify/src/components/VAppBar/VAppBar.sass
index 8b358d27d79..9f1dcdadf26 100644
--- a/packages/vuetify/src/components/VAppBar/VAppBar.sass
+++ b/packages/vuetify/src/components/VAppBar/VAppBar.sass
@@ -15,7 +15,7 @@
top: 0
z-index: 5
-.v-app-bar.v-app-bar--hide-shadow
+.v-app-bar.v-app-bar.v-app-bar--hide-shadow
// Workaround for cascaded elevation styles
// that persist when the bar is inactive.
+elevation(0, true)
|
24c47f4de83a24680749199779d052e4ffba435c
|
2019-01-02 19:05:30
|
Andrew Henry
|
fix(snackbar): fixed deleted rtl style #6013
| false
|
fixed deleted rtl style #6013
|
fix
|
diff --git a/packages/vuetify/src/stylus/components/_snackbars.styl b/packages/vuetify/src/stylus/components/_snackbars.styl
index 4a9bc929951..873b9744928 100644
--- a/packages/vuetify/src/stylus/components/_snackbars.styl
+++ b/packages/vuetify/src/stylus/components/_snackbars.styl
@@ -1,5 +1,12 @@
@import '../bootstrap'
+v-snack-rtl()
+ &__content
+ .v-btn
+ margin: 0 24px 0 0
+
+rtl(v-snack-rtl, "v-snack")
+
.v-snack
position: fixed
display: flex
@@ -77,6 +84,14 @@
&--auto-height &__content
height: auto
+v-snack-sm-and-up-rtl()
+ @media $display-breakpoints.sm-and-up
+ &__content .v-btn:first-of-type
+ margin-left: 0
+ margin-right: 42px
+
+rtl(v-snack-sm-and-up-rtl, "v-snack")
+
@media $display-breakpoints.sm-and-up
.v-snack
&__wrapper
|
446f9bf8b747e28b97215c65e4e0e41cb7ee7b83
|
2019-04-17 04:45:32
|
John Leider
|
refactor(VBtn): remove icon size designation
| false
|
remove icon size designation
|
refactor
|
diff --git a/packages/vuetify/src/components/VBtn/VBtn.sass b/packages/vuetify/src/components/VBtn/VBtn.sass
index a076ad48923..cafbf0fcade 100644
--- a/packages/vuetify/src/components/VBtn/VBtn.sass
+++ b/packages/vuetify/src/components/VBtn/VBtn.sass
@@ -194,9 +194,6 @@
height: #{$size}px
width: #{$size}px
- .v-icon
- font-size: #{round($size / 1.5)}px
-
&.v-btn--absolute
&.v-btn--bottom
bottom: -#{$size / 2}px
|
7288626c886d2c7a7b86177820b88aa24dd8c8c0
|
2018-10-28 15:16:52
|
John Leider
|
chore(packages): updated vuetify
| false
|
updated vuetify
|
chore
|
diff --git a/packages/vuetifyjs.com/package.json b/packages/vuetifyjs.com/package.json
index 4135a001358..b97de66d8ec 100755
--- a/packages/vuetifyjs.com/package.json
+++ b/packages/vuetifyjs.com/package.json
@@ -45,7 +45,7 @@
"vue-router": "^3.0.1",
"vue-server-renderer": "^2.5.14",
"vuelidate": "^0.6.2",
- "vuetify": "^1.0.8",
+ "vuetify": "^1.0.9",
"vuex": "^3.0.1",
"vuex-router-sync": "^5.0.0"
},
diff --git a/packages/vuetifyjs.com/yarn.lock b/packages/vuetifyjs.com/yarn.lock
index cac565e5cf5..570128e566f 100644
--- a/packages/vuetifyjs.com/yarn.lock
+++ b/packages/vuetifyjs.com/yarn.lock
@@ -6313,9 +6313,9 @@ vuelidate@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.6.2.tgz#b417f5367407b047a2548119b25db56fe2bd5753"
-vuetify@^1.0.8:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.0.8.tgz#cb77287a4d4d941f440adc9f5448529423a8815c"
+vuetify@^1.0.9:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.0.9.tgz#036f0c97aaba452ec4bdfb87c4c69448db46af74"
vuex-router-sync@^5.0.0:
version "5.0.0"
|
67911a8dc91471477f7649c5c273c127b2320d4f
|
2019-07-25 18:15:44
|
Elijah Kotyluk
|
docs(VSimpleTable): update API for 2.0 (#8009)
| false
|
update API for 2.0 (#8009)
|
docs
|
diff --git a/packages/docs/src/lang/en/components/SimpleTables.json b/packages/docs/src/lang/en/components/SimpleTables.json
index d5f22ac6ae3..bdcabb8b52b 100644
--- a/packages/docs/src/lang/en/components/SimpleTables.json
+++ b/packages/docs/src/lang/en/components/SimpleTables.json
@@ -7,11 +7,11 @@
},
"height": {
"header": "### Fixed height",
- "desc": "Use the `height` prop to set a fixed height of the table."
+ "desc": "Use the `height` prop to set the height of the table."
},
"fixed-header": {
"header": "### Fixed header",
- "desc": "Use the `fixed-header` prop together with `height` to fix the header to the top of the table."
+ "desc": "Use the `fixed-header` prop together with the `height` prop to fix the header to the top of the table."
},
"dense": {
"header": "### Dense table",
diff --git a/packages/vuetify/src/components/VDataTable/VSimpleTable.ts b/packages/vuetify/src/components/VDataTable/VSimpleTable.ts
index e40987a8533..99b5a9cd131 100644
--- a/packages/vuetify/src/components/VDataTable/VSimpleTable.ts
+++ b/packages/vuetify/src/components/VDataTable/VSimpleTable.ts
@@ -9,9 +9,9 @@ export default mixins(Themeable).extend({
name: 'v-simple-table',
props: {
+ dense: Boolean,
fixedHeader: Boolean,
height: [Number, String],
- dense: Boolean,
},
computed: {
|
813e17ab81fa659cca703e88bf8286e3c800b358
|
2023-01-12 00:58:18
|
John Leider
|
docs(Carbon): remove defined height
| false
|
remove defined height
|
docs
|
diff --git a/packages/docs/src/components/promoted/Carbon.vue b/packages/docs/src/components/promoted/Carbon.vue
index f638b7c79bc..86c0e553fff 100644
--- a/packages/docs/src/components/promoted/Carbon.vue
+++ b/packages/docs/src/components/promoted/Carbon.vue
@@ -7,7 +7,6 @@
<promoted-base
:key="route.path"
border
- height="225"
max-width="360"
>
<promoted-script
|
0f16f0648f86a366acb02feac2701cf9bdbf3908
|
2019-06-29 06:12:44
|
John Leider
|
docs: performance improvements
| false
|
performance improvements
|
docs
|
diff --git a/packages/docs/src/index.template.html b/packages/docs/src/index.template.html
index fa62b6daaad..b780f6b9cee 100644
--- a/packages/docs/src/index.template.html
+++ b/packages/docs/src/index.template.html
@@ -16,8 +16,7 @@
<meta name="keywords" content="{{ keywords }}">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="manifest" href="/manifest.json">
- <link href="https://use.fontawesome.com/releases/v5.0.8/css/all.css" rel="stylesheet">
- <link href='https://fonts.googleapis.com/css?family=Material+Icons' rel="stylesheet" type="text/css">
+ <link href="https://use.fontawesome.com/releases/v5.0.8/css/all.css" as="stylesheet" rel="preload">
{{{ hreflangs }}}
{{{ crowdin }}}
</head>
|
46d785e8eae130a0e53102b290750385e13825e8
|
2020-08-05 05:43:37
|
John Leider
|
docs: shuffle pages around
| false
|
shuffle pages around
|
docs
|
diff --git a/packages/docs-next/src/components/doc/ReleaseNotes.vue b/packages/docs-next/src/components/doc/Notes.vue
similarity index 99%
rename from packages/docs-next/src/components/doc/ReleaseNotes.vue
rename to packages/docs-next/src/components/doc/Notes.vue
index a3d43bb98b8..d55d1dc4b38 100644
--- a/packages/docs-next/src/components/doc/ReleaseNotes.vue
+++ b/packages/docs-next/src/components/doc/Notes.vue
@@ -63,7 +63,7 @@
import { sortBy } from 'lodash'
export default {
- name: 'ReleaseNotes',
+ name: 'Notes',
data: () => ({
branch: undefined,
diff --git a/packages/docs-next/src/components/doc/links/TeamLink.vue b/packages/docs-next/src/components/doc/links/TeamLink.vue
new file mode 100644
index 00000000000..1a3739d30ef
--- /dev/null
+++ b/packages/docs-next/src/components/doc/links/TeamLink.vue
@@ -0,0 +1,16 @@
+<template>
+ <app-btn
+ :to="{
+ name: 'Documentation',
+ params: {
+ category: 'introduction',
+ page: 'meet-the-team'
+ }
+ }"
+ path="team"
+ />
+</template>
+
+<script>
+ export default { name: 'TeamLink' }
+</script>
diff --git a/packages/docs-next/src/components/menus/LearnMenu.vue b/packages/docs-next/src/components/menus/LearnMenu.vue
new file mode 100644
index 00000000000..15edec43487
--- /dev/null
+++ b/packages/docs-next/src/components/menus/LearnMenu.vue
@@ -0,0 +1,48 @@
+<template>
+ <app-menu :items="items">
+ <template #activator="{ attrs, on }">
+ <app-btn
+ v-bind="attrs"
+ v-on="on"
+ >
+ {{ $t('learn') }}
+
+ <app-chevron-down />
+ </app-btn>
+ </template>
+ </app-menu>
+</template>
+
+<script>
+ export default {
+ name: 'LearnMenu',
+
+ computed: {
+ items () {
+ return [
+ { heading: 'documentation' },
+ {
+ title: this.$t('guide'),
+ to: {
+ name: 'Documentation',
+ params: {
+ category: 'beginners-guide',
+ page: 'guide',
+ },
+ },
+ },
+ { divider: true },
+ { heading: this.$t('video-courses') },
+ {
+ title: 'Vue Mastery',
+ href: 'https://vuemastery.com',
+ },
+ {
+ title: 'Vue School',
+ href: 'https://vueschool.io?friend=vuetify',
+ },
+ ]
+ },
+ },
+ }
+</script>
diff --git a/packages/docs-next/src/data/nav.json b/packages/docs-next/src/data/nav.json
index fefeb16bd88..d1b23878b51 100644
--- a/packages/docs-next/src/data/nav.json
+++ b/packages/docs-next/src/data/nav.json
@@ -24,11 +24,14 @@
"title": "getting-started",
"icon": "$mdiSpeedometer",
"items": [
- "quick-start",
- "pre-made-layouts",
+ "installation",
+ "release-notes",
+ "upgrade-guide",
+ "accessibility",
"browser-support",
+ "treeshaking",
+ "pre-made-layouts",
"unit-testing",
- "releases-and-migrations",
"contributing"
]
},
@@ -36,14 +39,13 @@
"title": "customization",
"icon": "$mdiCogs",
"items": [
- "accessibility",
- "treeshaking",
"breakpoints",
"global-config",
+ "scrolling",
"icons",
"internationalization",
- "rtl",
"presets",
+ "rtl",
"sass-variables",
"theme"
]
@@ -62,8 +64,7 @@
"float",
"spacing",
"text-and-typography",
- "transitions",
- "scroll"
+ "transitions"
]
},
{
diff --git a/packages/docs-next/src/i18n/messages/en.json b/packages/docs-next/src/i18n/messages/en.json
index f9be1d1f956..86841ef8a03 100644
--- a/packages/docs-next/src/i18n/messages/en.json
+++ b/packages/docs-next/src/i18n/messages/en.json
@@ -73,6 +73,7 @@
"file-a-bug-report": "File a bug report",
"focus": "Focus",
"form-inputs-and-controls": "Form inputs & controls",
+ "framework-services": "Framework services",
"functional": "Functional",
"funding": "Funding",
"getting-started": "Getting started",
@@ -121,6 +122,7 @@
"search-jobs": "@:search @:jobs",
"search": "Search",
"section": "Section",
+ "services": "Services",
"settings": "Settings",
"small": "Small",
"sponsor": "Sponsor",
@@ -148,6 +150,7 @@
"ui": "UI",
"ultra-wide": "Ultra-wide",
"unread": "View Unread ({number})",
+ "video-courses": "Video courses",
"view-in-github": "View on @:github",
"view-source": "View source",
"viewport": "Viewport",
diff --git a/packages/docs-next/src/layouts/default/AppBar.vue b/packages/docs-next/src/layouts/default/AppBar.vue
index 1720a73b7c2..5dd93cd951e 100644
--- a/packages/docs-next/src/layouts/default/AppBar.vue
+++ b/packages/docs-next/src/layouts/default/AppBar.vue
@@ -31,7 +31,9 @@
<template v-if="!$vuetify.breakpoint.mobile">
<v-spacer />
- <guide-link />
+ <learn-menu />
+
+ <team-link />
<support-menu />
diff --git a/packages/docs-next/src/layouts/default/ListGroup.vue b/packages/docs-next/src/layouts/default/ListGroup.vue
index 3fd20150c8a..3be07676c59 100644
--- a/packages/docs-next/src/layouts/default/ListGroup.vue
+++ b/packages/docs-next/src/layouts/default/ListGroup.vue
@@ -71,8 +71,6 @@
<style lang="sass">
.v-list-group.v-list-group--default
- margin-bottom: 4px
-
.v-list-group__header
min-height: 32px
diff --git a/packages/docs-next/src/pages/en/styles/scroll.md b/packages/docs-next/src/pages/en/customization/scrolling.md
similarity index 99%
rename from packages/docs-next/src/pages/en/styles/scroll.md
rename to packages/docs-next/src/pages/en/customization/scrolling.md
index 7565cc2ad10..fa0e852ed76 100644
--- a/packages/docs-next/src/pages/en/styles/scroll.md
+++ b/packages/docs-next/src/pages/en/customization/scrolling.md
@@ -1,14 +1,14 @@
---
meta:
- title: Scroll
+ title: Goto Service
description: Programmatic scrolling within an application can be handled using the goTo method included in the vuetify object.
keywords: programmatic scrolling, vuetify goto, goto
related:
- - /directives/scrolling/
+ - /directives/scroll/
- /styles/content/
---
-# Scroll
+# Goto: programmatic scrolling
You can Programmatically trigger scrolling in your application by using the **goTo** method found on the `$vuetify` object. This method supports several different types of target selectors, and options including smooth scrolling using built-in easing functions.
diff --git a/packages/docs-next/src/pages/en/customization/accessibility.md b/packages/docs-next/src/pages/en/getting-started/accessibility.md
similarity index 100%
rename from packages/docs-next/src/pages/en/customization/accessibility.md
rename to packages/docs-next/src/pages/en/getting-started/accessibility.md
diff --git a/packages/docs-next/src/pages/en/getting-started/quick-start.md b/packages/docs-next/src/pages/en/getting-started/installation.md
similarity index 99%
rename from packages/docs-next/src/pages/en/getting-started/quick-start.md
rename to packages/docs-next/src/pages/en/getting-started/installation.md
index 39bf217561f..e4ddd7886d3 100644
--- a/packages/docs-next/src/pages/en/getting-started/quick-start.md
+++ b/packages/docs-next/src/pages/en/getting-started/installation.md
@@ -9,7 +9,7 @@ related:
- /company/advertise-with-us/
---
-# Quick start
+# Installation
Get started with Vuetify, the world’s most popular Vue.js framework for building feature rich, blazing fast application.
diff --git a/packages/docs-next/src/pages/en/getting-started/release-notes.md b/packages/docs-next/src/pages/en/getting-started/release-notes.md
new file mode 100644
index 00000000000..75b533318fd
--- /dev/null
+++ b/packages/docs-next/src/pages/en/getting-started/release-notes.md
@@ -0,0 +1,18 @@
+---
+meta:
+ title: Release notes
+ description: Stay up to date with the latest release notes. The migration guides will also help you migrate applications though major releases.
+ keywords: migration, releases, upgrading vuetify
+related:
+ - /introduction/long-term-support/
+ - /getting-started/contributing/
+ - /introduction/roadmap/
+---
+
+# Release notes
+
+The Vuetify team performs releases on a weekly basis. All release notes can be found through the Github and can be viewed below for your convenience. Furthermore between major releases there can be many breaking changes in which you can follow the latest migration guide below to help easy your transition.
+
+<notes />
+
+<backmatter />
diff --git a/packages/docs-next/src/pages/en/customization/treeshaking.md b/packages/docs-next/src/pages/en/getting-started/treeshaking.md
similarity index 100%
rename from packages/docs-next/src/pages/en/customization/treeshaking.md
rename to packages/docs-next/src/pages/en/getting-started/treeshaking.md
diff --git a/packages/docs-next/src/pages/en/getting-started/releases-and-migrations.md b/packages/docs-next/src/pages/en/getting-started/upgrade-guide.md
similarity index 96%
rename from packages/docs-next/src/pages/en/getting-started/releases-and-migrations.md
rename to packages/docs-next/src/pages/en/getting-started/upgrade-guide.md
index 9e3d72096d3..46c094c9e1d 100644
--- a/packages/docs-next/src/pages/en/getting-started/releases-and-migrations.md
+++ b/packages/docs-next/src/pages/en/getting-started/upgrade-guide.md
@@ -1,27 +1,17 @@
---
meta:
- title: Releases and migrations
- description: Stay up to date with the latest release notes. The migration guides will also help you migrate applications though major releases.
- keywords: migration, releases, upgrading vuetify
+ title: Upgrade Guide
+ description: Keep your Vuetify up to date with the latest bug fixes, features, and functionality.
+ keywords: migration, upgarde guide, upgrading vuetify
related:
- /introduction/long-term-support/
- /getting-started/contributing/
- /introduction/roadmap/
---
-# Releases and migrations
+# Upgrade Guide
-The Vuetify team performs releases on a weekly basis. All release notes can be found through the Github and can be viewed below for your convenience. Furthermore between major releases there can be many breaking changes in which you can follow the latest migration guide below to help easy your transition.
-
-## Release notes
-
-<release-notes />
-
-<entry-ad />
-
-## Migration guide
-
-### Migrating from v1.5.x to v2.0.x
+## Upgrading from v1.5.x to v2.0.x
Version 2 contains non backwards compatible breaking changes. This includes previously deprecated functionality from v1.x.x. These breaking changes are noted in the console for the corresponding components.
diff --git a/packages/docs-next/src/pages/en/introduction/why-vuetify.md b/packages/docs-next/src/pages/en/introduction/why-vuetify.md
index 8474a01edec..a6a4c1d1f18 100644
--- a/packages/docs-next/src/pages/en/introduction/why-vuetify.md
+++ b/packages/docs-next/src/pages/en/introduction/why-vuetify.md
@@ -7,6 +7,7 @@ related:
- /professional-support/consulting/
- /introduction/roadmap/
- /introduction/meet-the-team/
+nav: Why Vuetify?
---
# Why Vuetify
diff --git a/packages/docs-next/src/vuetify/icons.js b/packages/docs-next/src/vuetify/icons.js
index 8b62eec19f6..5bb39ba8307 100644
--- a/packages/docs-next/src/vuetify/icons.js
+++ b/packages/docs-next/src/vuetify/icons.js
@@ -57,6 +57,7 @@ import {
mdiEmailOpen,
mdiEmailOpenMultiple,
mdiEye,
+ mdiHuman,
mdiMonitorDashboard,
mdiFormatTextdirectionLToR,
mdiFormatTextdirectionRToL,
@@ -86,6 +87,7 @@ import {
mdiPlusCircle,
mdiPound,
mdiRefreshCircle,
+ mdiRocket,
mdiSpeedometer,
mdiStar,
mdiStarHalfFull,
@@ -164,6 +166,7 @@ export const icons = {
mdiEmailOpen,
mdiEmailOpenMultiple,
mdiEye,
+ mdiHuman,
mdiMonitorDashboard,
mdiFormatTextdirectionLToR,
mdiFormatTextdirectionRToL,
@@ -193,6 +196,7 @@ export const icons = {
mdiPlusCircle,
mdiPound,
mdiRefreshCircle,
+ mdiRocket,
mdiSpeedometer,
mdiStar,
mdiStarHalfFull,
|
635e7d1dc039de910d3b6d2ecdb04c6e5e6fc8d8
|
2024-03-22 06:18:40
|
John Leider
|
docs(service-worker): skip cache requests for unsupported schemes
| false
|
skip cache requests for unsupported schemes
|
docs
|
diff --git a/packages/docs/src/service-worker.js b/packages/docs/src/service-worker.js
index 87ccd5dcbe9..236eea86db7 100644
--- a/packages/docs/src/service-worker.js
+++ b/packages/docs/src/service-worker.js
@@ -53,6 +53,8 @@ self.addEventListener('activate', event => {
self.addEventListener('fetch', event => {
const url = new URL(event.request.url, location.href)
+ if (!['http:', 'https:'].includes(url.protocol)) return
+
if (event.request.method !== 'GET') return
if (
|
6830b9db8c38f129ac934244037278a7be4a1290
|
2021-10-11 22:03:35
|
Glandos
|
docs(VProgressCircular): remove color mention (#14247)
| false
|
remove color mention (#14247)
|
docs
|
diff --git a/packages/docs/src/pages/en/components/progress-circular.md b/packages/docs/src/pages/en/components/progress-circular.md
index 6dde3852fc4..214a95d340c 100644
--- a/packages/docs/src/pages/en/components/progress-circular.md
+++ b/packages/docs/src/pages/en/components/progress-circular.md
@@ -17,7 +17,7 @@ The `v-progress-circular` component is used to convey data circularly to users.
## Usage
-By default, progress circular uses the applications secondary color.
+In its simplest form, v-progress-circular displays a circular progress bar. Use the value prop to control the progress.
<example file="v-progress-circular/usage" />
|
786e9ec332657626137eedb5cda9ee35a942b37b
|
2019-03-26 17:42:41
|
Dmitry Sharshakov
|
test(VCalendar): convert to TS and @vue/test-utils (#6835)
| false
|
convert to TS and @vue/test-utils (#6835)
|
test
|
diff --git a/packages/vuetify/src/components/VCalendar/__tests__/VCalendar.spec.ts b/packages/vuetify/src/components/VCalendar/__tests__/VCalendar.spec.ts
new file mode 100644
index 00000000000..4be54db62ab
--- /dev/null
+++ b/packages/vuetify/src/components/VCalendar/__tests__/VCalendar.spec.ts
@@ -0,0 +1,111 @@
+import { parseDate } from '../util/timestamp'
+import VCalendar from '../VCalendar'
+import {
+ mount,
+ Wrapper,
+ MountOptions
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../util/mixins'
+
+describe('VCalendar', () => {
+ type Instance = ExtractVue<typeof VCalendar>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+ beforeEach(() => {
+ mountFunction = (options?: MountOptions<Instance>) => {
+ return mount(VCalendar, {
+ ...options,
+ mocks: {
+ $vuetify: {
+ lang: {
+ current: 'en-US'
+ }
+ }
+ }
+ })
+ }
+ })
+
+ it('should render day view', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ type: 'day',
+ start: '2018-01-29',
+ end: '2018-02-04',
+ now: '2019-02-17'
+ },
+ methods: {
+ getNow: () => parseDate(new Date('2019-02-17'))
+ }
+ })
+
+ expect(wrapper.classes('v-calendar-daily')).toBeTruthy()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render week view', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ type: 'week',
+ start: '2018-01-29',
+ end: '2018-02-04',
+ now: '2019-02-17'
+ },
+ methods: {
+ getNow: () => parseDate(new Date('2019-02-17'))
+ }
+ })
+
+ expect(wrapper.classes('v-calendar-daily')).toBeTruthy()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render month view', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ type: 'month',
+ start: '2018-01-29',
+ end: '2018-02-04',
+ now: '2019-02-17'
+ },
+ methods: {
+ getNow: () => parseDate(new Date('2019-02-17'))
+ }
+ })
+
+ expect(wrapper.classes('v-calendar-monthly')).toBeTruthy()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should parse value', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ value: '2019-02-02',
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ expect(wrapper.vm.parsedValue.date).toBe('2019-02-02')
+ })
+
+ it('should parse start', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ expect(wrapper.vm.parsedValue.date).toBe('2019-01-29')
+ })
+
+ it('should calculate end', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ end: '2018-12-04'
+ }
+ })
+
+ expect(wrapper.vm.parsedValue.date).toEqual(new Date().toISOString().split('T')[0])
+ })
+})
diff --git a/packages/vuetify/src/components/VCalendar/__tests__/VCalendarDailly.spec.ts b/packages/vuetify/src/components/VCalendar/__tests__/VCalendarDailly.spec.ts
new file mode 100644
index 00000000000..39f578d3245
--- /dev/null
+++ b/packages/vuetify/src/components/VCalendar/__tests__/VCalendarDailly.spec.ts
@@ -0,0 +1,184 @@
+import VCalendarDaily from '../VCalendarDaily'
+import {
+ mount,
+ Wrapper,
+ MountOptions
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../util/mixins'
+
+describe('VCalendarDaily', () => {
+ type Instance = ExtractVue<typeof VCalendarDaily>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+ beforeEach(() => {
+ mountFunction = (options?: MountOptions<Instance>) => {
+ return mount(VCalendarDaily, {
+ ...options,
+ mocks: {
+ $vuetify: {
+ lang: {
+ current: 'en-US'
+ }
+ }
+ }
+ })
+ }
+ })
+
+ it('should render component and have v-calendar-daily class', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ expect(wrapper.classes('v-calendar-daily')).toBeTruthy()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should compute scrollPush on init', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ jest.spyOn(wrapper.vm, 'getScrollPush').mockImplementation(_ => 123)
+
+ expect(wrapper.vm.scrollPush).toBe(0)
+ expect(wrapper.vm.getScrollPush).not.toHaveBeenCalled()
+ await wrapper.vm.$nextTick()
+ expect(wrapper.vm.getScrollPush).toHaveBeenCalled()
+ expect(wrapper.vm.scrollPush).toBe(123)
+ })
+
+ it('should compute scrollPush properly', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ expect(wrapper.vm.getScrollPush()).toBe(0)
+
+ Object.defineProperty(wrapper.vm.$refs.scrollArea, 'offsetWidth', { value: 100 })
+ Object.defineProperty(wrapper.vm.$refs.pane, 'offsetWidth', { value: 25 })
+
+ expect(wrapper.vm.getScrollPush()).toBe(75)
+ })
+
+ it('should render correctly with intervalMinutes prop', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ intervalMinutes: 40
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render correctly with maxDays prop', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ maxDays: 5
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render correctly without shortIntervals prop', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ shortIntervals: false
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render correctly with intervalHeight prop', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ intervalHeight: 70
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render correctly with firstInterval prop', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ firstInterval: 2
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should render correctly with intervalCount prop', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ intervalCount: 12
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ it('should use custom interval formatter and render correctly', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ intervalFormat: jest.fn(x => `test: ${x.date} ${x.time}`)
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ expect(wrapper.vm.intervalFormat).toHaveBeenCalled()
+ })
+
+ it('should use custom interval style function and render correctly', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ intervalStyle: jest.fn(x => ({
+ 'opacity': x.hour / 24
+ }))
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ expect(wrapper.vm.intervalStyle).toHaveBeenCalled()
+ })
+
+ it('should use custom showIntervalLabel function and render correctly', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ showIntervalLabel: jest.fn(x => (x.hour % 2 === 0))
+ }
+ })
+
+ expect(wrapper.html()).toMatchSnapshot()
+ expect(wrapper.vm.showIntervalLabel).toHaveBeenCalled()
+ })
+})
diff --git a/packages/vuetify/test/unit/components/VCalendar/__snapshots__/VCalendar.spec.js.snap b/packages/vuetify/src/components/VCalendar/__tests__/__snapshots__/VCalendar.spec.ts.snap
similarity index 100%
rename from packages/vuetify/test/unit/components/VCalendar/__snapshots__/VCalendar.spec.js.snap
rename to packages/vuetify/src/components/VCalendar/__tests__/__snapshots__/VCalendar.spec.ts.snap
diff --git a/packages/vuetify/test/unit/components/VCalendar/__snapshots__/VCalendarDailly.spec.js.snap b/packages/vuetify/src/components/VCalendar/__tests__/__snapshots__/VCalendarDailly.spec.ts.snap
similarity index 100%
rename from packages/vuetify/test/unit/components/VCalendar/__snapshots__/VCalendarDailly.spec.js.snap
rename to packages/vuetify/src/components/VCalendar/__tests__/__snapshots__/VCalendarDailly.spec.ts.snap
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/__snapshots__/calendar-base.spec.js.snap b/packages/vuetify/src/components/VCalendar/mixins/__tests__/__snapshots__/calendar-base.spec.ts.snap
similarity index 100%
rename from packages/vuetify/test/unit/components/VCalendar/mixins/__snapshots__/calendar-base.spec.js.snap
rename to packages/vuetify/src/components/VCalendar/mixins/__tests__/__snapshots__/calendar-base.spec.ts.snap
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/__snapshots__/calendar-with-intervals.spec.js.snap b/packages/vuetify/src/components/VCalendar/mixins/__tests__/__snapshots__/calendar-with-intervals.spec.ts.snap
similarity index 100%
rename from packages/vuetify/test/unit/components/VCalendar/mixins/__snapshots__/calendar-with-intervals.spec.js.snap
rename to packages/vuetify/src/components/VCalendar/mixins/__tests__/__snapshots__/calendar-with-intervals.spec.ts.snap
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/__snapshots__/times.spec.js.snap b/packages/vuetify/src/components/VCalendar/mixins/__tests__/__snapshots__/times.spec.ts.snap
similarity index 100%
rename from packages/vuetify/test/unit/components/VCalendar/mixins/__snapshots__/times.spec.js.snap
rename to packages/vuetify/src/components/VCalendar/mixins/__tests__/__snapshots__/times.spec.ts.snap
diff --git a/packages/vuetify/src/components/VCalendar/mixins/__tests__/calendar-base.spec.ts b/packages/vuetify/src/components/VCalendar/mixins/__tests__/calendar-base.spec.ts
new file mode 100644
index 00000000000..1c92f60707c
--- /dev/null
+++ b/packages/vuetify/src/components/VCalendar/mixins/__tests__/calendar-base.spec.ts
@@ -0,0 +1,176 @@
+import CalendarBase from '../calendar-base'
+import { parseTimestamp } from '../../util/timestamp'
+import {
+ mount,
+ Wrapper,
+ MountOptions
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../../util/mixins'
+
+const Mock = CalendarBase.extend({
+ render: h => h('div')
+})
+
+describe('calendar-base.ts', () => {
+ type Instance = ExtractVue<typeof Mock>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+ beforeEach(() => {
+ mountFunction = (options?: MountOptions<Instance>) => {
+ return mount(Mock, {
+ ...options,
+ mocks: {
+ $vuetify: {
+ lang: {
+ current: 'en-US'
+ }
+ }
+ }
+ })
+ }
+ })
+
+ it('should parse start & end', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.parsedStart).toBeDefined()
+ expect(wrapper.vm.parsedStart).toMatchSnapshot()
+ expect(wrapper.vm.parsedEnd).toBeDefined()
+ expect(wrapper.vm.parsedEnd).toMatchSnapshot()
+ })
+
+ it('should create a day list', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.days).toBeDefined()
+ expect(wrapper.vm.days).toHaveLength(11)
+ expect(wrapper.vm.days).toMatchSnapshot()
+
+ expect(wrapper.vm.days[0].date).toBe('2019-01-29')
+ expect(wrapper.vm.days[10].date).toBe('2019-02-08')
+ })
+
+ it('should calculate weekday skips', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.weekdaySkips).toBeDefined()
+ expect(wrapper.vm.weekdaySkips).toHaveLength(7)
+ })
+
+ it('should generate classes', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.getRelativeClasses(parseTimestamp('2019-01-28'))).toBeDefined()
+ expect(wrapper.vm.getRelativeClasses(parseTimestamp('2019-01-28'))).toMatchSnapshot()
+ })
+
+ it('should generate classes with outside', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.getRelativeClasses(parseTimestamp('2019-01-28'), true)).toBeDefined()
+ expect(wrapper.vm.getRelativeClasses(parseTimestamp('2019-01-28'), true)).toMatchSnapshot()
+ })
+
+ it('should return weekdayFormatter equal to weekdayFormat prop', async () => {
+ const weekdayFormat = x => x
+ const wrapper = mountFunction({
+ propsData: {
+ weekdayFormat
+ }
+ })
+
+ expect(wrapper.vm.weekdayFormatter).toEqual(weekdayFormat)
+ })
+
+ it('should long-format weekday', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.weekdayFormatter).toBeDefined()
+ expect(typeof wrapper.vm.weekdayFormatter).toEqual('function')
+
+ expect(wrapper.vm.weekdayFormatter(parseTimestamp('2019-01-28'), false)).toEqual('Monday')
+ expect(wrapper.vm.weekdayFormatter(parseTimestamp('2019-01-27'), false)).toEqual('Sunday')
+ expect(wrapper.vm.weekdayFormatter(parseTimestamp('2019-01-29'), false)).toEqual('Tuesday')
+ })
+
+ it('should short-format weekday', async () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.weekdayFormatter).toBeDefined()
+ expect(typeof wrapper.vm.weekdayFormatter).toEqual('function')
+
+ expect(wrapper.vm.weekdayFormatter(parseTimestamp('2019-01-28'), true)).toEqual('Mon')
+ expect(wrapper.vm.weekdayFormatter(parseTimestamp('2019-01-27'), true)).toEqual('Sun')
+ expect(wrapper.vm.weekdayFormatter(parseTimestamp('2019-01-29'), true)).toEqual('Tue')
+ })
+
+ it('should get start of week', async () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.getStartOfWeek(parseTimestamp('2019-01-28')).weekday).toEqual(0)
+ expect(wrapper.vm.getStartOfWeek(parseTimestamp('2019-01-03')).weekday).toEqual(0)
+ })
+
+ it('should get end of week', async () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.getEndOfWeek(parseTimestamp('2019-03-28')).weekday).toEqual(6)
+ expect(wrapper.vm.getEndOfWeek(parseTimestamp('2019-12-31')).weekday).toEqual(6)
+ })
+
+ it('should return dayFormatter equal to dayFormat prop', async () => {
+ const dayFormat = x => x
+ const wrapper = mountFunction({
+ propsData: {
+ dayFormat
+ }
+ })
+
+ expect(wrapper.vm.dayFormatter).toEqual(dayFormat)
+ })
+
+ it('should format day', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.weekdayFormatter).toBeDefined()
+ expect(typeof wrapper.vm.weekdayFormatter).toEqual('function')
+
+ expect(wrapper.vm.dayFormatter(parseTimestamp('2019-01-28'), false)).toEqual('28')
+ expect(wrapper.vm.dayFormatter(parseTimestamp('2019-01-27'), false)).toEqual('27')
+ expect(wrapper.vm.dayFormatter(parseTimestamp('2019-01-29'), false)).toEqual('29')
+ })
+})
diff --git a/packages/vuetify/src/components/VCalendar/mixins/__tests__/calendar-with-intervals.spec.ts b/packages/vuetify/src/components/VCalendar/mixins/__tests__/calendar-with-intervals.spec.ts
new file mode 100644
index 00000000000..ca48acc3077
--- /dev/null
+++ b/packages/vuetify/src/components/VCalendar/mixins/__tests__/calendar-with-intervals.spec.ts
@@ -0,0 +1,326 @@
+import CalendarWithIntervals from '../calendar-with-intervals'
+import { parseTimestamp, VTimestamp } from '../../util/timestamp'
+import {
+ mount,
+ Wrapper,
+ MountOptions
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../../util/mixins'
+
+const Mock = CalendarWithIntervals.extend({
+ render: h => h('div')
+})
+
+const createMouseEvent = (x, y) => ({
+ clientX: x,
+ clientY: y,
+ currentTarget: document.body
+})
+const createTouchEvent = (x, y) => ({
+ touches: [{
+ clientX: x,
+ clientY: y
+ }],
+ currentTarget: document.body
+})
+
+describe('calendar-with-intervals.ts', () => {
+ type Instance = ExtractVue<typeof Mock>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+ beforeEach(() => {
+ mountFunction = (options?: MountOptions<Instance>) => {
+ return mount(Mock, {
+ ...options,
+ mocks: {
+ $vuetify: {
+ lang: {
+ current: 'en-US'
+ }
+ }
+ }
+ })
+ }
+ })
+
+ it('should parse all data', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ firstInterval: '1',
+ intervalMinutes: '30',
+ intervalCount: '10',
+ intervalHeight: '20'
+ }
+ })
+
+ expect(wrapper.vm.parsedFirstInterval).toBeDefined()
+ expect(wrapper.vm.parsedFirstInterval).toBe(1)
+ expect(wrapper.vm.parsedIntervalMinutes).toBeDefined()
+ expect(wrapper.vm.parsedIntervalMinutes).toBe(30)
+ expect(wrapper.vm.parsedIntervalCount).toBeDefined()
+ expect(wrapper.vm.parsedIntervalCount).toBe(10)
+ expect(wrapper.vm.parsedIntervalHeight).toBeDefined()
+ expect(wrapper.vm.parsedIntervalHeight).toBe(20)
+ })
+
+ it('should generate firstMinute', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ firstInterval: '2',
+ intervalMinutes: '30'
+ }
+ })
+
+ expect(wrapper.vm.firstMinute).toBeDefined()
+ expect(wrapper.vm.firstMinute).toBe(60)
+ })
+
+ it('should generate bodyHeight', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ intervalCount: '10',
+ intervalHeight: '20'
+ }
+ })
+
+ expect(wrapper.vm.bodyHeight).toBeDefined()
+ expect(wrapper.vm.bodyHeight).toBe(200)
+ })
+
+ it('should generate days', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ expect(wrapper.vm.days).toBeDefined()
+ expect(wrapper.vm.days).toHaveLength(7)
+ expect(wrapper.vm.days[0].date).toBe('2019-01-29')
+ expect(wrapper.vm.days[6].date).toBe('2019-02-04')
+ expect(wrapper.vm.days).toMatchSnapshot()
+
+ wrapper.setProps({
+ start: '2019-01-29',
+ end: '2019-02-02'
+ })
+
+ expect(wrapper.vm.days).toBeDefined()
+ expect(wrapper.vm.days).toHaveLength(5)
+ expect(wrapper.vm.days[0].date).toBe('2019-01-29')
+ expect(wrapper.vm.days[4].date).toBe('2019-02-02')
+ expect(wrapper.vm.days).toMatchSnapshot()
+ })
+
+ it('should generate intervals', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04'
+ }
+ })
+
+ expect(wrapper.vm.intervals).toBeDefined()
+ expect(wrapper.vm.intervals).toHaveLength(7)
+ expect(wrapper.vm.intervals[0]).toHaveLength(24)
+ expect(wrapper.vm.intervals[0][0].date).toBe('2019-01-29')
+ expect(wrapper.vm.intervals[6][0].date).toBe('2019-02-04')
+ expect(wrapper.vm.intervals).toMatchSnapshot()
+
+ wrapper.setProps({
+ start: '2019-01-29',
+ end: '2019-02-02'
+ })
+
+ expect(wrapper.vm.intervals).toBeDefined()
+ expect(wrapper.vm.intervals).toHaveLength(5)
+ expect(wrapper.vm.intervals[0]).toHaveLength(24)
+ expect(wrapper.vm.intervals[0][0].date).toBe('2019-01-29')
+ expect(wrapper.vm.intervals[4][0].date).toBe('2019-02-02')
+ expect(wrapper.vm.intervals).toMatchSnapshot()
+ })
+
+ it('should generate intervalFormatter', async () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.intervalFormatter).toBeDefined()
+ expect(typeof wrapper.vm.intervalFormatter).toBe('function')
+ })
+
+ it('should format interval', async () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.intervalFormatter({ date: '2019-02-08', hour: 8, minute: 30 } as VTimestamp, false)).toBe('8:30 AM')
+ expect(wrapper.vm.intervalFormatter({ date: '2019-02-08', hour: 20, minute: 30 } as VTimestamp, false)).toBe('8:30 PM')
+ expect(wrapper.vm.intervalFormatter({ date: '2019-02-08', hour: 0, minute: 30 } as VTimestamp, false)).toBe('12:30 AM')
+ expect(wrapper.vm.intervalFormatter({ date: '2019-02-08', hour: 8, minute: 30 } as VTimestamp, true)).toBe('8:30 AM')
+ expect(wrapper.vm.intervalFormatter({ date: '2019-02-08', hour: 20, minute: 30 } as VTimestamp, true)).toBe('8:30 PM')
+ expect(wrapper.vm.intervalFormatter({ date: '2019-02-08', hour: 0, minute: 30 } as VTimestamp, true)).toBe('12:30 AM')
+ })
+
+ it('should return intervalFormat if has one', async () => {
+ const intervalFormat = x => x
+ const wrapper = mountFunction({
+ propsData: {
+ intervalFormat
+ }
+ })
+
+ expect(wrapper.vm.intervalFormatter).toBeDefined()
+ expect(typeof wrapper.vm.intervalFormatter).toBe('function')
+ expect(wrapper.vm.intervalFormatter).toBe(intervalFormat)
+ })
+
+ it('should generate slot scope', async () => {
+ const wrapper = mountFunction()
+
+ expect(wrapper.vm.getSlotScope(parseTimestamp('2019-02-08'))).toBeDefined()
+ expect(wrapper.vm.getSlotScope(parseTimestamp('2019-02-08')).date).toBe('2019-02-08')
+ expect(wrapper.vm.getSlotScope(parseTimestamp('2019-02-08'))).toMatchSnapshot()
+ expect(typeof wrapper.vm.getSlotScope(parseTimestamp('2019-02-08')).timeToY).toBe('function')
+ expect(typeof wrapper.vm.getSlotScope(parseTimestamp('2019-02-08')).minutesToPixels).toBe('function')
+ })
+
+ it('should convert time to Y', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.timeToY).toBe('function')
+ expect(wrapper.vm.timeToY('08:30')).toBeDefined()
+ expect(wrapper.vm.timeToY('08:30')).toBe(340)
+ expect(wrapper.vm.timeToY('09:30')).toBe(380)
+ expect(Math.round(wrapper.vm.timeToY('23:50') || 0)).toBe(953)
+
+ wrapper.setProps({
+ firstInterval: 5,
+ intervalCount: 5,
+ intervalMinutes: 10,
+ bodyHeight: 400
+ })
+
+ expect(wrapper.vm.timeToY('08:30')).toBe(200)
+ expect(wrapper.vm.timeToY('09:30')).toBe(200)
+ expect(wrapper.vm.timeToY('23:50')).toBe(200)
+
+ expect(wrapper.vm.timeToY('00:05')).toBe(0)
+
+ expect(Math.round(wrapper.vm.timeToY('08:30', false) || 0)).toBe(1840)
+ expect(wrapper.vm.timeToY('09:30', false)).toBe(2080)
+ expect(wrapper.vm.timeToY('23:50', false)).toBe(5520)
+
+ expect(wrapper.vm.timeToY('bad')).toBe(false)
+ })
+
+ it('should convert minutes to pixels', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ intervalMinutes: 5,
+ bodyHeight: 200
+ }
+ })
+
+ expect(wrapper.vm.minutesToPixels).toBeDefined()
+ expect(typeof wrapper.vm.minutesToPixels).toBe('function')
+ expect(wrapper.vm.minutesToPixels(5)).toBeDefined()
+
+ expect(wrapper.vm.minutesToPixels(5)).toBe(40)
+ expect(wrapper.vm.minutesToPixels(10)).toBe(80)
+ expect(wrapper.vm.minutesToPixels(50)).toBe(400)
+
+ wrapper.setProps({
+ intervalMinutes: 10,
+ bodyHeight: 400
+ })
+
+ expect(wrapper.vm.minutesToPixels(5)).toBe(20)
+ expect(wrapper.vm.minutesToPixels(10)).toBe(40)
+ expect(wrapper.vm.minutesToPixels(50)).toBe(200)
+ })
+
+ it('should scroll to time', async () => {
+ const wrapper = mountFunction({
+ render: h => h('div', [
+ h('div', {
+ ref: 'scrollArea'
+ })
+ ])
+ })
+
+ wrapper.vm.scrollToTime('8:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(340)
+ wrapper.vm.scrollToTime('12:30')
+ expect(Math.round((wrapper.vm.$refs.scrollArea as any).scrollTop)).toBe(500)
+ wrapper.vm.scrollToTime('20:00')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(800)
+
+ wrapper.setProps({
+ intervalMinutes: 5,
+ bodyHeight: 200
+ })
+
+ wrapper.vm.scrollToTime('8:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(960)
+ wrapper.vm.scrollToTime('12:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(960)
+ wrapper.vm.scrollToTime('20:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(960)
+
+ wrapper.setProps({
+ intervalMinutes: 30,
+ bodyHeight: 1700
+ })
+
+ wrapper.vm.scrollToTime('8:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(680)
+ wrapper.vm.scrollToTime('12:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(960)
+ wrapper.vm.scrollToTime('20:30')
+ expect((wrapper.vm.$refs.scrollArea as any).scrollTop).toBe(960)
+
+ expect(wrapper.vm.scrollToTime('20:19')).toBe(true)
+ expect(wrapper.vm.scrollToTime('bad')).toBe(false)
+ })
+
+ it('should get timestamp at mouse event', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.getTimestampAtEvent).toBe('function')
+
+ expect(wrapper.vm.getTimestampAtEvent(createMouseEvent(0, 100) as unknown as MouseEvent, { time: '20:00' } as VTimestamp)).toMatchObject({ hour: 2, minute: 30 })
+ expect(wrapper.vm.getTimestampAtEvent(createMouseEvent(0, 150) as unknown as MouseEvent, { time: '20:00' } as VTimestamp)).toMatchObject({ hour: 3, minute: 45 })
+ expect(wrapper.vm.getTimestampAtEvent(createMouseEvent(0, 200) as unknown as MouseEvent, { time: '20:00' } as VTimestamp)).toMatchObject({ hour: 5, minute: 0 })
+ })
+
+ it('should get timestamp at touch event', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.getTimestampAtEvent).toBe('function')
+
+ expect(wrapper.vm.getTimestampAtEvent(createTouchEvent(0, 100) as unknown as TouchEvent, { time: '20:00' } as VTimestamp)).toMatchObject({ hour: 2, minute: 30 })
+ expect(wrapper.vm.getTimestampAtEvent(createTouchEvent(0, 150) as unknown as TouchEvent, { time: '20:00' } as VTimestamp)).toMatchObject({ hour: 3, minute: 45 })
+ expect(wrapper.vm.getTimestampAtEvent(createTouchEvent(0, 200) as unknown as TouchEvent, { time: '20:00' } as VTimestamp)).toMatchObject({ hour: 5, minute: 0 })
+ })
+
+ it('should get style', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.intervalStyleDefault).toBe('function')
+ expect(wrapper.vm.intervalStyleDefault({} as VTimestamp)).toBeUndefined()
+ })
+
+ it('should show interval label', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ start: '2019-01-29',
+ end: '2019-02-04',
+ firstInterval: 5
+ }
+ })
+ expect(typeof wrapper.vm.showIntervalLabelDefault).toBe('function')
+ expect(wrapper.vm.showIntervalLabelDefault({})).toBeFalsy()
+
+ expect(wrapper.vm.showIntervalLabelDefault({ hour: 0, minute: 5 } as VTimestamp)).toBeFalsy()
+ expect(wrapper.vm.showIntervalLabelDefault({ hour: 12, minute: 30 } as VTimestamp)).toBeFalsy()
+ expect(wrapper.vm.showIntervalLabelDefault({ hour: 13, minute: 0 } as VTimestamp)).toBeTruthy()
+ expect(wrapper.vm.showIntervalLabelDefault({ hour: 13, minute: 30 } as VTimestamp)).toBeFalsy()
+ })
+})
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/mouse.spec.js b/packages/vuetify/src/components/VCalendar/mixins/__tests__/mouse.spec.ts
similarity index 54%
rename from packages/vuetify/test/unit/components/VCalendar/mixins/mouse.spec.js
rename to packages/vuetify/src/components/VCalendar/mixins/__tests__/mouse.spec.ts
index 2633a39f583..e4164e723a7 100644
--- a/packages/vuetify/test/unit/components/VCalendar/mixins/mouse.spec.js
+++ b/packages/vuetify/src/components/VCalendar/mixins/__tests__/mouse.spec.ts
@@ -1,12 +1,25 @@
-import { test } from '@/test'
-import Mouse from '@/components/VCalendar/mixins/mouse'
+import Mouse from '../mouse'
-const Mock = {
- mixins: [Mouse],
+import {
+ mount,
+ Wrapper,
+ MountOptions
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../../util/mixins'
+
+const Mock = Mouse.extend({
render: h => h('div')
-}
+})
+
+describe('mouse.ts', () => {
+ type Instance = ExtractVue<typeof Mock>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+ beforeEach(() => {
+ mountFunction = (options?: MountOptions<Instance>) => {
+ return mount(Mock, options)
+ }
+ })
-test('mouse.ts', ({ mount }) => {
it('should generate mouse event handlers', async () => {
const noop = e => e
const wrapper = mount(Mock, {
@@ -15,7 +28,7 @@ test('mouse.ts', ({ mount }) => {
}
})
- expect(typeof wrapper.vm.getMouseEventHandlers({ click: { event: "click" } }, noop).click).toBe("function")
+ expect(typeof wrapper.vm.getMouseEventHandlers({ click: { event: 'click' } }, noop).click).toBe('function')
})
it('should generate default mouse event handlers', async () => {
@@ -26,8 +39,8 @@ test('mouse.ts', ({ mount }) => {
}
})
- expect(typeof wrapper.vm.getDefaultMouseEventHandlers("", noop).click).toBe("function")
- expect(Object.keys(typeof wrapper.vm.getDefaultMouseEventHandlers("", noop)).length).toBe(6)
+ expect(typeof wrapper.vm.getDefaultMouseEventHandlers('', noop).click).toBe('function')
+ expect(Object.keys(typeof wrapper.vm.getDefaultMouseEventHandlers('', noop))).toHaveLength(6)
})
it('should emit events', async () => {
@@ -38,7 +51,8 @@ test('mouse.ts', ({ mount }) => {
}
})
- wrapper.vm.getMouseEventHandlers({ click: { event: "click" } }, fn).click()
+ const { click } = wrapper.vm.getMouseEventHandlers({ click: { event: 'click' } }, () => {})
+ Array.isArray(click) ? click[0](null) : click(null)
expect(fn).toHaveBeenCalledTimes(1)
})
@@ -52,7 +66,8 @@ test('mouse.ts', ({ mount }) => {
const event = { preventDefault: () => {} }
const spy = jest.spyOn(event, 'preventDefault')
- wrapper.vm.getMouseEventHandlers({ click: { event: "click", prevent: true } }, fn).click(event)
+ const { click } = wrapper.vm.getMouseEventHandlers({ click: { event: 'click', prevent: true } }, () => {})
+ Array.isArray(click) ? click[0](event as MouseEvent) : click(event as MouseEvent)
expect(fn).toHaveBeenCalledTimes(1)
expect(spy).toHaveBeenCalledTimes(1)
})
@@ -67,7 +82,8 @@ test('mouse.ts', ({ mount }) => {
const event = { stopPropagation: () => {} }
const spy = jest.spyOn(event, 'stopPropagation')
- wrapper.vm.getMouseEventHandlers({ click: { event: "click", stop: true } }, fn).click(event)
+ const { click } = wrapper.vm.getMouseEventHandlers({ click: { event: 'click', stop: true } }, () => {})
+ Array.isArray(click) ? click[0](event as MouseEvent) : click(event as MouseEvent)
expect(fn).toHaveBeenCalledTimes(1)
expect(spy).toHaveBeenCalledTimes(1)
})
diff --git a/packages/vuetify/src/components/VCalendar/mixins/__tests__/times.spec.ts b/packages/vuetify/src/components/VCalendar/mixins/__tests__/times.spec.ts
new file mode 100644
index 00000000000..a05a19a1fe9
--- /dev/null
+++ b/packages/vuetify/src/components/VCalendar/mixins/__tests__/times.spec.ts
@@ -0,0 +1,79 @@
+import Times from '../times'
+import {
+ mount,
+ Wrapper,
+ MountOptions
+} from '@vue/test-utils'
+import { ExtractVue } from '../../../../util/mixins'
+import { VTimestamp } from '../../util/timestamp'
+
+const Mock = Times.extend({
+ render: h => h('div')
+})
+
+describe('times.ts', () => {
+ type Instance = ExtractVue<typeof Mock>
+ let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+ beforeEach(() => {
+ mountFunction = (options?: MountOptions<Instance>) => {
+ return mount(Mock, options)
+ }
+ })
+
+ it('should parse timestamp', async () => {
+ const wrapper = mountFunction({
+ propsData: {
+ now: '2019-02-08'
+ }
+ })
+
+ expect(wrapper.vm.parsedNow).toBeDefined()
+ expect(wrapper.vm.parsedNow).toMatchSnapshot()
+ })
+
+ it('should update day', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.updateDay).toBe('function')
+ const target = {}
+ const now = {
+ date: '2019-02-08',
+ year: '2019',
+ month: '2',
+ day: '8',
+ weekday: '4'
+ }
+ wrapper.vm.updateDay(now as unknown as VTimestamp, target as unknown as VTimestamp)
+ expect(target).toEqual(now)
+ })
+
+ it('should not update day if dates are equal', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.updateDay).toBe('function')
+ const target = { date: '2019-02-08' }
+ const now = {
+ date: '2019-02-08',
+ year: '2019',
+ month: '2',
+ day: '8',
+ weekday: '4'
+ }
+ wrapper.vm.updateDay(now as unknown as VTimestamp, target as unknown as VTimestamp)
+ expect(target).not.toEqual(now)
+ })
+
+ it('should not update time if times are equal', async () => {
+ const wrapper = mountFunction()
+
+ expect(typeof wrapper.vm.updateTime).toBe('function')
+ const target = { time: '08:30' }
+ const now = {
+ time: '08:30',
+ hour: '8',
+ minute: '30'
+ }
+ wrapper.vm.updateTime(now as unknown as VTimestamp, target as unknown as VTimestamp)
+ expect(target).not.toEqual(now)
+ })
+})
diff --git a/packages/vuetify/test/unit/components/VCalendar/util/__snapshots__/timestamp.spec.js.snap b/packages/vuetify/src/components/VCalendar/util/__tests__/__snapshots__/timestamp.spec.ts.snap
similarity index 100%
rename from packages/vuetify/test/unit/components/VCalendar/util/__snapshots__/timestamp.spec.js.snap
rename to packages/vuetify/src/components/VCalendar/util/__tests__/__snapshots__/timestamp.spec.ts.snap
diff --git a/packages/vuetify/src/components/VCalendar/util/__tests__/props.spec.ts b/packages/vuetify/src/components/VCalendar/util/__tests__/props.spec.ts
new file mode 100644
index 00000000000..f8b3c18bd5a
--- /dev/null
+++ b/packages/vuetify/src/components/VCalendar/util/__tests__/props.spec.ts
@@ -0,0 +1,15 @@
+import { validateNumber } from '../props'
+
+describe('props.ts', () => {
+ it('should return true if number is valid', () => {
+ expect(validateNumber(1)).toBe(true)
+ expect(validateNumber(1000000)).toBe(true)
+ expect(validateNumber('1234')).toBe(true)
+ })
+
+ it('should return false if number is bad', () => {
+ expect(validateNumber(Infinity)).toBe(false)
+ expect(validateNumber(NaN)).toBe(false)
+ expect(validateNumber('bad')).toBe(false)
+ })
+})
diff --git a/packages/vuetify/test/unit/components/VCalendar/util/timestamp.spec.js b/packages/vuetify/src/components/VCalendar/util/__tests__/timestamp.spec.ts
similarity index 76%
rename from packages/vuetify/test/unit/components/VCalendar/util/timestamp.spec.js
rename to packages/vuetify/src/components/VCalendar/util/__tests__/timestamp.spec.ts
index 1663f3a27fc..c23b79970f9 100644
--- a/packages/vuetify/test/unit/components/VCalendar/util/timestamp.spec.js
+++ b/packages/vuetify/src/components/VCalendar/util/__tests__/timestamp.spec.ts
@@ -21,10 +21,9 @@ import {
nextDay,
prevDay,
relativeDays
-} from '@/components/VCalendar/util/timestamp'
-import { test } from '@/test'
+} from '../timestamp'
-test('VCalendar/util/timestamp.ts', ({ mount }) => {
+describe('VCalendar/util/timestamp.ts', () => { // eslint-disable-line max-statements
it('should parse time number', () => {
expect(parseTime(0)).toBe(0)
expect(parseTime(120)).toBe(120)
@@ -42,17 +41,17 @@ test('VCalendar/util/timestamp.ts', ({ mount }) => {
})
it('should parse time object', () => {
- expect(parseTime({hour: 0, minute: 0})).toBe(0)
- expect(parseTime({hour: 0, minute: 30})).toBe(30)
- expect(parseTime({hour: 8, minute: 0})).toBe(8 * 60)
- expect(parseTime({hour: 8, minute: 30})).toBe(8 * 60 + 30)
- expect(parseTime({hour: 15, minute: 13})).toBe(15 * 60 + 13)
- expect(parseTime({hour: 23, minute: 59})).toBe(23 * 60 + 59)
+ expect(parseTime({ hour: 0, minute: 0 })).toBe(0)
+ expect(parseTime({ hour: 0, minute: 30 })).toBe(30)
+ expect(parseTime({ hour: 8, minute: 0 })).toBe(8 * 60)
+ expect(parseTime({ hour: 8, minute: 30 })).toBe(8 * 60 + 30)
+ expect(parseTime({ hour: 15, minute: 13 })).toBe(15 * 60 + 13)
+ expect(parseTime({ hour: 23, minute: 59 })).toBe(23 * 60 + 59)
})
it('should not parse time', () => {
expect(parseTime('nopes')).toBe(false)
- expect(parseTime({hour: 23})).toBe(false)
+ expect(parseTime({ hour: 23 })).toBe(false)
expect(parseTime([23])).toBe(false)
expect(parseTime(false)).toBe(false)
expect(parseTime(true)).toBe(false)
@@ -167,7 +166,7 @@ test('VCalendar/util/timestamp.ts', ({ mount }) => {
present: false,
future: false
})
- expect(parseTimestamp('bad')).toEqual(null)
+ expect(parseTimestamp('bad')).toBeNull()
})
it('should parse timestamp and update relative flags', () => {
@@ -310,7 +309,7 @@ test('VCalendar/util/timestamp.ts', ({ mount }) => {
expect(cc.future).toBe(false)
})
- it('should calculate weekday', () => {
+ it('should calculate weekday', () => { // eslint-disable-line max-statements
expect(parseTimestamp('2019-01-01').weekday).toBe(2)
expect(parseTimestamp('2019-01-02').weekday).toBe(3)
expect(parseTimestamp('2019-01-03').weekday).toBe(4)
@@ -390,13 +389,13 @@ test('VCalendar/util/timestamp.ts', ({ mount }) => {
)
expect(days).toEqual([
- {"date": "2019-04-29", "day": 29, "future": false, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 4, "past": true, "present": false, "time": "", "weekday": 1, "year": 2019},
- {"date": "2019-04-30", "day": 30, "future": false, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 4, "past": true, "present": false, "time": "", "weekday": 2, "year": 2019},
- {"date": "2019-05-01", "day": 1, "future": false, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 5, "past": true, "present": false, "time": "", "weekday": 3, "year": 2019},
- {"date": "2019-05-02", "day": 2, "future": false, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 5, "past": true, "present": false, "time": "", "weekday": 4, "year": 2019},
- {"date": "2019-05-03", "day": 3, "future": false, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 5, "past": false, "present": true, "time": "", "weekday": 5, "year": 2019},
- {"date": "2019-05-04", "day": 4, "future": true, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 5, "past": false, "present": false, "time": "", "weekday": 6, "year": 2019},
- {"date": "2019-05-05", "day": 5, "future": true, "hasDay": true, "hasTime": false, "hour": 0, "minute": 0, "month": 5, "past": false, "present": false, "time": "", "weekday": 0, "year": 2019}
+ { 'date': '2019-04-29', 'day': 29, 'future': false, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 4, 'past': true, 'present': false, 'time': '', 'weekday': 1, 'year': 2019 },
+ { 'date': '2019-04-30', 'day': 30, 'future': false, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 4, 'past': true, 'present': false, 'time': '', 'weekday': 2, 'year': 2019 },
+ { 'date': '2019-05-01', 'day': 1, 'future': false, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 5, 'past': true, 'present': false, 'time': '', 'weekday': 3, 'year': 2019 },
+ { 'date': '2019-05-02', 'day': 2, 'future': false, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 5, 'past': true, 'present': false, 'time': '', 'weekday': 4, 'year': 2019 },
+ { 'date': '2019-05-03', 'day': 3, 'future': false, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 5, 'past': false, 'present': true, 'time': '', 'weekday': 5, 'year': 2019 },
+ { 'date': '2019-05-04', 'day': 4, 'future': true, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 5, 'past': false, 'present': false, 'time': '', 'weekday': 6, 'year': 2019 },
+ { 'date': '2019-05-05', 'day': 5, 'future': true, 'hasDay': true, 'hasTime': false, 'hour': 0, 'minute': 0, 'month': 5, 'past': false, 'present': false, 'time': '', 'weekday': 0, 'year': 2019 }
])
})
@@ -416,7 +415,7 @@ test('VCalendar/util/timestamp.ts', ({ mount }) => {
Number.MAX_SAFE_INTEGER
)
- expect(days).toEqual([]);
+ expect(days).toEqual([])
})
it('should handle skips equal to zero', () => {
@@ -435,89 +434,89 @@ test('VCalendar/util/timestamp.ts', ({ mount }) => {
Number.MAX_SAFE_INTEGER
)
- expect(days).toMatchSnapshot();
+ expect(days).toMatchSnapshot()
})
it('should create interval list', () => {
- expect(createIntervalList(parseTimestamp("2019-02-08"), 2, 15, 10)).toMatchSnapshot();
- expect(createIntervalList(parseTimestamp("2019-02-08"), 1, 15, 10)).toMatchSnapshot();
- expect(createIntervalList(parseTimestamp("2019-02-08"), 2, 5, 2)).toMatchSnapshot();
+ expect(createIntervalList(parseTimestamp('2019-02-08'), 2, 15, 10)).toMatchSnapshot()
+ expect(createIntervalList(parseTimestamp('2019-02-08'), 1, 15, 10)).toMatchSnapshot()
+ expect(createIntervalList(parseTimestamp('2019-02-08'), 2, 5, 2)).toMatchSnapshot()
})
// TODO Create a test that doesn't fail when
// the day changes or ignore the code it
// covers
it.skip('should create native locale formatter', () => {
- expect(createNativeLocaleFormatter("en-US", () => {})(parseTimestamp("2019-02-08"))).toBe('2/8/2019');
- expect(createNativeLocaleFormatter("en-UK", () => {})(parseTimestamp("2019-02-08"))).toBe('2/8/2019');
- expect(createNativeLocaleFormatter("ru-RU", () => {})(parseTimestamp("2019-02-08"))).toBe('2019-2-8');
+ expect(createNativeLocaleFormatter('en-US', () => {})(parseTimestamp('2019-02-08'))).toBe('2/8/2019')
+ expect(createNativeLocaleFormatter('en-UK', () => {})(parseTimestamp('2019-02-08'))).toBe('2/8/2019')
+ expect(createNativeLocaleFormatter('ru-RU', () => {})(parseTimestamp('2019-02-08'))).toBe('2019-2-8')
})
it('should return emptyFormatter if Intl isn\'t defined', () => {
- const intl = global.Intl;
- global.Intl = undefined;
- expect(createNativeLocaleFormatter("", () => {})(parseTimestamp("2019-02-08"))).toBe('');
- global.Intl = intl;
+ const intl = global.Intl
+ global.Intl = undefined
+ expect(createNativeLocaleFormatter('', () => {})(parseTimestamp('2019-02-08'))).toBe('')
+ global.Intl = intl
})
it('should return emptyFormatter if Intl throws error', () => {
- global.Intl.DateTimeFormat = () => { throw new Error(); };
- expect(createNativeLocaleFormatter("", () => {})(parseTimestamp("2019-02-08"))).toBe('');
+ global.Intl.DateTimeFormat = () => { throw new Error() }
+ expect(createNativeLocaleFormatter('', () => {})(parseTimestamp('2019-02-08'))).toBe('')
})
it('should get month start', () => {
- expect(getStartOfMonth(parseTimestamp('2019-02-08')).date).toEqual('2019-02-01');
- expect(getStartOfMonth(parseTimestamp('2019-03-08')).date).toEqual('2019-03-01');
- expect(getStartOfMonth(parseTimestamp('2019-06-08')).date).toEqual('2019-06-01');
+ expect(getStartOfMonth(parseTimestamp('2019-02-08')).date).toEqual('2019-02-01')
+ expect(getStartOfMonth(parseTimestamp('2019-03-08')).date).toEqual('2019-03-01')
+ expect(getStartOfMonth(parseTimestamp('2019-06-08')).date).toEqual('2019-06-01')
})
it('should get month end', () => {
- expect(getEndOfMonth(parseTimestamp('2019-02-08')).date).toEqual('2019-02-28');
- expect(getEndOfMonth(parseTimestamp('2019-03-08')).date).toEqual('2019-03-31');
- expect(getEndOfMonth(parseTimestamp('2019-06-08')).date).toEqual('2019-06-30');
+ expect(getEndOfMonth(parseTimestamp('2019-02-08')).date).toEqual('2019-02-28')
+ expect(getEndOfMonth(parseTimestamp('2019-03-08')).date).toEqual('2019-03-31')
+ expect(getEndOfMonth(parseTimestamp('2019-06-08')).date).toEqual('2019-06-30')
})
it('should get next minutes', () => {
- expect(nextMinutes({ hour: 8, minute: 30 }, 40)).toEqual({ hour: 9, minute: 10 });
- expect(nextMinutes({ hour: 8, minute: 10 }, 90)).toEqual({ hour: 9, minute: 40 });
- expect(nextMinutes({ hour: 8, minute: 0 }, 40)).toEqual({ hour: 8, minute: 40 });
- expect(nextMinutes({ day: 1, weekday: 1, hour: 23, minute: 50 }, 40)).toEqual({ hour: 0, minute: 30, day: 2, weekday: 2 });
+ expect(nextMinutes({ hour: 8, minute: 30 }, 40)).toEqual({ hour: 9, minute: 10 })
+ expect(nextMinutes({ hour: 8, minute: 10 }, 90)).toEqual({ hour: 9, minute: 40 })
+ expect(nextMinutes({ hour: 8, minute: 0 }, 40)).toEqual({ hour: 8, minute: 40 })
+ expect(nextMinutes({ day: 1, weekday: 1, hour: 23, minute: 50 }, 40)).toEqual({ hour: 0, minute: 30, day: 2, weekday: 2 })
})
it('should update minutes', () => {
- expect(updateMinutes({}, 40)).toMatchObject({ hour: 0, minute: 40 });
- expect(updateMinutes({}, 90)).toMatchObject({ hour: 1, minute: 30 });
- expect(updateMinutes({}, 40, {})).toMatchObject({ hour: 0, minute: 40 });
- expect(updateMinutes({}, 90, {})).toMatchObject({ hour: 1, minute: 30 });
+ expect(updateMinutes({}, 40)).toMatchObject({ hour: 0, minute: 40 })
+ expect(updateMinutes({}, 90)).toMatchObject({ hour: 1, minute: 30 })
+ expect(updateMinutes({}, 40, {})).toMatchObject({ hour: 0, minute: 40 })
+ expect(updateMinutes({}, 90, {})).toMatchObject({ hour: 1, minute: 30 })
})
it('should get weekday skips', () => {
- expect(getWeekdaySkips([ 0, 1, 2, 3, 4, 5, 6 ])).toEqual([1, 1, 1, 1, 1, 1, 1]);
- expect(getWeekdaySkips([ 1, 5, 0, 3, 4, 2, 6 ])).toEqual([1, 1, 1, 1, 1, 1, 1]);
- expect(getWeekdaySkips([ 1, 5, 1, 3, 4, 2, 6 ])).toEqual([0, 1, 1, 1, 1, 1, 2]);
+ expect(getWeekdaySkips([ 0, 1, 2, 3, 4, 5, 6 ])).toEqual([1, 1, 1, 1, 1, 1, 1])
+ expect(getWeekdaySkips([ 1, 5, 0, 3, 4, 2, 6 ])).toEqual([1, 1, 1, 1, 1, 1, 1])
+ expect(getWeekdaySkips([ 1, 5, 1, 3, 4, 2, 6 ])).toEqual([0, 1, 1, 1, 1, 1, 2])
})
it('should create day list', () => {
const skips = getWeekdaySkips([ 0, 1, 2, 3, 4, 5, 6 ])
const skips1 = getWeekdaySkips([ 1, 1, 1, 1, 1, 1, 0 ])
- expect(createDayList(parseTimestamp("2019-02-02"), parseTimestamp("2019-02-01"), parseTimestamp("2019-02-02"), skips)).toHaveLength(0)
- expect(createDayList(parseTimestamp("2019-02-01"), parseTimestamp("2019-02-10"), parseTimestamp("2019-02-02"), skips)).toHaveLength(10)
- expect(createDayList(parseTimestamp("2019-02-01"), parseTimestamp("2019-02-10"), parseTimestamp("2019-02-02"), skips1)).toHaveLength(3)
+ expect(createDayList(parseTimestamp('2019-02-02'), parseTimestamp('2019-02-01'), parseTimestamp('2019-02-02'), skips)).toHaveLength(0)
+ expect(createDayList(parseTimestamp('2019-02-01'), parseTimestamp('2019-02-10'), parseTimestamp('2019-02-02'), skips)).toHaveLength(10)
+ expect(createDayList(parseTimestamp('2019-02-01'), parseTimestamp('2019-02-10'), parseTimestamp('2019-02-02'), skips1)).toHaveLength(3)
})
it('should find weekday', () => {
- expect(findWeekday(parseTimestamp("2019-02-03"), 5, nextDay, 100)).toMatchObject({ weekday: 5 })
- expect(findWeekday(parseTimestamp("2019-01-03"), 1, nextDay, 100)).toMatchObject({ weekday: 1 })
- expect(findWeekday(parseTimestamp("2019-01-03"), 5, prevDay, 100)).toMatchObject({ weekday: 5 })
- expect(findWeekday(parseTimestamp("2019-01-03"), 1, prevDay, 100)).toMatchObject({ weekday: 1 })
+ expect(findWeekday(parseTimestamp('2019-02-03'), 5, nextDay, 100)).toMatchObject({ weekday: 5 })
+ expect(findWeekday(parseTimestamp('2019-01-03'), 1, nextDay, 100)).toMatchObject({ weekday: 1 })
+ expect(findWeekday(parseTimestamp('2019-01-03'), 5, prevDay, 100)).toMatchObject({ weekday: 5 })
+ expect(findWeekday(parseTimestamp('2019-01-03'), 1, prevDay, 100)).toMatchObject({ weekday: 1 })
})
it('should calculate relative days', () => {
- expect(relativeDays(parseTimestamp("2019-02-03"), nextDay, 1)).toMatchObject({ day: 4 })
- expect(relativeDays(parseTimestamp("2019-01-03"), nextDay, 10)).toMatchObject({ day: 13 })
- expect(relativeDays(parseTimestamp("2019-01-03"), nextDay, 1000)).toMatchObject({ day: 29, month: 9, year: 2021 })
- expect(relativeDays(parseTimestamp("2019-01-03"), prevDay, 1)).toMatchObject({ day: 2 })
- expect(relativeDays(parseTimestamp("2019-01-03"), prevDay, 10)).toMatchObject({ day: 24 })
- expect(relativeDays(parseTimestamp("2019-01-03"), prevDay, 1000)).toMatchObject({ day: 8, month: 4, year: 2016 })
+ expect(relativeDays(parseTimestamp('2019-02-03'), nextDay, 1)).toMatchObject({ day: 4 })
+ expect(relativeDays(parseTimestamp('2019-01-03'), nextDay, 10)).toMatchObject({ day: 13 })
+ expect(relativeDays(parseTimestamp('2019-01-03'), nextDay, 1000)).toMatchObject({ day: 29, month: 9, year: 2021 })
+ expect(relativeDays(parseTimestamp('2019-01-03'), prevDay, 1)).toMatchObject({ day: 2 })
+ expect(relativeDays(parseTimestamp('2019-01-03'), prevDay, 10)).toMatchObject({ day: 24 })
+ expect(relativeDays(parseTimestamp('2019-01-03'), prevDay, 1000)).toMatchObject({ day: 8, month: 4, year: 2016 })
})
})
diff --git a/packages/vuetify/test/unit/components/VCalendar/VCalendar.spec.js b/packages/vuetify/test/unit/components/VCalendar/VCalendar.spec.js
deleted file mode 100644
index 30ed5fc3986..00000000000
--- a/packages/vuetify/test/unit/components/VCalendar/VCalendar.spec.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { test } from "@/test"
-import { parseDate } from "@/components/VCalendar/util/timestamp"
-import VCalendar from "@/components/VCalendar/VCalendar"
-
-test("VCalendar", ({ mount }) => {
- it("should render day view", async () => {
- const wrapper = mount(VCalendar, {
- propsData: {
- type: "day",
- start: "2018-01-29",
- end: "2018-02-04",
- now: "2019-02-17"
- },
- methods: {
- getNow: () => parseDate(new Date("2019-02-17"))
- }
- });
-
- expect(wrapper.hasClass("v-calendar-daily")).toBe(true)
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render week view", async () => {
- const wrapper = mount(VCalendar, {
- propsData: {
- type: "week",
- start: "2018-01-29",
- end: "2018-02-04",
- now: "2019-02-17"
- },
- methods: {
- getNow: () => parseDate(new Date("2019-02-17"))
- }
- });
-
- expect(wrapper.hasClass("v-calendar-daily")).toBe(true)
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render month view", async () => {
- const wrapper = mount(VCalendar, {
- propsData: {
- type: "month",
- start: "2018-01-29",
- end: "2018-02-04",
- now: "2019-02-17"
- },
- methods: {
- getNow: () => parseDate(new Date("2019-02-17"))
- }
- });
-
- expect(wrapper.hasClass("v-calendar-monthly")).toBe(true)
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should parse value", async () => {
- const wrapper = mount(VCalendar, {
- propsData: {
- value: "2019-02-02",
- start: "2019-01-29",
- end: "2019-02-04"
- }
- });
-
- expect(wrapper.vm.parsedValue.date).toBe("2019-02-02")
- })
-
- it("should parse start", async () => {
- const wrapper = mount(VCalendar, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04"
- }
- });
-
- expect(wrapper.vm.parsedValue.date).toBe("2019-01-29")
- })
-
- // TODO Create a test that doesn"t fail when
- // the day changes or ignore the code it
- // covers
- it.skip("should calculate end", async () => {
- const wrapper = mount(VCalendar, {
- propsData: {
- end: "2018-12-04"
- }
- });
-
- expect(wrapper.vm.parsedValue.date).toEqual(new Date().toISOString().split("T")[0])
- })
-});
diff --git a/packages/vuetify/test/unit/components/VCalendar/VCalendarDailly.spec.js b/packages/vuetify/test/unit/components/VCalendar/VCalendarDailly.spec.js
deleted file mode 100644
index d35e4ff1d45..00000000000
--- a/packages/vuetify/test/unit/components/VCalendar/VCalendarDailly.spec.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import { test } from "@/test"
-import VCalendarDaily from "@/components/VCalendar/VCalendarDaily"
-
-test("VCalendarDaily", ({ mount }) => {
- it("should render component and have v-calendar-daily class", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04"
- }
- });
-
- expect(wrapper.hasClass('v-calendar-daily')).toBe(true)
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should compute scrollPush on init", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04"
- }
- });
-
- wrapper.vm.getScrollPush = jest.fn(_ => 123);
-
- expect(wrapper.vm.scrollPush).toBe(0);
- expect(wrapper.vm.getScrollPush).not.toBeCalled();
- await wrapper.vm.$nextTick();
- expect(wrapper.vm.getScrollPush).toBeCalled();
- expect(wrapper.vm.scrollPush).toBe(123);
- })
-
- it("should compute scrollPush properly", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04"
- }
- });
-
- expect(wrapper.vm.getScrollPush()).toBe(0);
-
- Object.defineProperty(wrapper.vm.$refs.scrollArea, "offsetWidth", { value: 100 });
- Object.defineProperty(wrapper.vm.$refs.pane, "offsetWidth", { value: 25 });
-
- expect(wrapper.vm.getScrollPush()).toBe(75);
- })
-
- it("should render correctly with intervalMinutes prop", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- intervalMinutes: 40
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render correctly with maxDays prop", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- maxDays: 5
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render correctly without shortIntervals prop", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- shortIntervals: false
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render correctly with intervalHeight prop", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- intervalHeight: 70
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render correctly with firstInterval prop", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- firstInterval: 2
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should render correctly with intervalCount prop", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- intervalCount: 12
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- })
-
- it("should use custom interval formatter and render correctly", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- intervalFormat: jest.fn(x => `test: ${x.date} ${x.time}`)
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- expect(wrapper.vm.intervalFormat).toBeCalled();
- })
-
- it("should use custom interval style function and render correctly", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- intervalStyle: jest.fn(x => ({
- "opacity": x.hour / 24
- }))
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- expect(wrapper.vm.intervalStyle).toBeCalled();
- })
-
- it("should use custom showIntervalLabel function and render correctly", async () => {
- const wrapper = mount(VCalendarDaily, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- showIntervalLabel: jest.fn(x => (x.hour % 2 === 0))
- }
- });
-
- expect(wrapper.html()).toMatchSnapshot();
- expect(wrapper.vm.showIntervalLabel).toBeCalled();
- })
-})
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/calendar-base.spec.js b/packages/vuetify/test/unit/components/VCalendar/mixins/calendar-base.spec.js
deleted file mode 100644
index 930ede338cf..00000000000
--- a/packages/vuetify/test/unit/components/VCalendar/mixins/calendar-base.spec.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import { test } from '@/test'
-import CalendarBase from '@/components/VCalendar/mixins/calendar-base'
-import { parseTimestamp } from '@/components/VCalendar/util/timestamp'
-
-const Mock = {
- mixins: [CalendarBase],
- render: h => h('div')
-}
-
-test('calendar-base.ts', ({ mount }) => {
- it('should parse start & end', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.parsedStart).toBeDefined();
- expect(wrapper.vm.parsedStart).toMatchSnapshot();
- expect(wrapper.vm.parsedEnd).toBeDefined();
- expect(wrapper.vm.parsedEnd).toMatchSnapshot();
- })
-
- it('should create a day list', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.days).toBeDefined();
- expect(wrapper.vm.days.length).toBe(11);
- expect(wrapper.vm.days).toMatchSnapshot();
-
- expect(wrapper.vm.days[0].date).toBe("2019-01-29");
- expect(wrapper.vm.days[10].date).toBe("2019-02-08");
- })
-
- it('should calculate weekday skips', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.weekdaySkips).toBeDefined();
- expect(wrapper.vm.weekdaySkips.length).toEqual(7);
- })
-
- it('should generate classes', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.getRelativeClasses(parseTimestamp("2019-01-28"))).toBeDefined();
- expect(wrapper.vm.getRelativeClasses(parseTimestamp("2019-01-28"))).toMatchSnapshot();
- })
-
- it('should generate classes with outside', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.getRelativeClasses(parseTimestamp("2019-01-28"), true)).toBeDefined();
- expect(wrapper.vm.getRelativeClasses(parseTimestamp("2019-01-28"), true)).toMatchSnapshot();
- })
-
- it('should return weekdayFormatter equal to weekdayFormat prop', async () => {
- const weekdayFormat = x => x;
- const wrapper = mount(Mock, {
- propsData: {
- weekdayFormat
- }
- });
-
- expect(wrapper.vm.weekdayFormatter).toEqual(weekdayFormat);
- })
-
- it('should long-format weekday', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.weekdayFormatter).toBeDefined();
- expect(typeof wrapper.vm.weekdayFormatter).toEqual("function");
-
- expect(wrapper.vm.weekdayFormatter(parseTimestamp("2019-01-28"), false)).toEqual("Monday");
- expect(wrapper.vm.weekdayFormatter(parseTimestamp("2019-01-27"), false)).toEqual("Sunday");
- expect(wrapper.vm.weekdayFormatter(parseTimestamp("2019-01-29"), false)).toEqual("Tuesday");
- })
-
- it('should short-format weekday', async () => {
- const wrapper = mount(Mock)
-
- expect(wrapper.vm.weekdayFormatter).toBeDefined();
- expect(typeof wrapper.vm.weekdayFormatter).toEqual("function");
-
- expect(wrapper.vm.weekdayFormatter(parseTimestamp("2019-01-28"), true)).toEqual("Mon");
- expect(wrapper.vm.weekdayFormatter(parseTimestamp("2019-01-27"), true)).toEqual("Sun");
- expect(wrapper.vm.weekdayFormatter(parseTimestamp("2019-01-29"), true)).toEqual("Tue");
- })
-
- it('should get start of week', async () => {
- const wrapper = mount(Mock)
-
- expect(wrapper.vm.getStartOfWeek(parseTimestamp("2019-01-28")).weekday).toEqual(0);
- expect(wrapper.vm.getStartOfWeek(parseTimestamp("2019-01-03")).weekday).toEqual(0);
- })
-
- it('should get end of week', async () => {
- const wrapper = mount(Mock)
-
- expect(wrapper.vm.getEndOfWeek(parseTimestamp("2019-03-28")).weekday).toEqual(6);
- expect(wrapper.vm.getEndOfWeek(parseTimestamp("2019-12-31")).weekday).toEqual(6);
- })
-
- it('should return dayFormatter equal to dayFormat prop', async () => {
- const dayFormat = x => x;
- const wrapper = mount(Mock, {
- propsData: {
- dayFormat
- }
- });
-
- expect(wrapper.vm.dayFormatter).toEqual(dayFormat);
- })
-
- it('should format day', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.weekdayFormatter).toBeDefined();
- expect(typeof wrapper.vm.weekdayFormatter).toEqual("function");
-
- expect(wrapper.vm.dayFormatter(parseTimestamp("2019-01-28"), false)).toEqual("28");
- expect(wrapper.vm.dayFormatter(parseTimestamp("2019-01-27"), false)).toEqual("27");
- expect(wrapper.vm.dayFormatter(parseTimestamp("2019-01-29"), false)).toEqual("29");
- })
-})
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/calendar-with-intervals.spec.js b/packages/vuetify/test/unit/components/VCalendar/mixins/calendar-with-intervals.spec.js
deleted file mode 100644
index 7fe51d27e4c..00000000000
--- a/packages/vuetify/test/unit/components/VCalendar/mixins/calendar-with-intervals.spec.js
+++ /dev/null
@@ -1,307 +0,0 @@
-import { test } from '@/test'
-import CalendarWithIntervals from '@/components/VCalendar/mixins/calendar-with-intervals'
-import { parseTimestamp, parseTime } from '@/components/VCalendar/util/timestamp'
-
-const Mock = {
- mixins: [CalendarWithIntervals],
- render: h => h('div')
-}
-
-const createMouseEvent = (x, y) => ({
- clientX: x,
- clientY: y,
- currentTarget: document.body
-})
-const createTouchEvent = (x, y) => ({
- touches: [{
- clientX: x,
- clientY: y
- }],
- currentTarget: document.body
-})
-
-test('calendar-with-intervals.ts', ({ mount }) => {
- it('should parse all data', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- firstInterval: "1",
- intervalMinutes: "30",
- intervalCount: "10",
- intervalHeight: "20"
- }
- })
-
- expect(wrapper.vm.parsedFirstInterval).toBeDefined();
- expect(wrapper.vm.parsedFirstInterval).toBe(1);
- expect(wrapper.vm.parsedIntervalMinutes).toBeDefined();
- expect(wrapper.vm.parsedIntervalMinutes).toBe(30);
- expect(wrapper.vm.parsedIntervalCount).toBeDefined();
- expect(wrapper.vm.parsedIntervalCount).toBe(10);
- expect(wrapper.vm.parsedIntervalHeight).toBeDefined();
- expect(wrapper.vm.parsedIntervalHeight).toBe(20);
- })
-
- it('should generate firstMinute', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- firstInterval: "2",
- intervalMinutes: "30"
- }
- })
-
- expect(wrapper.vm.firstMinute).toBeDefined();
- expect(wrapper.vm.firstMinute).toBe(60);
- })
-
- it('should generate bodyHeight', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- intervalCount: "10",
- intervalHeight: "20"
- }
- })
-
- expect(wrapper.vm.bodyHeight).toBeDefined();
- expect(wrapper.vm.bodyHeight).toBe(200);
- })
-
- it('should generate days', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04"
- }
- })
-
- expect(wrapper.vm.days).toBeDefined();
- expect(wrapper.vm.days.length).toBe(7);
- expect(wrapper.vm.days[0].date).toBe("2019-01-29");
- expect(wrapper.vm.days[6].date).toBe("2019-02-04");
- expect(wrapper.vm.days).toMatchSnapshot();
-
- wrapper.setProps({
- start: "2019-01-29",
- end: "2019-02-02"
- });
-
- expect(wrapper.vm.days).toBeDefined();
- expect(wrapper.vm.days.length).toBe(5);
- expect(wrapper.vm.days[0].date).toBe("2019-01-29");
- expect(wrapper.vm.days[4].date).toBe("2019-02-02");
- expect(wrapper.vm.days).toMatchSnapshot();
- })
-
- it('should generate intervals', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04"
- }
- })
-
- expect(wrapper.vm.intervals).toBeDefined();
- expect(wrapper.vm.intervals.length).toBe(7);
- expect(wrapper.vm.intervals[0].length).toBe(24);
- expect(wrapper.vm.intervals[0][0].date).toBe("2019-01-29");
- expect(wrapper.vm.intervals[6][0].date).toBe("2019-02-04");
- expect(wrapper.vm.intervals).toMatchSnapshot();
-
- wrapper.setProps({
- start: "2019-01-29",
- end: "2019-02-02"
- });
-
- expect(wrapper.vm.intervals).toBeDefined();
- expect(wrapper.vm.intervals.length).toBe(5);
- expect(wrapper.vm.intervals[0].length).toBe(24);
- expect(wrapper.vm.intervals[0][0].date).toBe("2019-01-29");
- expect(wrapper.vm.intervals[4][0].date).toBe("2019-02-02");
- expect(wrapper.vm.intervals).toMatchSnapshot();
- })
-
- it('should generate intervalFormatter', async () => {
- const wrapper = mount(Mock)
-
- expect(wrapper.vm.intervalFormatter).toBeDefined();
- expect(typeof wrapper.vm.intervalFormatter).toBe("function");
- })
-
- it('should format interval', async () => {
- const wrapper = mount(Mock)
- const date = parseTimestamp("2019-02-08");
-
- expect(wrapper.vm.intervalFormatter({ date: "2019-02-08", hour: 8, minute: 30 }, false)).toBe("8:30 AM");
- expect(wrapper.vm.intervalFormatter({ date: "2019-02-08", hour: 20, minute: 30 }, false)).toBe("8:30 PM");
- expect(wrapper.vm.intervalFormatter({ date: "2019-02-08", hour: 0, minute: 30 }, false)).toBe("12:30 AM");
- expect(wrapper.vm.intervalFormatter({ date: "2019-02-08", hour: 8, minute: 30 }, true)).toBe("8:30 AM");
- expect(wrapper.vm.intervalFormatter({ date: "2019-02-08", hour: 20, minute: 30 }, true)).toBe("8:30 PM");
- expect(wrapper.vm.intervalFormatter({ date: "2019-02-08", hour: 0, minute: 30 }, true)).toBe("12:30 AM");
- })
-
- it('should return intervalFormat if has one', async () => {
- const intervalFormat = x => x;
- const wrapper = mount(Mock, {
- propsData: {
- intervalFormat
- }
- })
-
- expect(wrapper.vm.intervalFormatter).toBeDefined();
- expect(typeof wrapper.vm.intervalFormatter).toBe("function");
- expect(wrapper.vm.intervalFormatter).toBe(intervalFormat);
- })
-
- it('should generate slot scope', async () => {
- const wrapper = mount(Mock)
-
- expect(wrapper.vm.getSlotScope(parseTimestamp("2019-02-08"))).toBeDefined();
- expect(wrapper.vm.getSlotScope(parseTimestamp("2019-02-08")).date).toBe("2019-02-08");
- expect(wrapper.vm.getSlotScope(parseTimestamp("2019-02-08"))).toMatchSnapshot();
- expect(typeof wrapper.vm.getSlotScope(parseTimestamp("2019-02-08")).timeToY).toBe("function");
- expect(typeof wrapper.vm.getSlotScope(parseTimestamp("2019-02-08")).minutesToPixels).toBe("function");
- })
-
- it('should convert time to Y', async () => {
- const wrapper = mount(Mock)
-
- expect(typeof wrapper.vm.timeToY).toBe("function");
- expect(wrapper.vm.timeToY("08:30")).toBeDefined();
- expect(wrapper.vm.timeToY("08:30")).toBe(340);
- expect(wrapper.vm.timeToY("09:30")).toBe(380);
- expect(Math.round(wrapper.vm.timeToY("23:50"))).toBe(953);
-
- wrapper.setProps({
- firstInterval: 5,
- intervalCount: 5,
- intervalMinutes: 10,
- bodyHeight: 400
- })
-
- expect(wrapper.vm.timeToY("08:30")).toBe(200);
- expect(wrapper.vm.timeToY("09:30")).toBe(200);
- expect(wrapper.vm.timeToY("23:50")).toBe(200);
-
- expect(wrapper.vm.timeToY("00:05")).toBe(0);
-
- expect(Math.round(wrapper.vm.timeToY("08:30", false))).toBe(1840);
- expect(wrapper.vm.timeToY("09:30", false)).toBe(2080);
- expect(wrapper.vm.timeToY("23:50", false)).toBe(5520);
-
- expect(wrapper.vm.timeToY("bad")).toBe(false);
- })
-
- it('should convert minutes to pixels', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- intervalMinutes: 5,
- bodyHeight: 200
- }
- })
-
- expect(wrapper.vm.minutesToPixels).toBeDefined();
- expect(typeof wrapper.vm.minutesToPixels).toBe("function");
- expect(wrapper.vm.minutesToPixels(5)).toBeDefined();
-
- expect(wrapper.vm.minutesToPixels(5)).toBe(40);
- expect(wrapper.vm.minutesToPixels(10)).toBe(80);
- expect(wrapper.vm.minutesToPixels(50)).toBe(400);
-
- wrapper.setProps({
- intervalMinutes: 10,
- bodyHeight: 400
- })
-
- expect(wrapper.vm.minutesToPixels(5)).toBe(20);
- expect(wrapper.vm.minutesToPixels(10)).toBe(40);
- expect(wrapper.vm.minutesToPixels(50)).toBe(200);
- })
-
- it('should scroll to time', async () => {
- const wrapper = mount({
- ...Mock,
- render: h => h('div', [
- h('div', {
- ref: 'scrollArea'
- })
- ])
- })
-
- wrapper.vm.scrollToTime("8:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(340)
- wrapper.vm.scrollToTime("12:30");
- expect(Math.round(wrapper.vm.$refs.scrollArea.scrollTop)).toBe(500)
- wrapper.vm.scrollToTime("20:00");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(800)
-
- wrapper.setProps({
- intervalMinutes: 5,
- bodyHeight: 200
- })
-
- wrapper.vm.scrollToTime("8:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(960)
- wrapper.vm.scrollToTime("12:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(960)
- wrapper.vm.scrollToTime("20:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(960)
-
- wrapper.setProps({
- intervalMinutes: 30,
- bodyHeight: 1700
- })
-
- wrapper.vm.scrollToTime("8:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(680)
- wrapper.vm.scrollToTime("12:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(960)
- wrapper.vm.scrollToTime("20:30");
- expect(wrapper.vm.$refs.scrollArea.scrollTop).toBe(960)
-
- expect(wrapper.vm.scrollToTime("20:19")).toBe(true)
- expect(wrapper.vm.scrollToTime("bad")).toBe(false)
- })
-
- it('should get timestamp at mouse event', async () => {
- const wrapper = mount(Mock);
-
- expect(typeof wrapper.vm.getTimestampAtEvent).toBe("function");
-
- expect(wrapper.vm.getTimestampAtEvent(createMouseEvent(0, 100), { time: "20:00" })).toMatchObject({ hour: 2, minute: 30 });
- expect(wrapper.vm.getTimestampAtEvent(createMouseEvent(0, 150), { time: "20:00" })).toMatchObject({ hour: 3, minute: 45 });
- expect(wrapper.vm.getTimestampAtEvent(createMouseEvent(0, 200), { time: "20:00" })).toMatchObject({ hour: 5, minute: 0 });
- })
-
- it('should get timestamp at touch event', async () => {
- const wrapper = mount(Mock);
-
- expect(typeof wrapper.vm.getTimestampAtEvent).toBe("function");
-
- expect(wrapper.vm.getTimestampAtEvent(createTouchEvent(0, 100), { time: "20:00" })).toMatchObject({ hour: 2, minute: 30 });
- expect(wrapper.vm.getTimestampAtEvent(createTouchEvent(0, 150), { time: "20:00" })).toMatchObject({ hour: 3, minute: 45 });
- expect(wrapper.vm.getTimestampAtEvent(createTouchEvent(0, 200), { time: "20:00" })).toMatchObject({ hour: 5, minute: 0 });
- })
-
- it('should get style', async () => {
- const wrapper = mount(Mock);
-
- expect(typeof wrapper.vm.intervalStyleDefault).toBe("function");
- expect(wrapper.vm.intervalStyleDefault({})).toBeUndefined();
- })
-
- it('should show interval label', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- start: "2019-01-29",
- end: "2019-02-04",
- firstInterval: 5
- }
- });
- expect(typeof wrapper.vm.showIntervalLabelDefault).toBe("function");
- expect(wrapper.vm.showIntervalLabelDefault({})).toBeFalsy();
-
- expect(wrapper.vm.showIntervalLabelDefault({ hour: 0, minute: 5 })).toBeFalsy();
- expect(wrapper.vm.showIntervalLabelDefault({ hour: 12, minute: 30 })).toBeFalsy();
- expect(wrapper.vm.showIntervalLabelDefault({ hour: 13, minute: 0 })).toBeTruthy();
- expect(wrapper.vm.showIntervalLabelDefault({ hour: 13, minute: 30 })).toBeFalsy();
- })
-});
diff --git a/packages/vuetify/test/unit/components/VCalendar/mixins/times.spec.js b/packages/vuetify/test/unit/components/VCalendar/mixins/times.spec.js
deleted file mode 100644
index b4a677cc61b..00000000000
--- a/packages/vuetify/test/unit/components/VCalendar/mixins/times.spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { test } from '@/test'
-import Times from '@/components/VCalendar/mixins/times'
-
-const Mock = {
- mixins: [Times],
- render: h => h('div')
-}
-
-test('times.ts', ({ mount }) => {
- it('should parse timestamp', async () => {
- const wrapper = mount(Mock, {
- propsData: {
- now: "2019-02-08"
- }
- })
-
- expect(wrapper.vm.parsedNow).toBeDefined();
- expect(wrapper.vm.parsedNow).toMatchSnapshot();
- })
-
- it('should update day', async () => {
- const wrapper = mount(Mock)
-
- expect(typeof wrapper.vm.updateDay).toBe("function");
- let target = {};
- let now = {
- date: "2019-02-08",
- year: "2019",
- month: "2",
- day: "8",
- weekday: "4",
- }
- wrapper.vm.updateDay(now, target);
- expect(target).toEqual(now);
- })
-
- it('should not update day if dates are equal', async () => {
- const wrapper = mount(Mock)
-
- expect(typeof wrapper.vm.updateDay).toBe("function");
- let target = { date: "2019-02-08" };
- let now = {
- date: "2019-02-08",
- year: "2019",
- month: "2",
- day: "8",
- weekday: "4",
- }
- wrapper.vm.updateDay(now, target);
- expect(target).not.toEqual(now);
- })
-
- it('should not update time if times are equal', async () => {
- const wrapper = mount(Mock)
-
- expect(typeof wrapper.vm.updateTime).toBe("function");
- let target = { time: "08:30" };
- let now = {
- time: "08:30",
- hour: "8",
- minute: "30"
- }
- wrapper.vm.updateTime(now, target);
- expect(target).not.toEqual(now);
- })
-})
diff --git a/packages/vuetify/test/unit/components/VCalendar/util/props.spec.js b/packages/vuetify/test/unit/components/VCalendar/util/props.spec.js
deleted file mode 100644
index 1540df67cee..00000000000
--- a/packages/vuetify/test/unit/components/VCalendar/util/props.spec.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { validateNumber } from '@/components/VCalendar/util/props'
-import { test } from '@/test'
-
-test("props.ts", () => {
- it("should return true if number is valid", () => {
- expect(validateNumber(1)).toBe(true);
- expect(validateNumber(1000000)).toBe(true);
- expect(validateNumber("1234")).toBe(true);
- })
-
- it("should return false if number is bad", () => {
- expect(validateNumber(Infinity)).toBe(false);
- expect(validateNumber(NaN)).toBe(false);
- expect(validateNumber("bad")).toBe(false);
- })
-})
|
07fa3da9615b19ddf78b679d283022fbd23c79dd
|
2020-03-18 03:41:29
|
amoliski
|
fix(VSelect): incorrect dense height (#10694)
| false
|
incorrect dense height (#10694)
|
fix
|
diff --git a/packages/vuetify/src/components/VTextField/VTextField.sass b/packages/vuetify/src/components/VTextField/VTextField.sass
index a37cdc0fb27..00c2435abdd 100644
--- a/packages/vuetify/src/components/VTextField/VTextField.sass
+++ b/packages/vuetify/src/components/VTextField/VTextField.sass
@@ -86,7 +86,7 @@
&.v-input--dense
padding-top: 0
- &:not(.v-text-field--outlined):not(.v-text-field--single-line)
+ &:not(.v-text-field--outlined):not(.v-text-field--single-line):not(.v-select)
input
padding: $text-field-dense-padding
|
47950449849a22f8c1e53cf09343cf30837be2e6
|
2018-05-05 20:42:43
|
nekosaur
|
fix(v-slider): ticks not showing when active
| false
|
ticks not showing when active
|
fix
|
diff --git a/src/stylus/components/_sliders.styl b/src/stylus/components/_sliders.styl
index d4eb103b908..5a011ae119f 100755
--- a/src/stylus/components/_sliders.styl
+++ b/src/stylus/components/_sliders.styl
@@ -219,6 +219,10 @@ rtl(v-slider-rtl, "v-input--slider")
.v-slider__thumb
transform: translateY(-50%) scale(0)
+ .v-slider__ticks-container
+ .v-slider__ticks
+ opacity: 1
+
&__thumb-label__container
position: absolute
left: 0
|
cd735d67be0ba0dbf2d78aec8441ce3bd8474562
|
2023-01-30 01:52:18
|
nekosaur
|
fix(VForm): remove unused prop lazy-validation
| false
|
remove unused prop lazy-validation
|
fix
|
diff --git a/packages/api-generator/src/locale/en/form.json b/packages/api-generator/src/locale/en/form.json
index 9c2bb1428f9..05ebbdcf318 100644
--- a/packages/api-generator/src/locale/en/form.json
+++ b/packages/api-generator/src/locale/en/form.json
@@ -2,9 +2,8 @@
"props": {
"disabled": "Puts all children inputs into a disabled state",
"fastFail": "Stop validation as soon as any rules fail.",
- "lazyValidation": "If enabled, value will always be true unless there are visible validation errors. You can still call validate() to manually trigger validation.",
"readonly": "Puts all children inputs into a readonly state.",
- "modelValue": "A boolean value representing the validity of the form.",
+ "modelValue": "The value representing the validity of the form. If the value is `null` then no validation has taken place yet, or the form has been reset. Otherwise the value will be a `boolean` that indicates if validation has passed or not.",
"validateOn": "Changes the events in which validation occurs."
}
}
diff --git a/packages/api-generator/src/locale/en/v-form.json b/packages/api-generator/src/locale/en/v-form.json
index 5873641fa4d..9d6676ea7fc 100644
--- a/packages/api-generator/src/locale/en/v-form.json
+++ b/packages/api-generator/src/locale/en/v-form.json
@@ -1,10 +1,4 @@
{
- "props": {
- "disabled": "Puts all children inputs into a disabled state",
- "lazyValidation": "If enabled, **value** will always be _true_ unless there are visible validation errors. You can still call `validate()` to manually trigger validation",
- "readonly": "Puts all children inputs into a readonly state.",
- "value": "A boolean value representing the validity of the form."
- },
"events": {
"submit": "Emitted when form is submitted",
"update:modelValue": "Event emitted when the form's validity changes"
diff --git a/packages/vuetify/src/composables/form.ts b/packages/vuetify/src/composables/form.ts
index 510f71758c7..7c0f7861a61 100644
--- a/packages/vuetify/src/composables/form.ts
+++ b/packages/vuetify/src/composables/form.ts
@@ -58,7 +58,6 @@ export interface FormProps {
export const makeFormProps = propsFactory({
disabled: Boolean,
fastFail: Boolean,
- lazyValidation: Boolean,
readonly: Boolean,
modelValue: {
type: Boolean as PropType<boolean | null>,
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.