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

🐛 Avoid self reference on dropdown options

Browse Source
This commit is contained in:
Eva Marco
2026-02-11 17:11:51 +01:00
parent e1e7dcf4b7
commit d6fb1170d3
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,15 @@
(let [cursor (.-selectionStart input-node)]
(extract-partial-token value cursor)))
(defn remove-self-token [filtered-options current-token]
(let [group (:type current-token)
current-id (:id current-token)
filtered-options (deref filtered-options)]
(update filtered-options group
(fn [options]
(remove #(= (:id %) current-id) options)))))
(defn- select-option-by-id
[id options-ref input-node value]
(let [cursor (.-selectionStart input-node)
@@ -126,6 +135,7 @@
[{:keys [name tokens token token-type empty-to-end ref] :rest props}]
(let [form (mf/use-ctx fc/context)
_ (prn "token" token)
input-name name
token-name (get-in @form [:data :name] nil)
@@ -163,9 +173,15 @@
(mf/with-memo [raw-tokens-by-type token-type]
(csu/filter-tokens-for-input raw-tokens-by-type token-type))
visible-options
(mf/with-memo [filtered-tokens-by-type token]
(if token
(remove-self-token filtered-tokens-by-type token)
filtered-tokens-by-type))
dropdown-options
(mf/with-memo [filtered-tokens-by-type filter-term]
(csu/get-token-dropdown-options filtered-tokens-by-type (str "{" filter-term)))
(mf/with-memo [visible-options filter-term]
(csu/get-token-dropdown-options visible-options (str "{" filter-term)))
set-option-ref
(mf/use-fn