fixes

Author: heymynameisrob

src/components/emoji-picker.tsx

@@ -9,6 +9,7 @@ import { Toggle } from "@/primitives/toggle";
 import { useDoc } from "@/queries/docs";
 import { cn } from "@/lib/utils";
 import { REVALIDATE_DAY } from "@/lib/fetch";
+import { Button } from "@/primitives/button";
 
 type EmojiPickerProps = {
   docId: string;
@@ -34,33 +35,28 @@ export const EmojiPicker = ({
         .json();
       return res;
     },
-    persister: undefined,
     staleTime: REVALIDATE_DAY,
   });
 
   return (
     <Popover open={isOpen} onOpenChange={setIsOpen}>
       <PopoverTrigger asChild>
-        <Toggle
-          pressed={isOpen}
-          onPressedChange={setIsOpen}
-          onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
-            e.preventDefault();
-            e.stopPropagation();
-            setIsOpen(!isOpen);
-          }}
-          data-emoji
+        <Button
+          size="icon"
+          variant="ghost"
+          onClick={() => setIsOpen(!isOpen)}
           className={cn(
             "h-9 w-9 rounded-lg bg-gray-3 dark:bg-gray-2 p-px !text-base",
             disabled && "pointer-events-none",
             className,
           )}
         >
           {emoji || "📝"}
-        </Toggle>
+        </Button>
       </PopoverTrigger>
       <PopoverContent
         align="start"
+        side="bottom"
         avoidCollisions={true}
         className="w-[350px] overflow-hidden border-0 p-0"
       >

src/components/tiptap/tiptap-editor.tsx

@@ -121,7 +121,7 @@ export const TipTapEditor = ({
         }
       });
 
-      if (mentionNodes.length === 0) return;
+      console.log(prevMentionNodes, mentionNodes);
 
       previousState.current = editor.state;
 
@@ -131,7 +131,7 @@ export const TipTapEditor = ({
         }
       });
     },
-    [removeBacklink, doc.id],
+    [removeBacklink],
   );
 
   /**

src/pages/login.tsx

@@ -28,7 +28,7 @@ export async function getServerSideProps(ctx: GetServerSidePropsContext) {
     return {
       redirect: {
         permanent: false,
-        destination: isOnboarded ? "/app" : "/onboarding",
+        destination: isOnboarded ? "/" : "/onboarding",
       },
     };
 

src/primitives/button.tsx

@@ -40,7 +40,10 @@ export interface ButtonProps
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, title, asChild = false, ...props }, ref) => {
+  (
+    { className, variant, size, onClick, title, asChild = false, ...props },
+    ref,
+  ) => {
     const Comp = asChild ? Slot : "button";
 
     if (title) {
@@ -49,7 +52,9 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
           <Comp
             className={cn(buttonVariants({ variant, size, className }))}
             ref={ref}
+            onMouseDown={onClick}
             {...props}
+            onClick={undefined}
           />
         </Tooltip>
       );
@@ -59,7 +64,9 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       <Comp
         className={cn(buttonVariants({ variant, size, className }))}
         ref={ref}
+        onMouseDown={onClick}
         {...props}
+        onClick={undefined}
       />
     );
   },

src/primitives/toggle.tsx

@@ -33,15 +33,26 @@ const Toggle = React.forwardRef<
   React.ElementRef<typeof TogglePrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof TogglePrimitive.Root> &
     VariantProps<typeof toggleVariants>
->(({ className, variant, title, size, ...props }, ref) => (
-  <Tooltip content={title}>
+>(({ className, variant, title, size, ...props }, ref) => {
+  if (title) {
+    return (
+      <Tooltip content={title}>
+        <TogglePrimitive.Root
+          ref={ref}
+          className={cn(toggleVariants({ variant, size, className }))}
+          {...props}
+        />
+      </Tooltip>
+    );
+  }
+  return (
     <TogglePrimitive.Root
       ref={ref}
       className={cn(toggleVariants({ variant, size, className }))}
       {...props}
     />
-  </Tooltip>
-));
+  );
+});
 
 Toggle.displayName = TogglePrimitive.Root.displayName;
 

src/primitives/tooltip.tsx

@@ -25,7 +25,7 @@ export function Tooltip({
   ...props
 }: TooltipProps) {
   return (
-    <TooltipPrimitive.Root open={open} onOpenChange={onOpenChange}>
+    <TooltipPrimitive.Root>
       <TooltipPrimitive.Trigger asChild>{children}</TooltipPrimitive.Trigger>
       <TooltipPrimitive.Content
         side={side}