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

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

@@ -1098,15 +1098,24 @@
             (when (seq (:redo-changes changes))
               (rx/of (dch/commit-changes changes)))
             (when-not (empty? updated-frames)
-              (rx/merge
-               (rx/of (ptk/data-event :layout/update {:ids (map :id updated-frames) :undo-group undo-group}))
-               (->> (rx/from updated-frames)
-                    (rx/mapcat
-                     (fn [shape]
-                       (rx/of
-                        (dwt/clear-thumbnail file-id (:page-id shape) (:id shape) "frame")
-                        (when-not (= (:frame-id shape) uuid/zero)
-                          (dwt/clear-thumbnail file-id (:page-id shape) (:frame-id shape) "frame"))))))))
+              (let [frames-by-page (->> updated-frames
+                                        (group-by :page-id))]
+                (rx/merge
+                 ;; Emit one layout/update event for each page
+                 (rx/from
+                  (map (fn [[page-id frames]]
+                         (ptk/data-event :layout/update
+                                         {:page-id page-id
+                                          :ids (map :id frames)
+                                          :undo-group undo-group}))
+                       frames-by-page))
+                 (->> (rx/from updated-frames)
+                      (rx/mapcat
+                       (fn [shape]
+                         (rx/of
+                          (dwt/clear-thumbnail file-id (:page-id shape) (:id shape) "frame")
+                          (when-not (= (:frame-id shape) uuid/zero)
+                            (dwt/clear-thumbnail file-id (:page-id shape) (:frame-id shape) "frame")))))))))
 
             (when (not= file-id library-id)
               ;; When we have just updated the library file, give some time for the

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

@@ -131,11 +131,12 @@
              ;; they are process together. It will get a better performance.
              (rx/buffer-time 100)
              (rx/filter #(d/not-empty? %))
-             (rx/map
+             (rx/mapcat
               (fn [data]
-                (let [page-id (->> data (keep :page-id) first)
-                      ids (reduce #(into %1 (:ids %2)) #{} data)]
-                  (update-layout-positions {:page-id page-id :ids ids}))))
+                (->> (group-by :page-id data)
+                     (map (fn [[page-id items]]
+                            (let [ids (reduce #(into %1 (:ids %2)) #{} items)]
+                              (update-layout-positions {:page-id page-id :ids ids})))))))
              (rx/take-until stopper))))))
 
 (defn finalize-shape-layout

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

@@ -304,7 +304,6 @@
    (when (string? value)
      (generate-text-shape-update {:text-transform value} shape-ids page-id))))
 
-
 ;; Events to apply / unapply tokens to shapes ------------------------------------------------------------
 
 (defn apply-token

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

@@ -75,7 +75,7 @@
         [:> cta-power-up*
          {:top-title (tr "subscription.dashboard.power-up.your-subscription")
           :top-description (tr "subscription.dashboard.power-up.unlimited-plan")
-          :bottom-description (tr "subscription.dashboard.power-up.unlimited.bottom", subscription-href)
+          :bottom-description (tr "subscription.dashboard.power-up.unlimited.bottom-text", subscription-href)
           :has-dropdown true}])
 
       "enterprise"

frontend/src/app/main/ui/settings/subscription.cljs

@@ -365,17 +365,17 @@
            [:> plan-card* {:card-title (tr "subscription.settings.enterprise-trial")
                            :card-title-icon i/character-e
                            :benefits-title (tr "subscription.settings.benefits.all-professional-benefits")
-                           :benefits [(tr "subscription.settings.enterprise.security"),
+                           :benefits [(tr "subscription.settings.enterprise.unlimited-storage"),
                                       (tr "subscription.settings.enterprise.capped-bill"),
-                                      (tr "subscription.settings.enterprise.unlimited-storage")]
+                                      (tr "subscription.settings.enterprise.autosave")]
                            :cta-text (tr "subscription.settings.manage-your-subscription")
                            :cta-link go-to-payments}]
            [:> plan-card* {:card-title (tr "subscription.settings.enterprise")
                            :card-title-icon i/character-e
                            :benefits-title (tr "subscription.settings.benefits.all-professional-benefits")
-                           :benefits [(tr "subscription.settings.enterprise.security"),
+                           :benefits [(tr "subscription.settings.enterprise.unlimited-storage"),
                                       (tr "subscription.settings.enterprise.capped-bill"),
-                                      (tr "subscription.settings.enterprise.unlimited-storage")]
+                                      (tr "subscription.settings.enterprise.autosave")]
                            :cta-text (tr "subscription.settings.manage-your-subscription")
                            :cta-link go-to-payments}]))
 
@@ -425,9 +425,9 @@
                          :price-value "$950"
                          :price-period (tr "subscription.settings.price-organization-month")
                          :benefits-title (tr "subscription.settings.benefits.all-unlimited-benefits")
