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 1/6] 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>
 

From e6e60b11b4d085194e395a6a3d471742c2054bc3 Mon Sep 17 00:00:00 2001
From: jarmywang <awangjianjun9@gmail.com>
Date: Fri, 10 Mar 2023 17:07:58 +0800
Subject: [PATCH 2/6] feat(popup): support background,border-radius,safe-area

---
 src/action-sheet/action-sheet.less | 4 ----
 src/action-sheet/action-sheet.wxml | 2 +-
 src/calendar/calendar.less         | 2 --
 src/drawer/drawer.less             | 2 --
 src/picker/picker.less             | 2 --
 src/popup/_example/base/index.wxss | 4 ++--
 src/popup/popup.less               | 8 ++++++++
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/action-sheet/action-sheet.less b/src/action-sheet/action-sheet.less
index 2c9646bbd..1ba042768 100644
--- a/src/action-sheet/action-sheet.less
+++ b/src/action-sheet/action-sheet.less
@@ -147,8 +147,4 @@
       }
     }
   }
-  &__safe {
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-  }
 }
diff --git a/src/action-sheet/action-sheet.wxml b/src/action-sheet/action-sheet.wxml
index bf8d757cc..9be95bc6a 100644
--- a/src/action-sheet/action-sheet.wxml
+++ b/src/action-sheet/action-sheet.wxml
@@ -25,7 +25,7 @@
       </view>
     </view>
     <slot />
-    <view wx:if="{{showCancel}}" class="{{classPrefix}}__footer {{classPrefix}}__safe">
+    <view wx:if="{{showCancel}}" class="{{classPrefix}}__footer">
       <view class="{{classPrefix}}__gap-{{theme}}" />
       <view
         class="{{classPrefix}}__cancel {{prefix}}-class-cancel"
