🐛 Fix problem with text not growing the hug container

common/src/app/common/geom/shapes/modifiers.cljc

@@ -121,7 +121,7 @@
                        (update-in [child-id :modifiers] ctm/add-modifiers child-modifiers))
                      (rest children)))))))))
 
-(defn- process-layout-children
+#_(defn- process-layout-children
   [modif-tree objects bounds parent transformed-parent-bounds]
   (letfn [(process-child [modif-tree child]
             (let [child-id        (:id child)
@@ -275,7 +275,7 @@
        (set-children-modifiers objects bounds parent transformed-parent-bounds ignore-constraints)
 
        layout?
-       (-> (process-layout-children objects bounds parent transformed-parent-bounds)
+       (-> #_(process-layout-children objects bounds parent transformed-parent-bounds)
            (set-layout-modifiers objects bounds parent transformed-parent-bounds)))
 
      ;; Auto-width/height can change the positions in the parent so we need to recalculate

common/src/app/common/types/modifiers.cljc

@@ -40,13 +40,15 @@
 ;;     * change-properties
 
 (defrecord Modifiers
-    [geometry-parent
+    [last-order ;; Last `order` attribute in the geometry list
+     geometry-parent
      geometry-child
      structure-parent
      structure-child])
 
 (defrecord GeometricOperation
-    [type
+    [order ;; Need the order to keep consistent between geometry-parent and geometry-child
+     type
      vector
      origin
      transform
@@ -62,41 +64,42 @@
 
 ;; Record constructors
 
-(defn move-op
+(defn- move-op
-  [vector]
+  [order vector]
-  (GeometricOperation. :move vector nil nil nil nil nil))
+  (GeometricOperation. order :move vector nil nil nil nil nil))
 
-(defn resize-op
+(defn- resize-op
-  ([vector origin]
+  ([order vector origin]
-   (GeometricOperation. :resize vector origin nil nil nil nil))
+   (GeometricOperation. order :resize vector origin nil nil nil nil))
-  ([vector origin transform transform-inverse]
-   (GeometricOperation. :resize vector origin transform transform-inverse nil nil)))
 
-(defn rotation-geom-op
+  ([order vector origin transform transform-inverse]
-  [center angle]
+   (GeometricOperation. order :resize vector origin transform transform-inverse nil nil)))
-  (GeometricOperation. :rotation nil nil nil nil angle center))
 
-(defn rotation-struct-op
+(defn- rotation-geom-op
+  [order center angle]
+  (GeometricOperation. order :rotation nil nil nil nil angle center))
+
+(defn- rotation-struct-op
   [angle]
   (StructureOperation. :rotation nil angle nil))
 
-(defn remove-children-op
+(defn- remove-children-op
   [shapes]
   (StructureOperation. :remove-children nil shapes nil))
 
-(defn add-children-op
+(defn- add-children-op
   [shapes index]
   (StructureOperation. :add-children nil shapes index))
 
-(defn reflow-op
+(defn- reflow-op
   []
   (StructureOperation. :reflow nil nil nil))
 
-(defn scale-content-op
+(defn- scale-content-op
   [value]
   (StructureOperation. :scale-content nil value nil))
 
-(defn change-property-op
+(defn- change-property-op
   [property value]
   (StructureOperation. :change-property property value nil))
 
@@ -142,8 +145,9 @@
 (defn- merge-move
   [op1 op2]
   (let [vector-op1 (dm/get-prop op1 :vector)
-        vector-op2 (dm/get-prop op2 :vector)]
+        vector-op2 (dm/get-prop op2 :vector)
-    (move-op (gpt/add vector-op1 vector-op2))))
+        vector     (gpt/add vector-op1 vector-op2)]
+    (assoc op1 :vector vector)))
 
 (defn- merge-resize
   [op1 op2]
@@ -197,7 +201,7 @@
 ;; Public builder API
 
 (defn empty []
-  (Modifiers. [] [] [] []))
+  (Modifiers. 0 [] [] [] []))
 
 (defn move-parent
   ([modifiers x y]
@@ -205,22 +209,31 @@
 
   ([modifiers vector]
    (assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
-   (cond-> (or modifiers (empty))
+   (let [modifiers (or modifiers (empty))
-     (move-vec? vector)
+         order     (inc (dm/get-prop modifiers :last-order))
-     (update :geometry-parent maybe-add-move (move-op vector)))))
+         modifiers (assoc modifiers :last-order order)]
+     (cond-> modifiers
+       (move-vec? vector)
+       (update :geometry-parent maybe-add-move (move-op order vector))))))
 
 (defn resize-parent
   ([modifiers vector origin]
    (assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
-   (cond-> (or modifiers (empty))
+   (let [modifiers (or modifiers (empty))
-     (resize-vec? vector)
+         order     (inc (dm/get-prop modifiers :last-order))
-     (update :geometry-parent maybe-add-resize (resize-op vector origin))))
+         modifiers (assoc modifiers :last-order order)]
+     (cond-> modifiers
+       (resize-vec? vector)
+       (update :geometry-parent maybe-add-resize (resize-op order vector origin)))))
 
   ([modifiers vector origin transform transform-inverse]
    (assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
-   (cond-> (or modifiers (empty))
+   (let [modifiers (or modifiers (empty))
-     (resize-vec? vector)
+         order     (inc (dm/get-prop modifiers :last-order))
-     (update :geometry-parent maybe-add-resize (resize-op vector origin transform transform-inverse)))))
+         modifiers (assoc modifiers :last-order order)]
+     (cond-> modifiers
+       (resize-vec? vector)
+       (update :geometry-parent maybe-add-resize (resize-op order vector origin transform transform-inverse))))))
 
 (defn move
   ([modifiers x y]
@@ -228,29 +241,41 @@
 
   ([modifiers vector]
    (assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
-   (cond-> (or modifiers (empty))
+   (let [modifiers (or modifiers (empty))
-     (move-vec? vector)
+         order     (inc (dm/get-prop modifiers :last-order))
-     (update :geometry-child maybe-add-move (move-op vector)))))
+         modifiers (assoc modifiers :last-order order)]
+     (cond-> modifiers
+       (move-vec? vector)
+       (update :geometry-child maybe-add-move (move-op order vector))))))
 
 (defn resize
   ([modifiers vector origin]
    (assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
-   (cond-> (or modifiers (empty))
+   (let [modifiers (or modifiers (empty))
-     (resize-vec? vector)
+         order     (inc (dm/get-prop modifiers :last-order))
-     (update :geometry-child maybe-add-resize (resize-op vector origin))))
+         modifiers (assoc modifiers :last-order order)]
+     (cond-> modifiers
+       (resize-vec? vector)
+       (update :geometry-child maybe-add-resize (resize-op order vector origin)))))
 
   ([modifiers vector origin transform transform-inverse]
    (assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
-   (cond-> (or modifiers (empty))
+   (let [modifiers (or modifiers (empty))
-     (resize-vec? vector)
+         order     (inc (dm/get-prop modifiers :last-order))
-     (update :geometry-child maybe-add-resize (resize-op vector origin transform transform-inverse)))))
+         modifiers (assoc modifiers :last-order order)]
+     (cond-> modifiers
+       (resize-vec? vector)
+       (update :geometry-child maybe-add-resize (resize-op order vector origin transform transform-inverse))))))
 
 (defn rotation
   [modifiers center angle]
-  (cond-> (or modifiers (empty))
+  (let [modifiers (or modifiers (empty))
-    (not (mth/close? angle 0))
+        order     (inc (dm/get-prop modifiers :last-order))
-    (-> (update :structure-child conj (rotation-struct-op angle))
+        modifiers (assoc modifiers :last-order order)]
-        (update :geometry-child conj (rotation-geom-op center angle)))))
+    (cond-> modifiers
+      (not (mth/close? angle 0))
+      (-> (update :structure-child conj (rotation-struct-op angle))
+          (update :geometry-child conj (rotation-geom-op order center angle))))))
 
 (defn remove-children
   [modifiers shapes]
@@ -279,8 +304,8 @@
   (-> (or modifiers (empty))
       (update :structure-child conj (change-property-op property value))))
 
-(defn- merge-geometry
+(defn- concat-geometry
-  [operations other]
+  [operations other merge?]
 
   (cond
     (c/empty? operations)
@@ -297,10 +322,10 @@
         (let [current (first operations)
               result
               (cond
-                (= :move (dm/get-prop current :type))
+                (and merge? (= :move (dm/get-prop current :type)))
                 (maybe-add-move result current)
 
-                (= :resize (dm/get-prop current :type))
+                (and merge? (= :resize (dm/get-prop current :type)))
                 (maybe-add-resize result current)
 
                 :else
@@ -308,15 +333,37 @@
 
           (recur result (rest operations)))))))
 
+(defn increase-order
+  [operations last-order]
+  (->> operations
+       (mapv #(update % :order + last-order))))
+
 (defn add-modifiers
   [modifiers new-modifiers]
+
   (let [modifiers (or modifiers (empty))
-        new-modifiers (or new-modifiers (empty))]
+        new-modifiers (or new-modifiers (empty))
+        last-order (dm/get-prop modifiers :last-order)
+        new-last-order (dm/get-prop new-modifiers :last-order)
+
+
+        old-geom-child (dm/get-prop modifiers :geometry-child)
+        new-geom-child (-> (dm/get-prop new-modifiers :geometry-child)
+                           (increase-order last-order))
+
+        old-geom-parent (dm/get-prop modifiers :geometry-parent)
+        new-geom-parent (-> (dm/get-prop new-modifiers :geometry-parent)
+                            (increase-order last-order))
+
+        ;; We can only merge if the result will respect the global order in modifiers
+        merge-child? (and (c/empty? new-geom-parent) (c/empty? old-geom-parent))
+        merge-parent? (and (c/empty? new-geom-child) (c/empty? old-geom-child))]
     (-> modifiers
-        (update :geometry-child merge-geometry (dm/get-prop new-modifiers :geometry-child))
+        (assoc  :last-order       (+ last-order new-last-order))
-        (update :geometry-parent merge-geometry (dm/get-prop new-modifiers :geometry-parent))
+        (update :geometry-child   #(concat-geometry % new-geom-child merge-child?))
+        (update :geometry-parent  #(concat-geometry % new-geom-parent merge-parent?))
         (update :structure-parent #(d/concat-vec [] % (dm/get-prop new-modifiers :structure-parent)))
-        (update :structure-child #(d/concat-vec [] % (dm/get-prop new-modifiers :structure-child))))))
+        (update :structure-child  #(d/concat-vec [] % (dm/get-prop new-modifiers :structure-child))))))
 
 
 ;; These are convenience methods to create single operation modifiers without the builder
@@ -522,8 +569,9 @@
 (defn modifiers->transform
   "Given a set of modifiers returns its transformation matrix"
   [modifiers]
-  (let [modifiers (concat (dm/get-prop modifiers :geometry-parent)
+  (let [modifiers (->> (concat (dm/get-prop modifiers :geometry-parent)
-                          (dm/get-prop modifiers :geometry-child))]
+                               (dm/get-prop modifiers :geometry-child))
+                       (sort-by :order))]
 
     (loop [matrix    (gmt/matrix)
            modifiers (seq modifiers)]

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

@@ -8,6 +8,7 @@
   (:require
    [app.common.attrs :as attrs]
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as gsh]
    [app.common.math :as mth]
@@ -380,23 +381,36 @@
 
     new-shape))
 
+(defn update-text-modifier-state
+  [id props]
+  (ptk/reify ::update-text-modifier-state
+    ptk/UpdateEvent
+    (update [_ state]
+      (update-in state [:workspace-text-modifier id] (fnil merge {}) props))))
+
 (defn update-text-modifier
   [id props]
   (ptk/reify ::update-text-modifier
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:workspace-text-modifier id] (fnil merge {}) props))
-
     ptk/WatchEvent
     (watch [_ state _]
-      (let [shape (wsh/lookup-shape state id)]
+      (let [shape (wsh/lookup-shape state id)
-        (when (or (and (some? (:width props))
-                       (not (mth/close? (:width props) (:width shape))))
-                  (and (some? (:height props))
-                       (not (mth/close? (:height props) (:height shape)))))
 
-          (let [modif-tree (dwm/create-modif-tree [id] (ctm/reflow-modifiers))]
+            text-modifier (dm/get-in state [:workspace-text-modifier id])
-            (rx/of (dwm/set-modifiers modif-tree))))))))
+
+            current-width (or (:width text-modifier) (:width shape))
+            current-height (or (:height text-modifier) (:height shape))]
+        (rx/concat
+         (rx/of (update-text-modifier-state id props))
+
+         (if (or (and (some? (:width props))
+                      (not (mth/close? (:width props) current-width)))
+                 (and (some? (:height props))
+                      (not (mth/close? (:height props) current-height))))
+
+           (let [modif-tree (dwm/create-modif-tree [id] (ctm/reflow-modifiers))]
+             (->> (rx/of (dwm/set-modifiers modif-tree))
+                  (rx/observe-on :async)))
+           (rx/empty)))))))
 
 (defn clean-text-modifier
   [id]