From fb43c1f1a907a36b48b573d403a53e7d80180158 Mon Sep 17 00:00:00 2001
From: dolymood <dolymood@gmail.com>
Date: Fri, 6 Jul 2018 18:44:32 +0800
Subject: [PATCH] refactor(mixin): remove parent mixin, use provide and inject

---
 src/common/mixins/parent.js                   | 22 -------------------
 .../scroll-nav-bar/scroll-nav-bar.vue         |  8 +++++--
 .../scroll-nav/scroll-nav-panel.vue           |  3 +--
 src/components/scroll-nav/scroll-nav.vue      |  8 ++++---
 src/components/sticky/sticky-ele.vue          |  4 +---
 src/components/sticky/sticky.vue              |  8 ++++---
 6 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 src/common/mixins/parent.js

diff --git a/src/common/mixins/parent.js b/src/common/mixins/parent.js
deleted file mode 100644
index bee9621e..00000000
--- a/src/common/mixins/parent.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default function parentMixinCreator (relationKey, targetKey = 'relationParent') {
-  return {
-    created() {
-      this[targetKey] = this._getTargetParent()
-    },
-    destroyed() {
-      this[targetKey] = null
-    },
-    methods: {
-      _getTargetParent() {
-        let p = this.$parent
-        while (p) {
-          if (p[relationKey]) {
-            return p
-          }
-          p = p.$parent
-        }
-        return null
-      }
-    }
-  }
-}
diff --git a/src/components/scroll-nav-bar/scroll-nav-bar.vue b/src/components/scroll-nav-bar/scroll-nav-bar.vue
index 59d9a395..3b960dae 100644
--- a/src/components/scroll-nav-bar/scroll-nav-bar.vue
+++ b/src/components/scroll-nav-bar/scroll-nav-bar.vue
@@ -26,7 +26,6 @@
 
 <script type="text/ecmascript-6">
   import scrollMixin from '../../common/mixins/scroll'
-  import parentMixinCreator from '../../common/mixins/parent'
   import CubeScroll from '../scroll/scroll.vue'
 
   const DIRECTION_H = 'horizontal'
@@ -37,7 +36,12 @@
 
   export default {
     name: COMPONENT_NAME,
-    mixins: [scrollMixin, parentMixinCreator('isScrollNav', 'scrollNav')],
+    inject: {
+      scrollNav: {
+        default: null
+      }
+    },
+    mixins: [scrollMixin],
     props: {
       direction: {
         type: String,
diff --git a/src/components/scroll-nav/scroll-nav-panel.vue b/src/components/scroll-nav/scroll-nav-panel.vue
index e54ba4a6..ecb3ad83 100644
--- a/src/components/scroll-nav/scroll-nav-panel.vue
+++ b/src/components/scroll-nav/scroll-nav-panel.vue
@@ -8,14 +8,13 @@
 </template>
 
 <script type="text/ecmascript-6">
-  import parentMixinCreator from '../../common/mixins/parent'
   import CubeStickyEle from '../sticky/sticky-ele.vue'
 
   const COMPONENT_NAME = 'cube-scroll-nav-panel'
 
   export default {
     name: COMPONENT_NAME,
-    mixins: [parentMixinCreator('isScrollNav', 'scrollNav')],
+    inject: ['scrollNav'],
     props: {
       label: {
         type: [String, Number],
diff --git a/src/components/scroll-nav/scroll-nav.vue b/src/components/scroll-nav/scroll-nav.vue
index e04850ca..6c2f87d0 100644
--- a/src/components/scroll-nav/scroll-nav.vue
+++ b/src/components/scroll-nav/scroll-nav.vue
@@ -54,6 +54,11 @@
 
   export default {
     name: COMPONENT_NAME,
+    provide() {
+      return {
+        scrollNav: this
+      }
+    },
     mixins: [scrollMixin],
     props: {
       data: {
@@ -97,9 +102,6 @@
         this.$emit(EVENT_CHANGE, newVal)
       }
     },
-    beforeCreate() {
-      this.isScrollNav = true
-    },
     created() {
       this.navBar = null
       this.panels = []
diff --git a/src/components/sticky/sticky-ele.vue b/src/components/sticky/sticky-ele.vue
index db57ad96..202cb6d9 100644
--- a/src/components/sticky/sticky-ele.vue
+++ b/src/components/sticky/sticky-ele.vue
@@ -7,13 +7,11 @@
 </template>
 
 <script type="text/ecmascript-6">
-  import parentMixinCreator from '../../common/mixins/parent'
-
   const COMPONENT_NAME = 'cube-sticky-ele'
 
   export default {
     name: COMPONENT_NAME,
-    mixins: [parentMixinCreator('isSticky', 'sticky')],
+    inject: ['sticky'],
     props: {
       eleKey: {
         type: [Number, String]
diff --git a/src/components/sticky/sticky.vue b/src/components/sticky/sticky.vue
index c97eef7d..b9e4cf5f 100644
--- a/src/components/sticky/sticky.vue
+++ b/src/components/sticky/sticky.vue
@@ -26,6 +26,11 @@
 
   export default {
     name: COMPONENT_NAME,
+    provide() {
+      return {
+        sticky: this
+      }
+    },
     props: {
       pos: {
         type: Number,
@@ -106,9 +111,6 @@
         this.$emit(EVENT_DIFF_CHANGE, newVal, height)
       }
     },
-    beforeCreate() {
-      this.isSticky = true
-    },
     created() {
       this.fixedEleHeight = 0
       this.eles = []
-- 
GitLab