From f5cdc319347523ac9d8758c266938838b3298e41 Mon Sep 17 00:00:00 2001
From: Mikael Sand <msand@abo.fi>
Date: Fri, 25 Jan 2019 16:14:27 +0200
Subject: [PATCH] Simplify Svg element render method and pickNotNil

---
 elements/Svg.js |  9 ++++++---
 lib/util.js     | 14 ++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/elements/Svg.js b/elements/Svg.js
index 83b634d3..d2fde4b4 100644
--- a/elements/Svg.js
+++ b/elements/Svg.js
@@ -97,6 +97,11 @@ export default class Svg extends Shape {
             flex: 0,
         } : null;
 
+        const o = +opacity;
+        const opacityStyle = !isNaN(o) ? {
+            opacity: o,
+        } : null;
+
         return (
             <NativeSvgView
                 {...props}
@@ -108,9 +113,7 @@ export default class Svg extends Shape {
                 style={[
                     styles.svg,
                     style,
-                    !isNaN(+opacity) && {
-                        opacity: +opacity,
-                    },
+                    opacityStyle,
                     dimensions,
                 ]}
                 {...extractResponder(props, this)}
diff --git a/lib/util.js b/lib/util.js
index 4c70c9b9..901c758f 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -1,13 +1,11 @@
 export function pickNotNil(object) {
     const result = {};
-    const keys = Object.keys(object);
-    const l = keys.length;
-    for (let i = 0; i < l; i++) {
-        const key = keys[i];
-        const value = object[key];
-        // eslint-disable-next-line eqeqeq
-        if (value != null) {
-            result[key] = value;
+    for (const key in object) {
+        if (object.hasOwnProperty(key)) {
+            const value = object[key];
+            if (value !== undefined && value !== null) {
+                result[key] = value;
+            }
         }
     }
     return result;