0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-13 16:21:57 -05:00

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

This commit is contained in:
Andrey Antukh 2021-12-22 18:49:46 +01:00
commit 0cad1a1e7e
12 changed files with 105 additions and 106 deletions

View file

@ -183,7 +183,7 @@
(defmethod ig/prep-key ::gc-task
[_ cfg]
(merge {:max-age (dt/duration {:days 2})}
(merge {:max-age (dt/duration {:days 15})}
(d/without-nils cfg)))
(defmethod ig/init-key ::gc-task

View file

@ -261,20 +261,12 @@
(defn select-frames
[objects]
(let [root (get objects uuid/zero)
loopfn (fn loopfn [ids]
(let [id (first ids)
obj (get objects id)]
(cond
(or (nil? id) (nil? obj))
nil
(= :frame (:type obj))
(lazy-seq (cons obj (loopfn (rest ids))))
:else
(lazy-seq (loopfn (rest ids))))))]
(loopfn (:shapes root))))
(let [lookup #(get objects %)
frame? #(= :frame (:type %))
xform (comp (map lookup)
(filter frame?))]
(->> (:shapes (lookup uuid/zero))
(into [] xform))))
(defn clone-object
"Gets a copy of the object and all its children, with new ids

View file

@ -506,7 +506,6 @@
stopper (rx/filter ms/mouse-up? stream)]
(when-not (empty? selected)
(->> ms/mouse-position
(rx/take-until stopper)
(rx/map #(gpt/to-vec initial %))
(rx/map #(gpt/length %))
(rx/filter #(> % 1))
@ -519,7 +518,9 @@
(rx/of (start-move-duplicate initial)
(dws/duplicate-selected false))
;; Otherwise just plain old move
(rx/of (start-move initial selected)))))))))))
(rx/of (start-move initial selected)))))
(rx/take-until stopper)))))))
(defn- start-move-duplicate
[from-position]
@ -560,7 +561,6 @@
delta)))
position (->> ms/mouse-position
(rx/take-until stopper)
(rx/with-latest-from ms/mouse-position-shift)
(rx/map #(fix-axis %)))
@ -579,7 +579,8 @@
(->> position
(rx/with-latest vector snap-delta)
(rx/map snap/correct-snap-point)
(rx/map set-local-displacement))
(rx/map set-local-displacement)
(rx/take-until stopper))
(rx/of (set-modifiers ids)
(apply-modifiers ids)

View file

@ -219,7 +219,7 @@
(l/derived :options workspace-page))
(def workspace-frames
(l/derived cp/select-frames workspace-page-objects))
(l/derived cp/select-frames workspace-page-objects =))
(def workspace-editor
(l/derived :workspace-editor st/state))

View file

@ -162,5 +162,12 @@
(obj/set! "onKeyDown" handle-key-down)
(obj/set! "onBlur" handle-blur))]
(mf/use-effect
(mf/deps value-str)
(fn []
(when-let [input-node (mf/ref-val ref)]
(when-not (dom/active? input-node)
(dom/set-value! input-node value-str)))))
[:> :input props]))

View file

@ -522,7 +522,7 @@
[:li.feedback {:on-click (partial on-click :settings-feedback)}
[:span.icon i/msg-info]
[:span.text (tr "labels.give-feedback")]
[:span.primary-badge "BETA"]])]]]
])]]]
(when (and team profile)
[:& comments-section {:profile profile

View file

@ -289,8 +289,8 @@
(when (contains? @cf/flags :user-feedback)
[:li.feedback {:on-click (st/emitf (rt/nav :settings-feedback))}
[:span (tr "labels.give-feedback")]
[:span.primary-badge "ALPHA"]])
[:span (tr "labels.give-feedback")]])
]]]))
;; --- Header Component

View file

@ -64,7 +64,6 @@
(fn [value]
(on-change (assoc-in grid keys-path value))))
;; TODO: remove references to :auto
handle-change-size
(mf/use-fn
(mf/deps grid)
@ -75,7 +74,6 @@
(-> (gg/calculate-default-item-length frame-length margin gutter)
(mth/precision 2))
item-length)]
(-> grid
(update :params assoc :size size :item-length item-length)
(on-change)))))

