Merge pull request #3286 from penpot/superalex-fix-add-flow-option-for-frames

🐛 Fix add flow option in contextual menu for frames

CHANGES.md

@@ -1,5 +1,7 @@
 # CHANGELOG
 
+## 1.18.5
+
 ## 1.18.4
 
 ### :bug: Bugs fixed

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

@@ -169,14 +169,16 @@
   [{:keys [::db/pool] :as cfg} params]
 
   (when-not (contains? cf/flags :registration)
-    (if-not (contains? params :invitation-token)
+    (when-not (contains? params :invitation-token)
       (ex/raise :type :restriction
-                :code :registration-disabled)
-      (let [invitation (tokens/verify (::main/props cfg) {:token (:invitation-token params) :iss :team-invitation})]
-        (when-not (= (:email params) (:member-email invitation))
-          (ex/raise :type :restriction
-                    :code :email-does-not-match-invitation
-                    :hint "email should match the invitation")))))
+                :code :registration-disabled)))
+
+  (when (contains? params :invitation-token)
+    (let [invitation (tokens/verify (::main/props cfg) {:token (:invitation-token params) :iss :team-invitation})]
+      (when-not (= (:email params) (:member-email invitation))
+        (ex/raise :type :restriction
+                  :code :email-does-not-match-invitation
+                  :hint "email should match the invitation"))))
 
   (when-let [domains (cf/get :registration-domain-whitelist)]
     (when-not (email-domain-in-whitelist? domains (:email params))

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

@@ -8,6 +8,7 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.math :as mth]
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
    [clojure.spec.alpha :as s]))
@@ -262,8 +263,8 @@
 
 (defn gaps
   [{:keys [layout-gap]}]
-  (let [layout-gap-row (or (-> layout-gap :row-gap) 0)
-        layout-gap-col (or (-> layout-gap :column-gap) 0)]
+  (let [layout-gap-row (or (-> layout-gap :row-gap (mth/finite 0)) 0)
+        layout-gap-col (or (-> layout-gap :column-gap (mth/finite 0)) 0)]
     [layout-gap-row layout-gap-col]))
 
 (defn child-min-width

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

@@ -44,6 +44,7 @@
    [app.main.data.workspace.drawing.common :as dwdc]
    [app.main.data.workspace.edition :as dwe]
    [app.main.data.workspace.fix-bool-contents :as fbc]
+   [app.main.data.workspace.fix-deleted-fonts :as fdf]
    [app.main.data.workspace.groups :as dwg]
    [app.main.data.workspace.guides :as dwgu]
    [app.main.data.workspace.highlight :as dwh]
@@ -131,6 +132,7 @@
             components-v2  (features/active-feature? state :components-v2)]
         (rx/merge
          (rx/of (fbc/fix-bool-contents))
+         (rx/of (fdf/fix-deleted-fonts))
          (if (and has-graphics? components-v2)
            (rx/of (remove-graphics (:id file) (:name file)))
            (rx/empty)))))))

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

