haya_select_helpers 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9756954e876e2e6afc78872b90101b188977b26a82a589e653c2103119062b0b
-  data.tar.gz: ac41d31b10a7b81871445a581cfd071074ef600cb458fd4b80865f4ada7baf4d
+  metadata.gz: 7f84d8a6672eb46f35aa0949b1b1bbbf702e7fca854541d7fcb7e2152d890caa
+  data.tar.gz: e5e2e100bc9e5697c4cd93c0d747026d94d249cbc1793ee4e7e4967be6ac19eb
 SHA512:
-  metadata.gz: dea740fc972e837eb124d7fb517813931a11d4a2a10a594c0d6a47282df17b450e6ebaec5c1b3d74e70c1d60e52182a08bd9c968d43f785610f68a888eedd61d
-  data.tar.gz: 667adf2ee18c752efc6f5eac4739ce360c76f71c47c614c99e8d3a89a1cc6760c028a23249bcb4747531ba98315adbac2aacee841519b65bc6af628df2115450
+  metadata.gz: 6ed9d67b118f6ec2ffa66789a44b258f542a2e331e3401b9b5ccd6263d26dacd4be1b8ef3d7fcad2bc6c5ddc0a6e8444a0c7c6ea98542bbdb287f4b243184469
+  data.tar.gz: 9751a4a39bb5304733df0a7e783a67adb6182bb7e63f486308b96ec7b6b63df86c5268d136eca26058e69228ac70c9eadb0bafebfa9a62b12b17cea368d8f0d5

data/lib/haya_select.rb

@@ -37,7 +37,7 @@ class HayaSelect
     attempts = 0
 
     begin
-      click_open_target
+      click_open_target_element
       wait_for_open
       self
     rescue WaitUtil::TimeoutError, Selenium::WebDriver::Error::StaleElementReferenceError
@@ -75,7 +75,9 @@ class HayaSelect
   end
 
   def search(value)
-    wait_for_and_find("#{base_selector} [data-class='search-text-input']").set(value)
+    search_input = wait_for_and_find("#{base_selector} [data-class='search-text-input']")
+    search_input.set("")
+    search_input.send_keys(value)
     self
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
@@ -90,8 +92,8 @@ class HayaSelect
       selected_value = select_option_value(label:, value:)
       selected_value = "" if selected_value.nil? && value.nil?
       allow_blank = previous_value == selected_value
-      wait_for_selected_value_or_label(label, value || selected_value, allow_blank:)
       close_if_open
+      wait_for_selected_value_or_label(label, value || selected_value, allow_blank:)
       self
     rescue WaitUtil::TimeoutError, Selenium::WebDriver::Error::StaleElementReferenceError
       attempts += 1
@@ -117,15 +119,8 @@ class HayaSelect
     raise "The '#{label}'-option is disabled" if option['data-disabled'] == 'true'
 
     option_value = option['data-value']
-    if option.visible?
-      option.click
-    else
-      scope.page.execute_script(
-        "arguments[0].scrollIntoView({block: 'center', inline: 'center'})",
-        option
-      )
-      scope.page.execute_script("arguments[0].click()", option)
-    end
+    perform_option_selection(option, label, option_value)
+
     option_value
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
@@ -201,14 +196,21 @@ private
 
     return if option_present?(selector, label)
 
-    unless scope.page.has_selector?(search_input_selector)
+    if scope.page.has_selector?(options_selector, visible: :all)
       wait_for_browser do
-        option_present?(selector, label)
+        scope.page.has_selector?("#{options_selector} [data-class='select-option']", visible: :all) ||
+          scope.page.has_selector?(no_options_selector, visible: :all)
       end
+    end
 
-      return
+    wait_for_browser do
+      option_present?(selector, label)
     end
 
+    return if option_present?(selector, label)
+
+    return unless scope.page.has_selector?(search_input_selector)
+
     search_terms_for(label).each do |search_term|
       current_options_text = options_container_text
       search_for_option(search_term)
@@ -228,11 +230,20 @@ private
 
   def wait_for_selected_value_or_label(label, value, allow_blank: false)
     wait_for_expect do
+      value_input_selector = "#{base_selector} [data-class='current-selected'] input[type='hidden']"
+      has_value_input = scope.page.has_selector?(value_input_selector, visible: false)
       label_matches = label && label_matches?(label)
       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)
 
-      expect(label_matches || value_matches || blank_matches).to eq true
+      matches =
+        if has_value_input
+          value_matches || blank_matches
+        else
+          label_matches || value_matches || blank_matches
+        end
+
+      expect(matches).to eq true
     end
   end
 
@@ -280,26 +291,36 @@ private
   end
 
   def close_if_open
-    return if scope.page.has_no_selector?(options_selector)
+    return if scope.page.has_no_selector?(options_selector, visible: :all)
 
     close_attempts = 0
 
-    while scope.page.has_selector?(options_selector) && close_attempts < 3
-      if scope.page.has_selector?(select_container_selector)
-        wait_for_and_find(select_container_selector).click
-      else
-        wait_for_and_find("body").click
-      end
+    while scope.page.has_selector?(options_selector, visible: :all) && 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)
+
+    body = wait_for_and_find("body")
+    body.send_keys(:escape)
+    return if wait_for_close?
+
+    click_element_safely(body)
+    wait_for_close?
+  end
+
+  def wait_for_close?
+    scope.page.has_no_selector?(options_selector, visible: :all, wait: 1)
   end
 
   def search_input_selector
     "#{base_selector} [data-class='search-text-input']"
   end
 
-  def click_open_target
+  def click_open_target_element
     target_selector =
       if scope.page.has_selector?(select_container_selector)
         select_container_selector
