From 2890a55ed8a0c3f4ac25053f3195e72671c8f955 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 16 Nov 2017 04:56:24 -0600
Subject: [PATCH] [new feature] optimize find-parent (#325)

* fix: Tabbar icon line-height

* [new feature] progress add showPivot prop

* [new feature] TabItem support vue-router

* [new feature] update document header style

* [Doc] add toast english ducoment

* [bugfix] Search box-sizing wrong

* [Doc] update vant-demo respo

* [Doc] translate theme & demo pages

* [Doc] add Internationalization document

* [bugfix] remove unnecessary props

* [fix] optimize clickoutside

* [new feature] optimize find-parent
---
 packages/checkbox/index.vue    |  4 ++--
 packages/mixins/find-parent.js | 22 ++++++++++++++++++++++
 packages/mixins/findParent.js  | 22 ----------------------
 packages/radio/index.vue       |  4 ++--
 packages/tab/index.vue         |  4 ++--
 5 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 packages/mixins/find-parent.js
 delete mode 100644 packages/mixins/findParent.js

diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index a0349490a..df41f2707 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -22,7 +22,7 @@
 
 <script>
 import Icon from '../icon';
-import findParent from '../mixins/findParent';
+import findParent from '../mixins/find-parent';
 
 export default {
   name: 'van-checkbox',
@@ -52,7 +52,7 @@ export default {
   computed: {
     // whether is in van-checkbox-group
     isGroup() {
-      return !!this.findParentByComponentName('van-checkbox-group');
+      return !!this.findParentByName('van-checkbox-group');
     },
 
     currentValue: {
diff --git a/packages/mixins/find-parent.js b/packages/mixins/find-parent.js
new file mode 100644
index 000000000..a48dfe0e9
--- /dev/null
+++ b/packages/mixins/find-parent.js
@@ -0,0 +1,22 @@
+/**
+ * find parent component by name
+ */
+
+export default {
+  methods: {
+    findParentByName(name) {
+      if (!this.parentGroup) {
+        let parent = this.$parent;
+        while (parent) {
+          if (parent.$options.name === name) {
+            this.parentGroup = parent;
+            break;
+          }
+          parent = parent.$parent;
+        }
+      }
+
+      return this.parentGroup;
+    }
+  }
+};
diff --git a/packages/mixins/findParent.js b/packages/mixins/findParent.js
deleted file mode 100644
index 9c4ec13f4..000000000
--- a/packages/mixins/findParent.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * 根据父组件名找到对应`parent`
- */
-export default {
-  methods: {
-    findParentByComponentName(name) {
-      if (this.parentGroup) return;
-
-      let parent = this.$parent;
-      while (parent) {
-        if (parent.$options.name === name) {
-          this.parentGroup = parent;
-          break;
-        } else {
-          parent = parent.$parent;
-        }
-      }
-
-      return this.parentGroup;
-    }
-  }
-};
diff --git a/packages/radio/index.vue b/packages/radio/index.vue
index 764605c83..7b19e6198 100644
--- a/packages/radio/index.vue
+++ b/packages/radio/index.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import findParent from '../mixins/findParent';
+import findParent from '../mixins/find-parent';
 
 export default {
   name: 'van-radio',
@@ -40,7 +40,7 @@ export default {
 
   computed: {
     isGroup() {
-      return !!this.findParentByComponentName('van-radio-group');
+      return !!this.findParentByName('van-radio-group');
     },
 
     currentValue: {
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
index 2b195283e..7a6b4c8c7 100644
--- a/packages/tab/index.vue
+++ b/packages/tab/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import findParent from '../mixins/findParent';
+import findParent from '../mixins/find-parent';
 
 export default {
   name: 'van-tab',
@@ -21,7 +21,7 @@ export default {
   },
 
   data() {
-    this.findParentByComponentName('van-tabs');
+    this.findParentByName('van-tabs');
     const nextIndex = this.parentGroup.tabs.length;
     this.updateParentData(nextIndex);
     return {