diff --git a/src/calendar/calendar.less b/src/calendar/calendar.less
index 44303d1bf..18b91700c 100644
--- a/src/calendar/calendar.less
+++ b/src/calendar/calendar.less
@@ -16,8 +16,6 @@
   z-index: 9999;
   background: @calendar-bg-color;
   overflow-x: hidden;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
 
   &--popup {
     border-top-left-radius: @calendar-radius;
diff --git a/src/drawer/drawer.less b/src/drawer/drawer.less
index 50007866c..c9412b03d 100644
--- a/src/drawer/drawer.less
+++ b/src/drawer/drawer.less
@@ -20,8 +20,6 @@
   width: @drawer-width;
   display: flex;
   flex-direction: column;
-  padding-bottom: env(safe-area-inset-bottom, 28px);
-  padding-bottom: constant(safe-area-inset-bottom, 28px);
 
   &--hover {
     background-color: @drawer-hover-color;
diff --git a/src/picker/picker.less b/src/picker/picker.less
index 12f6ecc78..bde541d4d 100644
--- a/src/picker/picker.less
+++ b/src/picker/picker.less
@@ -26,8 +26,6 @@
 .@{picker} {
   position: relative;
   background-color: @picker-bg-color;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
   border-top-left-radius: @picker-border-radius;
   border-top-right-radius: @picker-border-radius;
 
diff --git a/src/popup/_example/base/index.wxss b/src/popup/_example/base/index.wxss
index 604ec5069..d71c0511b 100644
--- a/src/popup/_example/base/index.wxss
+++ b/src/popup/_example/base/index.wxss
@@ -1,5 +1,5 @@
 .block {
-  background: #fff;
+  /*background: #fff;*/
   color: #333;
   display: flex;
   align-items: center;
@@ -25,4 +25,4 @@
 
 .wrapper + .wrapper {
   margin-top: 32rpx;
-}
\ No newline at end of file
+}
diff --git a/src/popup/popup.less b/src/popup/popup.less
index 4b61ba086..70d1cce34 100644
--- a/src/popup/popup.less
+++ b/src/popup/popup.less
@@ -9,6 +9,7 @@
   z-index: 11500;
   max-height: 100vh;
   transition: all 300ms ease;
+  background-color: @bg-color-container;
 
   &__content {
     position: relative;
@@ -27,12 +28,18 @@
     top: 0;
     left: 0;
     width: 100%;
+    border-bottom-left-radius: @radius-default;
+    border-bottom-right-radius: @radius-default;
   }
 
   &--bottom {
     bottom: 0;
     left: 0;
     width: 100vw;
+    border-top-left-radius: @radius-default;
+    border-top-right-radius: @radius-default;
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
   }
 
   &--left {
@@ -52,6 +59,7 @@
     left: 50%;
     transform: scale(1) translate3d(-50%, -50%, 0);
     transform-origin: 0% 0%;
+    border-radius: @radius-default;
   }
 
   &.@{prefix}-fade-enter,

From c7cda3313316b223e0ea251c9debe80f1a296ca2 Mon Sep 17 00:00:00 2001
From: jarmywang <awangjianjun9@gmail.com>
Date: Tue, 14 Mar 2023 11:36:24 +0800
Subject: [PATCH 3/6] fix(popup): add less variable (#1758)

---
 src/popup/popup.less | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/popup/popup.less b/src/popup/popup.less
index 70d1cce34..817dc8c87 100644
--- a/src/popup/popup.less
+++ b/src/popup/popup.less
@@ -4,12 +4,15 @@
 @popup-position: ~'@{popup}--position';
 @popup-transition: ~'@{popup}--transition';
 
+@popup-bg-color: var(--td-popup-bg-color, @bg-color-container);
+@popup-border-radius: var(--td-popup-border-radius, @radius-default);
+
 .@{popup} {
   position: fixed;
   z-index: 11500;
   max-height: 100vh;
   transition: all 300ms ease;
-  background-color: @bg-color-container;
+  background-color: @popup-bg-color;
 
   &__content {
     position: relative;
@@ -28,16 +31,16 @@
     top: 0;
     left: 0;
     width: 100%;
-    border-bottom-left-radius: @radius-default;
-    border-bottom-right-radius: @radius-default;
+    border-bottom-left-radius: @popup-border-radius;
+    border-bottom-right-radius: @popup-border-radius;
   }
 
   &--bottom {
     bottom: 0;
     left: 0;
     width: 100vw;
-    border-top-left-radius: @radius-default;
-    border-top-right-radius: @radius-default;
+    border-top-left-radius: @popup-border-radius;
+    border-top-right-radius: @popup-border-radius;
     padding-bottom: constant(safe-area-inset-bottom);
     padding-bottom: env(safe-area-inset-bottom);
   }
@@ -59,7 +62,7 @@
     left: 50%;
     transform: scale(1) translate3d(-50%, -50%, 0);
     transform-origin: 0% 0%;
-    border-radius: @radius-default;
+    border-radius: @popup-border-radius;
   }
 
   &.@{prefix}-fade-enter,

From a6de672de7b53a412cd31c2affedc363d03631e3 Mon Sep 17 00:00:00 2001
From: jarmywang <awangjianjun9@gmail.com>
Date: Fri, 24 Mar 2023 17:23:16 +0800
Subject: [PATCH 4/6] fix(checkbox): placement name

---
 src/checkbox/__test__/__snapshots__/demo.test.js.snap       | 6 +++---
 .../__test__/__virtualHostSnapshot__/demo.test.js.snap      | 6 +++---
 src/checkbox/_example/right/index.wxml                      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/checkbox/__test__/__snapshots__/demo.test.js.snap b/src/checkbox/__test__/__snapshots__/demo.test.js.snap
index 75c814d45..249157d52 100644
--- a/src/checkbox/__test__/__snapshots__/demo.test.js.snap
+++ b/src/checkbox/__test__/__snapshots__/demo.test.js.snap
@@ -136,7 +136,7 @@ exports[`Checkbox Checkbox horizontal demo works fine 1`] = `
 exports[`Checkbox Checkbox right demo works fine 1`] = `
 <right>
   <t-checkbox
-    checked="{{true}}"
+    defaultChecked="{{true}}"
     label="多选"
     value="1"
   />
@@ -145,9 +145,9 @@ exports[`Checkbox Checkbox right demo works fine 1`] = `
     style="height: 32rpx"
   />
   <t-checkbox
-    align="right"
-    checked="{{true}}"
+    defaultChecked="{{true}}"
     label="多选"
+    placement="right"
     value="2"
   />
 </right>
diff --git a/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 75c814d45..249157d52 100644
--- a/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -136,7 +136,7 @@ exports[`Checkbox Checkbox horizontal demo works fine 1`] = `
 exports[`Checkbox Checkbox right demo works fine 1`] = `
 <right>
   <t-checkbox
-    checked="{{true}}"
+    defaultChecked="{{true}}"
     label="多选"
     value="1"
   />
@@ -145,9 +145,9 @@ exports[`Checkbox Checkbox right demo works fine 1`] = `
     style="height: 32rpx"
   />
   <t-checkbox
-    align="right"
-    checked="{{true}}"
+    defaultChecked="{{true}}"
     label="多选"
+    placement="right"
     value="2"
   />
 </right>
diff --git a/src/checkbox/_example/right/index.wxml b/src/checkbox/_example/right/index.wxml
index f0ab0ef4d..fdcd38310 100644
--- a/src/checkbox/_example/right/index.wxml
+++ b/src/checkbox/_example/right/index.wxml
@@ -1,5 +1,5 @@
-<t-checkbox value="1" label="多选" checked />
+<t-checkbox value="1" label="多选" default-checked />
 
 <view class="box" style="height: 32rpx" />
 
-<t-checkbox value="2" label="多选" align="right" checked />
+<t-checkbox value="2" label="多选" placement="right" default-checked />

From 821f9247f0de03b9ec8c7b2f3c877b1c82f5fe82 Mon Sep 17 00:00:00 2001
From: jarmywang <awangjianjun9@gmail.com>
Date: Wed, 29 Mar 2023 22:02:27 +0800
Subject: [PATCH 5/6] fix(avatar): resolve "bordered" is overwritten warning
 (#1849)

---
 src/avatar/avatar.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/avatar/avatar.ts b/src/avatar/avatar.ts
index 1c4406738..cd33cb563 100644
--- a/src/avatar/avatar.ts
+++ b/src/avatar/avatar.ts
@@ -28,7 +28,6 @@ export default class Avatar extends SuperComponent {
     classPrefix: name,
     isShow: true,
     zIndex: 0,
-    bordered: false,
   };
 
   relations: RelationsOptions = {

From afb22405f39790d684a5c7fb68d80e8cc8cb7778 Mon Sep 17 00:00:00 2001
From: jarmywang <awangjianjun9@gmail.com>
Date: Mon, 3 Apr 2023 11:06:55 +0800
Subject: [PATCH 6/6] fix(avatar): add borderedWithGroup attr

---
 src/avatar/avatar.ts   | 3 ++-
 src/avatar/avatar.wxml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/avatar/avatar.ts b/src/avatar/avatar.ts
index cd33cb563..10107db43 100644
--- a/src/avatar/avatar.ts
+++ b/src/avatar/avatar.ts
@@ -28,6 +28,7 @@ export default class Avatar extends SuperComponent {
     classPrefix: name,
     isShow: true,
     zIndex: 0,
+    borderedWithGroup: false,
   };
 
   relations: RelationsOptions = {
@@ -38,7 +39,7 @@ export default class Avatar extends SuperComponent {
 
         this.setData({
           size: this.data.size ?? parent.data.size,
-          bordered: true,
+          borderedWithGroup: true,
         });
       },
     },
diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index e908f5ad3..a92bb54f4 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -21,7 +21,7 @@
     t-class-count="{{badgeProps.tClassCount}}"
   >
     <view
-      class="{{this.getClass(classPrefix, size, shape, bordered)}} {{prefix}}-class-image"
+      class="{{this.getClass(classPrefix, size, shape, bordered || borderedWithGroup)}} {{prefix}}-class-image"
       style="{{this.getSize(size)}}"
       aria-label="{{ ariaLabel || alt ||'头像'}}"
       aria-role="{{ ariaRole || 'img'}}"