CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-02-12 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix little bug

Browse Source
This commit is contained in:
Eva Marco
2026-02-11 16:49:20 +01:00
parent 46864fb01a
commit e1e7dcf4b7
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/app/main/ui/workspace/tokens/management/forms/border_radius.cljs
View File

@@ -7,7 +7,6 @@
(ns app.main.ui.workspace.tokens.management.forms.border-radius
(:require
[app.common.types.token :as cto]
[app.main.ui.workspace.tokens.management.forms.controls :as token.controls]
[app.main.ui.workspace.tokens.management.forms.generic-form :as generic]
[rumext.v2 :as mf]))
@@ -15,12 +14,7 @@
(mf/defc form*
[{:keys [token token-type] :rest props}]
(let [token
(mf/with-memo [token]
(if token
(update token :value cto/join-font-family)
{:type token-type}))
props (mf/spread-props props {:token token
(let [props (mf/spread-props props {:token token
:token-type token-type
:input-component token.controls/combobox*})]
[:> generic/form* props]))

39
frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs
View File

@@ -60,21 +60,26 @@
(defn replace-active-token
[value cursor new-name]
(let [before (subs value 0 cursor)
start (str/last-index-of before "{")]
(if start
(let [after-start (subs value start)
(let [before (subs value 0 cursor)
last-open (str/last-index-of before "{")
last-close (str/last-index-of before "}")]
(if (and last-open
(or (nil? last-close)
(> last-open last-close)))
(let [after-start (subs value last-open)
close-pos (str/index-of after-start "}")
end (if close-pos
(+ start close-pos 1)
(+ last-open close-pos 1)
cursor)]
(str (subs value 0 start)
(str (subs value 0 last-open)
"{" new-name "}"
(subs value end)))
(str (subs value 0 cursor)
"{" new-name "}"))))
"{" new-name "}"
(subs value cursor)))))
(defn active-token [value input-node]
(let [cursor (.-selectionStart input-node)]
@@ -128,7 +133,6 @@
is-open* (mf/use-state false)
is-open (deref is-open*)
listbox-id (mf/use-id)
filter-term* (mf/use-state "")
filter-term (deref filter-term*)
@@ -179,7 +183,6 @@
(dom/prevent-default event)
(swap! is-open* not)))
resolve-stream
(mf/with-memo [token]
(if (contains? token :value)
@@ -196,14 +199,14 @@
(fm/on-input-change form input-name value)
(rx/push! resolve-stream value)
(if token
(do
(reset! is-open* true)
(reset! filter-term* (:partial token)))
(do
(reset! is-open* false)
(reset! filter-term* ""))))))
(if token
(do
(reset! is-open* true)
(reset! filter-term* (:partial token)))
(do
(reset! is-open* false)
(reset! filter-term* ""))))))
on-option-click
(mf/use-fn