3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-03 11:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging'

Browse source
This commit is contained in:
Alejandro Alonso 2022-08-24 11:10:08 +02:00
commit d2cd29bf76
12 changed files with 146 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

34
frontend/src/app/main/ui/viewer.cljs
View file

@ -275,6 +275,19 @@
interactions-mode
(:interactions-mode local)
click-on-screen
(mf/use-callback
(fn [event]
(let [origin (dom/get-target event)
over-section? (dom/class? origin "viewer-section")
layout (dom/get-element "viewer-layout")
has-force? (dom/class? layout "force-visible")]
(when over-section?
(if has-force?
(dom/remove-class! layout "force-visible")
(dom/add-class! layout "force-visible"))))))
on-click
(mf/use-fn
(mf/deps section)
@ -414,17 +427,15 @@
:handoff-layout (= section :handoff)
:fullscreen fullscreen?)}
[:& header/header
{:project project
:index index
:file file
:page page
:frame frame
:permissions permissions
:zoom zoom
:section section}]
[:div.viewer-content
[:& header/header {:project project
:index index
:file file
:page page
:frame frame
:permissions permissions
:zoom zoom
:section section}]
[:div.thumbnail-close {:on-click #(st/emit! dv/close-thumbnails-panel)
:class (dom/classnames :invisible (not (:show-thumbnails local false)))}]
[:& thumbnails-panel {:frames frames
@ -434,7 +445,8 @@
:thumbnail-data (:thumbnails file)}]
[:section.viewer-section {:id "viewer-section"
:ref viewer-section-ref
:class (if fullscreen? "fullscreen" "")}
:class (if fullscreen? "fullscreen" "")
:on-click click-on-screen}
(cond
(empty? frames)
[:section.empty-state

10
frontend/src/app/main/ui/viewer/comments.cljs
View file

@ -91,7 +91,6 @@
(mf/defc comments-layer
[{:keys [zoom file users frame page] :as props}]
(prn "comments-layer")
(let [profile (mf/deref refs/profile)
local (mf/deref refs/comments-local)
@ -113,12 +112,12 @@
modifier1 (mf/with-memo [frame-corner]
(-> (gmt/matrix)
(gmt/translate (gpt/negate frame-corner))))
modifier2 (mf/with-memo [frame-corner]
(-> (gpt/point frame-corner)
(gmt/translate-matrix)))
threads (mf/with-memo [threads-map positions]
threads (mf/with-memo [threads-map positions frame local profile]
(->> (vals threads-map)
(map (partial update-thread-position positions))
(filter #(= (:frame-id %) (:id frame)))
@ -126,7 +125,6 @@
(filter (fn [{:keys [position]}]
(gsh/has-point? frame position)))))
on-bubble-click
(mf/use-fn
(mf/deps open-thread-id)
@ -160,9 +158,7 @@
(mf/use-fn
(mf/deps frame-id modifier2)
(fn [draft]
(let [params (-> draft
(update :position gpt/transform modifier2)
(assoc :frame-id frame-id))]
(let [params (assoc draft :frame-id frame-id)]
(st/emit! (dcm/create-thread-on-viewer params)
(dcm/close-thread)))))]

12
frontend/src/app/main/ui/viewer/handoff.cljs
View file

@ -22,7 +22,17 @@
(fn [event]
(dom/prevent-default event)
(dom/stop-propagation event)
(st/emit! (dv/select-shape (:id frame)))))
(st/emit! (dv/select-shape (:id frame)))
(let [origin (dom/get-target event)
over-section? (dom/class? origin "handoff-svg-container")
layout (dom/get-element "viewer-layout")
has-force? (dom/class? layout "force-visible")]
(when over-section?
(if has-force?
(dom/remove-class! layout "force-visible")
(dom/add-class! layout "force-visible"))))))
(mf/defc viewport
[{:keys [local file page frame index viewer-pagination size]}]