Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/react-on-rails/src/createReactOutput.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import { createElement, isValidElement, type ReactElement } from 'react';
import type { CreateParams, ReactComponent, RenderFunction, CreateReactOutputResult } from './types/index.ts';
import { isServerRenderHash, isPromise } from './isServerRenderResult.ts';

function createReactElementFromRenderFunctionResult(
renderFunctionResult: ReactComponent,
name: string,
props: Record<string, unknown> | undefined,
): React.ReactElement {
if (React.isValidElement(renderFunctionResult)) {
): ReactElement {
if (isValidElement(renderFunctionResult)) {
// If already a ReactElement, then just return it.
console.error(
`Warning: ReactOnRails: Your registered render-function (ReactOnRails.register) for ${name}
Expand All @@ -19,7 +19,7 @@ work if you return JSX. Update by wrapping the result JSX of ${name} in a fat ar
}

// If a component, then wrap in an element
return React.createElement(renderFunctionResult, props);
return createElement(renderFunctionResult, props);
}

/**
Expand Down Expand Up @@ -88,5 +88,5 @@ export default function createReactOutput({
return createReactElementFromRenderFunctionResult(renderFunctionResult, name, props);
}
// else
return React.createElement(component as ReactComponent, props);
return createElement(component as ReactComponent, props);
}
4 changes: 2 additions & 2 deletions packages/react-on-rails/src/handleError.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from 'react';
import { createElement } from 'react';
import { renderToString } from './ReactDOMServer.cts';
import type { ErrorOptions } from './types/index.ts';
import generateRenderingErrorMessage from './generateRenderingErrorMessage.ts';

const handleError = (options: ErrorOptions): string => {
const msg = generateRenderingErrorMessage(options);
const reactElement = React.createElement('pre', null, msg);
const reactElement = createElement('pre', null, msg);
return renderToString(reactElement);
};

Expand Down
5 changes: 2 additions & 3 deletions packages/react-on-rails/src/serverRenderReactComponent.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import type { ReactElement } from 'react';
import { isValidElement, type ReactElement } from 'react';

// ComponentRegistry is accessed via globalThis.ReactOnRails.getComponent for cross-bundle compatibility
import createReactOutput from './createReactOutput.ts';
Expand Down Expand Up @@ -69,7 +68,7 @@ function processPromise(
return '{}';
}
return result.then((promiseResult) => {
if (React.isValidElement(promiseResult)) {
if (isValidElement(promiseResult)) {
return processReactElement(promiseResult);
}
return promiseResult;
Expand Down
Loading