From 682785a4c8e73a788eeb9caab50427ff5fd1442d Mon Sep 17 00:00:00 2001
From: jarmywang <awangjianjun9@gmail.com>
Date: Thu, 9 Mar 2023 19:54:09 +0800
Subject: [PATCH] fix(popup): resolve close can not tap

---
 src/calendar/__test__/__snapshots__/index.test.js.snap    | 8 ++++----
 .../__test__/__virtualHostSnapshot__/index.test.js.snap   | 8 ++++----
 .../__test__/__snapshots__/index.test.js.snap             | 8 ++++----
 .../__test__/__virtualHostSnapshot__/index.test.js.snap   | 8 ++++----
 src/dialog/__test__/__snapshots__/index.test.js.snap      | 8 ++++----
 .../__test__/__virtualHostSnapshot__/index.test.js.snap   | 8 ++++----
 src/picker/__test__/__snapshots__/index.test.js.snap      | 8 ++++----
 .../__test__/__virtualHostSnapshot__/index.test.js.snap   | 8 ++++----
 src/popup/popup.wxml                                      | 4 ++--
 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/calendar/__test__/__snapshots__/index.test.js.snap b/src/calendar/__test__/__snapshots__/index.test.js.snap
index 56c5f98c3..7b7a84a67 100644
--- a/src/calendar/__test__/__snapshots__/index.test.js.snap
+++ b/src/calendar/__test__/__snapshots__/index.test.js.snap
@@ -17,10 +17,6 @@ exports[`calendar :base 1`] = `
         <wx-view
           class="t-popup__content t-class-content"
         >
-          <wx-view
-            class="t-popup__close"
-            bind:tap="handleClose"
-          />
           <wx-view
             class="t-calendar t-calendar--popup class t-class"
             style=""
@@ -787,6 +783,10 @@ exports[`calendar :base 1`] = `
               </t-button>
             </wx-view>
           </wx-view>
+          <wx-view
+            class="t-popup__close"
+            bind:tap="handleClose"
+          />
         </wx-view>
       </wx-view>
       <t-overlay
diff --git a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap
index 56c5f98c3..7b7a84a67 100644
--- a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -17,10 +17,6 @@ exports[`calendar :base 1`] = `
         <wx-view
           class="t-popup__content t-class-content"
         >
-          <wx-view
-            class="t-popup__close"
-            bind:tap="handleClose"
-          />
           <wx-view
             class="t-calendar t-calendar--popup class t-class"
             style=""
@@ -787,6 +783,10 @@ exports[`calendar :base 1`] = `
               </t-button>
             </wx-view>
           </wx-view>
+          <wx-view
+            class="t-popup__close"
+            bind:tap="handleClose"
+          />
         </wx-view>
       </wx-view>
       <t-overlay
diff --git a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
index 3ef2dbac1..ea53b8fb5 100644
--- a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
@@ -25,10 +25,6 @@ exports[`date-time-picker :base 1`] = `
           <wx-view
             class="t-popup__content t-class-content"
           >
-            <wx-view
-              class="t-popup__close"
-              bind:tap="handleClose"
-            />
             <wx-view
               class="t-picker t-class"
               slot="content"
@@ -451,6 +447,10 @@ exports[`date-time-picker :base 1`] = `
                 />
               </wx-view>
             </wx-view>
+            <wx-view
+              class="t-popup__close"
+              bind:tap="handleClose"
+            />
           </wx-view>
         </wx-view>
         <t-overlay
diff --git a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
index 3ef2dbac1..ea53b8fb5 100644
--- a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -25,10 +25,6 @@ exports[`date-time-picker :base 1`] = `
           <wx-view
             class="t-popup__content t-class-content"
           >
-            <wx-view
-              class="t-popup__close"
-              bind:tap="handleClose"
-            />
             <wx-view
               class="t-picker t-class"
               slot="content"
@@ -451,6 +447,10 @@ exports[`date-time-picker :base 1`] = `
                 />
               </wx-view>
             </wx-view>