@@ -0,0 +1,129 @@
+;; 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.data.workspace.fix-deleted-fonts
+  (:require
+   [app.common.data :as d]
+   [app.common.pages.helpers :as cph]
+   [app.common.text :as txt]
+   [app.main.data.workspace.changes :as dch]
+   [app.main.data.workspace.state-helpers :as wsh]
+   [app.main.fonts :as fonts]
+   [beicon.core :as rx]
+   [potok.core :as ptk]))
+
+;; This event will update the file so the texts with non existing custom fonts try to be fixed.
+;; This can happen when:
+;; - Exporting/importing files to different teams or penpot instances
+;; - Moving files from one team to another in the same instance
+;; - Custom fonts are explicitly deleted in the team area
+
+(defn has-invalid-font-family
+  [node]
+  (let [fonts (deref fonts/fontsdb)]
+    (and
+      (some? (:font-family node))
+      (nil? (get fonts (:font-id node))))))
+
+(defn calculate-alternative-font-id
+  [value]
+  (let [fonts (deref fonts/fontsdb)]
+    (->> (vals fonts)
+         (filter #(= (:family %) value))
+         (first)
+         :id)))
+
+(defn should-fix-deleted-font-shape?
+  [shape]
+  (let [text-nodes (txt/node-seq txt/is-text-node? (:content shape))]
+    (and (cph/text-shape? shape) (some has-invalid-font-family text-nodes))))
+
+(defn should-fix-deleted-font-component?
+  [component]
+  (->> (:objects component)
+       (vals)
+       (d/seek should-fix-deleted-font-shape?)))
+
+(defn should-fix-deleted-font-typography?
+  [typography]
+  (let [fonts (deref fonts/fontsdb)]
+    (nil? (get fonts (:font-id typography)))))
+
+(defn fix-deleted-font
+  [node]
+  (let [alternative-font-id (calculate-alternative-font-id (:font-family node))]
+    (cond-> node
+      (some? alternative-font-id) (assoc :font-id alternative-font-id))))
+
+(defn fix-deleted-font-shape
+  [shape]
+  (let [transform (partial txt/transform-nodes has-invalid-font-family fix-deleted-font)]
+    (update shape :content transform)))
+
+(defn fix-deleted-font-component
+  [component]
+  (update component
+    :objects
+    (fn [objects]
+      (d/mapm #(fix-deleted-font-shape %2) objects))))
+
+(defn fix-deleted-font-typography
+  [typography]
+  (let [alternative-font-id (calculate-alternative-font-id (:font-family typography))]
+    (cond-> typography
+      (some? alternative-font-id) (assoc :font-id alternative-font-id))))
+
+(defn fix-deleted-fonts
+  []
+  (ptk/reify ::fix-deleted-fonts
+    ptk/WatchEvent
+    (watch [it state _]
+      (let [objects (wsh/lookup-page-objects state)
+
+            ids (into #{}
+                  (comp (filter should-fix-deleted-font-shape?) (map :id))
+                  (vals objects))
+
+            components (->> (wsh/lookup-local-components state)
+                            (vals)
+                            (filter should-fix-deleted-font-component?))
+
+            component-changes
+            (into []
+              (map (fn [component]
+                     {:type :mod-component
+                      :id (:id component)
+                      :objects (-> (fix-deleted-font-component component) :objects)}))
+              components)
+
+            typographies (->> (get-in state [:workspace-data :typographies])
+                              (vals)
+                              (filter should-fix-deleted-font-typography?))
+
+            typography-changes
+            (into []
+              (map (fn [typography]
+                     {:type :mod-typography
+                      :typography (fix-deleted-font-typography typography)}))
+              typographies)]
+
+        (rx/concat
+          (rx/of (dch/update-shapes ids #(fix-deleted-font-shape %) {:reg-objects? false
+                                                           :save-undo? false
+                                                           :ignore-tree true}))
+          (if (empty? component-changes)
+            (rx/empty)
+            (rx/of (dch/commit-changes {:origin it
+                                        :redo-changes component-changes
+                                        :undo-changes []
+                                        :save-undo? false})))
+
+          (if (empty? typography-changes)
+            (rx/empty)
+            (rx/of (dch/commit-changes {:origin it
+                                        :redo-changes typography-changes
+                                        :undo-changes []
+                                        :save-undo? false}))))))))

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

@@ -126,8 +126,10 @@
          all-width (->> selrects
                         (map :width)
                         (reduce +))
-         column-gap (if (or (= direction :row) (= direction :row-reverse))
-                      (/ (- (- max-x min-x) all-width) (dec (count shapes)))
+         column-gap (if (and (> (count shapes) 1)
+                             (or (= direction :row) (= direction :row-reverse)))
+                      (/ (- (- max-x min-x) all-width)
+                         (dec (count shapes)))
                       0)
 
          min-y (->> selrects
@@ -139,8 +141,10 @@
          all-height (->> selrects
                          (map :height)
                          (reduce +))
-         row-gap (if (or (= direction :column) (= direction :column-reverse))
-                   (/ (- (- max-y min-y) all-height) (dec (count shapes)))
+         row-gap (if (and (> (count shapes) 1)
+                          (or (= direction :column) (= direction :column-reverse)))
+                   (/ (- (- max-y min-y) all-height)
+                      (dec (count shapes)))
                    0)
 
          layout-gap {:row-gap (max row-gap 0) :column-gap (max column-gap 0)}

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

@@ -290,7 +290,6 @@
    [:text {:x (+ x (/ width 2))
            :y (+ y (/ height 2))
            :text-anchor "middle"
-           :text-align "center"
            :dominant-baseline "central"
            :style {:fill distance-text-color
                    :font-size font-size}}
@@ -352,8 +351,8 @@
 
     [:rect.padding-rect {:x (:x rect-data)
                          :y (:y rect-data)
-                         :width (:width rect-data)
-                         :height (:height rect-data)
+                         :width (max 0 (:width rect-data))
+                         :height (max 0 (:height rect-data))
                          :on-pointer-enter on-pointer-enter
                          :on-pointer-leave on-pointer-leave
                          :on-pointer-down on-pointer-down

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

@@ -349,7 +349,7 @@
 (mf/defc context-menu-prototype
   [{:keys [shapes]}]
   (let [options         (mf/deref refs/workspace-page-options)
-        options-mode    (mf/deref refs/options-mode)
+        options-mode    (mf/deref refs/options-mode-global)
         do-add-flow     #(st/emit! (dwi/add-flow-selected-frame))
         do-remove-flow  #(st/emit! (dwi/remove-flow (:id %)))
         flows           (:flows options)

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

@@ -8,6 +8,7 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.math :as mth]
    [app.main.data.workspace :as udw]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.refs :as refs]
@@ -337,7 +338,7 @@
         i/auto-gap]
        [:> numeric-input {:no-validate true
                           :placeholder "--"
-                        :on-focus (fn [event]
+                          :on-focus (fn [event]
                                       (select-gap :column-gap)
                                       (reset! gap-selected? :column-gap)
                                       (dom/select-target event))
@@ -535,9 +536,10 @@
 
         set-gap
         (fn [gap-multiple? type val]
-          (if gap-multiple?
-            (st/emit! (dwsl/update-layout ids {:layout-gap {:row-gap val :column-gap val}}))
-            (st/emit! (dwsl/update-layout ids {:layout-gap {type val}}))))
+          (let [val (mth/finite val 0)]
+            (if gap-multiple?
+              (st/emit! (dwsl/update-layout ids {:layout-gap {:row-gap val :column-gap val}}))
+              (st/emit! (dwsl/update-layout ids {:layout-gap {type val}})))))
 
         ;; Padding
 
@@ -547,15 +549,16 @@
 
         on-padding-change
         (fn [type prop val]
-          (cond
-            (and (= type :simple) (= prop :p1))
-            (st/emit! (dwsl/update-layout ids {:layout-padding {:p1 val :p3 val}}))
+          (let [val (mth/finite val 0)]
+            (cond
+              (and (= type :simple) (= prop :p1))
+              (st/emit! (dwsl/update-layout ids {:layout-padding {:p1 val :p3 val}}))
 
-            (and (= type :simple) (= prop :p2))
-            (st/emit! (dwsl/update-layout ids {:layout-padding {:p2 val :p4 val}}))
+              (and (= type :simple) (= prop :p2))
+              (st/emit! (dwsl/update-layout ids {:layout-padding {:p2 val :p4 val}}))
 
-            :else
-            (st/emit! (dwsl/update-layout ids {:layout-padding {prop val}}))))
+              :else
+              (st/emit! (dwsl/update-layout ids {:layout-padding {prop val}})))))
 
         ;; Grid-direction
 

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

@@ -543,8 +543,8 @@
              [:clipPath {:id "clip-handlers"}
               [:rect {:x (+ (:x vbox) rule-area-size)
                       :y (+ (:y vbox) rule-area-size)
-                      :width (- (:width vbox) (* rule-area-size 2))
-                      :height (- (:height vbox) (* rule-area-size 2))}]])]
+                      :width (max 0 (- (:width vbox) (* rule-area-size 2)))
+                      :height (max 0 (- (:height vbox) (* rule-area-size 2)))}]])]
 
           [:& selection/selection-handlers
            {:selected selected

frontend/translations/en.po

@@ -387,7 +387,7 @@ msgid "dashboard.export.title"
 msgstr "Export files"
 
 msgid "dashboard.fonts.deleted-placeholder"
-msgstr "Font deleted"
+msgstr "Missing font"
 
 #: src/app/main/ui/dashboard/fonts.cljs
 msgid "dashboard.fonts.dismiss-all"

frontend/translations/es.po

@@ -393,7 +393,7 @@ msgid "dashboard.export.title"
 msgstr "Exportar ficheros"
 
 msgid "dashboard.fonts.deleted-placeholder"
-msgstr "Fuente eliminada"
+msgstr "Fuente no encontrada"
 
 #: src/app/main/ui/dashboard/fonts.cljs
 msgid "dashboard.fonts.dismiss-all"

version.txt

@@ -1 +1 @@
-1.18.4
+1.18.5