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

Merge remote-tracking branch 'origin/staging'

Browse source
This commit is contained in:
Alejandro Alonso 2024-04-09 13:13:23 +02:00
commit b130cc40f0
6 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/data/workspace.cljs
View file

@ -682,12 +682,12 @@
(defn end-rename-shape
"End the ongoing shape rename process"
([] (end-rename-shape nil))
([name]
([] (end-rename-shape nil nil))
([shape-id name]
(ptk/reify ::end-rename-shape
ptk/WatchEvent
(watch [_ state _]
(when-let [shape-id (dm/get-in state [:workspace-local :shape-for-rename])]
(when-let [shape-id (d/nilv shape-id (dm/get-in state [:workspace-local :shape-for-rename]))]
(let [shape (wsh/lookup-shape state shape-id)
name (str/trim name)
clean-name (cfh/clean-path name)

4
frontend/src/app/main/data/workspace/colors.cljs
View file

@ -602,9 +602,11 @@
(update-in state [:stops stop] (fn [data] (->> changes
(merge data)
(materialize-color-components))))
(-> state
(dissoc :gradient :stops :editing-stop)
(assoc :type :color)))))))
(cond-> (not= :image (:type state))
(assoc :type :color))))))))
ptk/WatchEvent
(watch [_ state _]
(when add-recent?

8
frontend/src/app/main/ui/components/editable_label.scss
View file

@ -20,12 +20,8 @@
color: var(--input-foreground-color-active);
}
.editable-label {
display: flex;
&.is-hidden {
display: none;
}
.editable-label.is-hidden {
display: none;
}
.editable-label-close {

3
frontend/src/app/main/ui/dashboard/projects.scss
View file

@ -85,6 +85,9 @@
line-height: 0.8;
color: var(--title-foreground-color-hover);
cursor: pointer;
height: $s-16;
display: inline-flex;
align-items: center;
}
.info-wrapper {

8
frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs
View file

@ -51,21 +51,21 @@
accept-edit
(mf/use-fn
(mf/deps on-stop-edit)
(mf/deps shape-id on-stop-edit)
(fn []
(let [name-input (mf/ref-val ref)
name (str/trim (dom/get-value name-input))]
(on-stop-edit)
(reset! edition* false)
(st/emit! (dw/end-rename-shape name)))))
(st/emit! (dw/end-rename-shape shape-id name)))))
cancel-edit
(mf/use-fn
(mf/deps on-stop-edit)
(mf/deps shape-id on-stop-edit)
(fn []
(on-stop-edit)
(reset! edition* false)
(st/emit! (dw/end-rename-shape nil))))
(st/emit! (dw/end-rename-shape shape-id nil))))
on-key-down
(mf/use-fn

23
frontend/src/app/main/ui/workspace/viewport/selection.cljs
View file

@ -36,6 +36,8 @@
(def selection-rect-width 1)
(def min-selrect-side 10)
(def small-selrect-side 30)
(def min-selrect-width 10)
(def min-selrect-height 10)
(mf/defc selection-rect
{::mf/wrap-props false}
@ -43,12 +45,27 @@
(let [x (dm/get-prop rect :x)
y (dm/get-prop rect :y)
width (dm/get-prop rect :width)
height (dm/get-prop rect :height)]
height (dm/get-prop rect :height)
;; This is a calculation to create a "minimum" interactable rect
;; Is necesary so that small shapes in x/y (like lines) can be moved
;; better
[x width]
(if (< width (/ min-selrect-width zoom))
(let [width' (/ min-selrect-width zoom)]
[(- x (/ (- width' width) 2)) width'])
[x width])
[y height]
(if (< height (/ min-selrect-height zoom))
(let [height' (/ min-selrect-height zoom)]
[(- y (/ (- height' height) 2)) height'])
[y height])]
[:rect.main.viewport-selrect
{:x x
:y y
:width width
:height height
:width (max width (/ 10 zoom))
:height (max height (/ 10 zoom))
:transform (str transform)
:on-pointer-down on-move-selected
:on-context-menu on-context-menu