Trigger afterPopupVisibleChange after portal updated

Author: yesmeck

package.json

@@ -61,6 +61,6 @@
     "prop-types": "15.x",
     "rc-align": "2.x",
     "rc-animate": "2.x",
-    "rc-util": "^4.1.0"
+    "rc-util": "^4.2.0"
   }
 }

src/index.js

@@ -126,6 +126,9 @@ const Trigger = createReactClass({
     } else {
       popupVisible = !!props.defaultPopupVisible;
     }
+
+    this.prevPopupVisible = popupVisible;
+
     return {
       popupVisible,
     };
@@ -163,10 +166,10 @@ const Trigger = createReactClass({
     };
     if (!IS_REACT_16) {
       this.renderComponent(null, triggerAfterPopupVisibleChange);
-    } else {
-      triggerAfterPopupVisibleChange();
     }
 
+    this.prevPopupVisible = prevState.popupVisible;
+
     // We must listen to `mousedown`, edge case:
     // https://github.com/ant-design/ant-design/issues/5804
     // https://github.com/react-component/calendar/issues/250
@@ -313,6 +316,12 @@ const Trigger = createReactClass({
     }
   },
 
+  handlePortalUpdate() {
+    if (this.prevPopupVisible !== this.state.popupVisible) {
+      this.props.afterPopupVisibleChange(this.state.popupVisible);
+    }
+  },
+
   getPopupDomNode() {
     // for test
     if (this._component && this._component.getPopupDomNode) {
@@ -574,6 +583,7 @@ const Trigger = createReactClass({
         <Portal
           key="portal"
           getContainer={this.getContainer}
+          didUpdate={this.handlePortalUpdate}
         >
           {this.getComponent()}
         </Portal>