github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-27 07:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Andrey Antukh 2026-08-27 08:31:56 +02:00
commit 9657a848e3
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/app/main/ui/ds/controls/numeric_input.cljs
View File

@ -558,10 +558,8 @@
(mf/deps disabled is-open is-multiple? ref min max nillable default is-token-applied?) (mf/deps disabled is-open is-multiple? ref min max nillable default is-token-applied?)
(fn [event] (fn [event]
(when-not (or disabled is-open is-multiple? is-token-applied?) (when-not (or disabled is-open is-multiple? is-token-applied?)
(let [node (mf/ref-val ref) (let [has-token (some? (deref token-applied-name*))]
is-focused (and (some? node) (dom/active? node)) (when-not has-token
has-token (some? (deref token-applied-name*))]
(when-not (or is-focused has-token)
(let [client-x (.-clientX event) (let [client-x (.-clientX event)
parsed (parse-value (str/trim (mf/ref-val raw-value*)) (mf/ref-val last-value*) min max nillable) parsed (parse-value (str/trim (mf/ref-val raw-value*)) (mf/ref-val last-value*) min max nillable)
start-val (or parsed default 0)] start-val (or parsed default 0)]
@ -610,7 +608,8 @@
(mf/set-ref-val! drag-state* :idle) (mf/set-ref-val! drag-state* :idle)
(dom/release-pointer event) (dom/release-pointer event)
(when-let [node (mf/ref-val ref)] (when-let [node (mf/ref-val ref)]
(dom/focus! node))) (dom/focus! node)
(dom/select-text! node)))
(when (= state :dragging) (when (= state :dragging)
(mf/set-ref-val! drag-state* :idle) (mf/set-ref-val! drag-state* :idle)
(dom/release-pointer event) (dom/release-pointer event)

4
frontend/src/app/main/ui/ds/controls/numeric_input.scss
View File

@ -23,9 +23,7 @@
position: relative; position: relative;
&.resizable { &.resizable {
&:not(:focus-within) { cursor: ew-resize;
cursor: ew-resize;
}
} }
&:hover { &:hover {

2
frontend/src/app/main/ui/ds/controls/utilities/input_field.scss
View File

@ -96,7 +96,7 @@
} }
&::selection { &::selection {
background: var(--color-accent-select); background: var(--color-accent-background-select);
} }
&::placeholder { &::placeholder {