Skip to content

Commit

Permalink
Merge branch 'master' into fix-19441
Browse files Browse the repository at this point in the history
  • Loading branch information
yuwu9145 committed May 17, 2024
2 parents 1cda184 + 665c616 commit a94a4ad
Show file tree
Hide file tree
Showing 55 changed files with 1,473 additions and 590 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.4",
"version": "3.6.6",
"useWorkspaces": true
}
4 changes: 2 additions & 2 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.4",
"version": "3.6.6",
"private": true,
"description": "",
"scripts": {
Expand All @@ -17,7 +17,7 @@
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.27",
"vuetify": "^3.6.4"
"vuetify": "^3.6.6"
},
"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."
}
}
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"
}
}
6 changes: 3 additions & 3 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.4",
"version": "3.6.6",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand Down Expand Up @@ -38,7 +38,7 @@
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.16.1",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.6.4"
"vuetify": "^3.6.6"
},
"devDependencies": {
"@emailjs/browser": "^4.3.3",
Expand All @@ -50,7 +50,7 @@
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.27",
"@vuetify/api-generator": "^3.6.4",
"@vuetify/api-generator": "^3.6.6",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/docs/src/data/nav.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@
"title": "snackbar-queue",
"subfolder": "components"
},
{
"title": "vertical-steppers",
"subfolder": "components"
},
{
"title": "time-pickers",
"subfolder": "components"
Expand Down
112 changes: 0 additions & 112 deletions packages/docs/src/examples/v-sparkline/misc-dashboard-cards.vue

This file was deleted.

84 changes: 84 additions & 0 deletions packages/docs/src/examples/v-stepper-vertical/slot-actions.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<template>
<v-stepper-vertical>
<template v-slot:default="{ step }">
<v-stepper-vertical-item
:complete="step > 1"
subtitle="Personal details"
title="Step one"
value="1"
>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi, ratione debitis quis est labore voluptatibus! Eaque cupiditate minima, at placeat totam, magni doloremque veniam neque porro libero rerum unde voluptatem!

<template v-slot:next="{ next }">
<v-btn color="primary" @click="next"></v-btn>
</template>

<template v-slot:prev></template>
</v-stepper-vertical-item>

<v-stepper-vertical-item
:complete="step > 2"
subtitle="Contact Details"
title="Step two"
value="2"
>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi, ratione debitis quis est labore voluptatibus! Eaque cupiditate minima, at placeat totam, magni doloremque veniam neque porro libero rerum unde voluptatem!

<template v-slot:next="{ next }">
<v-btn color="primary" @click="next"></v-btn>
</template>

<template v-slot:prev="{ prev }">
<v-btn variant="plain" @click="prev"></v-btn>
</template>
</v-stepper-vertical-item>

<v-stepper-vertical-item
subtitle="Confirmation"
title="Step three"
value="3"
@click:next="onClickFinish"
>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi, ratione debitis quis est labore voluptatibus! Eaque cupiditate minima, at placeat totam, magni doloremque veniam neque porro libero rerum unde voluptatem!

<template v-slot:next="{ next }">
<v-btn color="primary" text="Finish" @click="next"></v-btn>
</template>

<template v-slot:prev="{ prev }">
<v-btn v-if="!finished" variant="plain" @click="prev"></v-btn>

<v-btn v-else text="Reset" variant="plain" @click="finished = false"></v-btn>
</template>
</v-stepper-vertical-item>
</template>
</v-stepper-vertical>
</template>

<script setup>
import { shallowRef } from 'vue'
const finished = shallowRef(false)
function onClickFinish () {
finished.value = true
alert('Finished')
}
</script>

<script>
export default {
data: () => ({
finished: false,
}),
methods: {
onClickFinish () {
this.finished = true
alert('Finished')
},
},
}
</script>

0 comments on commit a94a4ad

Please sign in to comment.