Merge pull request vault-development#80 from gre/onLoad

add onLoad prop
allsquare · Jun 10, 2018 · 7dc8dee · 7dc8dee
2 parents dbd6f52 + a29d3a8
commit 7dc8dee
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -35,6 +35,11 @@ interface SvgUriProps {
      */
     fill?: string
 
+    /**
+     * Invoked when load completes successfully.
+     */
+    onLoad?: Function
+
     /**
      * Fill the entire svg element with same color
      */

diff --git a/index.js b/index.js
@@ -125,28 +125,34 @@ class SvgUri extends Component{
     this.isComponentMounted = false
   }
 
-  async fetchSVGData(uri){
-    let responseXML = null;
+  async fetchSVGData(uri) {
+    let responseXML = null, error = null;
     try {
       const response = await fetch(uri);
       responseXML = await response.text();
     } catch(e) {
+      error = e;
       console.error("ERROR SVG", e);
     } finally {
       if (this.isComponentMounted) {
-        this.setState({svgXmlData:responseXML});
+        this.setState({ svgXmlData: responseXML }, () => {
+          const { onLoad } = this.props;
+          if (onLoad && !error) {
+            onLoad();
+          }
+        });
       }
     }
 
     return responseXML;
   }
-   
-  // Remove empty strings from children array  
+
+  // Remove empty strings from children array
   trimElementChilden(children) {
     for (child of children) {
       if (typeof child === 'string') {
         if (child.trim.length === 0)
-          children.splice(children.indexOf(child), 1); 
+          children.splice(children.indexOf(child), 1);
       }
     }
   }
@@ -308,6 +314,7 @@ SvgUri.propTypes = {
   svgXmlData: PropTypes.string,
   source: PropTypes.any,
   fill: PropTypes.string,
+  onLoad: PropTypes.func,
   fillAll: PropTypes.bool
 }