Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Jun 12, 2024
2 parents f842cd9 + 666484a commit 82a15dc
Show file tree
Hide file tree
Showing 190 changed files with 3,907 additions and 1,769 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.6.3",
"version": "3.6.9",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@unhead/vue": "^1.9.4",
"@vue/compiler-sfc": "^3.4.21",
"@vue/compiler-sfc": "^3.4.27",
"@vueuse/head": "^1.3.1",
"babel-eslint": "^10.1.0",
"babel-jest": "^28.1.3",
Expand Down Expand Up @@ -82,7 +82,7 @@
"upath": "^2.0.1",
"vite-plugin-inspect": "^0.8.3",
"vite-plugin-warmup": "^0.1.0",
"vue": "^3.4.21",
"vue": "^3.4.27",
"vue-analytics": "^5.16.1",
"vue-router": "^4.3.0",
"vue-tsc": "^1.8.27",
Expand Down
6 changes: 3 additions & 3 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
"version": "3.6.3",
"version": "3.6.9",
"private": true,
"description": "",
"scripts": {
Expand All @@ -16,8 +16,8 @@
"prettier": "^3.2.5",
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.21",
"vuetify": "^3.6.3"
"vue": "^3.4.27",
"vuetify": "^3.6.9"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
27 changes: 27 additions & 0 deletions packages/api-generator/src/locale/en/Stepper.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"props": {
"altLabels": "Places the labels beneath the step.",
"editable": "Marks step as editable.",
"hideActions": "Hide actions bar (prev and next buttons).",
"itemTitle": "Property on supplied `items` that contains its title.",
"itemValue": "Property on supplied `items` that contains its value.",
"mobile": "Forces the stepper into a mobile state, removing labels from stepper items.",
"nextText": "The text used for the Next button.",
"prevText": "The text used for the Prev button.",
"nonLinear": "Allow user to jump to any step."
},
"slots": {
"[`header-item.${string}`]": "Slot for customizing header items when using the [items](/api/v-stepper/#props-items) prop.",
"[`item.${string}`]": "Slot for customizing the content for each step.",
"actions": "Slot for customizing [v-stepper-actions](/api/v-stepper-actions/).",
"header": "Slot for customizing the header.",
"header-item": "Slot for customizing all header items.",
"icon": "Slot for customizing all stepper item icons.",
"next": "Slot for customizing the next step functionailty",
"prev": "Slot for customizing the prev step functionality"
},
"exposed": {
"next": "Move to the next step.",
"prev": "Move to the prev step."
}
}
12 changes: 12 additions & 0 deletions packages/api-generator/src/locale/en/StepperItem.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"props": {
"complete": "Marks step as complete.",
"completeIcon": "Icon to display when step is marked as completed.",
"editable": "Marks step as editable.",
"editIcon": "Icon to display when step is editable.",
"errorIcon": "Icon to display when step has an error.",
"error": "Puts the stepper item in a manual error state.",
"rules": "Accepts a mixed array of types `function`, `boolean` and `string`. Functions pass an input value as an argument and must return either `true` / `false` or a `string` containing an error message. The input field will enter an error state if a function returns (or any value in the array contains) `false` or is a `string`.",
"step": "Content to display inside step circle."
}
}
10 changes: 6 additions & 4 deletions packages/api-generator/src/locale/en/VDataTable.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
"fixedHeader": "Fixed header to top of table.",
"groupBy": "Changes which item property should be used for grouping items. Currently only supports a single grouping in the format: `group` or `['group']`. When using an array, only the first element is considered. Can be used with `.sync` modifier.",
"groupDesc": "Changes which direction grouping is done. Can be used with `.sync` modifier.",
"headerProps": "Pass props to the default header. See [`v-data-table-header` API](/api/v-data-table-header) for more information.",
"headerProps": "Pass props to the default header. See [`v-data-table-headers` API](/api/v-data-table-headers) for more information.",
"headers": "An array of objects that each describe a header column. See the example below for a definition of all properties.",
"headersLength": "Can be used in combination with `hide-default-header` to specify the number of columns in the table to allow expansion rows and loading bar to function properly.",
"height": "Set an explicit height of table.",
"hideDefaultHeader": "Hide the default headers.",
"hideDefaultBody": "Hides the default body.",
"hideDefaultHeader": "Hides the default header.",
"hideDefaultFooter": "Hides the default footer. This has no effect on `v-data-table-virtual`.",
"hover": "Adds a hover effects to a table rows.",
"itemClass": "Property on supplied `items` that contains item's row class or function that takes an item as an argument and returns the class of corresponding row.",
"itemsPerPage": "Changes how many items per page should be visible. Can be used with `.sync` modifier. Setting this prop to `-1` will display all items on the page.",
Expand Down Expand Up @@ -52,9 +54,9 @@
"group.summary": "Slot to customize the default rendering of group summaries.",
"heading": "Slot to add a custom header.",
"header.<name>": "Slot to customize a specific header column.",
"header.data-table-select": "Slot to replace the default `v-simple-checkbox` in header.",
"header.data-table-select": "Slot to replace the default `v-checkbox-btn` in header.",
"item": "Slot to replace the default rendering of a row.",
"item.data-table-select": "Slot to replace the default `v-simple-checkbox` used when selecting rows.",
"item.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
"item.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
"item.<name>": "Slot to customize a specific column.",
"loading": "Defines content for when `loading` is true and no items are provided.",
Expand Down
1 change: 0 additions & 1 deletion packages/api-generator/src/locale/en/VDataTableHeader.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"props": {
"disableSort": "Toggles rendering of sort button.",
"everyItem": "Indicates if all items in table are selected.",
"headers": "Array of header items to display.",
"mobile": "Renders mobile view of headers.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"disableSort": "Toggles rendering of sort button.",
"sortAscIcon": "Icon used for ascending sort button.",
"sortDescIcon": "Icon used for descending sort button.",
"sticky": "Sticks the header to the top of the table."
Expand Down
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VDataTableServer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
"bottom": "Slot to add content below the table.",
"colgroup": "Slot to replace the default rendering of the `<colgroup>` element.",
"column.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
"column.data-table-select": "Slot to replace the default `v-simple-checkbox` used when selecting rows.",
"column.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
"dataTableGroup": "Slot for custom rendering of a group.",
"data-table-select": "Slot for custom rendering of a header cell with the select checkbox.",
"disableSort": "Disables sorting completely.",
"expanded-row": "Slot for custom rendering of an expanded row.",
"footer.prepend": "Adds content to the empty space in the footer.",
"group-header": "Slot for custom rendering of a group header.",
Expand Down
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VDataTableVirtual.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
"bottom": "Slot to add content below the table.",
"colgroup": "Slot to replace the default rendering of the `<colgroup>` element.",
"column.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
"column.data-table-select": "Slot to replace the default `v-simple-checkbox` used when selecting rows.",
"column.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
"data-table-group": "Slot for custom rendering of a group.",
"data-table-select": "Slot for custom rendering of a header cell with the select checkbox.",
"disableSort": "Disables sorting completely.",
"expanded-row": "Slot for custom rendering of an expanded row.",
"group-header": "Slot for custom rendering of a group header.",
"headers": "Slot to replace the default rendering of the `<thead>` element.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"props": {
"collapseIcon": "Icon used when the expansion panel is in a collapsable state.",
"expandIcon": "Icon used when the expansion panel is in a expandable state.",
"hideActions": "Hide the expand icon in the content title."
"hideActions": "Hide the expand icon in the content title.",
"static": "Remove title size expansion when selected."
}
}
22 changes: 1 addition & 21 deletions packages/api-generator/src/locale/en/VStepper.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
{
"props": {
"altLabels": "Places the labels beneath the step.",
"editable": "Marks step as editable.",
"flat": "Removes the stepper's elevation.",
"hideActions": "Hide actions bar (prev and next buttons).",
"itemTitle": "Property on supplied `items` that contains its title.",
"itemValue": "Property on supplied `items` that contains its value.",
"mobile": "Forces the stepper into a mobile state, removing labels from stepper items.",
"nextText": "The text used for the Next button.",
"prevText": "The text used for the Prev button.",
"nonLinear": "Allow user to jump to any step.",
"vertical": "Display steps vertically."
},
"slots": {
"[`header-item.${string}`]": "Slot for customizing header items when using the [items](/api/v-stepper/#props-items) prop.",
"[`item.${string}`]": "Slot for customizing the content for each step.",
"actions": "Slot for customizing [v-stepper-actions](/api/v-stepper-actions/).",
"header": "Slot for customizing the header.",
"header-item": "Slot for customizing all header items.",
"icon": "Slot for customizing all stepper item icons.",
"next": "Slot for customizing the next step functionailty",
"prev": "Slot for customizing the prev step functionality"
"flat": "Removes the stepper's elevation."
},
"exposed": {
"next": "Move to the next step.",
Expand Down
9 changes: 0 additions & 9 deletions packages/api-generator/src/locale/en/VStepperItem.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
{
"props": {
"complete": "Marks step as complete.",
"completeIcon": "Icon to display when step is marked as completed.",
"editable": "Marks step as editable.",
"editIcon": "Icon to display when step is editable.",
"errorIcon": "Icon to display when step has an error.",
"error": "Puts the stepper item in a manual error state.",
"rules": "Accepts a mixed array of types `function`, `boolean` and `string`. Functions pass an input value as an argument and must return either `true` / `false` or a `string` containing an error message. The input field will enter an error state if a function returns (or any value in the array contains) `false` or is a `string`.",
"step": "Content to display inside step circle."
},
"events": {
"click": "Emitted when component is clicked."
},
"slots": {
"icon": "Slot for customizing all stepper item icons."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"props": {
"finish": "Changes the Next button to use the finish text.",
"finishText": "The text used for the finish button. Shown when using the **finish** prop."
},
"events": {
"click:finish": "Emitted when the clicking the finish button."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"events": {
"click:finish": "Event emitted when clicking the finish button",
"click:next": "Event emitted when clicking the next button",
"click:previous": "Event emitted when clicking the previous button"
}
}
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VTabs.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"height": "Sets the height of the tabs bar.",
"hideSlider": "Hide's the generated `v-tabs-slider`.",
"iconsAndText": "Will stack icon and text vertically.",
"items": "The items to display in the component. This can be an array of strings or objects with a property `title`.",
"items": "The items to display in the component. This can be an array of strings or objects with a property `text`.",
"light": "Applies the light theme variant to the component.",
"mobileBreakpoint": "Sets the designated mobile breakpoint for the component.",
"optional": "Does not require an active item. Useful when using `v-tab` as a `router-link`.",
Expand Down
4 changes: 2 additions & 2 deletions packages/api-generator/src/locale/en/display.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"props": {
"mobile": "Explicitly designate as a mobile display configuration.",
"mobileBreakpoint": "Overrides the display configuration default."
"mobile": "Determines the display mode of the component. If true, the component will be displayed in mobile mode. If false, the component will be displayed in desktop mode. If null, will be based on the current mobile-breakpoint",
"mobileBreakpoint": "Overrides the display configuration default screen size that the component should be considered in mobile."
}
}
4 changes: 4 additions & 0 deletions packages/api-generator/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ function count (arr: string[], needle: string) {
// Types that are displayed as links
const allowedRefs = [
'Anchor',
'ActiveStrategy',
'DataIteratorItem',
'DataTableHeader',
'DataTableItem',
Expand All @@ -319,12 +320,15 @@ const allowedRefs = [
'ListItem',
'LocationStrategyFn',
'OpenSelectStrategyFn',
'OpenStrategy',
'OpenStrategyFn',
'ScrollStrategyFn',
'SelectItemKey',
'SelectStrategy',
'SelectStrategyFn',
'SortItem',
'SubmitEventPromise',
'TemplateRef',
'TouchHandlers',
'ValidationRule',
]
Expand Down
2 changes: 2 additions & 0 deletions packages/docs/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ declare module 'vue' {
IntroductionComparison: typeof import('./src/components/introduction/Comparison.vue')['default']
IntroductionDirectSupport: typeof import('./src/components/introduction/DirectSupport.vue')['default']
IntroductionDiscordDeck: typeof import('./src/components/introduction/DiscordDeck.vue')['default']
'IntroductionDiscordDeck.1': typeof import('./src/components/introduction/DiscordDeck.1.vue')['default']
IntroductionEnterpriseDeck: typeof import('./src/components/introduction/EnterpriseDeck.vue')['default']
IntroductionEnterpriseForm: typeof import('./src/components/introduction/EnterpriseForm.vue')['default']
IntroductionSlaDeck: typeof import('./src/components/introduction/SlaDeck.vue')['default']
PageFeatures: typeof import('./src/components/PageFeatures.vue')['default']
PromotedBase: typeof import('./src/components/promoted/Base.vue')['default']
PromotedCarbon: typeof import('./src/components/promoted/Carbon.vue')['default']
Expand Down
14 changes: 7 additions & 7 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <john@vuetifyjs.com>",
"version": "3.6.3",
"version": "3.6.9",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand All @@ -24,7 +24,7 @@
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vuetify/one": "^1.8.1",
"algoliasearch": "^4.23.2",
"algoliasearch": "^4.23.3",
"fflate": "^0.8.2",
"isomorphic-fetch": "^3.0.0",
"lodash-es": "^4.17.21",
Expand All @@ -33,12 +33,12 @@
"prismjs": "^1.29.0",
"roboto-fontface": "^0.10.0",
"vee-validate": "^4.12.6",
"vue": "^3.4.21",
"vue": "^3.4.27",
"vue-gtag-next": "^1.14.0",
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.15.0",
"vue-instantsearch": "^4.16.1",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.6.3"
"vuetify": "^3.6.9"
},
"devDependencies": {
"@emailjs/browser": "^4.3.3",
Expand All @@ -49,8 +49,8 @@
"@types/prismjs": "^1.26.3",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.21",
"@vuetify/api-generator": "^3.6.3",
"@vue/compiler-sfc": "^3.4.27",
"@vuetify/api-generator": "^3.6.9",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/api/ApiTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
name="row"
v-bind="{
props: {
class: 'bg-surface-bright'
style: 'background: rgba(0,0,0,.1)'
},
item,
}"
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/app/bar/EnterpriseLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:to="rpath('/introduction/enterprise-support/')"
class="ms-1"
color="primary"
text="enterprise"
text="support"
variant="outlined"
@click="gtagClick('app-bar', 'enterprise', name)"
/>
Expand Down
Loading

0 comments on commit 82a15dc

Please sign in to comment.