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
4 changes: 0 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -547,12 +547,10 @@ module.exports = {
},

globals: {
$ElementType: 'readonly',
$Flow$ModuleRef: 'readonly',
$FlowFixMe: 'readonly',
$Keys: 'readonly',
$NonMaybeType: 'readonly',
$PropertyType: 'readonly',
$ReadOnly: 'readonly',
$ReadOnlyArray: 'readonly',
$ArrayBufferView: 'readonly',
Expand Down Expand Up @@ -586,9 +584,7 @@ module.exports = {
NavigateEvent: 'readonly',
PropagationPhases: 'readonly',
PropertyDescriptor: 'readonly',
React$AbstractComponent: 'readonly',
React$Component: 'readonly',
React$ComponentType: 'readonly',
React$Config: 'readonly',
React$Context: 'readonly',
React$Element: 'readonly',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"eslint-plugin-react-internal": "link:./scripts/eslint-rules",
"fbjs-scripts": "^3.0.1",
"filesize": "^6.0.1",
"flow-bin": "^0.265",
"flow-remove-types": "^2.265",
"flow-bin": "^0.266",
"flow-remove-types": "^2.266",
"flow-typed": "^4.1.1",
"glob": "^7.1.6",
"glob-stream": "^6.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools-inline/src/frontend.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function initialize(
bridge?: FrontendBridge,
store?: Store,
} = {},
): React.ComponentType<Props> {
): component(...props: Props) {
if (bridge == null) {
bridge = createBridge(contentWindow);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools-shared/src/bridge.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class Bridge<

send<EventName: $Keys<OutgoingEvents>>(
event: EventName,
...payload: $ElementType<OutgoingEvents, EventName>
...payload: OutgoingEvents[EventName]
) {
if (this._isShutdown) {
console.warn(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,4 @@ function setResizeCSSVariable(
}
}

export default (portaledContent(Components): React$ComponentType<{}>);
export default (portaledContent(Components): component());
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,6 @@ function HookView({
}
}

export default (React.memo(
InspectedElementHooksTree,
): React.ComponentType<HookViewProps>);
export default (React.memo(InspectedElementHooksTree): component(
...props: HookViewProps
));
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ function EditorPane({selectedSource}: Props) {
</div>
);
}
export default (portaledContent(EditorPane): React$ComponentType<{}>);
export default (portaledContent(EditorPane): component());
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ function CommitFlamegraphListItem({data, index, style}: Props): React.Node {
);
}

export default (memo(
CommitFlamegraphListItem,
areEqual,
): React.ComponentType<Props>);
export default (memo(CommitFlamegraphListItem, areEqual): component(
...props: Props
));
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ function CommitRankedListItem({data, index, style}: Props) {
);
}

export default (memo(
CommitRankedListItem,
areEqual,
): React.ComponentType<Props>);
export default (memo(CommitRankedListItem, areEqual): component(
...props: Props
));
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,38 @@ type HookProps = {
hookNames: Map<string, string> | null,
};

const Hook: React.AbstractComponent<HookProps> = memo(({hook, hookNames}) => {
const hookSource = hook.hookSource;
const hookName = useMemo(() => {
if (!hookSource || !hookNames) return null;
const key = getHookSourceLocationKey(hookSource);
return hookNames.get(key) || null;
}, [hookSource, hookNames]);

return (
<ul className={styles.Hook}>
<li>
{hook.id !== null && (
<span className={styles.PrimitiveHookNumber}>
{String(hook.id + 1)}
const Hook: component(...props: HookProps) = memo(
({hook, hookNames}: HookProps) => {
const hookSource = hook.hookSource;
const hookName = useMemo(() => {
if (!hookSource || !hookNames) return null;
const key = getHookSourceLocationKey(hookSource);
return hookNames.get(key) || null;
}, [hookSource, hookNames]);

return (
<ul className={styles.Hook}>
<li>
{hook.id !== null && (
<span className={styles.PrimitiveHookNumber}>
{String(hook.id + 1)}
</span>
)}
<span
className={
hook.id !== null ? styles.PrimitiveHookName : styles.Name
}>
{hook.name}
{hookName && <span className={styles.HookName}>({hookName})</span>}
</span>
)}
<span
className={hook.id !== null ? styles.PrimitiveHookName : styles.Name}>
{hook.name}
{hookName && <span className={styles.HookName}>({hookName})</span>}
</span>
{hook.subHooks?.map((subHook, index) => (
<Hook key={hook.id} hook={subHook} hookNames={hookNames} />
))}
</li>
</ul>
);
});
{hook.subHooks?.map((subHook, index) => (
<Hook key={hook.id} hook={subHook} hookNames={hookNames} />
))}
</li>
</ul>
);
},
);

const shouldKeepHook = (
hook: HooksNode,
Expand Down Expand Up @@ -105,12 +109,12 @@ const filterHooks = (

type Props = {|
fiberID: number,
hooks: $PropertyType<ChangeDescription, 'hooks'>,
state: $PropertyType<ChangeDescription, 'state'>,
hooks: ChangeDescription['hooks'],
state: ChangeDescription['state'],
displayMode?: 'detailed' | 'compact',
|};

const HookChangeSummary: React.AbstractComponent<Props> = memo(
const HookChangeSummary: component(...props: Props) = memo(
({hooks, fiberID, state, displayMode = 'detailed'}: Props) => {
const {parseHookNames, toggleParseHookNames, inspectedElement} = useContext(
InspectedElementContext,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,4 @@ const tabsWithTimeline = [
},
];

export default (portaledContent(Profiler): React.ComponentType<{}>);
export default (portaledContent(Profiler): component());
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ function SnapshotCommitListItem({data: itemData, index, style}: Props) {
);
}

export default (memo(
SnapshotCommitListItem,
areEqual,
): React.ComponentType<Props>);
export default (memo(SnapshotCommitListItem, areEqual): component(
...props: Props
));
Original file line number Diff line number Diff line change
Expand Up @@ -437,4 +437,4 @@ function setResizeCSSVariable(
}
}

export default (portaledContent(SuspenseTab): React$ComponentType<{}>);
export default (portaledContent(SuspenseTab): component());
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import ThemeProvider from './ThemeProvider';
export type Props = {portalContainer?: Element, ...};

export default function portaledContent(
Component: React$ComponentType<any>,
): React$ComponentType<any> {
Component: component(...props: any),
): component(...props: any) {
return function PortaledContent({portalContainer, ...rest}: Props) {
const store = useContext(StoreContext);

Expand Down
7 changes: 2 additions & 5 deletions packages/react-devtools-shared/src/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default class EventEmitter<Events: Object> {

addListener<Event: $Keys<Events>>(
event: Event,
listener: (...$ElementType<Events, Event>) => any,
listener: (...Events[Event]) => any,
): void {
const listeners = this.listenersMap.get(event);
if (listeners === undefined) {
Expand All @@ -25,10 +25,7 @@ export default class EventEmitter<Events: Object> {
}
}

emit<Event: $Keys<Events>>(
event: Event,
...args: $ElementType<Events, Event>
): void {
emit<Event: $Keys<Events>>(event: Event, ...args: Events[Event]): void {
const listeners = this.listenersMap.get(event);
if (listeners !== undefined) {
if (listeners.length === 1) {
Expand Down
6 changes: 3 additions & 3 deletions packages/react-devtools-shared/src/hydration.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export function dehydrate(
path: Array<string | number>,
isPathAllowed: (path: Array<string | number>) => boolean,
level: number = 0,
): $PropertyType<DehydratedData, 'data'> {
): DehydratedData['data'] {
const type = getDataType(data);

let isPathAllowedCheck;
Expand Down Expand Up @@ -479,7 +479,7 @@ export function dehydrate(
return createDehydrated(type, true, data, cleaned, path);
} else {
const object: {
[string]: $PropertyType<DehydratedData, 'data'>,
[string]: DehydratedData['data'],
} = {};
getAllEnumerableKeys(data).forEach(key => {
const name = key.toString();
Expand Down Expand Up @@ -616,7 +616,7 @@ function dehydrateKey(
path: Array<string | number>,
isPathAllowed: (path: Array<string | number>) => boolean,
level: number = 0,
): $PropertyType<DehydratedData, 'data'> {
): DehydratedData['data'] {
try {
return dehydrate(
parent[key],
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools-shell/src/app/ToDoList/ListItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ function ListItem({item, removeItem, toggleItem}: Props) {
);
}

export default (memo(ListItem): React.ComponentType<Props>);
export default (memo(ListItem): component(...props: Props));
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ function updateLaneToLabelMap(

let profilerVersion = null;

function getLastType(stack: $PropertyType<ProcessorState, 'measureStack'>) {
function getLastType(stack: ProcessorState['measureStack']) {
if (stack.length > 0) {
const {type} = stack[stack.length - 1];
return type;
}
return null;
}

function getDepth(stack: $PropertyType<ProcessorState, 'measureStack'>) {
function getDepth(stack: ProcessorState['measureStack']) {
if (stack.length > 0) {
const {depth, type} = stack[stack.length - 1];
return type === 'render-idle' ? depth : depth + 1;
Expand Down Expand Up @@ -180,7 +180,7 @@ function markWorkCompleted(
type: ReactMeasureType,
stopTime: Milliseconds,
currentProfilerData: TimelineData,
stack: $PropertyType<ProcessorState, 'measureStack'>,
stack: ProcessorState['measureStack'],
) {
if (stack.length === 0) {
console.error(
Expand Down Expand Up @@ -214,7 +214,7 @@ function markWorkCompleted(

function throwIfIncomplete(
type: ReactMeasureType,
stack: $PropertyType<ProcessorState, 'measureStack'>,
stack: ProcessorState['measureStack'],
) {
const lastIndex = stack.length - 1;
if (lastIndex >= 0) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools-timeline/src/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export type SchedulingEvent =
| ReactScheduleRenderEvent
| ReactScheduleStateUpdateEvent
| ReactScheduleForceUpdateEvent;
export type SchedulingEventType = $PropertyType<SchedulingEvent, 'type'>;
export type SchedulingEventType = SchedulingEvent['type'];

export type ReactMeasureType =
| 'commit'
Expand Down
2 changes: 1 addition & 1 deletion packages/react-markup/src/ReactMarkupServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import {
type ReactMarkupNodeList =
// This is the intersection of ReactNodeList and ReactClientValue minus
// Client/ServerReferences.
| React$Element<React$ComponentType<any>>
| component(...props: any)
| LazyComponent<ReactMarkupNodeList, any>
| React$Element<string>
| string
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactTestSelectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type Type = symbol | number;

type ComponentSelector = {
$$typeof: Type,
value: React$ComponentType<empty>,
value: component(),
};

type HasPseudoClassSelector = {
Expand Down Expand Up @@ -79,7 +79,7 @@ type Selector =
| TestNameSelector;

export function createComponentSelector(
component: React$ComponentType<empty>,
component: component(),
): ComponentSelector {
return {
$$typeof: COMPONENT_TYPE,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server/src/ReactFlightServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ type ReactJSONValue =
// Serializable values
export type ReactClientValue =
// Server Elements and Lazy Components are unwrapped on the Server
| React$Element<React$ComponentType<any>>
| React$Element<component(...props: any)>
| LazyComponent<ReactClientValue, any>
// References are passed by their value
| ClientReference<any>
Expand Down
2 changes: 0 additions & 2 deletions packages/react/index.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
*/

// Keep in sync with https://github.com/facebook/flow/blob/main/lib/react.js
export type ComponentType<-P> = React$ComponentType<P>;
export type AbstractComponent<-Config> = React$AbstractComponent<Config>;
export type ElementType = React$ElementType;
export type Element<+C> = React$Element<C>;
export type Key = React$Key;
Expand Down
2 changes: 0 additions & 2 deletions packages/react/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
*/

// Keep in sync with https://github.com/facebook/flow/blob/main/lib/react.js
export type ComponentType<-P> = React$ComponentType<P>;
export type AbstractComponent<-Config> = React$AbstractComponent<Config>;
export type ElementType = React$ElementType;
export type Element<+C> = React$Element<C>;
export type MixedElement = React$Element<ElementType>;
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9298,12 +9298,12 @@ flatted@^3.2.9:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==

flow-bin@^0.265:
version "0.265.3"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.265.3.tgz#cbaad2115f4622e34920981dc79949824c27f421"
integrity sha512-08PjO2kjuQxy8MxYJNCzmgRpAe1uqTf7kQ+U32QTavRzTD/7IJASYKFEEvCkVNHlhSy8CTJsN+AQdHsXVqChIw==
flow-bin@^0.266:
version "0.266.1"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.266.1.tgz#8939be6fbd681c4ef8dc4873b22f4b79be76cb0a"
integrity sha512-c1lg1E8SDcuPSkrOeH0JTcNKMZOzXvqX2DuuXJ0amZec15uyuIi8QlGTO3OzYssMT/kwFdo5vviJqSUI/BNFbw==

flow-remove-types@^2.265:
flow-remove-types@^2.266:
version "2.279.0"
resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-2.279.0.tgz#3a3388d9158eba0f82c40d80d31d9640b883a3f5"
integrity sha512-bPFloMR/A2b/r/sIsf7Ix0LaMicCJNjwhXc4xEEQVzJCIz5u7C7XDaEOXOiqveKlCYK7DcBNn6R01Cbbc9gsYA==
Expand Down
Loading