fix ref bug

konvajs · Nov 8, 2018 · 569baed · 569baed
1 parent 1a46020
commit 569baed
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/lib/ReactKonva.js b/lib/ReactKonva.js
@@ -50,7 +50,7 @@ var Stage = function (_React$Component) {
       container: this._tagRef
     });
 
-    this.props.forwardedRef(this._stage);
+    this.props.forwardedRef && this.props.forwardedRef(this._stage);
 
     applyNodeProps(this._stage, this.props);
 
@@ -62,7 +62,7 @@ var Stage = function (_React$Component) {
     if (!Konva.isBrowser) {
       return;
     }
-    this.props.forwardedRef(this._stage);
+    this.props.forwardedRef && this.props.forwardedRef(this._stage);
     applyNodeProps(this._stage, this.props, prevProps);
 
     KonvaRenderer.updateContainer(this.props.children, this._mountNode, this);
@@ -72,7 +72,7 @@ var Stage = function (_React$Component) {
     if (!Konva.isBrowser) {
       return;
     }
-    this.props.forwardedRef(null);
+    this.props.forwardedRef && this.props.forwardedRef(null);
     KonvaRenderer.updateContainer(null, this._mountNode, this);
     this._stage.destroy();
   };

diff --git a/src/ReactKonva.js b/src/ReactKonva.js
@@ -35,7 +35,7 @@ class Stage extends React.Component {
       container: this._tagRef
     });
 
-    this.props.forwardedRef(this._stage);
+    this.props.forwardedRef && this.props.forwardedRef(this._stage);
 
     applyNodeProps(this._stage, this.props);
 
@@ -47,7 +47,7 @@ class Stage extends React.Component {
     if (!Konva.isBrowser) {
       return;
     }
-    this.props.forwardedRef(this._stage);
+    this.props.forwardedRef && this.props.forwardedRef(this._stage);
     applyNodeProps(this._stage, this.props, prevProps);
 
     KonvaRenderer.updateContainer(this.props.children, this._mountNode, this);
@@ -57,7 +57,7 @@ class Stage extends React.Component {
     if (!Konva.isBrowser) {
       return;
     }
-    this.props.forwardedRef(null);
+    this.props.forwardedRef && this.props.forwardedRef(null);
     KonvaRenderer.updateContainer(null, this._mountNode, this);
     this._stage.destroy();
   }

diff --git a/tests/index-test.js b/tests/index-test.js
@@ -54,6 +54,21 @@ describe('Test references', function() {
     const stageRef = instance.stage;
     expect(stageRef instanceof Konva.Stage).to.equal(true);
   });
+
+  // how can we make this work?
+  it('works ok with no ref', function() {
+    class App extends React.Component {
+      render() {
+        return (
+          <Stage width={300} height={300}>
+            <Layer ref={node => (this.layer = node)} />
+          </Stage>
+        );
+      }
+    }
+    const wrapper = mount(<App />);
+    instance = wrapper.instance();
+  });
 });
 
 describe('Test stage component', function() {