Skip to content

Allow override props #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joaom00 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Allow override props #117

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d4847a
chore: allow override props
Apr 13, 2023
37aeb9b
Merge branch 'main' into props-override
joaom00 May 9, 2023
4eec9ee
fix: compose event handlers
May 9, 2023
ecda01e
fix: tests
May 9, 2023
c7bf351
fix: format
May 9, 2023
0e85a47
Merge branch 'main' into props-override
May 10, 2023
5040972
fix: add div props to loading component
May 12, 2023
73a5efe
fix: format
May 12, 2023
27c627e
Merge branch 'main' into props-override
Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmdk/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
return (
<div
ref={mergeRefs([ref, forwardedRef])}
{...etc}
cmdk-root=""
{...etc}
onKeyDown={(e) => {
etc.onKeyDown?.(e)

Expand Down Expand Up @@ -626,13 +626,13 @@ const Item = React.forwardRef<HTMLDivElement, ItemProps>((props, forwardedRef) =
return (
<div
ref={mergeRefs([ref, forwardedRef])}
{...etc}
id={id}
cmdk-item=""
role="option"
aria-disabled={disabled || undefined}
aria-selected={selected || undefined}
data-selected={selected || undefined}
{...etc}
onPointerMove={disabled ? undefined : select}
onClick={disabled ? undefined : onSelect}
>
Expand Down Expand Up @@ -667,10 +667,10 @@ const Group = React.forwardRef<HTMLDivElement, GroupProps>((props, forwardedRef)
return (
<div
ref={mergeRefs([ref, forwardedRef])}
{...etc}
cmdk-group=""
role="presentation"
hidden={render ? undefined : true}
{...etc}
>
{heading && (
<div ref={headingRef} cmdk-group-heading="" aria-hidden id={headingId}>
Expand All @@ -694,7 +694,7 @@ const Separator = React.forwardRef<HTMLDivElement, SeparatorProps>((props, forwa
const render = useCmdk((state) => !state.search)

if (!alwaysRender && !render) return null
return <div ref={mergeRefs([ref, forwardedRef])} {...etc} cmdk-separator="" role="separator" />
return <div ref={mergeRefs([ref, forwardedRef])} cmdk-separator="" role="separator" {...etc} />
})

/**
Expand Down Expand Up @@ -723,7 +723,6 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, forwardedRe
return (
<input
ref={forwardedRef}
{...etc}
cmdk-input=""
autoComplete="off"
autoCorrect="off"
Expand All @@ -736,6 +735,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, forwardedRe
aria-activedescendant={selectedItemId}
id={context.inputId}
type="text"
{...etc}
value={isControlled ? props.value : search}
onChange={(e) => {
if (!isControlled) {
Expand Down Expand Up @@ -780,12 +780,12 @@ const List = React.forwardRef<HTMLDivElement, ListProps>((props, forwardedRef) =
return (
<div
ref={mergeRefs([ref, forwardedRef])}
{...etc}
cmdk-list=""
role="listbox"
aria-label="Suggestions"
id={context.listId}
aria-labelledby={context.inputId}
{...etc}
>
<div ref={height} cmdk-list-sizer="">
{children}
Expand Down Expand Up @@ -823,7 +823,7 @@ const Empty = React.forwardRef<HTMLDivElement, EmptyProps>((props, forwardedRef)
}, [])

if (isFirstRender.current || !render) return null
return <div ref={forwardedRef} {...props} cmdk-empty="" role="presentation" />
return <div ref={forwardedRef} cmdk-empty="" role="presentation" {...props} />
})

/**
Expand All @@ -835,13 +835,13 @@ const Loading = React.forwardRef<HTMLDivElement, LoadingProps>((props, forwarded
return (
<div
ref={forwardedRef}
{...etc}
cmdk-loading=""
role="progressbar"
aria-valuenow={progress}
aria-valuemin={0}
aria-valuemax={100}
aria-label="Loading..."
{...etc}
>
<div aria-hidden>{children}</div>
</div>
Expand Down