Merge commit dev into dev-bl/edit-edge-lock

* commit '2554384120687f63033afdb1c73493cb08a8a644':
  dev-bl/select-node-onblur: When AutoComplete field loses focus, if the current value matches a node, select it.

Author: benloh

build/app/view/netcreate/components/AutoComplete.jsx

@@ -169,6 +169,7 @@ class AutoComplete extends UNISYS.Component {
       this.onSuggestionSelected        = this.onSuggestionSelected.bind(this);
       this.onSuggestionHighlighted     = this.onSuggestionHighlighted.bind(this);
       this.shouldRenderSuggestions     = this.shouldRenderSuggestions.bind(this);
+      this.onBlur                      = this.onBlur.bind(this);
 
       // NOTE: do this AFTER you have used bind() on the class method
       // otherwise the call will fail due to missing 'this' context
@@ -330,6 +331,13 @@ class AutoComplete extends UNISYS.Component {
 /*/ shouldRenderSuggestions (value) {
       return this.state.mode===MODE_ACTIVE;
     }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ The AutoComplete field has lost focus.
+    Check to see if it references a valid node, if so, select it
+/*/ onBlur (value) {
+      // User selected an existing node in the suggestion list
+      this.AppCall('SOURCE_SEARCH_AND_SELECT', { searchString: this.state.value } );
+    }
 
 /// REACT LIFECYCLE /////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -358,7 +366,8 @@ class AutoComplete extends UNISYS.Component {
       const inputProps = {
         placeholder : "Type node name...",
         value       : value,
-        onChange    : this.onInputChange
+        onChange    : this.onInputChange,
+        onBlur      : this.onBlur
       };
       let jsx;
 

build/app/view/netcreate/nc-logic.js

@@ -364,7 +364,8 @@ MOD.Hook("INITIALIZE", () => {
       SEE ALSO: AutoComplete.onSuggestionSelected() and
                 D3SimpleNetGraph._UpdateGraph click handler
   /*/
-  UDATA.HandleMessage("SOURCE_SELECT", function(data) {
+  UDATA.HandleMessage("SOURCE_SELECT", m_sourceSelect);
+  function m_sourceSelect (data) {
     if (DBG) console.log(PR, "SOURCE_SELECT got data", data);
 
     let { nodeLabels = [], nodeIDs = [] } = data;
@@ -413,7 +414,7 @@ MOD.Hook("INITIALIZE", () => {
 
     // Set the SELECTION state so that listeners such as NodeSelectors update themselves
     UDATA.SetAppState("SELECTION", newState);
-  });
+  }
 
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ SOURCE_SEARCH sets the current matching term as entered in an
@@ -432,6 +433,20 @@ MOD.Hook("INITIALIZE", () => {
     UDATA.SetAppState("SEARCH", newState);
   });
 
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
+  /*/ SOURCE_SEARCH_AND_SELECT first searches for an exact mathcing node
+      and if found, selects it.
+      This is called by AutoComplete onBlur in case we need to make an
+      implicit selection.
+  /*/
+  UDATA.HandleMessage("SOURCE_SEARCH_AND_SELECT", function (data) {
+    let { searchString } = data;
+    let node = m_FindMatchingNodesByLabel(searchString).shift();
+    if (node && (node.label === searchString)) {
+      m_sourceSelect({ nodeIDs: [node.id] });
+    }
+  });
+
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ SOURCE_HILITE updates the currently rolled-over node name in a list of
       selections.  The hilite can be selected via either the label or