Skip to content

Commit e92856a

Browse files
committed
Merge branch 'master' into dev
2 parents c57bf18 + b62e737 commit e92856a

File tree

34 files changed

+356
-115
lines changed

34 files changed

+356
-115
lines changed

MIGRATION.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ const opts = {
202202
}
203203
```
204204

205-
* Now defaults to use [mdi](https://materialdesignicons.com/) icons. For information on how to install please navigate [here](https://vuetifyjs.com/customization/icons#install-material-design-icons).
205+
* Now defaults to use [mdi](https://materialdesignicons.com/) icons. For information on how to install please navigate [here](https://vuetifyjs.com/customization/icons#install-material-design-icons)
206206
* Is now located under the **icons** property of the Vuetify options
207207

208208
If you want to use a custom iconfont, you must set it up in the initial Vuetify options now.
@@ -330,11 +330,11 @@ All event names has been changed from camelCase to kebab-case:
330330
- `update:returnValue``update:return-value`
331331

332332
### Activators
333-
* Components with activators, `v-tooltip`, `v-menu`, `v-dialog`, `v-list-group` and `v-bottom-sheet` must now be bound using the new [v-slot](https://vuejs.org/v2/guide/components-slots.html#Named-Slots) syntax.
333+
* Components with activators, `v-tooltip`, `v-menu`, `v-dialog`, `v-list-group` and `v-bottom-sheet` must now be bound using the new [v-slot](https://vuejs.org/v2/guide/components-slots.html#Named-Slots) syntax
334334
* Requires [email protected]
335-
* We understand this is considerably more verbose than the v1.5 counterpart. We are still exploring ways to support the new **v-slot** in a more concise manner.
336-
* You can find more information on the official Vue documentation for [Destructuring Slot Props](https://vuejs.org/v2/guide/components-slots.html#Destructuring-Slot-Props).
337-
* You can find more information on the official Vue documentation for [v-slot](https://vuejs.org/v2/guide/components-slots.html#Named-Slots).
335+
* We understand this is considerably more verbose than the v1.5 counterpart. We are still exploring ways to support the new **v-slot** in a more concise manner
336+
* You can find more information on the official Vue documentation for [Destructuring Slot Props](https://vuejs.org/v2/guide/components-slots.html#Destructuring-Slot-Props)
337+
* You can find more information on the official Vue documentation for [v-slot](https://vuejs.org/v2/guide/components-slots.html#Named-Slots)
338338
* The upside to this change is it is easier to support nested activators and provide proper a11y support
339339

340340
#### Regular activator
@@ -542,29 +542,29 @@ _Developer notes: Was never explicitly listed in API_
542542
Data table (and iterator) have been rewritten from the ground up to be both easier to use and to allow for more flexibilty in more advanced use cases. This has resulted in a number of breaking changes. Some of these are shared between both components while some are unique to each.
543543

544544
#### Shared
545-
* **disable-initial-sort** has been removed. Neither component initially sorts data anymore. Use **sort-by** (or **options**) prop to sort.
546-
* **filter** prop has been removed. Instead use **custom-filter**. This was done in an effort to make custom filtering less confusing.
545+
* **disable-initial-sort** has been removed. Neither component initially sorts data anymore. Use **sort-by** (or **options**) prop to sort
546+
* **filter** prop has been removed. Instead use **custom-filter**. This was done in an effort to make custom filtering less confusing
547547
* The signature for **custom-filter** has changed from `(items: object[], search: string, filter: Filter): object[]` to `(value: any, search: string, item: any) => boolean`
548-
* **pagination** prop has been removed. Instead use the separate props such as **page**, **sort-by**, etc. If you want to provide a single object you can use the new **options** prop instead. **NOTE**: The **options** prop has a different object structure than **pagination**. Check API docs for details.
548+
* **pagination** prop has been removed. Instead use the separate props such as **page**, **sort-by**, etc. If you want to provide a single object you can use the new **options** prop instead. **NOTE**: The **options** prop has a different object structure than **pagination**. Check API docs for details
549549
* **total-items** prop has been renamed to **server-items-length**
550550
* **hide-actions** prop has been renamed to **hide-default-footer**. Also it no longer changes the visible items per page
551551
* Props related to the default footer have been move to the **footer-props** prop. These are:
552552
* **prev-icon**
553553
* **next-icon**
554554
* **rows-per-page-items****items-per-page-options**
555555
* **rows-per-page-text****items-per-page-text**
556-
* The **expand** prop has been removed.
556+
* The **expand** prop has been removed
557557

558558
#### `v-data-iterator`
559559
* The **content-tag**, **content-props**, **content-class** props have been removed. Instead simply use the default scoped slot to implement your intended markup.
560560

561561
#### `v-data-table`
562562
* **items** slot has been renamed to **item**
563563
* **headers** slot renamed to **header**
564-
* **item** slot (and **header**) now require you to define a `<tr>` element. Previously this was optional.
565-
* **expand** slot renamed to **expanded-item**. It no longer includes an expansion transition, and the slot is inside the `<tr>` element so that you can define your own `<td>` columns. To get back to a similar look as in 1.5, you will need a `<td>` with *colspan* equal to the number of columns in your header.
564+
* **item** slot (and **header**) now require you to define a `<tr>` element. Previously this was optional
565+
* **expand** slot renamed to **expanded-item**. It no longer includes an expansion transition, and the slot is inside the `<tr>` element so that you can define your own `<td>` columns. To get back to a similar look as in 1.5, you will need a `<td>` with *colspan* equal to the number of columns in your header
566566
* **hide-header** has been renamed to **hide-default-header**
567-
* **select-all** has been renamed to **show-select**. This will also render a checkbox on each item row as long as you are not defining a slot that overrides the internal row rendering (such as **item** or **body**).
567+
* **select-all** has been renamed to **show-select**. This will also render a checkbox on each item row as long as you are not defining a slot that overrides the internal row rendering (such as **item** or **body**)
568568
* Props related to the default header have been moved to the **header-props** prop. These are:
569569
* **sort-icon**
570570

@@ -777,7 +777,7 @@ _Developer notes: The tabs-items component does not have to be provided and is o
777777
```
778778

