mirror of
https://github.com/outline/outline.git
synced 2026-11-22 05:51:43 +03:00
* React 19 upgrade Bumps react and react-dom to 19.2.8, with the dependency changes React 19 requires: react-is 19, @types/react 19, @types/react-dom 19, react-helmet-async 3 and react-avatar-editor 15 (which now ships its own types). framer-motion moves to 13 — its v6 types reference React.ReactHTML, removed from @types/react 19. The type changes fall into a few classes: - The global JSX namespace is gone, so JSX.Element becomes React.JSX.Element and the custom element declarations move into a module augmentation. - useRef() now requires an initial value. - A ref created with a null initial value is typed nullable, so consumers that accept one are widened to RefObject<T | null>. - React.ReactChild was removed; tooltips take React.ReactNode. - Ref callbacks may only return a cleanup function. react-dnd connectors return the connected node, so useDragRef and useDropRef wrap useDrag and useDrop and hand back a ref callback. react-i18next stays on v12: i18next 23 drops compatibilityJSON "v3", which would rewrite all 64 _plural keys across every locale. outline-icons, oy-vey and react-waypoint have no release that lists React 19 as a peer. All three render correctly under it; the install reports them as unmet peers. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Remove react-helmet and forwardRef --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
170 lines
4.5 KiB
TypeScript
170 lines
4.5 KiB
TypeScript
import { ArrowIcon, BackIcon } from "outline-icons";
|
|
import * as React from "react";
|
|
import styled, { css, useTheme } from "styled-components";
|
|
import { s, ellipsis } from "@shared/styles";
|
|
import { normalizeKeyDisplay, shortcutSeparator } from "@shared/utils/keyboard";
|
|
import type { CommandBarActionImpl } from "~/actions";
|
|
import Highlight from "~/components/Highlight";
|
|
import Flex from "~/components/Flex";
|
|
import Key from "~/components/Key";
|
|
import Text from "~/components/Text";
|
|
import { HStack } from "../primitives/HStack";
|
|
|
|
type Props = {
|
|
action: CommandBarActionImpl;
|
|
active: boolean;
|
|
currentRootActionId: string | null | undefined;
|
|
ref?: React.Ref<HTMLDivElement>;
|
|
};
|
|
|
|
const SEARCH_RESULT_REGEX = /<b\b[^>]*>(.*?)<\/b>/gi;
|
|
|
|
function replaceResultMarks(tag: string) {
|
|
// don't use SEARCH_RESULT_REGEX here as it causes
|
|
// an infinite loop to trigger a regex inside it's own callback
|
|
return tag.replace(/<b\b[^>]*>(.*?)<\/b>/gi, "$1");
|
|
}
|
|
|
|
function CommandBarItem({ action, active, currentRootActionId, ref }: Props) {
|
|
const theme = useTheme();
|
|
const ancestors = React.useMemo(() => {
|
|
if (!currentRootActionId || !action.ancestors) {
|
|
return action.ancestors ?? [];
|
|
}
|
|
const index = action.ancestors.findIndex(
|
|
(ancestor) => ancestor.id === currentRootActionId
|
|
);
|
|
|
|
// +1 removes the currentRootAction; e.g. if we are on the "Set theme"
|
|
// parent action, the UI should not display "Set theme… > Dark" but rather
|
|
// just "Dark"
|
|
return action.ancestors.slice(index + 1);
|
|
}, [action.ancestors, currentRootActionId]);
|
|
|
|
return (
|
|
<Item active={active} ref={ref}>
|
|
<Content>
|
|
<Icon>
|
|
{action.icon ? (
|
|
// @ts-expect-error no icon on ActionImpl
|
|
React.cloneElement(action.icon, {
|
|
size: 22,
|
|
})
|
|
) : (
|
|
<ArrowIcon />
|
|
)}
|
|
</Icon>
|
|
|
|
{ancestors.map((ancestor) => (
|
|
<React.Fragment key={ancestor.id}>
|
|
<Ancestor>{ancestor.name}</Ancestor>
|
|
<ForwardIcon color={theme.textSecondary} size={22} />
|
|
</React.Fragment>
|
|
))}
|
|
{action.name}
|
|
{action.children?.length ? "…" : ""}
|
|
{action.subtitle && (
|
|
<Text type="secondary" ellipsis>
|
|
|
|
<Highlight
|
|
text={action.subtitle}
|
|
highlight={SEARCH_RESULT_REGEX}
|
|
processResult={replaceResultMarks}
|
|
/>
|
|
</Text>
|
|
)}
|
|
</Content>
|
|
{action.badge || action.shortcut?.length ? (
|
|
<Trailing>
|
|
{action.badge}
|
|
{action.shortcut?.length ? (
|
|
<Shortcut>
|
|
{action.shortcut.map((sc: string, index) => (
|
|
<React.Fragment key={sc}>
|
|
{index > 0 ? (
|
|
<>
|
|
{" "}
|
|
<Text size="xsmall" type="secondary">
|
|
then
|
|
</Text>{" "}
|
|
</>
|
|
) : (
|
|
""
|
|
)}
|
|
{sc.split("+").flatMap((key, i, arr) => {
|
|
const el = <Key key={key}>{normalizeKeyDisplay(key)}</Key>;
|
|
return i < arr.length - 1 && shortcutSeparator
|
|
? [el, shortcutSeparator]
|
|
: [el];
|
|
})}
|
|
</React.Fragment>
|
|
))}
|
|
</Shortcut>
|
|
) : null}
|
|
</Trailing>
|
|
) : null}
|
|
</Item>
|
|
);
|
|
}
|
|
|
|
const Trailing = styled(HStack).attrs({ spacing: 4 })`
|
|
flex-shrink: 0;
|
|
padding-left: 8px;
|
|
`;
|
|
|
|
const Shortcut = styled.div`
|
|
display: grid;
|
|
grid-auto-flow: column;
|
|
gap: 4px;
|
|
`;
|
|
|
|
const Icon = styled(Flex)`
|
|
align-items: center;
|
|
justify-content: center;
|
|
width: 24px;
|
|
height: 24px;
|
|
color: ${s("textSecondary")};
|
|
flex-shrink: 0;
|
|
`;
|
|
|
|
const Ancestor = styled.span`
|
|
color: ${s("textSecondary")};
|
|
`;
|
|
|
|
const Content = styled(HStack)`
|
|
${ellipsis()}
|
|
flex-shrink: 1;
|
|
`;
|
|
|
|
const Item = styled.div<{ active?: boolean }>`
|
|
font-size: 14px;
|
|
padding: 9px 12px;
|
|
margin: 0 8px;
|
|
border-radius: 4px;
|
|
background: ${(props) =>
|
|
props.active ? props.theme.menuItemSelected : "none"};
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
cursor: var(--pointer);
|
|
|
|
${ellipsis()}
|
|
user-select: none;
|
|
min-width: 0;
|
|
|
|
${(props) =>
|
|
props.active &&
|
|
css`
|
|
${Icon} {
|
|
color: ${props.theme.text};
|
|
}
|
|
`}
|
|
`;
|
|
|
|
const ForwardIcon = styled(BackIcon)`
|
|
transform: rotate(180deg);
|
|
flex-shrink: 0;
|
|
`;
|
|
|
|
export default CommandBarItem;
|