From 1b28680be123da921dc34fb47802d79cd1646579 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Thu, 19 Dec 2019 16:32:22 +0800
Subject: [PATCH] fix(Notify): fix safeAreaInsetTop not work (#2558)

fix #2540
---
 example/pages/notify/index.js   |  7 +++++++
 example/pages/notify/index.wxml |  6 +++++-
 packages/notify/index.ts        | 12 ++++++------
 packages/notify/index.wxml      |  5 ++++-
 packages/notify/notify.ts       |  3 ++-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/example/pages/notify/index.js b/example/pages/notify/index.js
index daf02e84..c21a87c1 100644
--- a/example/pages/notify/index.js
+++ b/example/pages/notify/index.js
@@ -27,5 +27,12 @@ Page({
       type,
       message: '通知内容'
     });
+  },
+
+  showSafe() {
+    Notify({
+      message: '通知内容',
+      safeAreaInsetTop: true
+    });
   }
 });
diff --git a/example/pages/notify/index.wxml b/example/pages/notify/index.wxml
index bac89cbf..c6a7cc33 100644
--- a/example/pages/notify/index.wxml
+++ b/example/pages/notify/index.wxml
@@ -18,4 +18,8 @@
   <van-button type="primary" bind:click="showCustomDuration">自定义时长</van-button>
 </demo-block>
 
-<van-notify id="van-notify" safe-area-inset-top />
+<demo-block padding title="插入状态栏高度">
+  <van-button type="primary" class="demo-margin-right" bind:click="showSafe">插入状态栏高度</van-button>
+</demo-block>
+
+<van-notify id="van-notify" />
diff --git a/packages/notify/index.ts b/packages/notify/index.ts
index b0eac383..95eda3b3 100644
--- a/packages/notify/index.ts
+++ b/packages/notify/index.ts
@@ -39,9 +39,9 @@ VantComponent({
       const { duration, onOpened } = this.data;
 
       clearTimeout(this.timer);
-      this.setData({
-        show: true
-      }, onOpened);
+      this.setData({ show: true });
+
+      wx.nextTick(onOpened);
 
       if (duration > 0 && duration !== Infinity) {
         this.timer = setTimeout(() => {
@@ -54,9 +54,9 @@ VantComponent({
       const { onClose } = this.data;
 
       clearTimeout(this.timer);
-      this.setData({
-        show: false
-      }, onClose);
+      this.setData({ show: false });
+
+      wx.nextTick(onClose);
     },
 
     onTap(event: Weapp.Event) {
diff --git a/packages/notify/index.wxml b/packages/notify/index.wxml
index 552b8e36..5ef0d8c4 100644
--- a/packages/notify/index.wxml
+++ b/packages/notify/index.wxml
@@ -9,7 +9,10 @@
     class="van-notify van-notify--{{ type }}"
     style="background:{{ background }};color:{{ color }};"
   >
-    <view wx:if="{{ safeAreaInsetTop }}" class="van-notify__safe-area"></view>
+    <view
+      wx:if="{{ safeAreaInsetTop }}"
+      style="height: {{ statusBarHeight }}px"
+    ></view>
     <text>{{ message }}</text>
   </view>
 </van-transition>
diff --git a/packages/notify/notify.ts b/packages/notify/notify.ts
index 37636c7d..dc13906a 100644
--- a/packages/notify/notify.ts
+++ b/packages/notify/notify.ts
@@ -23,6 +23,7 @@ const defaultOptions = {
   duration: 3000,
   zIndex: 110,
   color: WHITE,
+  safeAreaInsetTop: false,
   onClick: () => {},
   onOpened: () => {},
   onClose: () => {}
@@ -47,7 +48,7 @@ export default function Notify(options: NotifyOptions | string) {
   delete options.selector;
 
   if (notify) {
-    notify.set(options);
+    notify.setData(options);
     notify.show();
     return notify;
   }