app-proto/src/display.rs

@@ -506,20 +506,7 @@ pub fn Display() -> View {
                 
                 // if we clicked something, select it
                 match clicked {
-                    Some((key, _)) => {
+                    Some((key, _)) => state.select(key, event.shift_key()),
-                        if event.shift_key() {
-                            state.selection.update(|sel| {
-                                if !sel.remove(&key) {
-                                    sel.insert(key);
-                                }
-                            })
-                        } else {
-                            state.selection.update(|sel| {
-                                sel.clear();
-                                sel.insert(key);
-                            })
-                        }
-                    },
                     None => state.selection.update(|sel| sel.clear())
                 };
             }

app-proto/src/main.rs

@@ -25,6 +25,24 @@ impl AppState {
             selection: create_signal(FxHashSet::default())
         }
     }
+    
+    // in single-selection mode, select the element with the given key. in
+    // multiple-selection mode, toggle whether the element with the given key
+    // is selected
+    fn select(&self, key: ElementKey, multi: bool) {
+        if multi {
+            self.selection.update(|sel| {
+                if !sel.remove(&key) {
+                    sel.insert(key);
+                }
+            });
+        } else {
+            self.selection.update(|sel| {
+                sel.clear();
+                sel.insert(key);
+            });
+        }
+    }
 }
 
 fn main() {

app-proto/src/outline.rs

@@ -83,18 +83,7 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View {
                         move |event: KeyboardEvent| {
                             match event.key().as_str() {
                                 "Enter" => {
-                                    if event.shift_key() {
+                                    state.select(key, event.shift_key());
-                                        state.selection.update(|sel| {
-                                            if !sel.remove(&key) {
-                                                sel.insert(key);
-                                            }
-                                        });
-                                    } else {
-                                        state.selection.update(|sel| {
-                                            sel.clear();
-                                            sel.insert(key);
-                                        });
-                                    }
                                     event.prevent_default();
                                 },
                                 "ArrowRight" if constrained.get() => {