rails_accordion 1.0.0 → 1.0.2

data/app/assets/config/rails_accordion_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../builds

data/app/components/accordion_component.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
 class AccordionComponent < ViewComponent::Base
-
   def initialize(**args)
-    super
     @args = args.presence || {}
-    set_data_params
   end
 
   def call
-    content_tag(:div, content, **@args)
+    content_tag(:div, content, data: data_options, **@args)
   end
 
   private
 
-  def set_data_params
-    @args[:data] ||= {}
-    @args[:data][:controller] = [@args[:data][:controller], "accordion"].compact.join(" ")
-    @args[:data][:multiple_open] = @args.delete(:multiple_open) || RailsAccordion.configuration.multiple_open
-    @args[:data][:default_state] = @args.delete(:default_state) || RailsAccordion.configuration.default_state
+  def data_options
+    data = @args.delete(:data) || {}
+    {
+      controller: [data.delete(:controller), "accordion"].compact.join(" "),
+      accordion_multiple_open_value: @args.delete(:multiple_open) || RailsAccordion.configuration.multiple_open,
+      accordion_default_state_value: @args.delete(:default_state) || RailsAccordion.configuration.default_state,
+      **data
+    }
   end
 end

data/app/components/item_component.rb

@@ -5,13 +5,11 @@ class ItemComponent < ViewComponent::Base
   renders_one :header
 
   def initialize(**args)
-    super
     @args = args.presence || {}
-    set_classes
   end
 
   def call
-    content_tag :div, **@args do
+    content_tag :div, class: [@args.delete(:class), "accordion_item"].compact.join(" "), data: { accordion_target: "item" }, **@args do
       header_component + body_component
     end
   end
@@ -19,7 +17,7 @@ class ItemComponent < ViewComponent::Base
   private
 
   def header_component
-    content_tag :div, header, class: "accordion_toggle"
+    content_tag :div, header, class: "accordion_toggle", data: { action: "click->accordion#toggle" }
   end
 
   def body_component
@@ -32,10 +30,6 @@ class ItemComponent < ViewComponent::Base
     end
   end
 
-  def set_classes
-    @args[:class] = [@args[:class], "accordion_item"].compact.join(" ")
-  end
-
   def content_styles
     "transition-duration: #{parse_duration}ms;"
   end

data/app/helpers/rails_accordion/application_helper.rb

@@ -0,0 +1,15 @@
+module RailsAccordion
+  module ApplicationHelper
+    def accordion(**args, &block)
+      render AccordionComponent.new(**args), &block
+    end
+  
+    def accordion_item(**args, &block)
+      render ItemComponent.new(**args), &block
+    end
+  
+    def rails_accordion_assets
+      render "rails_accordion/assets"
+    end
+  end  
+end

data/app/javascript/controllers/accordion_controller.js

