Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Message Input Improvements (#3618)

Pedro Ladeira009eb54c7b55
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx
index 9db7d85c9b..191c593f38 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/profile-details-form.tsx
@@ -1,3 +1,4 @@
+import { parseActionError } from "@/lib/actions/parse-action-errors";
import { updatePartnerProfileAction } from "@/lib/actions/partners/update-partner-profile";
import { hasPermission } from "@/lib/auth/partner-users/partner-user-permissions";
import { mutatePrefix } from "@/lib/swr/mutate";
@@ -187,6 +188,11 @@ function BasicInfoForm({
mutatePrefix("/api/partner-profile");
},
onError({ error }) {
+ if (error.validationErrors) {
+ toast.error(parseActionError(error, "Could not update your profile."));
+ return;
+ }
+
setError("root.serverError", {
message: error.serverError,
});
diff --git a/apps/web/lib/actions/partners/update-partner-profile.ts b/apps/web/lib/actions/partners/update-partner-profile.ts
index 044a6f9881..05a1a1448b 100644
--- a/apps/web/lib/actions/partners/update-partner-profile.ts
+++ b/apps/web/lib/actions/partners/update-partner-profile.ts
@@ -26,7 +26,7 @@ import { authPartnerActionClient } from "../safe-action";
const updatePartnerProfileSchema = z
.object({
- name: z.string().optional(),
+ name: z.string().trim().min(1, "Name is required").optional(),
email: z.email().optional(),
image: uploadedImageSchema.nullish(),
description: z.string().max(MAX_PARTNER_DESCRIPTION_LENGTH).nullish(),
diff --git a/apps/web/ui/shared/emoji-picker.tsx b/apps/web/ui/shared/emoji-picker.tsx
index 464d853b3b..0f57b153dd 100644
--- a/apps/web/ui/shared/emoji-picker.tsx
+++ b/apps/web/ui/shared/emoji-picker.tsx
@@ -1,67 +1,113 @@
import { Button, Popover } from "@dub/ui";
import { FaceSmile } from "@dub/ui/icons";
import { EmojiPicker as EmojiPickerBase } from "frimousse";
-import { PropsWithChildren, useState } from "react";
+import {
+ type KeyboardEvent as ReactKeyboardEvent,
+ PropsWithChildren,
+ useRef,
+ useState,
+} from "react";
+
+type EmojiPickerProps = PropsWithChildren<{
+ onSelect: (emoji: string) => void;
+ openPopover?: boolean;
+ setOpenPopover?: (open: boolean) => void;
+ onKeyboardDismissFocusEditor?: () => void;
+}>;
export function EmojiPicker({
onSelect,
children,
-}: PropsWithChildren<{
- onSelect: (emoji: string) => void;
-}>) {
- const [isOpen, setIsOpen] = useState(false);
+ openPopover: controlledOpen,
+ setOpenPopover: controlledSetOpen,
+ onKeyboardDismissFocusEditor,
+}: EmojiPickerProps) {
+ const [internalOpen, setInternalOpen] = useState(false);
+ const isControlled =
+ controlledOpen !== undefined && controlledSetOpen !== undefined;
+ const openPopover = isControlled ? controlledOpen : internalOpen;
+ const setOpenPopover = isControlled ? controlledSetOpen : setInternalOpen;
+ const keyboardDismissRef = useRef(false);
+
+ const handleBackspaceClose = (e: ReactKeyboardEvent) => {
+ if (e.key !== "Backspace") return;
+ const target = e.target;
+ if (target instanceof HTMLInputElement && target.value.length > 0) return;
+ if (target instanceof HTMLTextAreaElement && target.value.length > 0)
+ return;
+ e.preventDefault();
+ e.stopPropagation();
+ keyboardDismissRef.current = true;
+ setOpenPopover(false);
+ };
return (
<Popover
- openPopover={isOpen}
- setOpenPopover={setIsOpen}
+ openPopover={openPopover}
+ setOpenPopover={setOpenPopover}
side="top"
align="start"
- sideOffset={34}
+ sideOffset={38}
+ onEscapeKeyDown={() => {
+ keyboardDismissRef.current = true;
+ }}
+ onCloseAutoFocus={(e) => {
+ if (!keyboardDismissRef.current) return;
+ keyboardDismissRef.current = false;
+ if (onKeyboardDismissFocusEditor) {
+ e.preventDefault();
+ setTimeout(() => onKeyboardDismissFocusEditor(), 0);
+ }
+ }}
content={
- <EmojiPickerBase.Root
+ <div
className="isolate flex h-[300px] w-fit flex-col"
- onEmojiSelect={({ emoji }) => {
- onSelect(emoji);
- setIsOpen(false);
- }}
+ onKeyDownCapture={handleBackspaceClose}
>
- <EmojiPickerBase.Search className="border-border-default focus:border-border-default z-10 rounded-t-lg border-0 border-b bg-white px-3 py-2.5 text-base outline-none placeholder:text-neutral-400 focus:ring-0 sm:text-sm" />
- <EmojiPickerBase.Viewport className="outline-hidden relative flex-1">
- <EmojiPickerBase.Loading className="absolute inset-0 flex items-center justify-center text-sm text-neutral-400">
- Loading…
- </EmojiPickerBase.Loading>
- <EmojiPickerBase.Empty className="absolute inset-0 flex items-center justify-center text-sm text-neutral-400">
- No emoji found.
- </EmojiPickerBase.Empty>
- <EmojiPickerBase.List
- className="select-none pb-1.5"
- components={{
- CategoryHeader: ({ category, ...props }) => (
- <div
- className="text-content-subtle bg-white px-3 pb-1.5 pt-3 text-xs font-medium"
- {...props}
- >
- {category.label}
- </div>
- ),
- Row: ({ children, ...props }) => (
- <div className="scroll-my-1.5 px-1.5" {...props}>
- {children}
- </div>
- ),
- Emoji: ({ emoji, ...props }) => (
- <button
- className="flex size-7 items-center justify-center rounded-md text-lg data-[active]:bg-neutral-100"
- {...props}
- >
- {emoji.emoji}
- </button>
- ),
- }}
- />
- </EmojiPickerBase.Viewport>
- </EmojiPickerBase.Root>
+ <EmojiPickerBase.Root
+ className="flex min-h-0 flex-1 flex-col"
+ onEmojiSelect={({ emoji }) => {
+ onSelect(emoji);
+ setOpenPopover(false);
+ }}
+ >
+ <EmojiPickerBase.Search className="border-border-default focus:border-border-default z-10 rounded-t-lg border-0 border-b bg-white px-3 py-2.5 text-base outline-none placeholder:text-neutral-400 focus:ring-0 sm:text-sm" />
+ <EmojiPickerBase.Viewport className="outline-hidden relative flex-1">
+ <EmojiPickerBase.Loading className="absolute inset-0 flex items-center justify-center text-sm text-neutral-400">
+ Loading…
+ </EmojiPickerBase.Loading>
+ <EmojiPickerBase.Empty className="absolute inset-0 flex items-center justify-center text-sm text-neutral-400">
+ No emoji found.
+ </EmojiPickerBase.Empty>
+ <EmojiPickerBase.List
+ className="select-none pb-1.5"
+ components={{
+ CategoryHeader: ({ category, ...props }) => (
+ <div
+ className="text-content-subtle bg-white px-3 pb-1.5 pt-3 text-xs font-medium"
+ {...props}
+ >
+ {category.label}
+ </div>
+ ),
+ Row: ({ children, ...props }) => (
+ <div className="scroll-my-1.5 px-1.5" {...props}>
+ {children}
+ </div>
+ ),
+ Emoji: ({ emoji, ...props }) => (
+ <button
+ className="flex size-7 items-center justify-center rounded-md text-lg data-[active]:bg-neutral-100"
+ {...props}
+ >
+ {emoji.emoji}
+ </button>
+ ),
+ }}
+ />
+ </EmojiPickerBase.Viewport>
+ </EmojiPickerBase.Root>
+ </div>
}
>
{children || (
diff --git a/apps/web/ui/shared/message-input.tsx b/apps/web/ui/shared/message-input.tsx
index f4c1e72545..11d196b2a2 100644
--- a/apps/web/ui/shared/message-input.tsx
+++ b/apps/web/ui/shared/message-input.tsx
@@ -8,9 +8,16 @@ import {
RichTextToolbar,
RichTextToolbarButton,
useRichTextContext,
+ useScrollProgress,
} from "@dub/ui";
-import { cn } from "@dub/utils";
-import { useRef, useState } from "react";
+import { cn, nFormatter } from "@dub/utils";
+import {
+ useCallback,
+ useEffect,
+ useRef,
+ useState,
+ type RefObject,
+} from "react";
import { EmojiPicker } from "../shared/emoji-picker";
export function MessageInput({
@@ -32,6 +39,15 @@ export function MessageInput({
}) {
const richTextRef = useRef<{ setContent: (content: any) => void }>(null);
const [typedMessage, setTypedMessage] = useState(defaultValue || "");
+ const [emojiPickerOpen, setEmojiPickerOpenState] = useState(false);
+ const stripColonOnEmojiPickRef = useRef(false);
+
+ const setEmojiPickerOpen = useCallback((open: boolean) => {
+ stripColonOnEmojiPickRef.current = false;
+ setEmojiPickerOpenState(open);
+ }, []);
+
+ const isSendDisabled = typedMessage.trim().length >= MAX_MESSAGE_LENGTH;
const sendMessage = () => {
const message = typedMessage.trim();
@@ -57,26 +73,53 @@ export function MessageInput({
markdown
autoFocus={autoFocus}
placeholder={placeholder}
- editorClassName="block max-h-24 w-full resize-none border-none overflow-auto scrollbar-hide p-3 text-base sm:text-sm"
+ editorClassName="block max-h-[min(40dvh,15rem)] w-full resize-none border-none overflow-auto scrollbar-hide p-3 text-base sm:max-h-64 sm:text-sm md:max-h-80 lg:max-h-96"
initialValue={defaultValue}
onChange={(editor) => setTypedMessage((editor as any).getMarkdown())}
editorProps={{
handleDOMEvents: {
- keydown: (_, e) => {
+ keydown: (view, e) => {
if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
e.stopPropagation();
sendMessage();
return false;
}
+ if (e.key === ":" && !e.metaKey && !e.ctrlKey && !e.altKey) {
+ const { $from } = view.state.selection;
+ const afterHardBreak =
+ $from.nodeBefore?.type.name === "hardBreak";
+ const atBlockStart = $from.parentOffset === 0;
+ const afterWhitespace =
+ $from.parentOffset > 0 &&
+ /\s/.test(
+ $from.parent.textBetween(
+ $from.parentOffset - 1,
+ $from.parentOffset,
+ ),
+ );
+ if (atBlockStart || afterWhitespace || afterHardBreak) {
+ setTimeout(() => {
+ stripColonOnEmojiPickRef.current = true;
+ setEmojiPickerOpenState(true);
+ }, 0);
+ }
+ }
},
},
}}
>
- <RichTextArea />
+ <div className="relative">
+ <RichTextArea />
+ <MessageInputEditorOverflowFades />
+ </div>
- <div className="flex items-center justify-between gap-4 px-3 pb-3">
- <MessageInputToolbar />
+ <div className="flex items-center justify-between gap-4 p-3">
+ <MessageInputToolbar
+ emojiPickerOpen={emojiPickerOpen}
+ setEmojiPickerOpen={setEmojiPickerOpen}
+ stripColonOnEmojiPickRef={stripColonOnEmojiPickRef}
+ />
<div className="flex items-center justify-between gap-2">
{onCancel && (
<Button
@@ -92,16 +135,41 @@ export function MessageInput({
<span className="flex items-center gap-2">
{sendButtonText}
<span className="hidden items-center gap-1 sm:flex">
- <span className="flex size-4 items-center justify-center rounded border border-neutral-700 text-[0.625rem]">
+ <span
+ className={cn(
+ "flex size-4 items-center justify-center rounded border text-[0.625rem]",
+ isSendDisabled
+ ? "border-neutral-300 text-neutral-400"
+ : "border-neutral-700 group-disabled:border-neutral-300 group-disabled:text-neutral-400",
+ )}
+ >
{navigator.platform.startsWith("Mac") ? "⌘" : "^"}
</span>
- <span className="flex size-4 items-center justify-center rounded border border-neutral-700">
- <ArrowTurnLeft className="text-content-inverted size-2.5" />
+ <span
+ className={cn(
+ "flex size-4 items-center justify-center rounded border",
+ isSendDisabled
+ ? "border-neutral-300"
+ : "border-neutral-700 group-disabled:border-neutral-300",
+ )}
+ >
+ <ArrowTurnLeft
+ className={cn(
+ "size-2.5",
+ isSendDisabled
+ ? "text-neutral-400"
+ : "text-content-inverted group-disabled:text-neutral-400",
+ )}
+ />
</span>
</span>
</span>
}
- disabled={typedMessage.trim().length >= MAX_MESSAGE_LENGTH}
+ disabledTooltip={
+ typedMessage.trim().length >= MAX_MESSAGE_LENGTH
+ ? `Message must be less than ${nFormatter(MAX_MESSAGE_LENGTH)} characters`
+ : undefined
+ }
onClick={sendMessage}
className="h-8 w-fit rounded-lg px-4"
/>
@@ -112,16 +180,126 @@ export function MessageInput({
);
}
-function MessageInputToolbar() {
+function MessageInputEditorOverflowFades() {
+ const { editor } = useRichTextContext();
+ const scrollElRef = useRef<HTMLElement | null>(null);
+ const prevScrollTopRef = useRef(0);
+ const [scrollDirection, setScrollDirection] = useState<"down" | "up" | null>(
+ null,
+ );
+
+ const { scrollProgress, updateScrollProgress } = useScrollProgress(
+ scrollElRef as RefObject<HTMLElement>,
+ );
+
+ useEffect(() => {
+ if (!editor) return;
+
+ const root = editor.view.dom as HTMLElement;
+ const scrollEl =
+ (editor.view as { scrollDOM?: HTMLElement }).scrollDOM ?? root;
+
+ scrollElRef.current = scrollEl;
+ updateScrollProgress();
+
+ const onScroll = () => {
+ setScrollDirection(
+ scrollEl.scrollTop > prevScrollTopRef.current ? "down" : "up",
+ );
+ prevScrollTopRef.current = scrollEl.scrollTop;
+ updateScrollProgress();
+ };
+
+ scrollEl.addEventListener("scroll", onScroll, { passive: true });
+
+ const mutationObserver = new MutationObserver(updateScrollProgress);
+ mutationObserver.observe(root, {
+ subtree: true,
+ childList: true,
+ characterData: true,
+ });
+
+ return () => {
+ scrollEl.removeEventListener("scroll", onScroll);
+ mutationObserver.disconnect();
+ scrollElRef.current = null;
+ };
+ }, [editor, updateScrollProgress]);
+
+ const epsilon = 0.02;
+ const hasOverflow = scrollProgress < 1 - epsilon || scrollProgress > epsilon;
+ let showTopFade = false;
+ let showBottomFade = false;
+
+ if (hasOverflow) {
+ if (scrollProgress <= epsilon) {
+ showBottomFade = true;
+ } else if (scrollProgress >= 1 - epsilon) {
+ showTopFade = true;
+ } else {
+ showTopFade = scrollDirection === "down";
+ showBottomFade = scrollDirection === "up";
+ }
+ }
+
+ return (
+ <>
+ <div
+ aria-hidden
+ className={cn(
+ "from-bg-default pointer-events-none absolute inset-x-0 top-0 z-[1] h-[20px] bg-gradient-to-b to-transparent transition-opacity duration-150 ease-out",
+ showTopFade ? "opacity-100" : "opacity-0",
+ )}
+ />
+ <div
+ aria-hidden
+ className={cn(
+ "from-bg-default pointer-events-none absolute inset-x-0 bottom-0 z-[1] h-[20px] bg-gradient-to-t to-transparent transition-opacity duration-150 ease-out",
+ showBottomFade ? "opacity-100" : "opacity-0",
+ )}
+ />
+ </>
+ );
+}
+
+function MessageInputToolbar({
+ emojiPickerOpen,
+ setEmojiPickerOpen,
+ stripColonOnEmojiPickRef,
+}: {
+ emojiPickerOpen: boolean;
+ setEmojiPickerOpen: (open: boolean) => void;
+ stripColonOnEmojiPickRef: { current: boolean };
+}) {
const { editor } = useRichTextContext();
return (
<RichTextToolbar
toolsStart={
<EmojiPicker
+ openPopover={emojiPickerOpen}
+ setOpenPopover={setEmojiPickerOpen}
+ onKeyboardDismissFocusEditor={() => editor?.commands.focus()}
onSelect={(emoji) => {
if (!editor) return;
- editor.chain().focus().insertContent(emoji).run();
+ const stripColon = stripColonOnEmojiPickRef.current;
+ stripColonOnEmojiPickRef.current = false;
+
+ const { from } = editor.state.selection;
+ if (
+ stripColon &&
+ from > 0 &&
+ editor.state.doc.textBetween(from - 1, from) === ":"
+ ) {
+ editor
+ .chain()
+ .deleteRange({ from: from - 1, to: from })
+ .insertContent(emoji)
+ .run();
+ } else {
+ editor.chain().insertContent(emoji).run();
+ }
+ setTimeout(() => editor.commands.focus(), 0);
}}
>
<RichTextToolbarButton icon={FaceSmile} label="Emoji" />
diff --git a/packages/ui/src/popover.tsx b/packages/ui/src/popover.tsx
index 7c1a1d7f92..6596602b29 100644
--- a/packages/ui/src/popover.tsx
+++ b/packages/ui/src/popover.tsx
@@ -16,6 +16,7 @@ export type PopoverProps = PropsWithChildren<{
forceDropdown?: boolean;
popoverContentClassName?: string;
onOpenAutoFocus?: PopoverPrimitive.PopoverContentProps["onOpenAutoFocus"];
+ onCloseAutoFocus?: PopoverPrimitive.PopoverContentProps["onCloseAutoFocus"];
collisionBoundary?: Element | Element[];
sticky?: "partial" | "always";
onEscapeKeyDown?: (event: KeyboardEvent) => void;
@@ -34,6 +35,7 @@ export function Popover({
forceDropdown,
popoverContentClassName,
onOpenAutoFocus,
+ onCloseAutoFocus,
collisionBoundary,
sticky,
onEscapeKeyDown,
@@ -93,6 +95,7 @@ export function Popover({
sticky={sticky}
collisionBoundary={collisionBoundary}
onOpenAutoFocus={onOpenAutoFocus}
+ onCloseAutoFocus={onCloseAutoFocus}
onEscapeKeyDown={onEscapeKeyDown}
onWheel={onWheel}
>