File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed
integrations/react/src/future/loader Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change 99 getContentComponent ,
1010 isStructuredActivityComponent ,
1111} from "../../__internal__/StructuredActivityComponentType" ;
12+ import { isPromiseLike } from "../../__internal__/utils/isPromiseLike" ;
1213import {
1314 inspect ,
1415 PromiseStatus ,
@@ -67,7 +68,9 @@ export function loaderPlugin<
6768 ...event ,
6869 activityContext : {
6970 ...event . activityContext ,
70- loaderData : resolve ( initialContext . initialLoaderData ) ,
71+ loaderData : isPromiseLike ( initialContext . initialLoaderData )
72+ ? resolve ( initialContext . initialLoaderData )
73+ : initialContext . initialLoaderData ,
7174 } ,
7275 } ;
7376 }
@@ -84,7 +87,11 @@ export function loaderPlugin<
8487 return event ;
8588 }
8689
87- const loaderData = resolve ( loadData ( activityName , activityParams ) ) ;
90+ const loaderDataRaw = loadData ( activityName , activityParams ) ;
91+
92+ const loaderData = isPromiseLike ( loaderDataRaw )
93+ ? resolve ( loaderDataRaw )
94+ : loaderDataRaw ;
8895
8996 Promise . allSettled ( [ loaderData ] ) . then ( ( [ loaderDataPromiseResult ] ) => {
9097 printLoaderDataPromiseError ( {
You can’t perform that action at this time.
0 commit comments