Skip to content

Commit 9c57a7f

Browse files
lunaleapsfacebook-github-bot
authored andcommitted
ESM ActivityIndicator
Summary: Changelog: [General][Changed] ActivityIndicator and remove .flow Reviewed By: yungsters Differential Revision: D42203449 fbshipit-source-id: 52ab1111166d23b7304e8406f299d23f9fd6f399
1 parent 9af5c33 commit 9c57a7f

File tree

5 files changed

+17
-68
lines changed

5 files changed

+17
-68
lines changed

Libraries/Components/ActivityIndicator/ActivityIndicator.flow.js

Lines changed: 0 additions & 58 deletions
This file was deleted.

Libraries/Components/ActivityIndicator/ActivityIndicator.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111

1212
'use strict';
13+
import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
1314
import type {ViewProps} from '../View/ViewPropTypes';
14-
import type {ActivityIndicator as ActivityIndicatorType} from './ActivityIndicator.flow';
1515

1616
import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet';
1717
import Platform from '../../Utilities/Platform';
@@ -184,8 +184,10 @@ const ActivityIndicator = (
184184
```
185185
*/
186186

187-
const ActivityIndicatorWithRef: ActivityIndicatorType =
188-
React.forwardRef(ActivityIndicator);
187+
const ActivityIndicatorWithRef: React.AbstractComponent<
188+
Props,
189+
HostComponent<mixed>,
190+
> = React.forwardRef(ActivityIndicator);
189191
ActivityIndicatorWithRef.displayName = 'ActivityIndicator';
190192

191193
const styles = StyleSheet.create({
@@ -203,4 +205,4 @@ const styles = StyleSheet.create({
203205
},
204206
});
205207

206-
module.exports = ActivityIndicatorWithRef;
208+
export default ActivityIndicatorWithRef;

Libraries/Components/ActivityIndicator/__tests__/ActivityIndicator-test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
'use strict';
1313

14+
import * as React from 'react';
15+
1416
const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
15-
const ActivityIndicator = require('../ActivityIndicator');
16-
const React = require('react');
17+
const ActivityIndicator = require('../ActivityIndicator').default;
1718

1819
describe('<ActivityIndicator />', () => {
1920
it('should set displayName to prevent <Component /> regressions', () => {

index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ module.exports = {
108108
.default;
109109
},
110110
get ActivityIndicator(): ActivityIndicator {
111-
return require('./Libraries/Components/ActivityIndicator/ActivityIndicator');
111+
return require('./Libraries/Components/ActivityIndicator/ActivityIndicator')
112+
.default;
112113
},
113114
get Button(): Button {
114115
return require('./Libraries/Components/Button');

jest/setup.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,14 @@ jest
164164
const mockScrollView = jest.requireActual('./mockScrollView');
165165
return mockScrollView(baseComponent);
166166
})
167-
.mock('../Libraries/Components/ActivityIndicator/ActivityIndicator', () =>
168-
mockComponent(
167+
.mock('../Libraries/Components/ActivityIndicator/ActivityIndicator', () => ({
168+
__esModule: true,
169+
default: mockComponent(
169170
'../Libraries/Components/ActivityIndicator/ActivityIndicator',
171+
null,
172+
true,
170173
),
171-
)
174+
}))
172175
.mock('../Libraries/AppState/AppState', () => ({
173176
addEventListener: jest.fn(() => ({
174177
remove: jest.fn(),

0 commit comments

Comments
 (0)