Skip to content

Commit

Permalink
Merge pull request #749 from shoutem/release/5.3.1
Browse files Browse the repository at this point in the history
Release/5.3.1 -> master
  • Loading branch information
sstimac authored Aug 17, 2022
2 parents 0e24c72 + b5378d6 commit f262576
Show file tree
Hide file tree
Showing 10 changed files with 2,288 additions and 1,469 deletions.
1 change: 0 additions & 1 deletion components/EmptyListImage.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ class EmptyListImage extends PureComponent {
}

EmptyListImage.propTypes = {
...EmptyListImage.propTypes,
image: PropTypes.func,
imageStyle: PropTypes.object,
message: PropTypes.string,
Expand Down
4 changes: 2 additions & 2 deletions components/GridRow.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Children, PureComponent } from 'react';
import { View as RNView, ViewPropTypes } from 'react-native';
import { View as RNView } from 'react-native';
import _ from 'lodash';
import PropTypes from 'prop-types';
import { connectAnimation } from '@shoutem/animation';
Expand Down Expand Up @@ -35,7 +35,7 @@ class GridRow extends PureComponent {
}

GridRow.propTypes = {
...ViewPropTypes,
...View.propTypes,
columns: PropTypes.number.isRequired,
};

Expand Down
3 changes: 2 additions & 1 deletion components/Image.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { PureComponent } from 'react';
import { Image as RNImage, Platform } from 'react-native';
import autoBindReact from 'auto-bind/react';
import { ImagePropTypes } from 'deprecated-react-native-prop-types';
import _ from 'lodash';
import { connectAnimation } from '@shoutem/animation';
import { connectStyle } from '@shoutem/theme';
Expand Down Expand Up @@ -82,7 +83,7 @@ class Image extends PureComponent {
}

Image.propTypes = {
...RNImage.propTypes,
...ImagePropTypes,
};

const AnimatedImage = connectAnimation(Image);
Expand Down
3 changes: 2 additions & 1 deletion components/Text.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
import { Text as RNText } from 'react-native';
import { TextPropTypes } from 'deprecated-react-native-prop-types';
import { connectAnimation } from '@shoutem/animation';
import { connectStyle } from '@shoutem/theme';

Expand All @@ -10,7 +11,7 @@ class Text extends PureComponent {
}

Text.propTypes = {
...RNText.propTypes,
...TextPropTypes,
};

const AnimatedText = connectAnimation(Text);
Expand Down
3 changes: 2 additions & 1 deletion components/TextInput.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { PureComponent } from 'react';
import { TextInput as RNTextInput } from 'react-native';
import autoBindReact from 'auto-bind/react';
import { TextInputPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import { connectAnimation, Wiggle } from '@shoutem/animation';
import { connectStyle } from '@shoutem/theme';
Expand Down Expand Up @@ -91,7 +92,7 @@ class TextInput extends PureComponent {
}

TextInput.propTypes = {
...RNTextInput.propTypes,
...TextInputPropTypes,
style: PropTypes.object.isRequired,
animate: PropTypes.bool,
errorMessage: PropTypes.string,
Expand Down
3 changes: 2 additions & 1 deletion components/View.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
import { View as RNView, ViewPropTypes } from 'react-native';
import { View as RNView } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import { connectAnimation } from '@shoutem/animation';
import { connectStyle } from '@shoutem/theme';
Expand Down
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export {
resolveFontFamily,
resolveFontStyle,
resolveFontWeight,
responsiveHeight,
responsiveWidth,
} from './theme';

// Services
Expand Down
Loading

0 comments on commit f262576

Please sign in to comment.