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

Move ImageSourcePropType.js, ImageStylePropTypes.js, TextPropTypes.js #21387

Closed
wants to merge 4 commits into from
Closed

Move ImageSourcePropType.js, ImageStylePropTypes.js, TextPropTypes.js #21387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcff7cb
move prop-types
nissy-dev Sep 28, 2018
29f50f7
fix flow error
nissy-dev Sep 28, 2018
ff3bd2c
Merge branch 'master' into move-type
nissy-dev Sep 28, 2018
d9f265a
Merge branch 'master' into move-type
nissy-dev Sep 28, 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
4 changes: 2 additions & 2 deletions Libraries/Components/View/ReactNativeStyleAttributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

const ImageStylePropTypes = require('ImageStylePropTypes');
const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
const TextStylePropTypes = require('TextStylePropTypes');
const ViewStylePropTypes = require('ViewStylePropTypes');

Expand All @@ -25,7 +25,7 @@ const sizesDiffer = require('sizesDiffer');
const ReactNativeStyleAttributes = {
...keyMirror(ViewStylePropTypes),
...keyMirror(TextStylePropTypes),
...keyMirror(ImageStylePropTypes),
...keyMirror(DeprecatedImageStylePropTypes),
};

ReactNativeStyleAttributes.transform = {process: processTransform};
Expand Down
0 Libraries/Image/ImageSourcePropType.js → ...ropTypes/DeprecatedImageSourcePropType.js
View file
Open in desktop
File renamed without changes.
0 Libraries/Image/ImageStylePropTypes.js → ...ropTypes/DeprecatedImageStylePropTypes.js
View file
Open in desktop
File renamed without changes.
0 Libraries/Text/TextPropTypes.js → ...catedPropTypes/DeprecatedTextPropTypes.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Libraries/Image/Image.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

const DeprecatedViewPropTypes = require('DeprecatedViewPropTypes');
const ImageStylePropTypes = require('ImageStylePropTypes');
const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
const NativeModules = require('NativeModules');
const PropTypes = require('prop-types');
const React = require('React');
Expand All @@ -38,7 +38,7 @@ function generateRequestId() {

const ImageProps = {
...DeprecatedViewPropTypes,
style: StyleSheetPropType(ImageStylePropTypes),
style: StyleSheetPropType(DeprecatedImageStylePropTypes),
/**
* See https://facebook.github.io/react-native/docs/image.html#source
*/
Expand Down
8 changes: 4 additions & 4 deletions Libraries/Image/ImageProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
'use strict';

const DeprecatedEdgeInsetsPropType = require('DeprecatedEdgeInsetsPropType');
const ImageSourcePropType = require('ImageSourcePropType');
const ImageStylePropTypes = require('ImageStylePropTypes');
const DeprecatedImageSourcePropType = require('DeprecatedImageSourcePropType');
const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
const PropTypes = require('prop-types');
const StyleSheetPropType = require('StyleSheetPropType');

Expand Down Expand Up @@ -78,13 +78,13 @@ module.exports = {
/**
* See https://facebook.github.io/react-native/docs/image.html#style
*/
style: StyleSheetPropType(ImageStylePropTypes),
style: StyleSheetPropType(DeprecatedImageStylePropTypes),
/**
* The image source (either a remote URL or a local file resource).
*
* See https://facebook.github.io/react-native/docs/image.html#source
*/
source: ImageSourcePropType,
source: DeprecatedImageSourcePropType,
/**
* A static image to display while loading the image source.
*
Expand Down
4 changes: 2 additions & 2 deletions Libraries/StyleSheet/StyleSheetValidation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

const ImageStylePropTypes = require('ImageStylePropTypes');
const DeprecatedImageStylePropTypes = require('DeprecatedImageStylePropTypes');
const TextStylePropTypes = require('TextStylePropTypes');
const ViewStylePropTypes = require('ViewStylePropTypes');

Expand Down Expand Up @@ -85,7 +85,7 @@ const styleError = function(message1, style, caller?, message2?) {
const allStylePropTypes = {};

if (__DEV__ && !global.__RCTProfileIsProfiling) {
StyleSheetValidation.addValidStylePropTypes(ImageStylePropTypes);
StyleSheetValidation.addValidStylePropTypes(DeprecatedImageStylePropTypes);
StyleSheetValidation.addValidStylePropTypes(TextStylePropTypes);
StyleSheetValidation.addValidStylePropTypes(ViewStylePropTypes);
}
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Text/Text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
const React = require('React');
const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
const TextAncestor = require('TextAncestor');
const TextPropTypes = require('TextPropTypes');
const DeprecatedTextPropTypes = require('DeprecatedTextPropTypes');
const Touchable = require('Touchable');
const UIManager = require('UIManager');

Expand Down Expand Up @@ -279,6 +279,6 @@ const Text = (
const TextToExport = React.forwardRef(Text);

// TODO: Deprecate this.
TextToExport.propTypes = TextPropTypes;
TextToExport.propTypes = DeprecatedTextPropTypes;

module.exports = (TextToExport: Class<NativeComponent<TextProps>>);