Merge pull request #1 from lucidlogic/patch-1

Patch 1
lucidlogic · Feb 14, 2021 · 34056e9 · 34056e9
2 parents dc4975c + a71dfb8
commit 34056e9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/dist/js/tool.js b/dist/js/tool.js
diff --git a/resources/js/components/CustomDetailToolbar.vue b/resources/js/components/CustomDetailToolbar.vue
@@ -12,7 +12,8 @@
             :key="action.uriKey"
             :action="action"
             @action-button-clicked="handleClick"></action-button>
-        <transition name="fade">
+        <!-- Action confirmation and response modals -->
+        <portal to="modals" transition="fade-transition">
             <component
                 :is="selectedAction.component"
                 :working="working"
@@ -24,7 +25,13 @@
                 @confirm="executeAction"
                 @close="confirmActionModalOpened = false"
             />
-        </transition>
+            <component
+                :is="actionResponseData.modal"
+                @close="closeActionResponseModal"
+                v-if="showActionResponseModal"
+                :data="actionResponseData"
+            />
+        </portal>
     </div>
 </template>
 

diff --git a/resources/js/components/CustomIndexToolbar.vue b/resources/js/components/CustomIndexToolbar.vue
@@ -12,7 +12,8 @@
             :key="action.uriKey"
             :action="action"
             @action-button-clicked="handleClick"></action-button>
-        <transition name="fade">
+        <!-- Action confirmation and response modals -->
+        <portal to="modals" transition="fade-transition">
             <component
                 :is="selectedAction.component"
                 :working="working"
@@ -22,8 +23,15 @@
                 :action="selectedAction"
                 :errors="errors"
                 @confirm="executeAction"
-                @close="confirmActionModalOpened = false"/>
-        </transition>
+                @close="confirmActionModalOpened = false"
+            />
+            <component
+                :is="actionResponseData.modal"
+                @close="closeActionResponseModal"
+                v-if="showActionResponseModal"
+                :data="actionResponseData"
+            />
+        </portal>
     </div>
 </template>
 <script>