Merge pull request #633 from penpot/bugfixing

Bugfixing

CHANGES.md

@@ -16,19 +16,21 @@
 ### Bugs fixed
 
 - Make the team deletion defferred (in the same way other objects).
-- Problems when transforming path shapes [Taiga 1170](https://tree.taiga.io/project/penpot/issue/1170)
+- Problems when transforming path shapes [Taiga #1170](https://tree.taiga.io/project/penpot/issue/1170)
 - Fix 500 when requestion password reset
 - Fix ldap function called on login click
-- Fix issues when moving shapes outside groups [Taiga 1138](https://tree.taiga.io/project/penpot/issue/1138)
+- Fix issues when moving shapes outside groups [Taiga #1138](https://tree.taiga.io/project/penpot/issue/1138)
-- Fix unexpected exception when uploading image [Taiga 1120](https://tree.taiga.io/project/penpot/issue/1120)
+- Fix unexpected exception when uploading image [Taiga #1120](https://tree.taiga.io/project/penpot/issue/1120)
 - Fix 404 when access shared link [#615](https://github.com/penpot/penpot/issues/615)
-- Fix show correct error when google auth is disabled [Taiga 1119](https://tree.taiga.io/project/penpot/issue/1119)
+- Fix show correct error when google auth is disabled [Taiga #1119](https://tree.taiga.io/project/penpot/issue/1119)
-- Fix apply a color to a text selection from color palette was not working [Taiga 1189](https://tree.taiga.io/project/penpot/issue/1189)
+- Fix apply a color to a text selection from color palette was not working [Taiga #1189](https://tree.taiga.io/project/penpot/issue/1189)
-- Fix logo icon in viewer should go to dashboard [Taiga 1149](https://tree.taiga.io/project/penpot/issue/1149)
+- Fix logo icon in viewer should go to dashboard [Taiga #1149](https://tree.taiga.io/project/penpot/issue/1149)
 - Fix text alignment in preview [#594](https://github.com/penpot/penpot/issues/594)
 - Fix problem when pasting URL's copied from the browser url bar [Taiga #1187](https://tree.taiga.io/project/penpot/issue/1187)
 - Fix ordering when restoring deleted shapes in sync [Taiga #1163](https://tree.taiga.io/project/penpot/issue/1163)
 - Fix updates on collaborative editing not updating selection rectangles [Taiga #1127](https://tree.taiga.io/project/penpot/issue/1127)
+- Fix problem with multiple selection and groups [Taiga #1128](https://tree.taiga.io/project/penpot/issue/1128)
+- Fix problem with red handler indicator on resize [Taiga #1188](https://tree.taiga.io/project/penpot/issue/1188)
 
 ### Community contributions by (Thank you! :heart:)
 

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

@@ -249,7 +249,7 @@
                                   (assoc :overflow-text true)
 
                                   (and (= :fixed grow-type) overflow-text (<= new-height shape-height))
-                                  (assoc :overflow-text true)
+                                  (assoc :overflow-text false)
 
                                   (and (not-changed? shape-width new-width) (= grow-type :auto-width))
                                   (-> (assoc :modifiers modifier-width)

frontend/src/app/main/ui/shapes/text/styles.cljs

@@ -20,28 +20,31 @@
   ([props] (generate-root-styles (clj->js (obj/get props "node")) props))
   ([data props]
    (let [valign (obj/get data "vertical-align" "top")
-         talign (obj/get data "text-align" "flex-start")
          shape  (obj/get props "shape")
          base   #js {:height (or (:height shape) "100%")
-                     :width (or (:width shape) "100%")
+                     :width (or (:width shape) "100%")}]
-                     :display "flex"}]
      (cond-> base
-       (= valign "top")     (obj/set! "alignItems" "flex-start")
+       (= valign "top")     (obj/set! "justifyContent" "flex-start")
-       (= valign "center")  (obj/set! "alignItems" "center")
+       (= valign "center")  (obj/set! "justifyContent" "center")
-       (= valign "bottom")  (obj/set! "alignItems" "flex-end")
+       (= valign "bottom")  (obj/set! "justifyContent" "flex-end")
-
+       ))))
-       (= talign "left")    (obj/set! "justifyContent" "flex-start")
-       (= talign "center")  (obj/set! "justifyContent" "center")
-       (= talign "right")   (obj/set! "justifyContent" "flex-end")
-       (= talign "justify") (obj/set! "justifyContent" "stretch")))))
 
 (defn generate-paragraph-set-styles
-  ([props] (generate-paragraph-set-styles nil props))
+  ([props] (generate-paragraph-set-styles (clj->js (obj/get props "node")) props))
   ([data props]
-   ;; The position absolute is used so the paragraph is "outside"
+   ;; This element will control the auto-width/auto-height size for the
-   ;; the normal layout and can grow outside its parent
+   ;; shape. The properties try to adjust to the shape and "overflow" if
-   ;; We use this element to measure the size of the text
+   ;; the shape is not big enough.
-   (let [base #js {:display "inline-block"}]
+   ;; We `inherit` the property `justify-content` so it's set by the root where
+   ;; the property it's known.
+   ;; `inline-flex` is similar to flex but `overflows` outside the bounds of the
+   ;; parent
+   (let [base #js {:display "inline-flex"
+                   :flex-direction "column"
+                   :justify-content "inherit"
+                   :min-height "100%"
+                   :min-width "100%"
+                   :vertical-align "top"}]
      base)))
 
 (defn generate-paragraph-styles

frontend/src/app/main/ui/workspace/sidebar/options/multiple.cljs

@@ -152,8 +152,9 @@
                                     (-> values
                                         (merge-attrs (select-keys shape attrs))
                                         (merge-attrs (ut/get-text-attrs-multi content attrs)))]
-                         :children (let [children (->> (:shapes shape []) (map #(get objects %)))]
+                         :children (let [children (->> (:shapes shape []) (map #(get objects %)))
-                                     (get-attrs children objects attr-type))
+                                         [new-ids new-values] (get-attrs children objects attr-type)]
+                                     [(d/concat ids new-ids) (merge-attrs values new-values)])
                          [])]
             result))]
     (reduce extract-attrs [[] []] shapes)))