Skip to content

[createReactClass] remove createReactClass from RNTester/js/ImageExample.js #21602

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

Closed
nissy-dev wants to merge 3 commits into from
Closed

[createReactClass] remove createReactClass from RNTester/js/ImageExample.js #21602

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b09e3f7
remove createReactClass
nissy-dev Oct 9, 2018
adfd5d9
fix flow
nissy-dev Oct 10, 2018
5705cbb
some fix
nissy-dev Oct 10, 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
219 changes: 141 additions & 78 deletions RNTester/js/ImageExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,47 +10,67 @@

'use strict';

var React = require('react');
var createReactClass = require('create-react-class');
var ReactNative = require('react-native');
var {
const React = require('react');
const ReactNative = require('react-native');
const {
ActivityIndicator,
Image,
Platform,
StyleSheet,
Text,
View,
ImageBackground,
} = ReactNative;

var base64Icon =
const base64Icon =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg==';

var ImageCapInsetsExample = require('./ImageCapInsetsExample');
const ImageCapInsetsExample = require('./ImageCapInsetsExample');
const IMAGE_PREFETCH_URL =
'http://origami.design/public/images/bird-logo.png?r=1&t=' + Date.now();
var prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL);
const prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL);

/* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an error
* found when Flow v0.63 was deployed. To see the error delete this comment and
* run Flow. */
var NetworkImageCallbackExample = createReactClass({
displayName: 'NetworkImageCallbackExample',
getInitialState: function() {
return {
events: [],
startLoadPrefetched: false,
mountTime: new Date(),
};

type NetworkImageCallbackExampleState = {
events: string[],
Copy link
Contributor

@RSNara RSNara Oct 9, 2018

Choose a reason for hiding this comment

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

nit: For consistency, we should use: Array<string>.

Copy link
Contributor Author

@nissy-dev nissy-dev Oct 10, 2018

Choose a reason for hiding this comment

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

👍

startLoadPrefetched: boolean,
mountTime: Date,
};

type NetworkImageCallbackExampleProps = $ReadOnly<{|
source: {
uri: string,
},
prefetchedSource: {
uri: string,
},
Copy link
Contributor

@RSNara RSNara Oct 9, 2018

Choose a reason for hiding this comment

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

Flow's $ReadOnly (like Object.freeze) only goes 1 layer deep. We should probably change this to:

type NetworkImageCallbackExampleProps = $ReadOnly<{|
  source: $ReadOnly<{|
    uri: string,
  |}>,
  prefetchedSource: $ReadOnly<{|
    uri: string,
  |}>,
|}>;

Copy link
Contributor Author

@nissy-dev nissy-dev Oct 10, 2018

Choose a reason for hiding this comment

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

Thank you!!
I didn't understand Flow's $ReadOnly (like Object.freeze) only goes 1 layer deep

|}>;

class NetworkImageCallbackExample extends React.Component<
NetworkImageCallbackExampleProps,
NetworkImageCallbackExampleState,
> {
static displayName: ?string = 'NetworkImageCallbackExample';
Copy link
Contributor

@RSNara RSNara Oct 9, 2018

Choose a reason for hiding this comment

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

Again, no need for this.

Copy link
Contributor Author

@nissy-dev nissy-dev Oct 10, 2018

Choose a reason for hiding this comment

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

👍


state = {
events: [],
startLoadPrefetched: false,
mountTime: new Date(),
};

UNSAFE_componentWillMount() {
this.setState({mountTime: new Date()});
},
}

render: function() {
var {mountTime} = this.state;
_loadEventFired = (event: string) => {
const {events} = this.state;
this.setState({events: [...events, event]});
};

render() {
const {mountTime} = this.state;
return (
<View>
<Image
Expand Down Expand Up @@ -133,24 +153,32 @@ var NetworkImageCallbackExample = createReactClass({
<Text style={{marginTop: 20}}>{this.state.events.join('\n')}</Text>
</View>
);
},
}
}

_loadEventFired(event) {
this.setState(state => {
return (state.events = [...state.events, event]);
});
type NetworkImageExampleProps = $ReadOnly<{|
source: {
uri: string,
},
});
|}>;

type NetworkImageExampleState = {
error: boolean,
loading: boolean,
progress: number,
};

var NetworkImageExample = createReactClass({
getInitialState: function() {
return {
error: false,
loading: false,
progress: 0,
};
},
render: function() {
class NetworkImageExample extends React.Component<
NetworkImageExampleProps,
NetworkImageExampleState,
> {
state = {
error: false,
loading: false,
progress: 0,
};

render() {
var loader = this.state.loading ? (
<View style={styles.progress}>
<Text>{this.state.progress}%</Text>
Expand Down Expand Up @@ -178,22 +206,38 @@ var NetworkImageExample = createReactClass({
{loader}
</ImageBackground>
);
},
});
}
}

var ImageSizeExample = createReactClass({
getInitialState: function() {
return {
width: 0,
height: 0,
};
},
componentDidMount: function() {
Image.getSize(this.props.source.uri, (width, height) => {
this.setState({width, height});
});
type ImageSizeExampleState = {
width: number,
height: number,
};

type ImageSizeExampleProps = $ReadOnly<{|
source: {
Copy link
Contributor

@RSNara RSNara Oct 9, 2018

Choose a reason for hiding this comment

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

type ImageSizeExampleProps = $ReadOnly<{|
  source: $ReadOnly<{|
    uri: string,
  |}>
|}>

Copy link
Contributor Author

@nissy-dev nissy-dev Oct 10, 2018

Choose a reason for hiding this comment

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

👍

uri: string,
},
render: function() {
|}>;

class ImageSizeExample extends React.Component<
ImageSizeExampleProps,
ImageSizeExampleState,
> {
state = {
width: 0,
height: 0,
};

componentDidMount() {
if (this.props.source.uri != null) {
Image.getSize(this.props.source.uri, (width, height) => {
this.setState({width, height});
});
}
}

render() {
return (
<View style={{flexDirection: 'row'}}>
<Image
Expand All @@ -211,17 +255,54 @@ var ImageSizeExample = createReactClass({
</Text>
</View>
);
},
});
}
}

type MultipleSourcesExampleState = {
width: number,
height: number,
};

class MultipleSourcesExample extends React.Component<
{},
Copy link
Contributor

@RSNara RSNara Oct 9, 2018

Choose a reason for hiding this comment

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

nit: Can we move this out to MultipleSourcesExampleProps?

Copy link
Contributor Author

@nissy-dev nissy-dev Oct 10, 2018

Choose a reason for hiding this comment

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

👍

MultipleSourcesExampleState,
> {
state = {
width: 30,
height: 30,
};

increaseImageSize = () => {
if (this.state.width >= 100) {
return;
}
this.setState({
width: this.state.width + 10,
height: this.state.height + 10,
});
};

var MultipleSourcesExample = createReactClass({
getInitialState: function() {
return {
width: 30,
height: 30,
};
},
render: function() {
increaseImageSize = () => {
if (this.state.width >= 100) {
return;
}
this.setState({
width: this.state.width + 10,
height: this.state.height + 10,
});
};

decreaseImageSize = () => {
if (this.state.width <= 10) {
return;
}
this.setState({
width: this.state.width - 10,
height: this.state.height - 10,
});
};

render() {
return (
<View>
<View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
Expand Down Expand Up @@ -260,26 +341,8 @@ var MultipleSourcesExample = createReactClass({
</View>
</View>
);
},
increaseImageSize: function() {
if (this.state.width >= 100) {
return;
}
this.setState({
width: this.state.width + 10,
height: this.state.height + 10,
});
},
decreaseImageSize: function() {
if (this.state.width <= 10) {
return;
}
this.setState({
width: this.state.width - 10,
height: this.state.height - 10,
});
},
});
}
}

exports.displayName = (undefined: ?string);
exports.framework = 'React';
Expand Down