3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-24 02:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Restore viewport and selection when exiting focus mode (#6827)

Browse source 
* 📚 Provide guidance on how to exit focus mode

* 🐛 Restore viewport & selection post focus mode

* 📎 Update changelog
This commit is contained in:
Álvaro Tejero-Cantero 2025-07-07 09:44:06 +02:00 • committed by GitHub
parent 92d708d52c
commit bcb69b6227
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -555,6 +555,11 @@
(assoc :workspace-focus-selected focus))))))
(defn toggle-focus-mode
"Zoom in on and center viewport on selection;
hide all other layers in viewport and layer panel.
When in focus mode, exit restoring previous viewport and selection.
"
[]
(ptk/reify ::toggle-focus-mode
ev/Event
@ -562,14 +567,22 @@
ptk/UpdateEvent
(update [_ state]
(let [selected (dsh/lookup-selected state)]
(cond-> state
(and (empty? (:workspace-focus-selected state))
(d/not-empty? selected))
(assoc :workspace-focus-selected selected)
(let [selected (dsh/lookup-selected state)
have-selection? (d/not-empty? selected)
in-mode? (d/not-empty? (:workspace-focus-selected state))]
(d/not-empty? (:workspace-focus-selected state))
(dissoc :workspace-focus-selected))))
(if in-mode?
;; Exit focus, restoring previous viewport, selection, etc
(-> state
(assoc :workspace-local (:workspace-pre-focus state))
(dissoc :workspace-focus-selected)
(dissoc :workspace-pre-focus))
(if have-selection?
;; Enter focus and save viewport, selection, etc
(-> state
(assoc :workspace-focus-selected selected)
(assoc :workspace-pre-focus (:workspace-local state)))
state))))
ptk/WatchEvent
(watch [_ state stream]
@ -584,6 +597,7 @@
(rx/map (comp set keys))
(rx/buffer 2 1)
(rx/merge-map
;; While focus is active, update it with any new and deleted shapes
(fn [[old-keys new-keys]]
(let [removed (set/difference old-keys new-keys)
added (set/difference new-keys old-keys)]