mirror of
https://github.com/penpot/penpot.git
synced 2025-05-30 01:36:11 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
Andrey Antukh
commit
582ec187f8
9 changed files with 125 additions and 42 deletions
|
|
@ -432,6 +432,7 @@ span.element-name {
|
|||
background-color: $color-white;
|
||||
color: $color-gray-50;
|
||||
border-radius: $br4;
|
||||
z-index: 1;
|
||||
span {
|
||||
padding: 10px 20px 10px 10px;
|
||||
border-radius: $br4;
|
||||
|
|
|
|||
|
|
@ -1008,6 +1008,13 @@
|
|||
;; Navigation
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defn workspace-focus-lost
|
||||
[]
|
||||
(ptk/reify ::workspace-focus-lost
|
||||
ptk/UpdateEvent
|
||||
(update [_ state]
|
||||
(assoc-in state [:workspace-global :show-distances?] false))))
|
||||
|
||||
(defn navigate-to-project
|
||||
[project-id]
|
||||
(ptk/reify ::navigate-to-project
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
[app.main.data.workspace.libraries :as dwl]
|
||||
[app.main.data.workspace.persistence :as dwp]
|
||||
[app.main.streams :as ms]
|
||||
[app.util.globals :refer [global]]
|
||||
[app.util.object :as obj]
|
||||
[app.util.time :as dt]
|
||||
[beicon.core :as rx]
|
||||
[cljs.spec.alpha :as s]
|
||||
|
|
@ -37,7 +39,8 @@
|
|||
profile-id (:profile-id state)
|
||||
|
||||
initmsg [{:type :subscribe-file
|
||||
:file-id file-id}
|
||||
:file-id file-id
|
||||
:version (obj/get global "penpotVersion")}
|
||||
{:type :subscribe-team
|
||||
:team-id team-id}]
|
||||
|
||||
|
|
@ -130,7 +133,7 @@
|
|||
})
|
||||
|
||||
(defn handle-presence
|
||||
[{:keys [type session-id profile-id] :as message}]
|
||||
[{:keys [type session-id profile-id version] :as message}]
|
||||
(letfn [(get-next-color [presence]
|
||||
(let [xfm (comp (map second)
|
||||
(map :color)
|
||||
|
|
@ -149,6 +152,7 @@
|
|||
(assoc :id session-id)
|
||||
(assoc :profile-id profile-id)
|
||||
(assoc :updated-at (dt/now))
|
||||
(assoc :version version)
|
||||
(update :color update-color presence)
|
||||
(assoc :text-color (if (contains? ["#00fa9a" "#ffd700" "#dda0dd" "#ffafda"]
|
||||
(update-color (:color presence) presence))
|
||||
|
|
@ -197,8 +201,9 @@
|
|||
(-deref [_] {:changes changes})
|
||||
|
||||
ptk/WatchEvent
|
||||
(watch [_ _ _]
|
||||
(let [position-data-operation?
|
||||
(watch [_ state _]
|
||||
(let [page-id (:current-page-id state)
|
||||
position-data-operation?
|
||||
(fn [{:keys [type attr]}]
|
||||
(and (= :set type) (= attr :position-data)))
|
||||
|
||||
|
|
@ -213,7 +218,8 @@
|
|||
;; Remove the position data from remote operations. Will be changed localy, otherwise
|
||||
;; creates a strange "out-of-sync" behaviour.
|
||||
(cond-> change
|
||||
(= :mod-obj (:type change))
|
||||
(and (= page-id (:page-id change))
|
||||
(= :mod-obj (:type change)))
|
||||
(update :operations #(d/removev position-data-operation? %))))
|
||||
|
||||
process-page-changes
|
||||
|
|
@ -223,7 +229,10 @@
|
|||
;; We update `position-data` from the incoming message
|
||||
changes (->> changes
|
||||
(mapv update-position-data)
|
||||
(d/removev :ignore-remote?))
|
||||
(d/removev (fn [change]
|
||||
(and (= page-id (:page-id change))
|
||||
(:ignore-remote? change)))))
|
||||
|
||||
changes-by-pages (group-by :page-id changes)]
|
||||
|
||||
(rx/merge
|
||||
|
|
|
|||
|
|
@ -184,10 +184,10 @@
|
|||
(ctm/resize scalev resize-origin shape-transform shape-transform-inverse)
|
||||
|
||||
(cond-> set-fix-width?
|
||||
(ctm/change-parent-property :layout-item-h-sizing :fix))
|
||||
(ctm/change-property :layout-item-h-sizing :fix))
|
||||
|
||||
(cond-> set-fix-height?
|
||||
(ctm/change-parent-property :layout-item-v-sizing :fix))
|
||||
(ctm/change-property :layout-item-v-sizing :fix))
|
||||
|
||||
(cond-> scale-text
|
||||
(ctm/scale-content (:x scalev))))
|
||||
|
|
@ -739,6 +739,13 @@
|
|||
#{}
|
||||
(into (d/ordered-set) (find-all-empty-parents #{})))
|
||||
|
||||
;; Not move absolute shapes that won't change parent
|
||||
moving-shapes
|
||||
(->> moving-shapes
|
||||
(remove (fn [shape]
|
||||
(and (ctl/layout-absolute? shape)
|
||||
(= frame-id (:parent-id shape))))))
|
||||
|
||||
changes
|
||||
(-> (pcb/empty-changes it page-id)
|
||||
(pcb/with-objects objects)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
;; Copyright (c) KALEIDOS INC
|
||||
|
||||
(ns app.main.ui.workspace
|
||||
(:import goog.events.EventType)
|
||||
(:require
|
||||
[app.common.data.macros :as dm]
|
||||
[app.main.data.messages :as msg]
|
||||
|
|
@ -31,9 +32,11 @@
|
|||
[app.main.ui.workspace.textpalette :refer [textpalette]]
|
||||
[app.main.ui.workspace.viewport :refer [viewport]]
|
||||
[app.util.dom :as dom]
|
||||
[app.util.globals :as globals]
|
||||
[app.util.i18n :as i18n :refer [tr]]
|
||||
[app.util.object :as obj]
|
||||
[debug :refer [debug?]]
|
||||
[goog.events :as events]
|
||||
[okulary.core :as l]
|
||||
[rumext.v2 :as mf]))
|
||||
|
||||
|
|
@ -135,7 +138,19 @@
|
|||
|
||||
components-v2 (features/use-feature :components-v2)
|
||||
|
||||
background-color (:background-color wglobal)]
|
||||
background-color (:background-color wglobal)
|
||||
|
||||
focus-out
|
||||
(mf/use-callback
|
||||
(fn []
|
||||
(st/emit! (dw/workspace-focus-lost))))]
|
||||
|
||||
(mf/use-effect
|
||||
(mf/deps focus-out)
|
||||
(fn []
|
||||
(let [keys [(events/listen globals/document EventType.FOCUSOUT focus-out)]]
|
||||
#(doseq [key keys]
|
||||
(events/unlistenByKey key)))))
|
||||
|
||||
;; Setting the layout preset by its name
|
||||
(mf/with-effect [layout-name]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
(:require
|
||||
[app.common.data.macros :as dm]
|
||||
[app.common.geom.point :as gpt]
|
||||
[app.common.geom.shapes :as gsh]
|
||||
[app.common.math :as mth]
|
||||
[app.main.ui.cursors :as cur]
|
||||
[app.main.ui.formats :refer [format-number]]))
|
||||
|
||||
|
|
@ -42,7 +42,58 @@
|
|||
(let [inv-zoom (/ 1 zoom)]
|
||||
(dm/fmt "scale(%, %) translate(%, %)" inv-zoom inv-zoom (* zoom x) (* zoom y))))
|
||||
|
||||
(defn title-transform [{:keys [selrect] :as shape} zoom]
|
||||
(let [transform (gsh/transform-str shape {:no-flip true})
|
||||
label-pos (gpt/point (:x selrect) (- (:y selrect) (/ 10 zoom)))]
|
||||
(dm/str transform " " (text-transform label-pos zoom))))
|
||||
(defn left?
|
||||
[cur cand]
|
||||
(let [closex? (mth/close? (:x cand) (:x cur))]
|
||||
(cond
|
||||
(and closex? (< (:y cand) (:y cur))) cand
|
||||
closex? cur
|
||||
(< (:x cand) (:x cur)) cand
|
||||
:else cur)))
|
||||
|
||||
(defn top?
|
||||
[cur cand]
|
||||
(let [closey? (mth/close? (:y cand) (:y cur))]
|
||||
(cond
|
||||
(and closey? (< (:x cand) (:x cur))) cand
|
||||
closey? cur
|
||||
(< (:y cand) (:y cur)) cand
|
||||
:else cur)))
|
||||
|
||||
(defn right?
|
||||
[cur cand]
|
||||
(let [closex? (mth/close? (:x cand) (:x cur))]
|
||||
(cond
|
||||
(and closex? (< (:y cand) (:y cur))) cand
|
||||
closex? cur
|
||||
(> (:x cand) (:x cur)) cand
|
||||
:else cur)))
|
||||
|
||||
(defn title-transform [{:keys [points] :as shape} zoom]
|
||||
(let [leftmost (->> points (reduce left?))
|
||||
topmost (->> points (remove #{leftmost}) (reduce top?))
|
||||
rightmost (->> points (remove #{leftmost topmost}) (reduce right?))
|
||||
|
||||
left-top (gpt/to-vec leftmost topmost)
|
||||
left-top-angle (gpt/angle left-top)
|
||||
|
||||
top-right (gpt/to-vec topmost rightmost)
|
||||
top-right-angle (gpt/angle top-right)
|
||||
|
||||
;; Choose the position that creates the less angle between left-side and top-side
|
||||
[label-pos angle v-pos]
|
||||
(if (< (mth/abs left-top-angle) (mth/abs top-right-angle))
|
||||
[leftmost left-top-angle (gpt/perpendicular left-top)]
|
||||
[topmost top-right-angle (gpt/perpendicular top-right)])
|
||||
|
||||
|
||||
label-pos
|
||||
(gpt/subtract label-pos (gpt/scale (gpt/unit v-pos) (/ 10 zoom)))]
|
||||
|
||||
(dm/fmt "rotate(% %,%) scale(%, %) translate(%, %)"
|
||||
;; rotate
|
||||
angle (:x label-pos) (:y label-pos)
|
||||
;; scale
|
||||
(/ 1 zoom) (/ 1 zoom)
|
||||
;; translate
|
||||
(* zoom (:x label-pos)) (* zoom (:y label-pos)))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue