Merge branch 'release/0.15.0'

shoutem · Jun 2, 2017 · 11272fc · 11272fc
2 parents 283211e + 2c35786
commit 11272fc
Show file tree

Hide file tree

Showing 29 changed files with 2,084 additions and 1,505 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -17,6 +17,7 @@
     "space-after-keywords": 0,
     "space-return-throw-case": 0,
     "react-native/no-unused-styles": 2,
-    "react-native/split-platform-components": 2
+    "react-native/split-platform-components": 2,
+    "react/prefer-stateless-function": 0,
   }
 }
diff --git a/components/Card.js b/components/Card.js
@@ -4,7 +4,7 @@ import { connectStyle } from '@shoutem/theme';
 import { connectAnimation } from '@shoutem/animation';
 
 const AnimatedCard = connectAnimation(View);
-const Card = connectStyle('shoutem.ui.Card', {})(AnimatedCard);
+const Card = connectStyle('shoutem.ui.Card')(AnimatedCard);
 
 export {
   Card,

diff --git a/components/DropDownMenu.js b/components/DropDownMenu.js
@@ -102,7 +102,7 @@ class DropDownMenu extends Component {
   collapse() {
     this.setState({ collapsed: true });
     this.scrollDriver = new ScrollDriver();
-    this.timingDriver.runTimer(1);
+    this.timingDriver.toValue(1);
   }
 
   selectOption(option) {
@@ -113,7 +113,7 @@ class DropDownMenu extends Component {
   }
 
   close() {
-    this.timingDriver.runTimer(0, () => this.setState({ collapsed: false }));
+    this.timingDriver.toValue(0, () => this.setState({ collapsed: false }));
   }
 
   emitOnOptionSelectedEvent(option) {
@@ -224,7 +224,7 @@ class DropDownMenu extends Component {
   }
 }
 
-const StyledDropDownMenu = connectStyle('shoutem.ui.DropDownMenu', {})(DropDownMenu);
+const StyledDropDownMenu = connectStyle('shoutem.ui.DropDownMenu')(DropDownMenu);
 
 export {
   StyledDropDownMenu as DropDownMenu,

diff --git a/components/Icon/config.json b/components/Icon/config.json
diff --git a/components/Icon/index.js b/components/Icon/index.js
@@ -10,14 +10,14 @@ const icons = {
 
 function Icon(props) {
   const DefaultIcon = icons.Default || icons.Fallback;
-  return <DefaultIcon {...props} />
+  return (<DefaultIcon {...props} />);
 }
 
-Icon.setIconFont = function (fontFamily) {
+Icon.setIconFont = fontFamily => {
   icons.Default = createIcon(fontFamily);
 };
 
 export {
   Icon,
   createIcon,
-}
+};
diff --git a/components/ImagePreview.js b/components/ImagePreview.js
@@ -103,7 +103,7 @@ class ImagePreview extends Component {
 
 ImagePreview.propTypes = propTypes;
 
-const StyledImagePreview = connectStyle('shoutem.ui.ImagePreview', {})(ImagePreview);
+const StyledImagePreview = connectStyle('shoutem.ui.ImagePreview')(ImagePreview);
 
 export {
   StyledImagePreview as ImagePreview,

diff --git a/components/NavigationBar/NavigationBar.js b/components/NavigationBar/NavigationBar.js
@@ -92,7 +92,7 @@ class NavigationBar extends Component {
 }
 
 const AnimatedNavigationBar = connectAnimation(composeChildren(NavigationBar));
-const StyledNavigationBar = connectStyle('shoutem.ui.NavigationBar', {})(AnimatedNavigationBar);
+const StyledNavigationBar = connectStyle('shoutem.ui.NavigationBar')(AnimatedNavigationBar);
 
 export {
   StyledNavigationBar as NavigationBar,

diff --git a/components/PageIndicators.js b/components/PageIndicators.js
@@ -63,7 +63,9 @@ class PageIndicators extends Component {
         indicatorStyle = 'selected';
       }
 
-      pageIndicators.push(this.renderPageIndicator(i, maxIndicatorsCount, activeIndex, indicatorStyle));
+      pageIndicators.push(
+        this.renderPageIndicator(i, maxIndicatorsCount, activeIndex, indicatorStyle)
+      );
     }
 
     return (

diff --git a/components/RichMedia.js b/components/RichMedia.js
@@ -2,12 +2,10 @@ import React from 'react';
 import { Html } from '../html';
 
 export default function RichMedia({ body }) {
-  console.warn('RichMedia is deprecated and will be removed in next verions.');
-
-  if (!body) {
-    console.log('Missing body in RichMedia component.')
-    return null;
-  }
-
+  console.warn('RichMedia is deprecated and will be removed in next versions.');
   return <Html body={body} />;
 }
+
+RichMedia.propTypes = {
+  body: React.PropTypes.string.isRequired,
+};
diff --git a/components/ShareButton.js b/components/ShareButton.js
@@ -83,7 +83,7 @@ class ShareButton extends Component {
   }
 }
 
-const StyledShareButton = connectStyle('shoutem.ui.ShareButton', {}, () => {},
+const StyledShareButton = connectStyle('shoutem.ui.ShareButton', undefined, undefined,
   { virtual: true })(ShareButton);
 
 export {

diff --git a/components/Spinner.js b/components/Spinner.js
@@ -5,19 +5,22 @@ import {
 
 import { connectStyle } from '@shoutem/theme';
 
-function Spinner({ style }) {
-  const indicatorStyle = { ...style };
-  delete indicatorStyle.size;
-  delete indicatorStyle.color;
+class Spinner extends React.Component {
+  render() {
+    const { style } = this.props;
+    const indicatorStyle = { ...style };
+    delete indicatorStyle.size;
+    delete indicatorStyle.color;
 
-  return (
-    <ActivityIndicator
-      animating
-      color={style.color}
-      size={style.size}
-      style={indicatorStyle}
-    />
-  );
+    return (
+      <ActivityIndicator
+        animating
+        color={style.color}
+        size={style.size}
+        style={indicatorStyle}
+      />
+    );
+  }
 }
 
 Spinner.propTypes = {

diff --git a/components/Switch.js b/components/Switch.js
@@ -50,7 +50,7 @@ class Switch extends Component {
   }
 
   setValue(value) {
-    this.timingDriver.runTimer(value ? 1 : 0);
+    this.timingDriver.toValue(value ? 1 : 0);
   }
 
   render() {

diff --git a/components/TextInput.js b/components/TextInput.js
@@ -12,13 +12,15 @@ class TextInput extends Component {
     };
     delete style.placeholderTextColor;
     delete style.selectionColor;
+    delete style.underlineColorAndroid;
 
     return (
       <RNTextInput
         {...props}
         style={style}
         placeholderTextColor={props.style.placeholderTextColor}
         selectionColor={props.style.selectionColor}
+        underlineColorAndroid={props.style.underlineColorAndroid}
       />
     );
   }

diff --git a/components/Touchable.js b/components/Touchable.js
@@ -16,47 +16,50 @@ import {
  * iOS, and a TouchableNativeFeedback on
  * Android.
  */
-function Touchable(props) {
-  const style = { ...props.style };
-  delete style.touchableOpacity;
-  delete style.touchableNativeFeedback;
+class Touchable extends React.Component {
+  static propTypes = {
+    ...TouchableOpacity.propTypes,
+    ...TouchableNativeFeedback.propTypes,
+    style: PropTypes.object,
+  };
+
+  render() {
+    const props = this.props;
+    const style = { ...props.style };
+    delete style.touchableOpacity;
+    delete style.touchableNativeFeedback;
+
+    if (Platform.OS === 'android') {
+      return (
+        <TouchableNativeFeedback
+          {...props}
+          style={props.style.touchableNativeFeedback}
+        >
+          <View
+            virtual
+            style={style}
+            styleName={props.styleName}
+          >
+            {props.children}
+          </View>
+        </TouchableNativeFeedback>
+      );
+    }
 
-  if (Platform.OS === 'android') {
     return (
-      <TouchableNativeFeedback
+      <TouchableOpacity
         {...props}
-        style={props.style.touchableNativeFeedback}
+        style={{
+          ...style,
+          ...props.style.touchableOpacity,
+        }}
       >
-        <View
-          virtual
-          style={style}
-          styleName={props.styleName}
-        >
-          {props.children}
-        </View>
-      </TouchableNativeFeedback>
+        {props.children}
+      </TouchableOpacity>
     );
   }
-
-  return (
-    <TouchableOpacity
-      {...props}
-      style={{
-        ...style,
-        ...props.style.touchableOpacity,
-      }}
-    >
-      {props.children}
-    </TouchableOpacity>
-  );
 }
 
-Touchable.propTypes = {
-  ...TouchableOpacity.propTypes,
-  ...TouchableNativeFeedback.propTypes,
-  style: PropTypes.object,
-};
-
 const StyledTouchable = connectStyle('shoutem.ui.Touchable', {
   touchableNativeFeedback: {},
   touchableOpacity: {},

diff --git a/components/TouchableNativeFeedback.js b/components/TouchableNativeFeedback.js
@@ -3,34 +3,37 @@ import { TouchableNativeFeedback as RNTouchableNativeFeedback } from 'react-nati
 
 import { connectStyle } from '@shoutem/theme';
 
-function TouchableNativeFeedback(props) {
-  // Remove the props that are not valid
-  // style keys.
-  const style = {
-    ...props.style,
+class TouchableNativeFeedback extends React.Component {
+  static propTypes = {
+    ...RNTouchableNativeFeedback.propTypes,
+    style: PropTypes.shape({
+      background: PropTypes.object,
+      useForeground: PropTypes.bool,
+    }),
   };
-  delete style.background;
-  delete style.useForeground;
 
-  return (
-    <RNTouchableNativeFeedback
-      {...props}
-      style={style}
-      background={props.style.background}
-      useForeground={props.style.useForeground}
-    >
-      {props.children}
-    </RNTouchableNativeFeedback>
-  );
-}
+  render() {
+    const props = this.props;
+    // Remove the props that are not valid
+    // style keys.
+    const style = {
+      ...props.style,
+    };
+    delete style.background;
+    delete style.useForeground;
 
-TouchableNativeFeedback.propTypes = {
-  ...RNTouchableNativeFeedback.propTypes,
-  style: PropTypes.shape({
-    background: PropTypes.object,
-    useForeground: PropTypes.bool,
-  }),
-};
+    return (
+      <RNTouchableNativeFeedback
+        {...props}
+        style={style}
+        background={props.style.background}
+        useForeground={props.style.useForeground}
+      >
+        {props.children}
+      </RNTouchableNativeFeedback>
+    );
+  }
+}
 
 const StyledTouchableNativeFeedback =
   connectStyle('shoutem.ui.TouchableNativeFeedback')(TouchableNativeFeedback);

diff --git a/components/TouchableOpacity.js b/components/TouchableOpacity.js
@@ -30,7 +30,7 @@ TouchableOpacity.propTypes = {
   ...RNTouchableOpacity.propTypes,
 };
 
-const StyledTouchableOpacity = connectStyle('shoutem.ui.TouchableOpacity', {})(TouchableOpacity);
+const StyledTouchableOpacity = connectStyle('shoutem.ui.TouchableOpacity')(TouchableOpacity);
 
 export {
   StyledTouchableOpacity as TouchableOpacity,