Skip to content

Commit c705aa6

Browse files
committed
Reorder reactHydrateOrRender parameters for consistency
1 parent 4472f2f commit c705aa6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

node_package/src/ReactOnRails.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ ctx.ReactOnRails = {
188188
const componentObj = ComponentRegistry.get(name);
189189
const reactElement = createReactOutput({ componentObj, props, domNodeId });
190190

191-
return reactHydrateOrRender(hydrate, document.getElementById(domNodeId) as Element, reactElement as ReactElement);
191+
return reactHydrateOrRender(document.getElementById(domNodeId) as Element, reactElement as ReactElement, hydrate);
192192
},
193193

194194
/**

node_package/src/clientStartup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function render(el: Element, railsContext: RailsContext): void {
168168
You returned a server side type of react-router error: ${JSON.stringify(reactElementOrRouterResult)}
169169
You should return a React.Component always for the client side entry point.`);
170170
} else {
171-
reactHydrateOrRender(shouldHydrate, domNode, reactElementOrRouterResult as ReactElement);
171+
reactHydrateOrRender(domNode, reactElementOrRouterResult as ReactElement, shouldHydrate);
172172
}
173173
}
174174
} catch (e: any) {

node_package/src/reactHydrateOrRender.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ export function reactRender(domNode: Element, reactElement: ReactElement): Rende
3737
return ReactDOM.render(reactElement, domNode);
3838
}
3939

40-
export default function reactHydrateOrRender(shouldHydrate: boolean, domNode: Element, reactElement: ReactElement): RenderReturnType {
41-
return shouldHydrate ? reactHydrate(domNode, reactElement) : reactRender(domNode, reactElement);
40+
export default function reactHydrateOrRender(domNode: Element, reactElement: React.ReactElement, hydrate: boolean): RenderReturnType {
41+
return hydrate ? reactHydrate(domNode, reactElement) : reactRender(domNode, reactElement);
4242
}

0 commit comments

Comments
 (0)