File tree Expand file tree Collapse file tree 3 files changed +8
-6
lines changed Expand file tree Collapse file tree 3 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -149,8 +149,8 @@ ctx.ReactOnRails = {
149149 * More details can be found here:
150150 * https://github.com/shakacode/react_on_rails/blob/master/docs/additional-reading/turbolinks.md
151151 */
152- reactOnRailsPageLoaded ( ) : void {
153- ClientStartup . reactOnRailsPageLoaded ( ) ;
152+ reactOnRailsPageLoaded ( ) {
153+ return ClientStartup . reactOnRailsPageLoaded ( ) ;
154154 } ,
155155
156156 reactOnRailsComponentLoaded ( domId : string ) : void {
Original file line number Diff line number Diff line change @@ -9,10 +9,12 @@ import {
99import { onPageLoaded , onPageUnloaded } from './pageLifecycle' ;
1010import { debugTurbolinks } from './turbolinksUtils' ;
1111
12- export function reactOnRailsPageLoaded ( ) : void {
12+ export async function reactOnRailsPageLoaded ( ) {
1313 debugTurbolinks ( 'reactOnRailsPageLoaded' ) ;
14- hydrateAllStores ( ) ;
15- renderOrHydrateAllComponents ( ) ;
14+ await Promise . all ( [
15+ hydrateAllStores ( ) ,
16+ renderOrHydrateAllComponents ( ) ,
17+ ] ) ;
1618}
1719
1820function reactOnRailsPageUnloaded ( ) : void {
Original file line number Diff line number Diff line change @@ -173,7 +173,7 @@ export interface ReactOnRails {
173173 getOrWaitForStoreGenerator ( name : string ) : Promise < StoreGenerator > ;
174174 setOptions ( newOptions : { traceTurbolinks : boolean } ) : void ;
175175 reactHydrateOrRender ( domNode : Element , reactElement : ReactElement , hydrate : boolean ) : RenderReturnType ;
176- reactOnRailsPageLoaded ( ) : void ;
176+ reactOnRailsPageLoaded ( ) : Promise < void > ;
177177 reactOnRailsComponentLoaded ( domId : string ) : void ;
178178 reactOnRailsStoreLoaded ( storeName : string ) : void ;
179179 authenticityToken ( ) : string | null ;
You can’t perform that action at this time.
0 commit comments