From 2128c842126a8a57210aaf171b3b1625bdd741d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Wed, 23 May 2018 10:02:20 +0200
Subject: [PATCH] [RN] Add utility function to combine 2 sets of styles

---
 react/features/base/styles/functions.js | 38 +++++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/react/features/base/styles/functions.js b/react/features/base/styles/functions.js
index 902bf87d0..9b29aa576 100644
--- a/react/features/base/styles/functions.js
+++ b/react/features/base/styles/functions.js
@@ -5,6 +5,7 @@ import { Platform } from '../react';
 import { ColorPalette } from './components';
 
 declare type StyleSheet = Object;
+export type StyleType = StyleSheet | Array<StyleSheet>;
 
 /**
  * The list of the well-known style properties which may not be numbers on Web
@@ -14,7 +15,35 @@ declare type StyleSheet = Object;
  */
 const _WELL_KNOWN_NUMBER_PROPERTIES = [ 'height', 'width' ];
 
-/* eslint-disable flowtype/space-before-type-colon */
+/**
+ * Combines the given 2 styles into a single one.
+ *
+ * @param {StyleType} a - An object or array of styles.
+ * @param {StyleType} b - An object or array of styles.
+ * @private
+ * @returns {StyleType} - The merged styles.
+ */
+export function combineStyles(a: StyleType, b: StyleType): StyleType {
+    const result = [];
+
+    if (a) {
+        if (Array.isArray(a)) {
+            result.push(...a);
+        } else {
+            result.push(a);
+        }
+    }
+
+    if (b) {
+        if (Array.isArray(b)) {
+            result.push(...b);
+        } else {
+            result.push(b);
+        }
+    }
+
+    return result;
+}
 
 /**
  * Create a style sheet using the provided style definitions.
@@ -25,11 +54,8 @@ const _WELL_KNOWN_NUMBER_PROPERTIES = [ 'height', 'width' ];
  * (often platform-independent) styles.
  * @returns {StyleSheet}
  */
-export function createStyleSheet(styles: StyleSheet, overrides: StyleSheet = {})
-        : StyleSheet {
-
-/* eslint-enable flowtype/space-before-type-colon */
-
+export function createStyleSheet(
+        styles: StyleSheet, overrides: StyleSheet = {}): StyleSheet {
     const combinedStyles = {};
 
     for (const k of Object.keys(styles)) {