fix(keybinds): last fn respects disabled items (#47)

* fix(keybinding): Meta+ArrowDown respects disabled items * chore(keybinds): update test * revert id change * chore: update test * remove .only Co-authored-by: Paco <[email protected]>
pacocoursey · Sep 5, 2022 · eb0947f · eb0947f · vercel · Sep 5, 2022
1 parent 9fae175
commit eb0947f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cmdk/src/index.tsx b/cmdk/src/index.tsx
@@ -440,7 +440,7 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
     }
   }
 
-  const last = () => updateSelectedToIndex(state.current.filtered.count - 1)
+  const last = () => updateSelectedToIndex(getValidItems().length - 1)
 
   const next = (e: React.KeyboardEvent) => {
     e.preventDefault()

diff --git a/test/pages/keybinds.tsx b/test/pages/keybinds.tsx
@@ -9,6 +9,10 @@ const Page = () => {
         <Command.List>
           <Command.Empty>No results.</Command.Empty>
 
+          <Command.Item value="disabled" disabled>
+            Disabled
+          </Command.Item>
+
           <Command.Item value="first">First</Command.Item>
 
           <Command.Group heading="Letters">
@@ -21,10 +25,15 @@ const Page = () => {
             <Command.Item>Apple</Command.Item>
             <Command.Item>Banana</Command.Item>
             <Command.Item>Orange</Command.Item>
+            <Command.Item disabled>Dragon Fruit</Command.Item>
             <Command.Item>Pear</Command.Item>
           </Command.Group>
 
           <Command.Item value="last">Last</Command.Item>
+
+          <Command.Item value="disabled-3" disabled>
+            Disabled 3
+          </Command.Item>
         </Command.List>
       </Command>
     </div>