mirror of
https://github.com/penpot/penpot.git
synced 2026-04-25 11:18:36 +00:00
Merge pull request #9140 from penpot/superalex-fix-merge-develop
🐛 Fix text.cljs error from staging merge
This commit is contained in:
commit
e05ea1392a
@ -429,12 +429,12 @@
|
|||||||
(when (not= "INPUT" (-> (dom/get-active) dom/get-tag-name))
|
(when (not= "INPUT" (-> (dom/get-active) dom/get-tag-name))
|
||||||
(dom/focus! (txu/get-text-editor-content)))))))
|
(dom/focus! (txu/get-text-editor-content)))))))
|
||||||
|
|
||||||
opts (mf/props
|
common-props (mf/props
|
||||||
{:ids ids
|
{:ids ids
|
||||||
:values values
|
:values values
|
||||||
:on-change on-change
|
:on-change on-change
|
||||||
:show-recent true
|
:show-recent true
|
||||||
:on-blur on-text-blur})]
|
:on-blur on-text-blur})]
|
||||||
|
|
||||||
(hooks/use-stream
|
(hooks/use-stream
|
||||||
expand-stream
|
expand-stream
|
||||||
@ -498,11 +498,11 @@
|
|||||||
:icon i/detach}]]
|
:icon i/detach}]]
|
||||||
|
|
||||||
:else
|
:else
|
||||||
[:> text-options* opts])
|
[:> text-options* common-props])
|
||||||
|
|
||||||
[:div {:class (stl/css :text-align-options)}
|
[:div {:class (stl/css :text-align-options)}
|
||||||
[:> text-align-options* common-props]
|
[:> text-align-options* common-props]
|
||||||
[:> grow-options* (mf/spread-props common-props {:ids ids})]
|
[:> grow-options* common-props]
|
||||||
[:> icon-button* {:variant "ghost"
|
[:> icon-button* {:variant "ghost"
|
||||||
:aria-label (tr "labels.options")
|
:aria-label (tr "labels.options")
|
||||||
:data-testid "text-align-options-button"
|
:data-testid "text-align-options-button"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user