Skip to content

Commit

Permalink
Merge pull request #629 from shoutem/release/4.6.0
Browse files Browse the repository at this point in the history
Release/4.6.0
  • Loading branch information
sstimac authored Aug 17, 2021
2 parents 67e84d1 + 254ef99 commit 40e71d2
Show file tree
Hide file tree
Showing 5 changed files with 156 additions and 293 deletions.
4 changes: 4 additions & 0 deletions components/ActionSheet/ActionSheet.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,11 @@ class ActionSheet extends PureComponent {
Animated.parallel([
Animated.spring(yPos, {
toValue,
useNativeDriver: true
}),
Animated.timing(opacity, {
toValue,
useNativeDriver: false
}),
]).start();
}
Expand All @@ -99,11 +101,13 @@ class ActionSheet extends PureComponent {
Animated.parallel([
Animated.spring(yPos, {
toValue,
useNativeDriver: true
}),
Animated.timing(opacity, {
toValue,
delay: 100,
duration: 150,
useNativeDriver: false
}),
]).start(this.hideComponent);
}
Expand Down
5 changes: 3 additions & 2 deletions components/ShareButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,14 @@ class ShareButton extends PureComponent {
}

render() {
const { animationName } = this.props;
const { animationName, iconProps, ...otherProps } = this.props;

return (
<Button onPress={this.onShare}>
<Button onPress={this.onShare} {...otherProps}>
<Icon
name={Platform.OS === 'ios' ? 'share' : 'share-android'}
animationName={animationName}
{...iconProps}
/>
</Button>
);
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shoutem/ui",
"version": "4.5.1",
"version": "4.6.0",
"description": "Styleable set of components for React Native applications",
"scripts": {
"lint": "eslint .",
Expand Down Expand Up @@ -30,7 +30,7 @@
"react-native-photo-view": "shoutem/react-native-photo-view#0ffa1481f6b6cb8663cb291b7db1d6644440584d",
"react-native-render-html": "~4.2.0",
"react-native-status-bar-height": "2.5.0",
"react-native-svg": "^9.13.0",
"react-native-svg": "^12.1.1",
"react-native-svg-transformer": "^0.14.3",
"react-native-transformable-image": "shoutem/react-native-transformable-image#v0.0.20",
"react-native-vector-icons": "~6.6.0",
Expand Down
Loading

0 comments on commit 40e71d2

Please sign in to comment.