From f630e7515b8bbfff3ab831cc7c5c451e398e3850 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 2 Feb 2021 20:28:26 +0800
Subject: [PATCH] style: add safe-area mixin (#8062)

---
 src/action-bar/index.less       | 4 ++--
 src/address-list/index.less     | 4 ++--
 src/calendar/index.less         | 4 ++--
 src/contact-list/index.less     | 4 ++--
 src/popup/index.less            | 4 ++--
 src/style/mixins/safe-area.less | 4 ++++
 src/submit-bar/index.less       | 4 ++--
 src/tabbar/index.less           | 4 ++--
 8 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 src/style/mixins/safe-area.less

diff --git a/src/action-bar/index.less b/src/action-bar/index.less
index 48cd61d64..24e6c3679 100644
--- a/src/action-bar/index.less
+++ b/src/action-bar/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van-action-bar {
   position: fixed;
@@ -9,9 +10,8 @@
   align-items: center;
   box-sizing: content-box;
   height: @action-bar-height;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
   background-color: @action-bar-background-color;
+  .safe-area-inset-bottom();
 
   &--unfit {
     padding-bottom: 0;
diff --git a/src/address-list/index.less b/src/address-list/index.less
index 68eceeb39..c3e7f70cf 100644
--- a/src/address-list/index.less
+++ b/src/address-list/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van-address-list {
   box-sizing: border-box;
@@ -13,9 +14,8 @@
     box-sizing: border-box;
     width: 100%;
     padding: 0 @padding-md;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
     background-color: @white;
+    .safe-area-inset-bottom();
   }
 
   &__add {
diff --git a/src/calendar/index.less b/src/calendar/index.less
index 1daca2cfe..8d9618b85 100644
--- a/src/calendar/index.less
+++ b/src/calendar/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van-calendar {
   display: flex;
@@ -173,8 +174,7 @@
   &__footer {
     flex-shrink: 0;
     padding: 0 @padding-md;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
+    .safe-area-inset-bottom();
 
     &--unfit {
       padding-bottom: 0;
diff --git a/src/contact-list/index.less b/src/contact-list/index.less
index 90aa431c6..155c2a0d3 100644
--- a/src/contact-list/index.less
+++ b/src/contact-list/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van-contact-list {
   box-sizing: border-box;
@@ -42,9 +43,8 @@
     left: 0;
     z-index: @contact-list-add-button-z-index;
     padding: 0 @padding-md;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
     background-color: @white;
+    .safe-area-inset-bottom();
   }
 
   &__add {
diff --git a/src/popup/index.less b/src/popup/index.less
index cf9dddeb2..dbdc66630 100644
--- a/src/popup/index.less
+++ b/src/popup/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van {
   &-overflow-hidden {
@@ -64,8 +65,7 @@
     }
 
     &--safe-area-inset-bottom {
-      padding-bottom: constant(safe-area-inset-bottom);
-      padding-bottom: env(safe-area-inset-bottom);
+      .safe-area-inset-bottom();
     }
 
     &-slide-top-enter-active,
diff --git a/src/style/mixins/safe-area.less b/src/style/mixins/safe-area.less
new file mode 100644
index 000000000..9fc95f9fe
--- /dev/null
+++ b/src/style/mixins/safe-area.less
@@ -0,0 +1,4 @@
+.safe-area-inset-bottom() {
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
diff --git a/src/submit-bar/index.less b/src/submit-bar/index.less
index 75f622a42..73c91146e 100644
--- a/src/submit-bar/index.less
+++ b/src/submit-bar/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van-submit-bar {
   position: fixed;
@@ -6,10 +7,9 @@
   left: 0;
   z-index: @submit-bar-z-index;
   width: 100%;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
   background-color: @submit-bar-background-color;
   user-select: none;
+  .safe-area-inset-bottom();
 
   &__tip {
     padding: @submit-bar-tip-padding;
diff --git a/src/tabbar/index.less b/src/tabbar/index.less
index fe25f9328..20384af74 100644
--- a/src/tabbar/index.less
+++ b/src/tabbar/index.less
@@ -1,4 +1,5 @@
 @import '../style/var';
+@import '../style/mixins/safe-area.less';
 
 .van-tabbar {
   z-index: @tabbar-z-index;
@@ -6,9 +7,8 @@
   box-sizing: content-box;
   width: 100%;
   height: @tabbar-height;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
   background-color: @tabbar-background-color;
+  .safe-area-inset-bottom();
 
   &--fixed {
     position: fixed;