mirror of
https://github.com/penpot/penpot.git
synced 2025-04-16 08:51:32 -05:00
✨ Path improvements
This commit is contained in:
alonso.torres
Andrés Moya
parent
48ba80c6e2
commit
07799d9b01
2 changed files with 0 additions and 194 deletions
|
|
@ -27,7 +27,6 @@
|
|||
[app.main.ui.workspace.viewport.selection :as selection]
|
||||
[app.main.ui.workspace.viewport.snap-distances :as snap-distances]
|
||||
[app.main.ui.workspace.viewport.snap-points :as snap-points]
|
||||
[app.main.ui.workspace.viewport.snap-path :as snap-path]
|
||||
[app.main.ui.workspace.viewport.utils :as utils]
|
||||
[app.main.ui.workspace.viewport.widgets :as widgets]
|
||||
[beicon.core :as rx]
|
||||
|
|
@ -284,11 +283,6 @@
|
|||
:selected selected
|
||||
:page-id page-id}])
|
||||
|
||||
[:& snap-path/snap-path
|
||||
{:zoom zoom
|
||||
:edition edition
|
||||
:edit-path edit-path}]
|
||||
|
||||
(when show-cursor-tooltip?
|
||||
[:& widgets/cursor-tooltip
|
||||
{:zoom zoom
|
||||
|
|
|
|||
|
|
@ -1,188 +0,0 @@
|
|||
;; This Source Code Form is subject to the terms of the Mozilla Public
|
||||
;; License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
;;
|
||||
;; Copyright (c) UXBOX Labs SL
|
||||
|
||||
(ns app.main.ui.workspace.viewport.snap-path
|
||||
(:require
|
||||
#_[app.common.math :as mth]
|
||||
#_[app.common.data :as d]
|
||||
#_[app.common.geom.point :as gpt]
|
||||
#_[app.common.geom.shapes :as gsh]
|
||||
[app.main.refs :as refs]
|
||||
#_[app.main.snap :as snap]
|
||||
#_[app.util.geom.snap-points :as sp]
|
||||
[app.util.geom.path :as ugp]
|
||||
#_[beicon.core :as rx]
|
||||
[rumext.alpha :as mf]))
|
||||
|
||||
#_(def ^:private line-color "#D383DA")
|
||||
#_(def ^:private line-opacity 0.6)
|
||||
#_(def ^:private line-width 1)
|
||||
|
||||
;; Configuration for debug
|
||||
;; (def ^:private line-color "red")
|
||||
;; (def ^:private line-opacity 1 )
|
||||
;; (def ^:private line-width 2)
|
||||
|
||||
#_(mf/defc snap-point
|
||||
[{:keys [point zoom]}]
|
||||
(let [{:keys [x y]} point
|
||||
x (mth/round x)
|
||||
y (mth/round y)
|
||||
cross-width (/ 3 zoom)]
|
||||
[:g
|
||||
[:line {:x1 (- x cross-width)
|
||||
:y1 (- y cross-width)
|
||||
:x2 (+ x cross-width)
|
||||
:y2 (+ y cross-width)
|
||||
:style {:stroke line-color :stroke-width (str (/ line-width zoom))}}]
|
||||
[:line {:x1 (- x cross-width)
|
||||
:y1 (+ y cross-width)
|
||||
:x2 (+ x cross-width)
|
||||
:y2 (- y cross-width)
|
||||
:style {:stroke line-color :stroke-width (str (/ line-width zoom))}}]]))
|
||||
|
||||
#_(mf/defc snap-line
|
||||
[{:keys [snap point zoom]}]
|
||||
[:line {:x1 (mth/round (:x snap))
|
||||
:y1 (mth/round (:y snap))
|
||||
:x2 (mth/round (:x point))
|
||||
:y2 (mth/round (:y point))
|
||||
:style {:stroke line-color :stroke-width (str (/ line-width zoom))}
|
||||
:opacity line-opacity}])
|
||||
|
||||
#_(defn get-snap
|
||||
[coord {:keys [shapes page-id filter-shapes modifiers]}]
|
||||
(let [shape (if (> (count shapes) 1)
|
||||
(->> shapes (map gsh/transform-shape) gsh/selection-rect (gsh/setup {:type :rect}))
|
||||
(->> shapes (first)))
|
||||
|
||||
shape (if modifiers
|
||||
(-> shape (assoc :modifiers modifiers) gsh/transform-shape)
|
||||
shape)
|
||||
|
||||
frame-id (snap/snap-frame-id shapes)]
|
||||
|
||||
(->> (rx/of shape)
|
||||
(rx/flat-map (fn [shape]
|
||||
(->> (sp/shape-snap-points shape)
|
||||
(map #(vector frame-id %)))))
|
||||
(rx/flat-map (fn [[frame-id point]]
|
||||
(->> (snap/get-snap-points page-id frame-id filter-shapes point coord)
|
||||
(rx/map #(vector point % coord)))))
|
||||
(rx/reduce conj []))))
|
||||
|
||||
#_(defn- flip
|
||||
"Function that reverses the x/y coordinates to their counterpart"
|
||||
[coord]
|
||||
(if (= coord :x) :y :x))
|
||||
|
||||
#_(defn add-point-to-snaps
|
||||
[[point snaps coord]]
|
||||
(let [normalize-coord #(assoc % coord (get point coord))]
|
||||
(cons point (map normalize-coord snaps))))
|
||||
|
||||
|
||||
#_(defn- process-snap-lines
|
||||
"Gets the snaps for a coordinate and creates lines with a fixed coordinate"
|
||||
[snaps coord]
|
||||
(->> snaps
|
||||
;; only snap on the `coord` coordinate
|
||||
(filter #(= (nth % 2) coord))
|
||||
;; we add the point so the line goes from the point to the snap
|
||||
(mapcat add-point-to-snaps)
|
||||
;; We flatten because it's a list of from-to points
|
||||
(flatten)
|
||||
;; Put together the points of the coordinate
|
||||
(group-by coord)
|
||||
;; Keep only the other coordinate
|
||||
(d/mapm #(map (flip coord) %2))
|
||||
;; Finally get the max/min and this will define the line to draw
|
||||
(d/mapm #(vector (apply min %2) (apply max %2)))
|
||||
;; Change the structure to retrieve a list of lines from/todo
|
||||
(map (fn [[fixedv [minv maxv]]] [(hash-map coord fixedv (flip coord) minv)
|
||||
(hash-map coord fixedv (flip coord) maxv)]))))
|
||||
|
||||
#_(mf/defc snap-feedback
|
||||
[{:keys [shapes page-id filter-shapes zoom modifiers] :as props}]
|
||||
(let [state (mf/use-state [])
|
||||
subject (mf/use-memo #(rx/subject))
|
||||
|
||||
;; We use sets to store points/lines so there are no points/lines repeated
|
||||
;; can cause problems with react keys
|
||||
snap-points (into #{} (mapcat add-point-to-snaps) @state)
|
||||
|
||||
snap-lines (->> (into (process-snap-lines @state :x)
|
||||
(process-snap-lines @state :y))
|
||||
(into #{}))]
|
||||
|
||||
(mf/use-effect
|
||||
(fn []
|
||||
(let [sub (->> subject
|
||||
(rx/switch-map #(rx/combine-latest
|
||||
d/concat
|
||||
(get-snap :y %)
|
||||
(get-snap :x %)))
|
||||
(rx/subs #(let [rs (filter (fn [[_ snaps _]] (> (count snaps) 0)) %)]
|
||||
(reset! state rs))))]
|
||||
|
||||
;; On unmount callback
|
||||
#(rx/dispose! sub))))
|
||||
|
||||
(mf/use-effect
|
||||
(mf/deps shapes modifiers)
|
||||
(fn []
|
||||
(rx/push! subject props)))
|
||||
|
||||
[:g.snap-feedback
|
||||
(for [[from-point to-point] snap-lines]
|
||||
[:& snap-line {:key (str "line-" (:x from-point)
|
||||
"-" (:y from-point)
|
||||
"-" (:x to-point)
|
||||
"-" (:y to-point) "-")
|
||||
:snap from-point
|
||||
:point to-point
|
||||
:zoom zoom}])
|
||||
(for [point snap-points]
|
||||
[:& snap-point {:key (str "point-" (:x point)
|
||||
"-" (:y point))
|
||||
:point point
|
||||
:zoom zoom}])]))
|
||||
|
||||
#_(mf/defc snap-points
|
||||
{::mf/wrap [mf/memo]}
|
||||
[{:keys [layout zoom selected page-id drawing transform modifiers] :as props}]
|
||||
(let [shapes (mf/deref (refs/objects-by-id selected))
|
||||
filter-shapes (mf/deref refs/selected-shapes-with-children)
|
||||
filter-shapes (fn [id]
|
||||
(if (= id :layout)
|
||||
(or (not (contains? layout :display-grid))
|
||||
(not (contains? layout :snap-grid)))
|
||||
(or (filter-shapes id)
|
||||
(not (contains? layout :dynamic-alignment)))))
|
||||
shapes (if drawing [drawing] shapes)]
|
||||
(when (or drawing transform)
|
||||
[:& snap-feedback {:shapes shapes
|
||||
:page-id page-id
|
||||
:filter-shapes filter-shapes
|
||||
:zoom zoom
|
||||
:modifiers modifiers}])))
|
||||
|
||||
(mf/defc snap-feedback [])
|
||||
|
||||
|
||||
(mf/defc snap-path
|
||||
{::mf/wrap [mf/memo]}
|
||||
[{:keys [edition edit-path zoom]}]
|
||||
(let [{:keys [content]} (mf/deref (refs/object-by-id edition))
|
||||
{:keys [drag-handler preview snap-toggled]} (get edit-path edition)
|
||||
|
||||
position (or drag-handler
|
||||
(ugp/command->point preview))]
|
||||
|
||||
(when snap-toggled
|
||||
[:& snap-feedback {:content content
|
||||
:position position
|
||||
:zoom zoom}])))
|
||||
Loading…
Add table
Reference in a new issue