From 5ee53016f73180a73428e338406eea6bd9325f09 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Fri, 4 Nov 2016 17:35:53 +0800
Subject: [PATCH] Message/Notification: manage z-index with PopupManager

---
 packages/message/src/main.js                | 2 ++
 packages/notification/src/main.js           | 2 ++
 packages/theme-default/src/message.css      | 1 -
 packages/theme-default/src/notification.css | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/message/src/main.js b/packages/message/src/main.js
index e4578f631..bc5414ca2 100644
--- a/packages/message/src/main.js
+++ b/packages/message/src/main.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { PopupManager } from 'vue-popup';
 let MessageConstructor = Vue.extend(require('./main.vue'));
 
 let instance;
@@ -27,6 +28,7 @@ var Message = function(options) {
   document.body.appendChild(instance.vm.$el);
   instance.vm.visible = true;
   instance.dom = instance.vm.$el;
+  instance.dom.style.zIndex = PopupManager.nextZIndex();
   instances.push(instance);
 };
 
diff --git a/packages/notification/src/main.js b/packages/notification/src/main.js
index 8dd441537..fda9d7cb8 100644
--- a/packages/notification/src/main.js
+++ b/packages/notification/src/main.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { PopupManager } from 'vue-popup';
 let NotificationConstructor = Vue.extend(require('./main.vue'));
 
 let instance;
@@ -22,6 +23,7 @@ var Notification = function(options) {
   document.body.appendChild(instance.vm.$el);
   instance.vm.visible = true;
   instance.dom = instance.vm.$el;
+  instance.dom.style.zIndex = PopupManager.nextZIndex();
 
   let topDist = 0;
   for (let i = 0, len = instances.length; i < len; i++) {
diff --git a/packages/theme-default/src/message.css b/packages/theme-default/src/message.css
index 3899245ed..7930137bc 100644
--- a/packages/theme-default/src/message.css
+++ b/packages/theme-default/src/message.css
@@ -16,7 +16,6 @@
     background-color: #fff;
     transition: opacity 0.3s, transform .4s;
     overflow: hidden;
-    z-index: var(--index-popper);
 
     @e group {
       margin-left: 38px;
diff --git a/packages/theme-default/src/notification.css b/packages/theme-default/src/notification.css
index b6952c296..a9840e15c 100644
--- a/packages/theme-default/src/notification.css
+++ b/packages/theme-default/src/notification.css
@@ -14,7 +14,6 @@
     box-shadow: var(--notification-shadow);
     transition: opacity 0.3s, transform .3s, right .3s, top 0.4s;
     overflow: hidden;
-    z-index: var(--index-popper);
 
     @e group {
       & span {