[MD Bookmarks] Add search.

chrome/browser/resources/md_bookmarks/store.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var BookmarksStore = Polymer({
   is: 'bookmarks-store',
 
   properties: {
     /** @type {BookmarkTreeNode} */
     rootNode: {
       type: Object,
       notify: true,
     },
 
     selectedId: {

[tsergeant, 2017/01/12 23:44:20]

I think you'll need to put /** @type {?string} */ here. If that doesn't work,
I'll debug with you in person.

[angelayang, 2017/01/13 00:25:11]

yep that works thankyou

       type: String,
-      observer: 'updateSelectedNode_',
+      observer: 'updateSelectedDisplay_',
       notify: true,

[tsergeant, 2017/01/12 23:44:21]

While you're here:

selectedId is public, but never used by anyone outside of bookmarks-store. Maybe
we should just make it private? I can't really think of any need for it to stay
public.

[angelayang, 2017/01/13 00:25:11]

left public for URL/router

     },
 
-    /** @type {BookmarkTreeNode} */
-    selectedNode: {
-      type: Object,
+    searchTerm: {
+      type: String,
+      observer: 'updateSearchDisplay_',
+      notify: true,
+    },
+
+    /**
+     * This updates to either the result of a search or the contents of the
+     * selected folder.
+     * @type {Array<BookmarkTreeNode>}
+     */
+    displayedList: {
+      type: Array,
       notify: true,
       readOnly: true,
     },
 
     idToNodeMap_: Object,
   },
 
   /** @private {Object} */
   documentListeners_: null,
 
   /** @override */
   attached: function() {
     this.documentListeners_ = {
       'selected-folder-changed': this.onSelectedFolderChanged_.bind(this),
       'folder-open-changed': this.onFolderOpenChanged_.bind(this),
+      'search-term-changed': this.onSearchTermChanged_.bind(this),
     };
     for (var event in this.documentListeners_)
       document.addEventListener(event, this.documentListeners_[event]);
   },
 
   /** @override */
   detached: function() {
     for (var event in this.documentListeners_)
       document.removeEventListener(event, this.documentListeners_[event]);
   },
@@ skipping 20 matching lines @@
    */
   setupStore_: function(rootNode) {
     this.rootNode = rootNode;
     this.idToNodeMap_ = {};
     this.rootNode.path = 'rootNode';
     BookmarksStore.generatePaths(rootNode, 0);
     BookmarksStore.initNodes(this.rootNode, this.idToNodeMap_);
     this.fire('selected-folder-changed', this.rootNode.children[0].id);
   },
 
+  /** @private */
+  deselectFolders_: function() {
+    this.unlinkPaths('displayedList');
+    this.set(this.idToNodeMap_[this.selectedId].path + '.isSelected', false);
+    this.selectedId = null;

[angelayang, 2017/01/12 07:51:24]

This is the closure compilation error.
##     found   : null
##     required: string
##     this.selectedId = null;
##     ^^^^^^^^^^^^^^^^^^^^^^

[angelayang, 2017/01/13 00:25:11]

Done.

+  },
+
   /**
    * @param {BookmarkTreeNode} folder
    * @private
    * @return {boolean}
    */
   isAncestorOfSelected_: function(folder) {
-    return this.selectedNode.path.startsWith(folder.path);
+    if (!this.selectedId)
+      return false;
+
+    var selectedNode = this.idToNodeMap_[this.selectedId];
+    return selectedNode.path.startsWith(folder.path);
   },
 
   /** @private */
-  updateSelectedNode_: function() {
+  updateSearchDisplay_: function() {
+    if (this.searchTerm == '') {
+      this.fire('selected-folder-changed', this.rootNode.children[0].id);
+    } else {
+      chrome.bookmarks.search(this.searchTerm, function(results) {
+        if (this.selectedId)
+          this.deselectFolders_();
+
+        this._setDisplayedList(results);
+      }.bind(this));
+    }
+  },
+
+  /** @private */
+  updateSelectedDisplay_: function() {
+    // Don't change to the selected display if ID was cleared.
+    if (!this.selectedId)
+      return;
+
     var selectedNode = this.idToNodeMap_[this.selectedId];
-    this.linkPaths('selectedNode', selectedNode.path);
-    this._setSelectedNode(selectedNode);
+    this.linkPaths('displayedList', selectedNode.path + '.children');
+    this._setDisplayedList(selectedNode.children);
   },
 
   /**
    * Remove all descendants of a given node from the map.
    * @param {string} id
    * @private
    */
   removeDescendantsFromMap_: function(id) {
     var node = this.idToNodeMap_[id];
     if (!node)
@@ skipping 12 matching lines @@
   /**
    * Callback for when a bookmark node is removed.
    * If a folder is selected or is an ancestor of a selected folder, the parent
    * of the removed folder will be selected.
    * @param {string} id The id of the removed bookmark node.
    * @param {!{index: number,
    *           parentId: string,
    *           node: BookmarkTreeNode}} removeInfo
    */
   onBookmarkRemoved_: function(id, removeInfo) {
-    if (this.isAncestorOfSelected_(this.idToNodeMap_[id]))
+    if (this.isAncestorOfSelected_(this.idToNodeMap_[id])) {

[tsergeant, 2017/01/12 23:44:21]

No need to add {} here

[angelayang, 2017/01/13 00:25:11]

Done.

       this.fire('selected-folder-changed', removeInfo.parentId);
+    }
 
     var parentNode = this.idToNodeMap_[removeInfo.parentId];
     this.splice(parentNode.path + '.children', removeInfo.index, 1);
     this.removeDescendantsFromMap_(id);
     BookmarksStore.generatePaths(parentNode, removeInfo.index);
+
+    // Regenerate the search list if its displayed.
+    if (this.searchTerm)
+      this.updateSearchDisplay_();
   },
 
   /**
    * Called when the title of a bookmark changes.
    * @param {string} id The id of changed bookmark node.
    * @param {!Object} changeInfo
    */
   onBookmarkChanged_: function(id, changeInfo) {
     if (changeInfo.title)
       this.set(this.idToNodeMap_[id].path + '.title', changeInfo.title);
     if (changeInfo.url)
       this.set(this.idToNodeMap_[id].path + '.url', changeInfo.url);

[tsergeant, 2017/01/12 23:44:20]

Should the search list also be refreshed here?

[angelayang, 2017/01/13 00:25:11]

Yes it definitely should :) 

   },
 
 ////////////////////////////////////////////////////////////////////////////////
 // bookmarks-store, bookmarks app event listeners:
 
   /**
+   * @param {Event} e
+   * @private
+   */
+  onSearchTermChanged_: function(e) {
+    this.searchTerm = /** @type {string} */ (e.detail);
+  },
+
+  /**
    * Selects the folder specified by the event and deselects the previously
    * selected folder.
    * @param {CustomEvent} e
    * @private
    */
   onSelectedFolderChanged_: function(e) {
+    if (this.searchTerm)
+      this.searchTerm = '';
+
     // Deselect the old folder if defined.
     if (this.selectedId)
       this.set(this.idToNodeMap_[this.selectedId].path + '.isSelected', false);
 
     var selectedId = /** @type {string} */ (e.detail);
     var newFolder = this.idToNodeMap_[selectedId];
     this.set(newFolder.path + '.isSelected', true);
     this.selectedId = selectedId;
   },
 
@@ skipping 41 matching lines @@
     idToNodeMap[bookmarkNode.id] = bookmarkNode;
 
   if (bookmarkNode.url)
     return;
 
   bookmarkNode.isSelected = false;
   bookmarkNode.isOpen = true;
   for (var i = 0; i < bookmarkNode.children.length; i++)
     BookmarksStore.initNodes(bookmarkNode.children[i], idToNodeMap);
 };