✨ Show actual coordinates while modifying and creating a shape

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

@@ -6,6 +6,8 @@
 
 (ns app.main.ui.workspace.sidebar.options
   (:require
+   [app.common.data :as d]
+   [app.common.geom.shapes :as gsh]
    [app.main.data.workspace :as udw]
    [app.main.refs :as refs]
    [app.main.store :as st]
@@ -55,6 +57,12 @@
 (mf/defc options-content
   {::mf/wrap [mf/memo]}
   [{:keys [selected section shapes shapes-with-children page-id file-id]}]
+  (let [drawing           (mf/deref refs/workspace-drawing)
+        base-objects      (-> (mf/deref refs/workspace-page-objects))
+        modifiers         (mf/deref refs/workspace-modifiers)
+        objects-modified  (mf/with-memo [base-objects modifiers]
+                            (gsh/merge-modifiers base-objects modifiers))
+        selected-shapes   (into [] (keep (d/getf objects-modified)) selected)]
     [:div.tool-window
      [:div.tool-window-content
       [:& tab-container {:on-change-tab #(st/emit! (udw/set-options-mode %))
@@ -64,19 +72,22 @@
         [:div.element-options
          [:& align-options]
          [:& bool-options]
-       (case (count selected)
+         (cond
-         0 [:& page/options]
+           (d/not-empty? drawing) [:& shape-options {:shape (:object drawing)
-         1 [:& shape-options {:shape (first shapes)
+                                                     :page-id page-id
+                                                     :file-id file-id}]
+           (= 0 (count selected)) [:& page/options]
+           (= 1 (count selected)) [:& shape-options {:shape (first selected-shapes)
                                                      :page-id page-id
                                                      :file-id file-id
                                                      :shapes-with-children shapes-with-children}]
-         [:& multiple/options {:shapes-with-children shapes-with-children
+           :else [:& multiple/options {:shapes-with-children shapes-with-children
-                               :shapes shapes}])]]
+                                       :shapes selected-shapes}])]]
 
        [:& tab-element {:id :prototype
                         :title (tr "workspace.options.prototype")}
         [:div.element-options
-       [:& interactions-menu {:shape (first shapes)}]]]]]])
+         [:& interactions-menu {:shape (first shapes)}]]]]]]))
 
 ;; TODO: this need optimizations, selected-objects and
 ;; selected-objects-with-children are derefed always but they only

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

@@ -54,14 +54,17 @@
 
 ;; -- User/drawing coords
 (mf/defc measures-menu
-  [{:keys [ids ids-with-children values type all-types] :as props}]
+  [{:keys [ids ids-with-children values type all-types shape] :as props}]
+         
   (let [options (if (= type :multiple)
                   (reduce #(union %1 %2) (map #(get type->options %) all-types))
                   (get type->options type))
 
         ids-with-children (or ids-with-children ids)
 
-        old-shapes (deref (refs/objects-by-id ids))
+        old-shapes (if (= type :multiple)
+                     (deref (refs/objects-by-id ids))
+                     [shape])
         frames (map #(deref (refs/object-by-id (:frame-id %))) old-shapes)
 
         shapes (as-> old-shapes $
@@ -78,6 +81,10 @@
                    (not= (:width values) :multiple) (assoc :width width)
                    (not= (:height values) :multiple) (assoc :height height)))
 
+        values (let [{:keys [rotation]} (-> shapes first)]
+                 (cond-> values
+                   (not= (:rotation values) :multiple) (assoc :rotation rotation)))
+
         proportion-lock (:proportion-lock values)
 
         show-presets-dropdown? (mf/use-state false)
@@ -134,7 +141,6 @@
          (fn [value]
            (st/emit! (udw/increase-rotation ids value))))
 
-
         on-switch-to-radius-1
         (mf/use-callback
          (mf/deps ids)
@@ -154,7 +160,6 @@
         (mf/use-callback
          (mf/deps ids)
          (fn [value]
-           (prn "entro en on radius 1")
            (st/emit! (dch/update-shapes ids-with-children #(ctr/set-radius-1 % value)))))
 
         on-radius-multi-change

frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs

@@ -26,7 +26,8 @@
     [:*
      [:& measures-menu {:ids ids
                         :type type
-                        :values measure-values}]
+                        :values measure-values
+                        :shape shape}]
      [:& constraints-menu {:ids ids
                            :values constraint-values}]
      [:& layer-menu {:ids ids

frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs

@@ -27,7 +27,8 @@
     [:*
      [:& measures-menu {:ids ids
                         :type type
-                        :values measure-values}]
+                        :values measure-values
+                        :shape shape}]
      [:& constraints-menu {:ids ids
                            :values constraint-values}]
      [:& layer-menu {:ids ids

frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs

@@ -25,7 +25,8 @@
     [:*
      [:& measures-menu {:ids [(:id shape)]
                         :values measure-values
-                        :type type}]
+                        :type type
+                        :shape shape}]
      [:& layer-menu {:ids ids
                      :type type
                      :values layer-values}]

frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs

@@ -41,7 +41,7 @@
         [comp-ids       comp-values]       [[(:id shape)] (select-keys shape component-attrs)]]
 
     [:div.options
-     [:& measures-menu {:type type :ids measure-ids :values measure-values}]
+     [:& measures-menu {:type type :ids measure-ids :values measure-values :shape shape}]
      [:& component-menu {:ids comp-ids :values comp-values}]
      [:& constraints-menu {:ids constraint-ids :values constraint-values}]
      [:& layer-menu {:type type :ids layer-ids :values layer-values}]

frontend/src/app/main/ui/workspace/sidebar/options/shapes/image.cljs

@@ -27,7 +27,8 @@
     [:*
      [:& measures-menu {:ids ids
                         :type type
-                        :values measure-values}]
+                        :values measure-values
+                        :shape shape}]
 
      [:& constraints-menu {:ids ids
                            :values constraint-values}]

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

@@ -241,7 +241,7 @@
 
     [:div.options
      (when-not (empty? measure-ids)
-       [:& measures-menu {:type type :all-types all-types :ids measure-ids :values measure-values}])
+       [:& measures-menu {:type type :all-types all-types :ids measure-ids :values measure-values :shape shapes}])
 
      (when-not (empty? constraint-ids)
        [:& constraints-menu {:ids constraint-ids :values constraint-values}])

frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs

@@ -27,7 +27,8 @@
     [:*
      [:& measures-menu {:ids ids
                         :type type
-                        :values measure-values}]
+                        :values measure-values
+                        :shape shape}]
      [:& constraints-menu {:ids ids
                            :values constraint-values}]
      [:& layer-menu {:ids ids

frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs

@@ -29,7 +29,8 @@
     [:*
      [:& measures-menu {:ids ids
                         :type type
-                        :values measure-values}]
+                        :values measure-values
+                        :shape shape}]
 
      [:& constraints-menu {:ids ids
                            :values constraint-values}]

frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs

@@ -103,7 +103,8 @@
       [:*
        [:& measures-menu {:ids ids
                           :type type
-                          :values measure-values}]
+                          :values measure-values
+                          :shape shape}]
 
        [:& constraints-menu {:ids ids
                              :values constraint-values}]

frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs

@@ -62,7 +62,8 @@
      [:& measures-menu
       {:ids ids
        :type type
-       :values (select-keys shape measure-attrs)}]
+       :values (select-keys shape measure-attrs)
+       :shape shape}]
 
      [:& constraints-menu
       {:ids ids