From 9d35d80ca08315ac47642e50a1e35f873ead9501 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 17 Dec 2018 21:16:40 +0800
Subject: [PATCH] fix: `Menu` flashing problem when scaling under `Layout`

---
 components/menu/index.jsx | 69 +++++++++++----------------------------
 1 file changed, 19 insertions(+), 50 deletions(-)

diff --git a/components/menu/index.jsx b/components/menu/index.jsx
index c814e6b51..716425080 100644
--- a/components/menu/index.jsx
+++ b/components/menu/index.jsx
@@ -53,6 +53,9 @@ const Menu = {
   created () {
     this.preProps = { ...this.$props }
   },
+  updated () {
+    this.propsUpdating = false
+  },
   watch: {
     mode (val, oldVal) {
       if (oldVal === 'inline' && val !== 'inline') {
@@ -63,59 +66,11 @@ const Menu = {
       this.setState({ sOpenKeys: val })
     },
     inlineCollapsed (val) {
-      if (!hasProp(this, 'openKeys')) {
-        if (val) {
-          this.switchingModeFromInline = true
-          this.inlineOpenKeys = this.sOpenKeys
-          this.setState({ sOpenKeys: [] })
-        } else {
-          this.setState({ sOpenKeys: this.inlineOpenKeys })
-          this.inlineOpenKeys = []
-        }
-      }
+      this.collapsedChange(val)
     },
-    // '$props': {
-    //   handler: function (nextProps) {
-    //     const { preProps, sOpenKeys } = this
-    //     if (preProps.mode === 'inline' && nextProps.mode !== 'inline') {
-    //       this.switchingModeFromInline = true
-    //     }
-    //     if (hasProp(this, 'openKeys')) {
-    //       this.setState({ sOpenKeys: nextProps.openKeys })
-    //       this.preProps = { ...nextProps }
-    //       return
-    //     }
-    //     if (nextProps.inlineCollapsed && !preProps.inlineCollapsed) {
-    //       this.switchingModeFromInline = true
-    //       this.inlineOpenKeys = sOpenKeys
-    //       this.setState({ sOpenKeys: [] })
-    //     }
-
-    //     if (!nextProps.inlineCollapsed && preProps.inlineCollapsed) {
-    //        this.setState({ sOpenKeys: this.inlineOpenKeys })
-    //        this.inlineOpenKeys = []
-    //     }
-    //     this.preProps = { ...nextProps }
-    //   },
-    //   deep: true,
-    // },
     'layoutSiderContext.sCollapsed': function (val) {
-      const { openKeys, sOpenKeys = [], prefixCls } = this
-      if (hasProp(this, 'openKeys')) {
-        this.setState({ sOpenKeys: openKeys })
-        return
-      }
-      if (val) {
-        this.switchingModeFromInline =
-        !!sOpenKeys.length && !!this.$el.querySelectorAll(`.${prefixCls}-submenu-open`).length
-        this.inlineOpenKeys = sOpenKeys
-        this.setState({ sOpenKeys: [] })
-      } else {
-        this.setState({ sOpenKeys: this.inlineOpenKeys })
-        this.inlineOpenKeys = []
-      }
+      this.collapsedChange(val)
     },
-
   },
   data () {
     const props = this.$props
@@ -138,6 +93,20 @@ const Menu = {
     }
   },
   methods: {
+    collapsedChange (val) {
+      if (this.propsUpdating) { return }
+      this.propsUpdating = true
+      if (!hasProp(this, 'openKeys')) {
+        if (val) {
+          this.switchingModeFromInline = true
+          this.inlineOpenKeys = this.sOpenKeys
+          this.setState({ sOpenKeys: [] })
+        } else {
+          this.setState({ sOpenKeys: this.inlineOpenKeys })
+          this.inlineOpenKeys = []
+        }
+      }
+    },
     restoreModeVerticalFromInline () {
       if (this.switchingModeFromInline) {
         this.switchingModeFromInline = false