@@ -2,12 +2,14 @@ import _ from "lodash";
22import {
33Comp ,
44CompAction ,
5+ CompActionTypes ,
56CompParams ,
67ConstructorToComp ,
78ConstructorToNodeType ,
89customAction ,
910deferAction ,
1011isChildAction ,
12+ isCustomAction ,
1113isMyCustomAction ,
1214MultiBaseComp ,
1315MultiCompConstructor ,
@@ -23,6 +25,7 @@ import { JSONValue } from "util/jsonTypes";
2325import { setFieldsNoTypeCheck } from "util/objectUtils" ;
2426import { map } from "./map" ;
2527import { paramsEqual , withParamsWithDefault } from "./withParams" ;
28+ import { LazyCompReadyAction } from "../comps/lazyLoadComp/lazyLoadComp" ;
2629
2730export const COMP_KEY = "__comp__" ;
2831export const MAP_KEY = "__map__" ;
@@ -160,8 +163,11 @@ export function withMultiContext<TCtor extends MultiCompConstructor>(VariantComp
160163} else if (
161164isChildAction ( action ) &&
162165action . path [ 0 ] === MAP_KEY &&
163- ! _ . isNil ( action . path [ 1 ] ) &&
164- ! thisCompMap . hasOwnProperty ( action . path [ 1 ] )
166+ ! _ . isNil ( action . path [ 1 ] )
167+ && (
168+ ! thisCompMap . hasOwnProperty ( action . path [ 1 ] )
169+ || isCustomAction < LazyCompReadyAction > ( action , "LazyCompReady" )
170+ )
165171) {
166172/**
167173 * a virtual path is activated, should generate a new comp in __map__
@@ -171,17 +177,16 @@ export function withMultiContext<TCtor extends MultiCompConstructor>(VariantComp
171177const params = comp . cacheParamsMap . get ( key ) ;
172178if ( params ) {
173179const childComp = comp
174- . getOriginalComp ( )
180+ . getComp ( key ) !
175181. setParams ( params )
176182. changeDispatch ( wrapDispatch ( wrapDispatch ( comp . dispatch , MAP_KEY ) , key ) ) ;
177183const newChildComp = childComp . reduce ( childAction ) ;
178- if ( childComp !== newChildComp ) {
179- const comps = { [ key ] :newChildComp } ;
180- comp = comp . setChild (
181- MAP_KEY ,
182- comp . children [ MAP_KEY ] . reduce ( MapCtor . batchSetCompAction ( comps ) )
183- ) ;
184- }
184+
185+ const comps = { [ key ] :newChildComp } ;
186+ comp = comp . setChild (
187+ MAP_KEY ,
188+ comp . children [ MAP_KEY ] . reduce ( MapCtor . batchSetCompAction ( comps ) )
189+ ) ;
185190}
186191} else {
187192comp = super . reduce ( action ) ;