View file

@ -20,13 +20,14 @@
[app.util.i18n :as i18n :refer [tr]]
[rumext.alpha :as mf]))
(def measure-attrs [:proportion-lock
:width :height
:x :y
:rotation
:rx :ry
:r1 :r2 :r3 :r4
:selrect])
(def measure-attrs
[:proportion-lock
:width :height
:x :y
:rotation
:rx :ry
:r1 :r2 :r3 :r4
:selrect])
(defn- attr->string [attr values]
(let [value (attr values)]

View file

@ -295,7 +295,7 @@
(when show-grids?
[:& frame-grid/frame-grid
{:zoom zoom}])
{:zoom zoom :selected selected :transform transform}])
(when show-pixel-grid?
[:& widgets/pixel-grid

View file

@ -42,7 +42,8 @@
:height (:height frame)
:fill (str "url(#" grid-id ")")}]]))
(mf/defc layout-grid [{:keys [key frame grid]}]
(mf/defc layout-grid
[{:keys [key frame grid]}]
(let [{color-value :color color-opacity :opacity} (-> grid :params :color)
;; Support for old color format
color-value (or color-value (:value (get-in grid [:params :color :value])))
@ -56,42 +57,37 @@
:strokeOpacity color-opacity
:fill "none"})]
[:g.grid
(for [{:keys [x y width height]} (gg/grid-areas frame grid)]
(do
[:rect {:key (str key "-" x "-" y)
:x (mth/round x)
:y (mth/round y)
:width (- (mth/round (+ x width)) (mth/round x))
:height (- (mth/round (+ y height)) (mth/round y))
:style style}]))]))
(for [{:keys [x y width height] :as area} (gg/grid-areas frame grid)]
[:rect {:key (str key "-" x "-" y)
:x (mth/round x)
:y (mth/round y)
:width (- (mth/round (+ x width)) (mth/round x))
:height (- (mth/round (+ y height)) (mth/round y))
:style style}])]))
(mf/defc grid-display-frame [{:keys [frame zoom]}]
(let [grids (:grids frame)]
(for [[index {:keys [type display] :as grid}] (map-indexed vector grids)]
(let [props #js {:key (str (:id frame) "-grid-" index)
:frame frame
:zoom zoom
:grid grid}]
(when display
(case type
:square [:> square-grid props]
:column [:> layout-grid props]
:row [:> layout-grid props]))))))
(def shapes-moving-ref
(let [moving-shapes (fn [local]
(when (= :move (:transform local))
(:selected local)))]
(l/derived moving-shapes refs/workspace-local)))
(mf/defc grid-display-frame
[{:keys [frame zoom]}]
(for [[index {:keys [type display] :as grid}] (->> (:grids frame)
(filter :display)
(map-indexed vector))]
(let [props #js {:key (str (:id frame) "-grid-" index)
:frame frame
:zoom zoom
:grid grid}]
(case type
:square [:> square-grid props]
:column [:> layout-grid props]
:row [:> layout-grid props]))))
(mf/defc frame-grid
{::mf/wrap [mf/memo]}
[{:keys [zoom]}]
(let [frames (mf/deref refs/workspace-frames)
shapes-moving (mf/deref shapes-moving-ref)]
[{:keys [zoom transform selected]}]
(let [frames (mf/deref refs/workspace-frames)
moving (when (= :move transform) selected)
is-moving? #(contains? moving (:id %))]
[:g.grid-display {:style {:pointer-events "none"}}
(for [frame (->> frames (remove #(contains? shapes-moving (:id %))))]
(for [frame (remove is-moving? frames)]
[:& grid-display-frame {:key (str "grid-" (:id frame))
:zoom zoom
:frame (gsh/transform-shape frame)}])]))

View file

@ -23,61 +23,65 @@
frame-length-no-margins (- frame-length (+ margin (- margin gutter)))]
(mth/floor (/ frame-length-no-margins (+ item-length gutter)))))
(defn- calculate-generic-grid
[v width {:keys [size gutter margin item-length type]}]
(let [size (if (number? size)
size
(calculate-size width item-length margin gutter))
parts (/ width size)
width' (min (or item-length ##Inf) (+ parts (- gutter) (/ gutter size) (- (/ (* margin 2) size))))
offset (case type
:right (- width (* width' size) (* gutter (dec size)) margin)
:center (/ (- width (* width' size) (* gutter (dec size))) 2)
margin)
gutter (if (= :stretch type)
(let [gutter (/ (- width (* width' size) (* margin 2)) (dec size))]
(if (mth/finite? gutter) gutter 0))
gutter)
next-v (fn [cur-val]
(+ offset v (* (+ width' gutter) cur-val)))]
[size width' next-v]))
(defn- calculate-column-grid
[{:keys [width height x y] :as frame} {:keys [size gutter margin item-length type] :as params}]
(let [size (if (number? size) size (calculate-size width item-length margin gutter))
parts (/ width size)
item-width (min (or item-length ##Inf) (+ parts (- gutter) (/ gutter size) (- (/ (* margin 2) size))))
item-height height
initial-offset (case type
:right (- width (* item-width size) (* gutter (dec size)) margin)
:center (/ (- width (* item-width size) (* gutter (dec size))) 2)
margin)
gutter (if (= :stretch type) (/ (- width (* item-width size) (* margin 2)) (dec size)) gutter)
next-x (fn [cur-val] (+ initial-offset x (* (+ item-width gutter) cur-val)))
next-y (fn [_] y)]
[size item-width item-height next-x next-y]))
[{:keys [width height x y] :as frame} params]
(let [[size width next-x] (calculate-generic-grid x width params)]
[size width height next-x (constantly y)]))
(defn- calculate-row-grid
[{:keys [width height x y] :as frame} {:keys [size gutter margin item-length type] :as params}]
(let [size (if (number? size) size (calculate-size height item-length margin gutter))
parts (/ height size)
item-width width
item-height (min (or item-length ##Inf) (+ parts (- gutter) (/ gutter size) (- (/ (* margin 2) size))))
initial-offset (case type
:right (- height (* item-height size) (* gutter (dec size)) margin)
:center (/ (- height (* item-height size) (* gutter (dec size))) 2)
margin)
gutter (if (= :stretch type) (/ (- height (* item-height size) (* margin 2)) (dec size)) gutter)
next-x (fn [_] x)
next-y (fn [cur-val] (+ initial-offset y (* (+ item-height gutter) cur-val)))]
[size item-width item-height next-x next-y]))
[{:keys [width height x y] :as frame} params]
(let [[size height next-y] (calculate-generic-grid y height params)]
[size width height (constantly x) next-y]))
(defn- calculate-square-grid
[{:keys [width height x y] :as frame} {:keys [size] :as params}]
(let [col-size (quot width size)
row-size (quot height size)
(let [col-size (quot width size)
row-size (quot height size)
as-row-col (fn [value] [(quot value col-size) (rem value col-size)])
next-x (fn [cur-val]
(let [[_ col] (as-row-col cur-val)] (+ x (* col size))))
next-y (fn [cur-val]
(let [[row _] (as-row-col cur-val)] (+ y (* row size))))]
next-x (fn [cur-val]
(let [[_ col] (as-row-col cur-val)] (+ x (* col size))))
next-y (fn [cur-val]
(let [[row _] (as-row-col cur-val)] (+ y (* row size))))]
[(* col-size row-size) size size next-x next-y]))
(defn grid-areas
"Given a frame and the grid parameters returns the areas defined on the grid"
[frame grid]
(let [grid-fn (case (-> grid :type)
:column calculate-column-grid
:row calculate-row-grid
:square calculate-square-grid)
:column calculate-column-grid
:row calculate-row-grid
:square calculate-square-grid)
[num-items item-width item-height next-x next-y] (grid-fn frame (-> grid :params))]
(->>
(range 0 num-items)
(map #(hash-map :x (next-x %)
:y (next-y %)
:width item-width
:height item-height)))))
(->> (range 0 num-items)
(map #(hash-map :x (next-x %)
:y (next-y %)
:width item-width
:height item-height)))))
(defn grid-area-points
[{:keys [x y width height]}]