🐛 Fix migration sync-component-id-with-near-main (loop added)

CHANGES.md

@@ -12,9 +12,7 @@
 
 ### :sparkles: New features & Enhancements
 
-- Add new Box Shadow Tokens [Taiga #10201](https://tree.taiga.io/project/penpot/us/10201)
 - Make i18n translation files load on-demand [Taiga #11474](https://tree.taiga.io/project/penpot/us/11474)
-- Add deleted files to dashboard [Taiga #8149](https://tree.taiga.io/project/penpot/us/8149)
 
 ### :bug: Bugs fixed
 
@@ -85,7 +83,6 @@ example. It's still usable as before, we just removed the example.
 
 - Ensure consistent snap behavior across all zoom levels [Github #7774](https://github.com/penpot/penpot/pull/7774) by [@Tokytome](https://github.com/Tokytome)
 - Fix crash in token grid view due to tooltip validation (by @dfelinto) [Github #7887](https://github.com/penpot/penpot/pull/7887)
-- Enable Hindi translations on the application
 
 ### :sparkles: New features & Enhancements
 
@@ -118,8 +115,6 @@ example. It's still usable as before, we just removed the example.
 - Fix incorrect interaction betwen hower and scroll on assets sidebar [Taiga #12389](https://tree.taiga.io/project/penpot/issue/12389)
 - Fix switch variants with paths [Taiga #12841](https://tree.taiga.io/project/penpot/issue/12841)
 - Fix referencing typography tokens on font-family tokens [Taiga #12492](https://tree.taiga.io/project/penpot/issue/12492)
-- Fix horizontal scroll on layer panel [Taiga #12843](https://tree.taiga.io/project/penpot/issue/12843)
-- Fix unicode handling on email template abbreviation filter [Github #7966](https://github.com/penpot/penpot/pull/7966)
 
 ## 2.11.1
 

backend/resources/app/email/invite-to-team/en.html

@@ -240,4 +240,4 @@
   </div>
 </body>
 
-</html>
+</html>

backend/src/app/binfile/common.clj

@@ -331,81 +331,6 @@
                                  (set/difference cfeat/backend-only-features))
                              #{}))))
 
-(defn check-file-exists
-  [cfg id & {:keys [include-deleted?]
-             :or {include-deleted? false}
-             :as options}]
-  (db/get-with-sql cfg [sql:get-minimal-file id]
-                   {:db/remove-deleted (not include-deleted?)}))
-
-(def ^:private sql:file-permissions
-  "select fpr.is_owner,
-          fpr.is_admin,
-          fpr.can_edit
-     from file_profile_rel as fpr
-    inner join file as f on (f.id = fpr.file_id)
-    where fpr.file_id = ?
-      and fpr.profile_id = ?
-   union all
-   select tpr.is_owner,
-          tpr.is_admin,
-          tpr.can_edit
-     from team_profile_rel as tpr
-    inner join project as p on (p.team_id = tpr.team_id)
-    inner join file as f on (p.id = f.project_id)
-    where f.id = ?
-      and tpr.profile_id = ?
-   union all
-   select ppr.is_owner,
-          ppr.is_admin,
-          ppr.can_edit
-     from project_profile_rel as ppr
-    inner join file as f on (f.project_id = ppr.project_id)
-    where f.id = ?
-      and ppr.profile_id = ?")
-
-(defn- get-file-permissions*
-  [conn profile-id file-id]
-  (when (and profile-id file-id)
-    (db/exec! conn [sql:file-permissions
-                    file-id profile-id
-                    file-id profile-id
-                    file-id profile-id])))
-
-(defn get-file-permissions
-  ([conn profile-id file-id]
-   (let [rows     (get-file-permissions* conn profile-id file-id)
-         is-owner (boolean (some :is-owner rows))
-         is-admin (boolean (some :is-admin rows))
-         can-edit (boolean (some :can-edit rows))]
-     (when (seq rows)
-       {:type :membership
-        :is-owner is-owner
-        :is-admin (or is-owner is-admin)
-        :can-edit (or is-owner is-admin can-edit)
-        :can-read true
-        :is-logged (some? profile-id)})))
-
-  ([conn profile-id file-id share-id]
-   (let [perms  (get-file-permissions conn profile-id file-id)
-         ldata  (some-> (db/get* conn :share-link {:id share-id :file-id file-id})
-                        (dissoc :flags)
-                        (update :pages db/decode-pgarray #{}))]
-
-     ;; NOTE: in a future when share-link becomes more powerful and
-     ;; will allow us specify which parts of the app is available, we
-     ;; will probably need to tweak this function in order to expose
-     ;; this flags to the frontend.
-     (cond
-       (some? perms) perms
-       (some? ldata) {:type :share-link
-                      :can-read true
-                      :pages (:pages ldata)
-                      :is-logged (some? profile-id)
-                      :who-comment (:who-comment ldata)
-                      :who-inspect (:who-inspect ldata)}))))
-
-
 (defn get-project
   [cfg project-id]
   (db/get cfg :project {:id project-id}))

backend/src/app/binfile/v3.clj

@@ -821,10 +821,9 @@
         entries (keep (match-storage-entry-fn) entries)]
 
     (doseq [{:keys [id entry]} entries]
-      (let [object  (-> (read-entry input entry)
-                        (decode-storage-object)
-                        (update :bucket d/nilv sto/default-bucket)
-                        (validate-storage-object))
+      (let [object  (->> (read-entry input entry)
+                         (decode-storage-object)
+                         (validate-storage-object))
 
             ext     (cmedia/mtype->extension (:content-type object))
             path    (str "objects/" id ext)

backend/src/app/http/assets.clj

@@ -30,7 +30,7 @@
 
 (defn- get-file-media-object
   [pool id]
-  (db/get pool :file-media-object {:id id} {::db/remove-deleted false}))
+  (db/get pool :file-media-object {:id id}))
 
 (defn- serve-object-from-s3
   [{:keys [::sto/storage] :as cfg} obj]

backend/src/app/http/middleware.clj

@@ -309,7 +309,7 @@
       (fn [request]
         (let [key (yreq/get-header request "x-shared-key")]
           (if (= key shared-key)
-            (handler (assoc request ::http/auth-with-shared-key true))
+            (handler request)
             {::yres/status 403}))))
     (fn [_ _]
       {::yres/status 403})))

backend/src/app/rpc.clj

@@ -14,7 +14,6 @@
    [app.common.spec :as us]
    [app.common.time :as ct]
    [app.common.uri :as u]
-   [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
    [app.http :as-alias http]
@@ -93,11 +92,7 @@
       (let [handler-name (:type path-params)
             etag         (yreq/get-header request "if-none-match")
             profile-id   (or (::session/profile-id request)
-                             (::actoken/profile-id request)
-                             (if (::http/auth-with-shared-key request)
-                               uuid/zero
-                               nil))
-
+                             (::actoken/profile-id request))
             ip-addr      (inet/parse-request request)
 
             data         (-> params

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

@@ -307,8 +307,7 @@
                                             :content-type (:mtype input)})]
       (:id sobject))
     (catch Throwable cause
-      (l/wrn :hint "unable to import profile picture"
-             :uri uri
+      (l/err :hint "unable to import profile picture"
              :cause cause)
       nil)))
 

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

@@ -79,14 +79,85 @@
 
 ;; --- FILE PERMISSIONS
 
+
+(def ^:private sql:file-permissions
+  "select fpr.is_owner,
+          fpr.is_admin,
+          fpr.can_edit
+     from file_profile_rel as fpr
+    inner join file as f on (f.id = fpr.file_id)
+    where fpr.file_id = ?
+      and fpr.profile_id = ?
+      and f.deleted_at is null
+   union all
+   select tpr.is_owner,
+          tpr.is_admin,
+          tpr.can_edit
+     from team_profile_rel as tpr
+    inner join project as p on (p.team_id = tpr.team_id)
+    inner join file as f on (p.id = f.project_id)
+    where f.id = ?
+      and tpr.profile_id = ?
+      and f.deleted_at is null
+   union all
+   select ppr.is_owner,
+          ppr.is_admin,
+          ppr.can_edit
+     from project_profile_rel as ppr
+    inner join file as f on (f.project_id = ppr.project_id)
+    where f.id = ?
+      and ppr.profile_id = ?
+      and f.deleted_at is null")
+
+(defn get-file-permissions
+  [conn profile-id file-id]
+  (when (and profile-id file-id)
+    (db/exec! conn [sql:file-permissions
+                    file-id profile-id
+                    file-id profile-id
+                    file-id profile-id])))
+
+(defn get-permissions
+  ([conn profile-id file-id]
+   (let [rows     (get-file-permissions conn profile-id file-id)
+         is-owner (boolean (some :is-owner rows))
+         is-admin (boolean (some :is-admin rows))
+         can-edit (boolean (some :can-edit rows))]
+     (when (seq rows)
+       {:type :membership
+        :is-owner is-owner
+        :is-admin (or is-owner is-admin)
+        :can-edit (or is-owner is-admin can-edit)
+        :can-read true
+        :is-logged (some? profile-id)})))
+
+  ([conn profile-id file-id share-id]
+   (let [perms  (get-permissions conn profile-id file-id)
+         ldata  (some-> (db/get* conn :share-link {:id share-id :file-id file-id})
+                        (dissoc :flags)
+                        (update :pages db/decode-pgarray #{}))]
+
+     ;; NOTE: in a future when share-link becomes more powerful and
+     ;; will allow us specify which parts of the app is available, we
+     ;; will probably need to tweak this function in order to expose
+     ;; this flags to the frontend.
+     (cond
+       (some? perms) perms
+       (some? ldata) {:type :share-link
+                      :can-read true
+                      :pages (:pages ldata)
+                      :is-logged (some? profile-id)
+                      :who-comment (:who-comment ldata)
+                      :who-inspect (:who-inspect ldata)}))))
+
 (def has-edit-permissions?
-  (perms/make-edition-predicate-fn bfc/get-file-permissions))
+  (perms/make-edition-predicate-fn get-permissions))
 
 (def has-read-permissions?
-  (perms/make-read-predicate-fn bfc/get-file-permissions))
+  (perms/make-read-predicate-fn get-permissions))
 
 (def has-comment-permissions?
-  (perms/make-comment-predicate-fn bfc/get-file-permissions))
+  (perms/make-comment-predicate-fn get-permissions))
 
 (def check-edition-permissions!
   (perms/make-check-fn has-edit-permissions?))
@@ -99,7 +170,7 @@
 
 (defn check-comment-permissions!
   [conn profile-id file-id share-id]
-  (let [perms       (bfc/get-file-permissions conn profile-id file-id share-id)
+  (let [perms       (get-permissions conn profile-id file-id share-id)
         can-read    (has-read-permissions? perms)
         can-comment (has-comment-permissions? perms)]
     (when-not (or can-read can-comment)
@@ -151,7 +222,7 @@
 (defn- get-minimal-file-with-perms
   [cfg {:keys [:id ::rpc/profile-id]}]
   (let [mfile (get-minimal-file cfg id)
-        perms (bfc/get-file-permissions cfg profile-id id)]
+        perms (get-permissions cfg profile-id id)]
     (assoc mfile :permissions perms)))
 
 (defn get-file-etag
@@ -177,7 +248,7 @@
   ;; will be already prefetched and we just reuse them instead
   ;; of making an additional database queries.
   (let [perms (or (:permissions (::cond/object params))
-                  (bfc/get-file-permissions conn profile-id id))]
+                  (get-permissions conn profile-id id))]
     (check-read-permissions! perms)
 
     (let [team (teams/get-team conn
@@ -240,7 +311,7 @@
    ::sm/result schema:file-fragment}
   [cfg {:keys [::rpc/profile-id file-id fragment-id share-id]}]
   (db/run! cfg (fn [cfg]
-                 (let [perms (bfc/get-file-permissions cfg profile-id file-id share-id)]
+                 (let [perms (get-permissions cfg profile-id file-id share-id)]
                    (check-read-permissions! perms)
                    (-> (get-file-fragment cfg file-id fragment-id)
                        (rph/with-http-cache long-cache-duration))))))
@@ -385,7 +456,8 @@
               :code :params-validation
               :hint "page-id is required when object-id is provided"))
 
-  (let [perms (bfc/get-file-permissions conn profile-id file-id share-id)
+  (let [perms (get-permissions conn profile-id file-id share-id)
+
         file  (bfc/get-file cfg file-id :read-only? true)
 
         proj  (db/get conn :project {:id (:project-id file)})
@@ -616,10 +688,11 @@
   "Get libraries used by the specified file."
   {::doc/added "1.17"
    ::sm/params schema:get-file-libraries}
-  [cfg {:keys [::rpc/profile-id file-id]}]
-  (bfc/check-file-exists cfg file-id)
-  (check-read-permissions! cfg profile-id file-id)
-  (bfc/get-file-libraries cfg file-id))
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id]}]
+  (dm/with-open [conn (db/open pool)]
+    (check-read-permissions! conn profile-id file-id)
+    (bfc/get-file-libraries conn file-id)))
+
 
 ;; --- COMMAND QUERY: Files that use this File library
 
@@ -712,7 +785,8 @@
        FROM file AS f
       INNER JOIN project AS p ON (p.id = f.project_id)
        LEFT JOIN file_thumbnail AS ft on (ft.file_id = f.id
-                                          AND ft.revn = f.revn)
+                                          AND ft.revn = f.revn
+                                          AND ft.deleted_at is null)
       WHERE p.team_id = ?
         AND (p.deleted_at > ?::timestamptz OR
              f.deleted_at > ?::timestamptz)

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

@@ -199,13 +199,15 @@
   [cfg {:keys [::rpc/profile-id file-id strip-frames-with-thumbnails] :as params}]
   (db/run! cfg (fn [{:keys [::db/conn] :as cfg}]
                  (files/check-read-permissions! conn profile-id file-id)
+
                  (let [team (teams/get-team conn
                                             :profile-id profile-id
                                             :file-id file-id)
+
                        file (bfc/get-file cfg file-id
-                                          :include-deleted? true
                                           :realize? true
                                           :read-only? true)
+
                        strip-frames-with-thumbnails
                        (or (nil? strip-frames-with-thumbnails) ;; if not present, default to true
                            (true? strip-frames-with-thumbnails))]
@@ -331,16 +333,12 @@
 
 ;; --- MUTATION COMMAND: create-file-thumbnail
 
-(defn- create-file-thumbnail
-  [{:keys [::db/conn ::sto/storage] :as cfg} {:keys [file-id revn props media] :as params}]
+(defn- create-file-thumbnail!
+  [{:keys [::db/conn ::sto/storage]} {:keys [file-id revn props media] :as params}]
   (media/validate-media-type! media)
   (media/validate-media-size! media)
 
-  (let [file  (bfc/get-file cfg file-id
-                            :include-deleted? true
-                            :load-data? false)
-
-        props (db/tjson (or props {}))
+  (let [props (db/tjson (or props {}))
         path  (:path media)
         mtype (:mtype media)
         hash  (sto/calculate-hash path)
@@ -369,7 +367,7 @@
 
         (db/update! conn :file-thumbnail
                     {:media-id (:id media)
-                     :deleted-at (:deleted-at file)
+                     :deleted-at nil
                      :updated-at tnow
                      :props props}
                     {:file-id file-id
@@ -380,7 +378,6 @@
                    :revn revn
                    :created-at tnow
                    :updated-at tnow
-                   :deleted-at (:deleted-at file)
                    :props props
                    :media-id (:id media)}))
 
@@ -405,8 +402,6 @@
    ::rtry/when rtry/conflict-exception?
    ::sm/params schema:create-file-thumbnail}
 
-  ;; FIXME: do not run the thumbnail upload inside a transaction
-
   [cfg {:keys [::rpc/profile-id file-id] :as params}]
   (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
                     ;; TODO For now we check read permissions instead of write,
@@ -414,6 +409,6 @@
                     ;; review this approach on the future.
                     (files/check-read-permissions! conn profile-id file-id)
                     (when-not (db/read-only? conn)
-                      (let [media (create-file-thumbnail cfg params)]
+                      (let [media (create-file-thumbnail! cfg params)]
                         {:uri (files/resolve-public-uri (:id media))
                          :id (:id media)})))))

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

@@ -6,7 +6,6 @@
 
 (ns app.rpc.commands.fonts
   (:require
-   [app.binfile.common :as bfc]
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.schema :as sm]
@@ -67,7 +66,7 @@
       (uuid? file-id)
       (let [file    (db/get-by-id conn :file file-id {:columns [:id :project-id]})
             project (db/get-by-id conn :project (:project-id file) {:columns [:id :team-id]})
-            perms   (bfc/get-file-permissions conn profile-id file-id share-id)]
+            perms   (files/get-permissions conn profile-id file-id share-id)]
         (files/check-read-permissions! perms)
         (db/query conn :team-font-variant
                   {:team-id (:team-id project)

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

@@ -13,6 +13,7 @@
    [app.config :as cf]
    [app.db :as db]
    [app.rpc :as-alias rpc]
+   [app.rpc.commands.files :as files]
    [app.rpc.commands.teams :as teams]
    [app.rpc.cond :as-alias cond]
    [app.rpc.doc :as-alias doc]
@@ -120,7 +121,7 @@
   [system {:keys [::rpc/profile-id file-id share-id] :as params}]
   (db/run! system
            (fn [{:keys [::db/conn] :as system}]
-             (let [perms  (bfc/get-file-permissions conn profile-id file-id share-id)
+             (let [perms  (files/get-permissions conn profile-id file-id share-id)
                    params (-> params
                               (assoc ::perms perms)
                               (assoc :profile-id profile-id))]

backend/src/app/rpc/rlimit.clj

@@ -104,29 +104,28 @@
 (def ^:private schema:limit
   [:and
    [:map
-    [::name :keyword]
+    [::name :any]
     [::strategy schema:strategy]
     [::key :string]
-    [::opts :string]
-    [::capacity {:optional true} ::sm/int]
-    [::rate {:optional true} ::sm/int]
-    [::interval {:optional true} ::ct/duration]
-    [::params {:optional true} [::sm/vec :any]]
-    [::permits {:optional true} ::sm/int]
-    [::unit {:optional true} [:enum :days :hours :minutes :seconds :weeks]]]
-   [:fn (fn [attrs]
-          (let [contains-fn (partial contains? attrs)]
-            (or (every? contains-fn [::capacity ::rate ::interval])
-                (every? contains-fn [::permits ::unit]))))]])
+    [::opts :string]]
+   [:or
+    [:map
+     [::capacity ::sm/int]
+     [::rate ::sm/int]
+     [::internal ::ct/duration]
+     [::params [::sm/vec :any]]]
+    [:map
+     [::nreq ::sm/int]
+     [::unit [:enum :days :hours :minutes :seconds :weeks]]]]])
 
 (def ^:private schema:limits
   [:map-of :keyword [::sm/vec schema:limit]])
 
 (def ^:private valid-limit-tuple?
-  (sm/validator schema:limit-tuple))
+  (sm/lazy-validator schema:limit-tuple))
 
 (def ^:private valid-rlimit-instance?
-  (sm/validator ::rpc/rlimit))
+  (sm/lazy-validator ::rpc/rlimit))
 
 (defmethod parse-limit :window
   [[name strategy opts :as vlimit]]
@@ -135,16 +134,16 @@
   (merge
    {::name name
     ::strategy strategy}
-   (if-let [[_ permits unit] (re-find window-opts-re opts)]
-     (let [permits (parse-long permits)]
-       {::permits permits
+   (if-let [[_ nreq unit] (re-find window-opts-re opts)]
+     (let [nreq (parse-long nreq)]
+       {::nreq nreq
         ::unit (case unit
                  "d" :days
                  "h" :hours
                  "m" :minutes
                  "s" :seconds
                  "w" :weeks)
-        ::key  (str "penpot.rlimit." (cf/get :tenant) ".window." (d/name name))
+        ::key  (str "ratelimit.window." (d/name name))
         ::opts opts})
      (ex/raise :type :validation
                :code :invalid-window-limit-opts
@@ -165,15 +164,15 @@
        ::interval interval
        ::opts     opts
        ::params   [(->seconds interval) rate capacity]
-       ::key      (str "penpot.rlimit." (cf/get :tenant) ".bucket." (d/name name))})
+       ::key      (str "ratelimit.bucket." (d/name name))})
     (ex/raise :type :validation
               :code :invalid-bucket-limit-opts
               :hint (str/ffmt "looks like '%' does not have a valid format" opts))))
 
 (defmethod process-limit :bucket
-  [rconn profile-id now {:keys [::key ::params ::service ::capacity ::interval ::rate] :as limit}]
+  [rconn user-id now {:keys [::key ::params ::service ::capacity ::interval ::rate] :as limit}]
   (let [script    (-> bucket-rate-limit-script
-                      (assoc ::rscript/keys [(str key "." service "." profile-id)])
+                      (assoc ::rscript/keys [(str key "." service "." user-id)])
                       (assoc ::rscript/vals (conj params (->seconds now))))
         result    (rds/eval rconn script)
         allowed?  (boolean (nth result 0))
@@ -193,18 +192,18 @@
         (assoc ::lresult/remaining remaining))))
 
 (defmethod process-limit :window
-  [rconn profile-id now {:keys [::permits ::unit ::key ::service] :as limit}]
+  [rconn user-id now {:keys [::nreq ::unit ::key ::service] :as limit}]
   (let [ts        (ct/truncate now unit)
         ttl       (ct/diff now (ct/plus ts {unit 1}))
         script    (-> window-rate-limit-script
-                      (assoc ::rscript/keys [(str key "." service "." profile-id "." (ct/format-inst ts))])
-                      (assoc ::rscript/vals [permits (->seconds ttl)]))
+                      (assoc ::rscript/keys [(str key "." service "." user-id "." (ct/format-inst ts))])
+                      (assoc ::rscript/vals [nreq (->seconds ttl)]))
         result    (rds/eval rconn script)
         allowed?  (boolean (nth result 0))
         remaining (nth result 1)]
     (l/trace :hint "limit processed"
              :service service
-             :name (name (::name limit))
+             :limit (name (::name limit))
              :strategy (name (::strategy limit))
              :opts (::opts limit)
              :allowed allowed?
@@ -215,8 +214,8 @@
         (assoc ::lresult/reset (ct/plus ts {unit 1})))))
 
 (defn- process-limits
-  [rconn profile-id limits now]
-  (let [results   (into [] (map (partial process-limit rconn profile-id now)) limits)
+  [rconn user-id limits now]
+  (let [results   (into [] (map (partial process-limit rconn user-id now)) limits)
         remaining (->> results
                        (d/index-by ::name ::lresult/remaining)
                        (uri/map->query-string))
@@ -228,7 +227,7 @@
 
     (when rejected
       (l/warn :hint "rejected rate limit"
-              :profile-id (str profile-id)
+              :user-id (str user-id)
               :limit-service (-> rejected ::service name)
               :limit-name (-> rejected ::name name)
               :limit-strategy (-> rejected ::strategy name)))
@@ -372,9 +371,12 @@
 (defn- on-refresh-error
   [_ cause]
   (when-not (instance? java.util.concurrent.RejectedExecutionException cause)
-    (l/warn :hint "unexpected exception on loading config"
-            :cause cause
-            ::l/sync? true)))
+    (if-let [explain (-> cause ex-data ex/explain)]
+      (l/warn ::l/raw (str "unable to refresh config, invalid format:\n" explain)
+              ::l/sync? true)
+      (l/warn :hint "unexpected exception on loading config"
+              :cause cause
+              ::l/sync? true))))
 
 (defn- get-config-path
   []

backend/src/app/rpc/rlimit/bucket.lua

@@ -25,9 +25,9 @@ local allowed = filled >= requested
 local newTokens = filled
 if allowed then
   newTokens = filled - requested
-  redis.call("hset", tokensKey, "tokens", newTokens, "timestamp", timestamp)
 end
 
+redis.call("hset", tokensKey, "tokens", newTokens, "timestamp", timestamp)
 redis.call("expire", tokensKey, ttl)
 
 return { allowed, newTokens }

backend/src/app/storage.clj

@@ -35,9 +35,6 @@
       :assets-s3 :s3
       nil)))
 
-(def default-bucket
-  "file-media-object")
-
 (def valid-buckets
   #{"file-media-object"
     "team-font-variant"

backend/src/app/storage/gc_touched.clj

@@ -25,7 +25,7 @@
    [app.common.time :as ct]
    [app.config :as cf]
    [app.db :as db]
-   [app.storage :as sto]
+   [app.storage :as-alias sto]
    [app.storage.impl :as impl]
    [integrant.core :as ig]))
 
@@ -130,7 +130,7 @@
   [{:keys [metadata]}]
   (or (some-> metadata :bucket)
       (some-> metadata :reference d/name)
-      sto/default-bucket))
+      "file-media-object"))
 
 (defn- process-objects!
   [conn has-refs? bucket objects]

backend/src/app/util/template.clj

@@ -7,18 +7,10 @@
 (ns app.util.template
   (:require
    [app.common.exceptions :as ex]
-   [cuerdas.core :as str]
-   [selmer.filters :as sf]
    [selmer.parser :as sp]))
 
 ;; (sp/cache-off!)
 
-(sf/add-filter! :abbreviate
-                (fn [s n]
-                  (let [n (parse-long n)]
-                    (str/abbreviate s n))))
-
-
 (defn render
   [path context]
   (try

backend/src/app/worker/dispatcher.clj

@@ -137,34 +137,33 @@ RETURNING task.id, task.queue")
                 ::wait)))
 
           (run-batch []
-            (try
-              (let [rconn (rds/connect cfg)]
-                (try
-                  (-> cfg
-                      (assoc ::rds/conn rconn)
-                      (db/tx-run! run-batch'))
-                  (finally
-                    (.close ^AutoCloseable rconn))))
+            (let [rconn (rds/connect cfg)]
+              (try
+                (-> cfg
+                    (assoc ::rds/conn rconn)
+                    (db/tx-run! run-batch'))
 
-              (catch InterruptedException cause
-                (throw cause))
+                (catch InterruptedException cause
+                  (throw cause))
+                (catch Exception cause
+                  (cond
+                    (rds/exception? cause)
+                    (do
+                      (l/wrn :hint "redis exception (will retry in an instant)" :cause cause)
+                      (px/sleep timeout))
 
-              (catch Exception cause
-                (cond
-                  (rds/exception? cause)
-                  (do
-                    (l/wrn :hint "redis exception (will retry in an instant)" :cause cause)
-                    (px/sleep timeout))
+                    (db/sql-exception? cause)
+                    (do
+                      (l/wrn :hint "database exception (will retry in an instant)" :cause cause)
+                      (px/sleep timeout))
 
-                  (db/sql-exception? cause)
-                  (do
-                    (l/wrn :hint "database exception (will retry in an instant)" :cause cause)
-                    (px/sleep timeout))
+                    :else
+                    (do
+                      (l/err :hint "unhandled exception (will retry in an instant)" :cause cause)
+                      (px/sleep timeout))))
 
-                  :else
-                  (do
-                    (l/err :hint "unhandled exception (will retry in an instant)" :cause cause)
-                    (px/sleep timeout))))))
+                (finally
+                  (.close ^AutoCloseable rconn)))))
 
           (dispatcher []
             (l/inf :hint "started")
@@ -177,7 +176,7 @@ RETURNING task.id, task.queue")
               (catch InterruptedException _
                 (l/trc :hint "interrupted"))
               (catch Throwable cause
-                (l/err :hint "unexpected exception" :cause cause))
+                (l/err :hint " unexpected exception" :cause cause))
               (finally
                 (l/inf :hint "terminated"))))]
 

common/deps.edn

@@ -29,7 +29,8 @@
   java-http-clj/java-http-clj {:mvn/version "0.4.3"}
   integrant/integrant {:mvn/version "1.0.0"}
 
-  funcool/cuerdas {:mvn/version "2026.415"}
+  funcool/tubax {:mvn/version "2021.05.20-0"}
+  funcool/cuerdas {:mvn/version "2025.06.16-414"}
   funcool/promesa
   {:git/sha "46048fc0d4bf5466a2a4121f5d52aefa6337f2e8"
    :git/url "https://github.com/funcool/promesa"}

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

@@ -1766,6 +1766,59 @@
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
+(defmethod migrate-data "0017-remove-unneeded-objects-from-components"
+  [data _]
+  ;; Some components have an `:objects` attribute, despite not being
+  ;; deleted. This migration removes it.
+  (letfn [(check-component [component]
+            (if (and (not (:deleted component))
+                     (contains? component :objects))
+              (dissoc component :objects)
+              component))]
+    (d/update-when data :components d/update-vals check-component)))
+
+(defmethod migrate-data "0018-sync-component-id-with-near-main"
+  [data _]
+  (let [libs (some-> (:libs data) deref)]
+    (letfn [(fix-shape
+              [data page shape]
+              (if (and (ctk/subcopy-head? shape)
+                       (nil? (ctk/get-swap-slot shape)))
+                (let [file {:id (:id data) :data data}
+                      ref-shape  (ctf/find-ref-shape file page libs shape {:include-deleted? true :with-context? true})]
+                  (if (and (some? ref-shape)
+                           (or (not= (:component-id shape) (:component-id ref-shape))
+                               (not= (:component-file shape) (:component-file ref-shape))))
+                    (cond-> shape
+                      (some? (:component-id ref-shape))
+                      (assoc :component-id (:component-id ref-shape))
+
+                      (nil? (:component-id ref-shape))
+                      (dissoc :component-id)
+
+                      (some? (:component-file ref-shape))
+                      (assoc :component-file (:component-file ref-shape))
+
+                      (nil? (:component-file ref-shape))
+                      (dissoc :component-file))
+                    shape))
+                shape))
+
+            (update-page
+              [data page]
+              (d/update-when page :objects d/update-vals (partial fix-shape data page)))
+
+            (fix-data [data]
+              (loop [current-data data
+                     iteration    0]
+                (let [next-data (update current-data :pages-index d/update-vals (partial update-page current-data))]
+                  (if (or (= current-data next-data)
+                          (> iteration 20))     ;; safety bound
+                    next-data
+                    (recur next-data (inc iteration))))))]
+      (fix-data data))))
+
+
 (def available-migrations
   (into (d/ordered-set)
         ["legacy-2"
@@ -1839,4 +1892,6 @@
          "0014-clear-components-nil-objects"
          "0015-fix-text-attrs-blank-strings"
          "0015-clean-shadow-color"
-         "0016-copy-fills-from-position-data-to-text-node"]))
+         "0016-copy-fills-from-position-data-to-text-node"
+         "0017-remove-unneeded-objects-from-components"
+         "0018-sync-component-id-with-near-main"]))

common/src/app/common/files/repair.cljc

@@ -333,6 +333,31 @@
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
 
+(defmethod repair-error :component-id-mismatch
+  [_ {:keys [shape page-id args] :as error} file-data _]
+  (let [repair-shape
+        (fn [shape]
+          ; Set the component-id and component-file to the ones of the near main
+          (log/debug :hint (str "  -> set component-id to " (:component-id args)))
+          (log/debug :hint (str "  -> set component-file to " (:component-file args)))
+          (cond-> shape
+            (some? (:component-id args))
+            (assoc :component-id (:component-id args))
+
+            (nil? (:component-id args))
+            (dissoc :component-id)
+
+            (some? (:component-file args))
+            (assoc :component-file (:component-file args))
+
+            (nil? (:component-file args))
+            (dissoc :component-file)))]
+
+    (log/dbg :hint "repairing shape :component-id-mismatch" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [(:id shape)] repair-shape))))
+
 (defmethod repair-error :ref-shape-is-head
   [_ {:keys [shape page-id args] :as error} file-data _]
   (let [repair-shape
@@ -499,7 +524,7 @@
         (pcb/update-shapes [(:id shape)] repair-shape))))
 
 (defmethod repair-error :component-nil-objects-not-allowed
-  [_ {:keys [shape] :as error} file-data _]
+  [_ {component :shape} file-data _]   ; in this error the :shape argument is the component
   (let [repair-component
         (fn [component]
           ; Remove the objects key, or set it to {} if the component is deleted
@@ -511,10 +536,26 @@
               (log/debug :hint "  -> remove :objects")
               (dissoc component :objects))))]
 
-    (log/dbg :hint "repairing component :component-nil-objects-not-allowed" :id (:id shape) :name (:name shape))
+    (log/dbg :hint "repairing component :component-nil-objects-not-allowed" :id (:id component) :name (:name component))
     (-> (pcb/empty-changes nil)
         (pcb/with-library-data file-data)
-        (pcb/update-component (:id shape) repair-component))))
+        (pcb/update-component (:id component) repair-component))))
+
+(defmethod repair-error :non-deleted-component-cannot-have-objects
+  [_ {component :shape} file-data _]   ; in this error the :shape argument is the component
+  (let [repair-component
+        (fn [component]
+          ; Remove the :objects field
+          (if-not (:deleted component)
+            (do
+              (log/debug :hint "  -> remove :objects")
+              (dissoc component :objects))
+            component))]
+
+    (log/dbg :hint "repairing component :non-deleted-component-cannot-have-objects" :id (:id component) :name (:name component))
+    (-> (pcb/empty-changes nil)
+        (pcb/with-library-data file-data)
+        (pcb/update-component (:id component) repair-component))))
 
 (defmethod repair-error :invalid-text-touched
   [_ {:keys [shape page-id] :as error} file-data _]

common/src/app/common/files/shapes_builder.cljc

@@ -82,113 +82,6 @@
 (declare create-svg-children)
 (declare parse-svg-element)
 
-(defn- process-gradient-stops
-  "Processes gradient stops to extract stop-color and stop-opacity from style attributes
-   and convert them to direct attributes. This ensures stops with style='stop-color:#...;stop-opacity:1'
-   are properly converted to stop-color and stop-opacity attributes."
-  [stops]
-  (mapv (fn [stop]
-          (let [stop-attrs (:attrs stop)
-                stop-style (get stop-attrs :style)
-                ;; Parse style if it's a string using csvg/parse-style utility
-                parsed-style (when (and (string? stop-style) (seq stop-style))
-                               (csvg/parse-style stop-style))
-                ;; Extract stop-color and stop-opacity from style
-                style-stop-color (when parsed-style (:stop-color parsed-style))
-                style-stop-opacity (when parsed-style (:stop-opacity parsed-style))
-                ;; Merge: use direct attributes first, then style values as fallback
-                final-attrs (cond-> stop-attrs
-                              (and style-stop-color (not (contains? stop-attrs :stop-color)))
-                              (assoc :stop-color style-stop-color)
-
-                              (and style-stop-opacity (not (contains? stop-attrs :stop-opacity)))
-                              (assoc :stop-opacity style-stop-opacity)
-
-                              ;; Remove style attribute if we've extracted its values
-                              (or style-stop-color style-stop-opacity)
-                              (dissoc :style))]
-            (assoc stop :attrs final-attrs)))
-        stops))
-
-(defn- resolve-gradient-href
-  "Resolves xlink:href references in gradients by merging the referenced gradient's
-   stops and attributes with the referencing gradient. This ensures gradients that
-   reference other gradients (like linearGradient3550 referencing linearGradient3536)
-   inherit the stops from the base gradient.
-   
-   According to SVG spec, when a gradient has xlink:href:
-   - It inherits all attributes from the referenced gradient
-   - It inherits all stops from the referenced gradient
-   - The referencing gradient's attributes override the base ones
-   - If the referencing gradient has stops, they replace the base stops
-   
-   Returns the defs map with all gradient href references resolved."
-  [defs]
-  (letfn [(resolve-gradient [gradient-id gradient-node defs visited]
-            (if (contains? visited gradient-id)
-              (do
-                #?(:cljs (js/console.warn "[resolve-gradient] Circular reference detected for" gradient-id)
-                   :clj nil)
-                gradient-node)  ;; Avoid circular references
-              (let [attrs (:attrs gradient-node)
-                    href-id (or (:href attrs) (:xlink:href attrs))
-                    href-id (when (and (string? href-id) (pos? (count href-id)))
-                              (subs href-id 1))  ;; Remove leading #
-
-                    base-gradient (when (and href-id (contains? defs href-id))
-                                    (get defs href-id))
-
-                    resolved-base (when base-gradient (resolve-gradient href-id base-gradient defs (conj visited gradient-id)))]
-
-                (if resolved-base
-                  ;; Merge: base gradient attributes + referencing gradient attributes
-                  ;; Use referencing gradient's stops if present, otherwise use base stops
-                  (let [base-attrs (:attrs resolved-base)
-                        ref-attrs (:attrs gradient-node)
-
-                        ;; Start with base attributes (without id), then merge with ref attributes
-                        ;; This ensures ref attributes override base ones
-                        base-attrs-clean (dissoc base-attrs :id)
-                        ref-attrs-clean (dissoc ref-attrs :href :xlink:href :id)
-
-                        ;; Special handling for gradientTransform: if both have it, combine them
-                        base-transform (get base-attrs :gradientTransform)
-                        ref-transform (get ref-attrs :gradientTransform)
-                        combined-transform (cond
-                                             (and base-transform ref-transform)
-                                             (str base-transform " " ref-transform)  ;; Apply base first, then ref
-                                             :else (or ref-transform base-transform))
-
-                        ;; Merge attributes: base first, then ref (ref overrides)
-                        merged-attrs (-> (d/deep-merge base-attrs-clean ref-attrs-clean)
-                                         (cond-> combined-transform
-                                           (assoc :gradientTransform combined-transform)))
-
-                        ;; If referencing gradient has content (stops), use it; otherwise use base content
-                        final-content (if (seq (:content gradient-node))
-                                        (:content gradient-node)
-                                        (:content resolved-base))
-
-                        ;; Process stops to extract stop-color and stop-opacity from style attributes
-                        processed-content (process-gradient-stops final-content)
-
-                        result {:tag (:tag gradient-node)
-                                :attrs (assoc merged-attrs :id gradient-id)
-                                :content processed-content}]
-                    result)
-                  ;; Process stops even for gradients without references to extract style attributes
-                  (let [processed-content (process-gradient-stops (:content gradient-node))]
-                    (assoc gradient-node :content processed-content))))))]
-    (let [gradient-tags #{:linearGradient :radialGradient}
-          result (reduce-kv
-                  (fn [acc id node]
-                    (if (contains? gradient-tags (:tag node))
-                      (assoc acc id (resolve-gradient id node defs #{}))
-                      (assoc acc id node)))
-                  {}
-                  defs)]
-      result)))
-
 (defn create-svg-shapes
   ([svg-data pos objects frame-id parent-id selected center?]
    (create-svg-shapes (uuid/next) svg-data pos objects frame-id parent-id selected center?))
@@ -219,9 +112,6 @@
              (csvg/fix-percents)
              (csvg/extract-defs))
 
-         ;; Resolve gradient href references in all defs before processing shapes
-         def-nodes (resolve-gradient-href def-nodes)
-
          ;; In penpot groups have the size of their children. To
          ;; respect the imported svg size and empty space let's create
          ;; a transparent shape as background to respect the imported
@@ -252,23 +142,12 @@
          (reduce (partial create-svg-children objects selected frame-id root-id svg-data)
                  [unames []]
                  (d/enumerate (->> (:content svg-data)
-                                   (mapv #(csvg/inherit-attributes root-attrs %)))))
+                                   (mapv #(csvg/inherit-attributes root-attrs %)))))]
 
-         ;; Collect all defs from children and merge into root shape
-         all-defs-from-children (reduce (fn [acc child]
-                                          (if-let [child-defs (:svg-defs child)]
-                                            (merge acc child-defs)
-                                            acc))
-                                        {}
-                                        children)
-
-         ;; Merge defs from svg-data and children into root shape
-         root-shape-with-defs (assoc root-shape :svg-defs (merge def-nodes all-defs-from-children))]
-
-     [root-shape-with-defs children])))
+     [root-shape children])))
 
 (defn create-raw-svg
-  [name frame-id {:keys [x y width height offset-x offset-y defs] :as svg-data} {:keys [attrs] :as data}]
+  [name frame-id {:keys [x y width height offset-x offset-y]} {:keys [attrs] :as data}]
   (let [props (csvg/attrs->props attrs)
         vbox  (grc/make-rect offset-x offset-y width height)]
     (cts/setup-shape
@@ -281,11 +160,10 @@
       :y y
       :content data
       :svg-attrs props
-      :svg-viewbox vbox
-      :svg-defs defs})))
+      :svg-viewbox vbox})))
 
 (defn create-svg-root
-  [id frame-id parent-id {:keys [name x y width height offset-x offset-y attrs defs] :as svg-data}]
+  [id frame-id parent-id {:keys [name x y width height offset-x offset-y attrs]}]
   (let [props (-> (dissoc attrs :viewBox :view-box :xmlns)
                   (d/without-keys csvg/inheritable-props)
                   (csvg/attrs->props))]
@@ -299,8 +177,7 @@
       :height height
       :x (+ x offset-x)
       :y (+ y offset-y)
-      :svg-attrs props
-      :svg-defs defs})))
+      :svg-attrs props})))
 
 (defn create-svg-children
   [objects selected frame-id parent-id svg-data [unames children] [_index svg-element]]
@@ -321,7 +198,7 @@
 
 
 (defn create-group
-  [name frame-id {:keys [x y width height offset-x offset-y defs] :as svg-data} {:keys [attrs]}]
+  [name frame-id {:keys [x y width height offset-x offset-y] :as svg-data} {:keys [attrs]}]
   (let [transform (csvg/parse-transform (:transform attrs))
         attrs     (-> attrs
                       (d/without-keys csvg/inheritable-props)
@@ -337,8 +214,7 @@
       :height height
       :svg-transform transform
       :svg-attrs attrs
-      :svg-viewbox vbox
-      :svg-defs defs})))
+      :svg-viewbox vbox})))
 
 (defn create-path-shape [name frame-id svg-data {:keys [attrs] :as data}]
   (when (and (contains? attrs :d) (seq (:d attrs)))
@@ -647,21 +523,6 @@
                  :else (dm/str tag))]
     (dm/str "svg-" suffix)))
 
