From 47ec98ae709856ef1fd7c3ef00c5ad26120b75e8 Mon Sep 17 00:00:00 2001
From: jelhan <jeldrik@systemli.org>
Date: Wed, 1 Jun 2016 17:20:04 +0200
Subject: [PATCH] fixes #99

---
 addon/mixins/component-child.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/mixins/component-child.js b/addon/mixins/component-child.js
index 03b5c2c..ea951af 100644
--- a/addon/mixins/component-child.js
+++ b/addon/mixins/component-child.js
@@ -14,11 +14,16 @@ export default Ember.Mixin.create({
     let parent = this.nearestOfType(ComponentParentMixin);
     if (parent) {
       parent.registerChild(this);
+      this.set('_parent', parent);
     }
   }),
 
+  // stores the parent in didInsertElement hook as a work-a-round for
+  // https://github.com/emberjs/ember.js/issues/12080
+  _parent: null,
+
   _willDestroyElement: Ember.on('willDestroyElement', function() {
-    let parent = this.nearestOfType(ComponentParentMixin);
+    let parent = this.nearestOfType(ComponentParentMixin) || this.get('_parent');
     if (parent) {
       parent.removeChild(this);
     }