🐳 Add missing package in the exporter Docker image (#7026)

penpot-exporter requires poppler-utils for exporting to a PDF, but it is missing.
Added the package to the Dockerfile in the RUN section where dependencies are
being installed.

Signed-off-by: Brandon Currell <brandon+git@currell.pw>

.github/workflows/build-bundles.yml

@@ -0,0 +1,129 @@
+name: Build and Upload Penpot Bundles non-prod
+
+on:
+  # Create bundler for every tag
+  push:
+    tags:
+      - '**' # Pattern matched against refs/tags
+  # Create bundler every hour between 5:00 and 20:00 on working days
+  schedule:
+    - cron: '0 5-20 * * 1-5'
+  # Create bundler from manual action
+  workflow_dispatch:
+    inputs:
+      zip_mode:
+        # zip_mode defines how the build artifacts are packaged:
+        # - 'individual': creates one ZIP file per component (frontend, backend, exporter)
+        # - 'all': creates a single ZIP containing all components
+        # - null: for the rest of cases (non-manual events)
+        description: 'Bundle packaging mode'
+        required: false
+        default: 'individual'
+        type: choice
+        options:
+          - individual
+          - all
+
+jobs:
+  build-bundles:
+    name: Build and Upload Penpot Bundles
+    runs-on: ubuntu-24.04
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract somer useful variables
+        id: vars
+        run: |
+          echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "gh_branch=${{ github.base_ref || github.ref_name }}" >> $GITHUB_OUTPUT
+
+      # Set up Docker Buildx for multi-arch build
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Run manage.sh build-bundle from host
+        run: ./manage.sh build-bundle
+
+      - name: Prepare directories for zipping
+        run: |
+          mkdir zips
+          mv bundles penpot
+
+      - name: Create zip bundles for zip_mode == 'all'
+        if: ${{ github.event.inputs.zip_mode == 'all' }}
+        run: |
+          echo "📦 Packaging Penpot 'all' bundles..."
+          zip -r zips/penpot-all-bundles.zip penpot
+
+      - name: Create zip bundles for zip_mode != 'all'
+        if: ${{ github.event.inputs.zip_mode != 'all' }}
+        run: |
+          echo "📦 Packaging Penpot 'individual' bundles..."
+          zip -r zips/penpot-frontend.zip penpot/frontend
+          zip -r zips/penpot-backend.zip penpot/backend
+          zip -r zips/penpot-exporter.zip penpot/exporter
+
+      - name: Upload unified 'all' bundle
+        if: ${{ github.event.inputs.zip_mode == 'all' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: penpot-all-bundles
+          path: zips/penpot-all-bundles.zip
+
+      - name: Upload individual bundles
+        if: ${{ github.event.inputs.zip_mode != 'all' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: penpot-individual-bundles
+          path: |
+            zips/penpot-frontend.zip
+            zips/penpot-backend.zip
+            zips/penpot-exporter.zip
+
+      - name: Upload unified 'all' bundle to S3
+        if: ${{ github.event.inputs.zip_mode == 'all' }}
+        run: |
+          aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.gh_branch}}.zip
+          aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.commit_hash }}.zip
+
+      - name: Upload 'individual' bundles to S3
+        if: ${{ github.event.inputs.zip_mode != 'all' }}
+        run: |
+            for name in penpot-frontend penpot-backend penpot-exporter; do
+              aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.gh_branch }}-latest.zip
+              aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.commit_hash }}.zip
+            done
+
+      - name: Notify Mattermost about automatic bundles
+        if: github.event_name == 'pull_request'
+        uses: mattermost/action-mattermost-notify@master
+        with:
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
+          TEXT: |
+            📦 *Penpot bundle automatically generated*
+            📄 PR: ${{ github.event.pull_request.title }}
+            🔁 From: \`${{ github.head_ref }}\` to \`{{ github.base_ref }}\`
+            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      - name: Notify Mattermost about manual bundles
+        if: github.event_name == 'workflow_dispatch'
+        uses: mattermost/action-mattermost-notify@master
+        with:
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
+          TEXT: |
+            📦 *Penpot bundle manually generated*
+            📄 Triggered from branch: `${{ github.ref_name}}`
+            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      - name: Print artifact summary URL
+        run: |
+          echo "📦 Artifacts available at:"
+          echo "🔗 https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.gitignore

@@ -41,6 +41,7 @@
 /backend/resources/public/assets
 /backend/resources/public/media
 /backend/target/
+/backend/experiments
 /bundle*
 /cd.md
 /clj-profiler/
@@ -51,9 +52,6 @@
 /exporter/target
 /frontend/.storybook/preview-body.html
 /frontend/.storybook/preview-head.html
-/frontend/cypress/fixtures/validuser.json
-/frontend/cypress/videos/*/
-/frontend/cypress/videos/*/
 /frontend/dist/
 /frontend/npm-debug.log
 /frontend/out/
@@ -70,6 +68,8 @@
 /vendor/svgclean/bundle*.js
 /web
 /library/target/
+/library/*.zip
+/external
 
 clj-profiler/
 node_modules

CHANGES.md

@@ -1,6 +1,15 @@
 # CHANGELOG
 
-## 2.8.0 (Next / Unreleased)
+## 2.8.1
+
+### :bug: Bugs fixed
+
+- Fix unexpected exception on processing old texts [Github #6889](https://github.com/penpot/penpot/pull/6889)
+- Fix error on inspect tab when selecting multiple shapes [Taiga #11655](https://tree.taiga.io/project/penpot/issue/11655)
+- Fix missing package for the penport_exporter Docker image [GitHub #7205](https://github.com/penpot/penpot/issues/7025)
+
+
+## 2.8.0
 
 ### :rocket: Epics and highlights
 
@@ -15,8 +24,8 @@ on [its own changelog](library/CHANGES.md)
 **Penpot migrate from Redis to Valkey**
 
 As [Valkey](https://valkey.io/) is an opne-souce fork of [Redis](https://redis.io/)
-version 7.2.4, this version of Penpot will be compatible with Redis but may diverge 
-in future versions. Therefore, **migration from Redis to ValKey is recommended for all 
+version 7.2.4, this version of Penpot will be compatible with Redis but may diverge
+in future versions. Therefore, **migration from Redis to ValKey is recommended for all
 on-premises instances** that want to keep up to date.
 
 ### :heart: Community contributions (Thank you!)
@@ -39,6 +48,7 @@ on-premises instances** that want to keep up to date.
 - Update google fonts (at 2025/05/19) [Taiga 10792](https://tree.taiga.io/project/penpot/us/10792)
 - Add tooltip component to DS [Taiga 9220](https://tree.taiga.io/project/penpot/us/9220)
 - Allow multi file token export [Taiga #10144](https://tree.taiga.io/project/penpot/us/10144)
+- Fix problem when double click on hidden shapes [Taiga #11314](https://tree.taiga.io/project/penpot/issue/11314)
 
 ### :bug: Bugs fixed
 
@@ -57,8 +67,12 @@ on-premises instances** that want to keep up to date.
 - Fix button width [Taiga #11394](https://tree.taiga.io/project/penpot/issue/11394)
 - Fix mixed letter spacing and line height [Taiga #11178](https://tree.taiga.io/project/penpot/issue/11178)
 - Fix snap nodes shortcut [Taiga #11054](https://tree.taiga.io/project/penpot/issue/11054)
-- Fix changing a text property in a text layer does not unapply the previously applied token in the same property [Taiga #11337}(https://tree.taiga.io/project/penpot/issue/11337)
+- Fix changing a text property in a text layer does not unapply the previously applied token in the same property [Taiga #11337](https://tree.taiga.io/project/penpot/issue/11337)
 - Fix shortcut error pressing G+W from the View Mode [Taiga #11061](https://tree.taiga.io/project/penpot/issue/11061)
+- Fix entering long project name [Taiga #11417](https://tree.taiga.io/project/penpot/issue/11417)
+- Fix slow color picker [Taiga #11019](https://tree.taiga.io/project/penpot/issue/11019)
+- Fix tooltip position after click [Taiga #11405](https://tree.taiga.io/project/penpot/issue/11405)
+- Fix incorrect media translation on paste text with fill images [Github #6845](https://github.com/penpot/penpot/pull/6845)
 
 ## 2.7.2
 

backend/src/app/binfile/v3.clj

@@ -12,7 +12,6 @@
    [app.binfile.common :as bfc]
    [app.binfile.migrations :as bfm]
    [app.common.data :as d]
-   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.features :as cfeat]
    [app.common.files.migrations :as-alias fmg]
@@ -54,7 +53,7 @@
   [:map {:title "Manifest"}
    [:version ::sm/int]
    [:type :string]
-
+   [:referer {:optional true} :string]
    [:generated-by {:optional true} :string]
 
    [:files
@@ -373,6 +372,7 @@
           params {:type "penpot/export-files"
                   :version 1
                   :generated-by (str "penpot/" (:full cf/version))
+                  :refer "penpot"
                   :files (vec (vals files))
                   :relations rels}]
       (write-entry! output "manifest.json" params))))
@@ -878,13 +878,8 @@
 (defn- import-files
   [{:keys [::bfc/timestamp ::bfc/input ::bfc/name] :or {timestamp (dt/now)} :as cfg}]
 
-  (dm/assert!
-   "expected zip file"
-   (instance? ZipFile input))
-
-  (dm/assert!
-   "expected valid instant"
-   (dt/instant? timestamp))
+  (assert (instance? ZipFile input) "expected zip file")
+  (assert (dt/instant? timestamp) "expected valid instant")
 
   (let [manifest (-> (read-manifest input)
                      (validate-manifest))
@@ -896,6 +891,7 @@
                 :hint "unexpected type on manifest"
                 :manifest manifest))
 
+
     ;; Check if all files referenced on manifest are present
     (doseq [{file-id :id features :features} (:files manifest)]
       (let [path (str "files/" file-id ".json")]
@@ -956,14 +952,13 @@
 
   [{:keys [::bfc/ids] :as cfg} output]
 
-  (dm/assert!
-   "expected a set of uuid's for `::bfc/ids` parameter"
-   (and (set? ids)
-        (every? uuid? ids)))
+  (assert
+   (and (set? ids) (every? uuid? ids))
+   "expected a set of uuid's for `::bfc/ids` parameter")
 
-  (dm/assert!
-   "expected instance of jio/IOFactory for `input`"
-   (satisfies? jio/IOFactory output))
+  (assert
+   (satisfies? jio/IOFactory output)
+   "expected instance of jio/IOFactory for `input`")
 
   (let [id (uuid/next)
         tp (dt/tpoint)
@@ -1002,14 +997,14 @@
 (defn import-files!
   [{:keys [::bfc/input] :as cfg}]
 
-  (dm/assert!
-   "expected valid profile-id and project-id on `cfg`"
+  (assert
    (and (uuid? (::bfc/profile-id cfg))
-        (uuid? (::bfc/project-id cfg))))
+        (uuid? (::bfc/project-id cfg)))
+   "expected valid profile-id and project-id on `cfg`")
 
-  (dm/assert!
-   "expected instance of jio/IOFactory for `input`"
-   (io/coercible? input))
+  (assert
+   (io/coercible? input)
+   "expected instance of jio/IOFactory for `input`")
 
   (let [id (uuid/next)
         tp (dt/tpoint)
@@ -1029,3 +1024,9 @@
                 :id (str id)
                 :elapsed (dt/format-duration (tp))
                 :error? (some? @cs))))))
+
+(defn get-manifest
+  [path]
+  (with-open [input (ZipFile. (fs/file path))]
+    (-> (read-manifest input)
+        (validate-manifest))))

backend/src/app/loggers/database.clj

@@ -41,7 +41,7 @@
   (if (or (instance? java.util.concurrent.CompletionException cause)
           (instance? java.util.concurrent.ExecutionException cause))
     (-> record
-        (assoc ::trace (ex/format-throwable cause :data? false :explain? false :header? false :summary? false))
+        (assoc ::trace (ex/format-throwable cause :data? true :explain? false :header? false :summary? false))
         (assoc ::l/cause (ex-cause cause))
         (record->report))
 
@@ -64,18 +64,18 @@
                          message))
                      @message)
         :trace   (or (::trace record)
-                     (some-> cause (ex/format-throwable :data? false :explain? false :header? false :summary? false)))}
+                     (some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))}
 
        (when-let [params (or (:request/params context) (:params context))]
-         {:params (pp/pprint-str params :length 30 :level 13)})
+         {:params (pp/pprint-str params :length 20 :level 20)})
 
        (when-let [value (:value context)]
-         {:value (pp/pprint-str value :length 30 :level 12)})
+         {:value (pp/pprint-str value :length 30 :level 13)})
 
        (when-let [data (some-> data (dissoc ::s/problems ::s/value ::s/spec ::sm/explain :hint))]
-         {:data (pp/pprint-str data :length 30 :level 12)})
+         {:data (pp/pprint-str data :length 30 :level 13)})
 
-       (when-let [explain (ex/explain data :length 30 :level 12)]
+       (when-let [explain (ex/explain data :length 30 :level 13)]
          {:explain explain})))))
 
 (defn error-record?

backend/src/app/rpc/commands/binfile.clj

@@ -134,11 +134,18 @@
    ::webhooks/event? true
    ::sse/stream? true
    ::sm/params schema:import-binfile}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version file] :as params}]
   (projects/check-edition-permissions! pool profile-id project-id)
-  (let [params (-> params
-                   (assoc :profile-id profile-id)
-                   (assoc :version (or version 1)))]
+  (let [version  (or version 1)
+        params   (-> params
+                     (assoc :profile-id profile-id)
+                     (assoc :version version))
+        manifest (case (int version)
+                   1 nil
+                   3 (bf.v3/get-manifest (:path file)))]
+
     (with-meta
       (sse/response (partial import-binfile cfg params))
-      {::audit/props {:file nil}})))
+      {::audit/props {:file nil
+                      :generated-by (:generated-by manifest)
+                      :referer (:referer manifest)}})))

backend/src/app/rpc/commands/files.clj

@@ -559,6 +559,8 @@
           f.project_id,
           f.created_at,
           f.modified_at,
+          f.data_backend,
+          f.data_ref_id,
           f.name,
           f.version,
           f.is_shared,

backend/src/app/rpc/commands/teams.clj

@@ -139,7 +139,8 @@
             '~:status', CASE COALESCE(p.props->'~:subscription'->>'~:type', 'professional')
                           WHEN 'professional' THEN 'active'
                           ELSE COALESCE(p.props->'~:subscription'->>'~:status', 'incomplete')
-                       END
+                       END,
+            '~:seats', p.props->'~:quantity'
           ) AS subscription
      FROM team_profile_rel AS tp
      JOIN team AS t ON (t.id = tp.team_id)

common/src/app/common/exceptions.cljc

@@ -47,10 +47,26 @@
     `(try ~@exprs (catch Throwable e# nil))))
 
 (defmacro try!
-  [& exprs]
-  (if (:ns &env)
-    `(try ~@exprs (catch :default e# e#))
-    `(try ~@exprs (catch Throwable e# e#))))
+  [expr & {:keys [reraise-with on-exception]}]
+  (let [ex-sym
+        (gensym "exc")
+
+        generate-catch
+        (fn []
+          (cond
+            (map? reraise-with)
+            `(ex/raise ~@(mapcat identity reraise-with) :cause ~ex-sym)
+
+            on-exception
+            `(let [handler# ~on-exception]
+               (handler# ~ex-sym))
+
+            :else
+            ex-sym))]
+
+    (if (:ns &env)
+      `(try ~expr (catch :default ~ex-sym ~(generate-catch)))
+      `(try ~expr (catch Throwable ~ex-sym ~(generate-catch))))))
 
 (defn ex-info?
   [v]

common/src/app/common/files/changes.cljc

@@ -487,7 +487,9 @@
                                (cts/shape? shape-new))
                   (ex/raise :type :assertion
                             :code :data-validation
-                            :hint "invalid shape found after applying changes"
+                            :hint (str "invalid shape found after applying changes on file "
+                                       (:id data-new))
+                            :file-id (:id data-new)
                             ::sm/explain (cts/explain-shape shape-new))))))]
 
     (->> (into #{} (map :page-id) items)

common/src/app/common/files/migrations.cljc

@@ -1019,8 +1019,8 @@
   [data _]
   (let [update-colors
         (fn [colors]
-          (into {} (filter #(-> % val types.color/valid-color?) colors)))]
-    (update data :colors update-colors)))
+          (into {} (filter #(-> % val types.color/valid-library-color?) colors)))]
+    (d/update-when data :colors update-colors)))
 
 (defmethod migrate-data "legacy-52"
   [data _]
@@ -1034,7 +1034,6 @@
 
     (update data :pages-index d/update-vals update-page)))
 
-
 (defmethod migrate-data "legacy-53"
   [data _]
   (migrate-data data "legacy-26"))
@@ -1319,18 +1318,35 @@
         (d/update-when :components d/update-vals update-container)
         (d/without-nils))))
 
-(defmethod migrate-data "0003-convert-path-content"
+(defmethod migrate-data "0003-convert-path-content-v2"
   [data _]
   (some-> cfeat/*new* (swap! conj "fdata/path-data"))
 
-  (letfn [(update-object [object]
-            (if (or (cfh/bool-shape? object)
-                    (cfh/path-shape? object))
-              (update object :content path/content)
-              object))
+  (let [decode-segments
+        (sm/decoder path/schema:segments sm/json-transformer)
 
-          (update-container [container]
-            (d/update-when container :objects d/update-vals update-object))]
+        update-object
+        (fn [object]
+          (if (or (cfh/bool-shape? object)
+                  (cfh/path-shape? object))
+            (let [content (get object :content)
+                  content (cond
+                            (path/content? content)
+                            content
+
+                            (nil? content)
+                            (path/content [])
+
+                            :else
+                            (-> content
+                                (decode-segments)
+                                (path/content)))]
+              (assoc object :content content))
+            object))
+
+        update-container
+        (fn [container]
+          (d/update-when container :objects d/update-vals update-object))]
 
     (-> data
         (update :pages-index d/update-vals update-container)
@@ -1500,6 +1516,17 @@
 
     (d/update-when data :colors d/update-vals clear-color)))
 
+(defmethod migrate-data "0009-clean-library-colors"
+  [data _]
+  (d/update-when data :colors
+                 (fn [colors]
+                   (reduce-kv (fn [colors id color]
+                                (if (types.color/valid-library-color? color)
+                                  colors
+                                  (dissoc colors id)))
+                              colors
+                              colors))))
+
 (def available-migrations
   (into (d/ordered-set)
         ["legacy-2"
@@ -1558,9 +1585,10 @@
          "0002-normalize-bool-content-v2"
          "0002-clean-shape-interactions"
          "0003-fix-root-shape"
-         "0003-convert-path-content"
+         "0003-convert-path-content-v2"
          "0004-clean-shadow-color"
          "0005-deprecate-image-type"
          "0006-fix-old-texts-fills"
          "0007-clear-invalid-strokes-and-fills-v2"
-         "0008-fix-library-colors-v4"]))
+         "0008-fix-library-colors-v4"
+         "0009-clean-library-colors"]))

common/src/app/common/text.cljc

@@ -170,19 +170,6 @@
         item))
     root)))
 
-(defn xform-nodes
-  "The same as transform but instead of receiving a funcion, receives
-  a transducer."
-  [xf root]
-  (let [rf (fn [_ v] v)]
-    (walk/postwalk
-     (fn [item]
-       (let [rf (xf rf)]
-         (if (is-node? item)
-           (d/nilv (rf nil item) item)
-           item)))
-     root)))
-
 (defn update-text-content
   [shape pred-fn update-fn attrs]
   (let [update-attrs-fn #(update-fn % attrs)

common/src/app/common/types/color.cljc

@@ -117,6 +117,7 @@
    [:ref-id {:optional true} ::sm/uuid]
    [:ref-file {:optional true} ::sm/uuid]])
 
+;; This schema represent an "applied color"
 (def schema:color
   [:and
    [:merge {:title "Color"}

common/src/app/common/types/path.cljc

@@ -8,6 +8,7 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.exceptions :as ex]
    [app.common.files.helpers :as cpf]
    [app.common.geom.matrix :as gmt]
    [app.common.geom.point :as gpt]
@@ -26,6 +27,9 @@
 (def ^:const bool-style-properties bool/style-properties)
 (def ^:const default-bool-fills bool/default-fills)
 
+(def schema:content impl/schema:content)
+(def schema:segments impl/schema:segments)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; TRANSFORMATIONS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -48,9 +52,9 @@
   [data]
   (impl/from-string data))
 
-(defn check-path-content
+(defn check-content
   [content]
-  (impl/check-content-like content))
+  (impl/check-content content))
 
 (defn get-byte-size
   "Get byte size of a path content"
@@ -76,7 +80,7 @@
 (defn apply-content-modifiers
   "Apply delta modifiers over the path content"
   [content modifiers]
-  (assert (impl/check-content-like content))
+  (assert (impl/check-content content))
 
   (letfn [(apply-to-index [content [index params]]
             (if (contains? content index)
@@ -196,7 +200,18 @@
         contents
         (sequence extract-content-xf (:shapes shape))]
 
-    (bool/calculate-content (:bool-type shape) contents)))
+    (ex/try!
+     (bool/calculate-content (:bool-type shape) contents)
+
+     :on-exception
+     (fn [cause]
+       (ex/raise :type :internal
+                 :code :invalid-path-content
+                 :hint (str "unable to calculate bool content for shape " (:id shape))
+                 :shapes (:shapes shape)
+                 :type (:bool-type shape)
+                 :content (vec contents)
+                 :cause cause)))))
 
 (defn calc-bool-content
   "Calculate the boolean content from shape and objects. Returns a

common/src/app/common/types/path/bool.cljc

@@ -412,7 +412,7 @@
 
 (defn calculate-content
   "Create a bool content from a collection of contents and specified
-  type."
+  type. Returns plain segments"
   [bool-type contents]
   ;; We apply the boolean operation in to each pair and the result to the next
   ;; element

common/src/app/common/types/path/helpers.cljc

@@ -27,13 +27,11 @@
 
 (defn make-move-to [to]
   {:command :move-to
-   :relative false
    :params {:x (:x to)
             :y (:y to)}})
 
 (defn make-line-to [to]
   {:command :line-to
-   :relative false
    :params {:x (:x to)
             :y (:y to)}})
 
@@ -65,7 +63,6 @@
 (defn make-curve-to
   [to h1 h2]
   {:command :curve-to
-   :relative false
    :params (make-curve-params to h1 h2)})
 
 (defn prefix->coords [prefix]
@@ -98,7 +95,7 @@
 (defn segment->point
   ([segment] (segment->point segment :x))
   ([segment coord]
-   (when-let [params (get segment :params)]
+   (when-let [params (not-empty (get segment :params))]
      (case coord
        :c1 (gpt/point (get params :c1x)
                       (get params :c1y))

common/src/app/common/types/path/impl.cljc

@@ -20,7 +20,8 @@
    [app.common.schema.generators :as sg]
    [app.common.svg.path :as svg.path]
    [app.common.transit :as t]
-   [app.common.types.path :as-alias path])
+   [app.common.types.path :as-alias path]
+   [cuerdas.core :as str])
   (:import
    #?(:cljs [goog.string StringBuffer]
       :clj  [java.nio ByteBuffer ByteOrder])))
@@ -507,18 +508,6 @@
                                        (= (:command e1) :move-to))))}
    schema:segment])
 
-(def schema:content-like
-  [:sequential schema:segment])
-
-(def check-content-like
-  (sm/check-fn schema:content-like))
-
-(def check-segment
-  (sm/check-fn schema:segment))
-
-(def ^:private check-segments
-  (sm/check-fn schema:segments))
-
 (defn path-data?
   [o]
   (instance? PathData o))
@@ -526,37 +515,42 @@
 (declare from-string)
 (declare from-plain)
 
-;; Mainly used on backend: features/components_v2.clj
-(sm/register! ::path/segment schema:segment)
-(sm/register! ::path/segments schema:segments)
+(def schema:content
+  (sm/type-schema
+   {:type ::path/content
+    :compile
+    (fn [_ _ _]
+      (let [decoder   (delay (sm/decoder schema:segments sm/json-transformer))
+            generator (->> (sg/generator schema:segments)
+                           (sg/filter not-empty)
+                           (sg/fmap from-plain))]
+        {:pred path-data?
+         :type-properties
+         {:gen/gen generator
+          :encode/json identity
+          :decode/json (fn [s]
+                         (cond
+                           (string? s)
+                           (if (str/empty? s)
+                             (from-plain [])
+                             (from-string s))
 
-(sm/register!
- {:type ::path/content
-  :compile
-  (fn [_ _ _]
-    (let [decoder   (delay (sm/decoder schema:segments sm/json-transformer))
-          generator (->> (sg/generator schema:segments)
-                         (sg/filter not-empty)
-                         (sg/fmap from-plain))]
-      {:pred path-data?
-       :type-properties
-       {:gen/gen generator
-        :encode/json identity
-        :decode/json (fn [s]
-                       (cond
-                         (string? s)
-                         (from-string s)
+                           (vector? s)
+                           (let [decode-fn (deref decoder)]
+                             (-> (decode-fn s)
+                                 (from-plain)))
 
-                         (vector? s)
-                         (let [decode-fn (deref decoder)]
-                           (-> (decode-fn s)
-                               (from-plain)))
+                           :else
+                           s))}}))}))
 
-                         :else
-                         s))}}))})
+(def check-plain-content
+  (sm/check-fn schema:segments))
 
-(def check-path-content
-  (sm/check-fn ::path/content))
+(def check-segment
+  (sm/check-fn schema:segment))
+
+(def check-content
+  (sm/check-fn schema:content))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; CONSTRUCTORS & PREDICATES
@@ -617,7 +611,7 @@
 (defn from-plain
   "Create a PathData instance from plain data structures"
   [segments]
-  (assert (check-segments segments))
+  (assert (check-plain-content segments))
 
   (let [total  (count segments)
         buffer (buf/allocate (* total SEGMENT-BYTE-SIZE))]

common/src/app/common/types/shape.cljc

@@ -246,7 +246,7 @@
   [:map {:title "BoolAttrs"}
    [:shapes [:vector {:gen/max 10 :gen/min 1} ::sm/uuid]]
    [:bool-type [::sm/one-of bool-types]]
-   [:content ::path/content]])
+   [:content path/schema:content]])
 
 (def ^:private schema:rect-attrs
   [:map {:title "RectAttrs"}])
@@ -271,7 +271,7 @@
 
 (def ^:private schema:path-attrs
   [:map {:title "PathAttrs"}
-   [:content ::path/content]])
+   [:content path/schema:content]])
 
 (def ^:private schema:text-attrs
   [:map {:title "TextAttrs"}

common/src/app/common/types/tokens_lib.cljc

@@ -1212,7 +1212,8 @@ Will return a value that matches this schema:
   "Searches through decoded token file and returns:
    - `:json-format/legacy` when first node satisfies `legacy-node?` predicate
    - `:json-format/dtcg` when first node satisfies `dtcg-node?` predicate
-   - `nil` if neither combination is found"
+   - If neither combination is found, return dtcg format by default (we assume that
+     the file does not contain any token, so the format is irrelevan)."
   ([decoded-json]
    (get-json-format decoded-json legacy-node? dtcg-node?))
   ([decoded-json legacy-node? dtcg-node?]
@@ -1230,9 +1231,10 @@ Will return a value that matches this schema:
                   (check-node node)
                   (when (branch? node)
                     (mapcat walk (children node))))))]
-     (->> (walk decoded-json)
-          (filter some?)
-          first)))) ;; TODO: throw error if format cannot be determined
+     (d/nilv (->> (walk decoded-json)
+                  (filter some?)
+                  first)
+             :json-format/dtcg))))
 
 (defn- legacy-json->dtcg-json
   "Converts a decoded json file in legacy format into DTCG format."
@@ -1291,9 +1293,17 @@ Will return a value that matches this schema:
   [set-name decoded-json-tokens]
   (assert (map? decoded-json-tokens) "expected a plain clojure map for `decoded-json-tokens`")
   (assert (= (get-json-format decoded-json-tokens) :json-format/dtcg) "expected a dtcg format for `decoded-json-tokens`")
-  (-> (make-tokens-lib)
-      (add-set (make-token-set :name (normalize-set-name set-name)
-                               :tokens (flatten-nested-tokens-json decoded-json-tokens "")))))
+
+  (let [set-name (normalize-set-name set-name)
+        tokens   (flatten-nested-tokens-json decoded-json-tokens "")]
+
+    (when (empty? tokens)
+      (throw (ex-info "the file doesn't contain any tokens"
+                      {:error/code :error.import/invalid-json-data})))
+
+    (-> (make-tokens-lib)
+        (add-set (make-token-set :name set-name
+                                 :tokens tokens)))))
 
 (defn- parse-single-set-legacy-json
   "Parse a decoded json file with a single set of tokens in legacy format into a TokensLib."
@@ -1385,6 +1395,10 @@ Will return a value that matches this schema:
                 library
                 active-theme-names)]
 
+    (when (and (empty? sets) (empty? themes))
+      (throw (ex-info "the file doesn't contain any tokens"
+                      {:error/code :error.import/invalid-json-data})))
+
     library))
 
 (defn- parse-multi-set-legacy-json

common/test/common_tests/types/path_data_test.cljc

@@ -14,6 +14,7 @@
    [app.common.pprint :as pp]
    [app.common.transit :as trans]
    [app.common.types.path :as path]
+   [app.common.types.path.bool :as path.bool]
    [app.common.types.path.helpers :as path.helpers]
    [app.common.types.path.impl :as path.impl]
    [app.common.types.path.segment :as path.segment]
@@ -414,3 +415,89 @@
         result1 (get-handlers sample-content-large)
         result2 (path.segment/get-handlers content)]
     (t/is (= result1 result2))))
+
+
+(def contents-for-bool
+  [[{:command :move-to, :params {:x 1682.9000244140625, :y 48.0}}
+    {:command :line-to, :params {:x 1682.9000244140625, :y 44.0}}
+    {:command :curve-to, :params {:x 1683.9000244140625, :y 43.0, :c1x 1682.9000244140625, :c1y 43.400001525878906, :c2x 1683.300048828125, :c2y 43.0}}
+    {:command :line-to, :params {:x 1687.9000244140625, :y 43.0}}
+    {:command :curve-to, :params {:x 1688.9000244140625, :y 44.0, :c1x 1688.5, :c1y 43.0, :c2x 1688.9000244140625, :c2y 43.400001525878906}}
+    {:command :line-to, :params {:x 1688.9000244140625, :y 48.0}}
+    {:command :curve-to, :params {:x 1687.9000244140625, :y 49.0, :c1x 1688.9000244140625, :c1y 48.599998474121094, :c2x 1688.5, :c2y 49.0}}
+    {:command :line-to, :params {:x 1683.9000244140625, :y 49.0}}
+    {:command :curve-to, :params {:x 1682.9000244140625, :y 48.0, :c1x 1683.300048828125, :c1y 49.0, :c2x 1682.9000244140625, :c2y 48.599998474121094}}
+    {:command :close-path, :params {}}
+    {:command :close-path, :params {}}
+    {:command :move-to, :params {:x 1684.9000244140625, :y 45.0}}
+    {:command :line-to, :params {:x 1684.9000244140625, :y 47.0}}
+    {:command :line-to, :params {:x 1686.9000244140625, :y 47.0}}
+    {:command :line-to, :params {:x 1686.9000244140625, :y 45.0}}
+    {:command :line-to, :params {:x 1684.9000244140625, :y 45.0}}
+    {:command :close-path, :params {}}
+    {:command :close-path, :params {}}]
+
+   [{:command :move-to, :params {:x 1672.9000244140625, :y 48.0}}
+    {:command :line-to, :params {:x 1672.9000244140625, :y 44.0}}
+    {:command :curve-to, :params {:x 1673.9000244140625, :y 43.0, :c1x 1672.9000244140625, :c1y 43.400001525878906, :c2x 1673.300048828125, :c2y 43.0}}
+    {:command :line-to, :params {:x 1677.9000244140625, :y 43.0}}
+    {:command :curve-to, :params {:x 1678.9000244140625, :y 44.0, :c1x 1678.5, :c1y 43.0, :c2x 1678.9000244140625, :c2y 43.400001525878906}}
+    {:command :line-to, :params {:x 1678.9000244140625, :y 48.0}}
+    {:command :curve-to, :params {:x 1677.9000244140625, :y 49.0, :c1x 1678.9000244140625, :c1y 48.599998474121094, :c2x 1678.5, :c2y 49.0}}
+    {:command :line-to, :params {:x 1673.9000244140625, :y 49.0}}
+    {:command :curve-to, :params {:x 1672.9000244140625, :y 48.0, :c1x 1673.300048828125, :c1y 49.0, :c2x 1672.9000244140625, :c2y 48.599998474121094}}
+    {:command :close-path, :params {}}
+    {:command :close-path, :params {}}
+    {:command :move-to, :params {:x 1674.9000244140625, :y 45.0}}
+    {:command :line-to, :params {:x 1674.9000244140625, :y 47.0}}
+    {:command :line-to, :params {:x 1676.9000244140625, :y 47.0}}
+    {:command :line-to, :params {:x 1676.9000244140625, :y 45.0}}
+    {:command :line-to, :params {:x 1674.9000244140625, :y 45.0}}
+    {:command :close-path, :params {}}
+    {:command :close-path, :params {}}]])
+
+(def bool-result
+  [{:command :move-to, :params {:x 1682.9000244140625, :y 48.0}}
+   {:command :line-to, :params {:x 1682.9000244140625, :y 44.0}}
+   {:command :curve-to,
+    :params
+    {:x 1683.9000244140625, :y 43.0, :c1x 1682.9000244140625, :c1y 43.400001525878906, :c2x 1683.300048828125, :c2y 43.0}}
+   {:command :line-to, :params {:x 1687.9000244140625, :y 43.0}}
+   {:command :curve-to,
+    :params {:x 1688.9000244140625, :y 44.0, :c1x 1688.5, :c1y 43.0, :c2x 1688.9000244140625, :c2y 43.400001525878906}}
+   {:command :line-to, :params {:x 1688.9000244140625, :y 48.0}}
+   {:command :curve-to,
+    :params {:x 1687.9000244140625, :y 49.0, :c1x 1688.9000244140625, :c1y 48.599998474121094, :c2x 1688.5, :c2y 49.0}}
+   {:command :line-to, :params {:x 1683.9000244140625, :y 49.0}}
+   {:command :curve-to,
+    :params
+    {:x 1682.9000244140625, :y 48.0, :c1x 1683.300048828125, :c1y 49.0, :c2x 1682.9000244140625, :c2y 48.599998474121094}}
+   {:command :move-to, :params {:x 1684.9000244140625, :y 45.0}}
+   {:command :line-to, :params {:x 1684.9000244140625, :y 47.0}}
+   {:command :line-to, :params {:x 1686.9000244140625, :y 47.0}}
+   {:command :line-to, :params {:x 1686.9000244140625, :y 45.0}}
+   {:command :line-to, :params {:x 1684.9000244140625, :y 45.0}}
+   {:command :move-to, :params {:x 1672.9000244140625, :y 48.0}}
+   {:command :line-to, :params {:x 1672.9000244140625, :y 44.0}}
+   {:command :curve-to,
+    :params
+    {:x 1673.9000244140625, :y 43.0, :c1x 1672.9000244140625, :c1y 43.400001525878906, :c2x 1673.300048828125, :c2y 43.0}}
+   {:command :line-to, :params {:x 1677.9000244140625, :y 43.0}}
+   {:command :curve-to,
+    :params {:x 1678.9000244140625, :y 44.0, :c1x 1678.5, :c1y 43.0, :c2x 1678.9000244140625, :c2y 43.400001525878906}}
+   {:command :line-to, :params {:x 1678.9000244140625, :y 48.0}}
+   {:command :curve-to,
+    :params {:x 1677.9000244140625, :y 49.0, :c1x 1678.9000244140625, :c1y 48.599998474121094, :c2x 1678.5, :c2y 49.0}}
+   {:command :line-to, :params {:x 1673.9000244140625, :y 49.0}}
+   {:command :curve-to,
+    :params
+    {:x 1672.9000244140625, :y 48.0, :c1x 1673.300048828125, :c1y 49.0, :c2x 1672.9000244140625, :c2y 48.599998474121094}}
+   {:command :move-to, :params {:x 1674.9000244140625, :y 45.0}}
+   {:command :line-to, :params {:x 1674.9000244140625, :y 47.0}}
+   {:command :line-to, :params {:x 1676.9000244140625, :y 47.0}}
+   {:command :line-to, :params {:x 1676.9000244140625, :y 45.0}}
+   {:command :line-to, :params {:x 1674.9000244140625, :y 45.0}}])
+
+(t/deftest calculate-bool-content
+  (let [result (path.bool/calculate-content :union contents-for-bool)]
+    (t/is (= result bool-result))))

common/test/common_tests/types/shape_decode_encode_test.cljc

@@ -113,10 +113,10 @@
      {:num 500})))
 
 (t/deftest shape-path-content-json-roundtrip
-  (let [encode (sm/encoder ::path/content (sm/json-transformer))
-        decode (sm/decoder ::path/content (sm/json-transformer))]
+  (let [encode (sm/encoder path/schema:content (sm/json-transformer))
+        decode (sm/decoder path/schema:content (sm/json-transformer))]
     (smt/check!
-     (smt/for [path-content (sg/generator ::path/content)]
+     (smt/for [path-content (sg/generator path/schema:content)]
        (let [path-content-1 (encode path-content)
              path-content-2 (json-roundtrip path-content-1)
              path-content-3 (decode path-content-2)]

docker/devenv/Dockerfile

@@ -404,4 +404,4 @@ COPY files/entrypoint.sh       /home/entrypoint.sh
 COPY files/init.sh             /home/init.sh
 
 ENTRYPOINT ["/home/entrypoint.sh"]
-CMD ["/home/init.sh"]
+CMD ["/home/init.sh"]

docker/imagemagick/Dockerfile

@@ -0,0 +1,91 @@
+FROM ubuntu:24.04
+LABEL maintainer="Penpot <docker@penpot.app>"
+
+ENV LANG='C.UTF-8' \
+    LC_ALL='C.UTF-8' \
+    DEBIAN_FRONTEND=noninteractive \
+    TZ=Etc/UTC
+
+ARG IMAGEMAGICK_VERSION=7.1.1-47
+
+RUN set -e; \
+    apt-get -qq update; \
+    apt-get -qq upgrade; \
+    apt-get -qqy --no-install-recommends install \
+        autoconf \
+        binutils \
+        build-essential \
+        ca-certificates \
+        curl \
+        libfftw3-dev \
+        libheif-dev \
+        libjpeg-dev \
+        liblcms2-dev \
+        libltdl-dev \
+        liblzma-dev \
+        libopenexr-dev \
+        libpng-dev \
+        librsvg2-dev \
+        libtiff-dev \
+        libtool \
+        libwebp-dev \
+        libzip-dev \
+        libzstd-dev \
+        pkg-config \
+    ; \
+    curl -LfsSo /tmp/magick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGEMAGICK_VERSION}.tar.gz; \
+    mkdir -p /tmp/magick; \
+    cd /tmp/magick; \
+    tar -xf /tmp/magick.tar.gz --strip-components=1; \
+    ./configure  --prefix=/opt/imagick; \
+    make -j 2; \
+    make install; \
+    rm -rf /opt/imagick/lib/libMagick++*; \
+    rm -rf /opt/imagick/include; \
+    rm -rf /opt/imagick/share; \
+    apt-get -qqy --autoremove purge \
+        autoconf \
+        binutils \
+        build-essential \
+        ca-certificates \
+        curl \
+        libfftw3-dev \
+        libheif-dev \
+        libjpeg-dev \
+        liblcms2-dev \
+        libltdl-dev \
+        liblzma-dev \
+        libopenexr-dev \
+        libpng-dev \
+        librsvg2-dev \
+        libtiff-dev \
+        libtool\
+        libwebp-dev \
+        libzip-dev \
+        libzstd-dev \
+        pkg-config \
+    ;\
+    apt-get -qqy --no-install-recommends install \
+        libfontconfig1 \
+        libfreetype6 \
+        libglib2.0-0 \
+        libgomp1 \
+        libheif1 \
+        libjpeg-turbo8 \
+        liblcms2-2 \
+        libopenexr-3-1-30 \
+        libopenjp2-7 \
+        libpng16-16 \
+        librsvg2-2 \
+        libtiff6 \
+        libwebp7 \
+        libwebpdemux2 \
+        libwebpmux3 \
+        libxml2 \
+        libzip4t64 \
+        libzstd1 \
+    ;\
+    apt-get -qqy clean; \
+    rm -rf /var/lib/apt/lists/*;
+
+ENTRYPOINT ["/opt/imagick/bin/magick"]

docker/images/Dockerfile.backend

@@ -6,37 +6,18 @@ ENV LANG='C.UTF-8' \
     JAVA_HOME="/opt/jdk" \
     DEBIAN_FRONTEND=noninteractive \
     NODE_VERSION=v22.16.0 \
-    IMAGEMAGICK_VERSION=7.1.1-47 \
     TZ=Etc/UTC
 
 RUN set -ex; \
     apt-get -qq update; \
     apt-get -qq upgrade; \
     apt-get -qqy --no-install-recommends install \
-        curl \
-        ca-certificates \
         binutils \
-        build-essential autoconf libtool pkg-config \
-        libltdl-dev \
-        libpng-dev libjpeg-dev libtiff-dev libwebp-dev libopenexr-dev libfftw3-dev \
-        libzip-dev \
-        liblcms2-dev liblzma-dev libzstd-dev \
-        libheif-dev librsvg2-dev \
+        ca-certificates \
+        curl \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-RUN set -eux; \
-    curl -LfsSo /tmp/magick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGEMAGICK_VERSION}.tar.gz; \
-    mkdir -p /tmp/magick; \
-    cd /tmp/magick; \
-    tar -xf /tmp/magick.tar.gz --strip-components=1; \
-    ./configure  --prefix=/opt/imagick; \
-    make -j 2; \
-    make install; \
-    rm -rf /opt/imagick/lib/libMagick++*; \
-    rm -rf /opt/imagick/include; \
-    rm -rf /opt/imagick/share;
-
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
@@ -105,33 +86,33 @@ RUN set -ex; \
     apt-get -qq update; \
     apt-get -qq upgrade; \
     apt-get -qqy --no-install-recommends install \
-        tzdata \
         ca-certificates \
         fontconfig \
-        woff-tools \
-        woff2 \
+        fontforge \
         python3 \
         python3-tabulate \
-        fontforge \
+        tzdata \
+        woff-tools \
+        woff2 \
         \
-        libpng16-16 \
+        libfontconfig1 \
+        libfreetype6 \
+        libglib2.0-0 \
+        libgomp1 \
+        libheif1 \
         libjpeg-turbo8 \
+        liblcms2-2 \
+        libopenexr-3-1-30 \
+        libopenjp2-7 \
+        libpng16-16 \
+        librsvg2-2 \
         libtiff6 \
         libwebp7 \
-        libopenexr-3-1-30 \
-        libfreetype6 \
-        libfontconfig1 \
-        libglib2.0-0 \
-        libxml2 \
-        liblcms2-2 \
-        libheif1 \
-        libopenjp2-7 \
-        libzstd1 \
-        librsvg2-2 \
-        libgomp1 \
-        libwebpmux3 \
         libwebpdemux2 \
+        libwebpmux3 \
+        libxml2 \
         libzip4t64 \
+        libzstd1 \
     ; \
     find tmp/usr/share/zoneinfo/* -type d ! -name 'Etc' |xargs rm -rf; \
     rm -rf /var/lib /var/cache; \
@@ -144,7 +125,7 @@ RUN set -ex; \
 
 COPY --from=build /opt/jre /opt/jre
 COPY --from=build /opt/node /opt/node
-COPY --from=build /opt/imagick /opt/imagick
+COPY --from=penpotapp/imagemagick:7.1.2-0 /opt/imagick /opt/imagick
 COPY --chown=penpot:penpot ./bundle-backend/ /opt/penpot/backend/
 
 USER penpot:penpot

docker/images/Dockerfile.exporter

@@ -39,6 +39,7 @@ RUN set -ex; \
       fonts-wqy-zenhei \
       fonts-tlwg-loma-otf \
       fonts-freefont-ttf \
+      poppler-utils \
       \
       libasound2t64 \
       libatk-bridge2.0-0t64 \

docker/images/build.sh

@@ -1,14 +1,17 @@
 #!/usr/bin/env bash
 set -x
 
-DOCKER_CLI_EXPERIMENTAL=enabled
+IMAGE=${1:-backend}
+
+OUTPUT="type=registry"
+
+if [ "--local" = "$2" ]; then
+    OUTPUT="type=docker"
+fi
+
 ORG=${PENPOT_DOCKER_NAMESPACE:-penpotapp};
-PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64};
-
-IMAGE=${PENPOT_BUILD_IMAGE:-backend}
-PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64};
+PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64,linux/arm64};
 VERSION=${PENPOT_BUILD_VERSION:-latest}
-
 DOCKER_IMAGE="$ORG/$IMAGE";
 OPTIONS="-t $DOCKER_IMAGE:$VERSION";
 
@@ -20,7 +23,7 @@ for element in "${TAGS[@]}"; do
 done
 
 docker buildx inspect penpot > /dev/null 2>&1;
-docker run --privileged --rm tonistiigi/binfmt --install all
+docker run --privileged --rm tonistiigi/binfmt --install all > /dev/null;
 
 if [ $? -eq 1 ]; then
     docker buildx create --name=penpot --use
@@ -32,4 +35,5 @@ fi
 
 unset IFS;
 
-docker buildx build --platform ${PLATFORM// /,} $OPTIONS -f Dockerfile.$IMAGE "$@" .;
+shift;
+docker buildx build --output $OUTPUT --platform ${PLATFORM// /,} $OPTIONS -f Dockerfile.$IMAGE .;

frontend/src/app/main/constants.cljs

@@ -15,6 +15,9 @@
 (def grid-x-axis 10)
 (def grid-y-axis 10)
 
+(def sidebar-default-width 318)
+(def sidebar-default-max-width 768)
+
 (def page-metadata
   "Default data for page metadata."
   {:grid-x-axis grid-x-axis

frontend/src/app/main/data/event.cljs

@@ -245,4 +245,4 @@
 
 (defn event
   [props]
-  (ptk/data-event ::events props))
+  (ptk/data-event ::event props))

frontend/src/app/main/data/plugins.cljs

@@ -9,6 +9,7 @@
    [app.common.data.macros :as dm]
    [app.common.files.changes-builder :as pcb]
    [app.main.data.changes :as dch]
+   [app.main.data.event :as ev]
    [app.main.data.modal :as modal]
    [app.main.data.notifications :as ntf]
    [app.main.store :as st]
@@ -144,8 +145,13 @@
     (watch [_ state _]
       (let [user-can-edit? (dm/get-in state [:permissions :can-edit])]
         (when-let [pid (::open-plugin state)]
-          (open-plugin! (preg/get-plugin pid) user-can-edit?)
-          (rx/of #(dissoc % ::open-plugin)))))))
+          (let [plugin (preg/get-plugin pid)]
+            (open-plugin! plugin user-can-edit?)
+            (rx/of (ev/event {::ev/name "start-plugin"
+                              ::ev/origin "workspace"
+                              :name (:name plugin)
+                              :host (:host plugin)})
+                   #(dissoc % ::open-plugin))))))))
 
 (defn- update-plugin-permissions-peek
   [{:keys [plugin-id url]}]

frontend/src/app/main/data/profile.cljs

@@ -172,7 +172,9 @@
                                    current)]
                      (case current
                        "dark"   "light"
-                       "light"  "dark")))))
+                       "light"  "dark"
+                       ; Failsafe for missing data
+                       "dark")))))
 
     ptk/WatchEvent
     (watch [it state _]

frontend/src/app/main/data/workspace/clipboard.cljs

@@ -673,41 +673,35 @@
 
 (defn paste-shapes
   [{in-viewport? :in-viewport :as pdata}]
-  (letfn [(translate-media [mdata media-idx attr-path]
-            (let [id   (-> (get-in mdata attr-path)
-                           (:id))
+  (letfn [(translate-media [mdata media-idx attr]
+            (let [id   (-> (get mdata attr) :id)
                   mobj (get media-idx id)]
               (if mobj
-                (if (empty? attr-path)
-                  (assoc mdata :id (:id mobj))
-                  (update-in mdata attr-path assoc :id (:id mobj)))
+                (update mdata attr assoc :id (:id mobj))
                 mdata)))
 
           (add-obj? [chg]
             (= (:type chg) :add-obj))
 
+          (process-rchange-shape [obj media-idx]
+            (let [translate-fill-image   #(translate-media % media-idx :fill-image)
+                  translate-stroke-image #(translate-media % media-idx :stroke-image)
+                  translate-fills        #(mapv translate-fill-image %)
+                  translate-strokes      #(mapv translate-stroke-image %)
+                  process-text-node      #(d/update-when % :fills translate-fills)]
+
+              (-> obj
+                  (update :fills translate-fills)
+                  (update :strokes translate-strokes)
+                  (d/update-when :content #(txt/transform-nodes process-text-node %))
+                  (d/update-when :position-data #(mapv process-text-node %)))))
+
           ;; Analyze the rchange and replace staled media and
           ;; references to the new uploaded media-objects.
           (process-rchange [media-idx change]
-            (let [;; Texts can have different fills for pieces of the text
-                  tr-fill-xf    (map #(translate-media % media-idx [:fill-image]))
-                  tr-stroke-xf  (map #(translate-media % media-idx [:stroke-image]))]
-              (if (add-obj? change)
-                (update change :obj (fn [obj]
-                                      (-> obj
-                                          (update :fills #(into [] tr-fill-xf %))
-                                          (update :strokes #(into [] tr-stroke-xf %))
-                                          (d/update-when :metadata translate-media media-idx [])
-                                          (d/update-when :fill-image translate-media media-idx [])
-                                          (d/update-when :content
-                                                         (fn [content]
-                                                           (txt/xform-nodes tr-fill-xf content)))
-                                          (d/update-when :position-data
-                                                         (fn [position-data]
-                                                           (mapv (fn [pos-data]
-                                                                   (update pos-data :fills #(into [] tr-fill-xf %)))
-                                                                 position-data))))))
-                change)))
+            (if (add-obj? change)
+              (update change :obj process-rchange-shape media-idx)
+              change))
 
           (calculate-paste-position [state pobjects selected position]
             (let [page-objects         (dsh/lookup-page-objects state)
@@ -909,16 +903,17 @@
                               (ev/event {::ev/name "use-library-component"
                                          ::ev/origin origin
                                          :is-external-library external-lib?
-                                         :parent-shape-type parent-type})
+                                         :type (get shape :type)
+                                         :parent-type parent-type})
                               (if (cfh/has-layout? objects (:parent-id shape))
                                 (ev/event {::ev/name "layout-add-element"
                                            ::ev/origin origin
-                                           :element-type (get shape :type)
+                                           :type (get shape :type)
                                            :parent-type parent-type})
                                 (ev/event {::ev/name "create-shape"
                                            ::ev/origin origin
-                                           :shape-type (get shape :type)
-                                           :parent-shape-type parent-type})))))))
+                                           :type (get shape :type)
+                                           :parent-type parent-type})))))))
 
            (rx/of (dwu/start-undo-transaction undo-id)
                   (dch/commit-changes changes)

frontend/src/app/main/data/workspace/path/changes.cljs

@@ -19,8 +19,8 @@
   "Generates changes to update the new content of the shape"
   [it objects page-id shape old-content new-content]
 
-  (assert (path/check-path-content old-content))
-  (assert (path/check-path-content new-content))
+  (assert (path/content? old-content))
+  (assert (path/content? new-content))
 
   (let [shape-id (:id shape)
 

frontend/src/app/main/data/workspace/path/drawing.cljs

@@ -305,7 +305,7 @@
     ptk/UpdateEvent
     (update [_ state]
       (let [content (some-> (dm/get-in state [:workspace-drawing :object :content])
-                            (path/check-path-content))]
+                            (path/check-content))]
         (if (> (count content) 1)
           (assoc-in state [:workspace-drawing :object :initialized?] true)
           state)))

frontend/src/app/main/data/workspace/selection.cljs

@@ -493,16 +493,17 @@
                                 (ev/event {::ev/name "use-library-component"
                                            ::ev/origin origin
                                            :is-external-library external-lib?
-                                           :parent-shape-type parent-type})
+                                           :type (get shape :type)
+                                           :parent-type parent-type})
                                 (if (cfh/has-layout? objects (:parent-id shape))
                                   (ev/event {::ev/name "layout-add-element"
                                              ::ev/origin origin
-                                             :element-type (get shape :type)
+                                             :type (get shape :type)
                                              :parent-type parent-type})
                                   (ev/event {::ev/name "create-shape"
                                              ::ev/origin origin
-                                             :shape-type (get shape :type)
-                                             :parent-shape-type parent-type})))))))
+                                             :type (get shape :type)
+                                             :parent-type parent-type})))))))
 
              ;; Warning: This order is important for the focus mode.
              (->> (rx/of

frontend/src/app/main/data/workspace/shapes.cljs

@@ -129,7 +129,10 @@
                (pcb/set-undo-group (:id shape)))
 
              undo-id
-             (js/Symbol)]
+             (js/Symbol)
+
+             parent-type
+             (cfh/get-shape-type objects (:parent-id shape))]
 
          (rx/concat
           (rx/of (dwu/start-undo-transaction undo-id)
@@ -146,12 +149,13 @@
           (rx/of (ev/event {::ev/name "create-shape"
                             ::ev/origin "workspace:add-shape"
                             :type (get shape :type)
-                            :parent-type (cfh/get-shape-type objects (:parent-id shape))}))
+                            :parent-type parent-type}))
 
           (when (cfh/has-layout? objects (:parent-id shape))
             (rx/of (ev/event {::ev/name "layout-add-element"
                               ::ev/origin "workspace:add-shape"
-                              :element-type (get shape :type)})))))))))
+                              :type (get shape :type)
+                              :parent-type parent-type})))))))))
 
 (defn move-shapes-into-frame
   [frame-id shapes]

frontend/src/app/main/data/workspace/texts.cljs

@@ -479,7 +479,7 @@
       ;; We don't have the fills attribute. It's an old text without color
       ;; so need to be black
       (and (nil? (:fills node)) (empty? color-attrs))
-      (update :fills conj txt/default-text-attrs)
+      (assoc :fills (:fills txt/default-text-attrs))
 
       ;; Remove duplicates from the fills
       :always

frontend/src/app/main/ui/dashboard/files.cljs

@@ -86,7 +86,8 @@
                        (when-not (str/empty? name)
                          (st/emit! (-> (dd/rename-project (assoc project :name name))
                                        (with-meta {::ev/origin "project"}))))
-                       (swap! local assoc :edition false)))}]
+                       (swap! local assoc :edition false)))
+           :max-length 250}]
          [:div {:class (stl/css :dashboard-title)}
           [:h1 {:on-double-click on-edit
                 :data-testid "project-title"

frontend/src/app/main/ui/dashboard/grid.cljs

@@ -414,7 +414,8 @@
        [:div {:class (stl/css :item-info)}
         (if (and (= file-id (:file-id state)) (:edition state))
           [:& inline-edition {:content (:name file)
-                              :on-end edit}]
+                              :on-end edit
+                              :max-length 250}]
           [:h3 (:name file)])
         [:& grid-item-metadata {:modified-at (:modified-at file)}]]
 

frontend/src/app/main/ui/dashboard/inline_edition.cljs

@@ -13,7 +13,7 @@
    [rumext.v2 :as mf]))
 
 (mf/defc inline-edition
-  [{:keys [content on-end] :as props}]
+  [{:keys [content on-end max-length] :as props}]
   (let [name      (mf/use-state content)
         input-ref (mf/use-ref)
 
@@ -61,13 +61,14 @@
          (dom/select-text! node))))
 
     [:div {:class (stl/css :edit-wrapper)}
-     [:input {:class (stl/css :element-title)
-              :value @name
-              :ref input-ref
-              :on-click on-click
-              :on-change on-input
+     [:input {:class       (stl/css :element-title)
+              :value       @name
+              :ref         input-ref
+              :on-click    on-click
+              :on-change   on-input
               :on-key-down on-keyup
-              :on-blur on-blur}]
+              :on-blur     on-blur
+              :max-length  max-length}]
      [:span {:class (stl/css :close)
              :on-click on-cancel} i/close]]))
 

frontend/src/app/main/ui/dashboard/projects.cljs

@@ -220,7 +220,8 @@
       [:div {:class (stl/css :project-name-wrapper)}
        (if (:edition @local)
          [:& inline-edition {:content (:name project)
-                             :on-end on-edit}]
+                             :on-end on-edit
+                             :max-length 250}]
          [:h2 {:on-click on-nav
                :style {:max-width (str title-width "%")}
                :class (stl/css :project-name)

frontend/src/app/main/ui/ds/tooltip/tooltip.cljs

@@ -36,8 +36,6 @@
 
 (defn- hide-popover
   [node]
-  (dom/unset-css-property! node "block-size")
-  (dom/unset-css-property! node "display")
   (.hidePopover ^js node))
 
 (defn- calculate-placement-bounding-rect
@@ -159,11 +157,9 @@
   (let [tooltip-brect (dom/get-bounding-rect tooltip)
         window-size   (dom/get-window-size)]
     (when-let [[placement placement-rect] (find-matching-placement placement tooltip-brect origin-brect window-size offset)]
-
       (let [height (if (or (= placement "right") (= placement "left"))
                      (- (:height placement-rect) arrow-height)
                      (:height placement-rect))]
-        (dom/set-css-property! tooltip "display" "grid")
         (dom/set-css-property! tooltip "block-size" (dm/str height "px"))
         (dom/set-css-property! tooltip "inset-block-start" (dm/str (:top placement-rect) "px"))
         (dom/set-css-property! tooltip "inset-inline-start" (dm/str (:left placement-rect) "px")))
@@ -212,8 +208,9 @@
 
                    update-position
                    (fn []
-                     (let [placement (update-tooltip-position tooltip placement origin-brect offset)]
-                       (reset! placement* placement)))]
+                     (let [new-placement (update-tooltip-position tooltip placement origin-brect offset)]
+                       (when (not= new-placement placement)
+                         (reset! placement* new-placement))))]
 
                (add-schedule schedule-ref delay update-position)))))
 
@@ -234,7 +231,7 @@
 
         tooltip-class
         (stl/css-case
-         :tooltip true
+         :tooltip-content-wrapper true
          :tooltip-top (identical? placement "top")
          :tooltip-bottom (identical? placement "bottom")
          :tooltip-left (identical? placement "left")
@@ -260,10 +257,11 @@
 
     [:> :div props
      children
-     [:div {:class [class tooltip-class]
+     [:div {:class [class (stl/css :tooltip)]
             :id id
             :popover "auto"
             :role "tooltip"}
-      [:div {:class (stl/css :tooltip-content)} content]
-      [:div {:class (stl/css :tooltip-arrow)
-             :id "tooltip-arrow"}]]]))
+      [:div {:class tooltip-class}
+       [:div {:class (stl/css :tooltip-content)} content]
+       [:div {:class (stl/css :tooltip-arrow)
+              :id "tooltip-arrow"}]]]]))

frontend/src/app/main/ui/ds/tooltip/tooltip.scss

@@ -19,6 +19,12 @@ $arrow-side: 12px;
   block-size: fit-content;
 }
 
+.tooltip-content-wrapper {
+  display: grid;
+  inline-size: fit-content;
+  block-size: fit-content;
+}
+
 .tooltip-arrow {
   background-color: var(--color-background-primary);
   border-radius: var(--sp-xs);

frontend/src/app/main/ui/inspect/attributes.cljs

@@ -15,7 +15,6 @@
    [app.main.ui.inspect.attributes.blur :refer [blur-panel]]
    [app.main.ui.inspect.attributes.fill :refer [fill-panel]]
    [app.main.ui.inspect.attributes.geometry :refer [geometry-panel]]
-   [app.main.ui.inspect.attributes.image :refer [image-panel]]
    [app.main.ui.inspect.attributes.layout :refer [layout-panel]]
    [app.main.ui.inspect.attributes.layout-element :refer [layout-element-panel]]
    [app.main.ui.inspect.attributes.shadow :refer [shadow-panel]]
@@ -27,13 +26,12 @@
    [rumext.v2 :as mf]))
 
 (def type->options
-  {:multiple [:fill :stroke :image :text :shadow :blur :layout-element]
+  {:multiple [:fill :stroke :text :shadow :blur :layout-element]
    :frame    [:geometry :fill :stroke :shadow :blur :layout :layout-element]
    :group    [:geometry :svg :layout-element]
    :rect     [:geometry :fill :stroke :shadow :blur :svg :layout-element]
    :circle   [:geometry :fill :stroke :shadow :blur :svg :layout-element]
    :path     [:geometry :fill :stroke :shadow :blur :svg :layout-element]
-   :image    [:image :geometry :fill :stroke :shadow :blur :svg :layout-element]
    :text     [:geometry :text :shadow :blur :stroke :layout-element]
    :variant  [:variant :geometry :fill :stroke :shadow :blur :layout :layout-element]})
 
@@ -69,7 +67,6 @@
              :stroke           stroke-panel
              :shadow           shadow-panel
              :blur             blur-panel
-             :image            image-panel
              :text             text-panel
              :svg              svg-panel
              :variant          variant-panel*)

frontend/src/app/main/ui/inspect/attributes/image.cljs

@@ -1,51 +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 app.main.ui.inspect.attributes.image
-  (:require-macros [app.main.style :as stl])
-  (:require
-   [app.common.files.helpers :as cfh]
-   [app.common.media :as cm]
-   [app.config :as cf]
-   [app.main.ui.components.copy-button :refer [copy-button*]]
-   [app.util.code-gen.style-css :as css]
-   [app.util.i18n :refer [tr]]
-   [cuerdas.core :as str]
-   [rumext.v2 :as mf]))
-
-(defn has-image? [shape]
-  (= (:type shape) :image))
-
-(mf/defc image-panel
-  [{:keys [objects shapes]}]
-  (for [shape (filter cfh/image-shape? shapes)]
-    [:div {:class (stl/css :attributes-block)
-           :key   (str "image-" (:id shape))}
-     [:div {:class (stl/css :image-wrapper)}
-      [:img {:src (cf/resolve-file-media (-> shape :metadata))}]]
-
-     [:div {:class (stl/css :image-row)}
-      [:div {:class (stl/css :global/attr-label)}
-       (tr "inspect.attributes.image.width")]
-      [:div {:class (stl/css :global/attr-value)}
-       [:> copy-button* {:data (css/get-css-property objects (:metadata shape) :width)}
-        [:div {:class (stl/css :button-children)} (css/get-css-value objects (:metadata shape) :width)]]]]
-
-     [:div {:class (stl/css :image-row)}
-      [:div {:class (stl/css :global/attr-label)}
-       (tr "inspect.attributes.image.height")]
-      [:div {:class (stl/css :global/attr-value)}
-       [:> copy-button* {:data (css/get-css-property objects (:metadata shape) :height)}
-        [:div {:class (stl/css :button-children)} (css/get-css-value objects (:metadata shape) :height)]]]]
-
-     (let [mtype     (-> shape :metadata :mtype)
-           name      (:name shape)
-           extension (cm/mtype->extension mtype)]
-       [:a   {:class (stl/css :download-button)
-              :target "_blank"
-              :download (cond-> name extension (str/concat extension))
-              :href (cf/resolve-file-media (-> shape :metadata))}
-        (tr "inspect.attributes.image.download")])]))

frontend/src/app/main/ui/workspace/sidebar.cljs

@@ -8,6 +8,7 @@
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.data.macros :as dm]
+   [app.main.constants :refer [sidebar-default-width sidebar-default-max-width]]
    [app.main.data.common :as dcm]
    [app.main.data.event :as ev]
    [app.main.data.workspace :as dw]
@@ -210,7 +211,7 @@
                  (= current-section :code)))
 
         {:keys [on-pointer-down on-lost-pointer-capture on-pointer-move set-size size]}
-        (use-resize-hook :code 276 276 768 :x true :right)
+        (use-resize-hook :code sidebar-default-width sidebar-default-width sidebar-default-max-width :x true :right)
 
         on-change-section
         (mf/use-fn
@@ -224,7 +225,7 @@
         (mf/use-fn
          (mf/deps size)
          (fn []
-           (set-size (if (> size 276) 276 768))))
+           (set-size (if (> size sidebar-default-width) sidebar-default-width sidebar-default-max-width))))
 
         props
         (mf/spread-props props
@@ -235,12 +236,12 @@
      [:aside
       {:class (stl/css-case :right-settings-bar true
                             :not-expand (not can-be-expanded?)
-                            :expanded (> size 276))
+                            :expanded (> size sidebar-default-width))
 
        :id "right-sidebar-aside"
        :data-testid "right-sidebar"
        :data-size (str size)
-       :style {"--width" (if can-be-expanded? (dm/str size "px") "276px")}}
+       :style {"--width" (if can-be-expanded? (dm/str size "px") (dm/str sidebar-default-width "px"))}}
 
       (when can-be-expanded?
         [:div {:class (stl/css :resize-area)

frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs

@@ -55,15 +55,22 @@
 
         ;; Excluding nil values
         values               (d/without-nils values)
-        fills                (if (contains? cfg/flags :frontend-binary-fills)
+
+        fills                (get values :fills)
+        fills                (if (and (contains? cfg/flags :frontend-binary-fills)
+                                      (not= fills :multiple))
                                (take types.fill/MAX-FILLS (d/nilv (:fills values) []))
-                               (:fills values))
+                               fills)
+
+
         has-fills?           (or (= :multiple fills) (some? (seq fills)))
+
         can-add-fills?       (if (contains? cfg/flags :frontend-binary-fills)
                                (and (not (= :multiple fills))
                                     (< (count fills) types.fill/MAX-FILLS))
                                (not (= :multiple fills)))
 
+
         state*               (mf/use-state has-fills?)
         open?                (deref state*)
 

frontend/src/app/main/ui/workspace/viewport/hooks.cljs

@@ -286,7 +286,8 @@
                (fn [mod? ids]
                  (let [sorted-ids
                        (into (d/ordered-set)
-                             (comp (remove #(dm/get-in objects [% :blocked]))
+                             (comp (remove (partial cfh/hidden-parent? objects))
+                                   (remove #(dm/get-in objects [% :blocked]))
                                    (remove (partial cfh/svg-raw-shape? objects)))
                              (ctt/sort-z-index objects ids {:bottom-frames? mod?}))]
                    (mf/set-ref-val! sorted-ids-cache (assoc cached-ids [mod? ids] sorted-ids))
@@ -355,7 +356,6 @@
                hover-shape
                (->> ids
                     (remove remove-hover?)
-                    (remove (partial cfh/hidden-parent? objects))
                     (remove #(and mod? (no-fill-nested-frames? %)))
                     (filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
                     (first)
@@ -366,7 +366,6 @@
                (when show-measures?
                  (->> ids
                       (remove remove-measure?)
-                      (remove (partial cfh/hidden-parent? objects))
                       (remove #(and mod? (no-fill-nested-frames? %)))
                       (filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
                       (first)

frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs

@@ -50,6 +50,41 @@
                                        (obj/set! internal-state "canvas" new-canvas)
                                        new-canvas))))))))
 
+(defn process-pointer-move [viewport-node canvas canvas-image-data zoom-view-context client-x client-y]
+  (when-let [image-data (mf/ref-val canvas-image-data)]
+    (when-let [zoom-view-node (dom/get-element "picker-detail")]
+      (when-not (mf/ref-val zoom-view-context)
+        (mf/set-ref-val! zoom-view-context (.getContext zoom-view-node "2d")))
+      (let [canvas-width 260
+            canvas-height 140
+            {brx :left bry :top} (dom/get-bounding-rect viewport-node)
+
+            x (mth/floor (- client-x brx))
+            y (mth/floor (- client-y bry))
+
+            zoom-context (mf/ref-val zoom-view-context)
+            offset (* (+ (* y (unchecked-get image-data "width")) x) 4)
+            rgba (unchecked-get image-data "data")
+
+            r (obj/get rgba (+ 0 offset))
+            g (obj/get rgba (+ 1 offset))
+            b (obj/get rgba (+ 2 offset))
+            a (obj/get rgba (+ 3 offset))
+
+            sx (- x 32)
+            sy (if (cfg/check-browser? :safari) y (- y 17))
+            sw 65
+            sh 35
+            dx 0
+            dy 0
+            dw canvas-width
+            dh canvas-height]
+        (when (obj/get zoom-context "imageSmoothingEnabled")
+          (obj/set! zoom-context "imageSmoothingEnabled" false))
+        (.clearRect zoom-context 0 0 canvas-width canvas-height)
+        (.drawImage zoom-context canvas sx sy sw sh dx dy dw dh)
+        (st/emit! (dwc/pick-color [r g b a]))))))
+
 (mf/defc pixel-overlay
   {::mf/wrap-props false}
   [props]
@@ -62,7 +97,8 @@
         canvas-context    (.getContext canvas "2d" #js {:willReadFrequently true})
         canvas-image-data (mf/use-ref nil)
         zoom-view-context (mf/use-ref nil)
-
+        canvas-ready      (mf/use-state false)
+        initial-mouse-pos (mf/use-state {:x 0 :y 0})
         update-str        (rx/subject)
 
         handle-keydown
@@ -74,49 +110,6 @@
              (st/emit! (dwc/stop-picker))
              (modal/disallow-click-outside!))))
 
-        handle-pointer-move-picker
-        (mf/use-callback
-         (mf/deps viewport-node)
-         (fn [event]
-           (when-let [image-data (mf/ref-val canvas-image-data)]
-             (when-let [zoom-view-node (dom/get-element "picker-detail")]
-               (when-not (mf/ref-val zoom-view-context)
-                 (mf/set-ref-val! zoom-view-context (.getContext zoom-view-node "2d")))
-               (let [canvas-width 260
-                     canvas-height 140
-                     {brx :left bry :top} (dom/get-bounding-rect viewport-node)
-
-                     x (mth/floor (- (.-clientX event) brx))
-                     y (mth/floor (- (.-clientY event) bry))
-
-                     zoom-context (mf/ref-val zoom-view-context)
-
-                     offset (* (+ (* y (unchecked-get image-data "width")) x) 4)
-                     rgba (unchecked-get image-data "data")
-
-                     r (obj/get rgba (+ 0 offset))
-                     g (obj/get rgba (+ 1 offset))
-                     b (obj/get rgba (+ 2 offset))
-                     a (obj/get rgba (+ 3 offset))
-
-                     ;; I don't know why, but the zoom view is offset by 24px
-                     ;; instead of 25.
-                     sx (- x 32)
-
-                     ;; Safari has a different offset fro the y coord
-                     sy (if (cfg/check-browser? :safari) y (- y 17))
-                     sw 65
-                     sh 35
-                     dx 0
-                     dy 0
-                     dw canvas-width
-                     dh canvas-height]
-                 (when (obj/get zoom-context "imageSmoothingEnabled")
-                   (obj/set! zoom-context "imageSmoothingEnabled" false))
-                 (.clearRect zoom-context 0 0 canvas-width canvas-height)
-                 (.drawImage zoom-context canvas sx sy sw sh dx dy dw dh)
-                 (st/emit! (dwc/pick-color [r g b a])))))))
-
         handle-pointer-down-picker
         (mf/use-callback
          (fn [event]
@@ -152,12 +145,27 @@
                               (let [width (unchecked-get canvas "width")
                                     height (unchecked-get canvas "height")
                                     image-data (.getImageData canvas-context 0 0 width height)]
-                                (mf/set-ref-val! canvas-image-data image-data))))))))
+                                (mf/set-ref-val! canvas-image-data image-data)
+                                (reset! canvas-ready true))))))))
 
         handle-svg-change
         (mf/use-callback
          (fn []
-           (rx/push! update-str :update)))]
+           (rx/push! update-str :update)))
+
+        handle-mouse-enter
+        (mf/use-callback
+         (mf/deps viewport-node)
+         (fn [event]
+           (let [x (.-clientX event)
+                 y (.-clientY event)]
+             (reset! initial-mouse-pos {:x x
+                                        :y y}))))
+        handle-pointer-move-picker
+        (mf/use-callback
+         (mf/deps viewport-node)
+         (fn [event]
+           (process-pointer-move viewport-node canvas canvas-image-data zoom-view-context (.-clientX event) (.-clientY event))))]
 
     (when (obj/get canvas-context "imageSmoothingEnabled")
       (obj/set! canvas-context "imageSmoothingEnabled" false))
@@ -188,9 +196,17 @@
          ;; Disconnect on unmount
          #(.disconnect observer))))
 
+    (mf/use-effect
+     (mf/deps viewport-node @canvas-ready)
+     (fn []
+       (when canvas-ready
+         (let [{:keys [x y]} @initial-mouse-pos]
+           (process-pointer-move viewport-node canvas canvas-image-data zoom-view-context x y)))))
+
     [:div {:id "pixel-overlay"
            :tab-index 0
            :class (dm/str (cur/get-static "picker") " " (stl/css :pixel-overlay))
            :on-pointer-down handle-pointer-down-picker
            :on-pointer-up handle-pointer-up-picker
-           :on-pointer-move handle-pointer-move-picker}]))
+           :on-pointer-move handle-pointer-move-picker
+           :on-mouse-enter handle-mouse-enter}]))

frontend/src/app/plugins/api.cljs

@@ -44,6 +44,7 @@
    [app.plugins.viewport :as viewport]
    [app.util.code-gen :as cg]
    [app.util.object :as obj]
+   [app.util.theme :as theme]
    [beicon.v2.core :as rx]
    [cuerdas.core :as str]))
 
@@ -216,9 +217,15 @@
     :getTheme
     (fn []
       (let [theme (get-in @st/state [:profile :theme])]
-        (if (or (not theme) (= theme "default"))
+        (cond
+          (or (not theme) (= theme "system"))
+          (theme/get-system-theme)
+
+          (= theme "default")
           "dark"
-          (get-in @st/state [:profile :theme]))))
+
+          :else
+          theme)))
 
     :getCurrentUser
     (fn []

frontend/src/app/plugins/events.cljs

@@ -14,6 +14,7 @@
    [app.plugins.parser :as parser]
    [app.plugins.shape :as shape]
    [app.util.object :as obj]
+   [app.util.theme :as theme]
    [goog.functions :as gf]))
 
 (defmulti handle-state-change (fn [type _] type))
@@ -50,10 +51,23 @@
       ::not-changed
       (apply array (map str new-selection)))))
 
+(defn- get-theme
+  [state]
+  (let [theme (get-in state [:profile :theme])]
+    (cond
+      (or (not theme) (= theme "system"))
+      (theme/get-system-theme)
+
+      (= theme "default")
+      "dark"
+
+      :else
+      theme)))
+
 (defmethod handle-state-change "themechange"
   [_ _ old-val new-val _]
-  (let [old-theme (get-in old-val [:profile :theme])
-        new-theme (get-in new-val [:profile :theme])]
+  (let [old-theme (get-theme old-val)
+        new-theme (get-theme new-val)]
     (if (identical? old-theme new-theme)
       ::not-changed
       (if (= new-theme "default")

library/CHANGES.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.0.7
+
+- Add the ability to provide refereron creating build context
+
+```js
+const context = penpot.createBuildContext({referer:"my-referer"});
+```
+
+The referer will be added as an additional field on the manifest.json
+
+
 ## 1.0.6
 
 - Fix unexpected issue on library color decoding

library/deps.edn

@@ -21,11 +21,10 @@
   :dev
   {:extra-paths ["dev"]
    :extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.1.4"}
+   {thheller/shadow-cljs {:mvn/version "3.1.7"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}
     org.clojure/tools.namespace {:mvn/version "RELEASE"}
-    criterium/criterium {:mvn/version "RELEASE"}
-    cider/cider-nrepl {:mvn/version "0.48.0"}}}
+    criterium/criterium {:mvn/version "RELEASE"}}}
 
   :shadow-cljs
   {:main-opts ["-m" "shadow.cljs.devtools.cli"]

library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penpot/library",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538",
@@ -40,8 +40,7 @@
     "@zip.js/zip.js": "patch:@zip.js/zip.js@npm%3A2.7.60#~/.yarn/patches/@zip.js-zip.js-npm-2.7.60-b6b814410b.patch",
     "concurrently": "^9.1.2",
     "luxon": "^3.6.1",
-    "nodemon": "^3.1.9",
-    "shadow-cljs": "3.1.4"
+    "nodemon": "^3.1.9"
   },
   "dependencies": {
     "source-map-support": "^0.5.21"

library/playground/sample-fill-stroke-and-media.js

@@ -6,7 +6,7 @@ import { Writable } from "stream";
 // console.log(penpot);
 
 (async function () {
-  const context = penpot.createBuildContext();
+  const context = penpot.createBuildContext({referer:"playground"});
 
   {
     context.addFile({ name: "Test File 1" });

library/src/lib/builder.cljs

@@ -271,11 +271,19 @@
     (fn []
       (json/->js @state))))
 
+(def ^:private schema:context-options
+  [:map {:title "ContextOptions"}
+   [:referer {:optional true} ::sm/text]])
+
+(def ^:private decode-context-options
+  (sm/decoder schema:context-options sm/json-transformer))
+
 (defn create-build-context
   "Create an empty builder state context."
-  []
-  (let [state (atom {})
-        api   (create-builder-api state)]
+  [options]
+  (let [options (some-> options decode-params decode-context-options)
+        state   (atom {:options options})
+        api     (create-builder-api state)]
 
     (specify! api
       cljs.core/IDeref

library/src/lib/export.cljs

@@ -183,17 +183,22 @@
 
 (defn- generate-manifest-procs
   [state]
-  (let [files (->> (get state ::fb/files)
-                   (mapv (fn [[file-id file]]
-                           {:id file-id
-                            :name (:name file)
-                            :features (:features file)})))
+  (let [opts   (get state :options)
+        files  (->> (get state ::fb/files)
+                    (mapv (fn [[file-id file]]
+                            {:id file-id
+                             :name (:name file)
+                             :features (:features file)})))
         params {:type "penpot/export-files"
                 :version 1
                 :generated-by "penpot-library/%version%"
+                :referer (get opts :referer)
                 :files files
-                :relations []}]
-    ["manifest.json" (delay (json/encode params))]))
+                :relations []}
+        params (d/without-nils params)]
+
+    ["manifest.json"
+     (delay (json/encode params))]))
 
 (defn- generate-procs
   [state]

manage.sh

@@ -7,21 +7,33 @@ export DEVENV_PNAME="penpotdev";
 export CURRENT_USER_ID=$(id -u);
 export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
 
+export IMAGEMAGICK_VERSION=7.1.2-0
+
+# Safe directory to avoid ownership errors with Git
+git config --global --add safe.directory /home/penpot/penpot || true
+
 # Set default java options
 export JAVA_OPTS=${JAVA_OPTS:-"-Xmx1000m -Xms50m"};
 
 set -e
 
+ARCH=$(uname -m)
+
+if [[ "$ARCH" == "x86_64" || "$ARCH" == "i386" || "$ARCH" == "i686" ]]; then
+    ARCH="amd64"
+elif [[ "$ARCH" == "aarch64" || "$ARCH" == "arm64" ]]; then
+    ARCH="arm64"
+else
+    echo "Unknown architecture $ARCH"
+    exit -1
+fi
+
+
 function print-current-version {
     echo -n "$(git describe --tags --match "*.*.*")";
 }
 
-function build-devenv {
-    set +e;
-    echo "Building development image $DEVENV_IMGNAME:latest..."
-
-    pushd docker/devenv;
-
+function setup-buildx {
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx inspect penpot > /dev/null 2>&1;
 
@@ -32,19 +44,28 @@ function build-devenv {
         docker buildx use penpot;
         docker buildx inspect --bootstrap  > /dev/null 2>&1;
     fi
-
-    # docker build -t $DEVENV_IMGNAME:latest .
-    docker buildx build --platform linux/amd64 --push -t $DEVENV_IMGNAME:latest .;
-    docker pull $DEVENV_IMGNAME:latest;
-
-    popd;
 }
 
-function build-devenv-local {
-    echo "Building local only development image $DEVENV_IMGNAME:latest..."
+function build-devenv {
+    set +e;
 
     pushd docker/devenv;
-    docker build -t $DEVENV_IMGNAME:latest .;
+
+    if [ "$1" = "--local" ]; then
+        echo "Build local only $DEVENV_IMGNAME:latest image";
+        docker build -t $DEVENV_IMGNAME:latest .;
+    else
+        echo "Build and push $DEVENV_IMGNAME:latest image";
+        setup-buildx;
+
+        docker buildx build \
+          --platform linux/amd64,linux/arm64 \
+          --output type=registry \
+          -t $DEVENV_IMGNAME:latest .;
+
+        docker pull $DEVENV_IMGNAME:latest;
+    fi
+
     popd;
 }
 
@@ -120,6 +141,32 @@ function run-devenv-isolated-shell {
            $DEVENV_IMGNAME:latest sudo -EH -u penpot bash
 }
 
+function build-imagemagick-docker-image {
+    set +e;
+    echo "Building image penpotapp/imagemagick:$IMAGEMAGICK_VERSION"
+
+    pushd docker/imagemagick;
+
+    output_option="type=registry";
+    platform="linux/amd64,linux/arm64";
+
+    if [ "$1" = "--local" ]; then
+        output_option="type=docker";
+        platform="linux/$ARCH"
+    fi
+
+    setup-buildx;
+
+    docker buildx build \
+      --build-arg IMAGEMAGICK_VERSION=$IMAGEMAGICK_VERSION \
+      --platform $platform \
+      --output $output_option \
+      -t penpotapp/imagemagick:latest \
+      -t penpotapp/imagemagick:$IMAGEMAGICK_VERSION .;
+
+    popd;
+}
+
 function build {
     echo ">> build start: $1"
     local version=$(print-current-version);
@@ -215,21 +262,21 @@ function build-docs-bundle {
     echo ">> bundle docs end";
 }
 
-function build-frontend-docker-images {
+function build-frontend-docker-image {
     rsync -avr --delete ./bundles/frontend/ ./docker/images/bundle-frontend/;
     pushd ./docker/images;
     docker build -t penpotapp/frontend:$CURRENT_BRANCH -t penpotapp/frontend:latest -f Dockerfile.frontend .;
     popd;
 }
 
-function build-backend-docker-images {
+function build-backend-docker-image {
     rsync -avr --delete ./bundles/backend/ ./docker/images/bundle-backend/;
     pushd ./docker/images;
     docker build -t penpotapp/backend:$CURRENT_BRANCH -t penpotapp/backend:latest -f Dockerfile.backend .;
     popd;
 }
 
-function build-exporter-docker-images {
+function build-exporter-docker-image {
     rsync -avr --delete ./bundles/exporter/ ./docker/images/bundle-exporter/;
     pushd ./docker/images;
     docker build -t penpotapp/exporter:$CURRENT_BRANCH -t penpotapp/exporter:latest -f Dockerfile.exporter .;
@@ -242,7 +289,7 @@ function usage {
     echo "Options:"
     echo "- pull-devenv                      Pulls docker development oriented image"
     echo "- build-devenv                     Build docker development oriented image"
-    echo "- build-devenv-local               Build a local docker development oriented image"
+    echo "- build-devenv --local             Build a local docker development oriented image"
     echo "- create-devenv                    Create the development oriented docker compose service."
     echo "- start-devenv                     Start the development oriented docker compose service."
     echo "- stop-devenv                      Stops the development oriented docker compose service."
@@ -259,9 +306,9 @@ function usage {
     echo "- build-docs-bundle                Build docs bundle."
     echo ""
     echo "- build-docker-images              Build all docker images (frontend, backend and exporter)."
-    echo "- build-frontend-docker-images     Build frontend docker images."
-    echo "- build-backend-docker-images      Build backend docker images."
-    echo "- build-exporter-docker-images     Build exporter docker images."
+    echo "- build-frontend-docker-image      Build frontend docker images."
+    echo "- build-backend-docker-image       Build backend docker images."
+    echo "- build-exporter-docker-image      Build exporter docker images."
     echo ""
     echo "- version                          Show penpot's version."
 }
@@ -277,11 +324,8 @@ case $1 in
         ;;
 
     build-devenv)
-        build-devenv ${@:2}
-        ;;
-
-    build-devenv-local)
-        build-devenv-local ${@:2}
+        shift;
+        build-devenv $@;
         ;;
 
     create-devenv)
@@ -335,22 +379,27 @@ case $1 in
         build-docs-bundle;
         ;;
 
+    build-imagemagick-docker-image)
+        shift;
+        build-imagemagick-docker-image $@;
+        ;;
+
     build-docker-images)
-        build-frontend-docker-images
-        build-backend-docker-images
-        build-exporter-docker-images
+        build-frontend-docker-image
+        build-backend-docker-image
+        build-exporter-docker-image
         ;;
 
-    build-frontend-docker-images)
-        build-frontend-docker-images
+    build-frontend-docker-image)
+        build-frontend-docker-image
         ;;
 
-    build-backend-docker-images)
-        build-backend-docker-images
+    build-backend-docker-image)
+        build-backend-docker-image
         ;;
 
-    build-exporter-docker-images)
-        build-exporter-docker-images
+    build-exporter-docker-image)
+        build-exporter-docker-image
         ;;
 
     *)