chore: update and fix dependencies

This commit is contained in:
2024-01-17 12:39:04 +07:00
parent 0b745cb40e
commit c0305db5fc
24 changed files with 149 additions and 152 deletions

View File

@@ -1,7 +1,7 @@
import { cn } from "@lume/utils";
import { Resizable } from "re-resizable";
import { ReactNode, useState } from "react";
import { MemoryRouter, UNSAFE_LocationContext } from "react-router-dom";
import { twMerge } from "tailwind-merge";
export function ColumnRoot({
children,
@@ -22,7 +22,7 @@ export function ColumnRoot({
}}
minWidth={420}
maxWidth={600}
className={twMerge(
className={cn(
"relative flex flex-col border-r-2 border-neutral-50 hover:border-neutral-100 dark:border-neutral-950 dark:hover:border-neutral-900",
className,
)}

View File

@@ -1,12 +1,11 @@
import { LoaderIcon, ReplyIcon, RepostIcon } from "@lume/icons";
import { editorAtom, editorValueAtom } from "@lume/utils";
import { cn, editorAtom, editorValueAtom } from "@lume/utils";
import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
import * as Tooltip from "@radix-ui/react-tooltip";
import { useSetAtom } from "jotai";
import { nip19 } from "nostr-tools";
import { useState } from "react";
import { toast } from "sonner";
import { twMerge } from "tailwind-merge";
import { useNoteContext } from "../provider";
export function NoteRepost() {
@@ -71,7 +70,7 @@ export function NoteRepost() {
<LoaderIcon className="size-4 animate-spin" />
) : (
<RepostIcon
className={twMerge(
className={cn(
"size-5 group-hover:text-blue-600",
isRepost ? "text-blue-500" : "",
)}

View File

@@ -1,7 +1,6 @@
import { PinIcon } from "@lume/icons";
import { COL_TYPES } from "@lume/utils";
import { COL_TYPES, cn } from "@lume/utils";
import { Link } from "react-router-dom";
import { twMerge } from "tailwind-merge";
import { Note } from ".";
import { useArk } from "../../hooks/useArk";
import { useColumnContext } from "../column/provider";
@@ -24,7 +23,7 @@ export function NoteThread({
if (!thread) return null;
return (
<div className={twMerge("w-full px-3", className)}>
<div className={cn("w-full px-3", className)}>
<div className="flex flex-col w-full gap-3 p-3 rounded-lg h-min bg-neutral-100 dark:bg-neutral-900">
{thread.rootEventId ? (
<Note.Child eventId={thread.rootEventId} isRoot />