haya_select_helpers 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f76d49276820fa73aa7b62dc77f39ce6f1b92ced049fc7ba96bb99be275a34
-  data.tar.gz: fa5bdbe4b24df0e7bf0ec7c17b358af38991822881826c96a218f3a1bf688f80
+  metadata.gz: d289ef00a14194f8d755422fbfb764557cc4d9942cfb09556235bd19c4cb3bed
+  data.tar.gz: c764a04952e83c05eac23e3199dda1e46c3986435724b305b478feac858eb027
 SHA512:
-  metadata.gz: eaa631f02a3f44ed87a3070e341f5fd08d0cd85e518f9e6e2e217d4c7167f6491b75f6e282e681b0da5d672e78eee79ffb81a26eff637041d5b06c8a0ba7117f
-  data.tar.gz: 9b09bc8269f204a345e18331a2dd49f1080cb0be89a52677f9aa306fde5c2a8ec19d9d389ea7cea8383580b1c27c4c6cf73ce0762f941325d13a8871f4ad5fd0
+  metadata.gz: cdea7c07e9ca63f5318d240086afec8754425385b7c1763b685fe9dd52c7922ae5ad39fab7aab30e00396821411dfd2a939d768f3d417d5d854210f8b868a222
+  data.tar.gz: 0ed2c3a90ee5c44f03e95b0c12cbffe8786456687cfc0fe56db610154deeb46491396da0ddcadf8b887ea5c06c2cac48bf6abb57821c1af8fead1800d0ebca80

data/lib/haya_select.rb

@@ -3,6 +3,7 @@
 # rubocop:disable Metrics/ClassLength, Style/Documentation
 class HayaSelect
   attr_reader :base_selector,
+    :debug,
     :not_opened_current_selected_selector,
     :opened_current_selected_selector,
     :options_selector,
@@ -19,8 +20,9 @@ class HayaSelect
     :wait_for_selector,
     to: :scope
 
-  def initialize(id:, scope:)
+  def initialize(id:, scope:, debug: false)
     @base_selector = "[data-component='haya-select'][data-id='#{id}']"
+    @debug = debug
     @not_opened_current_selected_selector = "#{base_selector}[data-opened='false'] [data-class='current-selected']"
     @opened_current_selected_selector = "#{base_selector}[data-opened='true'] [data-class='current-selected']"
     @options_selector = "[data-class='options-container'][data-id='#{id}']"
@@ -43,12 +45,12 @@ class HayaSelect
     attempts = 0
 
     begin
+      wait_for_selector("#{base_selector}[data-opened='false']", wait: 3)
       click_open_target_element
       wait_for_open
       self
     rescue WaitUtil::TimeoutError, Selenium::WebDriver::Error::StaleElementReferenceError
       attempts += 1
-      send_open_key
       retry if attempts < 3
       raise "Failed to open haya-select options for '#{base_selector}' (options container not found)"
     end
@@ -93,14 +95,19 @@ class HayaSelect
     attempts = 0
 
     begin
-      log_select_start(label, value, allow_if_selected, attempts)
+      debug_log do
+        "select start selector=#{base_selector} " \
+          "label=#{label.inspect} value=#{value.inspect} " \
+          "allow_if_selected=#{allow_if_selected} attempts=#{attempts}"
+      end
       guard_already_selected(label, value, allow_if_selected) if attempts.zero?
+      return self if attempts.positive? && selected?(label, value)
 
-      selected_value, allow_blank = select_value_and_close(label:, value:)
+      selected_value, allow_blank = select_value_and_close(label:, value:, allow_if_selected:)
       wait_for_selected_after_select(label, value, selected_value, allow_blank)
       self
     rescue WaitUtil::TimeoutError, Selenium::WebDriver::Error::StaleElementReferenceError
-      log_select_retry(attempts)
+      debug_log { "select retry selector=#{base_selector} attempts=#{attempts}" }
       attempts += 1
       retry if attempts < 3
       raise
