perf: optimize handling of font properties in G elements

software-mansion · Jan 18, 2020 · 0fa4177 · 0fa4177
1 parent 363c1b4
commit 0fa4177
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/__tests__/__snapshots__/css.test.tsx.snap b/__tests__/__snapshots__/css.test.tsx.snap
@@ -155,13 +155,9 @@ exports[`supports CSS in style element 1`] = `
 </svg>"
   xmlns="http://www.w3.org/2000/svg"
 >
-  <RNSVGGroup
-    font={Object {}}
-  >
+  <RNSVGGroup>
     <RNSVGDefs />
-    <RNSVGGroup
-      font={Object {}}
-    >
+    <RNSVGGroup>
       <RNSVGRect
         fill={4294901760}
         height={200}
@@ -179,9 +175,7 @@ exports[`supports CSS in style element 1`] = `
         y={0}
       />
     </RNSVGGroup>
-    <RNSVGGroup
-      font={Object {}}
-    >
+    <RNSVGGroup>
       <RNSVGRect
         fill={4294901760}
         fillOpacity={0.3}

diff --git a/src/elements/G.tsx b/src/elements/G.tsx
@@ -24,16 +24,24 @@ export default class G<P> extends Shape<P> {
   render() {
     const { props } = this;
     const prop = propsAndStyles(props);
+    const extractedProps = extractProps(prop, this);
+    const font = extractFont(prop);
+    if (hasProps(font)) {
+      extractedProps.font = font;
+    }
     return (
-      <RNSVGGroup
-        ref={this.refMethod}
-        {...extractProps(prop, this)}
-        font={extractFont(prop)}
-      >
+      <RNSVGGroup ref={this.refMethod} {...extractedProps}>
         {props.children}
       </RNSVGGroup>
     );
   }
 }
 
+const hasProps = (obj: {}) => {
+  for (let _ in obj) {
+    return true;
+  }
+  return false;
+};
+
 export const RNSVGGroup = requireNativeComponent('RNSVGGroup');