fix(combo): fix combo output key getting stuck

HaoboGu · Jan 24, 2025 · 9f0daaa · 9f0daaa
1 parent baba014
commit 9f0daaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/rmk/src/combo.rs b/rmk/src/combo.rs
@@ -62,7 +62,7 @@ impl Combo {
         let action_idx = self.actions.iter().position(|&a| a == key_action);
         if let Some(i) = action_idx {
             self.state |= 1 << i;
-        } else {
+        } else if !self.done() {
             self.reset();
         }
         action_idx.is_some()

diff --git a/rmk/src/keyboard.rs b/rmk/src/keyboard.rs
@@ -405,10 +405,12 @@ impl<'a, const ROW: usize, const COL: usize, const NUM_LAYER: usize>
         while let Some((action, event)) = self.combo_actions_buffer.pop_front() {
             self.process_key_action(action, event).await;
         }
+
         self.keymap
             .borrow_mut()
             .combos
             .iter_mut()
+            .filter(|combo| !combo.done())
             .for_each(Combo::reset);
     }