`04203a9`

Use double click to open day view

Authored by

espadonne 2 weeks ago

SHA: 04203a9e215116fb73c717abd9ddcd648bcbf6b8
Parents: 5475c02
Tree: 5c461e2

4 changed files

Status	File	+	-
M	`README.md`	2	2
M	`src/app.rs`	78	7
M	`src/cli.rs`	1	1
M	`src/tui.rs`	1	1

README.mdmodified

 .
  - Weekday initials jump within the selected week. Use `tu` for Tuesday, `th`
    for Thursday, `su` for Sunday, and `sa` for Saturday.
 -- Left click selects a visible date; left click the selected date again to open
 -  day view.
 +- Left click selects a visible date; double-click a visible date to open day
 +  view.
  Created events are stored locally as JSON and are shown immediately in month,
  week, and day views. The create/edit modal supports timed events, single-day

src/app.rsmodified

 +use std::time::{Duration, Instant};
++
  use crossterm::event::{
      KeyCode, KeyEvent, KeyEventKind, KeyModifiers, MouseButton, MouseEvent, MouseEventKind,
  };
      calendar::{CalendarDate, CalendarMonth, DAYS_PER_WEEK},
  };
 +const MOUSE_DOUBLE_CLICK_TIMEOUT: Duration = Duration::from_millis(500);
++
  #[derive(Debug, Clone, Copy, PartialEq, Eq)]
  pub enum ViewMode {
      Month,
  #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
  pub struct MouseInput {
 -    pending_open_date: Option<CalendarDate>,
 +    last_left_click: Option<MouseClick>,
 +}
++
 +#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 +struct MouseClick {
 +    date: CalendarDate,
 +    at: Instant,
+ }
  impl MouseInput {
          mouse: MouseEvent,
          target_date: Option<CalendarDate>,
          selected_date: CalendarDate,
 +    ) -> AppAction {
 +        self.translate_at(mouse, target_date, selected_date, Instant::now())
 +    }
++
 +    fn translate_at(
 +        &mut self,
 +        mouse: MouseEvent,
 +        target_date: Option<CalendarDate>,
 +        selected_date: CalendarDate,
 +        now: Instant,
      ) -> AppAction {
          match mouse.kind {
              MouseEventKind::Down(MouseButton::Left) => {
                      return AppAction::Noop;
                  };
 -                if self.pending_open_date == Some(target_date) && selected_date == target_date {
 +                let is_double_click = self
 +                    .last_left_click
 +                    .map(|click| {
 +                        click.date == target_date
 +                            && now.saturating_duration_since(click.at) <= MOUSE_DOUBLE_CLICK_TIMEOUT
 +                    })
 +                    .unwrap_or(false);
++
 +                self.last_left_click = Some(MouseClick {
 +                    date: target_date,
 +                    at: now,
 +                });
++
 +                if is_double_click && selected_date == target_date {
                      self.clear();
                      AppAction::OpenDay
                  } else {
 -                    self.pending_open_date = Some(target_date);
                      AppAction::SelectDate(target_date)
+                 }
+             }
 +            MouseEventKind::Up(_) => AppAction::Noop,
              _ => {
                  self.clear();
                  AppAction::Noop
+     }
      pub fn clear(&mut self) {
 -        self.pending_open_date = None;
 +        self.last_left_click = None;
+     }
+ }
+     }
      #[test]
 -    fn mouse_click_selects_then_second_click_opens_day() {
 +    fn mouse_double_click_selects_then_opens_day() {
          let target = date(2026, Month::April, 18);
          let mut app = AppState::new(date(2026, Month::April, 23));
          let mut input = MouseInput::default();
 +        let start = Instant::now();
 -        let action = input.translate(mouse_down(10, 10), Some(target), app.selected_date());
 +        let action =
 +            input.translate_at(mouse_down(10, 10), Some(target), app.selected_date(), start);
          app.apply(action);
          assert_eq!(app.selected_date(), target);
          assert_eq!(app.view_mode(), ViewMode::Month);
 -        let action = input.translate(mouse_down(10, 10), Some(target), app.selected_date());
 +        let action = input.translate_at(
 +            mouse_event(MouseEventKind::Up(MouseButton::Left), 10, 10),
 +            Some(target),
 +            app.selected_date(),
 +            start + Duration::from_millis(40),
 +        );
 +        app.apply(action);
 +        assert_eq!(app.view_mode(), ViewMode::Month);
++
 +        let action = input.translate_at(
 +            mouse_down(10, 10),
 +            Some(target),
 +            app.selected_date(),
 +            start + Duration::from_millis(120),
 +        );
          app.apply(action);
          assert_eq!(app.view_mode(), ViewMode::Day);
+     }
 +    #[test]
 +    fn slow_second_mouse_click_only_reselects_date() {
 +        let target = date(2026, Month::April, 18);
 +        let mut app = AppState::new(date(2026, Month::April, 23));
 +        let mut input = MouseInput::default();
 +        let start = Instant::now();
++
 +        let action =
 +            input.translate_at(mouse_down(10, 10), Some(target), app.selected_date(), start);
 +        app.apply(action);
 +        let action = input.translate_at(
 +            mouse_down(10, 10),
 +            Some(target),
 +            app.selected_date(),
 +            start + MOUSE_DOUBLE_CLICK_TIMEOUT + Duration::from_millis(1),
 +        );
 +        app.apply(action);
++
 +        assert_eq!(app.selected_date(), target);
 +        assert_eq!(app.view_mode(), ViewMode::Month);
 +    }
++
      #[test]
      fn mouse_clicks_without_a_date_target_are_ignored() {
          let mut input = MouseInput::default();

src/cli.rsmodified

      "  Digits jump immediately; a quick second digit refines the selected day.\n",
      "  Weekday initials jump within the selected week.\n\n",
      "Mouse:\n",
 -    "  Left click selects a visible date; left click the selected date again to open day view.\n\n",
 +    "  Left click selects a visible date; double-click a visible date to open day view.\n\n",
      "Notes:\n",
      "  Real calendar-account integration and reminder notifications are not in this milestone.\n",
  );

src/tui.rsmodified

              ("Weekdays", "Jump within the selected week"),
              ("Enter", "Open the focused day view"),
              ("+", "Create an event on the selected date"),
 -            ("Mouse", "Select a date; click it again to open"),
 +            ("Mouse", "Select a date; double-click to open"),
              ("?", "Close this help"),
              ("q", "Quit"),
          ],