Merge pull request #644 from shoutem/release/4.6.3

Release/4.6.3

components/ListView.js

@@ -77,6 +77,7 @@ class ListView extends PureComponent {
 
     this.state = {
       status: props.loading ? Status.LOADING : Status.IDLE,
+      isScrolling: false,
     };
   }
 
@@ -196,17 +197,21 @@ class ListView extends PureComponent {
     // reference
     mappedProps.ref = this.handleListViewRef;
 
+    mappedProps.onMomentumScrollBegin = this.setIsScrolling(true);
+
+    mappedProps.onMomentumScrollEnd = this.setIsScrolling(false);
+
     return mappedProps;
   }
 
   // eslint-disable-next-line consistent-return
   createOnLoadMore() {
     const { onLoadMore, data } = this.props;
-    const { status } = this.state;
+    const { isScrolling, status } = this.state;
     if (onLoadMore) {
       return _.throttle(
         () => {
-          if (!_.isEmpty(data) && status === Status.IDLE) {
+          if (!_.isEmpty(data) && isScrolling && status === Status.IDLE) {
             onLoadMore();
           }
         },
@@ -216,6 +221,10 @@ class ListView extends PureComponent {
     }
   }
 
+  setIsScrolling(isScrolling) {
+    this.setState({ isScrolling });
+  }
+
   autoHideHeader({
     nativeEvent: {
       layout: { height },

html/components/SimpleHtml.js

@@ -33,6 +33,7 @@ class SimpleHtml extends PureComponent {
     customTagStyles: PropTypes.object,
     customHandleLinkPress: PropTypes.func,
     unsupportedVideoFormatMessage: PropTypes.string,
+    customAlterNode: PropTypes.func,
   };
 
   constructor(props) {
@@ -56,10 +57,22 @@ class SimpleHtml extends PureComponent {
    * video iframe tags in when video format is unsupported
    */
   alterNode(node) {
-    const { style } = this.props;
+    const { customAlterNode, style } = this.props;
 
     const styleAttrib = _.get(node, 'attribs.style', '').trim();
 
+    if (customAlterNode && _.isFunction(customAlterNode)) {
+      const resolvedNode = customAlterNode(
+        node,
+        cssObjectToString,
+        cssStringToObject,
+      );
+
+      if (resolvedNode) {
+        return resolvedNode;
+      }
+    }
+
     if (node.name === 'table') {
       return tableAlterNode(node);
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "description": "Styleable set of components for React Native applications",
   "scripts": {
     "lint": "eslint .",
@@ -35,7 +35,7 @@
     "react-native-transformable-image": "shoutem/react-native-transformable-image#v0.0.20",
     "react-native-vector-icons": "~6.6.0",
     "react-native-webview": "~11.0.0",
-    "react-native-youtube-iframe": "~2.0.1",
+    "react-native-youtube-iframe": "~2.1.2",
     "stream": "0.0.2",
     "tinycolor2": "1.4.1"
   },

theme.js

@@ -2041,18 +2041,17 @@ export default (variables = defaultThemeVariables) => ({
         minHeight: 40,
         maxHeight: 200,
         justifyContent: 'center',
-        backgroundColor: inverseColorBrightnessForAmount(
-          variables.paperColor,
-          5,
-        ),
+        backgroundColor:
+          variables.categoryDropdownBackgroundColor ||
+          inverseColorBrightnessForAmount(variables.paperColor, 5),
         width: window.width,
         marginTop: 0,
         borderBottomWidth: StyleSheet.hairlineWidth,
         borderColor: variables.navBarBorderColor,
       },
       selectedOption: {
         'shoutem.ui.Icon': {
-          color: variables.text.color,
+          color: variables.categoryDropdownTextColor || variables.text.color,
         },
         'shoutem.ui.Text': {
           ...variables.navBarText,
@@ -2061,7 +2060,7 @@ export default (variables = defaultThemeVariables) => ({
             'normal',
             variables.navBarText.fontStyle,
           ),
-          color: variables.text.color,
+          color: variables.categoryDropdownTextColor || variables.text.color,
           fontWeight: resolveFontWeight('normal'),
           fontStyle: resolveFontStyle(variables.navBarText.fontStyle),
           textAlign: 'center',