Skip to content

Commit 5c4f5d1

Browse files
authored
Merge branch 'vuejs:main' into main
2 parents ae8b7e8 + 2d1235b commit 5c4f5d1

File tree

5 files changed

+29
-3
lines changed

5 files changed

+29
-3
lines changed

src/api/application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ An object for defining merging strategies for custom component options.
627627
628628
## app.config.idPrefix <sup class="vt-badge" data-text="3.5+" /> {#app-config-idprefix}
629629
630-
Configure a prefix for all IDs generated via [useId()](/api/general#useid) inside this application.
630+
Configure a prefix for all IDs generated via [useId()](/api/composition-api-helpers.html#useid) inside this application.
631631
632632
- **Type:** `string`
633633

src/api/sfc-css-features.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,26 @@ useCssModule()
153153
useCssModule('classes')
154154
```
155155

156+
- **Example**
157+
158+
```vue
159+
<script setup lang="ts">
160+
import { useCssModule } from 'vue'
161+
162+
const classes = useCssModule()
163+
</script>
164+
165+
<template>
166+
<p :class="classes.red">red</p>
167+
</template>
168+
169+
<style module>
170+
.red {
171+
color: red;
172+
}
173+
</style>
174+
```
175+
156176
## `v-bind()` in CSS {#v-bind-in-css}
157177

158178
SFC `<style>` tags support linking CSS values to dynamic component state using the `v-bind` CSS function:

src/guide/built-ins/transition-group.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ Now it looks much better - even animating smoothly when the whole list is shuffl
8080

8181
[Full Example](/examples/#list-transition)
8282

83+
### Custom TransitionGroup classes
84+
85+
You can also specify custom transition classes for the moving element by passing the `moveClass` prop to `<TransitionGroup>`, just like [custom transition classes on `<Transition>`](https://vuejs.org/guide/built-ins/transition.html#custom-transition-classes).
86+
8387
## Staggering List Transitions {#staggering-list-transitions}
8488

8589
By communicating with JavaScript transitions through data attributes, it's also possible to stagger transitions in a list. First, we render the index of an item as a data attribute on the DOM element:

src/guide/essentials/computed.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Now when you run `fullName.value = 'John Doe'`, the setter will be invoked and `
259259

260260
</div>
261261

262-
## Getting the previous value {#previous}
262+
## Getting the Previous Value {#previous}
263263

264264
- Only supported in 3.4+
265265

src/tutorial/tutorial.data.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ export declare const data: Record<string, ExampleData>
77
export default {
88
watch: './src/**',
99
async load() {
10-
const md = await createMarkdownRenderer(process.cwd(), undefined, '/')
10+
const md = await createMarkdownRenderer(process.cwd(), {
11+
theme: 'github-dark',
12+
}, '/')
1113
const files = readExamples(path.resolve(__dirname, './src'))
1214
for (const step in files) {
1315
const stepFiles = files[step]

0 commit comments

Comments
 (0)