Skip to content

Improve typing of renderApplication #56636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rubennorte wants to merge 1 commit into from
Closed

Improve typing of renderApplication #56636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions packages/react-native/Libraries/ReactNative/AppRegistryImpl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@ export function registerComponent(
): string {
runnables[appKey] = (appParameters, displayMode) => {
const renderApplication = require('./renderApplication').default;
renderApplication(
componentProviderInstrumentationHook(
renderApplication({
RootComponent: componentProviderInstrumentationHook(
componentProvider,
DeprecatedPerformanceLoggerStub,
),
appParameters.initialProps,
appParameters.rootTag,
wrapperComponentProvider && wrapperComponentProvider(appParameters),
rootViewStyleProvider && rootViewStyleProvider(appParameters),
true, // fabric - deprecated, always true
undefined, // formerly scopedPerformanceLogger; reserved positional slot
appKey === 'LogBox', // is logbox
appKey,
initialProps: appParameters.initialProps,
rootTag: appParameters.rootTag,
WrapperComponent:
wrapperComponentProvider && wrapperComponentProvider(appParameters),
rootViewStyle:
rootViewStyleProvider && rootViewStyleProvider(appParameters),
isLogBox: appKey === 'LogBox',
debugName: appKey,
displayMode,
);
});
};
if (section) {
sections[appKey] = runnables[appKey];
Expand Down
6 changes: 4 additions & 2 deletions packages/react-native/Libraries/ReactNative/RendererImplementation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* @format
*/

import type {RootTag} from './RootTag';

import {
onCaughtError,
onRecoverableError,
Expand All @@ -21,11 +23,11 @@ export function renderElement({
rootTag,
}: {
element: React.MixedElement,
rootTag: number,
rootTag: RootTag,
}): void {
ReactFabric.render(
element,
rootTag,
Number(rootTag),
/* callback */ null,
/* useConcurrentRoot */ true,
{
Expand Down
46 changes: 24 additions & 22 deletions packages/react-native/Libraries/ReactNative/renderApplication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,49 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow
* @flow strict-local
* @format
*/

import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
import type {RootTag} from './RootTag';

import AppContainer from './AppContainer';
import DisplayMode, {type DisplayModeType} from './DisplayMode';
import getCachedComponentWithDebugName from './getCachedComponentWithDebugName';
import * as Renderer from './RendererProxy';
import {createRootTag} from './RootTag';
import invariant from 'invariant';
import * as React from 'react';

// require BackHandler so it sets the default handler that exits the app if no listeners respond
import '../Utilities/BackHandler';

type ActivityType = component(
...{
mode: 'visible' | 'hidden',
children: React.Node,
}
);
type ActivityType = component(mode: 'visible' | 'hidden', children: React.Node);

export default function renderApplication<Props extends Object>(
RootComponent: React.ComponentType<Props>,
export type RenderApplicationOptions<Props extends {...}> = {
RootComponent: component(...Props),
initialProps: Props,
rootTag: any,
WrapperComponent?: ?React.ComponentType<any>,
rootTag: number | RootTag,
WrapperComponent?: ?component(initialProps: Props, children: React.Node),
rootViewStyle?: ?ViewStyleProp,
// Keep this parameter for backwards compatibility only. It is always treated as
// true internally.
fabric?: true | void,
// Reserved positional slot (formerly `scopedPerformanceLogger`). Preserved so
// existing callers that supply this argument continue to type-check; the
// value is ignored.
_unused?: void,
isLogBox?: boolean,
debugName?: string,
displayMode?: ?DisplayModeType,
useOffscreen?: boolean,
) {
};

export default function renderApplication<Props extends {...}>({
RootComponent,
initialProps,
rootTag,
WrapperComponent,
rootViewStyle,
isLogBox,
debugName,
displayMode,
useOffscreen,
}: RenderApplicationOptions<Props>) {
invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);

let renderable: React.MixedElement = (
Expand All @@ -58,7 +60,7 @@ export default function renderApplication<Props extends Object>(
</AppContainer>
);

if (__DEV__ && debugName) {
if (__DEV__ && debugName != null) {
const RootComponentWithMeaningfulName = getCachedComponentWithDebugName(
`${debugName}(RootComponent)`,
);
Expand All @@ -69,7 +71,7 @@ export default function renderApplication<Props extends Object>(
);
}

if (useOffscreen && displayMode != null) {
if (useOffscreen === true && displayMode != null) {
// $FlowFixMe[incompatible-type]
// $FlowFixMe[missing-export]
// $FlowFixMe[prop-missing] `unstable_Activity` is not yet in the React types.
Expand All @@ -85,6 +87,6 @@ export default function renderApplication<Props extends Object>(

Renderer.renderElement({
element: renderable,
rootTag,
rootTag: createRootTag(rootTag),
});
}
Loading