@@ -1,46 +1,39 @@
 import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  connect() {
-    this.initAccordion();
+  static targets = [ "item" ]
 
-    this.initDefaultState()
+  static values = {
+    multipleOpen: Boolean,
+    defaultState: String
   }
 
-  initDefaultState() {
-    const items = this.element.querySelectorAll('.accordion_item');
-
-    switch($(this.element).data('default-state')) {
+  connect() {
+    // inits default state for accordion
+    switch(this.defaultStateValue) {
       case 'all_closed':
-        this.hideAll(items);
+        this.hideAll(this.itemTargets);
         break;
       case 'all_opened':
-        this.showAll(items);
+        this.showAll(this.itemTargets);
         break;
       case 'first_opened':
-        this.hideAll(items)
-        this.open(items[0].querySelector('.accordion_content'))
+        this.hideAll(this.itemTargets)
+        this.open(this.itemTargets[0].querySelector('.accordion_content'))
     }
   }
 
-  initAccordion() {
-    const items = this.element.querySelectorAll('.accordion_item');
-
-    items.forEach((item) => {
-      const toggle = item.querySelector('.accordion_toggle');
-      const content = item.querySelector('.accordion_content')
-
-      toggle.addEventListener('click', (e) => {
-        if (content.classList.contains('accordion_active')) {
-          this.hide(content);
-        } else {
-          if ($(this.element).data('multiple-open') != true) {
-            this.hideAll(items);
-          }
-          this.open(content);
-        }
-      });
-    });
+  toggle(e) {
+    const content = e.currentTarget.parentNode.querySelector('.accordion_content')
+
+    if (content.classList.contains('accordion_active')) {
+      this.hide(content);
+    } else {
+      if (!this.multipleOpenValue) {
+        this.hideAll(this.itemTargets);
+      }
+      this.open(content);
+    }
   }
 
   hideAll(items) {
@@ -58,6 +51,12 @@ export default class extends Controller {
 
   open(item) {
     item.classList.add("accordion_active")
-    item.style.height = item.scrollHeight + 'px'
+    item.style.height = item.scrollHeight + 'px';
+
+    item.querySelectorAll('.accordion_content').forEach(function(child) {
+      new ResizeObserver(function() {
+        item.style.height = item.scrollHeight + 'px';
+      }).observe(child);
+    });
   }
 }

data/app/views/rails_accordion/_assets.html.erb

@@ -0,0 +1,2 @@
+<%= stylesheet_link_tag "/rails_accordion_assets/rails_accordion.css", "data-turbo-track": "reload", defer: true %>
+<%= javascript_include_tag "/rails_accordion_assets/rails_accordion.js", "data-turbo-track": "reload" %>

data/bin/rails

@@ -3,7 +3,6 @@
 # installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('..', __dir__)
-# ENGINE_PATH = File.expand_path('../lib/rails_table/engine', __dir__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)

data/lib/rails_accordion/engine.rb

@@ -0,0 +1,17 @@
+module RailsAccordion
+  class Engine < ::Rails::Engine
+    isolate_namespace RailsAccordion
+
+    initializer "rails_accordion.helpers" do
+      ActiveSupport.on_load :action_controller do
+        helper RailsAccordion::ApplicationHelper
+      end
+    end
+
+    config.app_middleware.use(
+      Rack::Static,
+      urls: ["/rails_accordion_assets"],
+      root: RailsAccordion::Engine.root.join("public")
+    )
+  end
+end

data/lib/rails_accordion.rb

@@ -7,32 +7,8 @@ loader.ignore("#{__dir__}/generators")
 loader.setup
 
 module RailsAccordion
-
-  class Error < StandardError; end
-
-  class Engine < ::Rails::Engine
-    isolate_namespace RailsAccordion
-
-    initializer "rails_accordion.importmap" do |app|
-      if defined?(Importmap)
-        app.config.assets.precompile << "rails_accordion.js"
-        app.config.assets.precompile << "rails_accordion.css"
-      end
-    end
-  end
-
-  class Railtie < Rails::Railtie
-    ActiveSupport.on_load :action_view do
-      include RailsAccordion
-    end
-  end
-
-  def accordion(**args, &block)
-    render AccordionComponent.new(**args), &block
-  end
-
-  def accordion_item(**args, &block)
-    render ItemComponent.new(**args), &block
+  def self.root
+    RailsAccordion::Engine.routes.find_script_name({})
   end
 end
 

data/lib/tasks/rails_accordion_tasks.rake

@@ -1,4 +1,7 @@
-# desc "Explaining what the task does"
-# task :rails_table do
-#   # Task goes here
-# end
+namespace :rails_accordion do
+  desc "Build for release"
+  task :build do
+    `yarn build`
+    `cp -r ./app/assets/builds/* ./public/rails_accordion_assets`
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_accordion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Ahmadshoh Nasrullozoda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stimulus-rails
@@ -70,11 +70,14 @@ files:
 - app/assets/builds/rails_accordion.css
 - app/assets/builds/rails_accordion.js
 - app/assets/builds/rails_accordion.js.map
+- app/assets/config/rails_accordion_manifest.js
 - app/assets/stylesheets/rails_accordion.css
 - app/components/accordion_component.rb
 - app/components/item_component.rb
+- app/helpers/rails_accordion/application_helper.rb
 - app/javascript/controllers/accordion_controller.js
 - app/javascript/rails_accordion.js
+- app/views/rails_accordion/_assets.html.erb
 - bin/console
 - bin/rails
 - bin/setup
@@ -82,12 +85,10 @@ files:
 - lib/generators/rails_accordion/templates/rails_accordion.tt
 - lib/rails_accordion.rb
 - lib/rails_accordion/configuration.rb
+- lib/rails_accordion/engine.rb
 - lib/rails_accordion/version.rb
 - lib/tasks/rails_accordion_tasks.rake
 - rails_accordion.gemspec
-- vendor/assets/javascripts/rails_accordion.js
-- vendor/assets/javascripts/rails_accordion.js.map
-- vendor/assets/stylesheets/rails_accordion.css
 homepage: https://github.com/Tajbrains/rails_accordion
 licenses:
 - MIT