mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Removed ProgressBarAndroid.android deprecation warning
Reviewed By: hramos Differential Revision: D6092598 fbshipit-source-id: 24282a923cf45e749cf33f8a5b7a49995e7fadfe
This commit is contained in:
committed by
Facebook Github Bot
parent
30b057fa9c
commit
b60fa63de8
@@ -10,13 +10,14 @@
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
const ActivityIndicator = require('ActivityIndicator');
|
||||
const ColorPropType = require('ColorPropType');
|
||||
const PropTypes = require('prop-types');
|
||||
const React = require('React');
|
||||
const ReactNative = require('ReactNative');
|
||||
const ViewPropTypes = require('ViewPropTypes');
|
||||
|
||||
const requireNativeComponent = require('requireNativeComponent');
|
||||
|
||||
const STYLE_ATTRIBUTES = [
|
||||
'Horizontal',
|
||||
'Normal',
|
||||
@@ -78,6 +79,10 @@ class ProgressBarAndroid extends ReactNative.NativeComponent {
|
||||
* - LargeInverse
|
||||
*/
|
||||
styleAttr: PropTypes.oneOf(STYLE_ATTRIBUTES),
|
||||
/**
|
||||
* Whether to show the ProgressBar (true, the default) or hide it (false).
|
||||
*/
|
||||
animating: PropTypes.bool,
|
||||
/**
|
||||
* If the progress bar will show indeterminate progress. Note that this
|
||||
* can only be false if styleAttr is Horizontal.
|
||||
@@ -99,21 +104,23 @@ class ProgressBarAndroid extends ReactNative.NativeComponent {
|
||||
|
||||
static defaultProps = {
|
||||
styleAttr: 'Normal',
|
||||
indeterminate: true
|
||||
indeterminate: true,
|
||||
animating: true,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
if (this.props.indeterminate && this.props.styleAttr !== 'Horizontal') {
|
||||
console.warn(
|
||||
'Circular indeterminate `ProgressBarAndroid`' +
|
||||
'is deprecated. Use `ActivityIndicator` instead.'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
return <ActivityIndicator {...this.props} animating={true} />;
|
||||
return <AndroidProgressBar {...this.props} />;
|
||||
}
|
||||
}
|
||||
|
||||
const AndroidProgressBar = requireNativeComponent(
|
||||
'AndroidProgressBar',
|
||||
ProgressBarAndroid,
|
||||
{
|
||||
nativeOnly: {
|
||||
animating: true,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
module.exports = ProgressBarAndroid;
|
||||
|
||||
Reference in New Issue
Block a user