-                         :benefits [(tr "subscription.settings.enterprise.security"),
+                         :benefits [(tr "subscription.settings.enterprise.unlimited-storage"),
                                     (tr "subscription.settings.enterprise.capped-bill"),
-                                    (tr "subscription.settings.enterprise.unlimited-storage")]
+                                    (tr "subscription.settings.enterprise.autosave")]
                          :cta-text (if subscription (tr "subscription.settings.subscribe") (tr "subscription.settings.try-it-free"))
                          :cta-link #(open-subscription-modal "enterprise" subscription)
                          :cta-text-with-icon (tr "subscription.settings.more-information")

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

@@ -275,10 +275,8 @@
 
         handle-gradient-remove-stop
         (mf/use-fn
-         (mf/deps state)
          (fn [index]
-           (when (> (count (:stops state)) 2)
-             (st/emit! (dc/remove-gradient-stop index)))))
+           (st/emit! (dc/remove-gradient-stop index))))
 
         handle-stop-edit-start
         (mf/use-fn

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

@@ -59,6 +59,14 @@
            on-unmount children is-selected icon disabled value]}]
   (let [submenu-ref (mf/use-ref nil)
         hovering?   (mf/use-ref false)
+
+        on-click'
+        (mf/use-fn
+         (mf/deps on-click)
+         (fn [event]
+           (st/emit! dw/hide-context-menu)
+           (when on-click (on-click event))))
+
         on-pointer-enter
         (mf/use-fn
          (fn []
@@ -96,7 +104,7 @@
             :disabled disabled
             :data-value value
             :ref set-dom-node
-            :on-click on-click
+            :on-click on-click'
             :on-pointer-enter on-pointer-enter
             :on-pointer-leave on-pointer-leave}
        [:span
@@ -110,7 +118,7 @@
             :disabled disabled
             :ref set-dom-node
             :data-value value
-            :on-click on-click
+            :on-click on-click'
             :on-pointer-enter on-pointer-enter
             :on-pointer-leave on-pointer-leave}
        [:span {:class (stl/css :title)} title]

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

@@ -41,25 +41,9 @@
     ""
     (ust/format-precision value 2)))
 
-(defn- get-next-font
-  [{:keys [id] :as current} fonts]
-  (if (seq fonts)
-    (let [index (d/index-of-pred fonts #(= (:id %) id))
-          index (or index -1)
-          next  (ex/ignoring (nth fonts (inc index)))]
-      (or next (first fonts)))
-    current))
-
-(defn- get-prev-font
-  [{:keys [id] :as current} fonts]
-  (if (seq fonts)
-    (let [index (d/index-of-pred fonts #(= (:id %) id))
-          next  (ex/ignoring (nth fonts (dec index)))]
-      (or next (peek fonts)))
-    current))
-
 (mf/defc font-item*
-  {::mf/wrap [mf/memo]}
+  {::mf/wrap [mf/memo]
+   ::mf/private true}
   [{:keys [font is-current on-click style]}]
   (let [item-ref (mf/use-ref)
         on-click (mf/use-fn (mf/deps font) #(on-click font))]
@@ -83,7 +67,7 @@
 
 (declare row-renderer)
 
-(defn filter-fonts
+(defn- filter-fonts
   [{:keys [term backends]} fonts]
   (let [term (str/lower term)
         xform (cond-> (map identity)
@@ -96,8 +80,7 @@
 
 (mf/defc font-selector*
   [{:keys [on-select on-close current-font show-recent full-size]}]
-  (let [selected     (mf/use-state current-font)
-        state*       (mf/use-state
+  (let [state*       (mf/use-state
                       #(do {:term "" :backends #{}}))
         state        (deref state*)
 
@@ -112,23 +95,41 @@
         recent-fonts (mf/with-memo [state recent-fonts]
                        (filter-fonts state recent-fonts))
 
-        full-size?   (boolean (and full-size show-recent))
+        ;; Combine recent fonts with filtered fonts, avoiding duplicates
+        combined-fonts
+        (mf/with-memo [recent-fonts fonts]
+          (let [recent-ids (into #{} d/xf:map-id recent-fonts)]
+            (into recent-fonts (remove #(contains? recent-ids (:id %))) fonts)))
+
+        ;; Initialize selected with current font index
+        selected-index
+        (mf/use-state
+         (fn []
+           (or (some (fn [[idx font]]
+                       (when (= (:id current-font) (:id font)) idx))
+                     (map-indexed vector combined-fonts))
+               0)))
+
+        full-size?
+        (boolean (and full-size show-recent))
 
         select-next
         (mf/use-fn
-         (mf/deps fonts)
+         (mf/deps combined-fonts)
          (fn [event]
            (dom/stop-propagation event)
            (dom/prevent-default event)
-           (swap! selected get-next-font fonts)))
+           (let [next-idx (mod (inc @selected-index) (count combined-fonts))]
+             (reset! selected-index next-idx))))
 
         select-prev
         (mf/use-fn
-         (mf/deps fonts)
+         (mf/deps combined-fonts)
          (fn [event]
            (dom/stop-propagation event)
            (dom/prevent-default event)
-           (swap! selected get-prev-font fonts)))
+           (let [prev-idx (mod (dec @selected-index) (count combined-fonts))]
+             (reset! selected-index prev-idx))))
 
         on-select-and-close
         (mf/use-fn
@@ -139,35 +140,32 @@
 
         on-key-down
         (mf/use-fn
-         (mf/deps fonts)
+         (mf/deps combined-fonts)
          (fn [event]
            (cond
              (kbd/up-arrow? event)   (select-prev event)
              (kbd/down-arrow? event) (select-next event)
              (kbd/esc? event)        (on-close)
-             (kbd/enter? event)      (do (on-select-and-close @selected))
+             (kbd/enter? event)      (do
+                                       (let [selected-font (nth combined-fonts @selected-index)]
+                                         (on-select-and-close selected-font)))
              :else                   (dom/focus! (mf/ref-val input)))))
 
         on-filter-change
         (mf/use-fn
          (fn [event]
-           (swap! state* assoc :term event)))
-
-        on-select-and-close
-        (mf/use-fn
-         (mf/deps on-select on-close)
-         (fn [font]
-           (on-select font)
-           (on-close)))]
+           (swap! state* assoc :term event)
+           ;; Reset selection to first item when filter changes
+           (reset! selected-index 0)))]
 
     (mf/with-effect [fonts]
       (let [key (events/listen js/document "keydown" on-key-down)]
         #(events/unlistenByKey key)))
 
-    (mf/with-effect [@selected]
+    (mf/with-effect [@selected-index]
       (when-let [inst (mf/ref-val flist)]
-        (when-let [index (:index @selected)]
-          (.scrollToRow ^js inst index))))
+        (when (and (>= @selected-index 0) (< @selected-index (count combined-fonts)))
+          (.scrollToRow ^js inst @selected-index))))
 
     (mf/with-effect []
       (st/emit! (dsc/push-shortcuts :typography {}))
@@ -175,15 +173,12 @@
         (st/emit! (dsc/pop-shortcuts :typography))))
 
     (mf/with-effect []
-      (let [index  (d/index-of-pred fonts #(= (:id %) (:id current-font)))
+      (let [index  (d/index-of-pred combined-fonts #(= (:id %) (:id current-font)))
             inst   (mf/ref-val flist)]
-        (tm/schedule
-         #(let [offset (.getOffsetForRow ^js inst #js {:alignment "center" :index index})]
-            (.scrollToPosition ^js inst offset)))))
-
-    (mf/with-effect [(:term state) fonts]
-      (when (and (seq fonts) (not= (:id @selected) (:id (first fonts))))
-        (reset! selected (first fonts))))
+        (when (and index (>= index 0))
+          (tm/schedule
+           #(let [offset (.getOffsetForRow ^js inst #js {:alignment "center" :index index})]
+              (.scrollToPosition ^js inst offset))))))
 
     [:div {:class (stl/css :font-selector)}
      [:div {:class (stl/css-case :font-selector-dropdown true :font-selector-dropdown-full-size full-size?)}
@@ -200,7 +195,7 @@
                             :font font
                             :style {}
                             :on-click on-select-and-close
-                            :is-current (= (:id font) (:id @selected))}])])]
+                            :is-current (= idx @selected-index)}])])]
 
       [:div {:class (stl/css-case :fonts-list true
                                   :fonts-list-full-size full-size?)}
@@ -208,17 +203,17 @@
         (fn [props]
           (let [width  (unchecked-get props "width")
                 height (unchecked-get props "height")
-                render #(row-renderer fonts @selected on-select-and-close %)]
+                render #(row-renderer combined-fonts @selected-index on-select-and-close %)]
             (mf/html
              [:> rvt/List #js {:height height
                                :ref flist
                                :width width
-                               :rowCount (count fonts)
+                               :rowCount (count combined-fonts)
                                :rowHeight 36
                                :rowRenderer render}])))]]]]))
 
 (defn row-renderer
-  [fonts selected on-select props]
+  [fonts selected-index on-select props]
   (let [index (unchecked-get props "index")
         key   (unchecked-get props "key")
         style (unchecked-get props "style")
@@ -228,7 +223,7 @@
                      :font font
                      :style style
                      :on-click on-select
-                     :is-current (= (:id font) (:id selected))}])))
+                     :is-current (= index selected-index)}])))
 
 (mf/defc font-options
   {::mf/wrap-props false}