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

This commit is contained in:
Andrey Antukh 2022-02-25 12:56:30 +01:00
commit 45f9d5bb81
10 changed files with 62 additions and 27 deletions

View file

@ -727,9 +727,13 @@
ptk/WatchEvent
(watch [_ state _]
(let [selected (wsh/lookup-selected state)
hover-guides (get-in state [:workspace-guides :hover])]
hover-guides (get-in state [:workspace-guides :hover])
options-mode (get-in state [:workspace-local :options-mode])]
(cond
(d/not-empty? selected)
(and (= options-mode :prototype) (d/not-empty? selected))
(rx/of (dwi/remove-interactions selected))
(and (= options-mode :design) (d/not-empty? selected))
(rx/of (dwc/delete-shapes selected)
(dws/deselect-all))

View file

@ -171,6 +171,15 @@
(update shape :interactions
csi/remove-interaction index)))))))
(defn remove-interactions
[ids]
(ptk/reify ::remove-interactions
ptk/WatchEvent
(watch [_ _ _]
(rx/of (dch/update-shapes ids
(fn [shape]
(assoc shape :interactions [])))))))
(defn update-interaction
[shape index update-fn]
(ptk/reify ::update-interaction

View file

@ -53,7 +53,7 @@
(mf/use-callback
(mf/deps vport)
(fn [resize-type size]
(when vport
(when (and vport (not= size vport))
(st/emit! (dw/update-viewport-size resize-type size)))))
node-ref (use-resize-observer on-resize)]

View file

@ -252,8 +252,7 @@
[:span (tr "workspace.header.menu.option.preferences")] [:span i/arrow-slide]]
(when (contains? @cf/flags :user-feedback)
[:*
[:li.feedback {:on-click (st/emitf (rt/nav :settings-feedback))
:on-pointer-enter (st/emitf (rt/nav :settings-feedback))}
[:li.feedback {:on-click (st/emitf (rt/nav-new-window* {:rname :settings-feedback}))}
[:span (tr "labels.give-feedback")]]])]]
[:& dropdown {:show (= @show-sub-menu? :file)

View file

@ -209,6 +209,7 @@
{:keys [on-pointer-down on-lost-pointer-capture on-mouse-move parent-ref size]}
(use-resize-hook :sitemap 200 38 400 :y false nil)
size (if @show-pages? size 38)
toggle-pages
(mf/use-callback #(reset! show-pages? not))]
@ -217,12 +218,13 @@
[:div.tool-window-bar
[:span (tr "workspace.sidebar.sitemap")]
[:div.add-page {:on-click create} i/close]
[:div.collapse-pages {:on-click toggle-pages} i/arrow-slide]]
[:div.collapse-pages {:on-click toggle-pages
:style {:transform (when (not @show-pages?) "rotate(-90deg)")}} i/arrow-slide]]
[:div.tool-window-content
[:& pages-list {:file file :key (:id file)}]]
(when @show-pages?
[:div.tool-window-content
[:& pages-list {:file file :key (:id file)}]])
[:div.resize-area {:on-pointer-down on-pointer-down
:on-lost-pointer-capture on-lost-pointer-capture
:on-mouse-move on-mouse-move}]]))
[:div.resize-area {:on-pointer-down on-pointer-down
:on-lost-pointer-capture on-lost-pointer-capture
:on-mouse-move on-mouse-move}])]))

View file

@ -196,13 +196,13 @@
(if (= axis :x)
{:rect-x (- pos (/ guide-pill-width 2))
:rect-y (+ (:y vbox) rules-pos (- (/ guide-pill-width 2)) (/ 2 zoom))
:rect-y (+ (:y vbox) rules-pos (- (/ guide-pill-width 2)) (/ 3 zoom))
:rect-width guide-pill-width
:rect-height guide-pill-height
:text-x pos
:text-y (+ (:y vbox) rules-pos (- (/ 3 zoom)))}
{:rect-x (+ (:x vbox) rules-pos (- (/ guide-pill-height 2)) (- (/ 5 zoom)))
{:rect-x (+ (:x vbox) rules-pos (- (/ guide-pill-height 2)) (- (/ 4 zoom)))
:rect-y (- pos (/ guide-pill-width 2))
:rect-width guide-pill-height
:rect-height guide-pill-width
@ -363,8 +363,8 @@
:text-anchor "middle"
:dominant-baseline "middle"
:transform (when (= axis :y) (str "rotate(-90 " text-x "," text-y ")"))
:style {:font-size (/ 13 zoom)
:font-family "sourcesanspro"
:style {:font-size (/ rules/font-size zoom)
:font-family rules/font-family
:fill colors/black}}
(str (mth/round pos))]]))])))

View file

@ -25,8 +25,8 @@
(def over-number-size 50)
(def over-number-opacity 0.7)
(def font-size 13)
(def font-family "sourcesanspro")
(def font-size 12)
(def font-family "worksans")
;; ----------------
;; RULES