0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-15 09:11:21 -05:00

Merge pull request #206 from uxbox/238/infinite-viewport-3

Viewport Improvements and Fixes
This commit is contained in:
Hirunatan 2020-05-12 13:51:35 +02:00 committed by GitHub
commit 0befd25ab7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 211 additions and 145 deletions

View file

@ -95,6 +95,7 @@ function readLocales() {
function readConfig(data) {
const publicURL = process.env.UXBOX_PUBLIC_URL;
const backendURL = process.env.UXBOX_BACKEND_URL;
const demoWarn = process.env.UXBOX_DEMO_WARNING;
const deployDate = process.env.UXBOX_DEPLOY_DATE;
const deployCommit = process.env.UXBOX_DEPLOY_COMMIT;
@ -107,6 +108,10 @@ function readConfig(data) {
cfg.publicURL = publicURL;
}
if (backendURL !== undefined) {
cfg.backendURL = backendURL;
}
if (deployDate !== undefined) {
cfg.deployDate = deployDate;
}

View file

@ -71,7 +71,7 @@
.zoom-dropdown {
top: 45px;
left: -30px;
left: -40px;
}
}

View file

@ -93,10 +93,10 @@
.coordinates {
background-color: $color-dark-bg;
border-radius: $br-small;
bottom: 0px;
bottom: -10px;
padding-left: 5px;
position: fixed;
right: 240px;
right: 248px;
text-align: center;
width: 100px;
padding-bottom: 2px;

View file

@ -17,7 +17,7 @@
.zoom-dropdown {
position: absolute;
z-index: 12;
width: 150px;
width: 160px;
background-color: $color-white;
border-radius: $br-small;

View file

@ -12,9 +12,12 @@
(this-as global
(let [config (obj/get global "uxboxConfig")
url (obj/get config "publicURL" "http://localhost:6060")
purl (obj/get config "publicURL" "http://localhost:3449")
burl (obj/get config "backendURL" "http://localhost:6060")
warn (obj/get config "demoWarning" true)]
(def default-language "en")
(def demo-warning warn)
(def url url)
(def url burl)
(def backend-url burl)
(def public-url purl)
(def default-theme "default")))

View file

@ -36,16 +36,16 @@
profile (:profile storage)
authed? (and (not (nil? profile))
(not= (:id profile) uuid/zero))]
(cond
(and (or (= path "")
(nil? match))
(not authed?))
(st/emit! (rt/nav :login))
(and (= path "") authed?)
(and (nil? match) authed?)
(st/emit! (rt/nav :dashboard-team {:team-id (:default-team-id profile)}))
(nil? match)
(st/emit! (rt/nav :not-found))

View file

@ -23,8 +23,8 @@
[uxbox.main.data.workspace.common :as dwc]
[uxbox.main.data.workspace.notifications :as dwn]
[uxbox.main.data.workspace.persistence :as dwp]
[uxbox.main.data.workspace.transforms :as dwt]
[uxbox.main.data.workspace.texts :as dwtxt]
[uxbox.main.data.workspace.transforms :as dwt]
[uxbox.main.repo :as rp]
[uxbox.main.store :as st]
[uxbox.main.streams :as ms]
@ -224,8 +224,8 @@
(update-in state [:workspace-local :vbox]
(fn [vbox]
(-> vbox
(update :x (comp mth/round x))
(update :y (comp mth/round y))))))))
(update :x x)
(update :y y)))))))
;; TODO: add spec
@ -328,15 +328,16 @@
;; --- Zoom Management
(defn- impl-update-zoom
[{:keys [vbox vport] :as local} zoom]
(let [zoom (if (fn? zoom)
(zoom (:zoom local))
zoom)
width (/ (:width vport) zoom)
height (/ (:height vport) zoom)]
[{:keys [vbox vport] :as local} center zoom]
(let [new-zoom (if (fn? zoom) (zoom (:zoom local)) zoom)
old-zoom (:zoom local)
center (if center center (geom/center vbox))
scale (/ old-zoom new-zoom)
mtx (gmt/scale-matrix (gpt/point scale) center)
vbox' (geom/transform vbox mtx)]
(-> local
(assoc :zoom zoom)
(update :vbox assoc :width width :height height))))
(assoc :zoom new-zoom)
(update :vbox merge (select-keys vbox' [:x :y :width :height])))))
(defn increase-zoom
[center]
@ -344,7 +345,7 @@
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
#(impl-update-zoom % (fn [z] (* z 1.1)))))))
#(impl-update-zoom % center (fn [z] (min (* z 1.1) 200)))))))
(defn decrease-zoom
[center]
@ -352,28 +353,14 @@
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
#(impl-update-zoom % (fn [z] (* z 0.9)))))))
#(impl-update-zoom % center (fn [z] (max (* z 0.9) 0.01)))))))
(def reset-zoom
(ptk/reify ::reset-zoom
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
#(impl-update-zoom % 1)))))
(def zoom-to-50
(ptk/reify ::zoom-to-50
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
#(impl-update-zoom % 0.5)))))
(def zoom-to-200
(ptk/reify ::zoom-to-200
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
#(impl-update-zoom % 2)))))
#(impl-update-zoom % nil 1)))))
(def zoom-to-fit-all
(ptk/reify ::zoom-to-fit-all
@ -1514,10 +1501,8 @@
"-" #(st/emit! decrease-zoom)
"ctrl+g" #(st/emit! create-group)
"ctrl+shift+g" #(st/emit! remove-group)
"shift+0" #(st/emit! zoom-to-50)
;; "shift+1" #(st/emit! reset-zoom)
"shift+0" #(st/emit! reset-zoom)
"shift+1" #(st/emit! zoom-to-fit-all)
;; "shift+2" #(st/emit! zoom-to-200)
"shift+2" #(st/emit! zoom-to-selected-shape)
"ctrl+d" #(st/emit! duplicate-selected)
"ctrl+z" #(st/emit! dwc/undo)

View file

@ -28,7 +28,7 @@
(when (not= stroke-style :none)
(obj/merge! attrs
#js {:stroke (:stroke-color shape nil)
:strokeWidth (:stroke-width shape nil)
:strokeWidth (:stroke-width shape 1)
:strokeOpacity (:stroke-opacity shape nil)
:strokeDasharray (stroke-type->dasharray stroke-style)}))
attrs))

View file

@ -24,7 +24,6 @@
{:keys [id x y width height]} (geom/shape->rect-shape shape)
stroke-style (:stroke-style shape :none)
stroke-position (:stroke-alignment shape :center)]
(cond
;; Center alignment (or no stroke): the default in SVG
(or (= stroke-style :none) (= stroke-position :center))
@ -43,7 +42,7 @@
:fill "white"
:fillOpacity 1}))
stroke-width (.-strokeWidth base-props)
stroke-width (obj/get base-props "strokeWidth")
shape-props (-> (obj/merge! #js {} base-props)
(obj/merge! #js {:strokeWidth (* stroke-width 2)
:clipPath (str "url('#" clip-id "')")}))]

View file

@ -16,14 +16,41 @@
[uxbox.main.refs :as refs]
[uxbox.main.store :as st]
[uxbox.main.ui.components.dropdown :refer [dropdown]]
[uxbox.main.ui.workspace.header :refer [zoom-widget]]
[uxbox.util.data :refer [classnames]]
[uxbox.util.dom :as dom]
[uxbox.util.i18n :as i18n :refer [t]]
[uxbox.util.router :as rt]
[uxbox.util.math :as mth]
[uxbox.common.uuid :as uuid]
[uxbox.util.webapi :as wapi]))
(mf/defc zoom-widget
{:wrap [mf/memo]}
[{:keys [zoom
on-increase
on-decrease
on-zoom-to-50
on-zoom-to-100
on-zoom-to-200]
:as props}]
(let [show-dropdown? (mf/use-state false)]
[:div.zoom-widget {:on-click #(reset! show-dropdown? true)}
[:span {} (str (mth/round (* 100 zoom)) "%")]
[:span.dropdown-button i/arrow-down]
[:& dropdown {:show @show-dropdown?
:on-close #(reset! show-dropdown? false)}
[:ul.zoom-dropdown
[:li {:on-click on-increase}
"Zoom in" [:span "+"]]
[:li {:on-click on-decrease}
"Zoom out" [:span "-"]]
[:li {:on-click on-zoom-to-50}
"Zoom to 50%" [:span "Shift + 0"]]
[:li {:on-click on-zoom-to-100}
"Zoom to 100%" [:span "Shift + 1"]]
[:li {:on-click on-zoom-to-200}
"Zoom to 200%" [:span "Shift + 2"]]]]]))
(mf/defc interactions-menu
[{:keys [interactions-mode] :as props}]
(let [show-dropdown? (mf/use-state false)

View file

@ -23,7 +23,7 @@
[uxbox.main.ui.keyboard :as kbd]
[uxbox.main.ui.hooks :as hooks]
[uxbox.main.ui.messages :refer [messages]]
[uxbox.main.ui.workspace.viewport :refer [viewport]]
[uxbox.main.ui.workspace.viewport :refer [viewport coordinates]]
[uxbox.main.ui.workspace.colorpalette :refer [colorpalette]]
[uxbox.main.ui.workspace.context-menu :refer [context-menu]]
[uxbox.main.ui.workspace.header :refer [header]]
@ -65,7 +65,9 @@
:vport (:vport local)}]
[:& vertical-rule {:zoom (:zoom local 1)
:vbox (:vbox local)
:vport (:vport local)}]])
:vport (:vport local)}]
[:& coordinates]])
[:& viewport {:page page
:key (:id page)

View file

@ -276,7 +276,6 @@
(ptk/reify ::handle-drawing-curve
ptk/WatchEvent
(watch [_ state stream]
(prn "handle-drawing-curve")
(let [{:keys [flags]} (:workspace-local state)
stoper (rx/filter stoper-event? stream)
mouse (rx/sample 10 ms/mouse-position)]
@ -323,14 +322,14 @@
(declare path-draw-area)
(mf/defc draw-area
[{:keys [shape] :as props}]
[{:keys [shape zoom] :as props}]
(when (:id shape)
(case (:type shape)
(:path :curve) [:& path-draw-area {:shape shape}]
[:& generic-draw-area {:shape shape}])))
[:& generic-draw-area {:shape shape :zoom zoom}])))
(mf/defc generic-draw-area
[{:keys [shape]}]
[{:keys [shape zoom]}]
(let [{:keys [x y width height]} (geom/selection-rect-shape shape)]
(when (and x y)
[:g
@ -340,7 +339,7 @@
:height height
:style {:stroke "#1FDEA7"
:fill "transparent"
:stroke-width "1"}}]])))
:stroke-width (/ 1 zoom)}}]])))
(mf/defc path-draw-area
[{:keys [shape] :as props}]

View file

@ -33,9 +33,9 @@
[{:keys [zoom
on-increase
on-decrease
on-zoom-to-50
on-zoom-to-100
on-zoom-to-200]
on-zoom-reset
on-zoom-fit
on-zoom-selected]
:as props}]
(let [show-dropdown? (mf/use-state false)]
[:div.zoom-widget {:on-click #(reset! show-dropdown? true)}
@ -48,12 +48,12 @@
"Zoom in" [:span "+"]]
[:li {:on-click on-decrease}
"Zoom out" [:span "-"]]
[:li {:on-click on-zoom-to-50}
"Zoom to 50%" [:span "Shift + 0"]]
[:li {:on-click on-zoom-to-100}
"Zoom to 100%" [:span "Shift + 1"]]
[:li {:on-click on-zoom-to-200}
"Zoom to 200%" [:span "Shift + 2"]]]]]))
[:li {:on-click on-zoom-reset}
"Zoom to 100%" [:span "Shift + 0"]]
[:li {:on-click on-zoom-fit}
"Zoom to fit all" [:span "Shift + 1"]]
[:li {:on-click on-zoom-selected}
"Zoom to selected" [:span "Shift + 2"]]]]]))
;; --- Header Users
@ -145,9 +145,9 @@
{:zoom zoom
:on-increase #(st/emit! dw/increase-zoom)
:on-decrease #(st/emit! dw/decrease-zoom)
:on-zoom-to-50 #(st/emit! dw/zoom-to-50)
:on-zoom-to-100 #(st/emit! dw/reset-zoom)
:on-zoom-to-200 #(st/emit! dw/zoom-to-200)}]
:on-zoom-reset #(st/emit! dw/reset-zoom)
:on-zoom-fit #(st/emit! dw/zoom-to-fit-all)
:on-zoom-selected #(st/emit! dw/zoom-to-selected-shape)}]
[:a.btn-icon-dark.btn-small
{;; :target "__blank"

View file

@ -13,15 +13,30 @@
[uxbox.util.math :as mth]
[uxbox.util.object :as obj]))
(defn- calculate-step-size
[zoom]
(cond
(< 0 zoom 0.008) 10000
(< 0.008 zoom 0.015) 5000
(< 0.015 zoom 0.04) 2500
(< 0.04 zoom 0.07) 1000
(< 0.07 zoom 0.2) 500
(< 0.2 zoom 0.5) 250
(< 0.5 zoom 1) 100
(<= 1 zoom 2) 50
(< 2 zoom 4) 25
(< 4 zoom 6) 10
(< 6 zoom 15) 5
(< 15 zoom 25) 2
(< 25 zoom) 1
:else 1))
(defn draw-rule!
[dctx {:keys [zoom size start count type] :or {count 200}}]
(let [txfm (- (* (- 0 start) zoom) 20)
minv (mth/round start)
maxv (mth/round (+ start (/ size zoom)))
step (mth/round (/ (mth/abs (- maxv minv)) count))
step (max (* 1 (* 10 step)) 1)]
step (calculate-step-size zoom)]
(obj/set! dctx "fillStyle" "#E8E9EA")
(if (= type :horizontal)
(do
@ -31,7 +46,7 @@
(.fillRect dctx 0 0 20 size)
(.translate dctx 0 txfm)))
(obj/set! dctx "font" "12px serif")
(obj/set! dctx "font" "12px sourcesanspro")
(obj/set! dctx "fillStyle" "#7B7D85")
(obj/set! dctx "strokeStyle" "#7B7D85")
(obj/set! dctx "textAlign" "center")

View file

@ -113,13 +113,14 @@
[:g.controls
(when (not (#{:move :rotate :resize} current-transform))
[:rect.main {:transform transform
:x (- x 1) :y (- y 1)
:width (+ width 2)
:height (+ height 2)
:style {:stroke "#1FDEA7"
:stroke-width (/ 1 zoom)
:fill "transparent"}}])
[:rect.main
{:transform transform
:x x :y y
:width width
:height height
:style {:stroke "#1FDEA7"
:stroke-width (/ 1 zoom)
:fill "transparent"}}])
(when (not (#{:move :rotate} current-transform))
(for [[position [cx cy]] resize-handlers]

View file

@ -41,7 +41,7 @@
;; --- Coordinates Widget
(mf/defc coordinates
[{:keys [zoom] :as props}]
[]
(let [coords (some-> (hooks/use-rxsub ms/mouse-position)
(gpt/round 0))]
[:ul.coordinates
@ -268,21 +268,27 @@
on-mouse-wheel
(mf/use-callback
(fn [event]
(dom/prevent-default event)
(dom/stop-propagation event)
(let [node (mf/ref-val viewport-ref)
target (dom/get-target event)]
(cond
(kbd/ctrl? event)
(let [event (.getBrowserEvent event)
pos @ms/mouse-position]
(dom/prevent-default event)
(dom/stop-propagation event)
(if (pos? (.-deltaY event))
(st/emit! (dw/decrease-zoom pos))
(st/emit! (dw/increase-zoom pos))))
(if (kbd/ctrl? event)
(let [event (.getBrowserEvent event)
pos @ms/mouse-position]
(if (pos? (.-deltaY event))
(st/emit! (dw/decrease-zoom pos))
(st/emit! (dw/increase-zoom pos))))
(let [event (.getBrowserEvent event)
delta (.-deltaY ^js event)
delta (/ delta @refs/selected-zoom)]
(if (kbd/shift? event)
(st/emit! (dw/update-viewport-position {:x #(+ % delta)}))
(st/emit! (dw/update-viewport-position {:y #(+ % delta)})))))))
(.contains ^js node target)
(let [event (.getBrowserEvent event)
delta (.-deltaY ^js event)
delta (/ delta @refs/selected-zoom)]
(dom/prevent-default event)
(dom/stop-propagation event)
(if (kbd/shift? event)
(st/emit! (dw/update-viewport-position {:x #(+ % delta)}))
(st/emit! (dw/update-viewport-position {:y #(+ % delta)}))))))))
on-drag-over
;; Should prevent only events that we'll handle on-drop
@ -331,52 +337,50 @@
]
(mf/use-effect on-mount)
[:*
[:& coordinates {:zoom zoom}]
[:svg.viewport
{:preserveAspectRatio "xMidYMid meet"
:width (:width vport 0)
:height (:height vport 0)
:view-box (str/join " " [(:x vbox 0)
(:y vbox 0)
(:width vbox 0 )
(:height vbox 0)])
:ref viewport-ref
:class (when drawing-tool "drawing")
:on-context-menu on-context-menu
:on-click on-click
:on-double-click on-double-click
:on-mouse-down on-mouse-down
:on-mouse-up on-mouse-up
:on-drag-over on-drag-over
:on-drop on-drop}
[:g
[:& frames {:key (:id page)}]
[:svg.viewport
{:preserveAspectRatio "xMidYMid meet"
:width (:width vport 0)
:height (:height vport 0)
:view-box (str/join " " [(:x vbox 0)
(:y vbox 0)
(:width vbox 0 )
(:height vbox 0)])
:ref viewport-ref
:class (when drawing-tool "drawing")
:on-context-menu on-context-menu
:on-click on-click
:on-double-click on-double-click
:on-mouse-down on-mouse-down
:on-mouse-up on-mouse-up
:on-drag-over on-drag-over
:on-drop on-drop}
[:g
[:& frames {:key (:id page)}]
(when (seq selected)
[:& selection-handlers {:selected selected
:zoom zoom
:edition edition}])
(when (seq selected)
[:& selection-handlers {:selected selected
:zoom zoom
:edition edition}])
(when-let [drawing-shape (:drawing local)]
[:& draw-area {:shape drawing-shape
:zoom zoom
:modifiers (:modifiers local)}])
(when-let [drawing-shape (:drawing local)]
[:& draw-area {:shape drawing-shape
:zoom zoom
:modifiers (:modifiers local)}])
[:& snap-feedback]
[:& snap-feedback]
(when (contains? flags :grid)
[:& grid])]
(when (contains? flags :grid)
[:& grid])]
(when tooltip
[:& cursor-tooltip {:zoom zoom :tooltip tooltip}])
(when tooltip
[:& cursor-tooltip {:zoom zoom :tooltip tooltip}])
(when (contains? flags :ruler)
[:& ruler {:zoom zoom :ruler (:ruler local)}])
(when (contains? flags :ruler)
[:& ruler {:zoom zoom :ruler (:ruler local)}])
[:& presence/active-cursors {:page page}]
[:& selection-rect {:data (:selrect local)}]
(when (= options-mode :prototype)
[:& interactions {:selected selected}])]]))
[:& presence/active-cursors {:page page}]
[:& selection-rect {:data (:selrect local)}]
(when (= options-mode :prototype)
[:& interactions {:selected selected}])]))

View file

@ -12,7 +12,9 @@
[cljs.spec.alpha :as s]
[uxbox.config :as cfg]
[uxbox.common.spec :as us]
[uxbox.util.worker :as uw]))
[uxbox.util.worker :as uw])
(:import
goog.Uri))
(defn on-error
[instance error]
@ -20,7 +22,10 @@
(defonce instance
(when (not= *target* "nodejs")
(uw/init "js/worker.js" on-error)))
(let [uri (Uri. cfg/public-url)]
(.setPath uri "js/worker.js")
(.setParameterValue uri "backendURL" cfg/backend-url)
(uw/init (.toString uri) on-error))))
(defn ask!
[message]

View file

@ -43,8 +43,8 @@
for rect-like shapes."
[shape {dx :x dy :y}]
(assoc shape
:x (mth/round (+ (_chk (:x shape)) (_chk dx)))
:y (mth/round (+ (_chk (:y shape)) (_chk dy)))))
:x (+ (_chk (:x shape)) (_chk dx))
:y (+ (_chk (:y shape)) (_chk dy))))
(defn- move-path
"A specialized function for relative movement

View file

@ -20,8 +20,20 @@
[uxbox.worker.selection]
[uxbox.worker.thumbnails]
[uxbox.worker.snaps]
[uxbox.util.object :as obj]
[uxbox.util.transit :as t]
[uxbox.util.worker :as w]))
[uxbox.util.worker :as w])
(:import goog.Uri))
;; --- Initialization
(this-as global
(let [location (obj/get global "location")
uri (Uri. (obj/get location "href"))
buri (.getParameterValue uri "backendURL")]
(swap! impl/config assoc :backend-url buri)))
;; --- Messages Handling
(s/def ::cmd keyword?)
(s/def ::payload

View file

@ -5,10 +5,16 @@
;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
(ns uxbox.worker.impl
(:require [uxbox.util.transit :as t]))
(:require
[okulary.core :as l]
[uxbox.util.transit :as t]))
(enable-console-print!)
;; --- Config
(defonce config (l/atom {}))
;; --- Handler
(defmulti handler :cmd)

View file

@ -33,16 +33,18 @@
(defn- request-page
[id]
(p/create
(fn [resolve reject]
(->> (http/send! {:url "http://localhost:6060/api/w/query/page"
:query {:id id}
:method :get})
(rx/mapcat handle-response)
(rx/subs (fn [body]
(resolve (:data body)))
(fn [error]
(reject error)))))))
(let [url (get @impl/config :backend-url "http://localhost:6060")
url (str url "/api/w/query/page")]
(p/create
(fn [resolve reject]
(->> (http/send! {:url url
:query {:id id}
:method :get})
(rx/mapcat handle-response)
(rx/subs (fn [body]
(resolve (:data body)))
(fn [error]
(reject error))))))))
(defmethod impl/handler :thumbnails/generate
[{:keys [id] :as message}]

View file

@ -56,6 +56,7 @@ function build-frontend {
--mount source=${HOME}/.m2,type=bind,target=/home/uxbox/.m2 \
-w /home/uxbox/uxbox/frontend \
-e UXBOX_PUBLIC_URL=${UXBOX_PUBLIC_URL} \
-e UXBOX_BACKEND_URL=${UXBOX_BACKEND_URL} \
-e UXBOX_DEMO_WARNING=${UXBOX_DEMO_WARNING} \
-e UXBOX_DEPLOY_DATE=${UXBOX_DEPLOY_DATE} \
-e UXBOX_DEPLOY_COMMIT=${UXBOX_DEPLOY_COMMIT} \