fix Color unnecessary setConfig on click hex input (#366)

Author: eagleoflqj

appium/TestConfigView.swift

@@ -7,19 +7,19 @@ struct TestConfigView: View {
       Button("Input Method") {
         NSApp.mainWindow?.close()
         ConfigWindowController.openWindow("im", InputMethodConfigController.self)
-      }
+      }.accessibilityIdentifier("Input Method")
       Button("Global Config") {
         NSApp.mainWindow?.close()
         ConfigWindowController.openWindow("global", GlobalConfigController.self)
-      }
+      }.accessibilityIdentifier("Global Config")
       Button("Theme") {
         NSApp.mainWindow?.close()
         ConfigWindowController.openWindow("theme", ThemeEditorController.self)
-      }
+      }.accessibilityIdentifier("Theme")
       Button("Advanced") {
         NSApp.mainWindow?.close()
         ConfigWindowController.openWindow("advanced", AdvancedController.self)
-      }
+      }.accessibilityIdentifier("Advanced")
     }
   }
 }

appium/test_color.py

@@ -0,0 +1,40 @@
+from appium.webdriver.webdriver import WebDriver
+
+from util.config import read_theme_config
+from util.button import get_undo_redo, is_enabled
+from util.color import get_color_value, set_color_value
+from util.message import (
+    BUTTON_SHOULD_BE_DISABLED,
+    BUTTON_SHOULD_BE_ENABLED,
+    CHANGE_NOT_SAVED,
+    UI_NOT_UPDATED,
+)
+from util.window import find_element_by_id, open_theme_config
+
+
+LIGHT_SECTION = "LightMode"
+COLOR_ID = "HighlightColor"
+
+
+def test_highlight_color(driver: WebDriver, app: str):
+    open_theme_config(driver)
+    find_element_by_id(driver, LIGHT_SECTION).click()
+
+    def read_config_value() -> str:
+        cfg = read_theme_config(app)
+        return cfg[LIGHT_SECTION][COLOR_ID].lstrip("#")
+
+    field = find_element_by_id(driver, COLOR_ID)
+    initial_value = get_color_value(field)
+    new_value = "abcdef"
+    undo, _ = get_undo_redo(driver)
+
+    set_color_value(field, new_value)
+    assert get_color_value(field) == new_value, UI_NOT_UPDATED
+    assert is_enabled(undo) is True, BUTTON_SHOULD_BE_ENABLED
+    assert read_config_value() == new_value, CHANGE_NOT_SAVED
+
+    undo.click()
+    assert get_color_value(field) == initial_value, UI_NOT_UPDATED
+    assert is_enabled(undo) is False, BUTTON_SHOULD_BE_DISABLED
+    assert read_config_value() == initial_value, CHANGE_NOT_SAVED

appium/test_string.py

@@ -9,14 +9,14 @@
     UI_NOT_UPDATED,
 )
 from util.string import get_string_value
-from util.window import find_button, find_element_by_id, reset_option
+from util.window import find_element_by_id, open_theme_config, reset_option
 
 CARET_SECTION = "Caret"
 STRING_ID = "Text"
 
 
 def test_theme_caret(driver: WebDriver, app: str):
-    find_button(driver, "Theme").click()
+    open_theme_config(driver)
     find_element_by_id(driver, CARET_SECTION).click()
 
     def read_config_value() -> str:

appium/util/color.py

@@ -0,0 +1,45 @@
+from selenium.webdriver.remote.webelement import WebElement
+from appium.webdriver.common.appiumby import AppiumBy
+from util.key import press
+from util.window import find_element_by_id
+
+
+def get_color_value(element: WebElement) -> str:
+    """Get the current color value from a text element."""
+    raw = element.get_attribute("value")  # rgb 0.0705882 0.203922 0.337255 1
+    return "".join(
+        "%.2x" % round(float(x) * 255) for x in raw.split()[1:-1]
+    )  # ignore alpha
+
+
+def set_color_value(element: WebElement, value: str):
+    driver = element.parent
+    element.click()
+
+    # Slider mode
+    buttons = driver.find_elements(AppiumBy.CLASS_NAME, "XCUIElementTypeButton")
+    for button in buttons:
+        if button.get_attribute("label") == "Color Sliders":
+            button.click()
+            break
+
+    # RGB slider
+    button = driver.find_element(AppiumBy.CLASS_NAME, "XCUIElementTypePopUpButton")
+    button.click()
+    find_element_by_id(driver, "showRGBView:").click()
+
+    # Type hex
+    hex_field = find_element_by_id(driver, "hex")
+    hex_field.send_keys(value)
+    press(driver, "\n")  # Without it, below may throw StaleElementReferenceException.
+
+    # Close
+    buttons = driver.find_elements(AppiumBy.CLASS_NAME, "XCUIElementTypeButton")
+    for button in buttons:
+        if (
+            button.tag_name == "_XCUI:CloseWindow"
+            and button.size["height"] == 12
+            and button.size["width"] == 12
+        ):
+            button.click()
+            break

appium/util/window.py

@@ -1,21 +1,8 @@
 from appium.webdriver.common.appiumby import AppiumBy
 from appium.webdriver.webdriver import WebDriver
-from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webelement import WebElement
 
 
-def find_button(driver: WebDriver, label: str) -> WebElement | None:
-    """Find a button by its title or label attribute."""
-    buttons = driver.find_elements(By.CLASS_NAME, "XCUIElementTypeButton")
-    for btn in buttons:
-        title = btn.get_attribute("title") or ""
-        btn_label = btn.get_attribute("label") or ""
-        name = title or btn_label
-        if label in name:
-            return btn
-    return None
-
-
 def find_element_by_id(driver: WebDriver, identifier: str) -> WebElement:
     """Find an element by its accessibility identifier."""
     elements = driver.find_elements(AppiumBy.ACCESSIBILITY_ID, identifier)
@@ -24,12 +11,17 @@ def find_element_by_id(driver: WebDriver, identifier: str) -> WebElement:
 
 def open_global_config(driver: WebDriver):
     """Open the Global Config window."""
-    find_button(driver, "Global Config").click()
+    find_element_by_id(driver, "Global Config").click()
+
+
+def open_theme_config(driver: WebDriver):
+    """Open the Theme window."""
+    find_element_by_id(driver, "Theme").click()
 
 
 def open_advanced_config(driver: WebDriver):
     """Open the Advanced Config window."""
-    find_button(driver, "Advanced").click()
+    find_element_by_id(driver, "Advanced").click()
 
 
 def reset_option(driver: WebDriver, option_id: str):

src/config/ColorView.swift

@@ -54,14 +54,17 @@ struct ColorView: OptionViewProtocol {
     HStack {
       if #available(macOS 14.0, *) {
         ColorPicker("", selection: $rgb, supportsOpacity: true)
+          .accessibilityIdentifier(data["Option"] as? String ?? "")
       } else {
         ColorPicker("", selection: $rgb, supportsOpacity: false)
         Text("Alpha (0-255)")
         TextField("", value: $alpha, formatter: numberFormatter)
       }
     }
-    .onChange(of: rgb) { _ in
-      if rgb != stringToColor(value as? String ?? "") {
+    .onChange(of: rgb) { newValue in
+      // value's initial value is affected by fcitx's serialization rule (lower case, omit 255 alpha).
+      // Compare full string to avoid unnecessary setConfig.
+      if colorToString(newValue) != colorToString(stringToColor(value as? String ?? "")) {
         colorSubject.send()
       }
     }