-(defn- filter-valid-def-references
-  "Filters out false positive references that are not valid def IDs.
-   Filters out:
-   - Colors in style attributes (hex colors like #f9dd67)
-   - Style fragments that contain CSS keywords (like stop-opacity)
-   - References that don't exist in defs"
-  [ref-ids defs]
-  (let [is-style-fragment? (fn [ref-id]
-                             (or (clr/hex-color-string? (str "#" ref-id))
-                                 (str/includes? ref-id ";")  ;; Contains CSS separator
-                                 (str/includes? ref-id "stop-opacity")  ;; CSS keyword
-                                 (str/includes? ref-id "stop-color")))]  ;; CSS keyword
-    (->> ref-ids
-         (remove is-style-fragment?)  ;; Filter style fragments and hex colors
-         (filter #(contains? defs %)))))  ;; Only existing defs
 
 (defn parse-svg-element
   [frame-id svg-data {:keys [tag attrs hidden] :as element} unames]
@@ -673,11 +534,7 @@
   (let [name         (or (:id attrs) (tag->name tag))
         att-refs     (csvg/find-attr-references attrs)
         defs         (get svg-data :defs)
-        valid-refs   (filter-valid-def-references att-refs defs)
-        all-refs     (csvg/find-def-references defs valid-refs)
-        ;; Filter the final result to ensure all references are valid defs
-        ;; This prevents false positives from style attributes in gradient stops
-        references   (filter-valid-def-references all-refs defs)
+        references   (csvg/find-def-references defs att-refs)
 
         href-id      (or (:href attrs) (:xlink:href attrs) " ")
         href-id      (if (and (string? href-id)

common/src/app/common/files/validate.cljc

@@ -51,6 +51,7 @@
     :ref-shape-is-head
     :ref-shape-is-not-head
     :shape-ref-in-main
+    :component-id-mismatch
     :root-main-not-allowed
     :nested-main-not-allowed
     :root-copy-not-allowed
@@ -59,6 +60,7 @@
     :not-head-copy-not-allowed
     :not-component-not-allowed
     :component-nil-objects-not-allowed
+    :non-deleted-component-cannot-have-objects
     :instance-head-not-frame
     :invalid-text-touched
     :misplaced-slot
@@ -326,6 +328,20 @@
                     :component-file (:component-file ref-shape)
                     :component-id (:component-id ref-shape)))))
 
+(defn- check-ref-component-id
+  "Validate that if the copy has not been swwpped, the component-id and component-file are
+   the same as in the referenced shape in the near main."
+  [shape file page libraries]
+  (when (nil? (ctk/get-swap-slot shape))
+    (when-let [ref-shape (ctf/find-ref-shape file page libraries shape :include-deleted? true)]
+      (when (or (not= (:component-id shape) (:component-id ref-shape))
+                (not= (:component-file shape) (:component-file ref-shape)))
+        (report-error :component-id-mismatch
+                      "Nested copy component-id and component-file must be the same as the near main"
+                      shape file page
+                      :component-id (:component-id ref-shape)
+                      :component-file (:component-file ref-shape))))))
+
 (defn- check-empty-swap-slot
   "Validate that this shape does not have any swap slot."
   [shape file page]
@@ -418,6 +434,7 @@
   (check-component-not-main-head shape file page libraries)
   (check-component-not-root shape file page)
   (check-valid-touched shape file page)
+  (check-ref-component-id shape file page libraries)
   ;; We can have situations where the nested copy and the ancestor copy come from different libraries and some of them have been dettached
   ;; so we only validate the shape-ref if the ancestor is from a valid library
   (when library-exists
@@ -648,6 +665,13 @@
                     "Component main not allowed inside other component"
                     main-instance file component-page))))
 
+(defn- check-not-objects
+  [component file]
+  (when (d/not-empty? (:objects component))
+    (report-error :non-deleted-component-cannot-have-objects
+                  "A non-deleted component cannot have shapes inside"
+                  component file nil)))
+
 (defn- check-component
   "Validate semantic coherence of a component. Report all errors found."
   [component file]
@@ -656,7 +680,8 @@
                   "Objects list cannot be nil"
                   component file nil))
   (when-not (:deleted component)
-    (check-main-inside-main component file))
+    (check-main-inside-main component file)
+    (check-not-objects component file))
   (when (:deleted component)
     (check-component-duplicate-swap-slot component file)
     (check-ref-cycles component file))

common/src/app/common/flags.cljc

@@ -169,7 +169,6 @@
    :enable-component-thumbnails
    :enable-render-wasm-dpr
    :enable-token-color
-   :enable-token-shadow
    :enable-inspect-styles
    :enable-feature-fdata-objects-map])
 

