Skip to content
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.

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

[Float] use common float types #26938

Merged
merged 1 commit into from
Jun 13, 2023
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
27 changes: 9 additions & 18 deletions packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @flow
*/

import type {HostDispatcher} from 'react-dom/src/ReactDOMDispatcher';
import type {HostDispatcher} from 'react-dom/src/shared/ReactDOMTypes';
import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
import type {DOMEventName} from '../events/DOMEventNames';
import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
Expand All @@ -19,6 +19,12 @@ import type {
import type {ReactScopeInstance} from 'shared/ReactTypes';
import type {AncestorInfoDev} from './validateDOMNesting';
import type {FormStatus} from 'react-dom-bindings/src/shared/ReactDOMFormActions';
import type {
PrefetchDNSOptions,
PreconnectOptions,
PreloadOptions,
PreinitOptions,
} from 'react-dom/src/shared/ReactDOMTypes';

import {NotPending} from 'react-dom-bindings/src/shared/ReactDOMFormActions';
import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext';
Expand Down Expand Up @@ -2095,7 +2101,7 @@ function preconnectAs(
}
}

function prefetchDNS(href: string, options?: mixed) {
function prefetchDNS(href: string, options?: ?PrefetchDNSOptions) {
if (!enableFloat) {
return;
}
Expand Down Expand Up @@ -2125,7 +2131,7 @@ function prefetchDNS(href: string, options?: mixed) {
preconnectAs('dns-prefetch', null, href);
}

function preconnect(href: string, options: ?{crossOrigin?: string}) {
function preconnect(href: string, options?: ?PreconnectOptions) {
if (!enableFloat) {
return;
}
Expand Down Expand Up @@ -2156,13 +2162,6 @@ function preconnect(href: string, options: ?{crossOrigin?: string}) {
preconnectAs('preconnect', crossOrigin, href);
}

type PreloadOptions = {
as: string,
crossOrigin?: string,
integrity?: string,
type?: string,
fetchPriority?: 'high' | 'low' | 'auto',
};
function preload(href: string, options: PreloadOptions) {
if (!enableFloat) {
return;
Expand Down Expand Up @@ -2238,14 +2237,6 @@ function preloadPropsFromPreloadOptions(
};
}

type PreinitOptions = {
as: string,
precedence?: string,
crossOrigin?: string,
integrity?: string,
nonce?: string,
fetchPriority?: 'high' | 'low' | 'auto',
};
function preinit(href: string, options: PreinitOptions) {
if (!enableFloat) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
PreconnectOptions,
PreloadOptions,
PreinitOptions,
} from 'react-dom/src/ReactDOMDispatcher';
} from 'react-dom/src/shared/ReactDOMTypes';

import {enableFloat} from 'shared/ReactFeatureFlags';

Expand Down Expand Up @@ -52,7 +52,7 @@ function prefetchDNS(href: string, options?: ?PrefetchDNSOptions) {
}
}

function preconnect(href: string, options: ?PreconnectOptions) {
function preconnect(href: string, options?: ?PreconnectOptions) {
if (enableFloat) {
if (typeof href === 'string') {
const request = resolveRequest();
Expand Down
25 changes: 8 additions & 17 deletions packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
*/

import type {ReactNodeList, ReactCustomFormAction} from 'shared/ReactTypes';
import type {
PrefetchDNSOptions,
PreconnectOptions,
PreloadOptions,
PreinitOptions,
} from 'react-dom/src/shared/ReactDOMTypes';

import {
checkHtmlStringCoercion,
Expand Down Expand Up @@ -4894,7 +4900,7 @@ function getResourceKey(as: string, href: string): string {
return `[${as}]${href}`;
}

export function prefetchDNS(href: string, options?: mixed) {
export function prefetchDNS(href: string, options?: ?PrefetchDNSOptions) {
if (!enableFloat) {
return;
}
Expand Down Expand Up @@ -4953,7 +4959,7 @@ export function prefetchDNS(href: string, options?: mixed) {
}
}

export function preconnect(href: string, options?: ?{crossOrigin?: string}) {
export function preconnect(href: string, options?: ?PreconnectOptions) {
if (!enableFloat) {
return;
}
Expand Down Expand Up @@ -5016,13 +5022,6 @@ export function preconnect(href: string, options?: ?{crossOrigin?: string}) {
}
}

type PreloadOptions = {
as: string,
crossOrigin?: string,
integrity?: string,
type?: string,
fetchPriority?: 'high' | 'low' | 'auto',
};
export function preload(href: string, options: PreloadOptions) {
if (!enableFloat) {
return;
Expand Down Expand Up @@ -5161,14 +5160,6 @@ export function preload(href: string, options: PreloadOptions) {
}
}

type PreinitOptions = {
as: string,
precedence?: string,
crossOrigin?: string,
integrity?: string,
nonce?: string,
fetchPriority?: 'high' | 'low' | 'auto',
};
function preinit(href: string, options: PreinitOptions): void {
if (!enableFloat) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {
PreconnectOptions,
PreloadOptions,
PreinitOptions,
} from 'react-dom/src/ReactDOMDispatcher';
} from 'react-dom/src/shared/ReactDOMTypes';

import ReactDOMSharedInternals from 'shared/ReactDOMSharedInternals';
const ReactDOMCurrentDispatcher = ReactDOMSharedInternals.Dispatcher;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-dom/src/ReactDOMSharedInternals.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @flow
*/

import type {HostDispatcher} from './ReactDOMDispatcher';
import type {HostDispatcher} from './shared/ReactDOMTypes';

type InternalsType = {
usingClientEntryPoint: boolean,
Expand Down
7 changes: 6 additions & 1 deletion packages/react-dom/src/client/ReactDOM.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ import {
} from 'react-dom-bindings/src/events/ReactDOMControlledComponent';
import Internals from '../ReactDOMSharedInternals';

export {prefetchDNS, preconnect, preload, preinit} from '../ReactDOMFloat';
export {
prefetchDNS,
preconnect,
preload,
preinit,
} from '../shared/ReactDOMFloat';
export {useFormStatus} from 'react-dom-bindings/src/shared/ReactDOMFormActions';

if (__DEV__) {
Expand Down
7 changes: 6 additions & 1 deletion packages/react-dom/src/server/ReactDOMServerRenderingStub.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
* @flow
*/

export {preinit, preload, preconnect, prefetchDNS} from '../ReactDOMFloat';
export {
preinit,
preload,
preconnect,
prefetchDNS,
} from '../shared/ReactDOMFloat';
export {useFormStatus as experimental_useFormStatus} from 'react-dom-bindings/src/shared/ReactDOMFormActions';

export function createPortal() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type {
PreconnectOptions,
PreloadOptions,
PreinitOptions,
} from './ReactDOMDispatcher';
} from './ReactDOMTypes';

import ReactDOMSharedInternals from 'shared/ReactDOMSharedInternals';
const Dispatcher = ReactDOMSharedInternals.Dispatcher;
Expand Down