Skip to content

Commit

Permalink
remove question mark suffix from boolean flags and local symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
@sprocketc
sprocketc committed Sep 27, 2024
1 parent ff649d4 commit 13e58d6
Show file tree
Hide file tree
Showing 63 changed files with 561 additions and 528 deletions.
80 changes: 40 additions & 40 deletions .clj-kondo/metosin/malli-types-cljs/config.edn
View file

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions src/renderer/app/db.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[renderer.document.db :refer [Document]]
[renderer.element.db :refer [Element Handle]]
[renderer.notification.db :refer [Notification]]
[renderer.ruler.db :refer [Ruler]]
[renderer.snap.db :refer [Snap]]
[renderer.theme.db :refer [Theme]]
[renderer.timeline.db :refer [Timeline]]
Expand All @@ -17,13 +18,13 @@
[renderer.window.db :refer [Window]]))

(def Panels
[:map-of {:default {:tree {:visible? true}
:properties {:visible? true}
:timeline {:visible? false}
:xml {:visible? false}
:history {:visible? false}
:repl-history {:visible? false}}}
keyword? [:map [:visible? boolean?]]])
[:map-of {:default {:tree {:visible true}
:properties {:visible true}
:timeline {:visible false}
:xml {:visible false}
:history {:visible false}
:repl-history {:visible false}}}
keyword? [:map [:visible boolean?]]])

(def DomRect
[:map {:closed true}
Expand Down Expand Up @@ -54,30 +55,28 @@
[:pointer-offset {:optional true} Vec2D]
[:adjusted-pointer-pos {:default [0 0]} Vec2D]
[:adjusted-pointer-offset {:optional true} Vec2D]
[:drag? {:optional true} boolean?]
[:drag {:optional true} boolean?]
[:zoom-sensitivity {:default 0.75} [:and number? pos?]]
[:event-time {:optional true} number?]
[:double-click-delta {:default 250} [:and number? pos?]]
[:state {:default :default} State]
[:grid-visible? {:default false :persist true} boolean?]
[:rulers-visible? {:default true :persist true} boolean?]
[:grid {:default false :persist true} boolean?]
[:ruler {:persist true} Ruler]
[:snap {:persist true} Snap]
[:active-document {:optional true :persist true} [:maybe uuid?]]
[:cursor {:default "default"} string?]
[:dom-rect {:optional true} DomRect]
[:rulers-locked? {:default false} boolean?]
[:dialogs {:default []} [:vector Dialog]]
[:documents {:default {} :persist true} [:map-of uuid? Document]]
[:document-tabs {:default [] :persist true} [:vector uuid?]]
[:recent {:max 10 :default [] :persist true} [:vector string?]]
[:drag-threshold {:default 1} number?]
[:ruler-size {:default 23} number?]
[:system-fonts {:optional true} vector?]
[:notifications {:default []} [:* Notification]]
[:debug-info? {:default false} boolean?]
[:pen-mode? {:default false} boolean?]
[:backdrop? {:default false} boolean?]
[:loading? {:default false} boolean?]
[:debug-info {:default false} boolean?]
[:pen-mode {:default false} boolean?]
[:backdrop {:default false} boolean?]
[:loading {:default false} boolean?]
[:explanation {:optional true} string?]
[:lang {:default :en-Us :persist true} Lang]
[:repl-mode {:default :cljs} keyword?]
Expand Down
21 changes: 5 additions & 16 deletions src/renderer/app/events.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,36 +75,25 @@
(rf/reg-event-db
::toggle-debug-info
(fn [db [_]]
(update db :debug-info? not)))
(update db :debug-info not)))

(rf/reg-event-db
::set-backdrop
(fn [db [_ visible?]]
(assoc db :backdrop? visible?)))

(rf/reg-event-db
::toggle-rulers
persist
(fn [db [_]]
(update db :rulers-visible? not)))

(rf/reg-event-db
::toggle-rulers-locked
(fn [db [_]]
(update db :rulers-locked? not)))
(fn [db [_ visible]]
(assoc db :backdrop visible)))

(rf/reg-event-db
::toggle-grid
persist
(fn [db [_]]
(update db :grid-visible? not)))
(update db :grid not)))

(rf/reg-event-db
::toggle-panel
[persist
(rf/path :panels)]
(fn [db [_ k]]
(update-in db [k :visible?] not)))
(update-in db [k :visible] not)))