common/src/app/common/logic/libraries.cljc

@@ -1769,6 +1769,23 @@
     (pcb/update-shapes changes [(:id dest-shape)] ctk/unhead-shape {:ignore-touched true})
     changes))
 
+(defn- check-swapped-main
+  [changes dest-shape origin-shape]
+  ;; Only for direct updates (from main to copy). Check if the main shape
+  ;; has been swapped. If so, the new component-id and component-file must
+  ;; be put into the copy.
+  (if (and (= (:shape-ref dest-shape) (:id origin-shape))
+           (ctk/instance-head? dest-shape)
+           (ctk/instance-head? origin-shape)
+           (or (not= (:component-id dest-shape) (:component-id origin-shape))
+               (not= (:component-file dest-shape) (:component-file origin-shape))))
+    (pcb/update-shapes changes [(:id dest-shape)]
+                       #(assoc %
+                               :component-id (:component-id origin-shape)
+                               :coponent-file (:component-file origin-shape))
+                       {:ignore-touched true})
+    changes))
+
 (defn- update-attrs
   "The main function that implements the attribute sync algorithm. Copy
   attributes that have changed in the origin shape to the dest shape.
@@ -1811,6 +1828,8 @@
             :always
             (check-detached-main dest-shape origin-shape)
             :always
+            (check-swapped-main dest-shape origin-shape)
+            :always
             (generate-update-tokens container dest-shape origin-shape touched omit-touched? nil))
 
           (let [attr-group        (get ctk/sync-attrs attr)

common/src/app/common/svg.cljc

@@ -546,19 +546,9 @@
            filter-values)))
 
 (defn extract-ids [val]
-  ;; Extract referenced ids from string values like "url(#myId)".
-  ;; Non-string values (maps, numbers, nil, etc.) return an empty seq
-  ;; to avoid re-seq type errors when attributes carry nested structures.
-  (cond
-    (string? val)
+  (when (some? val)
     (->> (re-seq xml-id-regex val)
-         (mapv second))
-
-    (sequential? val)
-    (mapcat extract-ids val)
-
-    :else
-    []))
+         (mapv second))))
 
 (defn fix-dot-number
   "Fixes decimal numbers starting in dot but without leading 0"

common/src/app/common/test_helpers/compositions.cljc

@@ -274,7 +274,7 @@
                      file-id
                      {file-id file}
                      file-id))]
-    (thf/apply-changes file changes)))
+    (thf/apply-changes file changes :validate? false)))
 
 (defn swap-component
   "Swap the specified shape by the component specified by component-tag"
@@ -305,12 +305,13 @@
                       [changes nil])
 
 
