From a95a7b9f90494e7e9440c5ffb095e11f4b1e5ef0 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 21 Nov 2022 09:08:57 +0100 Subject: [PATCH 1/3] :bug: Fix interaction for open url after delay duplicates tab --- frontend/src/app/main/ui/viewer/interactions.cljs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/main/ui/viewer/interactions.cljs b/frontend/src/app/main/ui/viewer/interactions.cljs index 02a1e62cc..921335dd5 100644 --- a/frontend/src/app/main/ui/viewer/interactions.cljs +++ b/frontend/src/app/main/ui/viewer/interactions.cljs @@ -84,7 +84,14 @@ ;; Retrieve frames again with correct modifier frame (get objects-not-fixed (:id frame)) - base (get objects-not-fixed (:id base))] + base (get objects-not-fixed (:id base)) + + non-delay-interactions (->> (:interactions frame) + (filterv #(not= (:event-type %) :after-delay))) + + fixed-frame (-> frame + (dissoc :fills) + (assoc :interactions non-delay-interactions))] [:& (mf/provider shapes/base-frame-ctx) {:value base} [:& (mf/provider shapes/frame-offset-ctx) {:value offset} @@ -106,7 +113,7 @@ :fill "none" :style {:width (:width size) :height (:height size)}} - [:& wrapper-fixed {:shape (dissoc frame :fills) :view-box vbox}]]]])) + [:& wrapper-fixed {:shape fixed-frame :view-box vbox}]]]])) (mf/defc viewport {::mf/wrap [mf/memo] From 7d48714aa2e4afb4088220fc8446e008440e8d90 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 22 Nov 2022 10:53:48 +0100 Subject: [PATCH 2/3] :tada: Add core-ui to libraries and templates carousel --- backend/resources/app/onboarding.edn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/resources/app/onboarding.edn b/backend/resources/app/onboarding.edn index 408835642..98403d054 100644 --- a/backend/resources/app/onboarding.edn +++ b/backend/resources/app/onboarding.edn @@ -22,6 +22,10 @@ :name "Circum Icons pack" :thumbnail-uri "https://penpot.app/images/libraries/cover-circum.jpg" :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/CircumIcons.penpot"} + {:id "coreui" + :name "CoreUI" + :thumbnail-uri "https://penpot.app/images/libraries/cover-coreui.jpg" + :file-uri "https://github.com/penpot/penpot-files/raw/main/CoreUI%20DesignSystem%20(DEMO).penpot"} {:id "whiteboarding-kit" :name "Whiteboarding Kit" :thumbnail-uri "https://penpot.app/images/libraries/cover-whiteboards.jpg" From e7865b86432a93180bd3ce272f1a2f065ccc4209 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 23 Nov 2022 12:44:04 +0100 Subject: [PATCH 3/3] :bug: Fix compatibility issue with 1.17.x file table changes --- backend/src/app/rpc/queries/files.clj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/app/rpc/queries/files.clj b/backend/src/app/rpc/queries/files.clj index 154e45d74..381ce0f0d 100644 --- a/backend/src/app/rpc/queries/files.clj +++ b/backend/src/app/rpc/queries/files.clj @@ -567,8 +567,9 @@ ;; --- Helpers (defn decode-row - [{:keys [data changes] :as row}] + [{:keys [data changes features] :as row}] (when row (cond-> row - changes (assoc :changes (blob/decode changes)) - data (assoc :data (blob/decode data))))) + features (assoc :features (db/decode-pgarray features #{})) + changes (assoc :changes (blob/decode changes)) + data (assoc :data (blob/decode data)))))