katalyst-navigation 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c41babca4e58e13c18e53437a8992f93a1f2e82566542ed43dd8f62a2a0a83f
-  data.tar.gz: 4d3ea6600b660cf877ac8c53aa81be4367169ea27ffca16d86374ca0a61a0b41
+  metadata.gz: e67d176cb768b324a1be109e98dc001bd9ce8419abba00d4856cd0d3c84dc6c9
+  data.tar.gz: 35555b9bac352c1e21786dcdddc638ccc3929e314003c7859dc3be56ad13c03e
 SHA512:
-  metadata.gz: dfff1369051123cbd3411fe4d873a8a1bee97166c09f05c117f6df9a11b0a0b618d8255349aed78213b76ee5b8c078807d904fd51899e803e2222f56d9beb086
-  data.tar.gz: 07e367633bd15cc6f84aa242d5f785e82822f9354482ed071a90e4ed975aa4ed40eeac22bea5d30ab949031d7aa6702cfd18c7fae6f3f9beb08d2c202dbd6d1d
+  metadata.gz: 4ba4e987c87e8dfe56def8ef4d2f9214c7376cd285385008079b82b84f2ed44e354248d1d8aceaa50f2ac0cad81311935b038c5cedaff9001ab38199bea61b8a
+  data.tar.gz: 0ac8744ff0e111c921974d82951f4c7b09f57df32d1c93d8c5cff0474de53b5254d53bbc2129d90ca81597ae08c8166e843f0609e58bd5c6311606da0fa1f4f7

data/app/assets/javascripts/controllers/navigation/editor/menu_controller.js

@@ -41,9 +41,7 @@ export default class MenuController extends Controller {
   nest(event) {
     const item = getEventItem(event);
 
-    item.traverse((child) => {
-      child.depth += 1;
-    });
+    item.nest();
 
     this.#update();
     event.preventDefault();
@@ -52,9 +50,7 @@ export default class MenuController extends Controller {
   deNest(event) {
     const item = getEventItem(event);
 
-    item.traverse((child) => {
-      child.depth -= 1;
-    });
+    item.deNest();
 
     this.#update();
     event.preventDefault();

data/app/assets/javascripts/utils/navigation/editor/item.js

@@ -128,6 +128,39 @@ export default class Item {
     expanded.forEach((item) => item.traverse(callback));
   }
 
+  /**
+   * Increase the depth of this item and its descendants.
+   * If this causes it to become a child of a collapsed item, then collapse this item.
+   */
+  nest() {
+    this.traverse((child) => {
+      child.depth += 1;
+    });
+
+    if (this.previousItem.hasCollapsedDescendants()) {
+      this.previousItem.collapseChild(this);
+    }
+  }
+
+  /**
+   * Move the given item into this element's hidden children list.
+   * Assumes the list already exists.
+   *
+   * @param item {Item}
+   */
+  collapseChild(item) {
+    this.#childrenListElement.appendChild(item.node);
+  }
+
+  /**
+   * Decrease the depth of this item (and its descendants).
+   */
+  deNest() {
+    this.traverse((child) => {
+      child.depth -= 1;
+    });
+  }
+
   /**
    * Collapses visible (logical) children into this element's hidden children
    * list, creating it if it doesn't already exist.
@@ -162,10 +195,12 @@ export default class Item {
    * @param deny {boolean}
    */
   toggleRule(rule, deny = false) {
-    if (this.node.dataset.hasOwnProperty(rule) && !deny)
+    if (this.node.dataset.hasOwnProperty(rule) && !deny) {
       delete this.node.dataset[rule];
-    if (!this.node.dataset.hasOwnProperty(rule) && deny)
+    }
+    if (!this.node.dataset.hasOwnProperty(rule) && deny) {
       this.node.dataset[rule] = "";
+    }
 
     if (rule === "denyDrag") {
       if (!this.node.hasAttribute("draggable") && !deny) {

data/app/assets/stylesheets/katalyst/navigation/editor/_index.scss

@@ -118,7 +118,7 @@ $status-dirty-color: #aaa !default;
 }
 
 // Ensures vertical alignment of header with rows
-[data-controller="navigation--editor-menu"] {
+[data-controller="navigation--editor--menu"] {
   [role="rowheader"] {
     min-height: var(--row-height);
     background: var(--table-header-color);

data/app/helpers/katalyst/navigation/editor/item.rb

@@ -14,13 +14,6 @@ module Katalyst
           end
         end
 
-        def build_all(*items)
-          render partial:    "katalyst/navigation/menus/link_item",
-                 layout:     "katalyst/navigation/menus/navigation_menu_link",
-                 collection: items,
-                 as:         :item
-        end
-
         def accordion_actions
           tag.div role: "toolbar", data: { tree_accordion_controls: "" } do
             concat tag.span(role: "button", value: "collapse",

data/app/views/katalyst/navigation/menus/_item.html.erb

@@ -2,7 +2,7 @@
   <div class="tree" data-invisible="<%= !item.visible? %>">
     <%= builder.accordion_actions %>
 
-    <span role="img" value="<%= item.url.present? ? "link" : "title" %>" title="Hidden"></span>
+    <span role="img" value="<%= item.url.present? ? "link" : "title" %>" title="Type"></span>
     <h4 class="title" title="<%= item.title %>"><%= item.title %></h4>
     <span role="img" value="invisible" title="Hidden"></span>
   </div>

data/lib/katalyst/navigation/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Navigation
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-navigation
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email: