File tree 2 files changed +22
-11
lines changed
2 files changed +22
-11
lines changed Original file line number Diff line number Diff line change 37
37
38
38
(defn update-bounds
39
39
[db el-k]
40
- (as-> db db
41
- (update-in db (conj (path db) el-k) #(assoc % :bounds (element/adjusted-bounds % (elements db))))
42
- (reduce #(update-bounds %1 %2 ) db (:children (element db el-k)))))
40
+ (if (= el-k :canvas )
41
+ db
42
+ (as-> db db
43
+ (update-in db (conj (path db) el-k) #(assoc % :bounds (element/adjusted-bounds % (elements db))))
44
+ (reduce #(update-bounds %1 %2 ) db (:children (element db el-k))))))
43
45
44
46
(defn update-el
45
47
[db el f & more]
Original file line number Diff line number Diff line change 136
136
[:ul (map (fn [el] [item el (inc depth) elements])
137
137
(mapv (fn [key] (get elements key)) (reverse children)))])]))
138
138
139
+ (defn inner-sidebar-render
140
+ [canvas-children elements]
141
+ [:div.tree-sidebar.overflow-hidden
142
+ {:on-pointer-up #(rf/dispatch [:element/deselect-all ])}
143
+ [:div.v-scroll.h-full
144
+ {:on-pointer-leave #(rf/dispatch [:document/set-hovered-keys #{}])}
145
+ [:ul (map (fn [el] [item el 1 elements])
146
+ (reverse canvas-children))]]])
147
+
139
148
(defn inner-sidebar []
140
- (let [canvas-children @(rf/subscribe [:element/canvas-children ])
141
- elements @( rf/subscribe [ :document/elements ])]
142
- [ :div.tree-sidebar.overflow-hidden
143
- { :on-pointer-up # (rf/dispatch [:element/deselect-all ])}
144
- [ :div.v-scroll.h-full
145
- { :on-pointer-leave # (rf/dispatch [:document/set-hovered-keys #{}])}
146
- [ :ul ( map ( fn [el] [item el 1 elements])
147
- ( reverse canvas-children))]]] ))
149
+ (let [state @(rf/subscribe [:state ])]
150
+ ( if ( = state :default )
151
+ ( let [canvas-children @( rf/subscribe [ :element/canvas-children ])
152
+ elements @ (rf/subscribe [:document/elements ])]
153
+ [inner-sidebar-render canvas-children elements])
154
+ ( ra/with-let [canvas-children @ (rf/subscribe [:element/canvas-children ])
155
+ elements @( rf/subscribe [ :document/elements ])]
156
+ [inner-sidebar-render canvas-children elements])) ))
148
157
149
158
(defn root
150
159
[]
You can’t perform that action at this time.
0 commit comments