+            <wx-view
+              class="t-popup__close"
+              bind:tap="handleClose"
+            />
           </wx-view>
         </wx-view>
         <t-overlay
diff --git a/src/dialog/__test__/__snapshots__/index.test.js.snap b/src/dialog/__test__/__snapshots__/index.test.js.snap
index 77099656f..45a54cb24 100644
--- a/src/dialog/__test__/__snapshots__/index.test.js.snap
+++ b/src/dialog/__test__/__snapshots__/index.test.js.snap
@@ -20,10 +20,6 @@ exports[`dialog :base 1`] = `
         <wx-view
           class="t-popup__content t-class-content"
         >
-          <wx-view
-            class="t-popup__close"
-            bind:tap="handleClose"
-          />
           <wx-view
             class="t-dialog t-class"
             slot="content"
@@ -35,6 +31,10 @@ exports[`dialog :base 1`] = `
               class="t-dialog__footer t-dialog__footer--full"
             />
           </wx-view>
+          <wx-view
+            class="t-popup__close"
+            bind:tap="handleClose"
+          />
         </wx-view>
       </wx-view>
       <t-overlay
diff --git a/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap
index 77099656f..45a54cb24 100644
--- a/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/dialog/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -20,10 +20,6 @@ exports[`dialog :base 1`] = `
         <wx-view
           class="t-popup__content t-class-content"
         >
-          <wx-view
-            class="t-popup__close"
-            bind:tap="handleClose"
-          />
           <wx-view
             class="t-dialog t-class"
             slot="content"
@@ -35,6 +31,10 @@ exports[`dialog :base 1`] = `
               class="t-dialog__footer t-dialog__footer--full"
             />
           </wx-view>
+          <wx-view
+            class="t-popup__close"
+            bind:tap="handleClose"
+          />
         </wx-view>
       </wx-view>
       <t-overlay
diff --git a/src/picker/__test__/__snapshots__/index.test.js.snap b/src/picker/__test__/__snapshots__/index.test.js.snap
index 7e9ca22d2..9801b437f 100644
--- a/src/picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/picker/__test__/__snapshots__/index.test.js.snap
@@ -22,10 +22,6 @@ exports[`picker :base 1`] = `
       <wx-view
         class="t-popup__content t-class-content"
       >
-        <wx-view
-          class="t-popup__close"
-          bind:tap="handleClose"
-        />
         <wx-view
           class="t-picker t-class"
           slot="content"
@@ -154,6 +150,10 @@ exports[`picker :base 1`] = `
             />
           </wx-view>
         </wx-view>
+        <wx-view
+          class="t-popup__close"
+          bind:tap="handleClose"
+        />
       </wx-view>
     </wx-view>
     <t-overlay
diff --git a/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap
index 7e9ca22d2..9801b437f 100644
--- a/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -22,10 +22,6 @@ exports[`picker :base 1`] = `
       <wx-view
         class="t-popup__content t-class-content"
       >
-        <wx-view
-          class="t-popup__close"
-          bind:tap="handleClose"
-        />
         <wx-view
           class="t-picker t-class"
           slot="content"
@@ -154,6 +150,10 @@ exports[`picker :base 1`] = `
             />
           </wx-view>
         </wx-view>
+        <wx-view
+          class="t-popup__close"
+          bind:tap="handleClose"
+        />
       </wx-view>
     </wx-view>
     <t-overlay
diff --git a/src/popup/popup.wxml b/src/popup/popup.wxml
index d58d80606..ae440c4b4 100644
--- a/src/popup/popup.wxml
+++ b/src/popup/popup.wxml
@@ -10,12 +10,12 @@
   aria-modal="{{ true }}"
 >
   <view class="{{classPrefix}}__content {{prefix}}-class-content">
+    <slot name="content" />
+    <slot />
     <view class="{{classPrefix}}__close" bind:tap="handleClose">
       <t-icon name="close" wx:if="{{closeBtn}}" size="64rpx" />
       <slot name="close-btn" class="{{classPrefix}}-slot" />
     </view>
-    <slot name="content" />
-    <slot />
   </view>
 </view>