(rf/reg-event-fx
::pointer-event
Expand Down
10 changes: 5 additions & 5 deletions src/renderer/app/handlers.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

(mx/defn pointer-handler
[db, e :- PointerEvent, now :- number?]
(let [{:keys [pointer-offset tool dom-rect drag? primary-tool drag-threshold]} db
(let [{:keys [pointer-offset tool dom-rect drag primary-tool drag-threshold]} db
{:keys [button buttons pointer-pos]} e
adjusted-pointer-pos (frame.h/adjust-pointer-pos db pointer-pos)]
(case (:type e)
Expand All @@ -46,10 +46,10 @@
(not= tool :pan)
(frame.h/pan-out-of-canvas dom-rect pointer-pos pointer-offset)

(not drag?)
(not drag)
(-> (tool.hierarchy/drag-start e)
(add-fx [::fx/set-pointer-capture (:pointer-id e)])
(assoc :drag? true))
(assoc :drag true))

:always
(tool.hierarchy/drag e))
Expand All @@ -72,7 +72,7 @@
(tool.hierarchy/pointer-down e))

"pointerup"
(cond-> (if drag?
(cond-> (if drag
(-> (tool.hierarchy/drag-end db e)
(add-fx [::fx/release-pointer-capture (:pointer-id e)]))
(if (= button :right)
Expand All @@ -87,7 +87,7 @@
(dissoc :primary-tool))

:always
(-> (dissoc :pointer-offset :drag?)
(-> (dissoc :pointer-offset :drag)
(update :snap dissoc :nearest-neighbor)))

db)))
Expand Down
36 changes: 12 additions & 24 deletions src/renderer/app/subs.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,12 @@
:-> :pivot-point)

(rf/reg-sub
::drag?
:-> :drag?)
::drag
:-> :drag)

(rf/reg-sub
::ruler-size
:-> :ruler-size)

(rf/reg-sub
::loading?
:-> :loading?)
::loading
:-> :loading)

(rf/reg-sub
::cursor
Expand Down Expand Up @@ -107,12 +103,12 @@
(merge css-property webref-css-property))))

(rf/reg-sub
::backdrop?
:-> :backdrop?)
::backdrop
:-> :backdrop)

(rf/reg-sub
::debug-info?
:-> :debug-info?)
::debug-info
:-> :debug-info)

(rf/reg-sub
::clicked-element
Expand Down Expand Up @@ -141,21 +137,13 @@
:-> :lang)

(rf/reg-sub
::rulers-locked?
:-> :rulers-locked?)

(rf/reg-sub
::rulers-visible?
:-> :rulers-visible?)

(rf/reg-sub
::grid-visible?
:-> :grid-visible?)
::grid
:-> :grid)

(rf/reg-sub
::panel-visible?
::panel-visible
(fn [db [_ k]]
(-> db :panels k :visible?)))
(-> db :panels k :visible)))

