Merge pull request #5280 from penpot/palba-enhancements-viewer-role

Enhancements for viewer role
This commit is contained in:
Andrey Antukh 2024-11-13 12:50:09 +01:00 committed by GitHub
commit df416af19b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 65 additions and 32 deletions

View file

@ -457,12 +457,14 @@
on-drop
(mf/use-fn
(fn [e]
(when (and (not (dnd/has-type? e "penpot/files"))
(or (dnd/has-type? e "Files")
(dnd/has-type? e "application/x-moz-file")))
(dom/prevent-default e)
(reset! dragging? false)
(import-files (.-files (.-dataTransfer e))))))]
(if can-edit
(when (and (not (dnd/has-type? e "penpot/files"))
(or (dnd/has-type? e "Files")
(dnd/has-type? e "application/x-moz-file")))
(dom/prevent-default e)
(reset! dragging? false)
(import-files (.-files (.-dataTransfer e))))
(dom/prevent-default e))))]
[:div {:class (stl/css :dashboard-grid)
:dragabble (dm/str can-edit)
@ -576,24 +578,26 @@
on-drop
(mf/use-fn
(mf/deps files selected-files)
(mf/deps files selected-files can-edit)
(fn [e]
(cond
(dnd/has-type? e "penpot/files")
(do
(reset! dragging? false)
(when (not= selected-project project-id)
(let [data {:ids (into #{} (keys selected-files))
:project-id project-id}
mdata {:on-success on-drop-success}]
(st/emit! (dd/move-files (with-meta data mdata))))))
(if can-edit
(cond
(dnd/has-type? e "penpot/files")
(do
(reset! dragging? false)
(when (not= selected-project project-id)
(let [data {:ids (into #{} (keys selected-files))
:project-id project-id}
mdata {:on-success on-drop-success}]
(st/emit! (dd/move-files (with-meta data mdata))))))
(or (dnd/has-type? e "Files")
(dnd/has-type? e "application/x-moz-file"))
(do
(dom/prevent-default e)
(reset! dragging? false)
(import-files (.-files (.-dataTransfer e)))))))]
(or (dnd/has-type? e "Files")
(dnd/has-type? e "application/x-moz-file"))
(do
(dom/prevent-default e)
(reset! dragging? false)
(import-files (.-files (.-dataTransfer e)))))
(dom/prevent-default e))))]
[:div {:class (stl/css :dashboard-grid)
:dragabble (dm/str can-edit)

View file

@ -686,10 +686,12 @@
(dp/open-plugin! manifest user-can-edit?)))))]
[:> dropdown-menu-item* {:key (dm/str "plugins-menu-" idx)
:on-click on-click
:title (when-not can-open? (tr "workspace.plugins.error.need-editor"))
:class (stl/css-case :submenu-item true :menu-disabled (not can-open?))
:on-key-down on-key-down}
[:span {:class (stl/css :item-name)} name]]))])))
[:span {:class (stl/css :item-name)} name]
(when-not can-open?
[:span {:class (stl/css :item-icon)
:title (tr "workspace.plugins.error.need-editor")} i/help])]))])))
(mf/defc menu
{::mf/props :obj}

View file

@ -113,3 +113,10 @@
top: $s-192;
}
}
.item-icon {
svg {
@extend .button-icon;
stroke: var(--icon-foreground);
}
}