advanced_select 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953976216c1b18428680721e8fc5158a86a3d8232990bda1d97210dc066c7e6c
-  data.tar.gz: 5f732a8ac9d8ea42dea6dd1c074d3f6ac1d4efddee82d2cdb63e386c4f657a10
+  metadata.gz: 8acafe10e284da26e61bec53737160926b3b6f43e51aa4d2a690e9a9b5a47367
+  data.tar.gz: c2465e1a792dc86ece9747b18fe2dcb3e077d706aed3e178515fe1376308067b
 SHA512:
-  metadata.gz: 41e49a91a3a045d7d405f43eb1d75eaf29606c20ac666602464dcab6e0b695582a26890ba7371111562e169cafe1992745dc8baf1dc4e9ab7d08a30d57fc94f4
-  data.tar.gz: b0caa43ec1b176d80c2b48f50782e9b0e5760bb6011dedb91e5329584d59206e478c5bf7992764886d54ee3a590ebf0db45f80490aceba14ea2c281ddc068acd
+  metadata.gz: d9a0cefc246959a5f8f5910e91e648f5654c55eee8bbb63ae78232c5abd9b7ab0b307eb04744f70016d5e23ab54cc3b7c9a6973c18b5d2ea3b885255a54e8c5a
+  data.tar.gz: 4e4143bb1da3fb3e50f5aa6fda9cce40f3631c6f7d0ba5b2185a5f06ca4cb9f0b16938932aca365206cf0391ac5b8151335ae1e32e1e5c9abd4a26447e383617

data/app/views/advanced_select/_options.html.erb

@@ -4,13 +4,15 @@
      aria-busy="false"
      <% if local_assigns[:multiple] %>aria-multiselectable="true"<% end %>
      role="listbox">
+  <% selected_option_ids = advanced_select_selected_option_ids(selected_options) %>
+
   <% advanced_select_option_groups(options).each do |group| %>
     <% if group[:label].present? %>
       <div class="<%= advanced_select_class(class_map, :group_label) %>"><%= group.fetch(:label) %></div>
     <% end %>
 
     <% group.fetch(:options).each do |option| %>
-      <%= render partial: "advanced_select/option", locals: { option: option, selected_options: selected_options, option_content_partial: option_content_partial, class_map: class_map } %>
+      <%= advanced_select_option_tag(option, selected_options, option_content_partial, class_map, selected_option_ids: selected_option_ids) %>
     <% end %>
   <% end %>
 

data/lib/advanced_select/helper.rb

@@ -60,6 +60,56 @@ module AdvancedSelect
       end.to_json
     end
 
+    def advanced_select_option_tag(option, selected_options, option_content_partial, class_map, selected_option_ids: nil)
+      selected = advanced_select_option_selected?(option, selected_options, selected_option_ids)
+
+      tag.button(
+        type: "button",
+        class: advanced_select_class(class_map, :option, (:option_selected if selected)),
+        role: "option",
+        aria: { selected: selected },
+        data: {
+          advanced_select_option: "",
+          action: "mouseenter->advanced-select#activateOption mousedown->advanced-select#choose",
+          advanced_select_value_param: option.fetch(:id),
+          advanced_select_submit_value_param: advanced_select_option_value(option),
+          advanced_select_label_param: advanced_select_option_label(option),
+          advanced_select_display_label_param: advanced_select_option_display_label(option)
+        }
+      ) do
+        safe_join([
+          tag.span(
+            (selected ? "\u2713" : ""),
+            class: advanced_select_class(class_map, :option_check),
+            data: { advanced_select_option_check: "" }
+          ),
+          advanced_select_option_content_tag(option, option_content_partial, class_map)
+        ])
+      end
+    end
+
+    def advanced_select_option_content_tag(option, option_content_partial, class_map)
+      if option_content_partial.present?
+        render partial: option_content_partial, locals: { option: option }
+      else
+        advanced_select_default_option_content_tag(option, class_map)
+      end
+    end
+
+    def advanced_select_default_option_content_tag(option, class_map)
+      description = advanced_select_option_description(option)
+      content = [tag.span(advanced_select_option_label(option))]
+
+      if description.present?
+        content << tag.span(
+          description,
+          class: advanced_select_class(class_map, :option_description)
+        )
+      end
+
+      tag.span(safe_join(content), class: advanced_select_class(class_map, :option_content))
+    end
+
     def advanced_select_options_for_render(options, selected_options, searchable)
       searchable ? selected_options.presence || options : options
     end
@@ -83,7 +133,15 @@ module AdvancedSelect
       end
     end
 
-    def advanced_select_option_selected?(option, selected_options)
+    def advanced_select_selected_option_ids(selected_options)
+      selected_options.each_with_object({}) do |selected_option, selected_option_ids|
+        selected_option_ids[selected_option.fetch(:id).to_s] = true
+      end
+    end
+
+    def advanced_select_option_selected?(option, selected_options, selected_option_ids = nil)
+      return selected_option_ids.key?(option.fetch(:id).to_s) if selected_option_ids
+
       selected_options.any? { |selected_option| selected_option.fetch(:id).to_s == option.fetch(:id).to_s }
     end
 

data/lib/advanced_select/version.rb

@@ -1,3 +1,3 @@
 module AdvancedSelect
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: advanced_select
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mehmet Celik
 - Tankut Ozbeyendir
+- Emre ULUSOY
 bindir: bin
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
@@ -86,6 +87,7 @@ description: AdvancedSelect provides helper-rendered Rails partials, Stimulus dr
 email:
 - mehmetcelik4@gmail.com
 - tankutozbeyendir@gmail.com
+- ulsyemr@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []