Add shouldComponentUpdate to Image. Use setTimeout to wait for the css to load before changing state.

Author: Amir Tocker

src/components/Image/Image.js

@@ -3,6 +3,32 @@ import cloudinary, {Util} from 'cloudinary-core';
 import CloudinaryComponent from '../CloudinaryComponent';
 import {debounce, firstDefined, closestAbove} from '../../Util';
 
+function compareObjects(o, p) {
+  let i,
+    keysO = Object.keys(o).sort(),
+    keysP = Object.keys(p).sort();
+  if (keysO.length !== keysP.length) return false;
+  if (keysO.join('') !== keysP.join('')) return false;
+  for (i = 0; i < keysO.length; ++i) {
+    if (o[keysO[i]] instanceof Array) {
+      if (!(p[keysO[i]] instanceof Array)) return false;
+      if (p[keysO[i]].sort().join('') !== o[keysO[i]].sort().join('')) return false;
+    }
+    else if (o[keysO[i]] instanceof Function) {
+      if (!(p[keysO[i]] instanceof Function)) return false;
+    }
+    else if (o[keysO[i]] instanceof Object) {
+      if (!(p[keysO[i]] instanceof Object)) return false;
+      if (o[keysO[i]] === o) {
+        if (p[keysO[i]] !== p) return false;
+      } else if (compareObjects(o[keysO[i]], p[keysO[i]]) === false) {
+        return false;//WARNING: does not deal with circular refs other than ^^
+      }
+    }
+    if (o[keysO[i]] != p[keysO[i]]) return false;//not the same value
+  }
+  return true;
+}
 
 export default class Image extends CloudinaryComponent {
   constructor(props, context) {
@@ -20,6 +46,9 @@ export default class Image extends CloudinaryComponent {
   get window() {
     return (this.element && this.element.ownerDocument) ? (this.element.ownerDocument.defaultView || window) : window;
   }
+  shouldComponentUpdate( nextProps, nextState){
+    return !( compareObjects(this.props, nextProps) && compareObjects(this.state, nextState));
+  }
 
   componentWillReceiveProps(nextProps, nextContext) {
     let state = this.prepareState(nextProps, nextContext);
@@ -47,10 +76,12 @@ export default class Image extends CloudinaryComponent {
 
   componentDidMount() {
     // now that we have a this.element, we need to calculate the URL
-    let state = this.prepareState();
-    if (state.url !== undefined) {
-      this.setState(state);
-    }
+    setTimeout(()=>{
+      let state = this.prepareState();
+      if (state.url !== undefined) {
+        this.setState(state);
+      }
+    }, 0);
   }
 
   componentWillUnmount() {