Skip to content
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.

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

feat(frontend): handle mentions in search bar #2049

Merged
merged 7 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,34 @@ import "./styles.css";
import { useChatStateUpdater } from "./hooks/useChatStateUpdater";
import { useCreateEditorState } from "./hooks/useCreateEditorState";
import { useEditor } from "./hooks/useEditor";
import { useEditorStateUpdater } from "./hooks/useEditorStateUpdater";

type EditorProps = {
onSubmit: () => void;
setMessage: (text: string) => void;
message: string;
placeholder?: string;
};

export const Editor = ({
setMessage,
message,
onSubmit,
placeholder,
}: EditorProps): JSX.Element => {
const { editor } = useCreateEditorState();
const { editor } = useCreateEditorState(placeholder);

useChatStateUpdater({
editor,
setMessage,
});

useEditorStateUpdater({
editor,
message,
});

const { submitOnEnter } = useEditor({
onSubmit,
});

return (
<EditorContent
className="w-full"
onKeyDown={submitOnEnter}
className="w-full caret-accent"
onKeyDown={(event) => void submitOnEnter(event)}
editor={editor}
/>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,39 @@
import Document from "@tiptap/extension-document";
import HardBreak from "@tiptap/extension-hard-break";
import Paragraph from "@tiptap/extension-paragraph";
import Placeholder from "@tiptap/extension-placeholder";
import Text from "@tiptap/extension-text";
import { useEditor } from "@tiptap/react";
import { Document } from "@tiptap/extension-document";
import { HardBreak } from "@tiptap/extension-hard-break";
import { Paragraph } from "@tiptap/extension-paragraph";
import { Placeholder } from "@tiptap/extension-placeholder";
import { Text } from "@tiptap/extension-text";
import { Extension, useEditor } from "@tiptap/react";
import { useTranslation } from "react-i18next";

import { useBrainMention } from "./useBrainMention";
import { usePromptMention } from "./usePromptSuggestionsConfig";

// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export const useCreateEditorState = () => {
export const useCreateEditorState = (placeholder?: string) => {
const { t } = useTranslation(["chat"]);
const { BrainMention, items } = useBrainMention();
const { PromptMention } = usePromptMention();

const PreventEnter = Extension.create({
addKeyboardShortcuts: () => {
return {
Enter: () => true,
};
},
});

const editor = useEditor(
{
autofocus: true,
onFocus: () => {
editor?.commands.focus("end");
},
extensions: [
PreventEnter,
Placeholder.configure({
showOnlyWhenEditable: true,
placeholder: t("actions_bar_placeholder"),
placeholder: placeholder ?? t("actions_bar_placeholder"),
}),
Document,
Text,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ type UseEditorProps = {
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export const useEditor = ({ onSubmit }: UseEditorProps) => {
const submitOnEnter = (ev: KeyboardEvent<HTMLDivElement>) => {
if (ev.key === "Enter" && !ev.shiftKey) {
ev.preventDefault();
if (ev.key === "Enter" && !ev.shiftKey && !ev.metaKey) {
onSubmit();
}
};
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@use '@/styles/Colors.module.scss';
@use '@/styles/IconSizes.module.scss';
@use '@/styles/Spacings.module.scss';
@use "@/styles/Colors.module.scss";
@use "@/styles/IconSizes.module.scss";
@use "@/styles/Spacings.module.scss";

.menu_icon {
width: IconSizes.$medium;
height: IconSizes.$medium;
cursor: pointer;
width: IconSizes.$large;
height: IconSizes.$large;
cursor: pointer;

&:hover {
color: Colors.$accent;
}
}
&:hover {
color: Colors.$accent;
}
}
5 changes: 3 additions & 2 deletions frontend/lib/components/ui/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
} from "@radix-ui/react-tooltip";
import { cva, type VariantProps } from "class-variance-authority";
import { ButtonHTMLAttributes, Ref, RefAttributes, forwardRef } from "react";
import { FaSpinner } from "react-icons/fa";

import { cn } from "@/lib/utils";
import { AiOutlineLoading3Quarters } from "react-icons/ai";

const ButtonVariants = cva(
"px-8 py-3 text-sm disabled:opacity-80 text-center font-medium rounded-md focus:ring ring-primary/10 outline-none flex items-center justify-center gap-2 transition-opacity focus:ring-0",
Expand Down Expand Up @@ -65,7 +65,8 @@ const Button = forwardRef(

const buttonChildren = (
<>
{children} {isLoading && <FaSpinner className="animate-spin" />}
{children}{" "}
{isLoading && <AiOutlineLoading3Quarters className="animate-spin" />}
</>
);

Expand Down
38 changes: 38 additions & 0 deletions frontend/lib/components/ui/LoaderIcon/LoaderIcon.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@use "@/styles/Colors.module.scss";
@use "@/styles/IconSizes.module.scss";

.loader_icon {
animation: spin 1s linear infinite;
width: IconSizes.$big;
height: IconSizes.$big;
color: Colors.$accent;

@keyframes spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

&.small {
width: IconSizes.$small;
height: IconSizes.$small;
}

&.normal {
width: IconSizes.$normal;
height: IconSizes.$normal;
}

&.large {
width: IconSizes.$large;
height: IconSizes.$large;
}

&.big {
width: IconSizes.$big;
height: IconSizes.$big;
}
}
17 changes: 17 additions & 0 deletions frontend/lib/components/ui/LoaderIcon/LoaderIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { AiOutlineLoading3Quarters } from "react-icons/ai";

import { IconSize } from "@/lib/types/Icons";

import styles from "./LoaderIcon.module.scss";

interface LoaderIconProps {
size: IconSize;
}

export const LoaderIcon = (props: LoaderIconProps): JSX.Element => {
return (
<AiOutlineLoading3Quarters
className={`${styles.loader_icon ?? ""} ${styles[props.size] ?? ""}`}
/>
);
};
61 changes: 26 additions & 35 deletions frontend/lib/components/ui/SearchBar/SearchBar.module.scss
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
@use '@/styles/Colors.module.scss';
@use '@/styles/IconSizes.module.scss';
@use '@/styles/Spacings.module.scss';
@use "@/styles/Colors.module.scss";
@use "@/styles/IconSizes.module.scss";
@use "@/styles/Spacings.module.scss";

.search_bar_wrapper {
display: flex;
justify-content: space-between;
align-items: center;
gap: Spacings.$spacing03;
background-color: Colors.$white;
padding: Spacings.$spacing05;
border-radius: 12px;
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
display: flex;
justify-content: space-between;
align-items: center;
gap: Spacings.$spacing03;
background-color: Colors.$white;
padding: Spacings.$spacing05;
border-radius: 12px;
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);

&:hover {
box-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
}

.search_input {
border: none;
flex: 1;
caret-color: Colors.$accent;

&:focus {
box-shadow: none;
}
}
&:hover {
box-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1),
0 8px 10px -6px rgb(0 0 0 / 0.1);
}

.search_icon {
width: IconSizes.$big;
height: IconSizes.$big;
color: Colors.$accent;
cursor: pointer;
.search_icon {
width: IconSizes.$big;
height: IconSizes.$big;
color: Colors.$accent;
cursor: pointer;

&.disabled {
color: Colors.$black;
pointer-events: none;
opacity: 0.2;
}
&.disabled {
color: Colors.$black;
pointer-events: none;
opacity: 0.2;
}
}
}
}
Loading
Loading