Merge remote-tracking branch 'origin/main' into develop

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

@@ -25,7 +25,7 @@
 ;; General purpose events & IMPL
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn team-fonts-loaded
+(defn fonts-fetched
   [fonts]
   (letfn [;; Prepare font to the internal font database format.
           (prepare-font [[id [item :as items]]]
@@ -74,8 +74,8 @@
   (ptk/reify ::load-team-fonts
     ptk/WatchEvent
     (watch [_ state stream]
-      (->> (rp/query :team-font-variants {:team-id team-id})
-           (rx/map team-fonts-loaded)))))
+      (->> (rp/query :font-variants {:team-id team-id})
+           (rx/map fonts-fetched)))))
 
 (defn process-upload
   "Given a seq of blobs and the team id, creates a ready-to-use fonts

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

@@ -12,9 +12,10 @@
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
    [app.main.constants :as c]
+   [app.main.data.comments :as dcm]
+   [app.main.data.fonts :as df]
    [app.main.repo :as rp]
    [app.main.store :as st]
-   [app.main.data.comments :as dcm]
    [app.util.avatars :as avatars]
    [app.util.router :as rt]
    [beicon.core :as rx]
@@ -97,7 +98,10 @@
                             :file-id file-id}
                      (string? token) (assoc :token token))]
         (->> (rp/query :viewer-bundle params)
-             (rx/map bundle-fetched))))))
+             (rx/mapcat
+              (fn [{:keys [fonts] :as bundle}]
+                (rx/of (df/fonts-fetched fonts)
+                       (bundle-fetched bundle)))))))))
 
 (defn- extract-frames
   [objects]

frontend/src/app/main/exports.cljs

@@ -7,27 +7,27 @@
 (ns app.main.exports
   "The main logic for SVG export functionality."
   (:require
-   [rumext.alpha :as mf]
-   [cuerdas.core :as str]
-   [app.common.uuid :as uuid]
-   [app.common.pages :as cp]
-   [app.common.math :as mth]
-   [app.common.geom.shapes :as gsh]
    [app.common.geom.align :as gal]
-   [app.common.geom.point :as gpt]
    [app.common.geom.matrix :as gmt]
-   [app.util.timers :as ts]
+   [app.common.geom.point :as gpt]
+   [app.common.geom.shapes :as gsh]
+   [app.common.math :as mth]
+   [app.common.pages :as cp]
+   [app.common.uuid :as uuid]
+   [app.main.ui.shapes.circle :as circle]
+   [app.main.ui.shapes.embed :as embed]
    [app.main.ui.shapes.filters :as filters]
    [app.main.ui.shapes.frame :as frame]
-   [app.main.ui.shapes.circle :as circle]
+   [app.main.ui.shapes.group :as group]
    [app.main.ui.shapes.image :as image]
    [app.main.ui.shapes.path :as path]
    [app.main.ui.shapes.rect :as rect]
-   [app.main.ui.shapes.text :as text]
-   [app.main.ui.shapes.group :as group]
-   [app.main.ui.shapes.svg-raw :as svg-raw]
    [app.main.ui.shapes.shape :refer [shape-container]]
-   [app.main.ui.shapes.embed :as embed]))
+   [app.main.ui.shapes.svg-raw :as svg-raw]
+   [app.main.ui.shapes.text :as text]
+   [app.util.timers :as ts]
+   [cuerdas.core :as str]
+   [rumext.alpha :as mf]))
 
 (def ^:private default-color "#E8E9EA") ;; $color-canvas
 
@@ -231,4 +231,3 @@
            :xmlnsXlink "http://www.w3.org/1999/xlink"
            :xmlns "http://www.w3.org/2000/svg"}
      [:& wrapper {:shape group :view-box vbox}]]))
-

frontend/src/app/main/repo.cljs

@@ -19,7 +19,7 @@
   (cond
     (= 204 status)
     ;; We need to send "something" so the streams listening downstream can act
-    (rx/of :empty)
+    (rx/of nil)
 
     (= 502 status)
     (rx/throw {:type :bad-gateway})

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

@@ -329,7 +329,7 @@
           (fn [e]
             (reset! dragging? false)
             (when (not= selected-project project-id)
-              (let [data  {:ids selected-files
+              (let [data  {:ids (into #{} (keys selected-files))
                            :project-id project-id}
                     mdata {:on-success on-drop-success}]
                 (st/emit! (dd/move-files (with-meta data mdata)))))))]

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

@@ -79,7 +79,8 @@
                       :min-width? true
                       :top top
                       :left left
-                      :options [[(tr "labels.rename") on-edit]
+                      :options [(when-not (:is-default project)
+                                  [(tr "labels.rename") on-edit])
                                 [(tr "dashboard.duplicate") on-duplicate]
                                 [(tr "dashboard.pin-unpin") toggle-pin]
                                 (when (seq teams)

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

@@ -12,8 +12,10 @@
    [app.common.math :as mth]
    [app.common.pages :as cp]
    [app.common.uuid :as uuid]
+   [app.main.data.fonts :as df]
    [app.main.exports :as exports]
    [app.main.repo :as repo]
+   [app.main.store :as st]
    [app.main.ui.shapes.embed :as embed]
    [app.main.ui.shapes.filters :as filters]
    [app.main.ui.shapes.shape :refer [shape-container]]
@@ -42,7 +44,6 @@
         objects  (reduce updt-fn objects mod-ids)
         object   (get objects object-id)
 
-
         {:keys [width height]} (gsh/points->selrect (:points object))
 
         ;; We need to get the shadows/blurs paddings to create the viewbox properly
@@ -80,6 +81,7 @@
             :xmlnsXlink "http://www.w3.org/1999/xlink"
             :xmlns "http://www.w3.org/2000/svg"
             :xmlns:penpot "https://penpot.app/xmlns"}
+
       (case (:type object)
         :frame [:& frame-wrapper {:shape object :view-box vbox}]
         :group [:> shape-container {:shape object}
@@ -107,12 +109,19 @@
   [{:keys [file-id page-id object-id] :as props}]
   (let [objects (mf/use-state nil)]
     (mf/use-effect
-     #(let [subs (->> (repo/query! :file {:id file-id})
-                      (rx/subs (fn [{:keys [data]}]
-                                 (let [objs (get-in data [:pages-index page-id :objects])
-                                       objs (adapt-root-frame objs object-id)]
-                                   (reset! objects objs)))))]
-        (fn [] (rx/dispose! subs))))
+     (mf/deps file-id page-id object-id)
+     (fn []
+       (->> (rx/zip
+             (repo/query! :font-variants {:file-id file-id})
+             (repo/query! :file {:id file-id}))
+            (rx/subs
+             (fn [[fonts {:keys [data]} :as kaka]]
+               (when (seq fonts)
+                 (st/emit! (df/fonts-fetched fonts)))
+               (let [objs (get-in data [:pages-index page-id :objects])
+                     objs (adapt-root-frame objs object-id)]
+                 (reset! objects objs)))))
+       (constantly nil)))
 
     (when @objects
       [:& object-svg {:objects @objects

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

@@ -75,7 +75,7 @@
 (mf/defc thumbnails-summary
   [{:keys [on-toggle-expand on-close total] :as props}]
   [:div.thumbnails-summary
-   [:span.counter (str total " frames")]
+   [:span.counter (tr "labels.num-of-frames" (i18n/c total))]
    [:span.buttons
     [:span.btn-expand {:on-click on-toggle-expand} i/arrow-down]
     [:span.btn-close {:on-click on-close} i/close]]])