Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-15 11:38:24 -05:00
Code Issues Activity

Merge pull request #2187 from penpot/niwinz-viewer-comments-positioning-bug

Browse source 
Viewer comments positioning regression
This commit is contained in:
Alejandro 2022-08-24 11:07:42 +02:00 • committed by GitHub
commit 35c1008b37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/devenv/Dockerfile
View file

@ -3,7 +3,7 @@ LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ENV NODE_VERSION=v16.16.0 \ ENV NODE_VERSION=v16.17.0 \
CLOJURE_VERSION=1.11.1.1149 \ CLOJURE_VERSION=1.11.1.1149 \
CLJKONDO_VERSION=2022.06.22 \ CLJKONDO_VERSION=2022.06.22 \
BABASHKA_VERSION=0.8.156 \ BABASHKA_VERSION=0.8.156 \

2
docker/images/Dockerfile.exporter
View file

@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV LANG=en_US.UTF-8 \ ENV LANG=en_US.UTF-8 \
LC_ALL=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \
NODE_VERSION=v16.15.1 NODE_VERSION=v16.17.0
RUN set -ex; \ RUN set -ex; \
mkdir -p /etc/resolvconf/resolv.conf.d; \ mkdir -p /etc/resolvconf/resolv.conf.d; \

11
docker/images/files/config.js
View file

@ -1,13 +1,2 @@
// Frontend configuration // Frontend configuration
//var penpotPublicURI = "https://penpot.example.com";
//var penpotDemoWarning = <true|false>;
//var penpotAllowDemoUsers = <true|false>;
//var penpotGoogleClientID = "<google-client-id-here>";
//var penpotGitlabClientID = "<gitlab-client-id-here>";
//var penpotGithubClientID = "<github-client-id-here>";
//var penpotOIDCClientID = "<oidc-client-id-here>";
//var penpotLoginWithLDAP = <true|false>;
//var penpotRegistrationEnabled = <true|false>;
//var penpotAnalyticsEnabled = <true|false>;
//var penpotFlags = ""; //var penpotFlags = "";

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

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