haya_select_helpers 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1859828251316a80407d354d1c30f56f865ea46c1358ca638c1f6da563164613
-  data.tar.gz: 2aa84183163ef3a14b9ea5ef6963a6ad157c19585f4a795be4cb342885e4a7de
+  metadata.gz: 96f76d49276820fa73aa7b62dc77f39ce6f1b92ced049fc7ba96bb99be275a34
+  data.tar.gz: fa5bdbe4b24df0e7bf0ec7c17b358af38991822881826c96a218f3a1bf688f80
 SHA512:
-  metadata.gz: 95227a959dff150c9555ef3b295b9f6c0af6cc8bd82edf6f289cfeec22a8942c6239b24aa0b758be7c7a48c9be8484076f069cbb608bf3b8ec52da56026e4a30
-  data.tar.gz: 58ddc7034b2a459763d1d2483cdcf4db878e8b25faf3af3a46cfa7ae33a3fb85338be1f7d5fe7abf4aef89654c00c24e71375d68d4d9d3d5a1e40e5b4d9a2da2
+  metadata.gz: eaa631f02a3f44ed87a3070e341f5fd08d0cd85e518f9e6e2e217d4c7167f6491b75f6e282e681b0da5d672e78eee79ffb81a26eff637041d5b06c8a0ba7117f
+  data.tar.gz: 9b09bc8269f204a345e18331a2dd49f1080cb0be89a52677f9aa306fde5c2a8ec19d9d389ea7cea8383580b1c27c4c6cf73ce0762f941325d13a8871f4ad5fd0

data/lib/haya_select.rb

@@ -108,18 +108,27 @@ class HayaSelect
   end
 
   def guard_already_selected(label, value, allow_if_selected)
-    current_value = value_no_wait
+    return if allow_if_selected
 
-    if !value.nil? && current_value == value
-      return if allow_if_selected
+    raise_if_value_already_selected(label, value)
+    raise_if_label_already_selected(label, value)
+  end
 
-      raise "The '#{label || value}'-option is already selected"
-    end
+  def selected_label_for_value(value)
+    return nil if value.nil? || value == ""
 
-    if value.nil? && !label.nil? && label_no_wait == label
-      return if allow_if_selected
+    was_open = scope.page.has_selector?(options_selector, visible: :all, wait: 0)
+    self.open(allow_if_open: true)
 
-      raise "The '#{label}'-option is already selected"
+    begin
+      option = scope.page.first(
+        "#{options_selector} [data-class='select-option'][data-value='#{value}']",
+        minimum: 0,
+        wait: 0
+      )
+      option&.[]("data-text") || option&.text
+    ensure
+      close_if_open unless was_open
     end
   end
 
@@ -243,6 +252,17 @@ class HayaSelect
     self
   end
 
+  def selected?(label, value)
+    return false unless label || value
+
+    return true if label_matches?(label)
+    return true if value_matches?(value)
+
+    label_matches_selected_value?(label)
+  rescue Selenium::WebDriver::Error::StaleElementReferenceError
+    retry
+  end
+
   def wait_for_value(expected_value)
     wait_for_selector(
       "#{base_selector} [data-class='current-selected'] input[type='hidden'][value='#{expected_value}']",
@@ -253,6 +273,43 @@ class HayaSelect
 
 private
 
+  def raise_if_value_already_selected(label, value)
+    return if value.nil?
+
+    current_value = value_no_wait
+    return unless current_value == value
+
+    raise "The '#{label || value}'-option is already selected"
+  end
+
+  def raise_if_label_already_selected(label, value)
+    return if label.nil? || !value.nil?
+    return if label_no_wait == label
+
+    current_value = value_no_wait
+    return if current_value.nil? || current_value == ""
+
+    selected_label = selected_label_for_value(current_value)
+    return unless selected_label == label
+
+    raise "The '#{label}'-option is already selected"
+  end
+
+  def value_matches?(value)
+    return false unless value
+
+    scope.page.has_selector?(current_value_selector(value), visible: false)
+  end
+
+  def label_matches_selected_value?(label)
+    return false unless label
+
+    current_value = value_no_wait
+    return false if current_value.nil? || current_value == ""
+
+    selected_label_for_value(current_value) == label
+  end
+
   def select_option_selector(label:, value:)
     if value
       "#{select_option_container_selector}[data-value='#{value}']"
@@ -307,17 +364,6 @@ private
     end
   end
 
-  def selected?(label, value)
-    return false unless label || value
-
-    label_matches = label && label_matches?(label)
-    value_matches = value && scope.page.has_selector?(current_value_selector(value), visible: false)
-
-    label_matches || value_matches
-  rescue Selenium::WebDriver::Error::StaleElementReferenceError
-    retry
-  end
-
   def search_for_option(label)
     return unless scope.page.has_selector?(search_input_selector)
 
@@ -470,6 +516,8 @@ private
   end
 
   def label_matches?(label)
+    return false unless label
+
     current_option_label_selectors.any? do |selector|
       scope.page.has_selector?(selector, exact_text: label)
     end

data/lib/haya_select_helpers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HayaSelectHelpers
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haya_select_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - kaspernj
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-13 00:00:00.000000000 Z
+date: 2026-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails