Merge pull request #151 from MercuryTechnologies/fixOnSelectionBug

Fix onSelection bug

Author: shirshendubhowmick

src/Wrapper.js

@@ -15,19 +15,27 @@ const checkedProps = {
   tag: PropTypes.string
 };
 
+const managerOptionsFromProps = (props) => {
+  return {
+    onMenuToggle: props.onMenuToggle,
+    onSelection: props.onSelection,
+    closeOnSelection: props.closeOnSelection,
+    closeOnBlur: props.closeOnBlur,
+    id: props.id
+  }
+}
+
 class AriaMenuButtonWrapper extends React.Component {
   static propTypes = checkedProps;
   static defaultProps = { tag: 'div' };
 
   constructor(props) {
     super(props);
-    this.manager = createManager({
-      onMenuToggle: this.props.onMenuToggle,
-      onSelection: this.props.onSelection,
-      closeOnSelection: this.props.closeOnSelection,
-      closeOnBlur: this.props.closeOnBlur,
-      id: this.props.id
-    });
+    this.manager = createManager(managerOptionsFromProps(props));
+  }
+
+  componentDidUpdate() {
+    this.manager.updateOptions(managerOptionsFromProps(this.props))
   }
 
   render() {

src/createManager.js

@@ -8,19 +8,7 @@ const focusGroupOptions = {
 
 const protoManager = {
   init(options) {
-    this.options = options || {};
-
-    if (typeof this.options.closeOnSelection === 'undefined') {
-      this.options.closeOnSelection = true;
-    }
-
-    if (typeof this.options.closeOnBlur === 'undefined') {
-      this.options.closeOnBlur = true;
-    }
-
-    if (this.options.id) {
-      externalStateControl.registerManager(this.options.id, this);
-    }
+    this.updateOptions(options);
 
     this.handleBlur = handleBlur.bind(this);
     this.handleSelection = handleSelection.bind(this);
@@ -42,6 +30,29 @@ const protoManager = {
     this.isOpen = false;
   },
 
+  updateOptions(options) {
+    const oldOptions = this.options;
+
+    this.options = options || this.options || {};
+
+    if (typeof this.options.closeOnSelection === 'undefined') {
+      this.options.closeOnSelection = true;
+    }
+
+    if (typeof this.options.closeOnBlur === 'undefined') {
+      this.options.closeOnBlur = true;
+    }
+
+    if (this.options.id) {
+      externalStateControl.registerManager(this.options.id, this);
+    }
+
+    if (oldOptions && oldOptions.id && oldOptions.id !== this.options.id) {
+      externalStateControl.unregisterManager(this.options.id, this);
+    }
+
+  },
+
   focusItem(index) {
     this.focusGroup.focusNodeAtIndex(index);
   },