Skip to content

Commit d49dc85

Browse files
huntiefacebook-github-bot
authored andcommitted
Remove deprecated Instance type aliases (Flow)
Summary: Remove the deprecated `PublicScrollViewInstance` and `PublicModalInstance` type aliases, replacing all remaining usages with the canonical `ScrollViewInstance` and `ModalInstance` types. NOTE: Existing equivalent types are **left alone** in the manual `.d.ts` sources (current TS API), as this is covered by the existing breaking migration notes for ref types under the Strict API. **Changes** - Delete `PublicScrollViewInstance` alias (ScrollView.js) - Delete `PublicModalInstance` alias (Modal.js) - Update `IntersectionObserverExplicitRootScroll.js` rn-tester example Changelog: [General][Removed] - **Strict TypeScript API**: Remove deprecated `PublicScrollViewInstance` and `PublicModalInstance` types. Use `ScrollViewInstance` and `ModalInstance` instead. Reviewed By: cipolleschi Differential Revision: D107268481
1 parent b99ddaf commit d49dc85

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

packages/react-native/Libraries/Components/ScrollView/ScrollView.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ export interface ScrollViewInstance
171171
extends HostInstance,
172172
ScrollViewImperativeMethods {}
173173

174-
/** @deprecated Use ScrollViewInstance instead */
175-
export type PublicScrollViewInstance = ScrollViewInstance;
176-
177174
type InnerViewInstance = React.ElementRef<typeof View>;
178175

179176
export type ScrollViewPropsIOS = Readonly<{

packages/react-native/Libraries/Modal/Modal.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ type ModalEventDefinitions = {
3838

3939
export type ModalInstance = HostInstance;
4040

41-
/** @deprecated Use ModalInstance instead */
42-
export type PublicModalInstance = ModalInstance;
43-
4441
const ModalEventEmitter =
4542
Platform.OS === 'ios' && NativeModalManager != null
4643
? new NativeEventEmitter<ModalEventDefinitions>(

packages/rn-tester/js/examples/IntersectionObserver/IntersectionObserverExplicitRootScroll.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
* @flow strict-local
99
*/
1010

11-
import type {HostInstance} from 'react-native';
12-
import type {PublicScrollViewInstance} from 'react-native/Libraries/Components/ScrollView/ScrollView';
11+
import type {HostInstance, ScrollViewInstance} from 'react-native';
1312
import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
1413
import type IntersectionObserverType from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserver';
1514

@@ -42,8 +41,8 @@ component IntersectionObserverExplicitRootScrollExample() {
4241
const [observationRoot, setObservationRoot] = useState<?HostInstance>(null);
4342

4443
const [showMargin, setShowMargin] = useState(true);
45-
const roofRef: React.RefSetter<PublicScrollViewInstance> = useCallback(
46-
(rootNode: ?PublicScrollViewInstance) => {
44+
const roofRef: React.RefSetter<ScrollViewInstance> = useCallback(
45+
(rootNode: ?ScrollViewInstance) => {
4746
if (rootNode != null) {
4847
setObservationRoot(rootNode);
4948
}

0 commit comments

Comments
 (0)