From b11af79d1b341646a4265868aa8022a5413b0a74 Mon Sep 17 00:00:00 2001
From: Lavrenov Egor <egor.uriewitch@gmail.com>
Date: Wed, 1 Apr 2020 14:24:07 +0300
Subject: [PATCH 1/2] fix
 https://github.com/LinusBorg/vue-simple-portal/issues/40

---
 src/components/TargetContainer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/TargetContainer.js b/src/components/TargetContainer.js
index 76e96c5..37d0116 100644
--- a/src/components/TargetContainer.js
+++ b/src/components/TargetContainer.js
@@ -19,6 +19,8 @@ export default Vue.extend({
   },
   destroyed() {
     const { $el: el } = this
-    el.parentNode.removeChild(el)
+    if (el.parentNode) {
+      el.parentNode.removeChild(el)
+    }
   },
 })

From a8c2021e27e15cc5789edc4453da8f91096b5341 Mon Sep 17 00:00:00 2001
From: Lavrenov Egor <egor.uriewitch@gmail.com>
Date: Tue, 7 Apr 2020 12:25:11 +0300
Subject: [PATCH 2/2] https://github.com/LinusBorg/vue-simple-portal/issues/42

---
 demo/App.vue                          |  3 +++
 demo/components/Condition.vue         | 28 +++++++++++++++++++++++++++
 demo/components/TestComponentProp.vue | 16 +++++++++++++++
 src/components/TargetContainer.js     |  6 ++----
 tests/e2e/specs/test.js               | 13 +++++++++++++
 5 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 demo/components/Condition.vue
 create mode 100644 demo/components/TestComponentProp.vue

diff --git a/demo/App.vue b/demo/App.vue
index 62a1562..a58ac68 100644
--- a/demo/App.vue
+++ b/demo/App.vue
@@ -3,6 +3,9 @@
     <h1>Demo App for VueSimplePortal</h1>
     <nav class="nav">
       <router-link to="/" exact>Base</router-link>
+      <router-link to="/condition" exact>
+        Base With condition component inside portal
+      </router-link>
       <router-link to="/disable">Disable</router-link>
       <router-link to="/transition">Transition</router-link>
       <router-link to="/multiple">Multiple</router-link>
diff --git a/demo/components/Condition.vue b/demo/components/Condition.vue
new file mode 100644
index 0000000..c2a910b
--- /dev/null
+++ b/demo/components/Condition.vue
@@ -0,0 +1,28 @@
+<template>
+  <div>
+    <h1>Component with condition prop</h1>
+    <button id="toggle-button" @click="active = !active">
+      Toggle test component
+    </button>
+    <portal>
+      <Test :active="active" />
+    </portal>
+  </div>
+</template>
+
+<script>
+import Test from './TestComponentProp'
+export default {
+  name: 'Base',
+  data() {
+    return {
+      active: false,
+    }
+  },
+  components: {
+    Test,
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/demo/components/TestComponentProp.vue b/demo/components/TestComponentProp.vue
new file mode 100644
index 0000000..1fc969d
--- /dev/null
+++ b/demo/components/TestComponentProp.vue
@@ -0,0 +1,16 @@
+<template>
+  <div v-if="active">
+    <h3 data-test="test-header">This is just a Test Component</h3>
+    <p>
+      Its purpose is to check the behaviour of components inside of the Simple
+      Portal which shown by prop
+    </p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TestComponent',
+  props: ['active'],
+}
+</script>
diff --git a/src/components/TargetContainer.js b/src/components/TargetContainer.js
index 37d0116..30f041a 100644
--- a/src/components/TargetContainer.js
+++ b/src/components/TargetContainer.js
@@ -18,9 +18,7 @@ export default Vue.extend({
       : h(this.tag || 'DIV', nodes)
   },
   destroyed() {
-    const { $el: el } = this
-    if (el.parentNode) {
-      el.parentNode.removeChild(el)
-    }
+    const el = this.$el.parentNode ? this.$el : this.updatedNodes()[0].elm
+    el.parentNode.removeChild(el)
   },
 })
diff --git a/tests/e2e/specs/test.js b/tests/e2e/specs/test.js
index 6cc0126..8808965 100644
--- a/tests/e2e/specs/test.js
+++ b/tests/e2e/specs/test.js
@@ -47,6 +47,19 @@ describe('My First Test', () => {
         expect(this.el).to.not.have.descendants('[data-test="test-header"]')
       })
   })
+  it('correct destroy component inside portal with condition prop', function() {
+    cy.visit('/condition')
+    cy.portalTarget()
+      .as('el')
+      .then(el => {
+        expect(el).to.not.be.undefined
+
+        cy.get('#toggle-button').click()
+        return cy.wait(500)
+      })
+    cy.visit('/')
+    expect(this.el).to.not.have.descendants('[data-test="test-header"]')
+  })
   it('works with multiple portals sending content', function() {
     cy.visit('/multiple')
     cy.portalTarget()