Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-08 19:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

add addl buttons

Browse Source
This commit is contained in:
Evan Simkowitz 2024-12-29 18:00:44 -05:00
parent 27f8a3c4f1
commit 4533c813ce
No known key found for this signature in database
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/app/element/search.tsx
View File

@ -16,6 +16,7 @@ type SearchProps = SearchAtoms & {
onSearch?: (search: string) => void;
onNext?: () => void;
onPrev?: () => void;
additionalButtons?: IconButtonDecl[];
};
const SearchComponent = ({
@ -29,6 +30,7 @@ const SearchComponent = ({
onSearch,
onNext,
onPrev,
additionalButtons,
}: SearchProps) => {
const [isOpen, setIsOpen] = useAtom<boolean>(isOpenAtom);
const [search, setSearch] = useAtom<string>(searchAtom);
@ -74,7 +76,7 @@ const SearchComponent = ({
);
middleware.push(offset(offsetCallback));
const { refs, floatingStyles, context } = useFloating({
const { refs, floatingStyles } = useFloating({
placement: "top-end",
open: isOpen,
onOpenChange: handleOpenChange,
@ -148,6 +150,13 @@ const SearchComponent = ({
>
{index + 1}/{numResults}
</div>
{additionalButtons?.length && (
<div className="right-buttons">
{additionalButtons.map((decl, i) => (
<IconButton key={i} decl={decl} />
))}
</div>
)}
<div className="right-buttons">
<IconButton decl={prevDecl} />
<IconButton decl={nextDecl} />

44
frontend/app/view/term/term.tsx
View File

@ -792,10 +792,53 @@ const TerminalView = ({ blockId, model }: TerminalViewProps) => {
const fullConfig = globalStore.get(atoms.fullConfigAtom);
const connFontFamily = fullConfig.connections?.[blockData?.meta?.connection]?.["term:fontfamily"];
// search
const searchProps = useSearch(viewRef, model);
const { additionalButtons, stateAtoms } = React.useMemo(() => {
const regexAtom = jotai.atom(false);
const wholeWordAtom = jotai.atom(false);
const caseSensitiveAtom = jotai.atom(false);
const additionalButtons: IconButtonDecl[] = [
{
elemtype: "iconbutton",
icon: "font-case",
title: "Case Sensitive",
click: () => {
globalStore.set(caseSensitiveAtom, !globalStore.get(caseSensitiveAtom));
},
},
{
elemtype: "iconbutton",
icon: "w",
title: "Whole Word",
click: () => {
globalStore.set(wholeWordAtom, !globalStore.get(wholeWordAtom));
},
},
{
elemtype: "iconbutton",
icon: "asterisk",
title: "Regex Search",
click: () => {
globalStore.set(regexAtom, !globalStore.get(regexAtom));
},
},
];
return {
additionalButtons,
stateAtoms: { caseSensitiveAtom, wholeWordAtom, regexAtom },
};
}, []);
searchProps.additionalButtons = additionalButtons;
const caseSensitive = jotai.useAtomValue<boolean>(stateAtoms.caseSensitiveAtom);
const wholeWord = jotai.useAtomValue<boolean>(stateAtoms.wholeWordAtom);
const regex = jotai.useAtomValue<boolean>(stateAtoms.regexAtom);
const searchVal = jotai.useAtomValue<string>(searchProps.searchAtom);
const searchOpts: ISearchOptions = {
incremental: true,
regex,
wholeWord,
caseSensitive,
decorations: {
matchOverviewRuler: "#e0e0e0",
activeMatchColorOverviewRuler: "#e0e0e0",
@ -816,6 +859,7 @@ const TerminalView = ({ blockId, model }: TerminalViewProps) => {
searchProps.onNext = React.useCallback(() => {
model.termRef.current?.searchAddon.findNext(searchVal, searchOpts);
}, [searchVal]);
// end search
React.useEffect(() => {
const fullConfig = globalStore.get(atoms.fullConfigAtom);