Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Vue3: Update vue-router #8215

Merged
merged 18 commits into from
Jan 17, 2023
+656 −541
Merged

[full-ci] Vue3: Update vue-router #8215

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ae854d4
Vue 3: Fix OcTooltip for Vue 3 components
dschmidt Jan 14, 2023
4972605
Bump vue-router
dschmidt Jan 14, 2023
21964da
Adjust driveAliasAndItem to make it a string and optional.
dschmidt Jan 14, 2023
e99554c
Fix Router type
dschmidt Jan 14, 2023
c123c18
Fix currentRoute usage
dschmidt Jan 14, 2023
0b3930d
Add comment
dschmidt Jan 14, 2023
624fa58
WIP: Adapt patchRouter for new vue-router
dschmidt Jan 14, 2023
b4eea87
Fix TopBar
dschmidt Jan 14, 2023
93ebacc
Fix types and tests
dschmidt Jan 14, 2023
f83bef0
Fix duplicated question mark in urls
dschmidt Jan 14, 2023
96fe57d
Fix navName computed/selectors
dschmidt Jan 14, 2023
93ed05c
Simplify navItem activity detection
dschmidt Jan 14, 2023
8ad2b61
Make RouterLink and RouterView global components known to TypeScript
dschmidt Jan 14, 2023
7f952b8
Get rid of router global instance
dschmidt Jan 14, 2023
813a5d2
Fix routing for driveAliasAndItem containing #
dschmidt Jan 15, 2023
cb6329f
Fix deprecated redirect to fix acceptance tests
dschmidt Jan 15, 2023
0b2a7ce
Fix redirect to accessDenied page on authError
dschmidt Jan 15, 2023
817fd9b
Remove unused variable
dschmidt Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/design-system/src/directives/OcTooltip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ export const destroy = (_tippy) => {
}
}

const initOrUpdate = (el, { value = {} }: any, { elm }) => {
const initOrUpdate = (el, { value = {} }: any) => {
if (Object.prototype.toString.call(value) !== '[object Object]') {
value = { content: value }
}

if (value.content !== 0 && !value.content) {
destroy(elm.tooltip)
elm.tooltip = null
if ((value.content !== 0 && !value.content) || value.content === '') {
kulmann marked this conversation as resolved.
Show resolved Hide resolved
destroy(el.tooltip)
el.tooltip = null
return
}

Expand All @@ -69,20 +69,20 @@ const initOrUpdate = (el, { value = {} }: any, { elm }) => {
value
])

if (!elm.tooltip) {
elm.tooltip = tippy(el, {
if (!el.tooltip) {
el.tooltip = tippy(el, {
...props,
plugins: [hideOnEsc, ariaHidden]
})
return
}

elm.tooltip.setProps(props)
el.tooltip.setProps(props)
}

export default {
name: 'OcTooltip',
beforeMount: initOrUpdate,
updated: initOrUpdate,
unmounted: (el, binding, { elm }) => destroy(elm.tooltip)
unmounted: (el, binding) => destroy(el.tooltip)
}