github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-23 17:03:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix layer and component names inputs not having their text selectable on Firefox

Browse Source
This commit is contained in:
Belén Albeza 2024-03-27 11:55:17 +01:00
parent 7fa026da15
commit 78aafa4635
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/app/main/ui/hooks.cljs
View File

@ -177,8 +177,9 @@
on-mount on-mount
(fn [] (fn []
(let [dom (mf/ref-val ref)] (let [dom (mf/ref-val ref)]
(.setAttribute dom "draggable" true) ;; In firefox it needs to be draggable for problems with event handling. ;; In firefox it needs to be draggable for problems with event handling.
;; It will stop the drag operation in on-drag-start ;; It will stop the drag operation in on-drag-start
(.setAttribute dom "draggable" (and draggable? (not disabled)))
;; Register all events in the (default) bubble mode, so that they ;; Register all events in the (default) bubble mode, so that they
;; are captured by the most leaf item. The handler will stop ;; are captured by the most leaf item. The handler will stop

35
frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
View File

@ -141,14 +141,16 @@
on-context-menu on-context-menu
(mf/use-fn (mf/use-fn
(mf/deps on-context-menu component-id) (mf/deps on-context-menu component-id)
(partial on-context-menu component-id))] (partial on-context-menu component-id))
renaming? (= renaming (:id component))]
[:div {:ref item-ref [:div {:ref item-ref
:class (stl/css-case :selected (contains? selected (:id component)) :class (stl/css-case :selected (contains? selected (:id component))
:grid-cell listing-thumbs? :grid-cell listing-thumbs?
:enum-item (not listing-thumbs?)) :enum-item (not listing-thumbs?))
:id (dm/str "component-shape-id-" (:id component)) :id (dm/str "component-shape-id-" (:id component))
:draggable (not read-only?) :draggable (and (not read-only?) (not renaming?))
:on-click on-component-click :on-click on-component-click
:on-double-click on-component-double-click :on-double-click on-component-double-click
:on-context-menu on-context-menu :on-context-menu on-context-menu
@ -160,22 +162,21 @@
(when (and (some? root-shape) (when (and (some? root-shape)
(some? container)) (some? container))
[:* [:*
(let [renaming? (= renaming (:id component))] [:*
[:* [:& editable-label
[:& editable-label {:class (stl/css-case :cell-name listing-thumbs?
{:class (stl/css-case :cell-name listing-thumbs? :item-name (not listing-thumbs?)
:item-name (not listing-thumbs?) :editing renaming?)
:editing renaming?) :value (cfh/merge-path-item (:path component) (:name component))
:value (cfh/merge-path-item (:path component) (:name component)) :tooltip (cfh/merge-path-item (:path component) (:name component))
:tooltip (cfh/merge-path-item (:path component) (:name component)) :display-value (:name component)
:display-value (:name component) :editing renaming?
:editing renaming? :disable-dbl-click true
:disable-dbl-click true :on-change do-rename
:on-change do-rename :on-cancel cancel-rename}]
:on-cancel cancel-rename}]
(when ^boolean dragging? (when ^boolean dragging?
[:div {:class (stl/css :dragging)}])]) [:div {:class (stl/css :dragging)}])]
(when visible? (when visible?
[:& cmm/component-item-thumbnail {:file-id file-id [:& cmm/component-item-thumbnail {:file-id file-id