Merge pull request #122 from kylekim-oicr/master

culturedbarbarian · web-flow · commit df1f2a18757d · 2018-01-30T13:21:14.000-05:00
Isotope Fix
diff --git a/lib/IsotopeGrid/IsotopeGrid.js b/lib/IsotopeGrid/IsotopeGrid.js
@@ -194,7 +194,11 @@ var IsotopeGrid = function (_React$Component) {
             }
 
             if (reload !== this.state.reload) this.setState({ reload: reload });
-            if (options) this.state.isotope.arrange(_extends({}, options));
+            if (options && this.state.isotope) {
+                this.state.isotope.arrange(_extends({}, options));
+            } else if (options) {
+                this.createIsotope();
+            }
         }
     }, {
         key: 'shouldComponentUpdate',
diff --git a/src/IsotopeGrid/IsotopeGrid.jsx b/src/IsotopeGrid/IsotopeGrid.jsx
@@ -146,7 +146,11 @@ class IsotopeGrid extends React.Component {
         }
 
         if (reload !== this.state.reload) this.setState({ reload });
-        if (options) this.state.isotope.arrange({ ...options });
+        if (options && this.state.isotope) {
+            this.state.isotope.arrange({ ...options });
+        } else if (options) {
+            this.createIsotope();
+        }
     }
 
     shouldComponentUpdate(nextProps, nextState) {

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,11 @@ var IsotopeGrid = function (_React$Component) {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if (reload !== this.state.reload) this.setState({ reload: reload });`
`197`		`- if (options) this.state.isotope.arrange(_extends({}, options));`
	`197`	`+ if (options && this.state.isotope) {`
	`198`	`+ this.state.isotope.arrange(_extends({}, options));`
	`199`	`+ } else if (options) {`
	`200`	`+ this.createIsotope();`
	`201`	`+ }`
`198`	`202`	`}`
`199`	`203`	`}, {`
`200`	`204`	`key: 'shouldComponentUpdate',`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,11 @@ class IsotopeGrid extends React.Component {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if (reload !== this.state.reload) this.setState({ reload });`
`149`		`- if (options) this.state.isotope.arrange({ ...options });`
	`149`	`+ if (options && this.state.isotope) {`
	`150`	`+ this.state.isotope.arrange({ ...options });`
	`151`	`+ } else if (options) {`
	`152`	`+ this.createIsotope();`
	`153`	`+ }`
`150`	`154`	`}`
`151`	`155`
`152`	`156`	`shouldComponentUpdate(nextProps, nextState) {`