Add disabled options support to Select component

baoagency · Sep 6, 2021 · 6b76761 · 6b76761
1 parent ed5c998
commit 6b76761
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/app/components/polaris/select_component.html.erb b/app/components/polaris/select_component.html.erb
@@ -1,9 +1,18 @@
 <%= render Polaris::LabelledComponent.new(**@wrapper_arguments) do %>
   <%= render Polaris::BaseComponent.new(**@system_arguments) do %>
     <% if @form.present? && @attribute.present? %>
-      <%= @form.select(@attribute, options_for_select(@options, @selected), @select_options, @input_options) %>
+      <%= @form.select(
+        @attribute,
+        options_for_select(@options, selected: @selected, disabled: @disabled_options),
+        @select_options,
+        @input_options,
+      ) %>
     <% else %>
-      <%= select_tag(@name, options_for_select(@options, @selected), @input_options) %>
+      <%= select_tag(
+        @name,
+        options_for_select(@options, selected: @selected, disabled: @disabled_options),
+        @input_options,
+      ) %>
     <% end %>
 
     <div

diff --git a/app/components/polaris/select_component.rb b/app/components/polaris/select_component.rb
@@ -8,6 +8,7 @@ def initialize(
       name: nil,
       options:,
       selected: nil,
+      disabled_options: nil,
       label: nil,
       label_hidden: false,
       label_inline: false,
@@ -26,6 +27,7 @@ def initialize(
       @name = name
       @options = options
       @selected = selected
+      @disabled_options = disabled_options
       @label = label
       @label_hidden = label_hidden
       @label_inline = label_inline

diff --git a/demo/test/components/previews/forms/select_component_preview/disabled.html.erb b/demo/test/components/previews/forms/select_component_preview/disabled.html.erb
@@ -8,3 +8,16 @@
     "Last 7 days" => "lastWeek",
   },
 ) %>
+
+<br>
+
+<%= polaris_select(
+  name: :date_range,
+  label: "Disabled options",
+  options: {
+    "Today" => "today",
+    "Yesterday" => "yesterday",
+    "Last 7 days" => "lastWeek",
+  },
+  disabled_options: ["yesterday", "lastWeek"],
+) %>
diff --git a/test/components/polaris/select_component_test.rb b/test/components/polaris/select_component_test.rb
@@ -88,6 +88,19 @@ def test_disabled
     end
   end
 
+  def test_disabled_options
+    render_inline(Polaris::SelectComponent.new(
+      name: :input_name,
+      label: "Input Label",
+      options: [["Option 1", "option1"], ["Option 2", "option2"]],
+      disabled_options: "option2",
+    ))
+
+    assert_selector ".Polaris-Select > select" do
+      assert_selector "option[value=option2][disabled]"
+    end
+  end
+
   def test_required
     render_inline(Polaris::SelectComponent.new(
       name: :input_name,