779779
#### `v-toolbar`
780-
* All existing scrolling techniques and `app` functionality has been deprecated and moved to `v-app-bar`.
780+
* All existing scrolling techniques and `app` functionality has been deprecated and moved to `v-app-bar`
781781

782782
<h2 id="i-need-help">🆘 I need help!</h2>
783783

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
}
1414
},
1515
"npmClient": "yarn",
16-
"version": "2.1.9",
16+
"version": "2.1.10",
1717
"useWorkspaces": true
1818
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dev": "node scripts/dev.js",
1515
"build": "node scripts/build.js",
1616
"start": "lerna run start --scope vuetifyjs.com --stream",
17-
"lint": "lerna run lint --parallel",
17+
"lint": "lerna run lint --parallel --stream",
1818
"lint:fix": "lerna run lint:fix --parallel",
1919
"version": "node scripts/confirm-npm-tag.js",
2020
"postinstall": "node scripts/post-install.js",

packages/api-generator/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"name": "@vuetify/api-generator",
3-
"version": "2.1.9",
3+
"version": "2.1.10",
44
"private": true,
55
"description": "",
66
"main": "dist/api.js",
77
"scripts": {
88
"debug": "babel-node inspect src/index.js",
99
"build": "node src/index.js",
10-
"lint": "eslint --ext .js src",
10+
"lint": "eslint --ext .js src -f codeframe --max-warnings 0",
1111
"lint:fix": "yarn lint --fix"
1212
},
1313
"author": "",
1414
"license": "ISC",
1515
"dependencies": {
1616
"deepmerge": "^4.0.0",
1717
"vue": "^2.6.10",
18-
"vuetify": "^2.1.9"
18+
"vuetify": "^2.1.10"
1919
},
2020
"devDependencies": {
2121
"@babel/node": "^7.5.5",

packages/api-generator/src/maps/v-data-table.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ const DataTableHeaderScopedProps = {
3636
},
3737
}
3838

39+
const DataTableFooterScopedProps = {
40+
props: {
41+
options: DataOptions,
42+
pagination: DataDefaultScopedSlotProps.pagination,
43+
itemsPerPageText: 'string',
44+
},
45+
on: '{}',
46+
headers: 'TableHeader[]',
47+
widths: '[]',
48+
}
49+
3950
const DataTableHeaderColumnScopedProps = {
4051
header: 'TableHeader',
4152
}
@@ -85,7 +96,7 @@ const DataTableSlots = [
8596
{ name: 'body.append', props: DataTableBodyScopedProps },
8697
{ name: 'body.prepend', props: DataTableBodyScopedProps },
8798
{ name: 'body', props: DataTableBodyScopedProps },
88-
{ name: 'footer', props: DataDefaultScopedSlotProps },
99+
{ name: 'footer', props: DataTableFooterScopedProps },
89100
{ name: 'footer.page-text', props: DataFooterPageTextScopedProps },
90101
{ name: 'header', props: DataTableHeaderScopedProps },
91102
{ name: 'header.data-table-select', props: DataTableHeaderSelectScopedProps },
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
'v-snackbar': {
3+
events: [
4+
{
5+
name: 'input',
6+
value: 'boolean',
7+
},
8+
],
9+
},
10+
}

packages/docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "A Vue.js project",
44
"private": true,
55
"author": "John Leider <[email protected]>",
6-
"version": "2.1.9",
6+
"version": "2.1.10",
77
"scripts": {
88
"dev": "cross-env node --max_old_space_size=4096 server",
99
"start": "cross-env NODE_ENV=production node server",
1010
"build": "rimraf dist && cross-env NODE_ENV=production webpack --config build/webpack.prod.config.js --no-progress --hide-modules",
11-
"lint": "eslint --ext .js,.vue,.json src -f codeframe",
11+
"lint": "eslint --ext .js,.vue,.json src -f codeframe --max-warnings 0",
1212
"lint:fix": "yarn lint --fix"
1313
},
1414
"dependencies": {
15-
"@vuetify/api-generator": "^2.1.9",
15+
"@vuetify/api-generator": "^2.1.10",
1616
"babel-polyfill": "^6.26.0",
1717
"chokidar": "^3.0.2",
1818
"compression": "^1.7.4",
@@ -39,7 +39,7 @@
3939
"vue-router": "^3.0.7",
4040
"vue-server-renderer": "^2.6.10",
4141
"vuelidate": "^0.7.4",
42-
"vuetify": "^2.1.9",
42+
"vuetify": "^2.1.10",
4343
"vuex": "^3.1.1",
4444
"vuex-pathify": "^1.4.0",
4545
"vuex-router-sync": "^5.0.0",

packages/docs/src/components/getting-started/Team.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
title: 'core',
6060
name: 'Andrew Henry',
6161
github: 'MajesticPotatoe',
62+
linkedin: 'andrew-henry-01049830',
6263
avatar: 'avatarStyle=Transparent&topType=ShortHairShortRound&accessoriesType=Blank&hairColor=BrownDark&facialHairType=Blank&clotheType=Hoodie&clotheColor=Heather&eyeType=Dizzy&eyebrowType=DefaultNatural&mouthType=Default&skinColor=Light',
6364
},
6465
{

packages/docs/src/data/pages/getting-started/QuickStart.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@
166166
"type": "text",
167167
"lang": "cdnText"
168168
},
169+
{
170+
"type": "alert",
171+
"lang": "cdnAlert",
172+
"value": "info"
173+
},
169174
{
170175
"type": "markup",
171176
"value": "html_cdn_quickstart"

packages/docs/src/examples/cards/complex/weather.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<template>
22
<v-card
33
class="mx-auto"
4-
color="#F9F9F9"
54
max-width="400"
65
>
76
<v-list-item two-line>

0 commit comments

Comments
 (0)