(rf/reg-sub
::font-options
Expand Down
101 changes: 52 additions & 49 deletions src/renderer/app/views.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
[renderer.history.views :as history.v]
[renderer.notification.views :as notification]
[renderer.reepl.views :as repl.v]
[renderer.ruler.events :as-alias ruler.e]
[renderer.ruler.subs :as-alias ruler.s]
[renderer.ruler.views :as ruler.v]
[renderer.timeline.views :as timeline.v]
[renderer.tool.hierarchy :as tool.hierarchy]
Expand All @@ -33,34 +35,36 @@

(defn frame-panel
[]
(let [rulers? @(rf/subscribe [::app.s/rulers-visible?])
read-only? @(rf/subscribe [::document.s/read-only?])
ruler-size @(rf/subscribe [::app.s/ruler-size])
rulers-locked? @(rf/subscribe [::app.s/rulers-locked?])]
(let [ruler-visible @(rf/subscribe [::ruler.s/visible])
read-only @(rf/subscribe [::document.s/read-only])
ruler-size @(rf/subscribe [::ruler.s/size])
ruler-locked @(rf/subscribe [::ruler.s/locked])]
[:div.flex.flex-col.flex-1.h-full.gap-px
[:div
[ui/scroll-area [toolbar.tools/root]]
(when rulers?
(when ruler-visible
[:div.flex.gap-px
[:div.bg-primary {:style {:width ruler-size :height ruler-size}}
[:div.bg-primary
{:style {:width ruler-size
:height ruler-size}}
[ui/icon-button
(if rulers-locked? "lock" "unlock")
(if ruler-locked "lock" "unlock")
{:class "small hidden"
:title (if rulers-locked? "unlock" "lock")
:on-click #(rf/dispatch [::e/toggle-rulers-locked])}]]
:title (if ruler-locked "unlock" "lock")
:on-click #(rf/dispatch [::ruler.e/toggle-locked])}]]
[:div.bg-primary.flex-1
[ruler.v/ruler :horizontal]]])]
[:div.flex.flex-1.relative.gap-px
(when rulers?
(when ruler-visible
[:div.bg-primary
[ruler.v/ruler :vertical]])
[:div.relative.grow.flex
[frame.v/root]
(if read-only?
(if read-only
[:div.absolute.inset-0.border-4.border-accent]
(when @(rf/subscribe [::app.s/debug-info?])
(when @(rf/subscribe [::app.s/debug-info])
[overlay/debug-info]))
(when @(rf/subscribe [::app.s/backdrop?])
(when @(rf/subscribe [::app.s/backdrop])
[:div.absolute.inset-0
{:on-click #(rf/dispatch [::e/set-backdrop false])}])]]]))

Expand All @@ -76,7 +80,7 @@
{:id "frame-panel"
:order 1}
[frame-panel]]
(when @(rf/subscribe [::app.s/panel-visible? :history])
(when @(rf/subscribe [::app.s/panel-visible :history])
[:<>
[:> PanelResizeHandle
{:id "history-resize-handle"
Expand All @@ -88,7 +92,7 @@
[:div.bg-primary.h-full
[history.v/root]]]])

(when @(rf/subscribe [::app.s/panel-visible? :xml])
(when @(rf/subscribe [::app.s/panel-visible :xml])
(let [xml @(rf/subscribe [::element.s/xml])]
[:<>
[:> PanelResizeHandle
Expand All @@ -108,7 +112,7 @@

(defn editor
[]
(let [timeline? @(rf/subscribe [::app.s/panel-visible? :timeline])]
(let [timeline-visible @(rf/subscribe [::app.s/panel-visible :timeline])]
[:> PanelGroup
{:direction "vertical"
:id "editor-group"
Expand All @@ -118,11 +122,11 @@
:order 1}
[center-top-group]]
[toolbar.status/root]
(when timeline?
(when timeline-visible
[:> PanelResizeHandle
{:id "timeline-resize-handle"
:className "resize-handle"}])
(when timeline?
(when timeline-visible
[:> Panel
{:id "timeline-panel"
:minSize 10
Expand Down Expand Up @@ -246,34 +250,33 @@

(defn root
[]
(let [properties-panel? @(rf/subscribe [::app.s/panel-visible? :properties])]
[:> Tooltip/Provider
[:div.flex.flex-col.flex-1.h-dvh.overflow-hidden
[window.v/app-header]
(if (seq @(rf/subscribe [::app.s/documents]))
[:div.flex.h-full.flex-1.overflow-hidden.gap-px
(when @(rf/subscribe [::app.s/panel-visible? :tree])
[:div.flex-col.hidden.md:flex.overflow-hidden
{:style {:width "227px"}}
[document.v/actions]
[tree.v/root]])
[:div.flex.flex-col.flex-1.overflow-hidden.h-full
[document.v/tab-bar]
[:div.flex.h-full.flex-1.gap-px.overflow-hidden
[:div.flex.h-full.flex-col.flex-1.overflow-hidden
[editor]]
[:div.flex
(when properties-panel?
[:div.hidden.md:flex
[:div.flex.flex-col.h-full.w-80
[ui/scroll-area
(tool.hierarchy/right-panel @(rf/subscribe [::app.s/tool]))]
[:div.bg-primary.grow.flex.mr-px]]])
[:div.bg-primary.flex
[ui/scroll-area [toolbar.object/root]]]]]]]
[home])]
[dialog.v/root]
[notification/main]
(when @(rf/subscribe [::app.s/loading?])
[:div.absolute.inset-0.backdrop
[:div.loader]])]))
[:> Tooltip/Provider
[:div.flex.flex-col.flex-1.h-dvh.overflow-hidden
[window.v/app-header]
(if (seq @(rf/subscribe [::app.s/documents]))
[:div.flex.h-full.flex-1.overflow-hidden.gap-px
(when @(rf/subscribe [::app.s/panel-visible :tree])
[:div.flex-col.hidden.md:flex.overflow-hidden
{:style {:width "227px"}}
[document.v/actions]
[tree.v/root]])
[:div.flex.flex-col.flex-1.overflow-hidden.h-full
[document.v/tab-bar]
[:div.flex.h-full.flex-1.gap-px.overflow-hidden
[:div.flex.h-full.flex-col.flex-1.overflow-hidden
[editor]]
[:div.flex
(when @(rf/subscribe [::app.s/panel-visible :properties])
[:div.hidden.md:flex
[:div.flex.flex-col.h-full.w-80
[ui/scroll-area
(tool.hierarchy/right-panel @(rf/subscribe [::app.s/tool]))]
[:div.bg-primary.grow.flex.mr-px]]])
[:div.bg-primary.flex
[ui/scroll-area [toolbar.object/root]]]]]]]
[home])]
[dialog.v/root]
[notification/main]
(when @(rf/subscribe [::app.s/loading])
[:div.absolute.inset-0.backdrop
[:div.loader]])])
Loading

0 comments on commit 13e58d6

Please sign in to comment.