Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 16:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(client): combine & prefer leave* transitions of from route

Browse Source 
#566
This commit is contained in:
Pooya Parsa 2017-06-12 04:58:03 +04:30
parent 6ca11461ce
commit 5c36ed7b73
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/app/client.js
View File

@ -14,12 +14,23 @@ let router
<%= (store ? 'let store' : '') %>
function mapTransitions(Components, to, from) {
const resolve = t => (typeof t.options.transition === 'function')
? t.options.transition(to, from)
: Object.assign({}, t.options.transition)
const resolveRoute = r => resolve(r.matched[0].components.default)
return Components.map((Component) => {
let transition = Component.options.transition
if (typeof transition === 'function') {
return transition(to, from)
let transitions = Object.assign({}, to ? resolveRoute(to) : resolve(Component))
// Combine transitions
// Prefer leave* transitions of from route
let from_transitions = from ? resolveRoute(from) : {}
Object.keys(from_transitions).forEach(key=> {
if(from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
transitions[key] = from_transitions[key]
}
return transition
})
return transitions
})
}