[#19265] fix: cursor overlapping placeholder in android

status-im · Apr 5, 2024 · 3e08a74 · 3e08a74
1 parent 9ba6c62
commit 3e08a74
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/quo/components/inputs/input/view.cljs b/src/quo/components/inputs/input/view.cljs
@@ -60,12 +60,12 @@
   "Custom properties that must be removed from properties map passed to InputText."
   [:type :blur? :error? :right-icon :left-icon :disabled? :small? :button
    :label :char-limit :on-char-limit-reach :icon-name :multiline? :on-focus :on-blur
-   :container-style :input-container-style :ref])
+   :container-style :input-container-style :ref :placeholder])
 
 (defn- base-input
   [{:keys [blur? error? right-icon left-icon disabled? small? button
            label char-limit multiline? clearable? on-focus on-blur container-style input-container-style
-           on-change-text on-char-limit-reach weight default-value on-clear]
+           on-change-text on-char-limit-reach weight default-value on-clear placeholder]
     :as   props}]
   (let [theme                  (quo.theme/use-theme-value)
         ref                    (rn/use-ref-atom nil)
@@ -110,7 +110,10 @@
                                      {:style-fn  style/clear-icon
                                       :icon-name :i/clear
                                       :on-press  clear-on-press}))
-        clean-props            (apply dissoc props custom-props)]
+        clean-props            (apply dissoc props custom-props)
+        ;; Workaround for android cursor overlapping placeholder
+        ;; https://github.com/facebook/react-native/issues/27687
+        modified-placeholder   (if platform/android? (str "\u2009" placeholder) placeholder)]
     [rn/view {:style container-style}
      (when (or label char-limit)
        [label-&-counter
@@ -134,6 +137,7 @@
                 :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
                 :cursor-color           (:cursor variant-colors)
                 :editable               (not disabled?)
+                :placeholder            modified-placeholder
                 :on-focus               (fn []
                                           (when on-focus (on-focus))
                                           (internal-on-focus))