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

CHANGES.md

@@ -28,6 +28,15 @@
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
 
+## 1.12.2-beta
+### :boom: Breaking changes
+
+### :sparkles: New features
+
+### :bug: Bugs fixed
+
+- Fix issue with guides over shape handlers [Taiga #3032](https://tree.taiga.io/project/penpot/issue/3032)
+- Fix problem with shift+ctrl+click to select [#1671](https://github.com/penpot/penpot/issues/1671)
 
 ## 1.12.1-beta
 ### :boom: Breaking changes

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

@@ -265,15 +265,30 @@
            :edition edition
            :zoom zoom}])
 
+       (when show-selection-handlers?
+         [:& selection/selection-area
+          {:shapes selected-shapes
+           :zoom zoom
+           :edition edition
+           :disable-handlers (or drawing-tool edition @space? @ctrl?)
+           :on-move-selected on-move-selected
+           :on-context-menu on-menu-selected}])
+
+       (when show-rules?
+         [:& guides/viewport-guides
+          {:zoom zoom
+           :vbox vbox
+           :hover-frame frame-parent
+           :modifiers modifiers
+           :disabled-guides? disabled-guides?}])
+
        (when show-selection-handlers?
          [:& selection/selection-handlers
           {:selected selected
            :shapes selected-shapes
            :zoom zoom
            :edition edition
-           :disable-handlers (or drawing-tool edition @space?)
-           :on-move-selected on-move-selected
-           :on-context-menu on-menu-selected}])
+           :disable-handlers (or drawing-tool edition @space?)}])
 
        (when show-measures?
          [:& msr/measurement
@@ -378,16 +393,7 @@
          :viewport-ref viewport-ref}]
 
        (when show-rules?
-         [:*
-          [:& rules/rules
-           {:zoom zoom
-            :vbox vbox
-            :selected-shapes selected-shapes}]
-
-          [:& guides/viewport-guides
-           {:zoom zoom
-            :vbox vbox
-            :hover-frame frame-parent
-            :modifiers modifiers
-            :disabled-guides? disabled-guides?}]])]]]))
-
+         [:& rules/rules
+          {:zoom zoom
+           :vbox vbox
+           :selected-shapes selected-shapes}])]]]))

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

@@ -160,14 +160,13 @@
          (st/emit! (ms/->MouseEvent :click ctrl? shift? alt?))
 
          (when (and hovering?
-                    (not shift?)
-                    (or ctrl? (not frame?))
+                    (or (not frame?) ctrl?)
                     (not @space?)
                     (not selected?)
                     (not edition)
                     (not drawing-path?)
                     (not drawing-tool))
-           (st/emit! (dw/select-shape (:id @hover)))))))))
+           (st/emit! (dw/select-shape (:id @hover) shift?))))))))
 
 (defn on-double-click
   [hover hover-ids drawing-path? objects edition]

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

@@ -165,7 +165,7 @@
 
     (hooks/use-stream
      over-shapes-stream
-     (mf/deps page-id objects @ctrl?)
+     (mf/deps page-id objects)
      (fn [ids]
        (let [is-group?
              (fn [id]
@@ -174,12 +174,14 @@
              selected (mf/ref-val selected-ref)
              focus (mf/ref-val focus-ref)
 
+             ctrl? (mf/ref-val ctrl-ref)
+
              remove-xfm (mapcat #(cph/get-parent-ids objects %))
              remove-id? (cond-> (into #{} remove-xfm selected)
-                          (not @ctrl?)
+                          (not ctrl?)
                           (into (filter #(group-empty-space? % objects ids)) ids)
 
-                          @ctrl?
+                          ctrl?
                           (into (filter is-group?) ids))
 
              hover-shape (->> ids

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

@@ -176,8 +176,7 @@
                  :cx cx'
                  :cy cy'
                  :style {:fill (if (debug? :resize-handler) "red" "none")
-                         :cursor cursor}}]
-       )]))
+                         :cursor cursor}}])]))
 
 (mf/defc resize-side-handler
   "The side handler is always rendered horizontally and then rotated"
@@ -217,14 +216,37 @@
      :width final-width
      :height final-height}))
 
