Skip to content

Commit

Permalink
Merge pull request #5672 from nextcloud-libraries/fix/NcRichText-inje…
Browse files Browse the repository at this point in the history
…ct-router

[next] fix(NcRichText): crash on router links rendering
  • Loading branch information
juliushaertl authored Jun 6, 2024
2 parents 8f59b27 + 4f25ba4 commit 87fca26
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
14 changes: 5 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,11 @@
"unified": "^11.0.4",
"unist-builder": "^4.0.0",
"unist-util-visit": "^5.0.0",
"vue": "^3.4.27",
"vue-datepicker-next": "^1.0.3",
"vue-router": "^4.3.2",
"vue-select": "^4.0.0-beta.6"
},
"peerDependencies": {
"vue": "^3.4.27"
},
"engines": {
"node": "^20.0.0",
"npm": "^10.0.0"
Expand Down Expand Up @@ -147,7 +146,6 @@
"vitest": "^1.6.0",
"vue-eslint-parser": "^9.4.2",
"vue-material-design-icons": "^5.3.0",
"vue-router": "^4.3.2",
"vue-styleguidist": "^4.72.4",
"webpack": "^5.91.0",
"webpack-merge": "^5.10.0"
Expand Down
6 changes: 3 additions & 3 deletions src/components/NcRichText/NcRichText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ export default {
'onUpdate:modelValue': () => {
this.$emit('interact:todo', id)
},
}, labelParts)
}, { default: () => labelParts })
return h(type, props, [inputComponent, nestedNode])
}
Expand All @@ -546,7 +546,7 @@ export default {
return h(RouterLink, {
...props,
to: route,
}, children)
}, { default: () => children })
}
}
return h(type, props, children)
Expand All @@ -568,7 +568,7 @@ export default {
...placeholder.props,
class: 'rich-text--component',
},
children,
{ default: () => children },
)
},
},
Expand Down

0 comments on commit 87fca26

Please sign in to comment.