katalyst-navigation 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7355ef157efbf9879accdafa63efa35f02815aa29be531d9e4f73289c130e433
-  data.tar.gz: 32cb8173a0f397d3b36491b35687b4a4848d5e7deed554742e5310d2a33b7a35
+  metadata.gz: c8641b8fd17205d9daa4beaf83301081e559193179c236ada502f251c577555b
+  data.tar.gz: 3fa8331ed9c531013405915b57dd998440b385ceaf662fe72cbe74a88d29bb4f
 SHA512:
-  metadata.gz: 52ec419f941ed4f1fb101206552c4bfde580a9c9afe8a50b63ca68ea2e569f6356a2feba27230bd9f7a6fec29f7c571703e7faee22007609aab393a0b21c7ba0
-  data.tar.gz: 0dbf4578c6b223b5fc6ab8f506cf4e45a392811ad181272352a64bdae83242367f927c7fa673349247f791b69387d08072c8f55b5609fa19d637880f2bf81c71
+  metadata.gz: 673b6803479f9d2b772e9bfbf0fbd05734794e334a4f9f14ace81dd83e8aca6c79554704595aa0bcbe8fdf92d5b309bffe4a5eba3c153dc6c83a5615bf6a3699
+  data.tar.gz: 325eea3d0caab65ea72dd948adcfc6a94f847d2d2ba158d281b75281edaf6b7204608fb01e001861709592acfbd545a2b0fabf122ed50cf43e06ca98d2d71797

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.2"
+    VERSION = "1.3.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-navigation
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -82,7 +82,6 @@ files:
 - lib/katalyst/navigation/config.rb
 - lib/katalyst/navigation/engine.rb
 - lib/katalyst/navigation/version.rb
-- lib/tasks/yarn.rake
 - spec/factories/katalyst/navigation/items.rb
 - spec/factories/katalyst/navigation/menus.rb
 homepage: https://github.com/katalyst/navigation

data/lib/tasks/yarn.rake

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-namespace :yarn do
-  desc "Install npm packages with yarn"
-  task install: :environment do
-    sh "yarn install"
-  end
-
-  desc "Lint JS/SCSS files using yarn (prettier)"
-  task lint: :install do
-    sh "yarn lint"
-  end
-
-  desc "Autoformat JS/SCSS files using yarn (prettier)"
-  task format: :install do
-    sh "yarn format"
-  end
-end