⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
wip
daniel31x13f8c96b493cfb
diff --git a/components/CopyButton.tsx b/components/CopyButton.tsxindex b9494758..cf1ad50b 100644--- a/components/CopyButton.tsx+++ b/components/CopyButton.tsx@@ -20,12 +20,43 @@ const CopyButton: React.FC<Props> = ({ text }) => {};return (- <div- className={`text-xl text-neutral btn btn-sm btn-square btn-ghost ${- copied ? "bi-check2 text-success" : "bi-copy"- }`}+ <button+ type="button"+ className="text-xl text-neutral btn btn-sm btn-square btn-ghost"onClick={handleCopy}- ></div>+ >+ {copied ? (+ <svg+ xmlns="http://www.w3.org/2000/svg"+ width="16"+ height="16"+ fill="currentColor"+ className="h-5 w-5 text-success"+ viewBox="0 0 16 16"+ >+ <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0" />+ </svg>+ ) : (+ <svg+ xmlns="http://www.w3.org/2000/svg"+ width="16"+ height="16"+ fill="currentColor"+ className="h-5 w-5"+ viewBox="0 0 16 16"+ >+ <path+ fillRule="evenodd"+ d="M4 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v8a2+ 2 0 0 1-2 2H6a2 2 0 0 1-2-2zm2-1a1 1 0 0 0-1+ 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V2a1 1 0+ 0 0-1-1zM2 5a1 1 0 0 0-1 1v8a1 1 0 0+ 0 1 1h8a1 1 0 0 0 1-1v-1h1v1a2 2 0 0 1-2+ 2H2a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h1v1z"+ />+ </svg>+ )}+ </button>);};diff --git a/components/Drawer.tsx b/components/Drawer.tsxdeleted file mode 100644index 7400e44f..00000000--- a/components/Drawer.tsx+++ /dev/null@@ -1,81 +0,0 @@-import React, { ReactNode, useEffect } from "react";-import { Drawer as D } from "vaul";-import clsx from "clsx";--type Props = {- toggleDrawer: Function;- children: ReactNode;- className?: string;- dismissible?: boolean;-};--export default function Drawer({- toggleDrawer,- className,- children,- dismissible = true,-}: Props) {- const [drawerIsOpen, setDrawerIsOpen] = React.useState(true);-- useEffect(() => {- if (window.innerWidth >= 640) {- document.body.style.overflow = "hidden";- document.body.style.position = "relative";- return () => {- document.body.style.overflow = "auto";- document.body.style.position = "";- };- }- }, []);-- if (window.innerWidth < 640) {- return (- <D.Root- open={drawerIsOpen}- onClose={() => dismissible && setDrawerIsOpen(false)}- onAnimationEnd={(isOpen) => !isOpen && toggleDrawer()}- dismissible={dismissible}- >- <D.Portal>- <D.Overlay className="fixed inset-0 bg-black/40" />- <D.Content className="flex flex-col rounded-t-2xl mt-24 fixed bottom-0 left-0 right-0 z-30 h-[90%] !select-auto focus:outline-none">- <div- className={clsx(- "p-4 bg-base-100 rounded-t-2xl flex-1 border-neutral-content border-t overflow-y-auto",- className- )}- data-testid="mobile-modal-container"- >- <div data-testid="mobile-modal-slider" />- {children}- </div>- </D.Content>- </D.Portal>- </D.Root>- );- } else {- return (- <D.Root- open={drawerIsOpen}- onClose={() => dismissible && setDrawerIsOpen(false)}- onAnimationEnd={(isOpen) => !isOpen && toggleDrawer()}- dismissible={dismissible}- direction="right"- >- <D.Portal>- <D.Overlay className="fixed inset-0 bg-black/10 z-20" />- <D.Content className="bg-white flex flex-col h-full w-2/5 min-w-[30rem] mt-24 fixed bottom-0 right-0 z-40 !select-auto focus:outline-none">- <div- className={clsx(- "p-4 bg-base-100 flex-1 border-neutral-content border-l overflow-y-auto",- className- )}- >- {children}- </div>- </D.Content>- </D.Portal>- </D.Root>- );- }-}diff --git a/components/Editor/MenuBar.tsx b/components/Editor/MenuBar.tsxnew file mode 100644index 00000000..ed86a407--- /dev/null+++ b/components/Editor/MenuBar.tsx@@ -0,0 +1,131 @@+import { Editor } from "@tiptap/react";+import IconButton from "./MenuIconButton";++const MenuBar = ({ editor }: { editor: Editor | null }) => {+ if (!editor) {+ return null;+ }++ return (+ <div className="flex overflow-x-auto hide-scrollbar gap-1 mb-2">+ <IconButton+ onClick={() => editor.chain().focus().toggleHeading({ level: 1 }).run()}+ isActive={editor.isActive("heading", { level: 1 })}+ icon="bi bi-type-h1"+ title="Heading 1"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleHeading({ level: 2 }).run()}+ isActive={editor.isActive("heading", { level: 2 })}+ icon="bi bi-type-h2"+ title="Heading 2"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleHeading({ level: 3 }).run()}+ isActive={editor.isActive("heading", { level: 3 })}+ icon="bi bi-type-h3"+ title="Heading 3"+ />+ <IconButton+ onClick={() => editor.chain().focus().setParagraph().run()}+ isActive={editor.isActive("paragraph")}+ icon="bi bi-paragraph"+ title="Paragraph"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleBold().run()}+ isActive={editor.isActive("bold")}+ icon="bi bi-type-bold"+ title="Bold"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleItalic().run()}+ isActive={editor.isActive("italic")}+ icon="bi bi-type-italic"+ title="Italic"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleStrike().run()}+ isActive={editor.isActive("strike")}+ icon="bi bi-type-strikethrough"+ title="Strike"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleHighlight().run()}+ isActive={editor.isActive("highlight")}+ icon="bi bi-highlighter"+ title="Highlight"+ />+ <IconButton+ onClick={() => editor.chain().focus().setTextAlign("left").run()}+ isActive={editor.isActive({ textAlign: "left" })}+ icon="bi bi-text-left"+ title="Align Left"+ />+ <IconButton+ onClick={() => editor.chain().focus().setTextAlign("center").run()}+ isActive={editor.isActive({ textAlign: "center" })}+ icon="bi bi-text-center"+ title="Align Center"+ />+ <IconButton+ onClick={() => editor.chain().focus().setTextAlign("right").run()}+ isActive={editor.isActive({ textAlign: "right" })}+ icon="bi bi-text-right"+ title="Align Right"+ />+ <IconButton+ onClick={() => editor.chain().focus().setTextAlign("justify").run()}+ isActive={editor.isActive({ textAlign: "justify" })}+ icon="bi bi-justify"+ title="Align Justify"+ />+ <IconButton+ onClick={() => editor.chain().focus().toggleBulletList().run()}+ isActive={editor.isActive({ textAlign: "justify" })}+ icon="bi bi-list-ul"+ title="Bullet List"+ />+ <IconButton+ onClick={() => {+ editor+ .chain()+ .focus()+ .insertContent({+ type: "taskList",+ content: [+ {+ type: "taskItem",+ attrs: { checked: false },+ content: [+ {+ type: "paragraph",+ content: [{ type: "text", text: " " }],+ },+ ],+ },+ ],+ })+ .run();+ }}+ isActive={false} // Task insertion isn't a toggle action+ icon="bi bi-check2-square" // Choose an appropriate Bootstrap icon+ title="Insert Task"+ />++ <IconButton+ onClick={() => {+ const url = window.prompt("Enter image URL");+ if (url) {+ editor.chain().focus().setImage({ src: url }).run();+ }+ }}+ isActive={false}+ icon="bi bi-image"+ title="Insert Image"+ />+ </div>+ );+};++export default MenuBar;diff --git a/components/Editor/MenuIconButton.tsx b/components/Editor/MenuIconButton.tsxnew file mode 100644index 00000000..42bf6295--- /dev/null+++ b/components/Editor/MenuIconButton.tsx@@ -0,0 +1,31 @@+import clsx from "clsx";++type MenuIconButtonProps = {+ onClick: () => void;+ isActive: boolean;+ icon: string;+ title?: string;+};++const MenuIconButton: React.FC<MenuIconButtonProps> = ({+ onClick,+ isActive,+ icon,+ title,+}) => {+ return (+ <button+ onClick={onClick}+ className={clsx(+ isActive ? "is-active btn-primary" : "btn-ghost",+ "btn btn-square btn-sm duration-100"+ )}+ title={title}+ type="button"+ >+ <i className={icon} />+ </button>+ );+};++export default MenuIconButton;diff --git a/components/IconPopover.tsx b/components/IconPopover.tsxindex 6b13d211..553ead4a 100644--- a/components/IconPopover.tsx+++ b/components/IconPopover.tsx@@ -1,10 +1,12 @@import React, { useState } from "react";+import ReactDOM from "react-dom";import TextInput from "./TextInput";import Popover from "./Popover";import { HexColorPicker } from "react-colorful";import { useTranslation } from "next-i18next";import IconGrid from "./IconGrid";import clsx from "clsx";+import useWindowDimensions from "@/hooks/useWindowDimensions";type Props = {alignment?: string;@@ -17,6 +19,8 @@ type Props = {reset: Function;className?: string;onClose: Function;+ top?: number;+ left?: number;};const IconPopover = ({@@ -30,17 +34,21 @@ const IconPopover = ({reset,className,onClose,+ top,+ left,}: Props) => {const { t } = useTranslation();const [query, setQuery] = useState("");- return (+ const content = (<PopoveronClose={() => onClose()}className={clsx(className,- "fade-in bg-base-200 border border-neutral-content p-3 w-[22.5rem] rounded-lg shadow-md"+ "fade-in bg-base-200 border border-neutral-content p-3 w-[22.5rem] rounded-lg shadow-md pointer-events-auto",+ top !== undefined && left !== undefined && `z-[1000]`)}+ style={{ top: top, left: left }}><div className="flex flex-col gap-3 w-full h-full"><TextInput@@ -142,6 +150,12 @@ const IconPopover = ({</div></Popover>);++ if (top !== undefined && left !== undefined) {+ return ReactDOM.createPortal(content, document.body);+ }++ return content;};export default IconPopover;diff --git a/components/LinkDetails.tsx b/components/LinkDetails.tsxindex 478ab755..4c080448 100644--- a/components/LinkDetails.tsx+++ b/components/LinkDetails.tsx@@ -1,17 +1,12 @@-import React, { useEffect, useState } from "react";+import React, { useEffect, useRef, useState } from "react";import {LinkIncludingShortenedCollectionAndTags,ArchivedFormat,} from "@/types/global";import Link from "next/link";-import {- atLeastOneFormatAvailable,- formatAvailable,-} from "@/lib/shared/formatStats";-import PreservedFormatRow from "@/components/PreserverdFormatRow";+import { formatAvailable } from "@/lib/shared/formatStats";import getPublicUserData from "@/lib/client/getPublicUserData";import { useTranslation } from "next-i18next";-import { BeatLoader } from "react-spinners";import { useUser } from "@/hooks/store/user";import { useGetLink, useUpdateLink, useUpdateFile } from "@/hooks/store/links";import LinkIcon from "./LinkViews/LinkComponents/LinkIcon";@@ -29,6 +24,8 @@ import IconPopover from "./IconPopover";import TextInput from "./TextInput";import usePermissions from "@/hooks/usePermissions";import oklchVariableToHex from "@/lib/client/oklchVariableToHex";+import Preservation from "./Preservation";+import useWindowDimensions from "@/hooks/useWindowDimensions";type Props = {className?: string;@@ -56,6 +53,14 @@ export default function LinkDetails({const permissions = usePermissions(link.collection.id as number);+ const { width } = useWindowDimensions();++ const iconTriggerRef = useRef<HTMLDivElement>(null);+ const [iconPopoverPosition, setIconPopoverPosition] = useState<{+ top: number;+ left: number;+ } | null>(null);+const { t } = useTranslation();const getLink = useGetLink();const { data: user = {} } = useUser();@@ -181,490 +186,429 @@ export default function LinkDetails({const [iconPopover, setIconPopover] = useState(false);return (- <div className={clsx(className)} data-vaul-no-drag>+ <div className={clsx(className)}><divclassName={clsx(- standalone && "sm:border sm:border-neutral-content sm:rounded-2xl p-5"+ standalone &&+ "sm:border sm:border-neutral-content sm:rounded-2xl sm:overflow-auto",+ width >= 640 && "flex h-[80vh]")}>- <div- className={clsx(- "overflow-hidden select-none relative group h-40 opacity-80",- standalone- ? "sm:max-w-xl -mx-5 -mt-5 sm:rounded-t-2xl"- : "-mx-4 -mt-4"- )}- >- {formatAvailable(link, "preview") ? (- <Image- src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}- width={1280}- height={720}- alt=""- className="object-cover scale-105 object-center h-full"- style={{- filter: "blur(1px)",- }}- onError={(e) => {- const target = e.target as HTMLElement;- target.style.display = "none";- }}- />- ) : link.preview === "unavailable" ? (- <div className="bg-gray-50 duration-100 h-40"></div>- ) : (- <div className="duration-100 h-40 skeleton rounded-none"></div>- )}-- {!standalone &&- (permissions === true || permissions?.canUpdate) &&- !isPublicRoute && (- <div className="absolute top-0 bottom-0 left-0 right-0 opacity-0 group-hover:opacity-100 duration-100 flex justify-end items-end">- <label className="btn btn-xs mb-2 mr-3 opacity-50 hover:opacity-100">- {t("upload_preview_image")}- <input- type="file"- accept="image/jpg, image/jpeg, image/png"- onChange={async (e) => {- const file = e.target.files?.[0];- if (!file) return;-- const load = toast.loading(t("updating"));-- await updateFile.mutateAsync(- {- linkId: link.id as number,- file,- isPreview: true,- },- {- onSettled: (data, error) => {- toast.dismiss(load);-- if (error) {- toast.error(error.message);- } else {- toast.success(t("updated"));- setLink({- updatedAt: data.response.updatedAt,- ...link,- });- }- },- }- );- }}- className="hidden"- />- </label>- </div>+ {width >= 640 && (+ <div className="w-1/2 lg:w-2/3 overflow-y-auto">+ {link.id && <Preservation link={link} standalone={standalone} />}+ </div>+ )}+ <div className={clsx(width >= 640 && "w-1/2 lg:w-1/3 overflow-y-auto")}>+ <div+ className={clsx(+ "overflow-hidden select-none relative group/banner h-40 opacity-80 rounded-t-2xl sm:rounded-tr-2xl sm:rounded-tl-none",+ width < 640 && "-mt-5")}- </div>-- {!standalone &&- (permissions === true || permissions?.canUpdate) &&- !isPublicRoute ? (- <div className="-mt-14 ml-8 relative w-fit pb-2">- <div className="tooltip tooltip-bottom" data-tip={t("change_icon")}>- <LinkIcon- link={link}- className="hover:bg-opacity-70 duration-100 cursor-pointer"- onClick={() => setIconPopover(true)}- />- </div>- {iconPopover && (- <IconPopover- color={link.color || oklchVariableToHex("--p")}- setColor={(color: string) => setLink({ ...link, color })}- weight={(link.iconWeight || "regular") as IconWeight}- setWeight={(iconWeight: string) =>- setLink({ ...link, iconWeight })- }- iconName={link.icon as string}- setIconName={(icon: string) => setLink({ ...link, icon })}- reset={() =>- setLink({- ...link,- color: "",- icon: "",- iconWeight: "",- })- }- className="top-12"- onClose={() => {- setIconPopover(false);- submit();+ >+ {formatAvailable(link, "preview") ? (+ <Image+ src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}+ width={1280}+ height={720}+ alt=""+ className="object-cover object-center h-full"+ style={{+ filter: "blur(1px)",+ }}+ onError={(e) => {+ const target = e.target as HTMLElement;+ target.style.display = "none";}}/>+ ) : link.preview === "unavailable" ? (+ <div className="bg-gray-50 duration-100 h-40"></div>+ ) : (+ <div className="duration-100 h-40 skeleton rounded-none"></div>)}++ {!standalone &&+ (permissions === true || permissions?.canUpdate) &&+ !isPublicRoute && (+ <div+ className={clsx(+ "absolute top-0 bottom-0 left-0 right-0 opacity-0 group-hover/banner:opacity-100 duration-100 flex justify-end items-end"+ )}+ >+ <label className="btn btn-xs mb-2 mr-3 opacity-50 hover:opacity-100">+ {t("upload_banner")}+ <input+ type="file"+ accept="image/jpg, image/jpeg, image/png"+ onChange={async (e) => {+ const file = e.target.files?.[0];+ if (!file) return;++ const load = toast.loading(t("updating"));++ await updateFile.mutateAsync(+ {+ linkId: link.id as number,+ file,+ isPreview: true,+ },+ {+ onSettled: (data, error) => {+ toast.dismiss(load);++ if (error) {+ toast.error(error.message);+ } else {+ toast.success(t("updated"));+ setLink({+ updatedAt: data.response.updatedAt,+ ...link,+ });+ }+ },+ }+ );+ }}+ className="hidden"+ />+ </label>+ </div>+ )}</div>- ) : (- <div className="-mt-14 ml-8 relative w-fit pb-2">- <LinkIcon link={link} onClick={() => setIconPopover(true)} />- </div>- )}- <div className="max-w-xl sm:px-8 p-5 pb-8 pt-2">- {mode === "view" && (- <div className="text-xl mt-2 pr-7">- <p- className={clsx("relative w-fit", !link.name && "text-neutral")}+ {!standalone &&+ (permissions === true || permissions?.canUpdate) &&+ !isPublicRoute ? (+ <div className="-mt-14 ml-8 relative w-fit pb-2">+ <div+ className="tooltip tooltip-bottom"+ ref={iconTriggerRef}+ data-tip={t("change_icon")}>- {unescapeString(link.name) || t("untitled")}- </p>- </div>- )}-- {mode === "edit" && (- <>- <br />-- <div>- <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">- {t("name")}- </p>- <TextInput- value={link.name}- onChange={(e) => setLink({ ...link, name: e.target.value })}- placeholder={t("placeholder_example_link")}- className="bg-base-200"+ <LinkIcon+ link={link}+ className="hover:bg-opacity-70 duration-100 cursor-pointer"+ onClick={() => {+ if (iconTriggerRef.current) {+ const rect =+ iconTriggerRef.current.getBoundingClientRect();+ if (width >= 640) {+ setIconPopoverPosition({+ top: rect.bottom + window.scrollY,+ left: rect.left + rect.width / 2 + window.scrollX, // center of LinkIcon+ });+ } else {+ setIconPopoverPosition({+ top: rect.bottom + window.scrollY,+ left: rect.left + window.scrollX,+ });+ }+ }+ setIconPopover(true);+ }}/></div>- </>- )}-- {link.url && mode === "view" ? (- <>- <br />-- <p className="text-sm mb-2 text-neutral">{t("link")}</p>-- <div className="relative">- <div className="rounded-md p-2 bg-base-200 hide-scrollbar overflow-x-auto whitespace-nowrap flex justify-between items-center gap-2 pr-14">- <Link href={link.url} title={link.url} target="_blank">- {link.url}- </Link>- <div className="absolute right-0 px-2 bg-base-200">- <CopyButton text={link.url} />- </div>- </div>- </div>- </>- ) : activeLink.url ? (- <>- <br />-- <div>- <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">- {t("link")}- </p>- <TextInput- value={link.url || ""}- onChange={(e) => setLink({ ...link, url: e.target.value })}- placeholder={t("placeholder_example_link")}- className="bg-base-200"+ {iconPopover && iconPopoverPosition && (+ <IconPopover+ color={link.color || oklchVariableToHex("--p")}+ setColor={(color: string) => setLink({ ...link, color })}+ weight={(link.iconWeight || "regular") as IconWeight}+ setWeight={(iconWeight: string) =>+ setLink({ ...link, iconWeight })+ }+ iconName={link.icon as string}+ setIconName={(icon: string) => setLink({ ...link, icon })}+ reset={() =>+ setLink({+ ...link,+ color: "",+ icon: "",+ iconWeight: "",+ })+ }+ className={clsx(width >= 640 && "-translate-x-1/2")}+ top={width >= 640 ? iconPopoverPosition.top : undefined}+ left={width >= 640 ? iconPopoverPosition.left : undefined}+ onClose={() => {+ setIconPopover(false);+ submit();+ }}/>- </div>- </>- ) : undefined}-- <br />-- <div className="relative">- <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">- {t("collection")}- </p>+ )}+ </div>+ ) : (+ <div className="-mt-14 ml-8 relative w-fit pb-2">+ <LinkIcon link={link} onClick={() => setIconPopover(true)} />+ </div>+ )}- {mode === "view" ? (- <div className="relative">- <Link- href={- isPublicRoute- ? `/public/collections/${link.collection.id}`- : `/collections/${link.collection.id}`- }- className="rounded-md p-2 bg-base-200 border border-base-200 hide-scrollbar overflow-x-auto whitespace-nowrap flex justify-between items-center gap-2 pr-14"+ <div className={clsx("pb-8 pt-2 p-3", width < 640 && "sm:px-8")}>+ {mode === "view" && (+ <div className="text-xl mt-2 pr-7">+ <p+ className={clsx(+ "relative w-fit",+ !link.name && "text-neutral"+ )}>- <p>{link.collection.name}</p>- <div className="absolute right-0 px-2 bg-base-200">- {link.collection.icon ? (- <Icon- icon={link.collection.icon}- size={30}- weight={- (link.collection.iconWeight ||- "regular") as IconWeight- }- color={link.collection.color}- />- ) : (- <i- className="bi-folder-fill text-2xl"- style={{ color: link.collection.color }}- ></i>- )}- </div>- </Link>+ {unescapeString(link.name) || t("untitled")}+ </p></div>- ) : (- <CollectionSelection- onChange={setCollection}- defaultValue={- link.collection.id- ? { value: link.collection.id, label: link.collection.name }- : { value: null as unknown as number, label: "Unorganized" }- }- creatable={false}- />)}- </div>- <br />+ {mode === "view" && width < 640 && (+ <div>+ <br />- <div className="relative">- <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">- {t("tags")}- </p>+ <div className="flex gap-1 items-center mb-2">+ <p+ className="text-sm text-neutral"+ title={t("available_formats")}+ >+ {link.url ? t("preserved_formats") : t("content")}+ </p>- {mode === "view" ? (- <div className="flex gap-2 flex-wrap rounded-md p-2 bg-base-200 border border-base-200 w-full text-xs">- {link.tags && link.tags[0] ? (- link.tags.map((tag) =>- isPublicRoute ? (+ {onUpdateArchive &&+ link.type === "url" &&+ (permissions === true || permissions?.canUpdate) &&+ !isPublicRoute && (<div- key={tag.id}- className="bg-base-200 p-1 hover:bg-neutral-content rounded-md duration-100"+ className="tooltip tooltip-bottom"+ data-tip={t("refresh_preserved_formats")}>- {tag.name}+ <button+ className="btn btn-xs btn-ghost btn-square text-neutral"+ onClick={() => onUpdateArchive()}+ >+ <i className="bi-arrow-clockwise text-sm" />+ </button></div>- ) : (- <Link- href={"/tags/" + tag.id}- key={tag.id}- className="bg-base-200 p-1 hover:bg-neutral-content btn btn-xs btn-ghost rounded-md"- >- {tag.name}- </Link>- )- )- ) : (- <div className="text-neutral text-base">{t("no_tags")}</div>- )}+ )}+ </div>++ {link.id && <Preservation link={link} standalone />}</div>- ) : (- <TagSelection- onChange={setTags}- defaultValue={link.tags.map((e) => ({- label: e.name,- value: e.id,- }))}- />)}- </div>-- <br />-- <div className="relative">- <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">- {t("description")}- </p>- {mode === "view" ? (- <div className="rounded-md p-2 bg-base-200 hyphens-auto">- {link.description ? (- <p>{link.description}</p>- ) : (- <p className="text-neutral">{t("no_description_provided")}</p>- )}- </div>- ) : (- <textarea- value={unescapeString(link.description) as string}- onChange={(e) =>- setLink({ ...link, description: e.target.value })- }- placeholder={t("link_description_placeholder")}- className="resize-none w-full rounded-md p-2 h-32 border-neutral-content bg-base-200 focus:border-primary border-solid border outline-none duration-100"- />+ {mode === "edit" && (+ <>+ <br />++ <div>+ <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">+ {t("name")}+ </p>+ <TextInput+ value={link.name}+ onChange={(e) => setLink({ ...link, name: e.target.value })}+ placeholder={t("placeholder_example_link")}+ className="bg-base-200"+ />+ </div>+ </>)}- </div>- {mode === "view" && (- <div>- <br />+ {link.url && mode === "view" ? (+ <>+ <br />- <div className="flex gap-1 items-center mb-2">- <p- className="text-sm text-neutral"- title={t("available_formats")}- >- {link.url ? t("preserved_formats") : t("file")}- </p>+ <p className="text-sm mb-2 text-neutral">{t("link")}</p>- {onUpdateArchive &&- link.type === "url" &&- (permissions === true || permissions?.canUpdate) &&- !isPublicRoute && (- <div- className="tooltip tooltip-bottom"- data-tip={t("refresh_preserved_formats")}- >- <button- className="btn btn-xs btn-ghost btn-square text-neutral"- onClick={() => onUpdateArchive()}- >- <i className="bi-arrow-clockwise text-sm" />- </button>+ <div className="relative">+ <div className="rounded-md p-2 bg-base-200 hide-scrollbar overflow-x-auto whitespace-nowrap flex justify-between items-center gap-2 pr-14">+ <Link href={link.url} title={link.url} target="_blank">+ {link.url}+ </Link>+ <div className="absolute right-0 px-2 bg-base-200">+ <CopyButton text={link.url} /></div>- )}- </div>-- <div className={`flex flex-col rounded-md p-3 bg-base-200`}>- {formatAvailable(link, "monolith") ? (- <>- <PreservedFormatRow- name={t("webpage")}- icon={"bi-filetype-html"}- format={ArchivedFormat.monolith}- link={link}- downloadable={true}- />- <hr className="m-3 border-t border-neutral-content" />- </>- ) : undefined}-- {formatAvailable(link, "image") ? (- <>- <PreservedFormatRow- name={t("screenshot")}- icon={"bi-file-earmark-image"}- format={- link?.image?.endsWith("png")- ? ArchivedFormat.png- : ArchivedFormat.jpeg- }- link={link}- downloadable={true}- />- <hr className="m-3 border-t border-neutral-content" />- </>- ) : undefined}-- {formatAvailable(link, "pdf") ? (- <>- <PreservedFormatRow- name={t("pdf")}- icon={"bi-file-earmark-pdf"}- format={ArchivedFormat.pdf}- link={link}- downloadable={true}- />- <hr className="m-3 border-t border-neutral-content" />- </>- ) : undefined}-- {formatAvailable(link, "readable") ? (- <>- <PreservedFormatRow- name={t("readable")}- icon={"bi-file-earmark-text"}- format={ArchivedFormat.readability}- link={link}- />- <hr className="m-3 border-t border-neutral-content" />- </>- ) : undefined}+ </div>+ </div>+ </>+ ) : activeLink.url ? (+ <>+ <br />++ <div>+ <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">+ {t("link")}+ </p>+ <TextInput+ value={link.url || ""}+ onChange={(e) => setLink({ ...link, url: e.target.value })}+ placeholder={t("placeholder_example_link")}+ className="bg-base-200"+ />+ </div>+ </>+ ) : undefined}- {!isReady() && !atLeastOneFormatAvailable(link) ? (- <div- className={`w-full h-full flex flex-col justify-center p-10`}- >- <BeatLoader- color="oklch(var(--p))"- className="mx-auto mb-3"- size={30}- />+ <br />- <p className="text-center text-2xl">- {t("preservation_in_queue")}- </p>- <p className="text-center text-lg">- {t("check_back_later")}- </p>- </div>- ) : link.url &&- !isReady() &&- atLeastOneFormatAvailable(link) ? (- <div- className={`w-full h-full flex flex-col justify-center p-5`}- >- <BeatLoader- color="oklch(var(--p))"- className="mx-auto mb-3"- size={20}- />- <p className="text-center">{t("there_are_more_formats")}</p>- <p className="text-center text-sm">- {t("check_back_later")}- </p>- </div>- ) : undefined}+ <div className="relative">+ <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">+ {t("collection")}+ </p>- {link.url && (+ {mode === "view" ? (+ <div className="relative"><Link- href={`https://web.archive.org/web/${link?.url?.replace(- /(^\w+:|^)\/\//,- ""- )}`}- target="_blank"- className="text-neutral mx-auto duration-100 hover:opacity-60 flex gap-2 w-1/2 justify-center items-center text-sm"+ href={+ isPublicRoute+ ? `/public/collections/${link.collection.id}`+ : `/collections/${link.collection.id}`+ }+ className="rounded-md p-2 bg-base-200 border border-base-200 hide-scrollbar overflow-x-auto whitespace-nowrap flex justify-between items-center gap-2 pr-14">- <p className="whitespace-nowrap">- {t("view_latest_snapshot")}- </p>- <i className="bi-box-arrow-up-right" />+ <p>{link.collection.name}</p>+ <div className="absolute right-0 px-2 bg-base-200">+ {link.collection.icon ? (+ <Icon+ icon={link.collection.icon}+ size={30}+ weight={+ (link.collection.iconWeight ||+ "regular") as IconWeight+ }+ color={link.collection.color}+ />+ ) : (+ <i+ className="bi-folder-fill text-2xl"+ style={{ color: link.collection.color }}+ ></i>+ )}+ </div></Link>- )}- </div>+ </div>+ ) : (+ <CollectionSelection+ onChange={setCollection}+ defaultValue={+ link.collection.id+ ? {+ value: link.collection.id,+ label: link.collection.name,+ }+ : {+ value: null as unknown as number,+ label: "Unorganized",+ }+ }+ creatable={false}+ />+ )}</div>- )}- {mode === "view" ? (- <>- <br />-- <p className="text-neutral text-xs text-center">- {t("saved")}{" "}- {new Date(link.createdAt || "").toLocaleDateString("en-US", {- month: "short",- day: "numeric",- year: "numeric",- })}{" "}- at{" "}- {new Date(link.createdAt || "").toLocaleTimeString("en-US", {- hour: "numeric",- minute: "numeric",- })}+ <br />++ <div className="relative">+ <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">+ {t("tags")}</p>- </>- ) : (- <>- <br />- <div className="flex justify-end items-center">- <button- className={clsx(- "btn btn-accent text-white",- JSON.stringify(activeLink) === JSON.stringify(link)- ? "btn-disabled"- : "dark:border-violet-400"++ {mode === "view" ? (+ <div className="flex gap-2 flex-wrap rounded-md p-2 bg-base-200 border border-base-200 w-full text-xs">+ {link.tags && link.tags[0] ? (+ link.tags.map((tag) =>+ isPublicRoute ? (+ <div+ key={tag.id}+ className="bg-base-200 p-1 hover:bg-neutral-content rounded-md duration-100"+ >+ {tag.name}+ </div>+ ) : (+ <Link+ href={"/tags/" + tag.id}+ key={tag.id}+ className="bg-base-200 p-1 hover:bg-neutral-content btn btn-xs btn-ghost rounded-md"+ >+ {tag.name}+ </Link>+ )+ )+ ) : (+ <div className="text-neutral text-base">{t("no_tags")}</div>)}- onClick={submit}- >- {t("save_changes")}- </button>- </div>- </>- )}+ </div>+ ) : (+ <TagSelection+ onChange={setTags}+ defaultValue={link.tags.map((e) => ({+ label: e.name,+ value: e.id,+ }))}+ />+ )}+ </div>++ <br />++ <div className="relative">+ <p className="text-sm mb-2 text-neutral relative w-fit flex justify-between">+ {t("description")}+ </p>++ {mode === "view" ? (+ <div className="rounded-md p-2 bg-base-200 hyphens-auto">+ {link.description ? (+ <p>{link.description}</p>+ ) : (+ <p className="text-neutral">+ {t("no_description_provided")}+ </p>+ )}+ </div>+ ) : (+ <textarea+ value={unescapeString(link.description) as string}+ onChange={(e) =>+ setLink({ ...link, description: e.target.value })+ }+ placeholder={t("link_description_placeholder")}+ className="resize-none w-full rounded-md p-2 h-32 border-neutral-content bg-base-200 focus:border-primary border-solid border outline-none duration-100"+ />+ )}+ </div>++ {mode === "view" ? (+ <>+ <br />++ <p className="text-neutral text-xs text-center">+ {t("saved")}{" "}+ {new Date(link.createdAt || "").toLocaleDateString("en-US", {+ month: "short",+ day: "numeric",+ year: "numeric",+ })}{" "}+ at{" "}+ {new Date(link.createdAt || "").toLocaleTimeString("en-US", {+ hour: "numeric",+ minute: "numeric",+ })}+ </p>+ </>+ ) : (+ <>+ <br />+ <div className="flex justify-end items-center">+ <button+ className={clsx(+ "btn btn-accent text-white",+ JSON.stringify(activeLink) === JSON.stringify(link)+ ? "btn-disabled"+ : "dark:border-violet-400"+ )}+ onClick={submit}+ >+ {t("save_changes")}+ </button>+ </div>+ </>+ )}+ </div></div></div></div>diff --git a/components/Modal.tsx b/components/Modal.tsxindex dbffb25b..7e22786f 100644--- a/components/Modal.tsx+++ b/components/Modal.tsx@@ -1,12 +1,15 @@import React, { MouseEventHandler, ReactNode, useEffect } from "react";import ClickAwayHandler from "@/components/ClickAwayHandler";import { Drawer } from "vaul";+import clsx from "clsx";+import useWindowDimensions from "@/hooks/useWindowDimensions";type Props = {toggleModal: Function;children: ReactNode;className?: string;dismissible?: boolean;+ isLinkModal?: boolean;};export default function Modal({@@ -14,11 +17,14 @@ export default function Modal({className,children,dismissible = true,+ isLinkModal,}: Props) {const [drawerIsOpen, setDrawerIsOpen] = React.useState(true);+ const { width } = useWindowDimensions();+useEffect(() => {- if (window.innerWidth >= 640) {+ if (width >= 640) {document.body.style.overflow = "hidden";document.body.style.position = "relative";return () => {@@ -28,7 +34,7 @@ export default function Modal({}}, []);- if (window.innerWidth < 640) {+ if (width < 640) {return (<Drawer.Rootopen={drawerIsOpen}@@ -38,16 +44,17 @@ export default function Modal({><Drawer.Portal><Drawer.Overlay className="fixed inset-0 bg-black/40" />- <Drawer.Content className="flex flex-col rounded-t-2xl h-[90%] mt-24 fixed bottom-0 left-0 right-0 z-30">+ <Drawer.Content className="flex flex-col rounded-t-2xl h-[90%] mt-24 fixed bottom-0 left-0 right-0 z-30 outline-none"><divclassName="p-4 bg-base-100 rounded-t-2xl flex-1 border-neutral-content border-t overflow-y-auto"data-testid="mobile-modal-container">- <div- className="mx-auto w-12 h-1.5 flex-shrink-0 rounded-full bg-neutral mb-5"- data-testid="mobile-modal-slider"- />-+ {!isLinkModal && (+ <div+ className="mx-auto w-12 h-1.5 flex-shrink-0 rounded-full bg-neutral mb-5"+ data-testid="mobile-modal-slider"+ />+ )}{children}</div></Drawer.Content>@@ -62,15 +69,22 @@ export default function Modal({><ClickAwayHandleronClickOutside={() => dismissible && toggleModal()}- className={`w-full mt-auto sm:m-auto sm:w-11/12 sm:max-w-2xl ${- className || ""- }`}+ className={clsx(+ "w-full mt-auto sm:m-auto",+ isLinkModal ? "sm:w-[80vw] sm:h-[80vh]" : "sm:w-11/12 sm:max-w-2xl",+ className+ )}><div- className="slide-up mt-auto sm:m-auto relative border-neutral-content rounded-t-2xl sm:rounded-2xl border-t sm:border shadow-2xl p-5 bg-base-100 overflow-y-auto sm:overflow-y-visible"+ className={clsx(+ "slide-up mt-auto sm:m-auto relative border-neutral-content rounded-t-2xl sm:rounded-2xl border-t sm:border shadow-2xl bg-base-100",+ isLinkModal+ ? "h-full overflow-hidden"+ : "overflow-y-auto sm:overflow-y-visible p-5"+ )}data-testid="modal-container">- {dismissible && (+ {dismissible && !isLinkModal && (<divonClick={toggleModal as MouseEventHandler<HTMLDivElement>}className="absolute top-4 right-3 btn btn-sm outline-none btn-circle btn-ghost z-10"diff --git a/components/ModalContent/LinkModal.tsx b/components/ModalContent/LinkModal.tsxindex acf166f4..9fe0841a 100644--- a/components/ModalContent/LinkModal.tsx+++ b/components/ModalContent/LinkModal.tsx@@ -2,7 +2,6 @@ import React, { useState } from "react";import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";import { useTranslation } from "next-i18next";import { useDeleteLink } from "@/hooks/store/links";-import Drawer from "../Drawer";import LinkDetails from "../LinkDetails";import Link from "next/link";import usePermissions from "@/hooks/usePermissions";@@ -10,6 +9,8 @@ import { useRouter } from "next/router";import { dropdownTriggerer } from "@/lib/client/utils";import toast from "react-hot-toast";import clsx from "clsx";+import Modal from "../Modal";+import useWindowDimensions from "@/hooks/useWindowDimensions";type Props = {onClose: Function;@@ -40,17 +41,16 @@ export default function LinkModal({const [mode, setMode] = useState<"view" | "edit">(activeMode || "view");- return (- <Drawer- toggleDrawer={onClose}- className="sm:h-screen items-center relative"- >- <div className="absolute top-3 left-0 right-0 flex justify-between px-3">- <div- className="bi-x text-xl btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10"- onClick={() => onClose()}- ></div>+ const { width } = useWindowDimensions();+ return (+ <Modal toggleModal={onClose} isLinkModal>+ <div+ className={clsx(+ "absolute top-3 left-0 right-0 flex justify-center",+ width >= 640 && "w-1/2 lg:w-1/3 ml-auto"+ )}+ >{(permissions === true || permissions?.canUpdate) && !isPublicRoute && (<div className="flex gap-1 h-8 rounded-full bg-neutral-content bg-opacity-50 text-base-content p-1 text-xs duration-100 select-none z-10"><div@@ -78,7 +78,16 @@ export default function LinkModal({</div>)}- <div className="flex gap-2">+ <div+ className="btn btn-sm btn-circle text-base-content opacity-50 hover:opacity-100 z-10 absolute right-3"+ onClick={() => {+ onClose();+ }}+ >+ <i title="Close" className="bi-x text-xl" />+ </div>++ {/* <div className="flex gap-2">{!isPublicRoute && (<div className={`dropdown dropdown-end z-20`}><div@@ -169,18 +178,16 @@ export default function LinkModal({className="bi-box-arrow-up-right btn-circle text-base-content opacity-50 hover:opacity-100 btn btn-sm select-none z-10"></Link>)}- </div>+ </div> */}</div>- <div className="w-full">- <LinkDetails- activeLink={link}- className="sm:mt-0 -mt-11"- mode={mode}- setMode={(mode: "view" | "edit") => setMode(mode)}- onUpdateArchive={onUpdateArchive}- />- </div>- </Drawer>+ <LinkDetails+ activeLink={link}+ className="sm:mt-0 -mt-11"+ mode={mode}+ setMode={(mode: "view" | "edit") => setMode(mode)}+ onUpdateArchive={onUpdateArchive}+ />+ </Modal>);}diff --git a/components/Popover.tsx b/components/Popover.tsxindex 903fab23..817c6589 100644--- a/components/Popover.tsx+++ b/components/Popover.tsx@@ -5,13 +5,15 @@ type Props = {children: React.ReactNode;onClose: Function;className?: string;+ style?: React.CSSProperties;};-const Popover = ({ children, className, onClose }: Props) => {+const Popover = ({ children, className, onClose, style }: Props) => {return (<ClickAwayHandleronClickOutside={() => onClose()}className={`absolute z-50 ${className || ""}`}+ style={style}>{children}</ClickAwayHandler>diff --git a/components/Preservation.tsx b/components/Preservation.tsxindex b710409b..cd795a1a 100644--- a/components/Preservation.tsx+++ b/components/Preservation.tsx@@ -1,22 +1,25 @@import React, { useEffect, useState } from "react";-import { useRouter } from "next/router";-import { ArchivedFormat } from "@/types/global";+import ReactDOM from "react-dom";+import {+ ArchivedFormat,+ LinkIncludingShortenedCollectionAndTags,+} from "@/types/global";import { useTranslation } from "next-i18next";import ReadableView from "@/components/ReadableView";-import { useGetLink } from "@/hooks/store/links";import clsx from "clsx";import { formatAvailable } from "@/lib/shared/formatStats";+import useWindowDimensions from "@/hooks/useWindowDimensions";-export default function Preservation() {- const router = useRouter();- const isPublicRoute = router.pathname.startsWith("/public");-- const { data: link, mutateAsync: fetchLink, error } = useGetLink();+export default function Preservation({+ link,+ standalone,+}: {+ link: LinkIncludingShortenedCollectionAndTags;+ standalone?: boolean;+}) {const { t } = useTranslation();- const [format, setFormat] = useState<ArchivedFormat>(- Number(router.query.format)- );+ const [format, setFormat] = useState<ArchivedFormat>();const [pdfLoaded, setPdfLoaded] = useState(false);const [monolithLoaded, setMonolithLoaded] = useState(false);@@ -25,42 +28,11 @@ export default function Preservation() {const [isExpanded, setIsExpanded] = useState(false);useEffect(() => {- router.push(- {- query: { id: router.query.id, format },- },- undefined,- { shallow: true }- );-setPdfLoaded(false);setMonolithLoaded(false);setImageLoaded(false);}, [format]);- useEffect(() => {- fetchLink({- id: Number(router.query.id),- isPublicRoute,- });-- let interval: NodeJS.Timeout | null = null;- if (- link &&- (!link?.image || !link?.pdf || !link?.readable || !link?.monolith)- ) {- interval = setInterval(() => {- fetchLink({ id: link.id as number });- }, 5000);- } else if (interval) {- clearInterval(interval);- }-- return () => {- if (interval) clearInterval(interval);- };- }, []);-const Skeleton = () => (<div className="p-5 m-auto w-full flex flex-col items-center gap-5"><div className="w-full mr-auto h-4 skeleton rounded-md"></div>@@ -78,11 +50,15 @@ export default function Preservation() {const renderFormat = () => {if (!link?.id) return null;- switch (Number(router.query.format)) {+ switch (format) {case ArchivedFormat.readability:return (<div className="overflow-auto w-full h-full">- <ReadableView link={link} isExpanded={isExpanded} />+ <ReadableView+ link={link}+ isExpanded={isExpanded}+ standalone={standalone}+ /></div>);@@ -91,11 +67,13 @@ export default function Preservation() {<>{!monolithLoaded && <Skeleton />}<iframe- src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.monolith}`}+ src={`/api/v1/archives/${link.id}?format=${+ ArchivedFormat.monolith+ }&_=${Date.now()}`}className={clsx("w-full border-none",monolithLoaded ? "block" : "hidden",- isExpanded ? "h-full" : "h-[calc(100vh-4.5rem)]"+ isExpanded ? "h-full" : "h-[calc(80vh-3.75rem)]")}onLoad={() => setMonolithLoaded(true)}/>@@ -107,11 +85,13 @@ export default function Preservation() {<>{!pdfLoaded && <Skeleton />}<iframe- src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.pdf}`}+ src={`/api/v1/archives/${link.id}?format=${+ ArchivedFormat.pdf+ }&_=${Date.now()}`}className={clsx("w-full border-none",pdfLoaded ? "block" : "hidden",- isExpanded ? "h-full" : "h-[calc(100vh-4.5rem)]"+ isExpanded ? "h-full" : "h-[calc(80vh-3.75rem)]")}onLoad={() => setPdfLoaded(true)}/>@@ -126,13 +106,8 @@ export default function Preservation() {<div className="overflow-auto w-fit mx-auto h-full"><imgalt=""- src={`/api/v1/archives/${link.id}?format=${Number(- router.query.format- )}`}- className={clsx(- "w-fit h-auto mx-auto", // Ensure block display and proper resizing- !imageLoaded && "hidden"- )}+ src={`/api/v1/archives/${link.id}?format=${format}`}+ className={clsx("w-fit mx-auto", !imageLoaded && "hidden")}onLoad={() => setImageLoaded(true)}/></div>@@ -169,50 +144,56 @@ export default function Preservation() {});};- return (+ const { width } = useWindowDimensions();++ const content = (<divclassName={clsx(- !isExpanded && "max-w-screen-lg mx-auto p-3 relative",- isExpanded && "fixed inset-0 w-screen h-screen z-50"+ "bg-base-200",+ !isExpanded &&+ `mx-auto relative p-2 h-full overflow-auto ${+ width < 640 && "rounded-md"+ }`,+ isExpanded && "fixed inset-0 w-screen h-screen z-[9999]")}style={{- overflow: isExpanded ? "hidden" : "visible",+ pointerEvents: "auto",}}>{!isExpanded && link?.id && (<div className="text-sm text-neutral mb-3 flex justify-between items-center w-full gap-2">- <div className="flex gap-1 h-8 rounded-full bg-neutral-content bg-opacity-50 text-base-content p-1 text-xs duration-100 select-none z-10">+ <div className="flex gap-1 h-8 rounded-xl bg-neutral-content bg-opacity-50 text-base-content p-1 text-xs duration-100 select-none z-10">{formatAvailable(link, "pdf") && (<divclassName={clsx(- "py-1 px-2 cursor-pointer duration-100 rounded-full font-semibold text-center flex justify-between items-center",+ "py-1 px-2 cursor-pointer duration-100 rounded-lg font-semibold text-center flex justify-between items-center w-6",format === ArchivedFormat.pdf && "bg-primary bg-opacity-50")}onClick={() => setFormat(ArchivedFormat.pdf)}><div className="tooltip tooltip-bottom" data-tip={t("pdf")}>- <i className={`bi-file-earmark-pdf text-lg`} />+ <i className={`bi-file-earmark-pdf text-lg -ml-[0.3rem]`} /></div></div>)}{formatAvailable(link, "monolith") && (<divclassName={clsx(- "py-1 px-2 cursor-pointer duration-100 rounded-full font-semibold text-center flex justify-between items-center",+ "py-1 px-2 cursor-pointer duration-100 rounded-lg font-semibold text-center flex justify-between items-center w-6",format === ArchivedFormat.monolith &&"bg-primary bg-opacity-50")}onClick={() => setFormat(ArchivedFormat.monolith)}><div className="tooltip tooltip-bottom" data-tip={t("webpage")}>- <i className={`bi-filetype-html text-lg`} />+ <i className={`bi-filetype-html text-lg -ml-[0.3rem]`} /></div></div>)}{formatAvailable(link, "readable") && (<divclassName={clsx(- "py-1 px-2 cursor-pointer duration-100 rounded-full font-semibold text-center flex justify-between items-center",+ "py-1 px-2 cursor-pointer duration-100 rounded-lg font-semibold text-center flex justify-between items-center w-6",format === ArchivedFormat.readability &&"bg-primary bg-opacity-50")}@@ -222,14 +203,14 @@ export default function Preservation() {className="tooltip tooltip-bottom"data-tip={t("readable")}>- <i className={`bi-file-earmark-text text-lg`} />+ <i className={`bi-file-earmark-text text-lg -ml-[0.3rem]`} /></div></div>)}{formatAvailable(link, "image") && (<divclassName={clsx(- "py-1 px-2 cursor-pointer duration-100 rounded-full font-semibold text-center flex justify-between items-center",+ "py-1 px-2 cursor-pointer duration-100 rounded-lg font-semibold text-center flex justify-between items-center w-6",format ===(link?.image?.endsWith("png")? ArchivedFormat.png@@ -244,42 +225,49 @@ export default function Preservation() {}><div className="tooltip tooltip-bottom" data-tip={t("image")}>- <i className={`bi-file-earmark-image text-lg`} />+ <i className={`bi-file-earmark-image text-lg -ml-[0.3rem]`} /></div></div>)}</div>- <div className="flex gap-2">- <div onClick={handleDownload} className="btn btn-sm btn-circle">- <i className="bi-cloud-arrow-down text-xl text-neutral" />- </div>- <div- className="btn btn-circle btn-sm"- onClick={() => setIsExpanded(true)}- >- <i className="bi-arrows-angle-expand" />+ {format !== undefined && (+ <div className="flex gap-2">+ <div+ onClick={handleDownload}+ className="btn btn-sm btn-square btn-ghost"+ >+ <i className="bi-cloud-arrow-down text-xl" />+ </div>+ <div+ className="btn btn-square btn-ghost btn-sm"+ onClick={() => setIsExpanded(true)}+ >+ <i className="bi-arrows-angle-expand" />+ </div></div>- </div>+ )}</div>)}- {error ? (- <p>{t("not_found_404")}</p>- ) : (- <div className={clsx("w-full", isExpanded ? "h-full" : "h-auto")}>- {renderFormat()}- </div>- )}+ <div className={clsx("w-full", isExpanded ? "h-full" : "h-auto")}>+ {renderFormat()}+ </div>{isExpanded && (<div- className="absolute top-3 right-3 btn btn-circle btn-sm"+ className="absolute top-3 right-3 btn btn-circle btn-primary btn-sm"onClick={() => setIsExpanded(false)}>- <i className="bi-arrows-angle-contract" />+ <i className="bi-arrows-angle-contract text-lg" /></div>)}</div>);++ if (isExpanded) {+ return ReactDOM.createPortal(content, document.body);+ }++ return content;}diff --git a/components/ReadableView.tsx b/components/ReadableView.tsxindex a4ccd58b..e261e306 100644--- a/components/ReadableView.tsx+++ b/components/ReadableView.tsx@@ -13,46 +13,55 @@ import isValidUrl from "@/lib/shared/isValidUrl";import Link from "next/link";import unescapeString from "@/lib/client/unescapeString";import usePermissions from "@/hooks/usePermissions";-import showdown from "showdown";-import TurndownService from "turndown";import { useUpdateFile } from "@/hooks/store/links";--const turndownService = new TurndownService({- headingStyle: "atx",- bulletListMarker: "-",- emDelimiter: "*",-});--const converter = new showdown.Converter({- omitExtraWLInCodeBlocks: true,- noHeaderId: false,- parseImgDimensions: true,- simplifiedAutoLink: true,- literalMidWordUnderscores: true,- strikethrough: true,- tables: true,- tablesHeaderId: false,- ghCodeBlocks: true,- tasklists: true,- smoothLivePreview: true,- prefixHeaderId: false,- disableForced4SpacesIndentedSublists: false,- ghCompatibleHeaderId: true,- smartIndentationFix: false,- headerLevelStart: 1,-});+import { EditorContent, useEditor } from "@tiptap/react";+import StarterKit from "@tiptap/starter-kit";+import Image from "@tiptap/extension-image";+import TipTapLink from "@tiptap/extension-link";+import Highlight from "@tiptap/extension-highlight";+import TextAlign from "@tiptap/extension-text-align";+import MenuBar from "./Editor/MenuBar";+import TaskItem from "@tiptap/extension-task-item";+import TaskList from "@tiptap/extension-task-list";+import ListItem from "@tiptap/extension-list-item";type Props = {link: LinkIncludingShortenedCollectionAndTags;isExpanded: boolean;+ standalone?: boolean;};-export default function ReadableView({ link, isExpanded }: Props) {+export default function ReadableView({ link, isExpanded, standalone }: Props) {const { t } = useTranslation();const [linkContent, setLinkContent] = useState("");-const [isEditing, setIsEditing] = useState(false);- const [editedMarkdown, setEditedMarkdown] = useState("");++ const editor = useEditor({+ extensions: [+ TaskList,+ TaskItem.configure({+ nested: true,+ }),+ StarterKit,+ Image,+ ListItem,+ Highlight,+ TextAlign,+ TipTapLink.configure({+ openOnClick: false,+ }),+ ],+ content: linkContent || "<p></p>",+ editable: false,+ editorProps: {+ attributes: {+ class: clsx(+ "rounded-md bg-base-200 focus:outline-none border-neutral-content focus:border-primary border-solid border p-3 overflow-auto duration-100",+ isExpanded ? "h-[calc(100vh-7.25rem)]" : "h-[calc(80vh-10.75rem)]"+ ),+ },+ },+ });const router = useRouter();const isPublicRoute = router.pathname.startsWith("/public");@@ -60,48 +69,54 @@ export default function ReadableView({ link, isExpanded }: Props) {useEffect(() => {const fetchLinkContent = async () => {- if (router.query.id && formatAvailable(link, "readable")) {+ if (formatAvailable(link, "readable")) {const response = await fetch(- `/api/v1/archives/${link?.id}?format=${ArchivedFormat.readability}`+ `/api/v1/archives/${link?.id}?format=${+ ArchivedFormat.readability+ }&_=${Date.now()}`);const data = await response?.json();- setLinkContent(data?.content);+ setLinkContent(data?.content || "");}};fetchLinkContent();- }, [link, router.query.id]);+ }, [link]);useEffect(() => {- if (!isEditing && linkContent) {- const initialMarkdown = turndownService.turndown(linkContent);- setEditedMarkdown(initialMarkdown);+ if (editor) {+ editor.setEditable(isEditing);}- }, [linkContent, isEditing]);+ }, [isEditing, editor]);++ useEffect(() => {+ if (!isEditing && linkContent && editor) {+ editor.commands.setContent(linkContent, false);+ }+ }, [linkContent, isEditing, editor]);const startEditing = () => {- if (linkContent) {- const initialMarkdown = turndownService.turndown(linkContent);- setEditedMarkdown(initialMarkdown);+ if (linkContent && editor) {+ editor.commands.setContent(linkContent, false);}setIsEditing(true);};const cancelEditing = () => {+ if (editor) {+ editor.commands.setContent(linkContent, false);+ }setIsEditing(false);};const updateFile = useUpdateFile();const saveChanges = () => {- const updatedHTML = DOMPurify.sanitize(converter.makeHtml(editedMarkdown));-- console.log("Saved HTML content:", updatedHTML);+ if (!editor) return;+ const updatedHTML = DOMPurify.sanitize(editor.getHTML());setLinkContent(updatedHTML);- setIsEditing(false);-updateFile.mutate({linkId: link.id as number,file: new File([updatedHTML], "updatedContent.txt", {@@ -111,7 +126,7 @@ export default function ReadableView({ link, isExpanded }: Props) {};return (- <div className="flex flex-col gap-3 items-start p-3">+ <div className="flex flex-col gap-3 items-start p-3 max-w-screen-lg mx-auto">{!isEditing && (<div className="flex gap-3 items-start"><div className="flex flex-col w-full gap-1">@@ -138,71 +153,71 @@ export default function ReadableView({ link, isExpanded }: Props) {<div className="text-sm text-neutral flex justify-between w-full gap-2"><LinkDate link={link} />-- {!isPublicRoute && (permissions === true || permissions?.canUpdate) && (- <>- {!isEditing && linkContent ? (- <button- className="flex items-center gap-2 btn btn-sm"- onClick={startEditing}- >- <i className="bi-pencil" />- {t("edit")}- </button>- ) : linkContent ? (- <div- className={clsx(- "flex items-center gap-2",- isExpanded && "mr-10"- )}- >+ {!isPublicRoute &&+ !standalone &&+ (permissions === true || permissions?.canUpdate) && (+ <>+ {!isEditing && linkContent ? (<button- className="flex items-center gap-2 btn btn-sm"- onClick={cancelEditing}+ className="flex items-center gap-2 btn btn-ghost btn-sm"+ onClick={startEditing}>- <i className="bi-x text-xl" />+ <i className="bi-pencil" />+ {t("edit")}</button>- <button- className="flex items-center gap-2 btn btn-primary btn-sm"- onClick={saveChanges}+ ) : linkContent ? (+ <div+ className={clsx(+ "flex items-center gap-2",+ isExpanded && "mr-10"+ )}>- <i className="bi-check2 text-xl" />- </button>- </div>- ) : null}- </>- )}+ <button+ className="flex items-center gap-2 btn btn-ghost btn-square btn-sm"+ onClick={cancelEditing}+ >+ <i className="bi-x text-xl" />+ </button>+ <button+ className="flex items-center gap-2 btn btn-primary btn-square btn-sm"+ onClick={() => {+ saveChanges();+ setIsEditing(false);+ }}+ >+ <i className="bi-check2 text-xl" />+ </button>+ </div>+ ) : null}+ </>+ )}</div>{link?.readable?.startsWith("archives") ? (<>{linkContent ? (- isEditing ? (- <textarea- className={clsx(- "w-full rounded-md p-3 border-neutral-content bg-base-200 focus:border-primary border-solid border outline-none duration-100 resize-none",- isExpanded- ? "h-[calc(100vh-4.5rem)]"- : "h-[calc(100vh-8.5rem)]"- )}- value={editedMarkdown}- onChange={(e) => setEditedMarkdown(e.target.value)}- />- ) : (- <div- className={clsx(- "p-3 rounded-md w-full",- linkContent && "bg-base-200"- )}- >+ <>+ {editor && isEditing ? (+ <div className="w-full reader-view">+ <MenuBar editor={editor} />+ <EditorContent editor={editor} />+ </div>+ ) : (<div- className="line-break px-1 reader-view"- dangerouslySetInnerHTML={{- __html: DOMPurify.sanitize(linkContent),- }}- />- </div>- )+ className={clsx(+ "p-3 rounded-md w-full",+ linkContent && "bg-base-200"+ )}+ >+ <div+ className="line-break px-1 reader-view read-only"+ dangerouslySetInnerHTML={{+ __html: DOMPurify.sanitize(linkContent),+ }}+ />+ </div>+ )}+ </>) : (<div className="p-5 m-auto w-full flex flex-col items-center gap-5"><div className="w-full mr-auto h-4 skeleton rounded-md"></div>diff --git a/hooks/useWindowDimensions.tsx b/hooks/useWindowDimensions.tsxindex bea7246b..517dd733 100644--- a/hooks/useWindowDimensions.tsx+++ b/hooks/useWindowDimensions.tsx@@ -1,4 +1,4 @@-import React, { useState, useEffect } from "react";+import { useState, useEffect } from "react";export default function useWindowDimensions() {const [dimensions, setDimensions] = useState({diff --git a/lib/api/storage/s3Client.ts b/lib/api/storage/s3Client.tsindex cebba5ae..cd2294ac 100644--- a/lib/api/storage/s3Client.ts+++ b/lib/api/storage/s3Client.ts@@ -6,7 +6,7 @@ const s3Client: S3 | undefined =process.env.SPACES_KEY &&process.env.SPACES_SECRET? new S3({- forcePathStyle: !!process.env.SPACES_FORCE_PATH_STYLE,+ forcePathStyle: process.env.SPACES_FORCE_PATH_STYLE === "true",endpoint: process.env.SPACES_ENDPOINT,region: process.env.SPACES_REGION,credentials: {diff --git a/package.json b/package.jsonindex 49b672ac..5edb2ce3 100644--- a/package.json+++ b/package.json@@ -31,6 +31,14 @@"@stripe/stripe-js": "^1.54.1","@tanstack/react-query": "^5.51.15","@tanstack/react-query-devtools": "^5.51.15",+ "@tiptap/extension-highlight": "^2.11.2",+ "@tiptap/extension-image": "^2.11.2",+ "@tiptap/extension-link": "^2.11.2",+ "@tiptap/extension-task-item": "^2.11.2",+ "@tiptap/extension-task-list": "^2.11.2",+ "@tiptap/extension-text-align": "^2.11.2",+ "@tiptap/react": "^2.11.2",+ "@tiptap/starter-kit": "^2.11.2","@types/crypto-js": "^4.1.1","@types/formidable": "^3.4.5","@types/node": "^20.10.4",@@ -82,11 +90,9 @@"react-window": "^1.8.10","rss": "^1.2.2","rss-parser": "^3.13.0",- "showdown": "^2.1.0","socks-proxy-agent": "^8.0.2","stripe": "^12.13.0","tailwind-merge": "^2.3.0",- "turndown": "^7.2.0","vaul": "^1.1.1","zod": "^3.23.8","zustand": "^4.3.8"@@ -99,8 +105,6 @@"@types/node-fetch": "^2.6.10","@types/react-window": "^1.8.8","@types/shelljs": "^0.8.15",- "@types/showdown": "^2.0.6",- "@types/turndown": "^5.0.5","autoprefixer": "^10.4.14","daisyui": "^4.4.2","nodemon": "^3.0.2",diff --git a/pages/links/[id].tsx b/pages/links/[id].tsxindex bb697698..85bce1f8 100644--- a/pages/links/[id].tsx+++ b/pages/links/[id].tsx@@ -21,11 +21,11 @@ const Index = () => {{getLink.data ? (<LinkDetailsactiveLink={getLink.data}- className="sm:max-w-xl sm:m-auto sm:p-5 w-full"+ className="sm:w-[80vw] sm:h-[80vh] sm:m-auto w-screen"standalone/>) : (- <div className="max-w-xl p-5 m-auto w-full flex flex-col items-center gap-5">+ <div className="sm:max-w-3xl p-5 m-auto w-full flex flex-col items-center gap-5"><div className="w-20 h-20 skeleton rounded-xl"></div><div className="w-full h-10 skeleton rounded-xl"></div><div className="w-full h-10 skeleton rounded-xl"></div>diff --git a/pages/preserved/[id].tsx b/pages/preserved/[id].tsxindex 4c336e43..311a5a88 100644--- a/pages/preserved/[id].tsx+++ b/pages/preserved/[id].tsx@@ -1,8 +1,7 @@-import getServerSideProps from "@/lib/client/getServerSideProps";-import Preservation from "@/components/Preservation";-+import { useRouter } from "next/router";export default function Index() {- return <Preservation />;-}+ const router = useRouter();+ const { id } = router.query;-export { getServerSideProps };+ return router.push(`/links/${id}`);+}diff --git a/pages/public/links/[id].tsx b/pages/public/links/[id].tsxindex 6a340b35..535561f5 100644--- a/pages/public/links/[id].tsx+++ b/pages/public/links/[id].tsx@@ -19,11 +19,11 @@ const Index = () => {{getLink.data ? (<LinkDetailsactiveLink={getLink.data}- className="sm:max-w-xl sm:m-auto sm:p-5 w-full"+ className="sm:w-[80vw] sm:h-[80vh] sm:m-auto w-screen"standalone/>) : (- <div className="max-w-xl p-5 m-auto w-full flex flex-col items-center gap-5">+ <div className="sm:max-w-3xl p-5 m-auto w-full flex flex-col items-center gap-5"><div className="w-20 h-20 skeleton rounded-xl"></div><div className="w-full h-10 skeleton rounded-xl"></div><div className="w-full h-10 skeleton rounded-xl"></div>diff --git a/pages/public/preserved/[id].tsx b/pages/public/preserved/[id].tsxindex 4c336e43..41c27d76 100644--- a/pages/public/preserved/[id].tsx+++ b/pages/public/preserved/[id].tsx@@ -1,8 +1,7 @@-import getServerSideProps from "@/lib/client/getServerSideProps";-import Preservation from "@/components/Preservation";-+import { useRouter } from "next/router";export default function Index() {- return <Preservation />;-}+ const router = useRouter();+ const { id } = router.query;-export { getServerSideProps };+ return router.push(`/public/links/${id}`);+}diff --git a/public/locales/en/common.json b/public/locales/en/common.jsonindex 1b05788e..095210c5 100644--- a/public/locales/en/common.json+++ b/public/locales/en/common.json@@ -240,7 +240,7 @@"new_version_announcement": "See what's new in <0>Linkwarden {{version}}!</0>","creating": "Creating...","upload_file": "Upload File",- "file": "File",+ "content": "Content","file_types": "PDF, PNG, JPG (Up to {{size}} MB)","description": "Description","auto_generated": "Will be auto generated if nothing is provided.",@@ -392,7 +392,7 @@"no_tags": "No tags.","no_description_provided": "No description provided.","change_icon": "Change Icon",- "upload_preview_image": "Upload Preview Image",+ "upload_banner": "Upload Banner","columns": "Columns","default": "Default","invalid_url_guide": "Please enter a valid Address for the Link. (It should start with http/https)",diff --git a/styles/globals.css b/styles/globals.cssindex 7f8919b7..d30e3bde 100644--- a/styles/globals.css+++ b/styles/globals.css@@ -2,15 +2,8 @@@tailwind components;@tailwind utilities;-:root {- --selection-color: #fff;- --selection-bg-color: #fff;-}-[data-theme="dark"] {color-scheme: dark;- --selection-color: #000000;- --selection-bg-color: #ffffff;--default: 82.76% 0.101277 230.317893;--red: 69.73% 0.168 22.43;--rose: 75% 0.2 340;@@ -22,8 +15,6 @@[data-theme="light"] {color-scheme: light;- --selection-color: #ffffff;- --selection-bg-color: #000000;--default: 50% 0.1193 242.75;--red: 49.7% 0.2026 22.43;--rose: 55% 0.25 340;@@ -33,11 +24,6 @@--zinc: 50% 0.07 220;}-::selection {- background-color: var(--selection-bg-color);- color: var(--selection-color);-}-/* Hide scrollbar */.hide-scrollbar::-webkit-scrollbar {display: none;@@ -205,23 +191,36 @@overflow-y: hidden;}+.custom-file-input::file-selector-button {+ cursor: pointer;+}+/* Reader view custom stylings */.reader-view {- line-height: 2.8rem;+ /* line-height: 2.8rem; */+}+.reader-view * {+ text-align: inherit;+}+.reader-view mark {+ background-color: oklch(var(--p) / 0.5);+ color: oklch(var(--bc));+ border-radius: 5px;+ padding-left: 0.25rem;+ padding-right: 0.25rem;}.reader-view p {font-size: 1.15rem;- line-height: 2.5rem;+ line-height: 1.8;}.reader-view h1 {font-size: 2.2rem;+ line-height: 1.3;}.reader-view h2 {- line-height: 4rem;font-size: 1.9rem;}.reader-view h3 {- line-height: 3.5rem;font-size: 1.6rem;}.reader-view h4 {@@ -262,7 +261,6 @@.reader-view code {padding: 0.15rem 0.4rem 0.15rem 0.4rem;}-[data-theme="dark"] .reader-view code,[data-theme="dark"] .reader-view pre {background-color: rgb(49, 49, 49);@@ -274,6 +272,31 @@border-radius: 8px;}-.custom-file-input::file-selector-button {+.reader-view ul[data-type="taskList"] {+ list-style: none;+ margin-left: 0;+ padding: 0;+}++.reader-view ul[data-type="taskList"] li {+ align-items: center;+ display: flex;+}++.reader-view ul[data-type="taskList"] li > label {+ flex: 0 0 auto;+ margin-right: 0.5rem;+ user-select: none;+}++.reader-view ul[data-type="taskList"] li > div {+ flex: 1 1 auto;+}++.reader-view ul[data-type="taskList"] input[type="checkbox"] {cursor: pointer;}++.read-only ul[data-type="taskList"] {+ pointer-events: none;+}diff --git a/yarn.lock b/yarn.lockindex 44c93423..c254a4e5 100644--- a/yarn.lock+++ b/yarn.lock@@ -1186,11 +1186,6 @@semver "^7.3.5"tar "^6.1.11"-"@mixmark-io/domino@^2.2.0":- version "2.2.0"- resolved "https://registry.yarnpkg.com/@mixmark-io/domino/-/domino-2.2.0.tgz#4e8ec69bf1afeb7a14f0628b7e2c0f35bdb336c3"- integrity sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw==-"@mozilla/readability@^0.4.4":version "0.4.4"resolved "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.4.tgz#5d258b3436eba1d5fe31c4386e50a848d5cb5811"@@ -1308,6 +1303,11 @@dependencies:playwright "1.45.0"+"@popperjs/core@^2.9.0":+ version "2.11.8"+ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"+ integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==+"@prisma/client@^5.21.1":version "5.21.1"resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.21.1.tgz#ad51ef220eb80173f882e859960d81e626b73898"@@ -1470,6 +1470,11 @@resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==+"@remirror/[email protected]":+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-3.0.0.tgz#96fdb89d25c62e7b6a5d08caf0ce5114370e3b8f"+ integrity sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==+"@rushstack/eslint-patch@^1.1.3":version "1.2.0"resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"@@ -1938,6 +1943,214 @@dependencies:"@tanstack/query-core" "5.51.15"+"@tiptap/core@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.11.2.tgz#d9d4bd912ee12d4127180e60d2672605c208baf7"+ integrity sha512-Z437c/sQg31yrRVgLJVkQuih+7Og5tjRx6FE/zE47QgEayqQ9yXH0LrTAbPiY6IfY1X+f2A0h3e5Y/WGD6rC3Q==++"@tiptap/extension-blockquote@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.11.2.tgz#9f434872d9e66eeafa60f2c13196d4d32013c7b1"+ integrity sha512-5XeU1o5UfjMCFX3AwgeErwDKlpUr5YPhta2tQqNsQUQ7QvumIdK/3apNT15/d8pySAjdAphDWEd/CZ2di5hq6A==++"@tiptap/extension-bold@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.11.2.tgz#e1a2b8ca2f7b5a2a2c1bed25d73dcd8bb474174c"+ integrity sha512-pSls6UnKiPMm2c0m1viuZ0aFexxUmTRm17vDA2Gy5PhRm5qSsnHlSxyEuEcKNOi/rIx+oJehvG1oO4uI+kmCKg==++"@tiptap/extension-bubble-menu@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.11.2.tgz#2a26223c5e79b662c52d1fa105ac7671dcbf0061"+ integrity sha512-G+m7JLhe6SGcDugm8q3RXVLVnCm4t67FGNlOLRzq25VNgD7FDNwjgISp04W+qcJa0+Z5cbQt/4naUji5QEH97A==+ dependencies:+ tippy.js "^6.3.7"++"@tiptap/extension-bullet-list@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.11.2.tgz#cad06f9c1cb7c448739b736f3e98a337a47ba6b7"+ integrity sha512-zqZYT7lmmivEDEO+6w5bl5kV3UP1L2dw5mksyMGtxpvoDgbFHZ85+ron6SeHee8C7vJc6aIptc1p6NxIS5/l0A==++"@tiptap/extension-code-block@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.11.2.tgz#81f43250c5514bcd24e04544e0d645c1a9f1ffce"+ integrity sha512-O6gVfql3uFZNq9yaUDa98VgV58BqaUSeOUnhZwLzpB/4VlqzTyW6/kvFxhKcSp7f+GmrMQaV4PXRs+tZcq6EFw==++"@tiptap/extension-code@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.11.2.tgz#32ed9a28e59be8eb02a54dc610fa783f0d3d6f74"+ integrity sha512-G8vvb17QAYQij3haz9RoDvArK1LSOZHqGzQ2dJ3/d0W5oqOyUrTnseN66fRZjWhBT3pns0VL2erwe/NBIqLOIw==++"@tiptap/extension-document@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.11.2.tgz#307aa0010d2074c05ffff043eedebe5571e84e4d"+ integrity sha512-/EZhIAN1x7DYgGM0xv7y7wo5ceBmHb0+rOIPuBerVFeTn+VcC3tST/Q64bdvcxgNe2E59Ti0CUdYEA51wc2u5Q==++"@tiptap/extension-dropcursor@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.11.2.tgz#b0dd8844c425d3d82ab354be7bef650eebd160b6"+ integrity sha512-HbXC9cMVZUY3kyKwbDtVH452CY1qlyLbIvTaN0+dxkFgcVeQZZtfIxU7DwMmqCDmDnsh0CdDqUgUvcXS2UQTwA==++"@tiptap/extension-floating-menu@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.11.2.tgz#21a6b8efcf4c525fdb0a88baa587e29f73a410fb"+ integrity sha512-DoFGgguE24rxPkZTD7sH3GFi9E3JKQGeGw0sFTwXx1ZFnyCtqbLcPOfT4THlvUEcixt68Mk48M1NTFVOGn/dyA==+ dependencies:+ tippy.js "^6.3.7"++"@tiptap/extension-gapcursor@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.11.2.tgz#9a44175bca5eb13e5281f22c6c64d6b9e3db326e"+ integrity sha512-ssJOrcc8dzlo5/Qq3+EixASDHTj3mqCyAv7Ohed1QYEYr+TsSpsTbjR0eMLjWHlgbt24TXL2Wr0ldjYCU8T1ZA==++"@tiptap/extension-hard-break@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.11.2.tgz#54813af7264cdb808c86b0c386155dc1f6d812f8"+ integrity sha512-FNcXemfuwkiP4drZ9m90BC6GD4nyikfYHYEUyYuVd74Mm6w5vXpueWXus3mUcdT78xTs1XpQVibDorilLu7X8w==++"@tiptap/extension-heading@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.11.2.tgz#f0aa459204ba4a45d36830eafae2f8430e854a48"+ integrity sha512-y/wAEXYB0a8y5WmSYGCIXAhus1ydudn0pokKIzT/OD00XutAVh14qOB5h/+m8iXwGU/UYMP7SUCtK82txZqwKA==++"@tiptap/extension-highlight@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.11.2.tgz#f78983063a0d87d203ba5dce116f6ae73ad2bb37"+ integrity sha512-ztq2lGthTIY/zPYtdYrG7+0dc4R4abkZqDVAmLxkFcwjs/mejq7nMG7WM2Unn2cIGo96m8Ibz/UtoOPJDt/+/Q==++"@tiptap/extension-history@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.11.2.tgz#62820dcb50863ccc4f482b295e2ee17c2c66b43e"+ integrity sha512-BamS6YjKsETgP7msmm0oIpqmNSLJWbivm3XurR3uSUqJZYrQo1Fv+No4HAR7eAACxoOnYGcDmYsrombRVs9lxw==++"@tiptap/extension-horizontal-rule@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.11.2.tgz#0f674a66e3d46a86f1cc2ab679836b5c77208d51"+ integrity sha512-R7MkTQzxkBy0bXJfq6L+6ax01/hmTEUvPPoyjwDSfU1Ktc1ihBJGUdTNtohT1KoQGQYt2d9khBohVspsXoCmFw==++"@tiptap/extension-image@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.11.2.tgz#bbfa887132be3bfabd31e15d19dd4b924210652b"+ integrity sha512-Ag+Arj6sclTqhvR+v5I2UD5e2lsWTcXLj0aS2aEsfGpytltk6rcLj6iDjx/SmJrE1BN8ognJsdzmFdZF/rNLpg==++"@tiptap/extension-italic@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.11.2.tgz#f74051e6c767680bf43039b8f152736c0553f13e"+ integrity sha512-652oTa+iDiR7sMtmePSy+303HSNJxvxmV/6IvQoMdffJU0oPiWcWnCCL0qrWgtHh15dplj36EtB/znENWbvVOw==++"@tiptap/extension-link@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.11.2.tgz#46096d6862a2c4f8dd18e9db9204959e4b1dbe0d"+ integrity sha512-Mbre+JotLMUg9jdWWrwIReiRVMkA2kMzmtD2Aqy/n5P+wuI84898qIZSkhPEzDOGzp0mluUO/iGsz0NdTto/JQ==+ dependencies:+ linkifyjs "^4.2.0"++"@tiptap/extension-list-item@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.11.2.tgz#4b81f934bdbe98ee5e1dabdb799f2f3bf095c44e"+ integrity sha512-cxysDCvw45bem53qLZtTCkle1pttO4Y/FGqYm1hl66ol3cZsuLbjpOb4aDB6wRhyd701Ws6MjOYM+cZsmtTNpw==++"@tiptap/extension-ordered-list@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.11.2.tgz#37b2f0d614cb173934848ee72d730663868e5b41"+ integrity sha512-TR8OqwKkQ0OCp40V9hcRJUcO1PSzCYWXy0mvW351lOYO8D6uE+1ouVkEV9qjXBC30sVCnQykSp/FR9UjsIuiVw==++"@tiptap/extension-paragraph@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.11.2.tgz#b4e99129b1c5959e2926b9563ced89755e0d4d81"+ integrity sha512-iydTjeZbPJuqctOaAx7QebLPvz9J/hBxPptuhe4GZmqInknAk7+SFJagYeGNb14wfXKOvDZ9DMqv6mBiqSA90Q==++"@tiptap/extension-strike@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.11.2.tgz#9b5b698da5a024219e2ecf438c3b503d9b812fbe"+ integrity sha512-n/rznmhqFlENGSlFY9t3pWnWzSmvDpUj3sjVhdpYteis+OCzabN9+c5KdQTBPMjtwRuRleQiKWnHmxvif0heEg==++"@tiptap/extension-task-item@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.11.2.tgz#cf8c5e86612cbeb0af0974fa595b317489a6935c"+ integrity sha512-TvEfOq81lg7QcaP6VLolSEFQVoop4v0PxWZuzmtpOSywrdelPtLE0PuStfu0FIJIrw1V7axEwoapPCaVwTM8Mg==++"@tiptap/extension-task-list@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.11.2.tgz#e0bdb4ee44b823a7dcf8290126161d08bb55abe1"+ integrity sha512-Wy4EYZQJqt/Z6oTlZ+RvaPrDivkyyVuca5cOwcGavrFsUtqvEv/QKxvAl59fsRgofYW6QsfK72K2GpppBBlVUw==++"@tiptap/extension-text-align@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.11.2.tgz#bc2985d9affaed06bebbcf9e1904bf526490a5ab"+ integrity sha512-0QfjepmK+iHubjTsJshuhSZvF54M+vaqpReDraf9NKVx+WkiZ+mxJX4S5nZwoFsp21sEz7Q7z03+uXgb/yj7mQ==++"@tiptap/extension-text-style@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-2.11.2.tgz#5a7f068c251b39b07893110cbc546004944f880c"+ integrity sha512-RAa7BTwEOJRZN3EB2lg03KXyu7JC/Ce96cerh3D0Fo78yrtKOArPaiVHoTki6ZEIG43ccHEit1PPjMYxivPPeg==++"@tiptap/extension-text@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.11.2.tgz#743352716de6288191cd336fa1d676c391acda52"+ integrity sha512-fJZeKYM5jeJ7NpS3FWLnC/NAvg+mZNbcTaRgXMo5ljBCgiMcYHhYg9p/RHk4SeICZBBpR9WSSZXHMACd9CbJiA==++"@tiptap/pm@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.11.2.tgz#7f0cc0dcb11d8975958815c338848a1bbf2b400f"+ integrity sha512-lNOMFRcD0mGy7Hf8tFMHW/fnglvq3dA0grs0QrSY4cHyYbH9BHtQjLMDceczXdXbXZq7nEqC40UBWNnqtaclpw==+ dependencies:+ prosemirror-changeset "^2.2.1"+ prosemirror-collab "^1.3.1"+ prosemirror-commands "^1.6.2"+ prosemirror-dropcursor "^1.8.1"+ prosemirror-gapcursor "^1.3.2"+ prosemirror-history "^1.4.1"+ prosemirror-inputrules "^1.4.0"+ prosemirror-keymap "^1.2.2"+ prosemirror-markdown "^1.13.1"+ prosemirror-menu "^1.2.4"+ prosemirror-model "^1.23.0"+ prosemirror-schema-basic "^1.2.3"+ prosemirror-schema-list "^1.4.1"+ prosemirror-state "^1.4.3"+ prosemirror-tables "^1.6.1"+ prosemirror-trailing-node "^3.0.0"+ prosemirror-transform "^1.10.2"+ prosemirror-view "^1.37.0"++"@tiptap/react@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/react/-/react-2.11.2.tgz#2a3026bca6a0a59449f2510a2e930ef6e0dc7f1f"+ integrity sha512-fhrfgXQwyc34L6ju+zzNGMa6J94+W20yww0BHyrqojUzjpYskVdO7/37h4OBfFGEhrAhLEXXDxRZcrNPtBf86A==+ dependencies:+ "@tiptap/extension-bubble-menu" "^2.11.2"+ "@tiptap/extension-floating-menu" "^2.11.2"+ "@types/use-sync-external-store" "^0.0.6"+ fast-deep-equal "^3"+ use-sync-external-store "^1"++"@tiptap/starter-kit@^2.11.2":+ version "2.11.2"+ resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.11.2.tgz#de7012444dab4ee3cb5e61093e6a4ac9c0c9e98a"+ integrity sha512-FUIblP9BSmBzskf/aX7AIcUK5XP5Gi/VqUqm5evCkzlR1FrggLoy+vY+CX0me4oE/WYk4KAgIRXkE9tcbwotQA==+ dependencies:+ "@tiptap/core" "^2.11.2"+ "@tiptap/extension-blockquote" "^2.11.2"+ "@tiptap/extension-bold" "^2.11.2"+ "@tiptap/extension-bullet-list" "^2.11.2"+ "@tiptap/extension-code" "^2.11.2"+ "@tiptap/extension-code-block" "^2.11.2"+ "@tiptap/extension-document" "^2.11.2"+ "@tiptap/extension-dropcursor" "^2.11.2"+ "@tiptap/extension-gapcursor" "^2.11.2"+ "@tiptap/extension-hard-break" "^2.11.2"+ "@tiptap/extension-heading" "^2.11.2"+ "@tiptap/extension-history" "^2.11.2"+ "@tiptap/extension-horizontal-rule" "^2.11.2"+ "@tiptap/extension-italic" "^2.11.2"+ "@tiptap/extension-list-item" "^2.11.2"+ "@tiptap/extension-ordered-list" "^2.11.2"+ "@tiptap/extension-paragraph" "^2.11.2"+ "@tiptap/extension-strike" "^2.11.2"+ "@tiptap/extension-text" "^2.11.2"+ "@tiptap/extension-text-style" "^2.11.2"+ "@tiptap/pm" "^2.11.2"+"@tokenizer/token@^0.3.0":version "0.3.0"resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"@@ -2024,6 +2237,24 @@resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==+"@types/linkify-it@^5":+ version "5.0.0"+ resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-5.0.0.tgz#21413001973106cda1c3a9b91eedd4ccd5469d76"+ integrity sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==++"@types/markdown-it@^14.0.0":+ version "14.1.2"+ resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-14.1.2.tgz#57f2532a0800067d9b934f3521429a2e8bfb4c61"+ integrity sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==+ dependencies:+ "@types/linkify-it" "^5"+ "@types/mdurl" "^2"++"@types/mdurl@^2":+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-2.0.0.tgz#d43878b5b20222682163ae6f897b20447233bdfd"+ integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==+"@types/minimatch@*":version "5.1.2"resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"@@ -2129,11 +2360,6 @@"@types/glob" "~7.2.0""@types/node" "*"-"@types/showdown@^2.0.6":- version "2.0.6"- resolved "https://registry.yarnpkg.com/@types/showdown/-/showdown-2.0.6.tgz#3d7affd5f971b4a17783ec2b23b4ad3b97477b7e"- integrity sha512-pTvD/0CIeqe4x23+YJWlX2gArHa8G0J0Oh6GKaVXV7TAeickpkkZiNOgFcFcmLQ5lB/K0qBJL1FtRYltBfbGCQ==-"@types/tough-cookie@*":version "4.0.3"resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.3.tgz#3d06b6769518450871fbc40770b7586334bdfd90"@@ -2144,10 +2370,10 @@resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.5.tgz#5cac7e7df3275bb95f79594f192d97da3b4fd5fe"integrity sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA==-"@types/turndown@^5.0.5":- version "5.0.5"- resolved "https://registry.yarnpkg.com/@types/turndown/-/turndown-5.0.5.tgz#614de24fc9ace4d8c0d9483ba81dc8c1976dd26f"- integrity sha512-TL2IgGgc7B5j78rIccBtlYAnkuv8nUQqhQc+DSYV5j9Be9XOcm/SKOVRuA47xAVI3680Tk9B1d8flK2GWT2+4w==+"@types/use-sync-external-store@^0.0.6":+ version "0.0.6"+ resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz#60be8d21baab8c305132eb9cb912ed497852aadc"+ integrity sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="@typescript-eslint/parser@^5.42.0":version "5.49.0"@@ -2707,11 +2933,6 @@ commander@^4.0.0:resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==-commander@^9.0.0:- version "9.5.0"- resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"- integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==-version "0.0.1"resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"@@ -2788,6 +3009,11 @@ create-require@^1.1.0:resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==+crelt@^1.0.0:+ version "1.0.6"+ resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"+ integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==+cross-spawn@^7.0.2, cross-spawn@^7.0.3:version "7.0.3"resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"@@ -3417,7 +3643,7 @@ extsprintf@^1.2.0:resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:+fast-deep-equal@^3, fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:version "3.1.3"resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==@@ -4500,6 +4726,18 @@ lines-and-columns@^1.1.6:resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==+linkify-it@^5.0.0:+ version "5.0.0"+ resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"+ integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==+ dependencies:+ uc.micro "^2.0.0"++linkifyjs@^4.2.0:+ version "4.2.0"+ resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.2.0.tgz#9dd30222b9cbabec9c950e725ec00031c7fa3f08"+ integrity sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==+load-bmfont@^1.4.1:version "1.4.1"resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz#c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9"@@ -4562,6 +4800,23 @@ make-error@^1.1.1:resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==+markdown-it@^14.0.0:+ version "14.1.0"+ resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"+ integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==+ dependencies:+ argparse "^2.0.1"+ entities "^4.4.0"+ linkify-it "^5.0.0"+ mdurl "^2.0.0"+ punycode.js "^2.3.1"+ uc.micro "^2.1.0"++mdurl@^2.0.0:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0"+ integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==+"memoize-one@>=3.1.1 <6", memoize-one@^5.0.4:version "5.2.1"resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"@@ -5002,6 +5257,11 @@ optionator@^0.9.3:prelude-ls "^1.2.1"type-check "^0.4.0"+orderedmap@^2.0.0:+ version "2.1.1"+ resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.1.1.tgz#61481269c44031c449915497bf5a4ad273c512d2"+ integrity sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==+p-limit@^3.0.2:version "3.1.0"resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"@@ -5290,6 +5550,160 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:object-assign "^4.1.1"react-is "^16.13.1"+prosemirror-changeset@^2.2.1:+ version "2.2.1"+ resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.1.tgz#dae94b63aec618fac7bb9061648e6e2a79988383"+ integrity sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ==+ dependencies:+ prosemirror-transform "^1.0.0"++prosemirror-collab@^1.3.1:+ version "1.3.1"+ resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.3.1.tgz#0e8c91e76e009b53457eb3b3051fb68dad029a33"+ integrity sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==+ dependencies:+ prosemirror-state "^1.0.0"++prosemirror-commands@^1.0.0, prosemirror-commands@^1.6.2:+ version "1.6.2"+ resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.6.2.tgz#d9cf6654912442cff47daa1677eb43ebd0b1f117"+ integrity sha512-0nDHH++qcf/BuPLYvmqZTUUsPJUCPBUXt0J1ErTcDIS369CTp773itzLGIgIXG4LJXOlwYCr44+Mh4ii6MP1QA==+ dependencies:+ prosemirror-model "^1.0.0"+ prosemirror-state "^1.0.0"+ prosemirror-transform "^1.10.2"++prosemirror-dropcursor@^1.8.1:+ version "1.8.1"+ resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.1.tgz#49b9fb2f583e0d0f4021ff87db825faa2be2832d"+ integrity sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==+ dependencies:+ prosemirror-state "^1.0.0"+ prosemirror-transform "^1.1.0"+ prosemirror-view "^1.1.0"++prosemirror-gapcursor@^1.3.2:+ version "1.3.2"+ resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz#5fa336b83789c6199a7341c9493587e249215cb4"+ integrity sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==+ dependencies:+ prosemirror-keymap "^1.0.0"+ prosemirror-model "^1.0.0"+ prosemirror-state "^1.0.0"+ prosemirror-view "^1.0.0"++prosemirror-history@^1.0.0, prosemirror-history@^1.4.1:+ version "1.4.1"+ resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.4.1.tgz#cc370a46fb629e83a33946a0e12612e934ab8b98"+ integrity sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==+ dependencies:+ prosemirror-state "^1.2.2"+ prosemirror-transform "^1.0.0"+ prosemirror-view "^1.31.0"+ rope-sequence "^1.3.0"++prosemirror-inputrules@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.4.0.tgz#ef1519bb2cb0d1e0cec74bad1a97f1c1555068bb"+ integrity sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==+ dependencies:+ prosemirror-state "^1.0.0"+ prosemirror-transform "^1.0.0"++prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.2.2:+ version "1.2.2"+ resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz#14a54763a29c7b2704f561088ccf3384d14eb77e"+ integrity sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==+ dependencies:+ prosemirror-state "^1.0.0"+ w3c-keyname "^2.2.0"++prosemirror-markdown@^1.13.1:+ version "1.13.1"+ resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.13.1.tgz#23feb6652dacb3dd78ffd8f131da37c20e4e4cf8"+ integrity sha512-Sl+oMfMtAjWtlcZoj/5L/Q39MpEnVZ840Xo330WJWUvgyhNmLBLN7MsHn07s53nG/KImevWHSE6fEj4q/GihHw==+ dependencies:+ "@types/markdown-it" "^14.0.0"+ markdown-it "^14.0.0"+ prosemirror-model "^1.20.0"++prosemirror-menu@^1.2.4:+ version "1.2.4"+ resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.4.tgz#3cfdc7c06d10f9fbd1bce29082c498bd11a0a79a"+ integrity sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA==+ dependencies:+ crelt "^1.0.0"+ prosemirror-commands "^1.0.0"+ prosemirror-history "^1.0.0"+ prosemirror-state "^1.0.0"++prosemirror-model@^1.0.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.24.1:+ version "1.24.1"+ resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.24.1.tgz#b445e4f9b9cfc8c1a699215057b506842ebff1a9"+ integrity sha512-YM053N+vTThzlWJ/AtPtF1j0ebO36nvbmDy4U7qA2XQB8JVaQp1FmB9Jhrps8s+z+uxhhVTny4m20ptUvhk0Mg==+ dependencies:+ orderedmap "^2.0.0"++prosemirror-schema-basic@^1.2.3:+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.3.tgz#649c349bb21c61a56febf9deb71ac68fca4cedf2"+ integrity sha512-h+H0OQwZVqMon1PNn0AG9cTfx513zgIG2DY00eJ00Yvgb3UD+GQ/VlWW5rcaxacpCGT1Yx8nuhwXk4+QbXUfJA==+ dependencies:+ prosemirror-model "^1.19.0"++prosemirror-schema-list@^1.4.1:+ version "1.5.0"+ resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.5.0.tgz#f05ddbe2e71efc9157a0dbedf80761c08bda5192"+ integrity sha512-gg1tAfH1sqpECdhIHOA/aLg2VH3ROKBWQ4m8Qp9mBKrOxQRW61zc+gMCI8nh22gnBzd1t2u1/NPLmO3nAa3ssg==+ dependencies:+ prosemirror-model "^1.0.0"+ prosemirror-state "^1.0.0"+ prosemirror-transform "^1.7.3"++prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.4.3:+ version "1.4.3"+ resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.3.tgz#94aecf3ffd54ec37e87aa7179d13508da181a080"+ integrity sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==+ dependencies:+ prosemirror-model "^1.0.0"+ prosemirror-transform "^1.0.0"+ prosemirror-view "^1.27.0"++prosemirror-tables@^1.6.1:+ version "1.6.2"+ resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.6.2.tgz#cec9e9ac6ecf81d67147c19ab39125d56c8351ae"+ integrity sha512-97dKocVLrEVTQjZ4GBLdrrMw7Gv3no8H8yMwf5IRM9OoHrzbWpcH5jJxYgNQIRCtdIqwDctT1HdMHrGTiwp1dQ==+ dependencies:+ prosemirror-keymap "^1.2.2"+ prosemirror-model "^1.24.1"+ prosemirror-state "^1.4.3"+ prosemirror-transform "^1.10.2"+ prosemirror-view "^1.37.1"++prosemirror-trailing-node@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz#5bc223d4fc1e8d9145e4079ec77a932b54e19e04"+ integrity sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==+ dependencies:+ "@remirror/core-constants" "3.0.0"+ escape-string-regexp "^4.0.0"++prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.10.2, prosemirror-transform@^1.7.3:+ version "1.10.2"+ resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.10.2.tgz#8ebac4e305b586cd96595aa028118c9191bbf052"+ integrity sha512-2iUq0wv2iRoJO/zj5mv8uDUriOHWzXRnOTVgCzSXnktS/2iQRa3UUQwVlkBlYZFtygw6Nh1+X4mGqoYBINn5KQ==+ dependencies:+ prosemirror-model "^1.21.0"++prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.37.0, prosemirror-view@^1.37.1:+ version "1.37.1"+ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.37.1.tgz#3ccd67cd3d831eb37a2505dd34151932462172fb"+ integrity sha512-MEAnjOdXU1InxEmhjgmEzQAikaS6lF3hD64MveTPpjOGNTl87iRLA1HupC/DEV6YuK7m4Q9DHFNTjwIVtqz5NA==+ dependencies:+ prosemirror-model "^1.20.0"+ prosemirror-state "^1.0.0"+ prosemirror-transform "^1.1.0"+proxy-from-env@^1.1.0:version "1.1.0"resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"@@ -5305,6 +5719,11 @@ pstree.remy@^1.1.8:resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==+punycode.js@^2.3.1:+ version "2.3.1"+ resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"+ integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:version "2.3.0"resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"@@ -5639,6 +6058,11 @@ rimraf@^3.0.2:dependencies:glob "^7.1.3"+rope-sequence@^1.3.0:+ version "1.3.4"+ resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.4.tgz#df85711aaecd32f1e756f76e43a415171235d425"+ integrity sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==+rrweb-cssom@^0.6.0:version "0.6.0"resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"@@ -5761,13 +6185,6 @@ shell-quote@^1.8.1:resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==-showdown@^2.1.0:- version "2.1.0"- resolved "https://registry.yarnpkg.com/showdown/-/showdown-2.1.0.tgz#1251f5ed8f773f0c0c7bfc8e6fd23581f9e545c5"- integrity sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==- dependencies:- commander "^9.0.0"-side-channel@^1.0.4:version "1.0.4"resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"@@ -6139,6 +6556,13 @@ tinycolor2@^1.6.0:resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e"integrity sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==+tippy.js@^6.3.7:+ version "6.3.7"+ resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"+ integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==+ dependencies:+ "@popperjs/core" "^2.9.0"+to-fast-properties@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"@@ -6269,13 +6693,6 @@ tunnel-agent@^0.6.0:dependencies:safe-buffer "^5.0.1"-turndown@^7.2.0:- version "7.2.0"- resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.2.0.tgz#67d614fe8371fb511079a93345abfd156c0ffcf4"- integrity sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==- dependencies:- "@mixmark-io/domino" "^2.2.0"-tweetnacl@^0.14.3, tweetnacl@~0.14.0:version "0.14.5"resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"@@ -6307,6 +6724,11 @@ [email protected]:resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==+uc.micro@^2.0.0, uc.micro@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"+ integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==+uglify-js@^3.1.4:version "3.17.4"resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"@@ -6400,6 +6822,11 @@ [email protected]:resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==+use-sync-external-store@^1:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz#adbc795d8eeb47029963016cefdf89dc799fcebc"+ integrity sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==+utif2@^4.0.1:version "4.1.0"resolved "https://registry.yarnpkg.com/utif2/-/utif2-4.1.0.tgz#e768d37bd619b995d56d9780b5d2b4611a3d932b"@@ -6448,6 +6875,11 @@ [email protected]:resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==+w3c-keyname@^2.2.0:+ version "2.2.8"+ resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"+ integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==+w3c-xmlserializer@^4.0.0:version "4.0.0"resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"