From 97ae295cb9cefbbbb94f52e594fe74b7cd2c0fcc Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Fri, 11 Oct 2024 11:55:22 +0200 Subject: [PATCH 1/8] :bug: Fix problem updating layout when toggle visibility in component copy --- CHANGES.md | 1 + common/src/app/common/logic/shapes.cljc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d1f27cfbe..77d2c8c4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -38,6 +38,7 @@ - Fix problem when translating multiple path points [Github #4459](https://github.com/penpot/penpot/issues/4459) - Fix problem on importing (and exporting) files with flows [Taiga #8914](https://tree.taiga.io/project/penpot/issue/8914) - Fix Internal Error page: "go to your penpot" wrong design [Taiga #8922](https://tree.taiga.io/project/penpot/issue/8922) +- Fix problem updating layout when toggle visibility in component copy[Github #5143](https://github.com/penpot/penpot/issues/5143) - Fix "Done" button on toolbar on inspect mode should go to design mode [Taiga #8933](https://tree.taiga.io/project/penpot/issue/8933) ## 2.2.1 diff --git a/common/src/app/common/logic/shapes.cljc b/common/src/app/common/logic/shapes.cljc index de3bd4c83..1bb1b109a 100644 --- a/common/src/app/common/logic/shapes.cljc +++ b/common/src/app/common/logic/shapes.cljc @@ -124,7 +124,7 @@ ;; All parents of any deleted shape must be resized. (into res (cfh/get-parent-ids objects id))) (d/ordered-set) - ids-to-delete) + (concat ids-to-delete ids-to-hide)) all-children (->> ids-to-delete ;; Children of deleted shapes must be also deleted. From f8fad95fef3e8971963db14e4036927b70a805a1 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Fri, 11 Oct 2024 13:27:26 +0200 Subject: [PATCH 2/8] :bug: Fix problem with shortcuts in text editor --- CHANGES.md | 3 ++- frontend/src/app/main/data/shortcuts_impl.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 77d2c8c4e..7b50269b0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -38,8 +38,9 @@ - Fix problem when translating multiple path points [Github #4459](https://github.com/penpot/penpot/issues/4459) - Fix problem on importing (and exporting) files with flows [Taiga #8914](https://tree.taiga.io/project/penpot/issue/8914) - Fix Internal Error page: "go to your penpot" wrong design [Taiga #8922](https://tree.taiga.io/project/penpot/issue/8922) -- Fix problem updating layout when toggle visibility in component copy[Github #5143](https://github.com/penpot/penpot/issues/5143) +- Fix problem updating layout when toggle visibility in component copy [Github #5143](https://github.com/penpot/penpot/issues/5143) - Fix "Done" button on toolbar on inspect mode should go to design mode [Taiga #8933](https://tree.taiga.io/project/penpot/issue/8933) +- Fix problem with shortcuts in text editor [Github #5078](https://github.com/penpot/penpot/issues/5078) ## 2.2.1 diff --git a/frontend/src/app/main/data/shortcuts_impl.js b/frontend/src/app/main/data/shortcuts_impl.js index e381cc150..0dcc27538 100644 --- a/frontend/src/app/main/data/shortcuts_impl.js +++ b/frontend/src/app/main/data/shortcuts_impl.js @@ -24,6 +24,10 @@ target.stopCallback = function (e, element, combo) { return false } + if ((' ' + element.className + ' ').indexOf(' mousetrap ') > -1) { + return false; + } + if ('composedPath' in e && typeof e.composedPath === 'function') { // For open shadow trees, update `element` so that the following check works. const initialEventTarget = e.composedPath()[0]; From c236e0765b27c6cb3d49b4f625686ac32bdb8220 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Fri, 11 Oct 2024 15:27:34 +0200 Subject: [PATCH 3/8] :bug: Fix problems with show in viewer and interactions --- CHANGES.md | 1 + common/src/app/common/logic/shapes.cljc | 15 ++-- .../logic/hide_in_viewer_test.cljc | 75 ------------------- .../app/main/data/workspace/interactions.cljs | 55 ++++++++------ 4 files changed, 40 insertions(+), 106 deletions(-) delete mode 100644 common/test/common_tests/logic/hide_in_viewer_test.cljc diff --git a/CHANGES.md b/CHANGES.md index 7b50269b0..8fb55004d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -41,6 +41,7 @@ - Fix problem updating layout when toggle visibility in component copy [Github #5143](https://github.com/penpot/penpot/issues/5143) - Fix "Done" button on toolbar on inspect mode should go to design mode [Taiga #8933](https://tree.taiga.io/project/penpot/issue/8933) - Fix problem with shortcuts in text editor [Github #5078](https://github.com/penpot/penpot/issues/5078) +- Fix problems with show in viewer and interactions [Github #4868](https://github.com/penpot/penpot/issues/4868) ## 2.2.1 diff --git a/common/src/app/common/logic/shapes.cljc b/common/src/app/common/logic/shapes.cljc index 1bb1b109a..0e292847f 100644 --- a/common/src/app/common/logic/shapes.cljc +++ b/common/src/app/common/logic/shapes.cljc @@ -408,17 +408,12 @@ ;; Resize parent containers that need to (pcb/resize-parents parents)))) - - - (defn change-show-in-viewer [shape hide?] - (cond-> (assoc shape :hide-in-viewer hide?) - ;; When a frame is no longer shown in view mode, it cannot have interactions - hide? - (dissoc :interactions))) + (assoc shape :hide-in-viewer hide?)) (defn add-new-interaction [shape interaction] (-> shape - (update :interactions ctsi/add-interaction interaction) - ;; When a interaction is created, the frame must be shown in view mode - (dissoc :hide-in-viewer))) + (update :interactions ctsi/add-interaction interaction))) + +(defn show-in-viewer [shape] + (dissoc shape :hide-in-viewer)) diff --git a/common/test/common_tests/logic/hide_in_viewer_test.cljc b/common/test/common_tests/logic/hide_in_viewer_test.cljc deleted file mode 100644 index 051a4732e..000000000 --- a/common/test/common_tests/logic/hide_in_viewer_test.cljc +++ /dev/null @@ -1,75 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; Copyright (c) KALEIDOS INC - -(ns common-tests.logic.hide-in-viewer-test - (:require - [app.common.files.changes-builder :as pcb] - [app.common.logic.shapes :as cls] - [app.common.test-helpers.compositions :as tho] - [app.common.test-helpers.files :as thf] - [app.common.test-helpers.ids-map :as thi] - [app.common.test-helpers.shapes :as ths] - [app.common.types.shape.interactions :as ctsi] - [clojure.test :as t])) - -(t/use-fixtures :each thi/test-fixture) - - -(t/deftest test-remove-show-in-view-mode-delete-interactions - (let [;; ==== Setup - - file (-> (thf/sample-file :file1) - (tho/add-frame :frame-dest) - (tho/add-frame :frame-origin) - (ths/add-interaction :frame-origin :frame-dest)) - - frame-origin (ths/get-shape file :frame-origin) - - page (thf/current-page file) - - - ;; ==== Action - changes (-> (pcb/empty-changes nil (:id page)) - (pcb/with-objects (:objects page)) - (pcb/update-shapes [(:id frame-origin)] #(cls/change-show-in-viewer % true))) - file' (thf/apply-changes file changes) - - ;; ==== Get - frame-origin' (ths/get-shape file' :frame-origin)] - - ;; ==== Check - (t/is (some? (:interactions frame-origin))) - (t/is (nil? (:interactions frame-origin'))))) - - - -(t/deftest test-add-new-interaction-updates-show-in-view-mode - (let [;; ==== Setup - - file (-> (thf/sample-file :file1) - (tho/add-frame :frame-dest :hide-in-viewer true) - (tho/add-frame :frame-origin :hide-in-viewer true)) - frame-dest (ths/get-shape file :frame-dest) - frame-origin (ths/get-shape file :frame-origin) - - page (thf/current-page file) - - ;; ==== Action - new-interaction (-> ctsi/default-interaction - (ctsi/set-destination (:id frame-dest)) - (assoc :position-relative-to (:id frame-dest))) - - changes (-> (pcb/empty-changes nil (:id page)) - (pcb/with-objects (:objects page)) - (pcb/update-shapes [(:id frame-origin)] #(cls/add-new-interaction % new-interaction))) - file' (thf/apply-changes file changes) - - ;; ==== Get - frame-origin' (ths/get-shape file' :frame-origin)] - - ;; ==== Check - (t/is (true? (:hide-in-viewer frame-origin))) - (t/is (nil? (:hide-in-viewer frame-origin'))))) diff --git a/frontend/src/app/main/data/workspace/interactions.cljs b/frontend/src/app/main/data/workspace/interactions.cljs index b2387e270..e8dfd1253 100644 --- a/frontend/src/app/main/data/workspace/interactions.cljs +++ b/frontend/src/app/main/data/workspace/interactions.cljs @@ -147,11 +147,15 @@ ptk/WatchEvent (watch [_ state _] (let [page-id (or page-id (:current-page-id state))] - (rx/of (dwsh/update-shapes - [shape-id] - (fn [shape] - (cls/add-new-interaction shape interaction)) - {:page-id page-id})))))) + (rx/of (dwsh/update-shapes [shape-id] + (fn [shape] + (cls/add-new-interaction shape interaction)) + {:page-id page-id}) + + (when (:destination interaction) + (dwsh/update-shapes [(:destination interaction)] + cls/show-in-viewer + {:page-id page-id}))))))) (defn add-new-interaction ([shape] (add-new-interaction shape nil)) @@ -167,15 +171,20 @@ flows (get page :objects) flow (ctp/get-frame-flow flows (:id frame))] (rx/concat - (rx/of (dwsh/update-shapes [(:id shape)] - (fn [shape] - (let [new-interaction (-> ctsi/default-interaction - (ctsi/set-destination destination) - (assoc :position-relative-to (:id shape)))] - (cls/add-new-interaction shape new-interaction))))) - (when (and (not (connected-frame? objects (:id frame))) - (nil? flow)) - (rx/of (add-flow (:id frame)))))))))) + (rx/of (dwsh/update-shapes + [(:id shape)] + (fn [shape] + (let [new-interaction (-> ctsi/default-interaction + (ctsi/set-destination destination) + (assoc :position-relative-to (:id shape)))] + (cls/add-new-interaction shape new-interaction)))) + + (when destination + (dwsh/update-shapes [destination] cls/show-in-viewer)) + + (when (and (not (connected-frame? objects (:id frame))) + (nil? flow)) + (add-flow (:id frame)))))))))) (defn remove-interaction ([shape index] @@ -186,8 +195,7 @@ (watch [_ _ _] (rx/of (dwsh/update-shapes [(:id shape)] (fn [shape] - (update shape :interactions - ctsi/remove-interaction index)) + (update shape :interactions ctsi/remove-interaction index)) {:page-id page-id})))))) (defn update-interaction ([shape index update-fn] @@ -196,11 +204,16 @@ (ptk/reify ::update-interaction ptk/WatchEvent (watch [_ _ _] - (rx/of (dwsh/update-shapes [(:id shape)] - (fn [shape] - (update shape :interactions - ctsi/update-interaction index update-fn)) - options)))))) + (let [interactions (ctsi/update-interaction (:interactions shape) index update-fn) + interaction (nth interactions index)] + (rx/of (dwsh/update-shapes + [(:id shape)] + (fn [shape] + (assoc shape :interactions interactions)) + options) + + (when (some? (:destination interaction)) + (dwsh/update-shapes [(:destination interaction)] cls/show-in-viewer options)))))))) (defn remove-all-interactions-nav-to "Remove all interactions that navigate to the given frame." From 3a9119cf29062a0561ff3311a88ecdffd341a414 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 14 Oct 2024 10:06:28 +0200 Subject: [PATCH 4/8] :bug: Add visual feedback when moving an element into a board --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/viewport.cljs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 8fb55004d..11c31f4f7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -42,6 +42,7 @@ - Fix "Done" button on toolbar on inspect mode should go to design mode [Taiga #8933](https://tree.taiga.io/project/penpot/issue/8933) - Fix problem with shortcuts in text editor [Github #5078](https://github.com/penpot/penpot/issues/5078) - Fix problems with show in viewer and interactions [Github #4868](https://github.com/penpot/penpot/issues/4868) +- Add visual feedback when moving an element into a board [Github #3210](https://github.com/penpot/penpot/issues/3210) ## 2.2.1 diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index 052f84c8f..7040c2c1e 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -397,7 +397,7 @@ (->> @hover-ids (filter #(cfh/frame-shape? (get base-objects %))) (remove selected) - (first)) + (last)) outlined-frame (get objects outlined-frame-id)] [:* [:& outline/shape-outlines From a25abd0ca4c971a2c8e82d4475d0968c76925c0a Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 14 Oct 2024 10:07:07 +0200 Subject: [PATCH 5/8] :bug: Fix percent calculation on grid layout tracks --- CHANGES.md | 1 + .../ui/workspace/sidebar/options/menus/layout_container.cljs | 2 +- .../ui/workspace/sidebar/options/menus/layout_container.scss | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 11c31f4f7..2a78e06e5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -43,6 +43,7 @@ - Fix problem with shortcuts in text editor [Github #5078](https://github.com/penpot/penpot/issues/5078) - Fix problems with show in viewer and interactions [Github #4868](https://github.com/penpot/penpot/issues/4868) - Add visual feedback when moving an element into a board [Github #3210](https://github.com/penpot/penpot/issues/3210) +- Fix percent calculation on grid layout tracks [Github #4688](https://github.com/penpot/penpot/issues/4688) ## 2.2.1 diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs index 83caf49bd..5bede159d 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs @@ -677,7 +677,7 @@ [{:keys [type value]}] (case type :auto "auto" - :percent (fmt/format-percent value) + :percent (fmt/format-percent (/ value 100)) :flex (fmt/format-frs value) :fixed (fmt/format-pixels value) value)) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss index 531b94989..00d7c2f7f 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss @@ -150,6 +150,7 @@ .grid-layout-menu { @include flexColumn; gap: $s-8; + overflow: hidden; .row { @include flexRow; From 2dc0cfdee3cd4ce0133527273f2db57b6f25f469 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 14 Oct 2024 11:43:34 +0200 Subject: [PATCH 6/8] :bug: Fix problem with caps and inner shadows --- CHANGES.md | 1 + common/src/app/common/geom/shapes/bounds.cljc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2a78e06e5..7363d47ee 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -44,6 +44,7 @@ - Fix problems with show in viewer and interactions [Github #4868](https://github.com/penpot/penpot/issues/4868) - Add visual feedback when moving an element into a board [Github #3210](https://github.com/penpot/penpot/issues/3210) - Fix percent calculation on grid layout tracks [Github #4688](https://github.com/penpot/penpot/issues/4688) +- Fix problem with caps and inner shadows [Github #4517](https://github.com/penpot/penpot/issues/4517) ## 2.2.1 diff --git a/common/src/app/common/geom/shapes/bounds.cljc b/common/src/app/common/geom/shapes/bounds.cljc index 5612837b4..d87ad2a4f 100644 --- a/common/src/app/common/geom/shapes/bounds.cljc +++ b/common/src/app/common/geom/shapes/bounds.cljc @@ -60,6 +60,7 @@ filter-y (mth/min y (+ y offset-y (- spread) (- blur) -5)) filter-w (+ w (mth/abs offset-x) (* spread 2) (* blur 2) 10) filter-h (+ h (mth/abs offset-y) (* spread 2) (* blur 2) 10)] + (grc/make-rect filter-x filter-y filter-w filter-h))) (defn get-rect-filter-bounds @@ -101,7 +102,7 @@ (map #(case (get % :stroke-alignment :center) :center (/ (:stroke-width % 0) 2) :outer (:stroke-width % 0) - 0)) + (:stroke-width % 0))) (reduce d/max 0)) stroke-margin From 9d2f484aa36301a31ba6013b0261a0d1acdec037 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 14 Oct 2024 11:44:29 +0200 Subject: [PATCH 7/8] :bug: Fix problem with horizontal/vertical lines and shadows --- CHANGES.md | 1 + frontend/src/app/main/ui/shapes/filters.cljs | 39 +++++++++++++++++--- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7363d47ee..46e567bbf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -45,6 +45,7 @@ - Add visual feedback when moving an element into a board [Github #3210](https://github.com/penpot/penpot/issues/3210) - Fix percent calculation on grid layout tracks [Github #4688](https://github.com/penpot/penpot/issues/4688) - Fix problem with caps and inner shadows [Github #4517](https://github.com/penpot/penpot/issues/4517) +- Fix problem with horizontal/vertical lines and shadows [Github #4516](https://github.com/penpot/penpot/issues/4516) ## 2.2.1 diff --git a/frontend/src/app/main/ui/shapes/filters.cljs b/frontend/src/app/main/ui/shapes/filters.cljs index f7ff505db..5d23c26ab 100644 --- a/frontend/src/app/main/ui/shapes/filters.cljs +++ b/frontend/src/app/main/ui/shapes/filters.cljs @@ -10,6 +10,7 @@ [app.common.data :as d] [app.common.data.macros :as dm] [app.common.geom.shapes.bounds :as gsb] + [app.common.math :as mth] [app.common.uuid :as uuid] [cuerdas.core :as str] [rumext.v2 :as mf])) @@ -129,6 +130,34 @@ [filters] (map #(assoc %1 :filter-in %2) filters (cons nil (map :id filters)))) +(defn filter-coords + [bounds selrect padding] + (if (or (mth/close? 0.01 (:width selrect)) + (mth/close? 0.01 (:height selrect))) + + ;; We cannot use "objectBoundingbox" if the shape doesn't have width/heigth + ;; From the SVG spec (https://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBox + ;; Keyword objectBoundingBox should not be used when the geometry of the applicable element + ;; has no width or no height, such as the case of a horizontal or vertical line, even when + ;; the line has actual thickness when viewed due to having a non-zero stroke width since + ;; stroke width is ignored for bounding box calculations. When the geometry of the + ;; applicable element has no width or height and objectBoundingBox is specified, then + ;; the given effect (e.g., a gradient or a filter) will be ignored. + (let [filter-width (+ (:width bounds) (* 2 (:horizontal padding))) + filter-height (+ (:height bounds) (* 2 (:vertical padding))) + filter-x (- (:x bounds) #_(:x selrect) (:horizontal padding)) + filter-y (- (:y bounds) #_(:y selrect) (:vertical padding)) + filter-units "userSpaceOnUse"] + [filter-x filter-y filter-width filter-height filter-units]) + + ;; If the width/height is not zero we use objectBoundingBox as it's more stable + (let [filter-width (/ (+ (:width bounds) (* 2 (:horizontal padding))) (:width selrect)) + filter-height (/ (+ (:height bounds) (* 2 (:vertical padding))) (:height selrect)) + filter-x (/ (- (:x bounds) (:x selrect) (:horizontal padding)) (:width selrect)) + filter-y (/ (- (:y bounds) (:y selrect) (:vertical padding)) (:height selrect)) + filter-units "objectBoundingBox"] + [filter-x filter-y filter-width filter-height filter-units]))) + (mf/defc filters [{:keys [filter-id shape]}] @@ -136,17 +165,17 @@ bounds (gsb/get-rect-filter-bounds (:selrect shape) filters (or (-> shape :blur :value) 0)) padding (gsb/calculate-padding shape) selrect (:selrect shape) - filter-x (/ (- (:x bounds) (:x selrect) (:horizontal padding)) (:width selrect)) - filter-y (/ (- (:y bounds) (:y selrect) (:vertical padding)) (:height selrect)) - filter-width (/ (+ (:width bounds) (* 2 (:horizontal padding))) (:width selrect)) - filter-height (/ (+ (:height bounds) (* 2 (:vertical padding))) (:height selrect))] + + [filter-x filter-y filter-width filter-height filter-units] + (filter-coords bounds selrect padding)] + (when (> (count filters) 2) [:filter {:id filter-id :x filter-x :y filter-y :width filter-width :height filter-height - :filterUnits "objectBoundingBox" + :filterUnits filter-units :color-interpolation-filters "sRGB"} (for [[index entry] (d/enumerate filters)] [:& filter-entry {:key (dm/str filter-id "-" index) From 6d8c1831609a3b9b66b46f72f54d761f349f0abf Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 14 Oct 2024 11:59:06 +0200 Subject: [PATCH 8/8] :sparkles: Add plugins whitelisting for removing the disclaimer --- frontend/src/app/config.cljs | 1 + frontend/src/app/main/ui/workspace/plugins.cljs | 11 ++++++----- frontend/src/app/main/ui/workspace/plugins.scss | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/config.cljs b/frontend/src/app/config.cljs index 72bbb4d00..e6b4361b0 100644 --- a/frontend/src/app/config.cljs +++ b/frontend/src/app/config.cljs @@ -111,6 +111,7 @@ (def flex-help-uri (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/")) (def grid-help-uri (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/")) (def plugins-list-uri (obj/get global "penpotPluginsListUri" "https://penpot-docs-plugins.pages.dev/plugins/getting-started/#examples")) +(def plugins-whitelist (into #{} (obj/get global "penpotPluginsWhitelist" []))) (defn- normalize-uri [uri-str] diff --git a/frontend/src/app/main/ui/workspace/plugins.cljs b/frontend/src/app/main/ui/workspace/plugins.cljs index cecc22bf6..3beba2d16 100644 --- a/frontend/src/app/main/ui/workspace/plugins.cljs +++ b/frontend/src/app/main/ui/workspace/plugins.cljs @@ -9,7 +9,7 @@ (:require [app.common.data :as d] [app.common.data.macros :as dm] - [app.config :as cf] + [app.config :as cfg] [app.main.data.events :as ev] [app.main.data.modal :as modal] [app.main.data.plugins :as dp] @@ -169,7 +169,7 @@ [:> i18n/tr-html* {:class (stl/css :discover) :on-click #(st/emit! (ptk/event ::ev/event {::ev/name "open-plugins-list"})) - :content (tr "workspace.plugins.discover" cf/plugins-list-uri)}]) + :content (tr "workspace.plugins.discover" cfg/plugins-list-uri)}]) [:hr] @@ -178,7 +178,7 @@ [:div {:class (stl/css :plugins-empty-logo)} i/puzzle] [:div {:class (stl/css :plugins-empty-text)} (tr "workspace.plugins.empty-plugins")] [:a {:class (stl/css :plugins-link) - :href cf/plugins-list-uri + :href cfg/plugins-list-uri :target "_blank" :on-click #(st/emit! (ptk/event ::ev/event {::ev/name "open-plugins-list"}))} (tr "workspace.plugins.plugin-list-link") i/external-link]] @@ -287,8 +287,9 @@ [:div {:class (stl/css :modal-content)} [:& plugins-permission-list {:permissions permissions}] - [:div {:class (stl/css :permissions-disclaimer)} - (tr "workspace.plugins.permissions.disclaimer")]] + (when-not (contains? cfg/plugins-whitelist host) + [:div {:class (stl/css :permissions-disclaimer)} + (tr "workspace.plugins.permissions.disclaimer")])] [:div {:class (stl/css :modal-footer)} [:div {:class (stl/css :action-buttons)} diff --git a/frontend/src/app/main/ui/workspace/plugins.scss b/frontend/src/app/main/ui/workspace/plugins.scss index ba736acf8..643b4957a 100644 --- a/frontend/src/app/main/ui/workspace/plugins.scss +++ b/frontend/src/app/main/ui/workspace/plugins.scss @@ -272,7 +272,7 @@ div.input-error { @include bodySmallTypography; padding: $s-16; background: var(--color-background-quaternary); - color: var(--color-foreground-quaternary); + color: var(--color-foreground-primary); border-radius: $br-4; }