MD Bookmarks: Allow 'complex' actions to access the page state directly

chrome/browser/resources/md_bookmarks/actions.js

 // Copyright 2017 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.
 
 /**
- * @fileoverview Module for functions which produce action objects. These are
- * listed in one place to document available actions and their parameters.
+ * @fileoverview Module for functions which create actions that do not
+ * rely on Page state.
  */
 
 cr.define('bookmarks.actions', function() {
   /**
    * @param {string} id
    * @param {BookmarkTreeNode} treeNode
    */
   function createBookmark(id, treeNode) {
     return {
       name: 'create-bookmark',
@@ skipping 33 matching lines @@
       index: index,
       oldParentId: oldParentId,
       oldIndex: oldIndex,
     };
   }
 
   /**
    * @param {string} id
    * @param {string} parentId
    * @param {number} index
-   * @param {NodeList} nodes
+   * @param {!Set<string>} descendants
    * @return {!Action}
    */
-  function removeBookmark(id, parentId, index, nodes) {
-    var descendants = bookmarks.util.getDescendants(nodes, id);
+  function removeBookmarkSubtree(id, parentId, index, descendants) {
     return {
       name: 'remove-bookmark',
       id: id,
       descendants: descendants,
       parentId: parentId,
       index: index,
     };
   }
 
   /**
@@ skipping 32 matching lines @@
     };
   }
 
   /** @return {!Action} */
   function clearSearch() {
     return {
       name: 'clear-search',
     };
   }
 
+  /**
+   * TODO(tsergeant): Make |items| a Set instead of an Array.
+   * @param {!Array<string>} items
+   * @param {string} anchor
+   * @param {boolean} add
+   * @return {!Action}
+   */
+  function selectItemSet(items, anchor, add) {
+    return {
+      name: 'select-items',
+      items: items,
+      anchor: anchor,
+      add: add,
+    };
+  }
+
   /** @return {!Action} */
   function deselectItems() {
     return {
       name: 'deselect-items',
     };
   }
 
-  /**
-   * @param {string} id
-   * @param {boolean} add
-   * @param {boolean} range
-   * @param {BookmarksPageState} state
-   * @return {!Action}
-   */
-  function selectItem(id, add, range, state) {
-    var anchor = state.selection.anchor;
-    var toSelect = [];
-
-    // TODO(tsergeant): Make it possible to deselect items by ctrl-clicking them
-    // again.
-    if (range && anchor) {
-      var displayedList = bookmarks.util.getDisplayedList(state);
-      var selectedIndex = displayedList.indexOf(id);
-      assert(selectedIndex != -1);
-      var anchorIndex = displayedList.indexOf(anchor);
-      if (anchorIndex == -1)
-        anchorIndex = selectedIndex;
-
-      var startIndex = Math.min(anchorIndex, selectedIndex);
-      var endIndex = Math.max(anchorIndex, selectedIndex);
-
-      for (var i = startIndex; i <= endIndex; i++)
-        toSelect.push(displayedList[i]);
-    } else {
-      toSelect.push(id);
-    }
-
-    return {
-      name: 'select-items',
-      add: add,
-      anchor: id,
-      items: toSelect,
-    };
-  }
-
   /**
    * @param {string} term
    * @return {!Action}
    */
   function setSearchTerm(term) {
     if (!term)
       return clearSearch();
 
     return {
       name: 'start-search',
@@ skipping 13 matching lines @@
   }
 
   return {
     changeFolderOpen: changeFolderOpen,
     clearSearch: clearSearch,
     createBookmark: createBookmark,
     deselectItems: deselectItems,
     editBookmark: editBookmark,
     moveBookmark: moveBookmark,
     refreshNodes: refreshNodes,
-    removeBookmark: removeBookmark,
+    removeBookmarkSubtree: removeBookmarkSubtree,
     selectFolder: selectFolder,
-    selectItem: selectItem,
+    selectItemSet: selectItemSet,
     setSearchResults: setSearchResults,
     setSearchTerm: setSearchTerm,
   };
 });