Merge branch 'dev' into master

timbabs1 · Mar 29, 2021 · 04aabe4 · 04aabe4
2 parents 8e82e99 + b92a3dc
commit 04aabe4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Block.js b/src/Block.js
@@ -93,7 +93,7 @@ Block.propTypes = {
   card: PropTypes.bool,
   left: PropTypes.bool,
   shadow: PropTypes.bool,
-  space: PropTypes.string,
+  space: PropTypes.oneOf(['between', 'around', 'evenly' ]),
   fluid: PropTypes.bool,
   height: PropTypes.number,
   width: PropTypes.number,

diff --git a/src/Toast.js b/src/Toast.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Dimensions, StyleSheet, Animated } from 'react-native';
 import PropTypes from 'prop-types';
-// galio components
+// Galio components
 import Text from './atomic/ions/Text';
 import GalioTheme, { withGalio } from './theme';
 
@@ -28,6 +28,7 @@ class Toast extends Component {
     }),
     styles: PropTypes.any,
     theme: PropTypes.any,
+    useNativeDriver: PropTypes.bool
   };
 
   static defaultProps = {
@@ -41,6 +42,7 @@ class Toast extends Component {
     textStyle: null,
     styles: {},
     theme: GalioTheme,
+    useNativeDriver: true
   };
 
   state = {
@@ -53,7 +55,7 @@ class Toast extends Component {
   visibilityTimeout;
 
   componentDidUpdate(prevProps) {
-    const { isShow, fadeInDuration, fadeOutDuration } = this.props;
+    const { isShow, fadeInDuration, fadeOutDuration, useNativeDriver } = this.props;
     const { isShow: prevIsShow } = prevProps;
     const { fadeAnim } = this.state;
 
@@ -63,13 +65,15 @@ class Toast extends Component {
       this.animation = Animated.timing(fadeAnim, {
         toValue: 1,
         duration: fadeInDuration,
+        useNativeDriver,
       }).start();
     }
 
     if (prevIsShow && !isShow) {
       this.animation = Animated.timing(fadeAnim, {
         toValue: 0,
         duration: fadeOutDuration,
+        useNativeDriver,
       }).start();
 
       this.visibilityTimeout = setTimeout(() => {