3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-19 23:36:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix multiplayer username sometimes is not displayed correctly

Browse source
This commit is contained in:
Alejandro Alonso 2023-03-22 16:14:52 +01:00 • committed by Alonso Torres
parent b5fc074e35
commit 3b2083134e
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -44,6 +44,7 @@
- Fix path options not showing when editing rects or ellipses [Taiga #5053](https://tree.taiga.io/project/penpot/issue/5053) - Fix path options not showing when editing rects or ellipses [Taiga #5053](https://tree.taiga.io/project/penpot/issue/5053)
- Fix tooltips for some alignment options are truncated on design tab [Taiga #5040](https://tree.taiga.io/project/penpot/issue/5040) - Fix tooltips for some alignment options are truncated on design tab [Taiga #5040](https://tree.taiga.io/project/penpot/issue/5040)
- Fix horizontal margins drag don't always start from place [Taiga #5020](https://tree.taiga.io/project/penpot/issue/5020) - Fix horizontal margins drag don't always start from place [Taiga #5020](https://tree.taiga.io/project/penpot/issue/5020)
- Fix multiplayer username sometimes is not displayed correctly [Taiga #4400](https://tree.taiga.io/project/penpot/issue/4400)
### :heart: Community contributions by (Thank you!) ### :heart: Community contributions by (Thank you!)
- To @ondrejkonec: for contributing to the code with: - To @ondrejkonec: for contributing to the code with:

12
frontend/src/app/main/data/comments.cljs
View file

@ -279,15 +279,19 @@
(-> (->
(assoc-in (conj path :position) (:position comment-thread)) (assoc-in (conj path :position) (:position comment-thread))
(assoc-in (conj path :frame-id) (:frame-id comment-thread)))))) (assoc-in (conj path :frame-id) (:frame-id comment-thread))))))
(fetched [data state] (fetched [[users comments] state]
(let [state (assoc state :comment-threads (d/index-by :id data))] (let [state (-> state
(reduce set-comment-threds state data)))] (assoc :comment-threads (d/index-by :id comments))
(assoc :current-file-comments-users (d/index-by :id users)))]
(reduce set-comment-threds state comments)))]
(ptk/reify ::retrieve-comment-threads (ptk/reify ::retrieve-comment-threads
ptk/WatchEvent ptk/WatchEvent
(watch [_ state _] (watch [_ state _]
(let [share-id (-> state :viewer-local :share-id)] (let [share-id (-> state :viewer-local :share-id)]
(->> (rp/cmd! :get-comment-threads {:file-id file-id :share-id share-id}) (->> (rx/zip (rp/cmd! :get-team-users {:file-id file-id})
(rp/cmd! :get-comment-threads {:file-id file-id :share-id share-id}))
(rx/take 1)
(rx/map #(partial fetched %)) (rx/map #(partial fetched %))
(rx/catch #(rx/throw {:type :comment-error})))))))) (rx/catch #(rx/throw {:type :comment-error}))))))))