fix: Various command bar fixes

This commit is contained in:
Tom Moor
2023-05-18 16:42:46 -04:00
parent dca64fe84b
commit b1e2ff0713
3 changed files with 26 additions and 16 deletions

View File

@@ -35,7 +35,7 @@ export function createAction(definition: Optional<Action, "id">): Action {
return definition.perform?.(context); return definition.perform?.(context);
} }
: undefined, : undefined,
id: uuidv4(), id: definition.id ?? uuidv4(),
}; };
} }

View File

@@ -8,24 +8,33 @@ export default function CommandBarResults() {
const { results, rootActionId } = useMatches(); const { results, rootActionId } = useMatches();
return ( return (
<KBarResults <Container>
items={results} <KBarResults
maxHeight={400} items={results}
onRender={({ item, active }) => maxHeight={400}
typeof item === "string" ? ( onRender={({ item, active }) =>
<Header>{item}</Header> typeof item === "string" ? (
) : ( <Header>{item}</Header>
<CommandBarItem ) : (
action={item} <CommandBarItem
active={active} action={item}
currentRootActionId={rootActionId} active={active}
/> currentRootActionId={rootActionId}
) />
} )
/> }
/>
</Container>
); );
} }
// Cannot style KBarResults unfortunately, so we must wrap and target the inner
const Container = styled.div`
> div {
padding-bottom: 8px;
}
`;
const Header = styled.h3` const Header = styled.h3`
font-size: 13px; font-size: 13px;
letter-spacing: 0.04em; letter-spacing: 0.04em;

View File

@@ -25,6 +25,7 @@ const useSettingsActions = () => {
const navigateToSettings = React.useMemo( const navigateToSettings = React.useMemo(
() => () =>
createAction({ createAction({
id: "settings",
name: ({ t }) => t("Settings"), name: ({ t }) => t("Settings"),
section: NavigationSection, section: NavigationSection,
shortcut: ["g", "s"], shortcut: ["g", "s"],