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.

Sign up for GitHub

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

Verify that the component passed to createAnimatedComponent is not functional #15019

Closed
wants to merge 9 commits into from
Closed

Verify that the component passed to createAnimatedComponent is not functional #15019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e25b54d
Verify that the component passed to createAnimatedComponent is not
janicduplessis Sep 9, 2017
affbd87
Use isReactComponent in invariant
janicduplessis Oct 12, 2017
a0189fc
Merge branch 'master' into create-animated-comp-error
janicduplessis Nov 5, 2017
0957389
Update createAnimatedComponent.js
janicduplessis Nov 5, 2017
95b4d32
Merge branch 'master' into create-animated-comp-error
janicduplessis Jan 12, 2018
a597faa
Merge remote-tracking branch 'upstream/master' into create-animated-c…
janicduplessis Feb 13, 2018
8bdf2a5
Try fix tests
janicduplessis Feb 13, 2018
d89319f
Try fix test p2
janicduplessis Feb 13, 2018
fcd1cdc
Allow string components
janicduplessis Feb 13, 2018
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
9 changes: 6 additions & 3 deletions Libraries/Animated/src/__tests__/AnimatedNative-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@
*/
'use strict';

const ClassComponentMock = class {};
ClassComponentMock.prototype.isReactComponent = true;

jest
.clearAllMocks()
.setMock('Text', {})
.setMock('View', {})
.setMock('Image', {})
.setMock('Text', ClassComponentMock)
.setMock('View', ClassComponentMock)
.setMock('Image', ClassComponentMock)
.setMock('React', {Component: class {}})
.setMock('NativeModules', {
NativeAnimatedModule: {},
Expand Down
9 changes: 9 additions & 0 deletions Libraries/Animated/src/createAnimatedComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,16 @@ const AnimatedProps = require('./nodes/AnimatedProps');
const React = require('React');
const ViewStylePropTypes = require('ViewStylePropTypes');

const invariant = require('fbjs/lib/invariant');

function createAnimatedComponent(Component: any): any {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For Flow checking within the RN codebase, you could add something like this:

createAnimatedComponent<P>(
  Component: Class<React.Component<P>>
): Class<React.Component<*>> {
  ...
}

I believe this will filter out functions too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember trying to type this properly but I hit some issue. React components typing changed in flow 0.53 I can try again to see if I can figure out something that works.

invariant(
typeof Component === 'string' ||
(Component.prototype && Component.prototype.isReactComponent),
'`createAnimatedComponent` does not support stateless functional components; ' +
'use a class component instead.',
);

class AnimatedComponent extends React.Component<Object> {
_component: any;
_invokeAnimatedPropsCallbackOnMount: boolean = false;
Expand Down