@@ -241,33 +241,32 @@ export class UIView extends Component<UIViewProps, UIViewState> {
241
241
return ;
242
242
}
243
243
244
- let newComponent =
245
- newConfig && newConfig . viewDecl && newConfig . viewDecl . component ;
246
- let trans : Transition = undefined ,
247
- resolves = { } ;
244
+ let trans : Transition ;
245
+ let resolves = { } ;
248
246
249
247
if ( newConfig ) {
250
- let context : ViewContext =
251
- newConfig . viewDecl && newConfig . viewDecl . $context ;
252
- this . uiViewAddress = { fqn : this . uiViewAddress . fqn , context } ;
253
-
254
- let ctx = new ResolveContext ( newConfig . path ) ;
255
- trans = ctx . getResolvable ( Transition ) . data ;
256
- let stringTokens : string [ ] = trans
257
- . getResolveTokens ( )
258
- . filter ( x => typeof x === 'string' ) ;
259
- resolves = stringTokens
260
- . map ( token => [ token , trans . injector ( ) . get ( token ) ] )
261
- . reduce ( applyPairs , { } ) ;
248
+ let viewContext : ViewContext = newConfig . viewDecl && newConfig . viewDecl . $context ;
249
+ this . uiViewAddress = { fqn : this . uiViewAddress . fqn , context : viewContext } ;
250
+
251
+ let resolveContext = new ResolveContext ( newConfig . path ) ;
252
+ let injector = resolveContext . injector ( ) ;
262
253
254
+ let stringTokens : string [ ] = resolveContext . getTokens ( )
255
+ . filter ( x => typeof x === 'string' ) ;
263
256
if ( stringTokens . indexOf ( 'transition' ) !== - 1 ) {
264
257
throw TransitionPropCollisionError ;
265
258
}
259
+
260
+ trans = injector . get ( Transition ) ;
261
+ resolves = stringTokens
262
+ . map ( token => [ token , injector . get ( token ) ] )
263
+ . reduce ( applyPairs , { } ) ;
266
264
}
267
265
268
266
this . uiViewData . config = newConfig ;
269
267
let props = { ...resolves , transition : trans } ;
270
268
269
+ let newComponent = newConfig && newConfig . viewDecl && newConfig . viewDecl . component ;
271
270
this . setState ( {
272
271
component : newComponent || 'div' ,
273
272
props : newComponent ? props : { } ,
0 commit comments