-        file' (thf/apply-changes file changes)]
+        file' (thf/apply-changes file changes :validate? (not propagate-fn))]
     (when new-shape-label
       (thi/rm-id! (:id new-shape))
       (thi/set-id! new-shape-label (:id new-shape)))
     (if propagate-fn
-      (propagate-fn file')
+      (-> (propagate-fn file')
+          (thf/validate-file!))
       file')))
 
 (defn swap-component-in-shape [file shape-tag component-tag & {:keys [page-label propagate-fn]}]
@@ -339,9 +340,10 @@
                                       (assoc shape :fills (ths/sample-fills-color :fill-color color)))
                                     (:objects page)
                                     {})
-        file' (thf/apply-changes file changes)]
+        file' (thf/apply-changes file changes :validate? (not propagate-fn))]
     (if propagate-fn
-      (propagate-fn file')
+      (-> (propagate-fn file')
+          (thf/validate-file!))
       file')))
 
 (defn update-bottom-color
@@ -357,9 +359,10 @@
                                       (assoc shape :fills (ths/sample-fills-color :fill-color color)))
                                     (:objects page)
                                     {})
-        file' (thf/apply-changes file changes)]
+        file' (thf/apply-changes file changes :validate? (not propagate-fn))]
     (if propagate-fn
-      (propagate-fn file')
+      (-> (propagate-fn file')
+          (thf/validate-file!))
       file')))
 
 (defn reset-overrides [file shape & {:keys [page-label propagate-fn]}]
@@ -374,9 +377,10 @@
                        {file-id file}
                        (ctn/make-container container :page)
                        (:id shape)))
-        file' (thf/apply-changes file changes)]
+        file' (thf/apply-changes file changes :validate? (not propagate-fn))]
     (if propagate-fn
-      (propagate-fn file')
+      (-> (propagate-fn file')
+          (thf/validate-file!))
       file')))
 
 (defn reset-overrides-in-first-child [file shape-tag & {:keys [page-label propagate-fn]}]
@@ -398,9 +402,10 @@
                                                 #{(-> (ths/get-shape file shape-tag :page-label page-label)
                                                       :id)}
                                                 {})
-        file' (thf/apply-changes file changes)]
+        file' (thf/apply-changes file changes :validate? (not propagate-fn))]
     (if propagate-fn
-      (propagate-fn file')
+      (-> (propagate-fn file')
+          (thf/validate-file!))
       file')))
 
 (defn duplicate-shape [file shape-tag & {:keys [page-label propagate-fn]}]
@@ -419,8 +424,9 @@
                                             (:id file))             ;; file-id
             (cll/generate-duplicate-changes-update-indices (:objects page)  ;; objects
                                                            #{(:id shape)}))
-        file' (thf/apply-changes file changes)]
+        file' (thf/apply-changes file changes :validate? (not propagate-fn))]
     (if propagate-fn
-      (propagate-fn file')
+      (-> (propagate-fn file')
+          (thf/validate-file!))
       file')))
 

common/src/app/common/test_helpers/files.cljc

@@ -54,12 +54,14 @@
   ([file] (validate-file! file {}))
   ([file libraries]
    (cfv/validate-file-schema! file)
-   (cfv/validate-file! file libraries)))
+   (cfv/validate-file! file libraries)
+   file))
 
 (defn apply-changes
-  [file changes]
+  [file changes & {:keys [validate?] :or {validate? true}}]
   (let [file' (ctf/update-file-data file #(cfc/process-changes % (:redo-changes changes) true))]
-    (validate-file! file')
+    (when validate?
+      (validate-file! file'))
     file'))
 
 (defn apply-undo-changes

common/src/app/common/time.cljc

@@ -340,7 +340,7 @@
      (dfn-diff t2 t1)))
 
 #?(:cljs
-   (defn set-default-locale
+   (defn set-default-locale!
      [locale]
      (when-let [locale (unchecked-get locales locale)]
        (dfn-set-default-options #js {:locale locale}))))

common/src/app/common/types/component.cljc

@@ -146,12 +146,15 @@
   "Check if some attribute is one that is involved in component syncrhonization.
    Note that design tokens also are involved, although they go by an alternate
    route and thus they are not part of :sync-attrs.
-   Also when detaching a nested copy it also needs to trigger a synchronization,
-   even though :shape-ref is not a synced attribute per se"
+   Also when detaching a nested copy or it also needs to trigger a synchronization,
+   even though :shape-ref or :component-id are not synced attribute per se"
   [attr]
   (or (get sync-attrs attr)
       (= :shape-ref attr)
-      (= :applied-tokens attr)))
+      (= :applied-tokens attr)
+      (= :component-id attr)
+      (= :component-file attr)
+      (= :component-root attr)))
 
 (defn instance-root?
   "Check if this shape is the head of a top instance."

common/src/app/common/types/components_list.cljc

@@ -60,6 +60,9 @@
                                        (some? objects)
                                        (assoc :objects objects)
 
+                                       (nil? objects)
+                                       (dissoc :objects)
+
                                        (some? modified-at)
                                        (assoc :modified-at modified-at)
 

common/src/app/common/types/file.cljc

@@ -362,24 +362,24 @@
         component           (ctkl/get-component component-file (:component-id top-instance) true)
         remote-shape        (get-ref-shape component-file component shape)
         component-container (get-component-container component-file component)
-        [remote-shape component-container component-file]
+        [remote-shape component-container]
         (if (some? remote-shape)
-          [remote-shape component-container component-file]
+          [remote-shape component-container]
           ;; If not found, try the case of this being a fostered or swapped children
-          (let [head-instance        (ctn/get-head-shape (:objects container) shape)
-                component-file       (get-in libraries [(:component-file head-instance) :data])
-                head-component       (ctkl/get-component component-file (:component-id head-instance) true)
-                remote-shape'        (get-ref-shape component-file head-component shape)
-                component-container' (get-component-container component-file head-component)]
-            [remote-shape' component-container' component-file]))]
+          (let [head-instance       (ctn/get-head-shape (:objects container) shape)
+                component-file      (get-in libraries [(:component-file head-instance) :data])
+                head-component      (ctkl/get-component component-file (:component-id head-instance) true)
+                remote-shape'       (get-ref-shape component-file head-component shape)
+                component-container (get-component-container component-file component)]
+            [remote-shape' component-container]))]
 
     (if (nil? remote-shape)
       nil
       (if (nil? (:shape-ref remote-shape))
         (cond-> remote-shape
           (and remote-shape with-context?)
-          (with-meta {:file {:id (:id component-file)
-                             :data component-file}
+          (with-meta {:file {:id (:id file-data)
+                             :data file-data}
                       :container component-container}))
         (find-remote-shape component-container libraries remote-shape :with-context? with-context?)))))
 

common/src/app/common/types/token.cljc

@@ -59,7 +59,6 @@
    :dimensions      "dimension"
    :font-family     "fontFamilies"
    :font-size       "fontSizes"
-   :font-weight     "fontWeights"
    :letter-spacing  "letterSpacing"
    :number          "number"
    :opacity         "opacity"
@@ -71,6 +70,7 @@
    :stroke-width    "borderWidth"
    :text-case       "textCase"
    :text-decoration "textDecoration"
+   :font-weight     "fontWeights"
    :typography      "typography"})
 
 (def dtcg-token-type->token-type

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

@@ -1410,8 +1410,8 @@ Will return a value that matches this schema:
     ;; NOTE: we can't assign statically at eval time the value of a
     ;; function that is declared but not defined; so we need to pass
     ;; an anonymous function and delegate the resolution to runtime
-    {:encode/json #(some-> % export-dtcg-json)
-     :decode/json #(some-> % read-multi-set-dtcg)
+    {:encode/json #(export-dtcg-json %)
+     :decode/json #(read-multi-set-dtcg %)
      ;; FIXME: add better, more reallistic generator
      :gen/gen (->> (sg/small-int)
                    (sg/fmap (fn [_]
@@ -1545,7 +1545,7 @@ Will return a value that matches this schema:
   (and (not (contains? decoded-json "$metadata"))
        (not (contains? decoded-json "$themes"))))
 
-(defn convert-dtcg-font-family
+(defn- convert-dtcg-font-family
   "Convert font-family token value from DTCG format to internal format.
    - If value is a string, split it into a collection of font families
    - If value is already an array, keep it as is
@@ -1556,7 +1556,7 @@ Will return a value that matches this schema:
     (sequential? value) value
     :else value))
 
-(defn convert-dtcg-typography-composite
+(defn- convert-dtcg-typography-composite
   "Convert typography token value keys from DTCG format to internal format."
   [value]
   (if (map? value)
@@ -1568,7 +1568,7 @@ Will return a value that matches this schema:
     ;; Reference value
     value))
 
-(defn convert-dtcg-shadow-composite
+(defn- convert-dtcg-shadow-composite
   "Convert shadow token value from DTCG format to internal format."
   [value]
   (let [process-shadow (fn [shadow]

common/test/common_tests/logic/comp_detach_with_nested_test.cljc

@@ -465,9 +465,10 @@
                                               page
                                               {(:id file) file}
                                               (thi/id :nested-h-ellipse))
-        file'   (-> (thf/apply-changes file changes)
+        file'   (-> (thf/apply-changes file changes :validate? false)
                     (tho/propagate-component-changes :c-board-with-ellipse)
-                    (tho/propagate-component-changes :c-big-board))
+                    (tho/propagate-component-changes :c-big-board)
+                    (thf/validate-file!))
 
         ;; ==== Get
         nested2-h-ellipse (ths/get-shape file' :nested-h-ellipse)

common/test/common_tests/logic/duplicated_pages_test.cljc

@@ -64,9 +64,8 @@
 
           (reset-all-overrides [file]
             (-> file
-                (tho/reset-overrides-in-first-child :frame-board-1 :page-label :page-1)
-                (tho/reset-overrides-in-first-child :copy-board-1 :page-label :page-2)
-                (propagate-all-component-changes)))
+                (tho/reset-overrides-in-first-child :frame-board-1 :page-label :page-1 :propagate-fn propagate-all-component-changes)
+                (tho/reset-overrides-in-first-child :copy-board-1 :page-label :page-2 :propagate-fn propagate-all-component-changes)))
 
           (fill-colors [file]
             [(tho/bottom-fill-color file :frame-ellipse-1 :page-label :page-1)

common/test/common_tests/logic/multiple_nesting_levels_test.cljc

@@ -56,10 +56,9 @@
 
           (reset-all-overrides [file]
             (-> file
-                (tho/reset-overrides (ths/get-shape file :copy-simple-1))
-                (tho/reset-overrides (ths/get-shape file :copy-frame-composed-1))
-                (tho/reset-overrides (ths/get-shape file :composed-1-composed-2-copy))
-                (propagate-all-component-changes)))
+                (tho/reset-overrides (ths/get-shape file :copy-simple-1 :propagate-fn propagate-all-component-changes))
+                (tho/reset-overrides (ths/get-shape file :copy-frame-composed-1 :propagate-fn propagate-all-component-changes))
+                (tho/reset-overrides (ths/get-shape file :composed-1-composed-2-copy :propagate-fn propagate-all-component-changes))))
 
           (fill-colors [file]
             [(tho/bottom-fill-color file :frame-simple-1)

common/test/common_tests/logic/swap_as_override_test.cljc

@@ -6,20 +6,12 @@
 
 (ns common-tests.logic.swap-as-override-test
   (:require
-   [app.common.files.changes :as ch]
-   [app.common.files.changes-builder :as pcb]
-   [app.common.logic.libraries :as cll]
-   [app.common.logic.shapes :as cls]
-   [app.common.pprint :as pp]
+   [app.common.data :as d]
    [app.common.test-helpers.components :as thc]
    [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.component :as ctk]
-   [app.common.types.container :as ctn]
-   [app.common.types.file :as  ctf]
-   [app.common.uuid :as uuid]
    [clojure.test :as t]))
 
 (t/use-fixtures :each thi/test-fixture)
@@ -27,23 +19,40 @@
 (defn- setup []
   (-> (thf/sample-file :file1)
 
-      (tho/add-simple-component :component-1 :frame-component-1 :child-component-1 :child-params {:name "child-component-1" :type :rect :fills (ths/sample-fills-color :fill-color "#111111")})
-      (tho/add-simple-component :component-2 :frame-component-2 :child-component-2 :child-params {:name "child-component-2" :type :rect :fills (ths/sample-fills-color :fill-color "#222222")})
-      (tho/add-simple-component :component-3 :frame-component-3 :child-component-3 :child-params {:name "child-component-3" :type :rect :fills (ths/sample-fills-color :fill-color "#333333")})
+      (tho/add-simple-component :component-1 :frame-component-1 :child-component-1
+                                :root-params {:name "component-1"}
+                                :child-params {:name "child-component-1"
+                                               :type :rect
+                                               :fills (ths/sample-fills-color :fill-color "#111111")})
+      (tho/add-simple-component :component-2 :frame-component-2 :child-component-2
+                                :root-params {:name "component-2"}
+                                :child-params {:name "child-component-2"
+                                               :type :rect
+                                               :fills (ths/sample-fills-color :fill-color "#222222")})
+      (tho/add-simple-component :component-3 :frame-component-3 :child-component-3
+                                :root-params {:name "component-3"}
+                                :child-params {:name "child-component-3"
+                                               :type :rect
+                                               :fills (ths/sample-fills-color :fill-color "#333333")})
 
-      (tho/add-frame :frame-icon-and-text)
-      (thc/instantiate-component :component-1 :copy-component-1 :parent-label :frame-icon-and-text :children-labels [:component-1-icon-and-text])
+      (tho/add-frame :frame-icon-and-text :name "copy-component-1")
+      (thc/instantiate-component :component-1 :copy-component-1
+                                 :parent-label :frame-icon-and-text
+                                 :children-labels [:component-1-icon-and-text])
       (ths/add-sample-shape :text
                             {:type :text
                              :name "icon+text"
                              :parent-label :frame-icon-and-text})
       (thc/make-component :icon-and-text :frame-icon-and-text)
 
-      (tho/add-frame :frame-panel)
-      (thc/instantiate-component :icon-and-text :copy-icon-and-text :parent-label :frame-panel :children-labels [:icon-and-text-panel])
+      (tho/add-frame :frame-panel :name "icon-and-text")
+      (thc/instantiate-component :icon-and-text :copy-icon-and-text
+                                 :parent-label :frame-panel
+                                 :children-labels [:icon-and-text-panel])
       (thc/make-component :panel :frame-panel)
 
-      (thc/instantiate-component :panel :copy-panel :children-labels [:copy-icon-and-text-panel])))
+      (thc/instantiate-component :panel :copy-panel
+                                 :children-labels [:copy-icon-and-text-panel])))
 
 (defn- propagate-all-component-changes [file]
   (-> file

docker/devenv/files/Caddyfile

@@ -10,7 +10,3 @@ localhost:3449 {
 http://localhost:3450 {
    reverse_proxy localhost:4449
 }
-
-http://penpot-devenv-main:3450 {
-    reverse_proxy localhost:4449
-}

exporter/package.json

@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8",
+  "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
@@ -16,9 +16,9 @@
     "date-fns": "^4.1.0",
     "generic-pool": "^3.9.0",
     "inflation": "^2.1.0",
-    "ioredis": "^5.8.2",
-    "playwright": "^1.57.0",
-    "raw-body": "^3.0.2",
+    "ioredis": "^5.8.1",
+    "playwright": "^1.55.1",
+    "raw-body": "^3.0.1",
     "source-map-support": "^0.5.21",
     "svgo": "penpot/svgo#v3.1",
     "undici": "^7.16.0",

exporter/yarn.lock

@@ -243,7 +243,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bytes@npm:~3.1.2":
+"bytes@npm:3.1.2":
   version: 3.1.2
   resolution: "bytes@npm:3.1.2"
   checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
@@ -442,7 +442,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"depd@npm:~2.0.0":
+"depd@npm:2.0.0, depd@npm:~2.0.0":
   version: 2.0.0
   resolution: "depd@npm:2.0.0"
   checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
@@ -577,9 +577,9 @@ __metadata:
     date-fns: "npm:^4.1.0"
     generic-pool: "npm:^3.9.0"
     inflation: "npm:^2.1.0"
-    ioredis: "npm:^5.8.2"
-    playwright: "npm:^1.57.0"
-    raw-body: "npm:^3.0.2"
+    ioredis: "npm:^5.8.1"
+    playwright: "npm:^1.55.1"
+    raw-body: "npm:^3.0.1"
     source-map-support: "npm:^0.5.21"
     svgo: "penpot/svgo#v3.1"
     undici: "npm:^7.16.0"
@@ -683,16 +683,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-errors@npm:~2.0.1":
-  version: 2.0.1
-  resolution: "http-errors@npm:2.0.1"
+"http-errors@npm:2.0.0":
+  version: 2.0.0
+  resolution: "http-errors@npm:2.0.0"
   dependencies:
-    depd: "npm:~2.0.0"
-    inherits: "npm:~2.0.4"
-    setprototypeof: "npm:~1.2.0"
-    statuses: "npm:~2.0.2"
-    toidentifier: "npm:~1.0.1"
-  checksum: 10c0/fb38906cef4f5c83952d97661fe14dc156cb59fe54812a42cd448fa57b5c5dfcb38a40a916957737bd6b87aab257c0648d63eb5b6a9ca9f548e105b6072712d4
+    depd: "npm:2.0.0"
+    inherits: "npm:2.0.4"
+    setprototypeof: "npm:1.2.0"
+    statuses: "npm:2.0.1"
+    toidentifier: "npm:1.0.1"
+  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
   languageName: node
   linkType: hard
 
@@ -716,6 +716,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iconv-lite@npm:0.7.0":
+  version: 0.7.0
+  resolution: "iconv-lite@npm:0.7.0"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10c0/2382400469071c55b6746c531eed5fa4d033e5db6690b7331fb2a5f59a30d7a9782932e92253db26df33c1cf46fa200a3fbe524a2a7c62037c762283f188ec2f
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:^0.6.2":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
@@ -725,15 +734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:~0.7.0":
-  version: 0.7.0
-  resolution: "iconv-lite@npm:0.7.0"
-  dependencies:
-    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
-  checksum: 10c0/2382400469071c55b6746c531eed5fa4d033e5db6690b7331fb2a5f59a30d7a9782932e92253db26df33c1cf46fa200a3fbe524a2a7c62037c762283f188ec2f
-  languageName: node
-  linkType: hard
-
 "ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
@@ -755,16 +755,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inherits@npm:~2.0.3, inherits@npm:~2.0.4":
+"inherits@npm:2.0.4, inherits@npm:~2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
   languageName: node
   linkType: hard
 
-"ioredis@npm:^5.8.2":
-  version: 5.8.2
-  resolution: "ioredis@npm:5.8.2"
+"ioredis@npm:^5.8.1":
+  version: 5.8.1
+  resolution: "ioredis@npm:5.8.1"
   dependencies:
     "@ioredis/commands": "npm:1.4.0"
     cluster-key-slot: "npm:^1.1.0"
@@ -775,7 +775,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/305e385f811d49908899e32c2de69616cd059f909afd9e0a53e54f596b1a5835ee3449bfc6a3c49afbc5a2fd27990059e316cc78f449c94024957bd34c826d88
+  checksum: 10c0/4ed66444017150da027bce940a24bf726994691e2a7b3aa11d52f8aeb37f258068cc171af4d9c61247acafc28eb086fa8a7c79420b8e8d2907d2f74f39584465
   languageName: node
   linkType: hard
 
@@ -1106,27 +1106,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.57.0":
-  version: 1.57.0
-  resolution: "playwright-core@npm:1.57.0"
+"playwright-core@npm:1.55.1":
+  version: 1.55.1
+  resolution: "playwright-core@npm:1.55.1"
   bin:
     playwright-core: cli.js
-  checksum: 10c0/798e35d83bf48419a8c73de20bb94d68be5dde68de23f95d80a0ebe401e3b83e29e3e84aea7894d67fa6c79d2d3d40cc5bcde3e166f657ce50987aaa2421b6a9
+  checksum: 10c0/39837a8c1232ec27486eac8c3fcacc0b090acc64310f7f9004b06715370fc426f944e3610fe8c29f17cd3d68280ed72c75f660c02aa5b5cf0eb34bab0031308f
   languageName: node
   linkType: hard
 
-"playwright@npm:^1.57.0":
-  version: 1.57.0
-  resolution: "playwright@npm:1.57.0"
+"playwright@npm:^1.55.1":
+  version: 1.55.1
+  resolution: "playwright@npm:1.55.1"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.57.0"
+    playwright-core: "npm:1.55.1"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10c0/ab03c99a67b835bdea9059f516ad3b6e42c21025f9adaa161a4ef6bc7ca716dcba476d287140bb240d06126eb23f889a8933b8f5f1f1a56b80659d92d1358899
+  checksum: 10c0/b84a97b0d764403df512f5bbb10c7343974e151a28202cc06f90883a13e8a45f4491a0597f0ae5fb03a026746cbc0d200f0f32195bfaa381aee5ca5770626771
   languageName: node
   linkType: hard
 
@@ -1161,15 +1161,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "raw-body@npm:3.0.2"
+"raw-body@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "raw-body@npm:3.0.1"
   dependencies:
-    bytes: "npm:~3.1.2"
-    http-errors: "npm:~2.0.1"
-    iconv-lite: "npm:~0.7.0"
-    unpipe: "npm:~1.0.0"
-  checksum: 10c0/d266678d08e1e7abea62c0ce5864344e980fa81c64f6b481e9842c5beaed2cdcf975f658a3ccd67ad35fc919c1f6664ccc106067801850286a6cbe101de89f29
+    bytes: "npm:3.1.2"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.7.0"
+    unpipe: "npm:1.0.0"
+  checksum: 10c0/892f4fbd21ecab7e2fed0f045f7af9e16df7e8050879639d4e482784a2f4640aaaa33d916a0e98013f23acb82e09c2e3c57f84ab97104449f728d22f65a7d79a
   languageName: node
   linkType: hard
 
@@ -1270,7 +1270,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"setprototypeof@npm:~1.2.0":
+"setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
   checksum: 10c0/68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
@@ -1368,10 +1368,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:~2.0.2":
-  version: 2.0.2
-  resolution: "statuses@npm:2.0.2"
-  checksum: 10c0/a9947d98ad60d01f6b26727570f3bcceb6c8fa789da64fe6889908fe2e294d57503b14bf2b5af7605c2d36647259e856635cd4c49eab41667658ec9d0080ec3f
+"statuses@npm:2.0.1":
+  version: 2.0.1
+  resolution: "statuses@npm:2.0.1"
+  checksum: 10c0/34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
   languageName: node
   linkType: hard
 
@@ -1500,7 +1500,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"toidentifier@npm:~1.0.1":
+"toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
   checksum: 10c0/93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
@@ -1539,7 +1539,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unpipe@npm:~1.0.0":
+"unpipe@npm:1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
   checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c

frontend/deps.edn

@@ -8,11 +8,6 @@
   metosin/reitit-core {:mvn/version "0.9.1"}
   funcool/okulary {:mvn/version "2022.04.11-16"}
 
-  funcool/tubax
-  {:git/tag "v2025.11.28"
-   :git/sha "2d9a986"
-   :git/url "https://github.com/funcool/tubax.git"}
-
   funcool/potok2
   {:git/tag "v2.2"
    :git/sha "0f7e15a"
@@ -50,7 +45,7 @@
    {thheller/shadow-cljs {:mvn/version "3.2.2"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}
     org.clojure/tools.namespace {:mvn/version "RELEASE"}
-    criterium/criterium {:mvn/version "0.4.6"}
+    criterium/criterium {:mvn/version "RELEASE"}
     cider/cider-nrepl {:mvn/version "0.57.0"}}}
 
   :shadow-cljs

frontend/package.json

@@ -32,8 +32,8 @@
     "e2e:server": "node ./scripts/e2e-server.js",
     "fmt:clj": "cljfmt fix --parallel=true src/ test/",
     "fmt:clj:check": "cljfmt check --parallel=false src/ test/",
-    "fmt:js": "yarn run prettier -c src/**/*.stories.jsx -c playwright/**/*.js -c scripts/**/*.js -c text-editor/**/*.js -w",
-    "fmt:js:check": "yarn run prettier -c src/**/*.stories.jsx -c playwright/**/*.js -c scripts/**/*.js text-editor/**/*.js",
+    "fmt:js": "yarn run prettier -c src/**/*.stories.jsx -c playwright/**/*.js -c scripts/**/*.js -w",
+    "fmt:js:check": "yarn run prettier -c src/**/*.stories.jsx -c playwright/**/*.js -c scripts/**/*.js",
     "lint:clj": "clj-kondo --parallel --lint src/",
     "lint:scss": "yarn run prettier -c resources/styles -c src/**/*.scss",
     "lint:scss:fix": "yarn run prettier -c resources/styles -c src/**/*.scss -w",
@@ -53,74 +53,83 @@
     "watch:storybook:assets": "node ./scripts/watch-storybook.js"
   },
   "devDependencies": {
-    "@penpot/draft-js": "portal:./packages/draft-js",
-    "@penpot/mousetrap": "portal:./packages/mousetrap",
-    "@penpot/plugins-runtime": "1.3.2",
-    "@penpot/svgo": "penpot/svgo#v3.2",
-    "@penpot/text-editor": "portal:./text-editor",
     "@playwright/test": "1.52.0",
     "@storybook/addon-docs": "10.0.4",
     "@storybook/addon-themes": "10.0.4",
     "@storybook/addon-vitest": "10.0.4",
     "@storybook/react-vite": "10.0.4",
-    "@tokens-studio/sd-transforms": "1.2.11",
     "@types/node": "^22.15.21",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-v8": "3.2.4",
-    "@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",
     "autoprefixer": "^10.4.21",
-    "compression": "^1.8.1",
     "concurrently": "^9.2.1",
-    "date-fns": "^4.1.0",
     "esbuild": "^0.25.9",
-    "eventsource-parser": "^3.0.6",
     "express": "^5.1.0",
     "fancy-log": "^2.0.0",
     "getopts": "^2.3.0",
     "gettext-parser": "^8.0.0",
-    "highlight.js": "^11.10.0",
-    "js-beautify": "^1.15.4",
+    "gulp-concat": "^2.6.1",
+    "gulp-gzip": "^1.4.2",
+    "gulp-mustache": "^5.0.0",
+    "gulp-postcss": "^10.0.0",
+    "gulp-rename": "^2.0.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-svg-sprite": "^2.0.3",
     "jsdom": "^27.0.0",
-    "lodash": "^4.17.21",
-    "lodash.debounce": "^4.0.8",
     "map-stream": "0.0.7",
     "marked": "^15.0.12",
     "mkdirp": "^3.0.1",
     "mustache": "^4.2.0",
     "nodemon": "^3.1.10",
     "npm-run-all": "^4.1.5",
-    "opentype.js": "^1.3.4",
     "p-limit": "^6.2.0",
     "playwright": "1.56.1",
     "postcss": "^8.5.4",
     "postcss-clean": "^1.2.2",
-    "postcss-modules": "^6.0.1",
     "prettier": "3.5.3",
     "pretty-time": "^1.1.0",
     "prop-types": "^15.8.1",
+    "rimraf": "^6.0.1",
+    "sass": "^1.89.0",
+    "sass-embedded": "^1.89.0",
+    "storybook": "10.0.4",
+    "svg-sprite": "^2.0.4",
+    "typescript": "^5.9.2",
+    "vite": "^6.3.5",
+    "vitest": "^3.2.0",
+    "wasm-pack": "^0.13.1",
+    "watcher": "^2.3.1",
+    "workerpool": "^9.3.2"
+  },
+  "dependencies": {
+    "@penpot/draft-js": "portal:./vendor/draft-js",
+    "@penpot/hljs": "portal:./vendor/hljs",
+    "@penpot/mousetrap": "portal:./vendor/mousetrap",
+    "@penpot/plugins-runtime": "1.3.2",
+    "@penpot/svgo": "penpot/svgo#v3.2",
+    "@penpot/text-editor": "portal:./text-editor",
+    "@tokens-studio/sd-transforms": "1.2.11",
+    "@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",
+    "compression": "^1.8.1",
+    "date-fns": "^4.1.0",
+    "eventsource-parser": "^3.0.6",
+    "js-beautify": "^1.15.4",
+    "lodash": "^4.17.21",
+    "lodash.debounce": "^4.0.8",
+    "opentype.js": "^1.3.4",
+    "postcss-modules": "^6.0.1",
     "randomcolor": "^0.6.2",
     "react": "19.1.1",
     "react-dom": "19.1.1",
     "react-error-boundary": "^6.0.0",
     "react-virtualized": "^9.22.6",
-    "rimraf": "^6.0.1",
     "rxjs": "8.0.0-alpha.14",
-    "sass": "^1.89.0",
-    "sass-embedded": "^1.89.0",
     "sax": "^1.4.1",
     "source-map-support": "^0.5.21",
-    "storybook": "10.0.4",
     "style-dictionary": "5.0.0-rc.1",
-    "svg-sprite": "^2.0.4",
     "tdigest": "^0.1.2",
     "tinycolor2": "^1.6.0",
-    "typescript": "^5.9.2",
     "ua-parser-js": "2.0.5",
-    "vite": "^6.3.5",
-    "vitest": "^3.2.0",
-    "wasm-pack": "^0.13.1",
-    "watcher": "^2.3.1",
-    "workerpool": "^9.3.2",
     "xregexp": "^5.1.2"
   }
 }

frontend/playwright/data/dashboard/get-team-deleted-files-empty.json

@@ -1 +0,0 @@
-[]

frontend/playwright/data/dashboard/get-team-deleted-files.json

@@ -1,47 +0,0 @@
-[
-  {
-    "~:id": "~uc7ce0794-0992-8105-8004-38e630f41234",
-    "~:revn": 1,
-    "~:vern": 1,
-    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920b",
-    "~:created-at": "~m1705307400000",
-    "~:modified-at": "~m1732111500000",
-    "~:deleted-at": "~m1732111500000",
-    "~:name": "Deleted Design File 1",
-    "~:is-shared": false,
-    "~:will-be-deleted-at": "~m1732716300000",
-    "~:thumbnail-id": null,
-    "~:row-num": 1,
-    "~:team-id": "~uc7ce0794-0992-8105-8004-38e630f40f6d"
-  },
-  {
-    "~:id": "~uc7ce0794-0992-8105-8004-38e630f41235",
-    "~:revn": 2,
-    "~:vern": 2,
-    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920b",
-    "~:created-at": "~m1704875700000",
-    "~:modified-at": "~m1732025400000",
-    "~:deleted-at": "~m1732025400000",
-    "~:name": "Deleted Design File 2",
-    "~:is-shared": true,
-    "~:will-be-deleted-at": "~m1732630200000",
-    "~:thumbnail-id": null,
-    "~:row-num": 2,
-    "~:team-id": "~uc7ce0794-0992-8105-8004-38e630f40f6d"
-  },
-  {
-    "~:id": "~uc7ce0794-0992-8105-8004-38e630f41236",
-    "~:revn": 3,
-    "~:vern": 3,
-    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920c",
-    "~:created-at": "~m1706792400000",
-    "~:modified-at": "~m1731939600000",
-    "~:deleted-at": "~m1731939600000",
-    "~:name": "Old Project Design",
-    "~:is-shared": false,
-    "~:will-be-deleted-at": "~m1732544400000",
-    "~:thumbnail-id": null,
-    "~:row-num": 3,
-    "~:team-id": "~uc7ce0794-0992-8105-8004-38e630f40f6d"
-  }
-]

frontend/playwright/helpers/Clipboard.js

@@ -1,12 +1,12 @@
 export class Clipboard {
   static Permission = {
-    ONLY_READ: ["clipboard-read"],
-    ONLY_WRITE: ["clipboard-write"],
-    ALL: ["clipboard-read", "clipboard-write"],
-  };
+    ONLY_READ: ['clipboard-read'],
+    ONLY_WRITE: ['clipboard-write'],
+    ALL: ['clipboard-read', 'clipboard-write']
+  }
 
   static enable(context, permissions) {
-    return context.grantPermissions(permissions);
+    return context.grantPermissions(permissions)
   }
 
   static writeText(page, text) {
@@ -18,8 +18,8 @@ export class Clipboard {
   }
 
   constructor(page, context) {
-    this.page = page;
-    this.context = context;
+    this.page = page
+    this.context = context
   }
 
   enable(permissions) {

frontend/playwright/helpers/Transit.js

@@ -1,16 +1,18 @@
 export class Transit {
   static parse(value) {
-    if (typeof value !== "string") return value;
+    if (typeof value !== 'string')
+      return value
 
-    if (value.startsWith("~")) return value.slice(2);
+    if (value.startsWith('~'))
+      return value.slice(2)
 
-    return value;
+    return value
   }
 
   static get(object, ...path) {
     let aux = object;
     for (const name of path) {
-      if (typeof name !== "string") {
+      if (typeof name !== 'string') {
         if (!(name in aux)) {
           return undefined;
         }

frontend/playwright/ui/pages/BasePage.js

@@ -9,7 +9,7 @@ export class BasePage {
    */
   static async mockRPCs(page, paths, options) {
     for (const [path, jsonFilename] of Object.entries(paths)) {
-      await this.mockRPC(page, path, jsonFilename, options);
+      await this.mockRPC(page, path, jsonFilename, options)
     }
   }
 

frontend/playwright/ui/pages/DashboardPage.js

@@ -106,13 +106,6 @@ export class DashboardPage extends BaseWebSocketPage {
     );
   }
 
-  async setupDeletedFiles() {
-    await this.mockRPC(
-      "get-team-deleted-files?team-id=*",
-      "dashboard/get-team-deleted-files.json",
-    );
-  }
-
   async setupDrafts() {
     await this.mockRPC(
       "get-project-files?project-id=*",
@@ -167,10 +160,6 @@ export class DashboardPage extends BaseWebSocketPage {
     });
     await this.mockRPC("search-files", "dashboard/search-files.json");
     await this.mockRPC("get-teams", "logged-in-user/get-teams-complete.json");
-    await this.mockRPC(
-      "get-team-deleted-files?team-id=*",
-      "dashboard/get-team-deleted-files.json",
-    );
   }
 
   async setupAccessTokensEmpty() {
@@ -300,13 +289,6 @@ export class DashboardPage extends BaseWebSocketPage {
     await expect(this.mainHeading).toHaveText("Libraries");
   }
 
-  async goToDeleted() {
-    await this.page.goto(
-      `#/dashboard/deleted?team-id=${DashboardPage.anyTeamId}`,
-    );
-    await expect(this.mainHeading).toHaveText("Projects");
-  }
-
   async openProfileMenu() {
     await this.userAccount.click();
   }

frontend/playwright/ui/pages/WorkspacePage.js

@@ -1,7 +1,7 @@
 import { expect } from "@playwright/test";
-import { readFile } from "node:fs/promises";
+import { readFile } from 'node:fs/promises';
 import { BaseWebSocketPage } from "./BaseWebSocketPage";
-import { Transit } from "../../helpers/Transit";
+import { Transit } from '../../helpers/Transit';
 
 export class WorkspacePage extends BaseWebSocketPage {
   static TextEditor = class TextEditor {

frontend/playwright/ui/specs/dashboard-deleted.spec.js

@@ -1,31 +0,0 @@
-import { test, expect } from "@playwright/test";
-import DashboardPage from "../pages/DashboardPage";
-
-test.beforeEach(async ({ page }) => {
-  await DashboardPage.init(page);
-  await DashboardPage.mockRPC(
-    page,
-    "get-profile",
-    "logged-in-user/get-profile-logged-in-no-onboarding.json",
-  );
-});
-
-test.describe("Dashboard Deleted Page", () => {
-  test("User can navigate to deleted page", async ({ page }) => {
-    const dashboardPage = new DashboardPage(page);
-
-    // Setup mock for deleted files API
-    await dashboardPage.setupDeletedFiles();
-
-    // Navigate directly to deleted page
-    await dashboardPage.goToDeleted();
-
-    // Check for the restore all and clear trash buttons
-    await expect(
-      page.getByRole("button", { name: "Restore All" }),
-    ).toBeVisible();
-    await expect(
-      page.getByRole("button", { name: "Clear trash" }),
-    ).toBeVisible();
-  });
-});

frontend/playwright/ui/specs/render-wasm.spec.js

@@ -51,7 +51,7 @@ test.skip("BUG 12164 - Crash when trying to fetch a missing font", async ({
     pageId: "2b7f0188-51a1-8193-8006-e05bad87b74d",
   });
 
-  await workspacePage.page.waitForTimeout(1000);
+  await workspacePage.page.waitForTimeout(1000)
   await workspacePage.waitForFirstRender();
 
   await expect(

frontend/playwright/ui/specs/text-editor-v2.spec.js

@@ -1,5 +1,5 @@
 import { test, expect } from "@playwright/test";
-import { Clipboard } from "../../helpers/Clipboard";
+import { Clipboard } from '../../helpers/Clipboard';
 import { WorkspacePage } from "../pages/WorkspacePage";
 
 const timeToWait = 100;
@@ -11,14 +11,14 @@ test.beforeEach(async ({ page, context }) => {
   await WorkspacePage.mockConfigFlags(page, ["enable-feature-text-editor-v2"]);
 });
 
-test.afterEach(async ({ context }) => {
+test.afterEach(async ({ context}) => {
   context.clearPermissions();
-});
+})
 
 test("Create a new text shape", async ({ page }) => {
   const initialText = "Lorem ipsum";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.goToWorkspace();
@@ -36,7 +36,10 @@ test("Create a new text shape from pasting text", async ({ page, context }) => {
     textEditor: true,
   });
   await workspace.setupEmptyFile();
-  await workspace.mockRPC("update-file?id=*", "text-editor/update-file.json");
+  await workspace.mockRPC(
+    "update-file?id=*",
+    "text-editor/update-file.json",
+  );
   await workspace.goToWorkspace();
 
   await Clipboard.writeText(page, textToPaste);
@@ -52,13 +55,10 @@ test("Create a new text shape from pasting text", async ({ page, context }) => {
   await workspace.textEditor.stopEditing();
 });
 
-test("Create a new text shape from pasting text using context menu", async ({
-  page,
-  context,
-}) => {
+test("Create a new text shape from pasting text using context menu", async ({ page, context }) => {
   const textToPaste = "Lorem ipsum";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.goToWorkspace();
@@ -72,13 +72,11 @@ test("Create a new text shape from pasting text using context menu", async ({
   expect(textContent).toBe(textToPaste);
 
   await workspace.textEditor.stopEditing();
-});
+})
 
-test("Update an already created text shape by appending text", async ({
-  page,
-}) => {
+test("Update an already created text shape by appending text", async ({ page }) => {
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -96,7 +94,7 @@ test("Update an already created text shape by prepending text", async ({
   page,
 }) => {
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -114,7 +112,7 @@ test("Update an already created text shape by inserting text in between", async
   page,
 }) => {
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -128,13 +126,10 @@ test("Update an already created text shape by inserting text in between", async
   await workspace.textEditor.stopEditing();
 });
 
-test("Update a new text shape appending text by pasting text", async ({
-  page,
-  context,
-}) => {
+test("Update a new text shape appending text by pasting text", async ({ page, context }) => {
   const textToPaste = " dolor sit amet";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -152,12 +147,11 @@ test("Update a new text shape appending text by pasting text", async ({
 });
 
 test("Update a new text shape prepending text by pasting text", async ({
-  page,
-  context,
+  page, context
 }) => {
   const textToPaste = "Dolor sit amet ";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -179,7 +173,7 @@ test("Update a new text shape replacing (starting) text with pasted text", async
 }) => {
   const textToPaste = "Dolor sit amet";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -203,7 +197,7 @@ test("Update a new text shape replacing (ending) text with pasted text", async (
 }) => {
   const textToPaste = "dolor sit amet";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -227,7 +221,7 @@ test("Update a new text shape replacing (in between) text with pasted text", asy
 }) => {
   const textToPaste = "dolor sit amet";
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
@@ -250,11 +244,14 @@ test("Update text font size selecting a part of it (starting)", async ({
   page,
 }) => {
   const workspace = new WorkspacePage(page, {
-    textEditor: true,
+    textEditor: true
   });
   await workspace.setupEmptyFile();
   await workspace.mockGetFile("text-editor/get-file-lorem-ipsum.json");
-  await workspace.mockRPC("update-file?id=*", "text-editor/update-file.json");
+  await workspace.mockRPC(
+    "update-file?id=*",
+    "text-editor/update-file.json",
+  );
   await workspace.goToWorkspace();
   await workspace.clickLeafLayer("Lorem ipsum");
   await workspace.textEditor.startEditing();
@@ -283,10 +280,7 @@ test.skip("Update text line height selecting a part of it (starting)", async ({
   await workspace.textEditor.selectFromStart(5);
   await workspace.textEditor.changeLineHeight(1.4);
 
-  const lineHeight = await workspace.textEditor.waitForParagraphStyle(
-    1,
-    "line-height",
-  );
+  const lineHeight = await workspace.textEditor.waitForParagraphStyle(1, 'line-height');
   expect(lineHeight).toBe("1.4");
 
   const textContent = await workspace.textEditor.waitForTextSpanContent();

frontend/resources/templates/index.mustache

@@ -24,8 +24,6 @@
 
     <link rel="icon" href="images/favicon.png" />
 
-    <script type="importmap">{{& manifest.importmap }}</script>
-
     <script type="module">
       globalThis.penpotVersion = "{{& version}}";
       globalThis.penpotBuildDate = "{{& build_date}}";
@@ -35,6 +33,7 @@
     {{# manifest}}
     <script src="{{& config}}"></script>
     <script src="{{& polyfills}}"></script>
+    <script type="importmap">{{& importmap }}</script>
     {{/manifest}}
 
     <!--cookie-consent-->
@@ -50,9 +49,7 @@
     <script type="module" src="{{& libs}}"></script>
     <script type="module">
       import { init } from "{{& app_main}}";
-      import defaultTranslations from "{{& default_translations}}";
-
-      init({defaultTranslations});
+      init();
     </script>
     {{/manifest}}
   </body>

frontend/scripts/_helpers.js

@@ -187,7 +187,7 @@ async function readManifestFile(resource) {
   return JSON.parse(content);
 }
 
-async function generateManifest() {
+async function readShadowManifest() {
   const index = {
     app_main: "./js/main.js",
     render_main: "./js/render.js",
@@ -197,7 +197,6 @@ async function generateManifest() {
     polyfills: "./js/polyfills.js?version=" + CURRENT_VERSION,
     libs: "./js/libs.js?version=" + CURRENT_VERSION,
     worker_main: "./js/worker/main.js?version=" + CURRENT_VERSION,
-    default_translations: "./js/translation.en.js?version=" + CURRENT_VERSION,
 
     importmap: JSON.stringify({
       "imports": {
@@ -277,7 +276,6 @@ export async function compileTranslations() {
     "id",
     "ru",
     "tr",
-    "hi",
     "zh_CN",
     "zh_Hant",
     "hr",
@@ -393,7 +391,7 @@ async function generateTemplates() {
   const isDebug = process.env.NODE_ENV !== "production";
   await fs.mkdir("./resources/public/", { recursive: true });
 
-  const manifest = await generateManifest();
+  const manifest = await readShadowManifest();
   let content;
 
   const iconsSprite = await fs.readFile(

frontend/scripts/build

@@ -20,26 +20,25 @@ echo $PATH
 set -ex
 
 corepack enable;
-corepack install;
+corepack install || exit 1;
 yarn install || exit 1;
 
-rm -rf target/dist;
 rm -rf resources/public;
+rm -rf target/dist;
 
 mkdir -p resources/public;
 mkdir -p target/dist;
 
-pushd ../render-wasm;
-./build
-popd
-
 yarn run build:app:main $EXTRA_PARAMS;
-yarn run build:app:libs;
-yarn run build:app:assets;
 
-sed -i "s/\.\/render.js/.\/render.js?version=$CURRENT_VERSION/g" resources/public/js/worker/main*.js
+if [ "$INCLUDE_WASM" = "yes" ];  then
+    yarn run build:wasm || exit 1;
+fi
 
-rsync -avr resources/public/ target/dist/
+yarn run build:app:libs || exit 1;
+yarn run build:app:assets || exit 1;
+
+rsync -avr resources/public/ target/dist/;
 
 if [ "$INCLUDE_STORYBOOK" = "yes" ];  then
     # build storybook

frontend/shadow-cljs.edn

@@ -92,7 +92,7 @@
    {:main
     {:entries [app.worker]
      :web-worker true
-     :prepend-js "importScripts('./render.js');"
+     :prepend-js "importScripts('/js/worker/render.js');"
      :depends-on #{}}}
 
    :js-options

frontend/src/app/main.cljs

@@ -90,10 +90,7 @@
             (rx/map #(ws/initialize)))))))
 
 (defn ^:export init
-  [options]
-  (some-> (unchecked-get options "defaultTranslations")
-          (i18n/set-default-translations))
-
+  []
   (mw/init!)
   (i18n/init)
   (cur/init-styles)

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

@@ -386,21 +386,3 @@
         (rx/of ::dps/force-persist
                (rt/nav :viewer params options))))))
 
-(defn go-to-dashboard-deleted
-  [& {:keys [team-id] :as options}]
-  (ptk/reify ::go-to-dashboard-deleted
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [profile (get state :profile)
-            team-id (cond
-                      (= :default team-id)
-                      (:default-team-id profile)
-
-                      (uuid? team-id)
-                      team-id
-
-                      :else
-                      (:current-team-id state))
-            params  {:team-id team-id}]
-        (rx/of (modal/hide)
-               (rt/nav :dashboard-deleted params options))))))

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

@@ -21,7 +21,6 @@
    [app.main.data.modal :as modal]
    [app.main.data.websocket :as dws]
    [app.main.repo :as rp]
-   [app.main.store :as st]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.sse :as sse]
    [beicon.v2.core :as rx]
@@ -77,8 +76,7 @@
     ptk/UpdateEvent
     (update [_ state]
       (reduce (fn [state {:keys [id] :as project}]
-                  ;; Replace completely instead of merge to ensure deleted-at is removed
-                (assoc-in state [:projects id] project))
+                (update-in state [:projects id] merge project))
               state
               projects))))
 
@@ -154,34 +152,6 @@
       (->> (rp/cmd! :get-builtin-templates)
            (rx/map builtin-templates-fetched)))))
 
-;; --- EVENT: deleted-files
-
-(defn- deleted-files-fetched
-  [files]
-  (ptk/reify ::deleted-files-fetched
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [now (ct/now)
-            filtered-files (filterv (fn [file]
-                                      (let [will-be-deleted-at (:will-be-deleted-at file)]
-                                        (or (nil? will-be-deleted-at)
-                                            (ct/is-after? will-be-deleted-at now))))
-                                    files)
-            files (d/index-by :id filtered-files)]
-        (-> state
-            (assoc :deleted-files files)
-            (update :files d/merge files))))))
-
-(defn fetch-deleted-files
-  ([] (fetch-deleted-files nil))
-  ([team-id]
-   (ptk/reify ::fetch-deleted-files
-     ptk/WatchEvent
-     (watch [_ state _]
-       (when-let [team-id (or team-id (:current-team-id state))]
-         (->> (rp/cmd! :get-team-deleted-files {:team-id team-id})
-              (rx/map deleted-files-fetched)))))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Data Selection
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -490,7 +460,6 @@
         (-> state
             (d/update-in-when [:files file-id] assoc :thumbnail-id thumbnail-id)
             (d/update-in-when [:recent-files file-id] assoc :thumbnail-id thumbnail-id)
-            (d/update-in-when [:deleted-files file-id] assoc :thumbnail-id thumbnail-id)
             (d/update-when :dashboard-search-result update-search-files))))))
 
 ;; --- EVENT: create-file
@@ -687,156 +656,3 @@
     :team-role-change       (handle-change-team-role msg)
     :team-membership-change (dcm/team-membership-change msg)
     nil))
-
-
-;; --- Delete files immediately
-
-(defn delete-files-immediately
-  [{:keys [team-id ids] :as params}]
-  (assert (uuid? team-id))
-  (assert (set? ids))
-  (assert (every? uuid? ids))
-
-  (ptk/reify ::delete-files-immediately
-    ev/Event
-    (-data [_]
-      {:team-id team-id
-       :num-files (count ids)})
-
-    ptk/WatchEvent
-    (watch [_ _ _]
-      (let [{:keys [on-success on-error]
-             :or {on-success identity
-                  on-error rx/throw}} (meta params)]
-        (->> (rp/cmd! :permanently-delete-team-files {:team-id team-id :ids ids})
-             (rx/tap on-success)
-             (rx/catch on-error))))))
-
-;; --- Restore deleted files immediately
-
-(defn- initialize-restore-status
-  [files]
-  (ptk/reify ::init-restore-status
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [restore-state {:in-progress true
-                           :healthy? true
-                           :error false
-                           :progress 0
-                           :widget-visible true
-                           :detail-visible true
-                           :files files
-                           :last-update (ct/now)
-                           :cmd :restore-files}]
-        (assoc state :restore restore-state)))))
-
-(defn- update-restore-status
-  [{:keys [index total] :as data}]
-  (ptk/reify ::upd-restore-status
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [time-diff (ct/diff-ms (get-in state [:restore :last-update]) (ct/now))
-            healthy?  (< time-diff 6000)]
-        (update state :restore assoc
-                :progress index
-                :total total
-                :last-update (ct/now)
-                :healthy? healthy?)))))
-
-(defn- complete-restore-status
-  []
-  (ptk/reify ::comp-restore-status
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [total (get-in state [:restore :total])]
-        (update state :restore assoc
-                :in-progress false
-                :progress total  ; Ensure progress equals total on completion
-                :last-update (ct/now))))))
-
-(defn- error-restore-status
-  [error]
-  (ptk/reify ::err-restore-status
-    ptk/UpdateEvent
-    (update [_ state]
-      (update state :restore assoc
-              :in-progress false
-              :error error
-              :last-update (ct/now)
-              :healthy? false))))
-
-(defn toggle-restore-detail-visibility
-  []
-  (ptk/reify ::toggle-restore-detail
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:restore :detail-visible] not))))
-
-(defn retry-last-restore
-  []
-  (ptk/reify ::retry-restore
-    ptk/UpdateEvent
-    (update [_ state]
-      ;; Reset restore state for retry - actual retry will be handled by UI
-      (if (get state :restore)
-        (update state :restore assoc :error false :in-progress false)
-        state))))
-
-(defn clear-restore-state
-  []
-  (ptk/reify ::clear-restore
-    ptk/UpdateEvent
-    (update [_ state]
-      (dissoc state :restore))))
-
-(defn- projects-restored
-  [team-id]
-  (ptk/reify ::projects-restored
-    ptk/WatchEvent
-    (watch [_ _ _]
-      ;; Refetch projects to get the updated state without deleted-at
-      (rx/of (fetch-projects team-id)))))
-
-(defn restore-files-immediately
-  [{:keys [team-id ids] :as params}]
-  (dm/assert! (uuid? team-id))
-  (dm/assert! (set? ids))
-  (dm/assert! (every? uuid? ids))
-
-  (ptk/reify ::restore-files-immediately
-    ev/Event
-    (-data [_]
-      {:team-id team-id
-       :num-files (count ids)})
-
-    ptk/WatchEvent
-    (watch [_ _ _]
-      (let [{:keys [on-success on-error]
-             :or {on-success identity
-                  on-error rx/throw}} (meta params)
-            files (mapv #(hash-map :id %) ids)]
-
-        (rx/merge
-         (rx/of (initialize-restore-status files))
-
-         (->> (rp/cmd! ::sse/restore-deleted-team-files {:team-id team-id :ids ids})
-              (rx/tap (fn [event]
-                        (let [payload (sse/get-payload event)
-                              type    (sse/get-type event)]
-                          (when (and payload (= type "progress"))
-                            (let [{:keys [index total]} payload]
-                              (when (and index total)
-                                ;; Dispatch progress update
-                                (st/emit! (update-restore-status {:index index :total total}))))))))
-              (rx/filter sse/end-of-stream?)
-              (rx/map sse/get-payload)
-              (rx/tap on-success)
-              (rx/mapcat (fn [_]
-                           (rx/of (complete-restore-status)
-                                  (projects-restored team-id))))
-              (rx/catch (fn [error]
-                          (rx/concat
-                           (rx/of (error-restore-status (ex-message error)))
-                           (on-error error)))))
-
-         (rx/of (ptk/data-event ::restore-start {:total (count ids)})))))))

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

@@ -98,7 +98,9 @@
 (def context
   (atom (d/without-nils (collect-context))))
 
-(add-watch i18n/locale "events" #(swap! context assoc :locale %4))
+(add-watch i18n/state "events"
+           (fn [_ _ _ v]
+             (swap! context assoc :locale (get v :locale))))
 
 ;; --- EVENT TRANSLATION
 

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

@@ -24,8 +24,6 @@
 (def revn-data (atom {}))
 (def queue-conj (fnil conj #queue []))
 
-(def force-persist? #(= % ::force-persist))
-
 (defn- update-status
   [status]
   (ptk/reify ::update-status

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

@@ -32,7 +32,7 @@
    [app.main.data.helpers :as dsh]
    [app.main.data.modal :as modal]
    [app.main.data.notifications :as ntf]
-   [app.main.data.persistence :as dps]
+   [app.main.data.persistence :as-alias dps]
    [app.main.data.plugins :as dp]
    [app.main.data.profile :as du]
    [app.main.data.project :as dpj]
@@ -67,7 +67,6 @@
    [app.main.errors]
    [app.main.features :as features]
    [app.main.features.pointer-map :as fpmap]
-   [app.main.refs :as refs]
    [app.main.repo :as rp]
    [app.main.router :as rt]
    [app.render-wasm :as wasm]
@@ -270,12 +269,8 @@
   (ptk/reify ::process-wasm-object
     ptk/EffectEvent
     (effect [_ state _]
-      (let [objects (dsh/lookup-page-objects state)
-            shape (get objects id)]
-        ;; Only process objects that exist in the current page
-        ;; This prevents errors when processing changes from other pages
-        (when shape
-          (wasm.api/process-object shape))))))
+      (let [objects (dsh/lookup-page-objects state)]
+        (wasm.api/process-object (get objects id))))))
 
 (defn initialize-workspace
   [team-id file-id]
@@ -384,59 +379,6 @@
                           (->> (rx/from added)
                                (rx/map process-wasm-object)))))))
 
-              (when render-wasm?
-                (let [local-commits-s
-                      (->> stream
-                           (rx/filter dch/commit?)
-                           (rx/map deref)
-                           (rx/filter #(and (= :local (:source %))
-                                            (not (contains? (:tags %) :position-data))))
-                           (rx/filter (complement empty?)))
-
-                      notifier-s
-                      (rx/merge
-                       (->> local-commits-s (rx/debounce 1000))
-                       (->> stream (rx/filter dps/force-persist?)))
-
-                      objects-s
-                      (rx/from-atom refs/workspace-page-objects {:emit-current-value? true})
-
-                      current-page-id-s
-                      (rx/from-atom refs/current-page-id {:emit-current-value? true})]
-
-                  (->> local-commits-s
-                       (rx/buffer-until notifier-s)
-                       (rx/with-latest-from objects-s)
-                       (rx/map
-                        (fn [[commits objects]]
-                          (->> commits
-                               (mapcat :redo-changes)
-                               (filter #(contains? #{:mod-obj :add-obj} (:type %)))
-                               (filter #(cfh/text-shape? objects (:id %)))
-                               (map #(vector
-                                      (:id %)
-                                      (wasm.api/calculate-position-data (get objects (:id %))))))))
-
-                       (rx/with-latest-from current-page-id-s)
-                       (rx/map
-                        (fn [[text-position-data page-id]]
-                          (let [changes
-                                (->> text-position-data
-                                     (mapv (fn [[id position-data]]
-                                             {:type :mod-obj
-                                              :id id
-                                              :page-id page-id
-                                              :operations
-                                              [{:type :set
-                                                :attr :position-data
-                                                :val position-data
-                                                :ignore-touched true
-                                                :ignore-geometry true}]})))]
-                            (dch/commit-changes
-                             {:redo-changes changes :undo-changes []
-                              :save-undo? false
-                              :tags #{:position-data}})))))))
-
               (->> stream
                    (rx/filter dch/commit?)
                    (rx/map deref)

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

@@ -14,7 +14,7 @@
    [app.common.types.fills :as types.fills]
    [app.common.types.library :as ctl]
    [app.common.types.shape :as shp]
-   [app.common.types.shape.shadow :as types.shadow]
+   [app.common.types.shape.shadow :refer [check-shadow]]
    [app.common.types.text :as txt]
    [app.main.broadcast :as mbc]
    [app.main.data.helpers :as dsh]
@@ -406,30 +406,30 @@
 
 (defn change-shadow
   [ids attrs index]
-  (letfn [(update-shadow [shape]
-            (let [;; If we try to set a gradient to a shadow (for
-                  ;; example using the color selection from
-                  ;; multiple shapes) let's use the first stop
-                  ;; color
-                  attrs  (cond-> attrs
-                           (:gradient attrs)
-                           (-> (dm/get-in [:gradient :stops 0])
-                               (select-keys types.shadow/color-attrs)))
+  (ptk/reify ::change-shadow
+    ptk/WatchEvent
+    (watch [_ _ _]
+      (rx/of (dwsh/update-shapes
+              ids
+              (fn [shape]
+                (let [;; If we try to set a gradient to a shadow (for
+                      ;; example using the color selection from
+                      ;; multiple shapes) let's use the first stop
+                      ;; color
+                      attrs  (cond-> attrs
+                               (:gradient attrs)
+                               (dm/get-in [:gradient :stops 0]))
 
-                  attrs' (-> (dm/get-in shape [:shadow index :color])
-                             (merge attrs)
-                             (d/without-nils))]
-              (assoc-in shape [:shadow index :color] attrs')))]
-    (ptk/reify ::change-shadow
-      ptk/WatchEvent
-      (watch [_ _ _]
-        (rx/of (dwsh/update-shapes ids update-shadow))))))
+                      attrs' (-> (dm/get-in shape [:shadow index :color])
+                                 (merge attrs)
+                                 (d/without-nils))]
+                  (assoc-in shape [:shadow index :color] attrs'))))))))
 
 (defn add-shadow
   [ids shadow]
 
   (assert
-   (types.shadow/check-shadow shadow)
+   (check-shadow shadow)
    "expected a valid shadow struct")
 
   (assert
@@ -1146,16 +1146,16 @@
 (defn- shadow->color-attr
   "Given a stroke map enriched with :shape-id, :index, and optionally
      :has-token-applied / :token-name, returns a color attribute map.
-
+  
      If :has-token-applied is true, adds token metadata to :attrs:
        {:has-token-applied true
         :token-name <token-name>}
-
+  
      Args:
      - stroke: map with stroke info, including :shape-id and :index
      - file-id: current file UUID
      - libraries: map of shared color libraries
-
+  
      Returns:
      A map like:
      {:attrs {...color data...}
@@ -1260,12 +1260,12 @@
      will include extra attributes in its :attrs map:
        {:has-token-applied true
         :token-name <token-name>}
-
+  
      Args:
      - shapes: vector of shape maps
      - file-id: current file UUID
      - libraries: map of shared color libraries
-
+  
      Returns:
      A vector of color attribute maps with metadata for each shape."
   [shapes file-id libraries]

frontend/src/app/main/refs.cljs

@@ -30,9 +30,6 @@
 (def profile
   (l/derived (l/key :profile) st/state))
 
-(def current-page-id
-  (l/derived (l/key :current-page-id) st/state))
-
 (def team
   (l/derived (fn [state]
                (let [team-id (:current-team-id state)
@@ -636,6 +633,3 @@
 
 (def persistence-state
   (l/derived (comp :status :persistence) st/state))
-
-(def restore
-  (l/derived :restore st/state))

frontend/src/app/main/repo.cljs

@@ -87,9 +87,6 @@
    {:stream? true
     :form-data? true}
 
-   ::sse/restore-deleted-team-files
-   {:stream? true}
-
    :export-binfile {:response-type :blob}
    :retrieve-list-of-builtin-templates {:query-params :all}})
 

frontend/src/app/main/ui.cljs

@@ -224,8 +224,7 @@
         :dashboard-members
         :dashboard-invitations
         :dashboard-webhooks
-        :dashboard-settings
-        :dashboard-deleted)
+        :dashboard-settings)
        (let [params        (get params :query)
              team-id       (some-> params :team-id uuid/parse*)
              project-id    (some-> params :project-id uuid/parse*)

frontend/src/app/main/ui/components/select.cljs

@@ -60,7 +60,6 @@
         current-id    (get state :id)
         current-value (get state :current-value)
         current-label (get label-index current-value)
-
         is-open?      (get state :is-open?)
 
         node-ref      (mf/use-ref nil)

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

@@ -20,7 +20,6 @@
    [app.main.router :as rt]
    [app.main.store :as st]
    [app.main.ui.context :as ctx]
-   [app.main.ui.dashboard.deleted :refer [deleted-section*]]
    [app.main.ui.dashboard.files :refer [files-section*]]
    [app.main.ui.dashboard.fonts :refer [fonts-page* font-providers-page*]]
    [app.main.ui.dashboard.import]
@@ -30,7 +29,6 @@
    [app.main.ui.dashboard.sidebar :refer [sidebar*]]
    [app.main.ui.dashboard.team :refer [team-settings-page* team-members-page* team-invitations-page* webhooks-page*]]
    [app.main.ui.dashboard.templates :refer [templates-section*]]
-   [app.main.ui.exports.assets :refer [progress-widget]]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.modal :refer [modal-container*]]
    [app.main.ui.workspace.plugins]
@@ -86,9 +84,6 @@
     [:div {:class (stl/css :dashboard-content)
            :on-click clear-selected-fn
            :ref container}
-
-     [:& progress-widget {:operation :restore}]
-
      (case section
        :dashboard-recent
        (when (seq projects)
@@ -145,11 +140,6 @@
        :dashboard-settings
        [:> team-settings-page* {:team team :profile profile}]
 
-       :dashboard-deleted
-       [:> deleted-section* {:team team
-                             :projects projects
-                             :profile profile}]
-
        nil)]))
 
 (def ref:dashboard-initialized

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

@@ -1,331 +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.dashboard.deleted
-  (:require-macros [app.main.style :as stl])
-  (:require
-   [app.common.data :as d]
-   [app.common.geom.point :as gpt]
-   [app.main.data.common :as dcm]
-   [app.main.data.dashboard :as dd]
-   [app.main.data.modal :as modal]
-   [app.main.data.notifications :as ntf]
-   [app.main.refs :as refs]
-   [app.main.store :as st]
-   [app.main.ui.components.context-menu-a11y :refer [context-menu*]]
-   [app.main.ui.dashboard.grid :refer [grid*]]
-   [app.main.ui.ds.buttons.button :refer [button*]]
-   [app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]]
-   [app.main.ui.hooks :as hooks]
-   [app.main.ui.icons :as deprecated-icon]
-   [app.util.dom :as dom]
-   [app.util.i18n :as i18n :refer [tr]]
-   [app.util.keyboard :as kbd]
-   [okulary.core :as l]
-   [rumext.v2 :as mf]))
-
-
-(def ^:private menu-icon
-  (deprecated-icon/icon-xref :menu (stl/css :menu-icon)))
-
-(mf/defc header*
-  {::mf/props :obj
-   ::mf/private true}
-  []
-  [:header {:class (stl/css :dashboard-header) :data-testid "dashboard-header"}
-   [:div#dashboard-deleted-title {:class (stl/css :dashboard-title)}
-    [:h1 (tr "dashboard.projects-title")]]])
-
-(mf/defc deleted-project-menu*
-  [{:keys [project files team-id show on-close top left]}]
-  (let [top  (d/nilv top 0)
-        left (d/nilv left 0)
-
-        file-ids
-        (mf/with-memo [files]
-          (into #{} d/xf:map-id files))
-
-        restore-fn
-        (fn [_]
-          (st/emit! (dd/restore-files-immediately
-                     (with-meta {:team-id team-id :ids file-ids}
-                       {:on-success #(st/emit! (ntf/success (tr "restore-modal.success-restore-immediately" (:name project)))
-                                               (dd/fetch-projects team-id)
-                                               (dd/fetch-deleted-files team-id))
-                        :on-error #(st/emit! (ntf/error (tr "restore-modal.error-restore-project" (:name project))))}))))
-
-        on-restore-project
-        (fn []
-          (st/emit!
-           (modal/show {:type :confirm
-                        :title (tr "restore-modal.restore-project.title")
-                        :message (tr "restore-modal.restore-project.description" (:name project))
-                        :accept-style :primary
-                        :accept-label (tr "labels.continue")
-                        :on-accept restore-fn})))
-
-        delete-fn
-        (fn [_]
-          (st/emit! (ntf/success (tr "delete-forever-modal.success-delete-immediately" (:name project)))
-                    (dd/delete-files-immediately
-                     {:team-id team-id
-                      :ids file-ids})
-                    (dd/fetch-projects team-id)
-                    (dd/fetch-deleted-files team-id)))
-
-        on-delete-project
-        (fn []
-          (st/emit!
-           (modal/show {:type :confirm
-                        :title (tr "delete-forever-modal.title")
-                        :message (tr "delete-forever-modal.delete-project.description" (:name project))
-                        :accept-label (tr "dashboard.deleted.delete-forever")
-                        :on-accept delete-fn})))
-        options
-        [{:name   (tr "dashboard.deleted.restore-project")
-          :id     "project-restore"
-          :handler on-restore-project}
-         {:name   (tr "dashboard.deleted.delete-project")
-          :id     "project-delete"
-          :handler on-delete-project}]]
-
-    [:> context-menu*
-     {:on-close on-close
-      :show show
-      :fixed (or (not= top 0) (not= left 0))
-      :min-width true
-      :top top
-      :left left
-      :options options}]))
-
-(mf/defc deleted-project-item*
-  {::mf/props :obj
-   ::mf/private true}
-  [{:keys [project team files]}]
-  (let [project-files  (filterv #(= (:project-id %) (:id project)) files)
-
-        empty?         (empty? project-files)
-        selected-files (mf/deref refs/selected-files)
-
-        dstate         (mf/deref refs/dashboard-local)
-        edit-id        (:project-for-edit dstate)
-
-        local          (mf/use-state
-                        #(do {:menu-open false
-                              :menu-pos nil
-                              :edition (= (:id project) edit-id)}))
-
-        [rowref limit] (hooks/use-dynamic-grid-item-width)
-
-        on-menu-click
-        (mf/use-fn
-         (fn [event]
-           (dom/prevent-default event)
-
-           (let [client-position (dom/get-client-position event)
-                 position (if (and (nil? (:y client-position)) (nil? (:x client-position)))
-                            (let [target-element (dom/get-target event)
-                                  points         (dom/get-bounding-rect target-element)
-                                  y              (:top points)
-                                  x              (:left points)]
-                              (gpt/point x y))
-                            client-position)]
-             (swap! local assoc
-                    :menu-open true
-                    :menu-pos position))))
-
-        on-menu-close
-        (mf/use-fn #(swap! local assoc :menu-open false))
-
-        handle-menu-click
-        (mf/use-callback
-         (mf/deps on-menu-click)
-         (fn [event]
-           (when (kbd/enter? event)
-             (dom/stop-propagation event)
-             (on-menu-click event))))]
-
-    [:article {:class (stl/css-case :dashboard-project-row true)}
-     [:header {:class (stl/css :project)}
-      [:div {:class (stl/css :project-name-wrapper)}
-       [:h2  {:class (stl/css :project-name)
-              :title (:name project)}
-        (:name project)]
-
-       (when (:deleted-at project)
-         [:div {:class (stl/css :info-wrapper)}
-          [:div {:class (stl/css-case :project-actions true)}
-
-           [:button {:class (stl/css :options-btn)
-                     :on-click on-menu-click
-                     :title (tr "dashboard.options")
-                     :aria-label  (tr "dashboard.options")
-                     :data-testid "project-options"
-                     :on-key-down handle-menu-click}
-            menu-icon]]
-
-          (when (:menu-open @local)
-            [:> deleted-project-menu*
-             {:project project
-              :files project-files
-              :team-id (:id team)
-              :show (:menu-open @local)
-              :left (+ 24 (:x (:menu-pos @local)))
-              :top (:y (:menu-pos @local))
-              :on-close on-menu-close}])])]]
-
-     [:div {:class (stl/css :grid-container) :ref rowref}
-      (if ^boolean empty?
-        [:> empty-placeholder* {:title (tr "dashboard.empty-placeholder-files-title")
-                                :class (stl/css :placeholder-placement)
-                                :type 1
-                                :subtitle (tr "dashboard.empty-placeholder-files-subtitle")}]
-
-        [:> grid*
-         {:project project
-          :files project-files
-          :origin :deleted
-          :can-edit false
-          :can-restore true
-          :limit limit
-          :selected-files selected-files}])]]))
-
-(def ^:private ref:deleted-files
-  (l/derived :deleted-files st/state))
-
-(mf/defc deleted-section*
-  [{:keys [team projects]}]
-  (let [deleted-map
-        (mf/deref ref:deleted-files)
-
-        projects
-        (mf/with-memo [projects deleted-map]
-          (->> projects
-               (filter (fn [project]
-                         (or (:deleted-at project)
-                             (when deleted-map
-                               (some #(= (:id project) (:project-id %))
-                                     (vals deleted-map))))))
-               (filter (fn [project]
-                         (when deleted-map
-                           (some #(= (:id project) (:project-id %))
-                                 (vals deleted-map)))))
-               (sort-by :modified-at)
-               (reverse)))
-
-        team-id
-        (get team :id)
-
-        ;; Calculate deletion days based on team subscription
-        deletion-days
-        (let [subscription (get team :subscription)
-              sub-type     (get subscription :type)
-              sub-status   (get subscription :status)
-              canceled?    (contains? #{"canceled" "unpaid"} sub-status)]
-          (cond
-            (and (= "unlimited" sub-type) (not canceled?)) 30
-            (and (= "enterprise" sub-type) (not canceled?)) 90
-            :else 7))
-
-        on-clear
-        (mf/use-fn
-         (mf/deps team-id deleted-map)
-         (fn []
-           (when deleted-map
-             (let [file-ids (into #{} (keys deleted-map))]
-               (when (seq file-ids)
-                 (st/emit!
-                  (modal/show {:type :confirm
-                               :title (tr "delete-forever-modal.title")
-                               :message (tr "delete-forever-modal.delete-all.description" (count file-ids))
-                               :accept-label (tr "dashboard.deleted.delete-forever")
-                               :on-accept #(st/emit!
-                                            (dd/delete-files-immediately
-                                             {:team-id team-id
-                                              :ids file-ids})
-                                            (dd/fetch-projects team-id)
-                                            (dd/fetch-deleted-files team-id))})))))))
-
-        restore-fn
-        (fn [file-ids]
-          (st/emit! (dd/restore-files-immediately
-                     (with-meta {:team-id team-id :ids file-ids}
-                       {:on-success #(st/emit! (dd/fetch-projects team-id)
-                                               (dd/fetch-deleted-files team-id))
-                        :on-error #(st/emit! (ntf/error (tr "restore-modal.error-restore-files")))}))))
-
-        on-restore-all
-        (mf/use-fn
-         (mf/deps team-id deleted-map)
-         (fn []
-           (when deleted-map
-             (let [file-ids (into #{} (keys deleted-map))]
-               (when (seq file-ids)
-                 (st/emit!
-                  (modal/show {:type :confirm
-                               :title (tr "restore-modal.restore-all.title")
-                               :message (tr "restore-modal.restore-all.description" (count file-ids))
-                               :accept-label (tr "labels.continue")
-                               :accept-style :primary
-                               :on-accept #(restore-fn file-ids)})))))))
-
-        on-recent-click
-        (mf/use-fn
-         (mf/deps team-id)
-         (fn []
-           (st/emit! (dcm/go-to-dashboard-recent :team-id team-id))))]
-
-    (mf/with-effect [team-id]
-      (st/emit! (dd/fetch-projects team-id)
-                (dd/fetch-deleted-files team-id)
-                (dd/clear-selected-files)))
-
-    [:*
-     [:> header* {:team team}]
-     [:section {:class (stl/css :dashboard-container :no-bg)}
-      [:*
-       [:div {:class (stl/css :no-bg)}
-
-        [:div {:class (stl/css :nav-options)}
-         [:> button* {:variant "ghost"
-                      :data-testid "recent-tab"
-                      :type "button"
-                      :on-click on-recent-click}
-          (tr "dashboard.labels.recent")]
-         [:div {:class (stl/css :selected)
-                :data-testid "deleted-tab"}
-          (tr "dashboard.labels.deleted")]]
-
-        [:div {:class (stl/css :deleted-content)}
-         [:div {:class (stl/css :deleted-info)}
-          [:div
-           (tr "dashboard.deleted.info-text")
-           [:span {:class (stl/css :info-text-highlight)}
-            (tr "dashboard.deleted.info-days" deletion-days)]
-           (tr "dashboard.deleted.info-text2")]
-          [:div
-           (tr "dashboard.deleted.restore-text")]]
-         [:div {:class (stl/css :deleted-options)}
-          [:> button* {:variant "ghost"
-                       :type "button"
-                       :on-click on-restore-all}
-           (tr "dashboard.deleted.restore-all")]
-          [:> button* {:variant "destructive"
-                       :type "button"
-                       :icon "delete"
-                       :on-click on-clear}
-           (tr "dashboard.deleted.clear")]]]
-
-        (when (seq projects)
-          (for [{:keys [id] :as project} projects]
-            (let [files (when deleted-map
-                          (->> (vals deleted-map)
-                               (filterv #(= id (:project-id %)))
-                               (sort-by :modified-at #(compare %2 %1))))]
-              [:> deleted-project-item* {:project project
-                                         :team team
-                                         :files files
-                                         :key id}])))]]]]))

frontend/src/app/main/ui/dashboard/deleted.scss

@@ -1,125 +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
-
-@use "common/refactor/common-dashboard";
-@use "../ds/typography.scss" as t;
-@use "../ds/_borders.scss" as *;
-@use "../ds/spacing.scss" as *;
-@use "../ds/_sizes.scss" as *;
-@use "../ds/z-index.scss" as *;
-
-.dashboard-container {
-  flex: 1 0 0;
-  width: 100%;
-  margin-inline-end: var(--sp-l);
-  border-top: $b-1 solid var(--panel-border-color);
-  overflow-y: auto;
-  padding-block-end: var(--sp-xxxl);
-}
-
-.deleted-content {
-  display: flex;
-  gap: var(--sp-l);
-  justify-content: space-between;
-  margin-inline-start: var(--sp-l);
-  margin-block-start: var(--sp-xxl);
-}
-
-.deleted-info {
-  @include t.use-typography("body-medium");
-  color: var(--color-foreground-secondary);
-}
-
-.info-text-highlight {
-  color: var(--color-accent-primary);
-}
-
-.deleted-options {
-  display: flex;
-  gap: 5px;
-  flex-shrink: 0;
-}
-
-.nav-options {
-  display: flex;
-  gap: var(--sp-l);
-  justify-content: space-between;
-  border-bottom: $b-1 solid var(--panel-border-color);
-  padding-inline-start: var(--sp-l);
-  background: var(--color-background-default);
-  position: sticky;
-  top: 0;
-  z-index: var(--z-index-panels);
-}
-
-.selected {
-  @include t.use-typography("headline-small");
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--color-foreground-primary);
-  border: $b-1 solid transparent;
-  border-bottom: $b-1 solid var(--color-foreground-primary);
-  padding: 0 var(--sp-m);
-}
-
-.project {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--sp-s);
-  width: 99%;
-  max-height: $sz-40;
-  padding: var(--sp-s) var(--sp-s) var(--sp-s) var(--sp-l);
-  margin-block-start: var(--sp-l);
-  border-radius: $br-4;
-}
-
-.project-name-wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  width: 100%;
-  min-height: var(--sp-xxxl);
-  margin-inline-start: var(--sp-s);
-}
-
-.project-name {
-  @include t.use-typography("body-large");
-  width: fit-content;
-  margin-inline-end: var(--sp-m);
-  line-height: 0.8;
-  color: var(--title-foreground-color-hover);
-  height: var(--sp-l);
-}
-
-.project-actions {
-  display: flex;
-  opacity: var(--actions-opacity);
-  margin-inline-start: var(--sp-xxxl);
-}
-
-.add-file-btn,
-.options-btn {
-  @extend .button-tertiary;
-  height: var(--sp-xxxl);
-  width: var(--sp-xxxl);
-  margin: 0 var(--sp-s);
-  padding: var(--sp-s);
-}
-
-.info-wrapper {
-  display: flex;
-  align-items: center;
-  gap: var(--sp-s);
-}
-
-.add-icon,
-.menu-icon {
-  @extend .button-icon;
-  stroke: var(--icon-foreground);
-}

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

@@ -55,7 +55,7 @@
           projects))
 
 (mf/defc file-menu*
-  [{:keys [files on-edit on-close top left navigate origin parent-id can-edit can-restore]}]
+  [{:keys [files on-edit on-close top left navigate origin parent-id can-edit]}]
 
   (assert (seq files) "missing `files` prop")
   (assert (fn? on-edit) "missing `on-edit` prop")
@@ -187,46 +187,7 @@
         on-export-binary-files
         (fn []
           (st/emit! (-> (fexp/open-export-dialog files)
-                        (with-meta {::ev/origin "dashboard"}))))
-
-        restore-fn
-        (fn [_]
-          (st/emit! (dd/restore-files-immediately
-                     (with-meta {:team-id (:id current-team)
-                                 :ids #{(:id file)}}
-                       {:on-success #(st/emit! (ntf/success (tr "restore-modal.success-restore-immediately" (:name file)))
-                                               (dd/fetch-projects (:id current-team))
-                                               (dd/fetch-deleted-files (:id current-team)))
-                        :on-error #(st/emit! (ntf/error (tr "restore-modal.error-restore-file" (:name file))))}))))
-
-        on-restore-immediately
-        (fn []
-          (st/emit!
-           (modal/show {:type :confirm
-                        :title (tr "restore-modal.restore-file.title")
-                        :message (tr "restore-modal.restore-file.description" (:name file))
-                        :accept-label (tr "labels.continue")
-                        :accept-style :primary
-                        :on-accept restore-fn})))
-
-
-        delete-fn
-        (fn [_]
-          (st/emit! (ntf/success (tr "delete-forever-modal.success-delete-immediately" (:name file)))
-                    (dd/delete-files-immediately
-                     {:team-id (:id current-team)
-                      :ids #{(:id file)}})
-                    (dd/fetch-projects (:id current-team))
-                    (dd/fetch-deleted-files (:id current-team))))
-
-        on-delete-immediately
-        (fn []
-          (st/emit!
-           (modal/show {:type :confirm
-                        :title (tr "delete-forever-modal.title")
-                        :message (tr "delete-forever-modal.delete-file.description" (:name file))
-                        :accept-label (tr "delete-forever-modal.title")
-                        :on-accept delete-fn})))]
+                        (with-meta {::ev/origin "dashboard"}))))]
 
     (mf/with-effect []
       (->> (rp/cmd! :get-all-projects)
@@ -266,85 +227,76 @@
                                        (:id sub-project))})})}]))
 
           options
-          (if can-restore
-            [(when can-restore
-               {:name    (tr "dashboard.restore-file")
-                :id      "restore-file"
-                :handler on-restore-immediately})
-             (when can-restore
-               {:name    (tr "dashboard.delete-file")
-                :id      "delete-file"
-                :handler on-delete-immediately})]
-            (if multi?
-              [(when can-edit
-                 {:name    (tr "dashboard.duplicate-multi" file-count)
-                  :id      "duplicate-multi"
-                  :handler on-duplicate})
+          (if multi?
+            [(when can-edit
+               {:name    (tr "dashboard.duplicate-multi" file-count)
+                :id      "duplicate-multi"
+                :handler on-duplicate})
 
-               (when (and (or (seq current-projects) (seq other-teams)) can-edit)
-                 {:name    (tr "dashboard.move-to-multi" file-count)
-                  :id      "file-move-multi"
-                  :options    sub-options})
+             (when (and (or (seq current-projects) (seq other-teams)) can-edit)
+               {:name    (tr "dashboard.move-to-multi" file-count)
+                :id      "file-move-multi"
+                :options    sub-options})
 
-               {:name    (tr "dashboard.export-binary-multi" file-count)
-                :id      "file-binary-export-multi"
-                :handler on-export-binary-files}
+             {:name    (tr "dashboard.export-binary-multi" file-count)
+              :id      "file-binary-export-multi"
+              :handler on-export-binary-files}
 
-               (when (and (:is-shared file) can-edit)
-                 {:name    (tr "labels.unpublish-multi-files" file-count)
-                  :id      "file-unpublish-multi"
-                  :handler on-del-shared})
+             (when (and (:is-shared file) can-edit)
+               {:name    (tr "labels.unpublish-multi-files" file-count)
+                :id      "file-unpublish-multi"
+                :handler on-del-shared})
 
-               (when (and (not is-lib-page?) can-edit)
-                 {:name    :separator}
-                 {:name    (tr "labels.delete-multi-files" file-count)
-                  :id      "file-delete-multi"
-                  :handler on-delete})]
+             (when (and (not is-lib-page?) can-edit)
+               {:name    :separator}
+               {:name    (tr "labels.delete-multi-files" file-count)
+                :id      "file-delete-multi"
+                :handler on-delete})]
 
-              [{:name    (tr "dashboard.open-in-new-tab")
-                :id      "file-open-new-tab"
-                :handler on-new-tab}
-               (when (and (not is-search-page?) can-edit)
-                 {:name    (tr "labels.rename")
-                  :id      "file-rename"
-                  :handler on-edit})
+            [{:name    (tr "dashboard.open-in-new-tab")
+              :id      "file-open-new-tab"
+              :handler on-new-tab}
+             (when (and (not is-search-page?) can-edit)
+               {:name    (tr "labels.rename")
+                :id      "file-rename"
+                :handler on-edit})
 
-               (when (and (not is-search-page?) can-edit)
-                 {:name    (tr "dashboard.duplicate")
-                  :id      "file-duplicate"
-                  :handler on-duplicate})
+             (when (and (not is-search-page?) can-edit)
+               {:name    (tr "dashboard.duplicate")
+                :id      "file-duplicate"
+                :handler on-duplicate})
 
-               (when (and (not is-lib-page?)
-                          (not is-search-page?)
-                          (or (seq current-projects) (seq other-teams))
-                          can-edit)
-                 {:name    (tr "dashboard.move-to")
-                  :id      "file-move-to"
-                  :options sub-options})
+             (when (and (not is-lib-page?)
+                        (not is-search-page?)
+                        (or (seq current-projects) (seq other-teams))
+                        can-edit)
+               {:name    (tr "dashboard.move-to")
+                :id      "file-move-to"
+                :options sub-options})
 
-               (when (and (not is-search-page?)
-                          can-edit)
-                 (if (:is-shared file)
-                   {:name    (tr "dashboard.unpublish-shared")
-                    :id      "file-del-shared"
-                    :handler on-del-shared}
-                   {:name    (tr "dashboard.add-shared")
-                    :id      "file-add-shared"
-                    :handler on-add-shared}))
+             (when (and (not is-search-page?)
+                        can-edit)
+               (if (:is-shared file)
+                 {:name    (tr "dashboard.unpublish-shared")
+                  :id      "file-del-shared"
+                  :handler on-del-shared}
+                 {:name    (tr "dashboard.add-shared")
+                  :id      "file-add-shared"
+                  :handler on-add-shared}))
 
-               {:name   :separator}
+             {:name   :separator}
 
-               {:name    (tr "dashboard.download-binary-file")
-                :id      "download-binary-file"
-                :handler on-export-binary-files}
+             {:name    (tr "dashboard.download-binary-file")
+              :id      "download-binary-file"
+              :handler on-export-binary-files}
 
-               (when (and (not is-lib-page?) (not is-search-page?) can-edit)
-                 {:name   :separator})
+             (when (and (not is-lib-page?) (not is-search-page?) can-edit)
+               {:name   :separator})
 
-               (when (and (not is-lib-page?) (not is-search-page?) can-edit)
-                 {:name    (tr "labels.delete")
-                  :id      "file-delete"
-                  :handler on-delete})]))]
+             (when (and (not is-lib-page?) (not is-search-page?) can-edit)
+               {:name    (tr "labels.delete")
+                :id      "file-delete"
+                :handler on-delete})])]
 
       [:> context-menu*
        {:on-close on-close

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

@@ -86,7 +86,7 @@
 (mf/defc grid-item-thumbnail*
   {::mf/props :obj
    ::mf/private true}
-  [{:keys [can-edit file can-restore]}]
+  [{:keys [can-edit file]}]
   (let [file-id      (get file :id)
         revn         (get file :revn)
         thumbnail-id (get file :thumbnail-id)
@@ -109,8 +109,7 @@
                                           :message (ex-message cause)))))]
           (partial rx/dispose! subscription))))
 
-    [:div {:class (stl/css-case :grid-item-th true
-                                :deleted-item can-restore)
+    [:div {:class (stl/css :grid-item-th)
            :style {:background-color bg-color}
            :ref container}
      (when visible?
@@ -132,15 +131,13 @@
 
 (mf/defc grid-item-library*
   {::mf/props :obj}
-  [{:keys [file can-restore]}]
+  [{:keys [file]}]
   (mf/with-effect [file]
     (when file
       (let [font-ids (map :font-id (get-in file [:library-summary :typographies :sample] []))]
         (run! fonts/ensure-loaded! font-ids))))
 
-  [:div {:class (stl/css-case :grid-item-th true
-                              :library true
-                              :deleted-item can-restore)}
+  [:div {:class (stl/css :grid-item-th :library)}
    (if (nil? file)
      [:> loader* {:class (stl/css :grid-loader)
                   :overlay true
@@ -253,7 +250,7 @@
     counter-el))
 
 (mf/defc grid-item*
-  [{:keys [file origin can-edit selected-files can-restore]}]
+  [{:keys [file origin can-edit selected-files]}]
   (let [file-id  (get file :id)
         state    (mf/deref refs/dashboard-local)
 
@@ -292,13 +289,12 @@
 
         on-navigate
         (mf/use-fn
-         (mf/deps file-id can-restore)
+         (mf/deps file-id)
          (fn [event]
-           (when-not can-restore
-             (let [menu-icon (mf/ref-val menu-ref)
-                   target    (dom/get-target event)]
-               (when-not (dom/child? target menu-icon)
-                 (st/emit! (dcm/go-to-workspace :file-id file-id)))))))
+           (let [menu-icon (mf/ref-val menu-ref)
+                 target    (dom/get-target event)]
+             (when-not (dom/child? target menu-icon)
+               (st/emit! (dcm/go-to-workspace :file-id file-id))))))
 
         on-drag-start
         (mf/use-fn
@@ -416,8 +412,8 @@
       [:div {:class (stl/css :overlay)}]
 
       (if ^boolean is-library-view?
-        [:> grid-item-library* {:file file :can-restore can-restore}]
-        [:> grid-item-thumbnail* {:file file :can-edit can-edit :can-restore can-restore}])
+        [:> grid-item-library* {:file file}]
+        [:> grid-item-thumbnail* {:file file :can-edit can-edit}])
 
       (when (and (:is-shared file) (not is-library-view?))
         [:div {:class (stl/css :item-badge)} deprecated-icon/library])
@@ -455,12 +451,11 @@
                             :on-edit on-edit
                             :on-close on-menu-close
                             :origin origin
-                            :parent-id (dm/str file-id "-action-menu")
-                            :can-restore can-restore}]])]]]]]))
+                            :parent-id (dm/str file-id "-action-menu")}]])]]]]]))
 
 (mf/defc grid*
   {::mf/props :obj}
-  [{:keys [files project origin limit create-fn can-edit selected-files can-restore]}]
+  [{:keys [files project origin limit create-fn can-edit selected-files]}]
   (let [dragging?  (mf/use-state false)
         project-id (get project :id)
         team-id    (get project :team-id)
@@ -540,8 +535,7 @@
               :key (dm/str (:id item))
               :origin origin
               :selected-files selected-files
-              :can-edit can-edit
-              :can-restore can-restore}])])
+              :can-edit can-edit}])])
 
        :else
        [:> empty-grid-placeholder*
@@ -554,7 +548,7 @@
          :on-finish-import on-finish-import}])]))
 
 (mf/defc line-grid-row
-  [{:keys [files selected-files dragging? limit can-edit can-restore] :as props}]
+  [{:keys [files selected-files dragging? limit can-edit] :as props}]
   (let [elements limit
         limit (if dragging? (dec limit) limit)]
     [:ul {:class (stl/css :grid-row :no-wrap)
@@ -569,11 +563,10 @@
          :file item
          :selected-files selected-files
          :can-edit can-edit
-         :key (dm/str (:id item))
-         :can-restore can-restore}])]))
+         :key (dm/str (:id item))}])]))
 
 (mf/defc line-grid
-  [{:keys [project team files limit create-fn can-edit can-restore] :as props}]
+  [{:keys [project team files limit create-fn can-edit] :as props}]
   (let [dragging?        (mf/use-state false)
         project-id       (:id project)
         team-id          (:id team)
@@ -671,8 +664,7 @@
                           :selected-files selected-files
                           :dragging? @dragging?
                           :can-edit can-edit
-                          :limit limit
-                          :can-restore can-restore}]
+                          :limit limit}]
 
        :else
        [:> empty-grid-placeholder*

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

@@ -375,7 +375,3 @@ $thumbnail-default-height: deprecated.$s-168; // Default width
 .grid-loader {
   --icon-width: calc(var(--th-width, #{$thumbnail-default-width}) * 0.25);
 }
-
-.deleted-item {
-  opacity: 0.5;
-}

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

@@ -21,7 +21,6 @@
    [app.main.ui.dashboard.inline-edition :refer [inline-edition]]
    [app.main.ui.dashboard.pin-button :refer [pin-button*]]
    [app.main.ui.dashboard.project-menu :refer [project-menu*]]
-   [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as deprecated-icon]
@@ -343,13 +342,7 @@
          (fn []
            (reset! show-team-hero* false)
            (st/emit! (ptk/data-event ::ev/event {::ev/name "dont-show-team-up-hero"
-                                                 ::ev/origin "dashboard"}))))
-
-        on-deleted-click
-        (mf/use-fn
-         (mf/deps team-id)
-         (fn []
-           (st/emit! (dcm/go-to-dashboard-deleted :team-id team-id))))]
+                                                 ::ev/origin "dashboard"}))))]
 
     (mf/with-effect [show-team-hero?]
       (swap! storage/global assoc ::show-team-hero show-team-hero?))
@@ -383,15 +376,6 @@
                                                           (not is-defalt-team?)
                                                           show-team-hero?
                                                           can-invite))}
-          [:div {:class (stl/css :nav-options)}
-           [:div {:class (stl/css :selected)
-                  :data-testid "recent-tab"}
-            (tr "dashboard.labels.recent")]
-           [:> button* {:variant "ghost"
-                        :type "button"
-                        :data-testid "deleted-tab"
-                        :on-click on-deleted-click}
-            (tr "dashboard.labels.deleted")]]
           (for [{:keys [id] :as project} projects]
             ;; FIXME: refactor this, looks inneficient
             (let [files (when recent-map

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

@@ -4,21 +4,16 @@
 //
 // Copyright (c) KALEIDOS INC
 
-@use "common/refactor/common-refactor.scss" as deprecated;
+@use "refactor/common-refactor.scss" as deprecated;
 @use "common/refactor/common-dashboard";
-@use "../ds/typography.scss" as t;
-@use "../ds/_borders.scss" as *;
-@use "../ds/spacing.scss" as *;
-@use "../ds/_sizes.scss" as *;
-@use "../ds/z-index.scss" as *;
 
 .dashboard-container {
   flex: 1 0 0;
   width: 100%;
-  margin-inline-end: var(--sp-l);
-  border-top: $b-1 solid var(--panel-border-color);
+  margin-right: deprecated.$s-16;
+  border-top: deprecated.$s-1 solid var(--panel-border-color);
   overflow-y: auto;
-  padding-bottom: var(--sp-xxxl);
+  padding-bottom: deprecated.$s-32;
 }
 
 .dashboard-projects {
@@ -32,16 +27,16 @@
 
 .dashboard-shared {
   width: calc(100vw - deprecated.$s-320);
-  margin-inline-end: deprecated.$s-52;
+  margin-right: deprecated.$s-52;
 }
 
 .search {
-  margin-block-start: var(--sp-m);
+  margin-top: deprecated.$s-12;
 }
 
 .dashboard-project-row {
   --actions-opacity: 0;
-  margin-block-end: var(--sp-xxl);
+  margin-bottom: deprecated.$s-24;
   position: relative;
 
   &:hover,
@@ -65,12 +60,12 @@
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  gap: var(--sp-s);
+  gap: deprecated.$s-8;
   width: 99%;
-  max-height: $sz-40;
-  padding: var(--sp-s) var(--sp-s) var(--sp-s) var(--sp-l);
-  margin-block-start: var(--sp-l);
-  border-radius: $br-4;
+  max-height: deprecated.$s-40;
+  padding: deprecated.$s-8 deprecated.$s-8 deprecated.$s-8 deprecated.$s-16;
+  margin-top: deprecated.$s-16;
+  border-radius: deprecated.$br-4;
 }
 
 .project-name-wrapper {
@@ -78,29 +73,30 @@
   align-items: center;
   justify-content: flex-start;
   width: 100%;
-  min-height: var(--sp-xxxl);
-  margin-inline-start: var(--sp-s);
+  min-height: deprecated.$s-32;
+  margin-left: deprecated.$s-8;
 }
 
 .project-name {
-  @include t.use-typography("body-large");
+  @include deprecated.bodyLargeTypography;
+  @include deprecated.textEllipsis;
   width: fit-content;
-  margin-inline-end: var(--sp-m);
+  margin-right: deprecated.$s-12;
   line-height: 0.8;
   color: var(--title-foreground-color-hover);
   cursor: pointer;
-  height: var(--sp-l);
+  height: deprecated.$s-16;
 }
 
 .info-wrapper {
   display: flex;
   align-items: center;
-  gap: var(--sp-s);
+  gap: deprecated.$s-8;
 }
 
 .info,
 .recent-files-row-title-info {
-  @include t.use-typography("body-medium");
+  @include deprecated.bodyMediumTypography;
   color: var(--title-foreground-color);
   @media (max-width: 760px) {
     display: none;
@@ -110,16 +106,16 @@
 .project-actions {
   display: flex;
   opacity: var(--actions-opacity);
-  margin-inline-start: var(--sp-xxxl);
+  margin-left: deprecated.$s-32;
 }
 
 .add-file-btn,
 .options-btn {
   @extend .button-tertiary;
-  height: var(--sp-xxxl);
-  width: var(--sp-xxxl);
-  margin: 0 var(--sp-s);
-  padding: var(--sp-s);
+  height: deprecated.$s-32;
+  width: deprecated.$s-32;
+  margin: 0 deprecated.$s-8;
+  padding: deprecated.$s-8;
 }
 
 .add-icon,
@@ -130,24 +126,24 @@
 
 .grid-container {
   width: 100%;
-  padding: 0 var(--sp-xs);
+  padding: 0 deprecated.$s-4;
 }
 
 .placeholder-placement {
-  margin: var(--sp-l) var(--sp-xxxl);
+  margin: deprecated.$s-16 deprecated.$s-32;
 }
 
 .show-more {
   --show-more-color: var(--button-secondary-foreground-color-rest);
   @include deprecated.buttonStyle;
-  @include t.use-typography("body-medium");
+  @include deprecated.bodyMediumTypography;
   position: absolute;
-  top: var(--sp-s);
+  top: deprecated.$s-8;
   right: deprecated.$s-52;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  column-gap: var(--sp-m);
+  column-gap: deprecated.$s-12;
   color: var(--show-more-color);
 
   &:hover {
@@ -156,8 +152,8 @@
 }
 
 .show-more-icon {
-  height: var(--sp-l);
-  width: var(--sp-l);
+  height: deprecated.$s-16;
+  width: deprecated.$s-16;
   fill: none;
   stroke: var(--show-more-color);
 }
@@ -168,13 +164,13 @@
   border-radius: deprecated.$br-8;
   border: none;
   display: flex;
-  margin: var(--sp-l);
-  padding: var(--sp-s);
+  margin: deprecated.$s-16;
+  padding: deprecated.$s-8;
   position: relative;
 
   img {
-    border-radius: $br-4;
-    height: var(--sp-xl) 0;
+    border-radius: deprecated.$br-4;
+    height: deprecated.$s-200;
     width: auto;
 
     @media (max-width: 1200px) {
@@ -189,18 +185,18 @@
   flex-direction: column;
   align-items: flex-start;
   flex-grow: 1;
-  padding: var(--sp-xl) var(--sp-xl);
+  padding: deprecated.$s-20 deprecated.$s-20;
 }
 
 .title {
-  font-size: $sz-24;
+  font-size: deprecated.$fs-24;
   color: var(--color-foreground-primary);
   font-weight: deprecated.$fw400;
 }
 
 .info {
   flex: 1;
-  font-size: $sz-16;
+  font-size: deprecated.$fs-16;
   span {
     color: var(--color-foreground-secondary);
     display: block;
@@ -208,15 +204,15 @@
   a {
     color: var(--color-accent-primary);
   }
-  padding: var(--sp-s) 0;
+  padding: deprecated.$s-8 0;
 }
 
 .close {
   --close-icon-foreground-color: var(--icon-foreground);
   position: absolute;
-  top: var(--sp-xl);
-  right: var(--sp-xxl);
-  width: var(--sp-xxl);
+  top: deprecated.$s-20;
+  right: deprecated.$s-24;
+  width: deprecated.$s-24;
   background-color: transparent;
   border: none;
   cursor: pointer;
@@ -231,7 +227,7 @@
 }
 
 .invite {
-  height: var(--sp-xxxl);
+  height: deprecated.$s-32;
   width: deprecated.$s-180;
 }
 
@@ -239,8 +235,8 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  width: var(--sp-xl) 0;
-  height: var(--sp-xl) 0;
+  width: deprecated.$s-200;
+  height: deprecated.$s-200;
   overflow: hidden;
   border-radius: deprecated.$br-4;
   @media (max-width: 1200px) {
@@ -248,26 +244,3 @@
     width: 0;
   }
 }
-
-.nav-options {
-  display: flex;
-  gap: var(--sp-l);
-  justify-content: space-between;
-  border-bottom: $b-1 solid var(--panel-border-color);
-  padding-inline-start: var(--sp-l);
-  background: var(--color-background-default);
-  position: sticky;
-  top: 0;
-  z-index: var(--z-index-panels);
-}
-
-.selected {
-  @include t.use-typography("headline-small");
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--color-foreground-primary);
-  border: $b-1 solid transparent;
-  border-bottom: $b-1 solid var(--color-foreground-primary);
-  padding: 0 var(--sp-m);
-}

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

@@ -27,11 +27,11 @@
    [app.main.ui.dashboard.comments :refer [comments-icon* comments-section]]
    [app.main.ui.dashboard.inline-edition :refer [inline-edition]]
    [app.main.ui.dashboard.project-menu :refer [project-menu*]]
-   [app.main.ui.dashboard.subscription :refer [dashboard-cta*
-                                               get-subscription-type
+   [app.main.ui.dashboard.subscription :refer [subscription-sidebar*
                                                menu-team-icon*
+                                               dashboard-cta*
                                                show-subscription-dashboard-banner?
-                                               subscription-sidebar*]]
+                                               get-subscription-type]]
    [app.main.ui.dashboard.team-form]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
    [app.main.ui.icons :as deprecated-icon]

frontend/src/app/main/ui/delete_shared.scss

@@ -45,7 +45,7 @@
 .element-list {
   @include t.use-typography("body-large");
   color: var(--modal-text-foreground-color);
-  overflow-y: auto;
+  overflow-y: scroll;
   margin-block: 0;
 }
 

frontend/src/app/main/ui/exports/assets.cljs

@@ -12,7 +12,6 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.types.color :as clr]
-   [app.main.data.dashboard :as dd]
    [app.main.data.exports.assets :as de]
    [app.main.data.modal :as modal]
    [app.main.refs :as refs]
@@ -206,13 +205,10 @@
       :cmd :export-frames
       :origin origin}]))
 
-(mf/defc progress-widget
+(mf/defc export-progress-widget
   {::mf/wrap [mf/memo]}
-  [{:keys [operation] :or {operation :export}}]
-  (let [state             (mf/deref (case operation
-                                      :export  refs/export
-                                      :restore refs/restore
-                                      refs/export))
+  []
+  (let [state             (mf/deref refs/export)
         profile           (mf/deref refs/profile)
         theme             (or (:theme profile) theme/default)
         is-default-theme? (= theme/default theme)
@@ -221,14 +217,11 @@
         detail-visible?   (:detail-visible state)
         widget-visible?   (:widget-visible state)
         progress          (:progress state)
-        items             (case operation
-                            :export  (:exports state)
-                            :restore (:files state)
-                            [])
-        total             (or (:total state) (count items))
+        exports           (:exports state)
+        total             (count exports)
         complete?         (= progress total)
         circ              (* 2 Math/PI 12)
-        pct               (if (zero? total) circ (- circ (* circ (/ progress total))))
+        pct               (- circ (* circ (/ progress total)))
 
         pwidth
         (if error?
@@ -250,43 +243,19 @@
 
         title
         (cond
-          error?    (case operation
-                      :export  (tr "workspace.options.exporting-object-error")
-                      :restore (tr "workspace.options.restoring-object-error")
-                      (tr "workspace.options.processing-object-error"))
-          complete? (case operation
-                      :export  (tr "workspace.options.exporting-complete")
-                      :restore (tr "workspace.options.restoring-complete")
-                      (tr "workspace.options.processing-complete"))
-          healthy?  (case operation
-                      :export  (tr "workspace.options.exporting-object")
-                      :restore (tr "workspace.options.restoring-object")
-                      (tr "workspace.options.processing-object"))
-          (not healthy?) (case operation
-                           :export  (tr "workspace.options.exporting-object-slow")
-                           :restore (tr "workspace.options.restoring-object-slow")
-                           (tr "workspace.options.processing-object-slow")))
+          error?          (tr "workspace.options.exporting-object-error")
+          complete?       (tr "workspace.options.exporting-complete")
+          healthy?        (tr "workspace.options.exporting-object")
+          (not healthy?)  (tr "workspace.options.exporting-object-slow"))
 
-        retry-last-operation
-        (mf/use-fn
-         (mf/deps operation)
-         (fn []
-           (case operation
-             :export  (st/emit! (de/retry-last-export))
-             :restore (st/emit! (dd/retry-last-restore))
-             nil)))
+        retry-last-export
+        (mf/use-fn #(st/emit! (de/retry-last-export)))
 
         toggle-detail-visibility
-        (mf/use-fn
-         (mf/deps operation)
-         (fn []
-           (case operation
-             :export  (st/emit! (de/toggle-detail-visibililty))
-             :restore (st/emit! (dd/toggle-restore-detail-visibility))
-             nil)))]
+        (mf/use-fn #(st/emit! (de/toggle-detail-visibililty)))]
 
     [:*
-     (when (and widget-visible? (= operation :export))
+     (when widget-visible?
        [:div {:class (stl/css :export-progress-widget)
               :on-click toggle-detail-visibility}
         [:svg {:width "24" :height "24"}
@@ -314,11 +283,11 @@
           error-icon
           neutral-icon)
 
-        [:div {:class (stl/css :export-progress-title)}
-         [:div {:class (stl/css :title-text)} title]
+        [:p {:class (stl/css :export-progress-title)}
+         title
          (if error?
            [:button {:class (stl/css :retry-btn)
-                     :on-click retry-last-operation}
+                     :on-click retry-last-export}
             (tr "workspace.options.retry")]
 
            [:span {:class (stl/css :progress)}

frontend/src/app/main/ui/routes.cljs

@@ -64,8 +64,7 @@
     ["/fonts"                :dashboard-fonts]
     ["/fonts/providers"      :dashboard-font-providers]
     ["/libraries"            :dashboard-libraries]
-    ["/files"                :dashboard-files]
-    ["/deleted" :dashboard-deleted]]
+    ["/files"                :dashboard-files]]
 
    ["/dashboard/team/:team-id"
     ["/members"              :dashboard-legacy-team-members]

frontend/src/app/main/ui/viewer/header.cljs

@@ -14,7 +14,7 @@
    [app.main.data.viewer.shortcuts :as sc]
    [app.main.store :as st]
    [app.main.ui.components.dropdown :refer [dropdown]]
-   [app.main.ui.exports.assets :refer [progress-widget]]
+   [app.main.ui.exports.assets :refer [export-progress-widget]]
    [app.main.ui.formats :as fmt]
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.viewer.comments :refer [comments-menu]]
@@ -167,7 +167,7 @@
         (open-share-dialog)))
 
     [:div {:class (stl/css :options-zone)}
-     [:& progress-widget {:operation :export}]
+     [:& export-progress-widget]
 
      (case section
        :interactions [:*

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

@@ -22,7 +22,7 @@
    [app.main.ui.dashboard.team]
    [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
    [app.main.ui.ds.foundations.assets.icon :as i]
-   [app.main.ui.exports.assets :refer [progress-widget]]
+   [app.main.ui.exports.assets :refer [export-progress-widget]]
    [app.main.ui.formats :as fmt]
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.workspace.presence :refer [active-sessions]]
@@ -200,7 +200,7 @@
      [:div {:class (stl/css :users-section)}
       [:& active-sessions]]
 
-     [:& progress-widget {:operation :export}]
+     [:& export-progress-widget]
 
      [:div {:class (stl/css :separator)}]
 

frontend/src/app/main/ui/workspace/shapes/text/editor.cljs

@@ -6,7 +6,7 @@
 
 (ns app.main.ui.workspace.shapes.text.editor
   (:require
-   ["@penpot/draft-js" :as draft]
+   ["draft-js" :as draft]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.geom.point :as gpt]

frontend/src/app/main/ui/workspace/sidebar/layer_item.scss

@@ -5,7 +5,6 @@
 // Copyright (c) KALEIDOS INC
 
 @use "refactor/common-refactor.scss" as deprecated;
-@use "ds/_utils.scss" as *;
 
 .layer-row {
   --layer-indentation-size: calc(#{deprecated.$s-4} * 6);
@@ -88,7 +87,7 @@
   height: deprecated.$s-32;
   width: calc(100% - (var(--depth) * var(--layer-indentation-size)));
   cursor: pointer;
-  min-width: px2rem(140);
+
   &.filtered {
     width: calc(100% - deprecated.$s-12);
   }

frontend/src/app/main/ui/workspace/sidebar/layers.scss

@@ -211,7 +211,9 @@
   overflow-x: auto;
   overflow-y: overlay;
   scrollbar-gutter: stable;
-}
-.element-list {
-  display: grid;
+
+  .element-list {
+    width: var(--left-sidebar-width);
+    display: grid;
+  }
 }

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

@@ -102,7 +102,7 @@
         [:> deprecated-input/numeric-input*
          {:placeholder (cond
                          (not all-equal?)
-                         (tr "settings.multiple")
+                         "Mixed"
                          (= :multiple (:r1 values))
                          (tr "settings.multiple")
                          :else

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

@@ -265,16 +265,12 @@
          (mf/deps font on-change)
          (fn [new-variant-id]
            (let [variant (d/seek #(= new-variant-id (:id %)) (:variants font))]
-             (when-not (nil? variant)
-               (on-change {:font-id (:id font)
-                           :font-family (:family font)
-                           :font-variant-id new-variant-id
-                           :font-weight (:weight variant)
-                           :font-style (:style variant)}))
-             ;; NOTE: the select component we are using does not fire on-blur event
-             ;; so we need to call on-blur manually
-             (when (some? on-blur)
-               (on-blur)))))
+             (on-change {:font-id (:id font)
+                         :font-family (:family font)
+                         :font-variant-id new-variant-id
+                         :font-weight (:weight variant)
+                         :font-style (:style variant)})
+             (dom/blur! (dom/get-target new-variant-id)))))
 
         on-font-select
         (mf/use-fn
@@ -346,13 +342,12 @@
                                                {:value (:id variant)
                                                 :key (pr-str variant)
                                                 :label (:name variant)})))
-             variant-options (if (= font-variant-id :multiple)
+             variant-options (if (= font-size :multiple)
                                (conj basic-variant-options
-                                     {:value ""
+                                     {:value :multiple
                                       :key :multiple-variants
                                       :label "--"})
                                basic-variant-options)]
-
          ;;  TODO Add disabled mode
          [:& select
           {:class (stl/css :font-variant-select)

frontend/src/app/main/ui/workspace/tokens/import/modal.cljs

@@ -268,8 +268,8 @@
                    :on-click modal/hide!}
        (tr "labels.cancel")]
       [:> import-type-dropdown*
-       {:options [{:label (tr "workspace.tokens.import-menu-json-option") :value :file}
-                  {:label (tr "workspace.tokens.import-menu-zip-option") :value :zip}
+       {:options [{:label (tr "workspace.tokens.import-menu-zip-option") :value :zip}
+                  {:label (tr "workspace.tokens.import-menu-json-option") :value :file}
                   {:label (tr "workspace.tokens.import-menu-folder-option") :value :folder}]
         :on-click handle-import-action
         :text-render render-button-text

frontend/src/app/main/ui/workspace/viewport/comments.scss

@@ -19,5 +19,5 @@
 }
 
 .threads {
-  position: absolute;
+  position: fixed;
 }

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

@@ -16,7 +16,6 @@
    [app.common.geom.shapes.points :as gpo]
    [app.common.types.shape.layout :as ctl]
    [app.common.uuid :as uuid]
-   [app.render-wasm.api :as wasm.api]
    [cuerdas.core :as str]
    [rumext.v2 :as mf]))
 
@@ -276,26 +275,3 @@
                      :y2 (:y end-p)
                      :style {:stroke "red"
                              :stroke-width (/ 1 zoom)}}]))]))))
-
-(mf/defc debug-text-wasm-position-data
-  {::mf/wrap-props false}
-  [props]
-  (let [zoom               (unchecked-get props "zoom")
-        selected-shapes    (unchecked-get props "selected-shapes")
-
-        selected-text
-        (when (and (= (count selected-shapes) 1) (= :text (-> selected-shapes first :type)))
-          (first selected-shapes))
-
-        position-data
-        (when selected-text
-          (wasm.api/calculate-position-data selected-text))]
-
-    (for [{:keys [x y width height]} position-data]
-      [:rect {:x x
-              :y (- y height)
-              :width width
-              :height height
-              :fill "none"
-              :strokeWidth (/ 1 zoom)
-              :stroke "red"}])))

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

@@ -12,12 +12,10 @@
    [app.common.files.helpers :as cfh]
    [app.common.geom.shapes :as gsh]
    [app.common.types.color :as clr]
-   [app.common.types.component :as ctk]
    [app.common.types.path :as path]
    [app.common.types.shape :as cts]
    [app.common.types.shape.layout :as ctl]
    [app.main.data.workspace.transforms :as dwt]
-   [app.main.data.workspace.variants :as dwv]
    [app.main.features :as features]
    [app.main.refs :as refs]
    [app.main.store :as st]
@@ -259,16 +257,6 @@
 
         first-shape (first selected-shapes)
 
-        show-add-variant?        (and single-select?
-                                      (or (ctk/is-variant-container? first-shape)
-                                          (ctk/is-variant? first-shape)))
-
-        add-variant
-        (mf/use-fn
-         (mf/deps first-shape)
-         #(st/emit!
-           (dwv/add-new-variant (:id first-shape))))
-
         show-padding?
         (and (nil? transform)
              single-select?
@@ -647,12 +635,6 @@
                                     :hover-top-frame-id @hover-top-frame-id
                                     :zoom zoom}])
 
-       (when (dbg/enabled? :text-outline)
-         [:& wvd/debug-text-wasm-position-data
-          {:selected-shapes selected-shapes
-           :objects base-objects
-           :zoom zoom}])
-
        (when show-selection-handlers?
          [:g.selection-handlers {:clipPath "url(#clip-handlers)"}
           (when-not text-editing?
@@ -681,11 +663,6 @@
           {:id (first selected)
            :zoom zoom}])
 
-       (when show-add-variant?
-         [:> widgets/button-add* {:shape first-shape
-                                  :zoom zoom
-                                  :on-click add-variant}])
-
        [:g.grid-layout-editor {:clipPath "url(#clip-handlers)"}
         (when show-grid-editor?
           [:& grid-layout/editor

frontend/src/app/plugins/shape.cljs

@@ -54,7 +54,6 @@
    [app.plugins.ruler-guides :as rg]
    [app.plugins.text :as text]
    [app.plugins.utils :as u]
-   [app.util.http :as http]
    [app.util.object :as obj]
    [beicon.v2.core :as rx]
    [cuerdas.core :as str]))
@@ -1196,12 +1195,7 @@
                    (js/Promise.
                     (fn [resolve reject]
                       (->> (rp/cmd! :export payload)
-                           (rx/mapcat (fn [{:keys [uri]}]
-                                        (->> (http/send! {:method :get
-                                                          :uri uri
-                                                          :response-type :blob
-                                                          :omit-default-headers true})
-                                             (rx/map :body))))
+                           (rx/mapcat #(rp/cmd! :export {:cmd :get-resource :wait true :id (:id %) :blob? true}))
                            (rx/mapcat #(.arrayBuffer %))
                            (rx/map #(js/Uint8Array. %))
                            (rx/subs! resolve reject))))))))

frontend/src/app/plugins/tokens.cljs

@@ -194,12 +194,7 @@
 
     :addToken
     (fn [type-str name value]
-      (let [type (cto/dtcg-token-type->token-type type-str)
-            value (case type
-                    :font-family (ctob/convert-dtcg-font-family (js->clj value))
-                    :typography (ctob/convert-dtcg-typography-composite (js->clj value))
-                    :shadow (ctob/convert-dtcg-shadow-composite (js->clj value))
-                    (js->clj value))]
+      (let [type (cto/dtcg-token-type->token-type type-str)]
         (cond
           (nil? type)
           (u/display-not-valid :addTokenType type-str)

frontend/src/app/render_wasm/api.cljs

@@ -18,13 +18,11 @@
    [app.common.types.path :as path]
    [app.common.types.path.impl :as path.impl]
    [app.common.types.shape.layout :as ctl]
-   [app.common.types.text :as txt]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.main.refs :as refs]
    [app.main.render :as render]
    [app.main.store :as st]
-   [app.main.ui.shapes.text]
    [app.main.worker :as mw]
    [app.render-wasm.api.fonts :as f]
    [app.render-wasm.api.texts :as t]
@@ -35,7 +33,7 @@
    [app.render-wasm.performance :as perf]
    [app.render-wasm.serializers :as sr]
    [app.render-wasm.serializers.color :as sr-clr]
-   [app.render-wasm.svg-filters :as svg-filters]
+   [app.render-wasm.svg-fills :as svg-fills]
    ;; FIXME: rename; confunsing name
    [app.render-wasm.wasm :as wasm]
    [app.util.debug :as dbg]
@@ -44,7 +42,6 @@
    [app.util.modules :as mod]
    [app.util.text.content :as tc]
    [beicon.v2.core :as rx]
-   [cuerdas.core :as str]
    [promesa.core :as p]
    [rumext.v2 :as mf]))
 
@@ -706,7 +703,7 @@
   (set-grid-layout-columns (get shape :layout-grid-columns))
   (set-grid-layout-cells (get shape :layout-grid-cells)))
 
-(defn set-layout-data
+(defn set-layout-child
   [shape]
   (let [margins       (get shape :layout-item-margin)
         margin-top    (get margins :m1 0)
@@ -729,7 +726,7 @@
         is-absolute   (boolean (get shape :layout-item-absolute))
         z-index       (get shape :layout-item-z-index)]
     (h/call wasm/internal-module
-            "_set_layout_data"
+            "_set_layout_child_data"
             margin-top
             margin-right
             margin-bottom
@@ -749,11 +746,6 @@
             is-absolute
             (d/nilv z-index 0))))
 
-(defn has-any-layout-prop? [shape]
-  (some #(and (keyword? %)
-              (str/starts-with? (name %) "layout-"))
-        (keys shape)))
-
 (defn clear-layout
   []
   (h/call wasm/internal-module "_clear_shape_layout"))
@@ -761,10 +753,10 @@
 (defn- set-shape-layout
   [shape objects]
   (clear-layout)
+
   (when (or (ctl/any-layout? shape)
-            (ctl/any-layout-immediate-child? objects shape)
-            (has-any-layout-prop? shape))
-    (set-layout-data shape))
+            (ctl/any-layout-immediate-child? objects shape))
+    (set-layout-child shape))
 
   (when (ctl/flex-layout? shape)
     (set-flex-layout shape))
@@ -883,43 +875,27 @@
 
 (def render-finish
   (letfn [(do-render [ts]
-            (perf/begin-measure "render-finish")
             (h/call wasm/internal-module "_set_view_end")
-            (render ts)
-            (perf/end-measure "render-finish"))]
+            (render ts))]
     (fns/debounce do-render DEBOUNCE_DELAY_MS)))
 
 (def render-pan
-  (letfn [(do-render-pan [ts]
-            (perf/begin-measure "render-pan")
-            (render ts)
-            (perf/end-measure "render-pan"))]
-    (fns/throttle do-render-pan THROTTLE_DELAY_MS)))
+  (fns/throttle render THROTTLE_DELAY_MS))
 
 (defn set-view-box
   [prev-zoom zoom vbox]
-  (let [is-pan (mth/close? prev-zoom zoom)]
-    (perf/begin-measure "set-view-box")
-    (h/call wasm/internal-module "_set_view_start")
-    (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
+  (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
 
-    (if is-pan
-      (do (perf/end-measure "set-view-box")
-          (perf/begin-measure "set-view-box::pan")
-          (render-pan)
-          (render-finish)
-          (perf/end-measure "set-view-box::pan"))
-      (do (perf/end-measure "set-view-box")
-          (perf/begin-measure "set-view-box::zoom")
-          (h/call wasm/internal-module "_render_from_cache" 0)
-          (render-finish)
-          (perf/end-measure "set-view-box::zoom")))))
+  (if (mth/close? prev-zoom zoom)
+    (do (render-pan)
+        (render-finish))
+    (do (h/call wasm/internal-module "_render_from_cache" 0)
+        (render-finish))))
 
 (defn set-object
   [objects shape]
   (perf/begin-measure "set-object")
-  (let [shape        (svg-filters/apply-svg-derived shape)
-        id           (dm/get-prop shape :id)
+  (let [id           (dm/get-prop shape :id)
         type         (dm/get-prop shape :type)
 
         parent-id    (get shape :parent-id)
@@ -933,7 +909,14 @@
         rotation     (get shape :rotation)
         transform    (get shape :transform)
 
-        fills        (get shape :fills)
+        ;; If the shape comes from an imported SVG (we know this because
+        ;; it has the :svg-attrs attribute) and it does not have its
+        ;; own fill, we set a default black fill. This fill will be
+        ;; inherited by child nodes and emulates the behavior of
+        ;; standard SVG, where a node without an explicit fill
+        ;; defaults to black.
+        fills        (svg-fills/resolve-shape-fills shape)
+
         strokes      (if (= type :group)
                        [] (get shape :strokes))
         children     (get shape :shapes)
@@ -965,8 +948,8 @@
     (set-shape-children children)
     (set-shape-corners corners)
     (set-shape-blur blur)
-    (when (= type :group)
-      (set-masked (boolean masked)))
+    (when (and (= type :group) masked)
+      (set-masked masked))
     (when (= type :bool)
       (set-shape-bool-type bool-type))
     (when (and (some? content)
@@ -977,11 +960,12 @@
       (set-shape-svg-attrs svg-attrs))
     (when (and (some? content) (= type :svg-raw))
       (set-shape-svg-raw-content (get-static-markup shape)))
-    (set-shape-shadows shadows)
+    (when (some? shadows) (set-shape-shadows shadows))
     (when (= type :text)
       (set-shape-grow-type grow-type))
 
     (set-shape-layout shape objects)
+
     (set-shape-selrect selrect)
 
     (let [pending_thumbnails (into [] (concat
@@ -1005,7 +989,10 @@
        (run!
         (fn [id]
           (f/update-text-layout id)
-          (update-text-rect! id)))))
+          (mw/emit! {:cmd :index/update-text-rect
+                     :page-id (:current-page-id @st/state)
+                     :shape-id id
+                     :dimensions (get-text-dimensions id)})))))
 
 (defn process-pending
   ([shapes thumbnails full on-complete]
@@ -1246,8 +1233,6 @@
     (when-not (nil? context)
       (let [handle (.registerContext ^js gl context #js {"majorVersion" 2})]
         (.makeContextCurrent ^js gl handle)
-        (set! wasm/gl-context-handle handle)
-        (set! wasm/gl-context context)
 
         ;; Force the WEBGL_debug_renderer_info extension as emscripten does not enable it
         (.getExtension context "WEBGL_debug_renderer_info")
@@ -1270,20 +1255,6 @@
     (set! wasm/context-initialized? false)
     (h/call wasm/internal-module "_clean_up")
 
-    ;; Ensure the WebGL context is properly disposed so browsers do not keep
-    ;; accumulating active contexts between page switches.
-    (when-let [gl (unchecked-get wasm/internal-module "GL")]
-      (when-let [handle wasm/gl-context-handle]
-        (try
-          ;; Ask the browser to release resources explicitly if available.
-          (when-let [ctx wasm/gl-context]
-            (when-let [lose-ext (.getExtension ^js ctx "WEBGL_lose_context")]
-              (.loseContext ^js lose-ext)))
-          (.deleteContext ^js gl handle)
-          (finally
-            (set! wasm/gl-context-handle nil)
-            (set! wasm/gl-context nil)))))
-
     ;; If this calls panics we don't want to crash. This happens sometimes
     ;; with hot-reload in develop
     (catch :default error
@@ -1377,62 +1348,6 @@
       (h/call wasm/internal-module "_end_temp_objects")
       content)))
 
-(def POSITION-DATA-U8-SIZE 36)
-(def POSITION-DATA-U32-SIZE (/ POSITION-DATA-U8-SIZE 4))
-
-(defn calculate-position-data
-  [shape]
-  (when wasm/context-initialized?
-    (use-shape (:id shape))
-    (let [heapf32 (mem/get-heap-f32)
-          heapu32 (mem/get-heap-u32)
-          offset (-> (h/call wasm/internal-module "_calculate_position_data")
-                     (mem/->offset-32))
-          length (aget heapu32 offset)
-
-          max-offset (+ offset 1 (* length POSITION-DATA-U32-SIZE))
-
-          result
-          (loop [result (transient [])
-                 offset (inc offset)]
-            (if (< offset max-offset)
-              (let [entry (dr/read-position-data-entry heapu32 heapf32 offset)]
-                (recur (conj! result entry)
-                       (+ offset POSITION-DATA-U32-SIZE)))
-              (persistent! result)))
-
-          result
-          (->> result
-               (mapv
-                (fn [{:keys [paragraph span start-pos end-pos direction x y width height]}]
-                  (let [content (:content shape)
-                        element (-> content :children
-                                    (get 0) :children ;; paragraph-set
-                                    (get paragraph) :children ;; paragraph
-                                    (get span))
-                        text (subs (:text element) start-pos end-pos)]
-
-                    (d/patch-object
-                     txt/default-text-attrs
-                     (d/without-nils
-                      {:x x
-                       :y (+ y height)
-                       :width width
-                       :height height
-                       :direction       (dr/translate-direction direction)
-                       :font-family     (get element :font-family)
-                       :font-size       (get element :font-size)
-                       :font-weight     (get element :font-weight)
-                       :text-transform  (get element :text-transform)
-                       :text-decoration (get element :text-decoration)
-                       :letter-spacing  (get element :letter-spacing)
-                       :font-style      (get element :font-style)
-                       :fills           (get element :fills)
-                       :text            text}))))))]
-      (mem/free)
-
-      result)))
-
 (defn init-wasm-module
   [module]
   (let [default-fn (unchecked-get module "default")

frontend/src/app/render_wasm/deserializers.cljs

@@ -45,29 +45,4 @@
      :center (gpt/point cx cy)
      :transform (gmt/matrix a b c d e f)}))
 
-(defn read-position-data-entry
-  [heapu32 heapf32 offset]
-  (let [paragraph (aget heapu32 (+ offset 0))
-        span      (aget heapu32 (+ offset 1))
-        start-pos (aget heapu32 (+ offset 2))
-        end-pos   (aget heapu32 (+ offset 3))
-        x         (aget heapf32 (+ offset 4))
-        y         (aget heapf32 (+ offset 5))
-        width     (aget heapf32 (+ offset 6))
-        height    (aget heapf32 (+ offset 7))
-        direction (aget heapu32 (+ offset 8))]
-    {:paragraph paragraph
-     :span      span
-     :start-pos start-pos
-     :end-pos   end-pos
-     :x         x
-     :y         y
-     :width     width
-     :height    height
-     :direction direction}))
 
-(defn translate-direction
-  [direction]
-  (case direction
-    0 "rtl"
-    "ltr"))

frontend/src/app/render_wasm/shape.cljs

@@ -14,7 +14,7 @@
    [app.common.types.shape.layout :as ctl]
    [app.main.refs :as refs]
    [app.render-wasm.api :as api]
-   [app.render-wasm.svg-filters :as svg-filters]
+   [app.render-wasm.svg-fills :as svg-fills]
    [app.render-wasm.wasm :as wasm]
    [beicon.v2.core :as rx]
    [cljs.core :as c]
@@ -130,11 +130,7 @@
 (defn- set-wasm-attr!
   [shape k]
   (when wasm/context-initialized?
-    (let [shape (case k
-                  :svg-attrs (svg-filters/apply-svg-derived (assoc shape :svg-attrs (get shape :svg-attrs)))
-                  (:fills :blur :shadow) (svg-filters/apply-svg-derived shape)
-                  shape)
-          v  (get shape k)
+    (let [v  (get shape k)
           id (get shape :id)]
       (case k
         :parent-id
@@ -167,7 +163,8 @@
         (api/set-shape-transform v)
 
         :fills
-        (api/set-shape-fills id v false)
+        (let [fills (svg-fills/resolve-shape-fills shape)]
+          (into [] (api/set-shape-fills id fills false)))
 
         :strokes
         (into [] (api/set-shape-strokes id v false))
@@ -225,16 +222,12 @@
           v])
 
         :svg-attrs
-        (do
-          (api/set-shape-svg-attrs v)
-          ;; Always update fills/blur/shadow to clear previous state if filters disappear          
-          (api/set-shape-fills id (:fills shape) false)
-          (api/set-shape-blur (:blur shape))
-          (api/set-shape-shadows (:shadow shape)))
+        (when (cfh/path-shape? shape)
+          (api/set-shape-svg-attrs v))
 
         :masked-group
-        (when (cfh/group-shape? shape)
-          (api/set-masked (boolean (:masked-group shape))))
+        (when (cfh/mask-shape? shape)
+          (api/set-masked (:masked-group shape)))
 
         :content
         (cond
@@ -269,7 +262,7 @@
          :layout-item-min-w
          :layout-item-absolute
          :layout-item-z-index)
-        (api/set-layout-data shape)
+        (api/set-layout-child shape)
 
         :layout-grid-rows
         (api/set-grid-layout-rows v)
@@ -299,7 +292,7 @@
 
             (ctl/flex-layout? shape)
             (api/set-flex-layout shape))
-          (api/set-layout-data shape))
+          (api/set-layout-child shape))
 
         ;; Property not in WASM
         nil))))

frontend/src/app/render_wasm/svg_fills.cljs

@@ -74,30 +74,6 @@
                             :width (max 0.01 (or (dm/get-prop shape :width) 1))
                             :height (max 0.01 (or (dm/get-prop shape :height) 1))}))))
 
-(defn- apply-svg-transform
-  "Applies SVG transform to a point if present."
-  [pt svg-transform]
-  (if svg-transform
-    (gpt/transform pt svg-transform)
-    pt))
-
-(defn- apply-viewbox-transform
-  "Transforms a point from viewBox space to selrect space."
-  [pt viewbox rect]
-  (if viewbox
-    (let [{svg-x :x svg-y :y svg-width :width svg-height :height} viewbox
-          rect-width (max 0.01 (dm/get-prop rect :width))
-          rect-height (max 0.01 (dm/get-prop rect :height))
-          origin-x (or (dm/get-prop rect :x) (dm/get-prop rect :x1) 0)
-          origin-y (or (dm/get-prop rect :y) (dm/get-prop rect :y1) 0)
-          scale-x (/ rect-width svg-width)
-          scale-y (/ rect-height svg-height)
-          ;; Transform from viewBox space to selrect space
-          transformed-x (+ origin-x (* (- (dm/get-prop pt :x) svg-x) scale-x))
-          transformed-y (+ origin-y (* (- (dm/get-prop pt :y) svg-y) scale-y))]
-      (gpt/point transformed-x transformed-y))
-    pt))
-
 (defn- normalize-point
   [pt units shape]
   (if (= units "userspaceonuse")
@@ -105,16 +81,9 @@
           width (max 0.01 (dm/get-prop rect :width))
           height (max 0.01 (dm/get-prop rect :height))
           origin-x (or (dm/get-prop rect :x) (dm/get-prop rect :x1) 0)
-          origin-y (or (dm/get-prop rect :y) (dm/get-prop rect :y1) 0)
-          svg-transform (:svg-transform shape)
-          viewbox (:svg-viewbox shape)
-          ;; For userSpaceOnUse, coordinates are in SVG user space
-          ;; We need to transform them to shape space before normalizing
-          pt-after-svg-transform (apply-svg-transform pt svg-transform)
-          transformed-pt (apply-viewbox-transform pt-after-svg-transform viewbox rect)
-          normalized-x (/ (- (dm/get-prop transformed-pt :x) origin-x) width)
-          normalized-y (/ (- (dm/get-prop transformed-pt :y) origin-y) height)]
-      (gpt/point normalized-x normalized-y))
+          origin-y (or (dm/get-prop rect :y) (dm/get-prop rect :y1) 0)]
+      (gpt/point (/ (- (dm/get-prop pt :x) origin-x) width)
+                 (/ (- (dm/get-prop pt :y) origin-y) height)))
     pt))
 
 (defn- normalize-attrs
@@ -288,25 +257,18 @@
                              (parse-gradient-stop node))))
                    vec)]
     (when (seq stops)
-      (let [[center point-x point-y]
+      (let [[center radius-point]
             (let [points (apply-gradient-transform [(gpt/point cx cy)
-                                                    (gpt/point (+ cx r) cy)
-                                                    (gpt/point cx (+ cy r))]
+                                                    (gpt/point (+ cx r) cy)]
                                                    transform)]
               (map #(normalize-point % units shape) points))
-            radius-x (gpt/distance center point-x)
-            radius-y (gpt/distance center point-y)
-            ;; Prefer Y as the base radius so width becomes the X/Y ratio.
-            base-radius (if (pos? radius-y) radius-y radius-x)
-            radius-point (if (pos? radius-y) point-y point-x)
-            width (let [safe-radius (max base-radius 1.0e-6)]
-                    (/ radius-x safe-radius))]
+            radius (gpt/distance center radius-point)]
         {:type :radial
          :start-x (dm/get-prop center :x)
          :start-y (dm/get-prop center :y)
          :end-x (dm/get-prop radius-point :x)
          :end-y (dm/get-prop radius-point :y)
-         :width width
+         :width radius
          :stops stops}))))
 
 (defn- svg-gradient->fill

frontend/src/app/render_wasm/svg_filters.cljs

@@ -1,98 +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.render-wasm.svg-filters
-  (:require
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.svg :as csvg]
-   [app.common.uuid :as uuid]
-   [app.render-wasm.svg-fills :as svg-fills]))
-
-(def ^:private drop-shadow-tags
-  #{:feOffset :feGaussianBlur :feColorMatrix})
-
-(defn- find-filter-element
-  "Finds a filter element by tag in filter content."
-  [filter-content tag]
-  (some #(when (= tag (:tag %)) %) filter-content))
-
-(defn- find-filter-def
-  [shape]
-  (let [filter-attr (or (dm/get-in shape [:svg-attrs :filter])
-                        (dm/get-in shape [:svg-attrs :style :filter]))
-        svg-defs    (dm/get-prop shape :svg-defs)]
-    (when (and filter-attr svg-defs)
-      (let [filter-ids (csvg/extract-ids filter-attr)]
-        (some #(get svg-defs %) filter-ids)))))
-
-(defn- build-blur
-  [gaussian-blur]
-  (when gaussian-blur
-    {:id (uuid/next)
-     :type :layer-blur
-     ;; For layer blur the value matches stdDeviation directly
-     :value (-> (dm/get-in gaussian-blur [:attrs :stdDeviation])
-                (d/parse-double 0))
-     :hidden false}))
-
-(defn- build-drop-shadow
-  [filter-content drop-shadow-elements]
-  (let [offset-elem (find-filter-element filter-content :feOffset)]
-    (when (and offset-elem (seq drop-shadow-elements))
-      (let [blur-elem  (find-filter-element drop-shadow-elements :feGaussianBlur)
-            dx         (-> (dm/get-in offset-elem [:attrs :dx])
-                           (d/parse-double 0))
-            dy         (-> (dm/get-in offset-elem [:attrs :dy])
-                           (d/parse-double 0))
-            blur-value (if blur-elem
-                         (-> (dm/get-in blur-elem [:attrs :stdDeviation])
-                             (d/parse-double 0)
-                             (* 2))
-                         0)]
-        [{:id (uuid/next)
-          :style :drop-shadow
-          :offset-x dx
-          :offset-y dy
-          :blur blur-value
-          :spread 0
-          :hidden false
-          ;; TODO: parse feColorMatrix to extract color/opacity
-          :color {:color "#000000" :opacity 1}}]))))
-
-(defn apply-svg-filters
-  "Derives native blur/shadow from SVG filter definitions when the shape does
-  not already have them. The SVG attributes are left untouched so SVG fallback
-  rendering keeps working the same way as gradient fills."
-  [shape]
-  (let [existing-blur   (:blur shape)
-        existing-shadow (:shadow shape)]
-    (if-let [filter-def (find-filter-def shape)]
-      (let [content              (:content filter-def)
-            gaussian-blur        (find-filter-element content :feGaussianBlur)
-            drop-shadow-elements (filter #(contains? drop-shadow-tags (:tag %)) content)
-            blur                 (or existing-blur (build-blur gaussian-blur))
-            shadow               (if (seq existing-shadow)
-                                   existing-shadow
-                                   (build-drop-shadow content drop-shadow-elements))]
-        (cond-> shape
-          blur (assoc :blur blur)
-          (seq shadow) (assoc :shadow shadow)))
-      shape)))
-
-(defn apply-svg-derived
-  "Applies SVG-derived effects (fills, blur, shadows) uniformly.
-  - Keeps user fills if present; otherwise derives from SVG.
-  - Converts SVG filters into native blur/shadow when needed.
-  - Always returns shape with :fills (possibly []) and blur/shadow keys."
-  [shape]
-  (let [shape' (apply-svg-filters shape)
-        fills  (or (svg-fills/resolve-shape-fills shape') [])]
-    (assoc shape'
-           :fills fills
-           :blur (:blur shape')
-           :shadow (:shadow shape'))))
-

frontend/src/app/render_wasm/wasm.cljs

@@ -9,8 +9,6 @@
 
 (defonce internal-frame-id nil)
 (defonce internal-module #js {})
-(defonce gl-context-handle nil)
-(defonce gl-context nil)
 (defonce serializers
   #js {:blur-type shared/RawBlurType
        :blend-mode shared/RawBlendMode

frontend/src/app/util/code_highlight.cljs

@@ -6,11 +6,11 @@
 
 (ns app.util.code-highlight
   (:require
-   ["highlight.js" :as hljs]
+   ["@penpot/hljs" :as hljs]
    [app.util.dom :as dom]))
 
 (defn highlight!
   {:lazy-loadable true}
   [node]
   (dom/set-data! node "highlighted" nil)
-  (.highlightElement hljs/default node))
+  (hljs/highlightElement node))