@@ -135,6 +142,7 @@ class HayaSelect
   def value_no_wait
     hidden_input = scope.page.first(
       "#{base_selector} [data-class='current-selected'] input[type='hidden']",
+      minimum: 0,
       visible: false,
       wait: 0
     )
@@ -145,6 +153,7 @@ class HayaSelect
   def label_no_wait
     current_option = scope.page.first(
       "#{base_selector} [data-class='current-selected'] [data-class='current-option']",
+      minimum: 0,
       wait: 0
     )
 
@@ -182,17 +191,18 @@ class HayaSelect
     retry
   end
 
-  def select_option_value(label: nil, value: nil)
+  def select_option_value(label: nil, value: nil, wait_for_selection: true, allow_if_selected: false)
     raise "No 'label' or 'value' given" if label.nil? && value.nil?
 
     selector = select_option_selector(label: label, value: value)
-    Rails.logger.debug do
-      "[haya_select] select_option_value selector=#{base_selector} option_selector=#{selector} label=#{label.inspect} value=#{value.inspect}"
+    debug_log do
+      "select_option_value selector=#{base_selector} " \
+        "option_selector=#{selector} label=#{label.inspect} value=#{value.inspect}"
     end
     wait_for_option(selector)
     option = find_option_element(selector, label)
-    Rails.logger.debug do
-      "[haya_select] option_element selector=#{base_selector} " \
+    debug_log do
+      "option_element selector=#{base_selector} " \
         "data-value=#{option['data-value'].inspect} " \
         "data-disabled=#{option['data-disabled'].inspect} " \
         "data-selected=#{option['data-selected'].inspect}"
@@ -200,8 +210,16 @@ class HayaSelect
 
     raise "The '#{label}'-option is disabled" if option['data-disabled'] == 'true'
 
+    selected_option_value = selected_option_value_or_raise(
+      option:,
+      label:,
+      value:,
+      allow_if_selected:
+    )
+    return selected_option_value if selected_option_value
+
     option_value = option['data-value']
-    perform_option_selection(option, label, option_value)
+    perform_option_selection(option, label, option_value, wait_for_selection:)
 
     option_value
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
@@ -284,7 +302,10 @@ private
 
   def raise_if_label_already_selected(label, value)
     return if label.nil? || !value.nil?
-    return if label_no_wait == label
+
+    current_label = label_no_wait
+    return if current_label == label
+    return if current_label
 
     current_value = value_no_wait
     return if current_value.nil? || current_value == ""
@@ -298,12 +319,15 @@ private
   def value_matches?(value)
     return false unless value
 
-    scope.page.has_selector?(current_value_selector(value), visible: false)
+    scope.page.has_selector?(current_value_selector(value), visible: false, wait: 0)
   end
 
   def label_matches_selected_value?(label)
     return false unless label
 
+    current_label = label_no_wait
+    return current_label == label if current_label
+
     current_value = value_no_wait
     return false if current_value.nil? || current_value == ""
 
@@ -321,7 +345,8 @@ private
   end
 
   def wait_for_option(selector)
-    wait_for_selector(selector, visible: :all)
+    wait_for_options_visible
+    wait_for_selector(selector)
   end
 
   def open_and_find_option_for(label:, value:)
@@ -349,9 +374,13 @@ private
   end
 
   def wait_for_selected_value_or_label(label, value, allow_blank: false)
-    log_wait_for_selected_start(label, value, allow_blank)
     value_input_selector = "#{base_selector} [data-class='current-selected'] input[type='hidden']"