-(mf/defc controls
+(mf/defc controls-selection
+  {::mf/wrap-props false}
+  [props]
+  (let [shape             (obj/get props "shape")
+        zoom              (obj/get props "zoom")
+        color             (obj/get props "color")
+        on-move-selected  (obj/get props "on-move-selected")
+        on-context-menu   (obj/get props "on-context-menu")
+        disable-handlers  (obj/get props "disable-handlers")
+
+        current-transform (mf/deref refs/current-transform)
+
+        selrect (:selrect shape)
+        transform (geom/transform-matrix shape {:no-flip true})]
+
+    (when (not (#{:move :rotate} current-transform))
+      [:g.controls {:pointer-events (if disable-handlers "none" "visible")}
+       ;; Selection rect
+       [:& selection-rect {:rect selrect
+                           :transform transform
+                           :zoom zoom
+                           :color color
+                           :on-move-selected on-move-selected
+                           :on-context-menu on-context-menu}]])))
+
+(mf/defc controls-handlers
   {::mf/wrap-props false}
   [props]
   (let [{:keys [overflow-text] :as shape} (obj/get props "shape")
         zoom              (obj/get props "zoom")
         color             (obj/get props "color")
-        on-move-selected  (obj/get props "on-move-selected")
-        on-context-menu   (obj/get props "on-context-menu")
         on-resize         (obj/get props "on-resize")
         on-rotate         (obj/get props "on-rotate")
         disable-handlers  (obj/get props "disable-handlers")
@@ -240,15 +262,6 @@
 
     (when (not (#{:move :rotate} current-transform))
       [:g.controls {:pointer-events (if disable-handlers "none" "visible")}
-
-       ;; Selection rect
-       [:& selection-rect {:rect selrect
-                           :transform transform
-                           :zoom zoom
-                           :color color
-                           :on-move-selected on-move-selected
-                           :on-context-menu on-context-menu}]
-
        ;; Handlers
        (for [{:keys [type position props]} (handlers-for-selection selrect shape zoom)]
          (let [common-props {:key (str (name type) "-" (name position))
@@ -267,10 +280,9 @@
              :resize-side [:> resize-side-handler props])))])))
 
 ;; --- Selection Handlers (Component)
-;; TODO: add specs for clarity
 
-(mf/defc text-edition-selection-handlers
-  [{:keys [shape color] :as props}]
+(mf/defc text-edition-selection
+  [{:keys [shape color zoom] :as props}]
   (let [{:keys [x y width height]} shape]
     [:g.controls
      [:rect.main {:x x :y y
@@ -279,12 +291,12 @@
                   :height height
                   :pointer-events "visible"
                   :style {:stroke color
-                          :stroke-width "0.5"
+                          :stroke-width (/ 0.5 zoom)
                           :stroke-opacity "1"
                           :fill "none"}}]]))
 
-(mf/defc multiple-selection-handlers
-  [{:keys [shapes selected zoom color disable-handlers on-move-selected on-context-menu] :as props}]
+(mf/defc multiple-handlers
+  [{:keys [shapes selected zoom color disable-handlers] :as props}]
   (let [shape (mf/use-memo
                (mf/deps shapes)
                #(->> shapes
@@ -292,8 +304,6 @@
                      (geom/selection-rect)
                      (geom/setup {:type :rect})))
 
-        shape-center (geom/center-shape shape)
-
         on-resize
         (fn [current-position _initial-position event]
           (when (dom/left-mouse? event)
@@ -306,33 +316,41 @@
             (dom/stop-propagation event)
             (st/emit! (dw/start-rotate shapes))))]
 
-    [:*
-     [:& controls {:shape shape
-                   :zoom zoom
-                   :color color
-                   :disable-handlers disable-handlers
-                   :on-move-selected on-move-selected
-                   :on-resize on-resize
-                   :on-rotate on-rotate
-                   :on-context-menu on-context-menu}]
+    [:& controls-handlers
+     {:shape shape
+      :zoom zoom
+      :color color
+      :disable-handlers disable-handlers
+      :on-resize on-resize
+      :on-rotate on-rotate}]))
 
-     (when (debug? :selection-center)
-       [:circle {:cx (:x shape-center) :cy (:y shape-center) :r 5 :fill "yellow"}])]))
+(mf/defc multiple-selection
+  [{:keys [shapes zoom color disable-handlers on-move-selected on-context-menu] :as props}]
+  (let [shape (mf/use-memo
+               (mf/deps shapes)
+               #(->> shapes
+                     (map geom/transform-shape)
+                     (geom/selection-rect)
+                     (geom/setup {:type :rect})))]
 
-(mf/defc single-selection-handlers
-  [{:keys [shape zoom color disable-handlers on-move-selected on-context-menu] :as props}]
+    [:& controls-selection
+     {:shape shape
+      :zoom zoom
+      :color color
+      :disable-handlers disable-handlers
+      :on-move-selected on-move-selected
+      :on-context-menu on-context-menu}]))
+
+(mf/defc single-handlers
+  [{:keys [shape zoom color disable-handlers] :as props}]
   (let [shape-id (:id shape)
         shape (geom/transform-shape shape {:round-coords? false})
 
-        shape' (if (debug? :simple-selection)
-                 (geom/setup {:type :rect} (geom/selection-rect [shape]))
-                 shape)
-
         on-resize
         (fn [current-position _initial-position event]
           (when (dom/left-mouse? event)
             (dom/stop-propagation event)
-            (st/emit! (dw/start-resize current-position #{shape-id} shape'))))
+            (st/emit! (dw/start-resize current-position #{shape-id} shape))))
 
         on-rotate
         (fn [event]
@@ -340,18 +358,29 @@
             (dom/stop-propagation event)
             (st/emit! (dw/start-rotate [shape]))))]
 
-    [:& controls {:shape shape'
-                  :zoom zoom
-                  :color color
-                  :on-rotate on-rotate
-                  :on-resize on-resize
-                  :disable-handlers disable-handlers
-                  :on-move-selected on-move-selected
-                  :on-context-menu on-context-menu}]))
+    [:& controls-handlers
+     {:shape shape
+      :zoom zoom
+      :color color
+      :disable-handlers disable-handlers
+      :on-rotate on-rotate
+      :on-resize on-resize}]))
 
-(mf/defc selection-handlers
+(mf/defc single-selection
+  [{:keys [shape zoom color disable-handlers on-move-selected on-context-menu] :as props}]
+  (let [shape (geom/transform-shape shape {:round-coords? false})]
+
+    [:& controls-selection
+     {:shape shape
+      :zoom zoom
+      :color color
+      :disable-handlers disable-handlers
+      :on-move-selected on-move-selected
+      :on-context-menu on-context-menu}]))
+
+(mf/defc selection-area
   {::mf/wrap [mf/memo]}
-  [{:keys [shapes selected edition zoom disable-handlers on-move-selected on-context-menu] :as props}]
+  [{:keys [shapes edition zoom disable-handlers on-move-selected on-context-menu] :as props}]
   (let [num (count shapes)
         {:keys [type] :as shape} (first shapes)
 
@@ -363,28 +392,64 @@
       nil
 
       (> num 1)
-      [:& multiple-selection-handlers {:shapes shapes
-                                       :selected selected
-                                       :zoom zoom
-                                       :color color
-                                       :disable-handlers disable-handlers
-                                       :on-move-selected on-move-selected
-                                       :on-context-menu on-context-menu}]
+      [:& multiple-selection
+       {:shapes shapes
+        :zoom zoom
+        :color color
+        :disable-handlers disable-handlers
+        :on-move-selected on-move-selected
+        :on-context-menu on-context-menu}]
 
-      (and (= type :text)
-           (= edition (:id shape)))
-      [:& text-edition-selection-handlers {:shape shape
-                                           :zoom zoom
-                                           :color color}]
+      (and (= type :text) (= edition (:id shape)))
+      [:& text-edition-selection
+       {:shape shape
+        :zoom zoom
+        :color color}]
 
       (= edition (:id shape))
-      [:& path-editor {:zoom zoom
-                       :shape shape}]
+      nil
 
       :else
-      [:& single-selection-handlers {:shape shape
-                                     :zoom zoom
-                                     :color color
-                                     :disable-handlers disable-handlers
-                                     :on-move-selected on-move-selected
-                                     :on-context-menu on-context-menu}])))
+      [:& single-selection
+       {:shape shape
+        :zoom zoom
+        :color color
+        :disable-handlers disable-handlers
+        :on-move-selected on-move-selected
+        :on-context-menu on-context-menu}])))
+
+(mf/defc selection-handlers
+  {::mf/wrap [mf/memo]}
+  [{:keys [shapes selected edition zoom disable-handlers] :as props}]
+  (let [num (count shapes)
+        {:keys [type] :as shape} (first shapes)
+
+        color (if (or (> num 1) (nil? (:shape-ref shape)))
+                selection-rect-color-normal
+                selection-rect-color-component)]
+    (cond
+      (zero? num)
+      nil
+
+      (> num 1)
+      [:& multiple-handlers
+       {:shapes shapes
+        :selected selected
+        :zoom zoom
+        :color color
+        :disable-handlers disable-handlers}]
+
+      (and (= type :text) (= edition (:id shape)))
+      nil
+
+      (= edition (:id shape))
+      [:& path-editor
+       {:zoom zoom
+        :shape shape}]
+
+      :else
+      [:& single-handlers
+       {:shape shape
+        :zoom zoom
+        :color color
+        :disable-handlers disable-handlers}])))