Skip to content

Commit a909db1

Browse files
committed
simplify tool hierarchy
1 parent ab26386 commit a909db1

File tree

9 files changed

+11
-19
lines changed

9 files changed

+11
-19
lines changed

src/renderer/tools/base.cljs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
(ns renderer.tools.base)
2-
3-
(derive ::transform ::tool)
4-
(derive ::misc ::tool)
5-
6-
(derive ::element ::tool)
7-
82
(derive ::renderable ::element)
9-
(derive ::never-renderable ::element)
10-
3+
(derive ::shape ::renderable)
114
(derive ::graphics ::renderable)
12-
13-
(derive ::gradient ::element)
14-
(derive ::descriptive ::element)
5+
(derive ::gradient ::renderable)
6+
(derive ::descriptive ::renderable)
157

168
(derive :foreignObject ::graphics)
179
(derive :textPath ::graphics)

src/renderer/tools/misc/dropper.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[renderer.notification.views :as notification.v]
77
[renderer.tools.base :as tools]))
88

9-
(derive :dropper ::tools/misc)
9+
(derive :dropper ::tools/tool)
1010

1111
(defmethod tools/properties :dropper
1212
[]

src/renderer/tools/misc/fill.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[renderer.history.handlers :as history]
66
[renderer.tools.base :as tools]))
77

8-
(derive :fill ::tools/misc)
8+
(derive :fill ::tools/tool)
99

1010
(defmethod tools/properties :fill
1111
[]

src/renderer/tools/misc/measure.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[renderer.tools.overlay :as overlay]
1010
[renderer.utils.units :as units]))
1111

12-
(derive :measure ::tools/misc)
12+
(derive :measure ::tools/tool)
1313

1414
(defmethod tools/properties :measure
1515
[]

src/renderer/tools/transform/edit.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[renderer.tools.base :as tools]
99
[renderer.utils.pointer :as pointer]))
1010

11-
(derive :edit ::tools/transform)
11+
(derive :edit ::tools/tool)
1212

1313
(defmethod tools/properties :edit
1414
[]

src/renderer/tools/transform/pan.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[renderer.frame.handlers :as frame]
55
[renderer.tools.base :as tools]))
66

7-
(derive :pan ::tools/transform)
7+
(derive :pan ::tools/tool)
88

99
(defmethod tools/properties :pan
1010
[]

src/renderer/tools/transform/select.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[renderer.utils.pointer :as pointer]
1616
[renderer.utils.units :as units]))
1717

18-
(derive :select ::tools/transform)
18+
(derive :select ::tools/tool)
1919

2020
(defmethod tools/properties :select
2121
[]

src/renderer/tools/transform/zoom.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[renderer.tools.overlay :as overlay]
88
[renderer.utils.pointer :as pointer]))
99

10-
(derive :zoom ::tools/transform)
10+
(derive :zoom ::tools/tool)
1111

1212
(defmethod tools/properties :zoom
1313
[]

src/renderer/utils/element.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
[el]
2626
(and (map? el)
2727
(keyword? (:tag el))
28-
(contains? (descendants ::tools/tool) (:tag el))))
28+
(contains? (descendants ::tools/element) (:tag el))))
2929

3030
(defn parent-container
3131
[elements el]

0 commit comments

Comments
 (0)