polaris_view_components 2.3.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb98f6ed98609f4a712c5b0c9711e7f8d01e4d3e4478929942e0dc50a97eb96
-  data.tar.gz: 67f60966dccce50b528834d4ec3cb220af8bab8422c9a0902975875445abff94
+  metadata.gz: 84f1b013b1c1b56632fecca163692825151171015df3b9edca221b21c12e87d2
+  data.tar.gz: 6ca879737c1a5e7730dc6299feb6101ec53cfe35bc929a632a8b1950157cd7f3
 SHA512:
-  metadata.gz: 55666e3992c1d19b86ea27f38519abc1af95633cb24e0f1e8233661f8de681f3923875a3fe37537ff1158c85a5cc5f49c98b5bb9b304d09940ce4768432b575f
-  data.tar.gz: 2f97473f885b40683351ce24cb7af5078ff629a56429bdefa0a1857b3f466d1a8c16d296bd50fddca30f93efc8fdf62a2006a2a22a2d07b84a10382600315d9f
+  metadata.gz: 0ad985b0add0dd115eefb5e94a64d5c53c8e5966bdfee188eec8e93da1c23ee327cc0bd0d35f62b11b178c6588bbc76cfeefb06de06d7eef1ac3faf0ff4cb50f
+  data.tar.gz: 25f136409d1e0c9aec94f43fc403a040f7f357cf1c53f5d9a1fe5ea567d6543cd9e0168b4d7b913e92c7842e5ee9efcf3fcafe5e064b79f4e9d17e6d429e2b97

data/app/assets/javascripts/polaris_view_components/autocomplete_controller.js

@@ -31,14 +31,14 @@ export default class extends Controller {
       detail: { value: input.value, label, selected: input.checked }
     })
 
-    this.element.dispatchEvent(changeEvent)
-
     if (!this.multipleValue) {
       this.popoverController.forceHide()
       this.inputTarget.value = label
       if (this.hasHiddenInputTarget)
         this.hiddenInputTarget.value = input.value
     }
+
+    this.element.dispatchEvent(changeEvent)
   }
 
   onInputChange = debounce(() => {

data/app/assets/javascripts/polaris_view_components/select_controller.js

@@ -11,4 +11,17 @@ export default class extends Controller {
     const option = this.selectTarget.options[this.selectTarget.selectedIndex]
     this.selectedOptionTarget.innerText = option.text
   }
+
+  clearErrorMessages() {
+    const polarisSelect = this.selectTarget.closest(".Polaris-Select")
+    const wrapper = polarisSelect.parentElement
+    const inlineError = wrapper.querySelector(".Polaris-InlineError")
+
+    if (polarisSelect) {
+      polarisSelect.classList.remove("Polaris-Select--error")
+    }
+    if (inlineError) {
+      inlineError.remove()
+    }
+  }
 }

data/app/assets/javascripts/polaris_view_components.js

@@ -203,12 +203,12 @@ class Autocomplete extends Controller {
         selected: input.checked
       }
     });
-    this.element.dispatchEvent(changeEvent);
     if (!this.multipleValue) {
       this.popoverController.forceHide();
       this.inputTarget.value = label;
       if (this.hasHiddenInputTarget) this.hiddenInputTarget.value = input.value;
     }
+    this.element.dispatchEvent(changeEvent);
   }
   onInputChange=debounce((() => {
     if (this.isRemote) {
@@ -2276,6 +2276,17 @@ class Select extends Controller {
     const option = this.selectTarget.options[this.selectTarget.selectedIndex];
     this.selectedOptionTarget.innerText = option.text;
   }
+  clearErrorMessages() {
+    const polarisSelect = this.selectTarget.closest(".Polaris-Select");
+    const wrapper = polarisSelect.parentElement;
+    const inlineError = wrapper.querySelector(".Polaris-InlineError");
+    if (polarisSelect) {
+      polarisSelect.classList.remove("Polaris-Select--error");
+    }
+    if (inlineError) {
+      inlineError.remove();
+    }
+  }
 }
 
 class TextField extends Controller {

data/app/components/polaris/button_component.html.erb

@@ -1,39 +1,49 @@
-<%= render Polaris::BaseComponent.new(tag: @tag, **system_arguments) do %>
-  <span class="Polaris-Button__Content">
-    <% if @loading %>
-      <span class="Polaris-Button__Spinner">
-        <%= polaris_spinner(size: :small) %>
-      </span>
-    <% end %>
+<% button_content = capture do %>
+  <%= render Polaris::BaseComponent.new(tag: @tag, **system_arguments) do %>
+    <span class="Polaris-Button__Content">
+      <% if @loading %>
+        <span class="Polaris-Button__Spinner">
+          <%= polaris_spinner(size: :small) %>
+        </span>
+      <% end %>
+
+      <% if icon.present? || @icon_name.present? %>
+        <div class="Polaris-Button__Icon">
+          <%= icon.presence || polaris_icon(name: @icon_name) %>
+        </div>
+        <% if content.present? && !@plain %>
+          &nbsp;
+        <% end %>
+      <% end %>
 
-    <% if icon.present? || @icon_name.present? %>
-      <div class="Polaris-Button__Icon">
-        <%= icon.presence || polaris_icon(name: @icon_name) %>
-      </div>
       <% if content.present? %>
-        &nbsp;
+        <div class="<%= @text_classes %>">
+          <%= content %>
+        </div>
       <% end %>
-    <% end %>
 
-    <% if content.present? %>
-      <div class="<%= @text_classes %>">
-        <%= content %>
-      </div>
-    <% end %>
+      <% if @disclosure.present? %>
+        <div class="Polaris-Button__Icon">
+          <% case @disclosure %>
+          <% when :down %>
+            <%= polaris_icon(name: "CaretDownIcon") %>
+          <% when :up %>
+            <%= polaris_icon(name: "CaretUpIcon") %>
+          <% when :select %>
+            <%= polaris_icon(name: "SelectIcon") %>
+          <% when :horizontal_dots %>
+            <%= polaris_icon(name: "MenuHorizontalIcon") %>
+          <% end %>
+        </div>
+      <% end %>
+    </span>
+  <% end %>
+<% end %>
 
-    <% if @disclosure.present? %>
-      <div class="Polaris-Button__Icon">
-        <% case @disclosure %>
-        <% when :down %>
-          <%= polaris_icon(name: "CaretDownIcon") %>
-        <% when :up %>
-          <%= polaris_icon(name: "CaretUpIcon") %>
-        <% when :select %>
-          <%= polaris_icon(name: "SelectIcon") %>
-        <% when :horizontal_dots %>
-          <%= polaris_icon(name: "MenuHorizontalIcon") %>
-        <% end %>
-      </div>
-    <% end %>
-  </span>
+<% if @tooltip.present? %>
+  <%= polaris_tooltip(text: @tooltip) do %>
+    <%= button_content %>
+  <% end %>
+<% else %>
+  <%= button_content %>
 <% end %>

data/app/components/polaris/headless_button.rb

@@ -43,6 +43,7 @@ module Polaris
       size: SIZE_DEFAULT,
       text_align: TEXT_ALIGN_DEFAULT,
       icon_name: nil,
+      tooltip: nil,
       **system_arguments
     )
       @tag = url.present? ? "a" : "button"
@@ -50,11 +51,12 @@ module Polaris
         "Polaris-Button__Text",
         "Polaris-Button--removeUnderline": plain && monochrome && remove_underline
       )
+      @plain = plain
       @loading = loading
       @disclosure = fetch_or_fallback(DISCLOSURE_OPTIONS, disclosure, DISCLOSURE_DEFAULT)
       @disclosure = :down if @disclosure === true
       @icon_name = icon_name
-
+      @tooltip = tooltip
       @system_arguments = system_arguments
       @system_arguments[:type] = submit ? "submit" : "button"
       if loading

data/app/components/polaris/labelled_component.rb

@@ -21,9 +21,13 @@ module Polaris
       @help_text = help_text
       @error = error
 
-      if label_action && label_action[:content].present?
-        label_content = label_action.delete(:content)
-        with_label_action(**label_action) { label_content }
+      if label_action
+        if label_action[:content].present?
+          label_content = label_action.delete(:content)
+          with_label_action(**label_action) { label_content }
+        elsif label_action[:icon_name].present?
+          with_label_action(**label_action)
+        end
       end
 
       @system_arguments = system_arguments

data/app/components/polaris/select_component.rb

@@ -21,6 +21,7 @@ module Polaris
       help_text: nil,
       error: false,
       grouped: false,
+      clear_errors_on_focus: false,
       wrapper_arguments: {},
       select_options: {},
       input_options: {},
@@ -69,6 +70,7 @@ module Polaris
         error: error
       }.merge(wrapper_arguments)
 
+      @clear_errors_on_focus = clear_errors_on_focus
       @select_options = select_options
 
       @input_options = input_options
@@ -77,6 +79,9 @@ module Polaris
       @input_options[:disabled] = disabled
       @input_options[:data] ||= {}
       prepend_option(@input_options[:data], :polaris_select_target, "select")
+      if @clear_errors_on_focus
+        prepend_option(@input_options[:data], :action, "click->polaris-select#clearErrorMessages")
+      end
       prepend_option(@input_options[:data], :action, "polaris-select#update")
     end
 

data/app/helpers/polaris/form_builder.rb

@@ -50,18 +50,14 @@ module Polaris
     end
 
     def polaris_text_field(method, **options, &block)
-      options[:error] ||= error_for(method)
-      if options[:error_hidden] && options[:error]
-        options[:error] = !!options[:error]
-      end
+      apply_error_options(options, method)
+
       render Polaris::TextFieldComponent.new(form: self, attribute: method, **options), &block
     end
 
     def polaris_select(method, **options, &block)
-      options[:error] ||= error_for(method)
-      if options[:error_hidden] && options[:error]
-        options[:error] = !!options[:error]
-      end
+      apply_error_options(options, method)
+
       value = object&.public_send(method)
       if value.present?
         options[:selected] = value
@@ -70,34 +66,25 @@ module Polaris
     end
 
     def polaris_check_box(method, **options, &block)
-      options[:error] ||= error_for(method)
-      if options[:error_hidden] && options[:error]
-        options[:error] = !!options[:error]
-      end
+      apply_error_options(options, method)
+
       render Polaris::CheckboxComponent.new(form: self, attribute: method, **options, &block)
     end
 
     def polaris_radio_button(method, **options, &block)
-      options[:error] ||= error_for(method)
-      if options[:error_hidden] && options[:error]
-        options[:error] = !!options[:error]
-      end
+      apply_error_options(options, method)
+
       render Polaris::RadioButtonComponent.new(form: self, attribute: method, **options, &block)
     end
 
     def polaris_dropzone(method, **options, &block)
-      options[:error] ||= error_for(method)
-      if options[:error_hidden] && options[:error]
-        options[:error] = !!options[:error]
-      end
+      apply_error_options(options, method)
+
       render Polaris::DropzoneComponent.new(form: self, attribute: method, **options, &block)
     end
 
     def polaris_collection_check_boxes(method, collection, value_method, text_method, **options, &block)
-      options[:error] ||= error_for(method)
-      if options[:error_hidden] && options[:error]
-        options[:error] = !!options[:error]
-      end
+      apply_error_options(options, method)
 
       value = object&.public_send(method)
       if value.present?
@@ -124,11 +111,19 @@ module Polaris
     end
 
     def polaris_autocomplete(method, **options, &block)
-      options[:error] ||= error_for(method)
+      apply_error_options(options, method)
+
+      render Polaris::AutocompleteComponent.new(form: self, attribute: method, name: method, **options), &block
+    end
+
+    private
+
+    def apply_error_options(options, method)
+      options[:error] ||= error_for(method) unless options.has_key?(:error)
+
       if options[:error_hidden] && options[:error]
         options[:error] = !!options[:error]
       end
-      render Polaris::AutocompleteComponent.new(form: self, attribute: method, name: method, **options), &block
     end
   end
 end

data/lib/polaris/view_components/version.rb

@@ -1,5 +1,5 @@
 module Polaris
   module ViewComponents
-    VERSION = "2.3.1"
+    VERSION = "2.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polaris_view_components
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Dan Gamble
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-16 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails