diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index d3af5c86a..3a7138921 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer="Andrey Antukh " ARG DEBIAN_FRONTEND=noninteractive -ENV NODE_VERSION=v16.16.0 \ +ENV NODE_VERSION=v16.17.0 \ CLOJURE_VERSION=1.11.1.1149 \ CLJKONDO_VERSION=2022.06.22 \ BABASHKA_VERSION=0.8.156 \ diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter index 5b1e90458..144b5a9c1 100644 --- a/docker/images/Dockerfile.exporter +++ b/docker/images/Dockerfile.exporter @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ENV LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \ - NODE_VERSION=v16.15.1 + NODE_VERSION=v16.17.0 RUN set -ex; \ mkdir -p /etc/resolvconf/resolv.conf.d; \ diff --git a/docker/images/files/config.js b/docker/images/files/config.js index ef86caa0e..7bc9ce940 100644 --- a/docker/images/files/config.js +++ b/docker/images/files/config.js @@ -1,13 +1,2 @@ // Frontend configuration - -//var penpotPublicURI = "https://penpot.example.com"; -//var penpotDemoWarning = ; -//var penpotAllowDemoUsers = ; -//var penpotGoogleClientID = ""; -//var penpotGitlabClientID = ""; -//var penpotGithubClientID = ""; -//var penpotOIDCClientID = ""; -//var penpotLoginWithLDAP = ; -//var penpotRegistrationEnabled = ; -//var penpotAnalyticsEnabled = ; //var penpotFlags = ""; diff --git a/frontend/src/app/main/ui/viewer/comments.cljs b/frontend/src/app/main/ui/viewer/comments.cljs index 96c44b262..8b1cf5c16 100644 --- a/frontend/src/app/main/ui/viewer/comments.cljs +++ b/frontend/src/app/main/ui/viewer/comments.cljs @@ -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)))))]