reflex_behaviors 0.0.9 → 0.0.10

data/app/reflexes/reflex_behaviors/toggle_reflex.rb

@@ -4,18 +4,18 @@ class ReflexBehaviors::ToggleReflex < ReflexBehaviors::ApplicationReflex
   prevent_controller_action
 
   def show
-    if element.dataset.remember?
+    if element.remember == "true"
       state[element.aria.controls] = true
     else
       state.now[element.aria.controls] = true
     end
 
-    morph "##{render_payload[:id]}", render(render_payload.except(:id))
+    morph "##{element.morphs}", render(render_payload)
   end
 
   def hide
     state[element.aria.controls] = false
-    morph "##{render_payload[:id]}", render(render_payload.except(:id))
+    morph "##{element.morphs}", render(render_payload)
   end
 
   def toggle

data/lib/reflex_behaviors/engine.rb

@@ -2,6 +2,7 @@
 
 require "turbo_reflex"
 require_relative "version"
+require_relative "../../app/helpers/reflex_behaviors/application_helper"
 
 module ReflexBehaviors
   def self.config

data/lib/reflex_behaviors/tag_builders/base_tag_builder.rb

@@ -17,6 +17,21 @@ module ReflexBehaviors
           memo << location.path[(location.path.index(prefix) + prefix.length)..]
         end
       end
+
+      protected
+
+      def dehydrate_value(value)
+        return value.to_s unless value.respond_to?(:to_sgid_param)
+        value.try(:persisted?) ? value.to_sgid_param : nil
+      end
+
+      def dehydrate_hash(hash)
+        hash
+          .with_indifferent_access
+          .each_with_object({}.with_indifferent_access) do |(key, val), memo|
+            memo[key] = dehydrate_value(val)
+          end
+      end
     end
   end
 end

data/lib/reflex_behaviors/tag_builders/toggle_tags_builder.rb

@@ -4,50 +4,87 @@ require_relative "base_tag_builder"
 
 module ReflexBehaviors::TagBuilders
   class ToggleTagsBuilder < BaseTagBuilder
-    def trigger_tag(target:, render:, action: :toggle, disabled: false, **kwargs, &block)
+    def trigger_tag(
+      renders:, # REQUIRED - the partial path to render
+      morphs:, # REQUIRED - dom_id of the partial's outermost containing element
+      controls:, # REQUIRED - dom_id of the toggle target
+      assigns: {}, # assigns required to render the partial i.e. instance variables
+      locals: {}, # local_assigns required to render the parital
+      collapse_selector: nil, # CSS selector for other targets to collapse when the target is expanded
+      focus_selector: nil, # CSS selector for the element to focus when the target is expanded
+      method: :toggle, # reflex method to inovke (show, hide, toggle)
+      disabled: false, # disable the trigger
+      remember: false, # remember state between requests
+      **kwargs,
+      &block
+    )
       kwargs = kwargs.with_indifferent_access
-      kwargs[:id] ||= "#{target}-toggle-trigger"
+      kwargs[:id] ||= "#{controls}-toggle-trigger"
 
+      # reflex
+      kwargs[:data] ||= {}
+      kwargs[:data][:turbo_reflex] = "ReflexBehaviors::ToggleReflex##{method}" unless disabled
+
+      # target / aria
       kwargs[:aria] ||= {}
+      kwargs[:aria][:controls] = controls
+      kwargs[:aria][:expanded] = target_expanded?(controls)
       kwargs[:aria][:atomic] ||= true
       kwargs[:aria][:relevant] ||= "all"
-      kwargs[:aria].merge!(controls: target, expanded: target_expanded?(target))
 
-      kwargs[:data] ||= {}
-      kwargs[:data][:auto_collapse] = !!kwargs[:data][:auto_collapse]
-      kwargs[:data][:view_stack] = view_stack.to_json if Rails.env.development?
-      kwargs[:data][:remember] = !!kwargs[:data][:remember]
-      kwargs[:data][:render] = render
-      kwargs[:data][:turbo_reflex] = "ReflexBehaviors::ToggleReflex##{action}" unless disabled
+      # rendering
+      kwargs[:renders] = renders
+      kwargs[:morphs] = morphs
+      kwargs[:assigns] = dehydrate_hash(assigns).compact.to_json if assigns.present?
+      kwargs[:locals] = dehydrate_hash(locals).compact.to_json if locals.present?
+      kwargs[:view_stack] = view_stack.to_json if Rails.env.development?
 
-      content_tag("toggle-trigger", nil, kwargs, &block)
+      # misc
+      kwargs[:collapse_selector] = collapse_selector
+      kwargs[:focus_selector] = focus_selector
+      kwargs[:remember] = !!remember
+
+      args = kwargs.select { |_, value| value.present? }
+      content_tag("toggle-trigger", nil, args.transform_keys(&:dasherize), &block)
     end
 
-    def target_tag(id, expanded: false, **kwargs, &block)
+    def target_tag(
+      id, # REQUIRED - the dom_id for the element
+      collapse_on: [], # list of events that trigger collapse
+      collapse_selector: nil, # CSS selector for other targets to collapse when this target is expanded
+      expanded: false, # override to force expansion
+      focus_selector: nil, # CSS selector for the element to focus when content is expanded
+      **kwargs,
+      &block
+    )
       kwargs = kwargs.with_indifferent_access
       kwargs[:id] = id
+      kwargs[:collapse_on] = collapse_on.to_json if collapse_on.present?
+      kwargs[:collapse_selector] = collapse_selector
+      kwargs[:focus_selector] = focus_selector
       kwargs[:role] = "region"
 
+      # aria
       kwargs[:aria] ||= {}
-      kwargs[:aria][:label] ||= "Dynamic Content Region"
       kwargs[:aria][:live] ||= "polite"
 
-      kwargs[:data] ||= {}
-      kwargs[:data][:view_stack] = view_stack.to_json if Rails.env.development?
+      # rendering
+      kwargs[:view_stack] = view_stack.to_json if Rails.env.development?
 
+      args = kwargs.select { |_, value| value.present? }
       if expanded || target_expanded?(id)
-        content_tag("toggle-target", nil, kwargs, &block)
+        content_tag("toggle-target", nil, args.transform_keys!(&:dasherize), &block)
       else
-        content_tag("toggle-target", nil, kwargs)
+        content_tag("toggle-target", nil, args.transform_keys!(&:dasherize))
       end
     end
 
-    def target_expanded?(target)
-      !!turbo_reflex.state[target]
+    def target_expanded?(dom_id)
+      !!turbo_reflex.state[dom_id]
     end
 
-    def target_collapsed?(target)
-      !target_expanded?(target)
+    def target_collapsed?(dom_id)
+      !target_expanded?(dom_id)
     end
   end
 end

data/lib/reflex_behaviors/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReflexBehaviors
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reflex_behaviors",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Pre-built easy to use reactive TurboReflex behaviors for Rails/Hotwire apps.",
   "main": "app/javascript/index.js",
   "repository": "https://github.com/hopsoft/reflex_behaviors",