@@ -310,16 +331,11 @@ private
       end
 
     element = wait_for_and_find(target_selector)
-    scope.page.execute_script("arguments[0].focus()", element)
     scope.page.execute_script(
       "arguments[0].scrollIntoView({block: 'center', inline: 'center'})",
       element
     )
     click_element_safely(element)
-
-    return if scope.page.has_selector?(opened_current_selected_selector)
-
-    dispatch_open_events(element)
   end
 
   def current_selected_selector
@@ -335,7 +351,47 @@ private
   def click_element_safely(element)
     element.click
   rescue Selenium::WebDriver::Error::ElementClickInterceptedError
-    scope.page.execute_script("arguments[0].click()", element)
+    scope.page.driver.browser.action.move_to(element.native).click.perform
+  end
+
+  def close_attempt
+    close_search_input
+    send_close_escape
+    click_close_target
+  end
+
+  def send_escape
+    scope.page.driver.browser.action.send_keys(:escape).perform
+  rescue Selenium::WebDriver::Error::InvalidElementStateError
+    scope.page.find("body").send_keys(:escape)
+  end
+
+  def close_search_input
+    return unless scope.page.has_selector?(search_input_selector)
+
+    search_input = wait_for_and_find(search_input_selector)
+    click_element_safely(search_input)
+    search_input.send_keys(:escape)
+    search_input.send_keys(:tab)
+  end
+
+  def send_close_escape
+    select_container = scope.page.first(select_container_selector, minimum: 0)
+    return select_container.send_keys(:escape) if select_container
+
+    send_escape
+  end
+
+  def click_close_target
+    close_target = scope.page.first(
+      "[data-component='super-admin--layout'], " \
+      "[data-component='admin/layout'], " \
+      "[data-component='layout/base'], " \
+      ".react-root > *",
+      minimum: 0
+    )
+    close_target ||= wait_for_and_find("body")
+    scope.page.driver.browser.action.move_to(close_target.native).click.perform
   end
 
   def send_open_key
@@ -346,24 +402,6 @@ private
     select_container.send_keys(:space)
   end
 
-  def dispatch_open_events(element)
-    scope.page.execute_script(
-      <<~JS,
-        const target = arguments[0]
-        const events = [
-          new PointerEvent('pointerdown', {bubbles: true, cancelable: true}),
-          new MouseEvent('mousedown', {bubbles: true, cancelable: true}),
-          new PointerEvent('pointerup', {bubbles: true, cancelable: true}),
-          new MouseEvent('mouseup', {bubbles: true, cancelable: true}),
-          new MouseEvent('click', {bubbles: true, cancelable: true})
-        ]
-
-        for (const event of events) target.dispatchEvent(event)
-      JS
-      element
-    )
-  end
-
   def current_option_label_selectors
     [
       "#{base_selector} [data-class='current-selected'] [data-testid='option-presentation-text']",
@@ -399,18 +437,72 @@ private
   end
 
   def find_option_element(selector, label)
-    return wait_for_and_find(selector, visible: :all) unless label
+    return wait_for_and_find(selector) unless label
+
+    return wait_for_and_find(selector) if selector.start_with?(select_option_container_selector)
 
-    return wait_for_and_find(selector, visible: :all) if selector.start_with?(select_option_container_selector)
+    if selector.include?("option-presentation")
+      option_presentation = wait_for_and_find(selector)
+      return option_presentation.find(:xpath, "./ancestor::*[@data-class='select-option']")
+    end
 
-    return wait_for_and_find(selector, visible: :all) if scope.page.has_selector?(selector, visible: :all)
+    return wait_for_and_find(selector) if scope.page.has_selector?(selector)
 
-    option_text = wait_for_and_find(option_label_selector, text: label, visible: :all)
+    option_text = wait_for_and_find(option_label_selector, text: label)
     option_text.find(:xpath, "./ancestor::*[@data-class='select-option']")
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
   end
 
+  def click_target_element(click_target)
+    unless click_target.visible?
+      scope.page.execute_script(
+        "arguments[0].scrollIntoView({block: 'center', inline: 'center'})",
+        click_target
+      )
+    end
+
+    click_element_safely(click_target)
+  end
+
+  def click_option_element(element)
+    raise ArgumentError, "Expected a clickable option element, got nil" if element.nil?
+
+    element.native.location_once_scrolled_into_view
+    element.click
+  end
+
+  def perform_option_selection(option, label, option_value)
+    click_option_element(option)
+    return if selected?(label, option_value)
+
+    if scope.page.has_selector?(current_value_selector(option_value), visible: false, wait: 1) ||
+        (label && label_matches?(label))
+      return
+    end
+
+    option_text = option.first("[data-testid='option-presentation-text']", minimum: 0)
+    click_option_element(option_text) if option_text
+    return if selected?(label, option_value)
+
+    click_option_presentation(option, label, option_value)
+    send_option_keys(option, label, option_value)
+    click_option_element(option) unless selected?(label, option_value)
+  end
+
+  def click_option_presentation(option, label, option_value)
+    return if selected?(label, option_value)
+
+    option_presentation = option.all("[data-testid='option-presentation']", minimum: 0).first
+    click_option_element(option_presentation) if option_presentation
+  end
+
+  def send_option_keys(option, label, option_value)
+    return if selected?(label, option_value)
+
+    option.click
+  end
+
   def select_option_container_selector
     "#{options_selector} [data-class='select-option']"
   end

data/lib/haya_select_helpers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HayaSelectHelpers
-  VERSION = '0.0.11'
+  VERSION = "0.0.13"
 end

metadata

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