From b87fd71959fef681d91587b6f6cc98e5d42e05cb Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 31 Mar 2020 06:57:22 +0800
Subject: [PATCH] feat(GoodsAction): enable safe-area-inset-bottom by default
 (#5955)

---
 src/goods-action/README.md       | 2 +-
 src/goods-action/README.zh-CN.md | 2 +-
 src/goods-action/demo/index.vue  | 8 ++++----
 src/goods-action/index.js        | 5 ++++-
 src/goods-action/index.less      | 1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/goods-action/README.md b/src/goods-action/README.md
index 714c2e1ce..c169e1d63 100644
--- a/src/goods-action/README.md
+++ b/src/goods-action/README.md
@@ -82,7 +82,7 @@ Use `badge` prop to show badge in icon
 
 | Attribute | Description | Type | Default |
 |------|------|------|------|
-| safe-area-inset-bottom | Whether to enable bottom safe area adaptation | *boolean* | `false` |
+| safe-area-inset-bottom | Whether to enable bottom safe area adaptation | *boolean* | `true` |
 
 ### GoodsActionIcon Props
 
diff --git a/src/goods-action/README.zh-CN.md b/src/goods-action/README.zh-CN.md
index ef152f087..04f81cccc 100644
--- a/src/goods-action/README.zh-CN.md
+++ b/src/goods-action/README.zh-CN.md
@@ -86,7 +86,7 @@ export default {
 
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|------|
-| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` |
+| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` |
 
 ### GoodsActionIcon Props
 
diff --git a/src/goods-action/demo/index.vue b/src/goods-action/demo/index.vue
index 181ee75d3..36001d5c4 100644
--- a/src/goods-action/demo/index.vue
+++ b/src/goods-action/demo/index.vue
@@ -1,7 +1,7 @@
 <template>
   <demo-section>
     <demo-block :title="t('basicUsage')">
-      <van-goods-action>
+      <van-goods-action :safe-area-inset-bottom="false">
         <van-goods-action-icon
           icon="chat-o"
           :text="t('icon1')"
@@ -26,7 +26,7 @@
     </demo-block>
 
     <demo-block :title="t('iconBadge')">
-      <van-goods-action>
+      <van-goods-action :safe-area-inset-bottom="false">
         <van-goods-action-icon icon="chat-o" dot :text="t('icon1')" />
         <van-goods-action-icon icon="cart-o" badge="5" :text="t('icon2')" />
         <van-goods-action-icon icon="shop-o" badge="12" :text="t('icon3')" />
@@ -36,7 +36,7 @@
     </demo-block>
 
     <demo-block v-if="!isWeapp" :title="t('customIconColor')">
-      <van-goods-action>
+      <van-goods-action :safe-area-inset-bottom="false">
         <van-goods-action-icon
           icon="chat-o"
           :text="t('icon1')"
@@ -54,7 +54,7 @@
     </demo-block>
 
     <demo-block :title="t('customButtonColor')">
-      <van-goods-action>
+      <van-goods-action :safe-area-inset-bottom="false">
         <van-goods-action-icon icon="chat-o" :text="t('icon1')" />
         <van-goods-action-icon icon="cart-o" :text="t('icon2')" />
         <van-goods-action-button
diff --git a/src/goods-action/index.js b/src/goods-action/index.js
index e677b7c50..1ea0a8a37 100644
--- a/src/goods-action/index.js
+++ b/src/goods-action/index.js
@@ -7,7 +7,10 @@ export default createComponent({
   mixins: [ParentMixin('vanGoodsAction')],
 
   props: {
-    safeAreaInsetBottom: Boolean,
+    safeAreaInsetBottom: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   render() {
diff --git a/src/goods-action/index.less b/src/goods-action/index.less
index a8931039a..c1ba67494 100644
--- a/src/goods-action/index.less
+++ b/src/goods-action/index.less
@@ -7,6 +7,7 @@
   left: 0;
   display: flex;
   align-items: center;
+  box-sizing: content-box;
   height: @goods-action-height;
   background-color: @goods-action-background-color;