Skip to content

Commit 05addfc

Browse files
authored
Update Flow to 0.266 (#34271)
- replace `$ElementType` and `$PropertyType` with `T[K]` accesses. - Use component types
1 parent d260b0d commit 05addfc

File tree

25 files changed

+76
-86
lines changed

25 files changed

+76
-86
lines changed

.eslintrc.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -547,12 +547,10 @@ module.exports = {
547547
},
548548

549549
globals: {
550-
$ElementType: 'readonly',
551550
$Flow$ModuleRef: 'readonly',
552551
$FlowFixMe: 'readonly',
553552
$Keys: 'readonly',
554553
$NonMaybeType: 'readonly',
555-
$PropertyType: 'readonly',
556554
$ReadOnly: 'readonly',
557555
$ReadOnlyArray: 'readonly',
558556
$ArrayBufferView: 'readonly',
@@ -586,9 +584,7 @@ module.exports = {
586584
NavigateEvent: 'readonly',
587585
PropagationPhases: 'readonly',
588586
PropertyDescriptor: 'readonly',
589-
React$AbstractComponent: 'readonly',
590587
React$Component: 'readonly',
591-
React$ComponentType: 'readonly',
592588
React$Config: 'readonly',
593589
React$Context: 'readonly',
594590
React$Element: 'readonly',

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"eslint-plugin-react-internal": "link:./scripts/eslint-rules",
7575
"fbjs-scripts": "^3.0.1",
7676
"filesize": "^6.0.1",
77-
"flow-bin": "^0.265",
78-
"flow-remove-types": "^2.265",
77+
"flow-bin": "^0.266",
78+
"flow-remove-types": "^2.266",
7979
"flow-typed": "^4.1.1",
8080
"glob": "^7.1.6",
8181
"glob-stream": "^6.1.0",

packages/react-devtools-inline/src/frontend.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function initialize(
5252
bridge?: FrontendBridge,
5353
store?: Store,
5454
} = {},
55-
): React.ComponentType<Props> {
55+
): component(...props: Props) {
5656
if (bridge == null) {
5757
bridge = createBridge(contentWindow);
5858
}

packages/react-devtools-shared/src/bridge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ class Bridge<
314314

315315
send<EventName: $Keys<OutgoingEvents>>(
316316
event: EventName,
317-
...payload: $ElementType<OutgoingEvents, EventName>
317+
...payload: OutgoingEvents[EventName]
318318
) {
319319
if (this._isShutdown) {
320320
console.warn(

packages/react-devtools-shared/src/devtools/views/Components/Components.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,4 @@ function setResizeCSSVariable(
235235
}
236236
}
237237

238-
export default (portaledContent(Components): React$ComponentType<{}>);
238+
export default (portaledContent(Components): component());

packages/react-devtools-shared/src/devtools/views/Components/InspectedElementHooksTree.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,6 @@ function HookView({
386386
}
387387
}
388388

389-
export default (React.memo(
390-
InspectedElementHooksTree,
391-
): React.ComponentType<HookViewProps>);
389+
export default (React.memo(InspectedElementHooksTree): component(
390+
...props: HookViewProps
391+
));

packages/react-devtools-shared/src/devtools/views/Editor/EditorPane.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ function EditorPane({selectedSource}: Props) {
115115
</div>
116116
);
117117
}
118-
export default (portaledContent(EditorPane): React$ComponentType<{}>);
118+
export default (portaledContent(EditorPane): component());

packages/react-devtools-shared/src/devtools/views/Profiler/CommitFlamegraphListItem.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ function CommitFlamegraphListItem({data, index, style}: Props): React.Node {
132132
);
133133
}
134134

135-
export default (memo(
136-
CommitFlamegraphListItem,
137-
areEqual,
138-
): React.ComponentType<Props>);
135+
export default (memo(CommitFlamegraphListItem, areEqual): component(
136+
...props: Props
137+
));

packages/react-devtools-shared/src/devtools/views/Profiler/CommitRankedListItem.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ function CommitRankedListItem({data, index, style}: Props) {
7979
);
8080
}
8181

82-
export default (memo(
83-
CommitRankedListItem,
84-
areEqual,
85-
): React.ComponentType<Props>);
82+
export default (memo(CommitRankedListItem, areEqual): component(
83+
...props: Props
84+
));

packages/react-devtools-shared/src/devtools/views/Profiler/HookChangeSummary.js

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,38 @@ type HookProps = {
3838
hookNames: Map<string, string> | null,
3939
};
4040

41-
const Hook: React.AbstractComponent<HookProps> = memo(({hook, hookNames}) => {
42-
const hookSource = hook.hookSource;
43-
const hookName = useMemo(() => {
44-
if (!hookSource || !hookNames) return null;
45-
const key = getHookSourceLocationKey(hookSource);
46-
return hookNames.get(key) || null;
47-
}, [hookSource, hookNames]);
48-
49-
return (
50-
<ul className={styles.Hook}>
51-
<li>
52-
{hook.id !== null && (
53-
<span className={styles.PrimitiveHookNumber}>
54-
{String(hook.id + 1)}
41+
const Hook: component(...props: HookProps) = memo(
42+
({hook, hookNames}: HookProps) => {
43+
const hookSource = hook.hookSource;
44+
const hookName = useMemo(() => {
45+
if (!hookSource || !hookNames) return null;
46+
const key = getHookSourceLocationKey(hookSource);
47+
return hookNames.get(key) || null;
48+
}, [hookSource, hookNames]);
49+
50+
return (
51+
<ul className={styles.Hook}>
52+
<li>
53+
{hook.id !== null && (
54+
<span className={styles.PrimitiveHookNumber}>
55+
{String(hook.id + 1)}
56+
</span>
57+
)}
58+
<span
59+
className={
60+
hook.id !== null ? styles.PrimitiveHookName : styles.Name
61+
}>
62+
{hook.name}
63+
{hookName && <span className={styles.HookName}>({hookName})</span>}
5564
</span>
56-
)}
57-
<span
58-
className={hook.id !== null ? styles.PrimitiveHookName : styles.Name}>
59-
{hook.name}
60-
{hookName && <span className={styles.HookName}>({hookName})</span>}
61-
</span>
62-
{hook.subHooks?.map((subHook, index) => (
63-
<Hook key={hook.id} hook={subHook} hookNames={hookNames} />
64-
))}
65-
</li>
66-
</ul>
67-
);
68-
});
65+
{hook.subHooks?.map((subHook, index) => (
66+
<Hook key={hook.id} hook={subHook} hookNames={hookNames} />
67+
))}
68+
</li>
69+
</ul>
70+
);
71+
},
72+
);
6973

7074
const shouldKeepHook = (
7175
hook: HooksNode,
@@ -105,12 +109,12 @@ const filterHooks = (
105109

106110
type Props = {|
107111
fiberID: number,
108-
hooks: $PropertyType<ChangeDescription, 'hooks'>,
109-
state: $PropertyType<ChangeDescription, 'state'>,
112+
hooks: ChangeDescription['hooks'],
113+
state: ChangeDescription['state'],
110114
displayMode?: 'detailed' | 'compact',
111115
|};
112116

113-
const HookChangeSummary: React.AbstractComponent<Props> = memo(
117+
const HookChangeSummary: component(...props: Props) = memo(
114118
({hooks, fiberID, state, displayMode = 'detailed'}: Props) => {
115119
const {parseHookNames, toggleParseHookNames, inspectedElement} = useContext(
116120
InspectedElementContext,

0 commit comments

Comments
 (0)