-    log_wait_for_selected_initial_state(value_input_selector)
+
+    if scope.page.has_selector?(value_input_selector, visible: false, wait: 0)
+      return wait_for_selector(current_value_selector(value), visible: false) if value
+      return wait_for_selector(current_value_selector(""), visible: false) if allow_blank
+    end
+
     wait_for_expect do
       expect(
         selected_value_or_label_matches?(
@@ -365,13 +394,13 @@ private
   end
 
   def search_for_option(label)
-    return unless scope.page.has_selector?(search_input_selector)
+    return unless scope.page.has_selector?(search_input_selector, wait: 0)
 
     search(label)
   end
 
   def options_container_updated?(search_term, previous_text)
-    return false unless scope.page.has_selector?(no_options_selector)
+    return false unless scope.page.has_selector?(no_options_selector, wait: 0)
     return false unless search_input_value == search_term
     return false if previous_text.nil?
 
@@ -397,18 +426,18 @@ private
   end
 
   def close_if_open
-    return if scope.page.has_no_selector?(options_selector, visible: :all)
+    return if scope.page.has_no_selector?(options_selector, visible: :all, wait: 0)
 
     close_attempts = 0
 
-    while scope.page.has_selector?(options_selector, visible: :all) && close_attempts < 3
+    while scope.page.has_selector?(options_selector, visible: :all, wait: 0) && close_attempts < 3
       close_attempt
       break if wait_for_close?
 
       close_attempts += 1
     end
 
-    return if scope.page.has_no_selector?(options_selector, visible: :all)
+    return if scope.page.has_no_selector?(options_selector, visible: :all, wait: 0)
 
     body = wait_for_and_find("body")
     body.send_keys(:escape)
@@ -428,9 +457,9 @@ private
 
   def click_open_target_element
     target_selector =
-      if scope.page.has_selector?(select_container_selector)
+      if scope.page.has_selector?(select_container_selector, wait: 0)
         select_container_selector
-      elsif scope.page.has_selector?(current_selected_selector)
+      elsif scope.page.has_selector?(current_selected_selector, wait: 0)
         current_selected_selector
       else
         base_selector
@@ -449,9 +478,7 @@ private
   end
 
   def wait_for_open
-    wait_for_browser(message: "waiting for haya-select options container to open") do
-      scope.page.has_selector?(options_selector, visible: :all)
-    end
+    wait_for_selector(options_selector, visible: :all)
   end
 
   def click_element_safely(element)
@@ -473,7 +500,7 @@ private
   end
 
   def close_search_input
-    return unless scope.page.has_selector?(search_input_selector)
+    return unless scope.page.has_selector?(search_input_selector, wait: 0)
 
     search_input = wait_for_and_find(search_input_selector)
     click_element_safely(search_input)
@@ -500,14 +527,6 @@ private
     scope.page.driver.browser.action.move_to(close_target.native).click.perform
   end
 
-  def send_open_key
-    return unless scope.page.has_selector?(select_container_selector)
-
-    select_container = wait_for_and_find(select_container_selector)
-    select_container.send_keys(:enter)
-    select_container.send_keys(:space)
-  end
-
   def current_option_label_selectors
     [
       "#{base_selector} [data-class='current-selected'] [data-testid='option-presentation-text']",
@@ -517,9 +536,13 @@ private
 
   def label_matches?(label)
     return false unless label
+    return true if scope.page.has_selector?(
+      "#{base_selector} [data-class='current-selected'] [data-testid='option-presentation'][data-text='#{label}']",
+      wait: 0
+    )
 
     current_option_label_selectors.any? do |selector|
-      scope.page.has_selector?(selector, exact_text: label)
+      scope.page.has_selector?(selector, exact_text: label, wait: 0)
     end
   end
 
@@ -539,9 +562,25 @@ private
     "#{options_selector} [data-testid='option-presentation-text']"
   end
 
+  def options_visibility_selector
+    "#{options_selector}[data-options-visibility]"
+  end
+
+  def options_visible_selector
+    "#{options_selector}[data-options-visibility='visible']"
+  end
+
+  def wait_for_options_visible
+    if scope.page.has_selector?(options_visibility_selector, visible: :all, wait: 0)
+      wait_for_selector(options_visible_selector, visible: :all)
+    else
+      wait_for_selector(options_selector, visible: :all)
+    end
+  end
+
   def option_present?(selector, label)
-    scope.page.has_selector?(selector, visible: :all) ||
-      scope.page.has_selector?(option_label_selector, text: label, visible: :all)
+    scope.page.has_selector?(selector, visible: :all, wait: 0) ||
+      scope.page.has_selector?(option_label_selector, text: label, visible: :all, wait: 0)
   end
 
   def find_option_element(selector, label)
@@ -554,7 +593,7 @@ private
       return option_presentation.find(:xpath, "./ancestor::*[@data-class='select-option']")
     end
 
-    return wait_for_and_find(selector) if scope.page.has_selector?(selector)
+    return wait_for_and_find(selector) if scope.page.has_selector?(selector, wait: 0)
 
     option_text = wait_for_and_find(option_label_selector, text: label)
     option_text.find(:xpath, "./ancestor::*[@data-class='select-option']")
@@ -566,6 +605,16 @@ private
     option['data-selected'] == 'true' || selected?(label, option_value)
   end
 
+  def selected_option_value_or_raise(option:, label:, value:, allow_if_selected:)
+    return unless option['data-selected'] == 'true'
+
+    option_value = option["data-value"] || value
+    return unless selected?(label, option_value)
+    return option_value if allow_if_selected
+
+    raise "The '#{label || value}'-option is already selected"
+  end
+
   def click_target_element(click_target)
     unless click_target.visible?
       scope.page.execute_script(
@@ -589,95 +638,83 @@ private
     element.click
   end
 
-  def perform_option_selection(option, label, option_value)
-    Rails.logger.debug do
-      "[haya_select] perform_option_selection selector=#{base_selector} " \
+  def perform_option_selection(option, label, option_value, wait_for_selection: true)
+    debug_log do
+      "perform_option_selection selector=#{base_selector} " \
         "label=#{label.inspect} option_value=#{option_value.inspect} " \
-        "data-selected=#{option['data-selected'].inspect}"
+        "data-selected=#{option['data-selected'].inspect} wait_for_selection=#{wait_for_selection}"
     end
     click_option_element(option)
-    wait_for_selected_value_or_label(label, option_value)
+    wait_for_selected_value_or_label(label, option_value) if wait_for_selection
   end
 
   def select_option_container_selector
     "#{options_selector} [data-class='select-option']"
   end
 
-  def log_select_start(label, value, allow_if_selected, attempts)
-    Rails.logger.debug do
-      "[haya_select] select start selector=#{base_selector} " \
-        "label=#{label.inspect} value=#{value.inspect} " \
-        "allow_if_selected=#{allow_if_selected} attempts=#{attempts}"
-    end
-  end
-
-  def select_value_and_close(label:, value:)
+  def select_value_and_close(label:, value:, allow_if_selected: false)
     previous_value = value
-    Rails.logger.debug { "[haya_select] open selector=#{base_selector}" }
+    debug_log { "open selector=#{base_selector}" }
     open
-    Rails.logger.debug { "[haya_select] select_option_value selector=#{base_selector}" }
-    selected_value = select_option_value(label:, value:)
-    Rails.logger.debug do
-      "[haya_select] select_option_value selector=#{base_selector} selected_value=#{selected_value.inspect}"
+    selected_value = select_option_value(label:, value:, wait_for_selection: false, **select_option_value_allow_args(allow_if_selected))
+    debug_log do
+      "select_option_value selector=#{base_selector} selected_value=#{selected_value.inspect}"
     end
     selected_value = "" if selected_value.nil? && value.nil?
     allow_blank = previous_value == selected_value
-    Rails.logger.debug { "[haya_select] close_if_open selector=#{base_selector}" }
+    debug_log { "close_if_open selector=#{base_selector}" }
     close_if_open
     [selected_value, allow_blank]
   end
 
   def wait_for_selected_after_select(label, value, selected_value, allow_blank)
     expected_value = value || selected_value
-    Rails.logger.debug do
-      "[haya_select] wait_for_selected_value_or_label " \
-        "selector=#{base_selector} label=#{label.inspect} " \
-        "value=#{expected_value.inspect} allow_blank=#{allow_blank}"
+    debug_log do
+      "wait_for_selected_value_or_label selector=#{base_selector} " \
+        "label=#{label.inspect} value=#{expected_value.inspect} allow_blank=#{allow_blank}"
     end
     wait_for_selected_value_or_label(label, expected_value, allow_blank:)
   end
 
-  def log_select_retry(attempts)
-    Rails.logger.debug { "[haya_select] select retry selector=#{base_selector} attempts=#{attempts}" }
+  def debug_log(&)
+    return unless debug
+
+    Rails.logger.debug { "[haya_select] #{yield}" }
   end
 
-  def log_wait_for_selected_start(label, value, allow_blank)
-    Rails.logger.debug do
-      "[haya_select] wait_for_selected_value_or_label start selector=#{base_selector} " \
-        "label=#{label.inspect} value=#{value.inspect} allow_blank=#{allow_blank}"
-    end
+  def selected_value_or_label_matches?(label:, value:, allow_blank:, value_input_selector:)
+    has_value_input = scope.page.has_selector?(value_input_selector, visible: false, wait: 0)
+    value_matches = current_value_matches?(value)
+    blank_matches = blank_value_matches?(allow_blank)
+    label_matches = label && label_matches?(label)
+    return value_matches || label_matches || blank_matches if has_value_input
+
+    selected_option_matches = selected_option_matches?(value)
+    label_matches || value_matches || selected_option_matches || blank_matches
   end
 
-  def log_wait_for_selected_initial_state(value_input_selector)
-    has_value_input_initial = scope.page.has_selector?(value_input_selector, visible: false, wait: 0)
-    current_value_initial = scope.page.first(value_input_selector, visible: false, wait: 0)&.[](:value)
-    current_option = scope.page.first(
-      "#{base_selector} [data-class='current-selected'] [data-class='current-option']",
-      minimum: 0,
+  def current_value_matches?(value)
+    value && scope.page.has_selector?(current_value_selector(value), visible: false, wait: 0)
+  end
+
+  def selected_option_matches?(value)
+    return false unless value
+
+    scope.page.has_selector?(
+      "#{select_option_container_selector}[data-value='#{value}'][data-selected='true']",
+      visible: :all,
       wait: 0
     )
-    current_label_initial =
-      if current_option
-        option_text = current_option.first("[data-testid='option-presentation-text']", minimum: 0)
-        option_text ? option_text.text : current_option.text
-      end
+  end
 
-    Rails.logger.debug do
-      "[haya_select] wait_for_selected_value_or_label initial " \
-        "selector=#{base_selector} has_value_input=#{has_value_input_initial} " \
-        "current_value=#{current_value_initial.inspect} " \
-        "current_label=#{current_label_initial.inspect}"
-    end
+  def blank_value_matches?(allow_blank)
+    allow_blank && scope.page.has_selector?(current_value_selector(""), visible: false, wait: 0)
   end
 
-  def selected_value_or_label_matches?(label:, value:, allow_blank:, value_input_selector:)
-    has_value_input = scope.page.has_selector?(value_input_selector, visible: false)
-    value_matches = value && scope.page.has_selector?(current_value_selector(value), visible: false)
-    blank_matches = allow_blank && scope.page.has_selector?(current_value_selector(""), visible: false)
-    return value_matches || blank_matches if has_value_input
+  def select_option_value_allow_args(allow_if_selected)
+    return {} unless allow_if_selected
 
-    label_matches = label && label_matches?(label)
-    label_matches || value_matches || blank_matches
+    {allow_if_selected:}
   end
 
   # rubocop:enable Metrics/ClassLength, Style/Documentation

data/lib/haya_select_helpers/version.rb

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

data/lib/haya_select_helpers.rb

@@ -3,7 +3,7 @@ require "haya_select_helpers/version"
 require "haya_select_helpers/engine"
 
 module HayaSelectHelpers
-  def haya_select(id)
-    HayaSelect.new(id: id, scope: self)
+  def haya_select(id, debug: ENV["HAYA_SELECT_DEBUG"] == "1")
+    HayaSelect.new(id: id, scope: self, debug:)
   end
 end

metadata

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