From 04d6e76c6c96f6f188ccab89e87f568e97d0c264 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Thu, 1 Sep 2022 12:44:33 +0200
Subject: [PATCH] :bug: Fix problem editing rotated texts

---
 CHANGES.md                                    |  5 ++-
 common/src/app/common/geom/shapes/text.cljc   | 20 +++++----
 .../app/main/ui/workspace/shapes/text.cljs    | 41 ++++++++++++-------
 .../main/ui/workspace/shapes/text/editor.cljs |  2 +-
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ea75c9dca..c8d5b9cb4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,9 @@
 
 ### :bug: Bugs fixed
 
-- Fix error when moving nested frames outside [Taiga #4017] https://tree.taiga.io/project/penpot/issue/4017
-- Fix problem when hovering over nested frames [Taiga #4018] https://tree.taiga.io/project/penpot/issue/4018
+- Fix error when moving nested frames outside [Taiga #4017](https://tree.taiga.io/project/penpot/issue/4017)
+- Fix problem when hovering over nested frames [Taiga #4018](https://tree.taiga.io/project/penpot/issue/4018)
+- Fix problem editing rotated texts [Taiga #4026](https://tree.taiga.io/project/penpot/issue/4026)
 
 ## 1.15.2-beta
 
diff --git a/common/src/app/common/geom/shapes/text.cljc b/common/src/app/common/geom/shapes/text.cljc
index af23e0c15..992f3c092 100644
--- a/common/src/app/common/geom/shapes/text.cljc
+++ b/common/src/app/common/geom/shapes/text.cljc
@@ -17,16 +17,22 @@
    :width width
    :height height})
 
-(defn position-data-points
-  [{:keys [position-data] :as shape}]
-  (let [points    (->> position-data
-                       (mapcat (comp gpr/rect->points position-data->rect)))
-        transform (gtr/transform-matrix shape)]
-    (gco/transform-points points transform)))
+(defn position-data-selrect
+  [shape]
+  (let [points    (->> shape
+                       :position-data
+                       (mapcat (comp gpr/rect->points position-data->rect)))]
+    (-> points (gpr/points->selrect))))
 
 (defn position-data-bounding-box
   [shape]
-  (gpr/points->selrect (position-data-points shape)))
+  (let [points    (->> shape
+                       :position-data
+                       (mapcat (comp gpr/rect->points position-data->rect)))
+        transform (gtr/transform-matrix shape)]
+    (-> points
+        (gco/transform-points transform)
+        (gpr/points->selrect ))))
 
 (defn overlaps-position-data?
   "Checks if the given position data is inside the shape"
diff --git a/frontend/src/app/main/ui/workspace/shapes/text.cljs b/frontend/src/app/main/ui/workspace/shapes/text.cljs
index 7a5b662d9..28dee8f66 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text.cljs
@@ -8,6 +8,8 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.geom.shapes :as gsh]
+   [app.common.geom.shapes.text :as gsht]
    [app.common.math :as mth]
    [app.main.data.workspace.texts :as dwt]
    [app.main.refs :as refs]
@@ -37,19 +39,28 @@
       [:& text/text-shape {:shape shape}]]
 
      (when (and (debug? :text-outline) (d/not-empty? (:position-data shape)))
-       (for [[index data] (d/enumerate (:position-data shape))]
-         (let [{:keys [x y width height]} data]
-           [:g {:key (dm/str index)}
-            ;; Text fragment bounding box
-            [:rect {:x x
-                    :y (- y height)
-                    :width width
-                    :height height
-                    :style {:fill "none" :stroke "red"}}]
+       [:g {:transform (gsh/transform-str shape {:no-flip true})}
+        (let [bounding-box (gsht/position-data-selrect shape)]
+          [:rect {
+                  :x (:x bounding-box)
+                  :y (:y bounding-box)
+                  :width (:width bounding-box)
+                  :height (:height bounding-box)
+                  :style { :fill "none" :stroke "orange"}}])
 
-            ;; Text baselineazo
-            [:line {:x1 (mth/round x)
-                    :y1 (mth/round (- (:y data) (:height data)))
-                    :x2 (mth/round (+ x width))
-                    :y2 (mth/round (- (:y data) (:height data)))
-                    :style {:stroke "blue"}}]])))]))
+        (for [[index data] (d/enumerate (:position-data shape))]
+          (let [{:keys [x y width height]} data]
+            [:g {:key (dm/str index)}
+             ;; Text fragment bounding box
+             [:rect {:x x
+                     :y (- y height)
+                     :width width
+                     :height height
+                     :style {:fill "none" :stroke "red"}}]
+
+             ;; Text baselineazo
+             [:line {:x1 (mth/round x)
+                     :y1 (mth/round (- (:y data) (:height data)))
+                     :x2 (mth/round (+ x width))
+                     :y2 (mth/round (- (:y data) (:height data)))
+                     :style {:stroke "blue"}}]]))])]))
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
index 0e9791dfd..484141d69 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
@@ -272,7 +272,7 @@
                 (some? text-modifier)
                 (dwt/apply-text-modifier text-modifier))
 
-        bounding-box (gsht/position-data-bounding-box shape)
+        bounding-box (gsht/position-data-selrect shape)
 
         x      (min (:x bounding-box) (:x shape))
         y      (min (:y bounding-box) (:y shape))