feat(record): support selecting item by clicking empty area to right

Author: arxanas

scm-record/src/render.rs

@@ -409,6 +409,32 @@ impl<'a, ComponentId: Clone + Debug + Eq + Hash> Viewport<'a, ComponentId> {
         widget.render(rect, self.buf);
     }
 
+    pub fn fill_rest_of_line(&mut self, x: isize, y: isize) {
+        let line_width = self.rect.width.unwrap_isize() - x;
+        let line_width: usize = match line_width.try_into() {
+            Ok(0) | Err(_) => return,
+            Ok(line_width) => line_width,
+        };
+
+        let line_rect = Rect {
+            x,
+            y,
+            width: line_width,
+            height: 1,
+        };
+        self.current_trace_mut().merge_rect(line_rect);
+        let draw_rect = self.rect.intersect(line_rect);
+        if !draw_rect.is_empty() {
+            let buf_rect = self.translate_rect(draw_rect);
+            self.buf.set_span(
+                buf_rect.x,
+                buf_rect.y,
+                &Span::raw(" ".repeat(line_width)),
+                buf_rect.width,
+            );
+        }
+    }
+
     /// Convert the virtual `Rect` being displayed on the viewport, potentially
     /// including an area off-screen, into a real terminal `tui::layout::Rect`
     /// indicating the actual positions of the characters to be printed

scm-record/src/ui.rs

@@ -1028,9 +1028,18 @@ impl<'a> Recorder<'a> {
         let y = row.unwrap_isize() + self.scroll_offset_y;
         drawn_rects
             .iter()
-            .filter(|(_id, rect)| rect.contains_point(x, y))
-            .min_by(|(_, lhs), (_, rhs)| lhs.size().area().cmp(&rhs.size().area()))
-            .map(|(id, _rect)| id.clone())
+            .filter(|(id, rect)| {
+                rect.contains_point(x, y)
+                    && match id {
+                        ComponentId::App => false,
+                        ComponentId::SelectableItem(_)
+                        | ComponentId::TristateBox(_)
+                        | ComponentId::QuitDialog
+                        | ComponentId::QuitDialogButton(_) => true,
+                    }
+            })
+            .min_by_key(|(id, rect)| (rect.size().area(), (rect.y, rect.x), *id))
+            .map(|(id, _rect)| *id)
             .unwrap_or(ComponentId::App)
     }
 
@@ -1463,6 +1472,7 @@ impl Component for FileView<'_> {
             section_views,
             is_header_selected,
         } = self;
+        viewport.fill_rest_of_line(x, y);
 
         let tristate_box_rect = viewport.draw_component(x, y, tristate_box);
         viewport.draw_span(
@@ -1542,6 +1552,7 @@ impl Component for SectionView<'_> {
             section,
             line_start_num,
         } = self;
+        viewport.fill_rest_of_line(x, y);
 
         let SectionKey {
             file_idx,
@@ -1811,6 +1822,7 @@ impl Component for SectionLineView<'_> {
 
     fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize) {
         let Self { line_key: _, inner } = self;
+        viewport.fill_rest_of_line(x, y);
         match inner {
             SectionLineViewInner::Unchanged { line, line_num } => {
                 let style = Style::default().add_modifier(Modifier::DIM);

scm-record/tests/test_scm_record.rs

@@ -896,3 +896,84 @@ fn test_mouse_click_checkbox() -> eyre::Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn test_mouse_click_wide_line() -> eyre::Result<()> {
+    let state = RecordState {
+        files: vec![File {
+            path: Cow::Borrowed(Path::new("foo")),
+            file_mode: None,
+            sections: vec![
+                Section::FileMode {
+                    is_toggled: false,
+                    before: FileMode::absent(),
+                    after: FileMode(0o100644),
+                },
+                Section::Changed {
+                    lines: vec![SectionChangedLine {
+                        is_toggled: false,
+                        change_type: ChangeType::Removed,
+                        line: Cow::Borrowed("foo\n"),
+                    }],
+                },
+            ],
+        }],
+    };
+
+    let initial = TestingScreenshot::default();
+    let click_line = TestingScreenshot::default();
+    let click_line_section = TestingScreenshot::default();
+    let click_file_mode_section = TestingScreenshot::default();
+    let click_file = TestingScreenshot::default();
+    let event_source = EventSource::testing(
+        80,
+        4,
+        [
+            initial.event(),
+            Event::Click { row: 3, column: 50 },
+            click_line.event(),
+            Event::Click { row: 2, column: 50 },
+            click_line_section.event(),
+            Event::Click { row: 1, column: 50 },
+            click_file_mode_section.event(),
+            Event::Click { row: 0, column: 50 },
+            click_file.event(),
+            Event::QuitAccept,
+        ],
+    );
+    let recorder = Recorder::new(state, event_source);
+    recorder.run()?;
+
+    insta::assert_display_snapshot!(initial, @r###"
+    "( ) foo                                                                         "
+    "  [ ] File mode changed from 0 to 100644                                        "
+    "  [ ] Section 2/2                                                               "
+    "    [ ] - foo                                                                   "
+    "###);
+    insta::assert_display_snapshot!(click_line, @r###"
+    "[ ] foo                                                                         "
+    "  [ ] File mode changed from 0 to 100644                                        "
+    "  [ ] Section 2/2                                                               "
+    "    ( ) - foo                                                                   "
+    "###);
+    insta::assert_display_snapshot!(click_line_section, @r###"
+    "[ ] foo                                                                         "
+    "  [ ] File mode changed from 0 to 100644                                        "
+    "  ( ) Section 2/2                                                               "
+    "    [ ] - foo                                                                   "
+    "###);
+    insta::assert_display_snapshot!(click_file_mode_section, @r###"
+    "[ ] foo                                                                         "
+    "  ( ) File mode changed from 0 to 100644                                        "
+    "  [ ] Section 2/2                                                               "
+    "    [ ] - foo                                                                   "
+    "###);
+    insta::assert_display_snapshot!(click_file, @r###"
+    "( ) foo                                                                         "
+    "  [ ] File mode changed from 0 to 100644                                        "
+    "  [ ] Section 2/2                                                               "
+    "    [ ] - foo                                                                   "
+    "###);
+
+    Ok(())
+}