katalyst-navigation 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf8cc382bdaae60ca2a35d93dcdfe970e36d317912ed13038607e74cf68da45
-  data.tar.gz: '05539e1025ee15510fb6952a3bfec19534daa834af0dd80f303081badb3a68cf'
+  metadata.gz: 0430e1c7846b906e84d20fd7c0302b9a602a0a4427a925b12590983ec07a15c2
+  data.tar.gz: 85387acf67b2842d791daf9f7272b067cca28991913e36541eb7c6ef6b9aedf3
 SHA512:
-  metadata.gz: dd9484b91afa4c6e80347513fe063989b00f838b9b6ca7bd3ff448879f444a89a7789e9e3fe7216987f67ea23fa4ae036797841b6e8631be37b157b6000b807f
-  data.tar.gz: 650999ce4d2ead2f82c80ec97458edbc326c0c43c57c62a5bb72f86f1c79c7c8c0adee7dba0653b4ea09b05d135677ad4de582209b13d7d9a66592ca8b49a058
+  metadata.gz: '034680c7620436686cf44504c3b22fd93a23301678c86a61fd2741719bdc8b16a561bb09d44b61256c33c41ee09a9418df071b1274615a38ab5a337f54049310'
+  data.tar.gz: db8060ce2d4bc572340af555630db50a3dc117f64c5f74b8faa85d9b674a2ec16c6f9ecede44eb16722059358ccdd6ef9d5a2d5fde1a5dede83ce5c21ade9d8d

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

@@ -42,7 +42,7 @@ export default class Item {
    * @returns {number} logical nesting depth of node in menu
    */
   get depth() {
-    return parseInt(this.node.dataset[`navigationDepth`]);
+    return parseInt(this.node.dataset[`navigationDepth`]) || 0;
   }
 
   get #depthInput() {

data/app/helpers/katalyst/navigation/frontend/builder.rb

@@ -46,11 +46,11 @@ module Katalyst
         end
 
         def render_link(link)
-          link_to(link.title, link.url)
+          link_to(link.title, link.url, link.item_options)
         end
 
         def render_button(link)
-          link_to(link.title, link.url, method: link.http_method)
+          link_to(link.title, link.url, link.item_options)
         end
 
         private

data/app/models/katalyst/navigation/button.rb

@@ -14,6 +14,17 @@ module Katalyst
       def self.permitted_params
         super + %i[http_method]
       end
+
+      def options_for_target
+        options = super
+
+        if target == "_blank" || target == "_top" || target == "self"
+          options.deep_merge!({ data: { method: http_method } })
+        else
+          options.deep_merge!({ data: { turbo_method: http_method } })
+        end
+        options
+      end
     end
   end
 end

data/app/models/katalyst/navigation/item.rb

@@ -10,12 +10,16 @@ module Katalyst
 
       attr_accessor :parent, :children, :index, :depth
 
+      TARGETS = %i[self _top _blank kpop].index_by(&:itself).freeze
+
+      enum method: TARGETS, _prefix: :target
+
       def self.permitted_params
         %i[
           title
           url
           visible
-          new_tab
+          target
           type
         ]
       end
@@ -24,6 +28,22 @@ module Katalyst
         is_a? Layout
       end
 
+      # Entrypoint for combining additional options based on attribute rules
+      def item_options
+        options_for_target
+      end
+
+      def options_for_target
+        return {} if target == "self"
+
+        options = { target: target }
+
+        unless target == "_blank" || target == "_top"
+          options = { data: { turbo: true, turbo_frame: target } }
+        end
+        options
+      end
+
       private
 
       def initialize_tree

data/db/migrate/20220826034507_create_katalyst_navigation_items.rb

@@ -9,6 +9,7 @@ class CreateKatalystNavigationItems < ActiveRecord::Migration[7.0]
       t.string :title
       t.string :url
       t.string :http_method
+      t.string :target
       t.boolean :visible, default: true
 
       t.timestamps

data/lib/katalyst/navigation/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Navigation
-    VERSION = "1.3.1"
+    VERSION = "1.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-navigation
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email: