Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

perf(project): move completed keyboard keys into overlay groups

vedanthd5780ff61779
diff --git a/crates/project/examples/keyboard-grouping-benchmark.rs b/crates/project/examples/keyboard-grouping-benchmark.rs
index 5e815cd14..272e7710d 100644
--- a/crates/project/examples/keyboard-grouping-benchmark.rs
+++ b/crates/project/examples/keyboard-grouping-benchmark.rs
@@ -31,11 +31,11 @@ fn event(key: &str, time_ms: f64, down: bool) -> KeyPressEvent {
}
fn measure<T>(mut operation: impl FnMut() -> T) -> (f64, f64) {
- for _ in 0..2 {
+ for _ in 0..3 {
black_box(operation());
}
let mut times = Vec::new();
- for _ in 0..7 {
+ for _ in 0..25 {
let started = Instant::now();
let output = black_box(operation());
times.push(started.elapsed().as_secs_f64() * 1000.0);
@@ -43,7 +43,7 @@ fn measure<T>(mut operation: impl FnMut() -> T) -> (f64, f64) {
drop(output);
}
times.sort_by(f64::total_cmp);
- (times[times.len() / 2], times[times.len() - 1])
+ (times[times.len() / 2], times[times.len() * 95 / 100])
}
fn main() {
diff --git a/crates/project/src/keyboard.rs b/crates/project/src/keyboard.rs
index 003a6d613..8f1f804d6 100644
--- a/crates/project/src/keyboard.rs
+++ b/crates/project/src/keyboard.rs
@@ -814,7 +814,7 @@ pub fn group_key_events(
start: start / 1000.0,
end: (event.time_ms + linger_duration_ms) / 1000.0,
display_text: current_display.clone(),
- keys: current_keys.clone(),
+ keys: take_group_keys(&mut current_keys),
fade_duration_override: None,
position_override: None,
color_override: None,
@@ -839,7 +839,7 @@ pub fn group_key_events(
start: start / 1000.0,
end: (last_key_time + linger_duration_ms) / 1000.0,
display_text: current_display.clone(),
- keys: current_keys.clone(),
+ keys: take_group_keys(&mut current_keys),
fade_duration_override: None,
position_override: None,
color_override: None,
@@ -888,7 +888,7 @@ pub fn group_key_events(
start: start / 1000.0,
end: (last_key_time + linger_duration_ms) / 1000.0,
display_text: current_display.clone(),
- keys: current_keys.clone(),
+ keys: take_group_keys(&mut current_keys),
fade_duration_override: None,
position_override: None,
color_override: None,
@@ -1002,6 +1002,12 @@ pub fn group_key_events(
segments
}
+fn take_group_keys(keys: &mut Vec<KeyPressDisplay>) -> Vec<KeyPressDisplay> {
+ let mut completed = Vec::with_capacity(keys.len());
+ completed.append(keys);
+ completed
+}
+
#[cfg(test)]
mod tests {
use super::*;
@@ -1024,6 +1030,41 @@ mod tests {
}
}
+ #[test]
+ fn completed_groups_preserve_text_keys_and_times_after_reusing_the_accumulator() {
+ for (terminator, time, end) in [
+ ("Space", 300.0, 0.8),
+ ("Space", 1000.0, 0.7),
+ ("x", 1000.0, 0.7),
+ ("LShift", 300.0, 0.7),
+ ] {
+ let events = KeyboardEvents {
+ presses: vec![
+ key_down("h", 100.0),
+ key_down("i", 200.0),
+ key_down(terminator, time),
+ key_down("a", time + 100.0),
+ key_down("Space", time + 200.0),
+ key_down("z", time + 300.0),
+ ],
+ };
+ let before = events.to_bytes().unwrap();
+ let grouped = group_key_events(&events, 300.0, 500.0, true, true);
+ assert_eq!(
+ serde_json::to_value(&grouped[0]).unwrap(),
+ serde_json::json!({
+ "id": "kb-1", "start": 0.1, "end": end, "displayText": "hi",
+ "keys": [{"key": "h", "timeOffset": 0.0}, {"key": "i", "timeOffset": 100.0}],
+ "fadeDurationOverride": null, "positionOverride": null, "colorOverride": null,
+ "backgroundColorOverride": null, "fontSizeOverride": null, "uppercaseOverride": null
+ }),
+ "{terminator} at {time}"
+ );
+ assert_eq!(grouped.last().unwrap().display_text, "z");
+ assert_eq!(events.to_bytes().unwrap(), before);
+ }
+ }
+
#[test]
fn groups_rapid_typing_into_word() {
let events = KeyboardEvents {