{
+ editor.chain().focus().deleteRange(range).insertSubpages().run();
+ },
+ },
{
title: "Iframe embed",
description: "Embed any Iframe",
diff --git a/apps/client/src/features/editor/components/subpages/subpages-menu.tsx b/apps/client/src/features/editor/components/subpages/subpages-menu.tsx
new file mode 100644
index 00000000..6cc017e2
--- /dev/null
+++ b/apps/client/src/features/editor/components/subpages/subpages-menu.tsx
@@ -0,0 +1,95 @@
+import {
+ BubbleMenu as BaseBubbleMenu,
+ posToDOMRect,
+ findParentNode,
+} from "@tiptap/react";
+import { Node as PMNode } from "@tiptap/pm/model";
+import React, { useCallback } from "react";
+import { ActionIcon, Tooltip } from "@mantine/core";
+import { IconTrash } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { Editor } from "@tiptap/core";
+import { sticky } from "tippy.js";
+
+interface SubpagesMenuProps {
+ editor: Editor;
+}
+
+interface ShouldShowProps {
+ state: any;
+ from?: number;
+ to?: number;
+}
+
+export const SubpagesMenu = React.memo(
+ ({ editor }: SubpagesMenuProps): JSX.Element => {
+ const { t } = useTranslation();
+
+ const shouldShow = useCallback(
+ ({ state }: ShouldShowProps) => {
+ if (!state) {
+ return false;
+ }
+
+ return editor.isActive("subpages");
+ },
+ [editor],
+ );
+
+ const getReferenceClientRect = useCallback(() => {
+ const { selection } = editor.state;
+ const predicate = (node: PMNode) => node.type.name === "subpages";
+ const parent = findParentNode(predicate)(selection);
+
+ if (parent) {
+ const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
+ return dom.getBoundingClientRect();
+ }
+
+ return posToDOMRect(editor.view, selection.from, selection.to);
+ }, [editor]);
+
+ const deleteNode = useCallback(() => {
+ const { selection } = editor.state;
+ editor
+ .chain()
+ .focus()
+ .setNodeSelection(selection.from)
+ .deleteSelection()
+ .run();
+ }, [editor]);
+
+ return (
+
+
+
+
+
+
+
+ );
+ },
+);
+
+export default SubpagesMenu;
diff --git a/apps/client/src/features/editor/components/subpages/subpages-view.tsx b/apps/client/src/features/editor/components/subpages/subpages-view.tsx
new file mode 100644
index 00000000..525e2ec9
--- /dev/null
+++ b/apps/client/src/features/editor/components/subpages/subpages-view.tsx
@@ -0,0 +1,120 @@
+import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
+import { Stack, Text, Anchor, ActionIcon } from "@mantine/core";
+import { IconFileDescription } from "@tabler/icons-react";
+import { useGetSidebarPagesQuery } from "@/features/page/queries/page-query";
+import { useMemo } from "react";
+import { Link, useParams } from "react-router-dom";
+import classes from "./subpages.module.css";
+import styles from "../mention/mention.module.css";
+import {
+ buildPageUrl,
+ buildSharedPageUrl,
+} from "@/features/page/page.utils.ts";
+import { useTranslation } from "react-i18next";
+import { sortPositionKeys } from "@/features/page/tree/utils/utils";
+import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
+
+export default function SubpagesView(props: NodeViewProps) {
+ const { editor } = props;
+ const { spaceSlug, shareId } = useParams();
+ const { t } = useTranslation();
+
+ const currentPageId = editor.storage.pageId;
+
+ // Get subpages from shared tree if we're in a shared context
+ const sharedSubpages = useSharedPageSubpages(currentPageId);
+
+ const { data, isLoading, error } = useGetSidebarPagesQuery({
+ pageId: currentPageId,
+ });
+
+ const subpages = useMemo(() => {
+ // If we're in a shared context, use the shared subpages
+ if (shareId && sharedSubpages) {
+ return sharedSubpages.map((node) => ({
+ id: node.value,
+ slugId: node.slugId,
+ title: node.name,
+ icon: node.icon,
+ position: node.position,
+ }));
+ }
+
+ // Otherwise use the API data
+ if (!data?.pages) return [];
+ const allPages = data.pages.flatMap((page) => page.items);
+ return sortPositionKeys(allPages);
+ }, [data, shareId, sharedSubpages]);
+
+ if (isLoading && !shareId) {
+ return null;
+ }
+
+ if (error && !shareId) {
+ return (
+
+
+ {t("Failed to load subpages")}
+
+
+ );
+ }
+
+ if (subpages.length === 0) {
+ return (
+
+
+
+ {t("No subpages")}
+
+
+
+ );
+ }
+
+ return (
+
+
+
+ {subpages.map((page) => (
+
+ {page?.icon ? (
+ {page.icon}
+ ) : (
+
+
+
+ )}
+
+
+ {page?.title || t("untitled")}
+
+
+ ))}
+
+
+ );
+}
diff --git a/apps/client/src/features/editor/components/subpages/subpages.module.css b/apps/client/src/features/editor/components/subpages/subpages.module.css
new file mode 100644
index 00000000..fb43eaf6
--- /dev/null
+++ b/apps/client/src/features/editor/components/subpages/subpages.module.css
@@ -0,0 +1,9 @@
+.container {
+ margin: 0;
+ padding-left: 4px;
+ user-select: none;
+
+ a {
+ border: none !important;
+ }
+}
diff --git a/apps/client/src/features/editor/extensions/extensions.ts b/apps/client/src/features/editor/extensions/extensions.ts
index 922bcd59..51009b43 100644
--- a/apps/client/src/features/editor/extensions/extensions.ts
+++ b/apps/client/src/features/editor/extensions/extensions.ts
@@ -38,6 +38,8 @@ import {
Embed,
SearchAndReplace,
Mention,
+ Subpages,
+ TableDndExtension,
} from "@docmost/editor-ext";
import {
randomElement,
@@ -57,6 +59,7 @@ import CodeBlockView from "@/features/editor/components/code-block/code-block-vi
import DrawioView from "../components/drawio/drawio-view";
import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-view.tsx";
import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
+import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
import plaintext from "highlight.js/lib/languages/plaintext";
import powershell from "highlight.js/lib/languages/powershell";
import abap from "highlightjs-sap-abap";
@@ -168,6 +171,7 @@ export const mainExtensions = [
TableRow,
TableCell,
TableHeader,
+ TableDndExtension,
MathInline.configure({
view: MathInlineView,
}),
@@ -212,6 +216,9 @@ export const mainExtensions = [
Embed.configure({
view: EmbedView,
}),
+ Subpages.configure({
+ view: SubpagesView,
+ }),
MarkdownClipboard.configure({
transformPastedText: true,
}),
diff --git a/apps/client/src/features/editor/page-editor.tsx b/apps/client/src/features/editor/page-editor.tsx
index 5d88b208..e97a783f 100644
--- a/apps/client/src/features/editor/page-editor.tsx
+++ b/apps/client/src/features/editor/page-editor.tsx
@@ -31,6 +31,7 @@ import TableMenu from "@/features/editor/components/table/table-menu.tsx";
import ImageMenu from "@/features/editor/components/image/image-menu.tsx";
import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
import VideoMenu from "@/features/editor/components/video/video-menu.tsx";
+import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx";
import {
handleFileDrop,
handlePaste,
@@ -49,6 +50,7 @@ import { extractPageSlugId } from "@/lib";
import { FIVE_MINUTES } from "@/lib/constants.ts";
import { PageEditMode } from "@/features/user/types/user.types.ts";
import { jwtDecode } from "jwt-decode";
+import { searchSpotlight } from '@/features/search/constants.ts';
interface PageEditorProps {
pageId: string;
@@ -221,6 +223,10 @@ export default function PageEditor({
event.preventDefault();
return true;
}
+ if ((event.ctrlKey || event.metaKey) && event.code === 'KeyK') {
+ searchSpotlight.open();
+ return true;
+ }
if (["ArrowUp", "ArrowDown", "Enter"].includes(event.key)) {
const slashCommand = document.querySelector("#slash-command");
if (slashCommand) {
@@ -375,7 +381,7 @@ export default function PageEditor({
}
return (
-
+
@@ -391,6 +397,7 @@ export default function PageEditor({
+
diff --git a/apps/client/src/features/editor/readonly-page-editor.tsx b/apps/client/src/features/editor/readonly-page-editor.tsx
index bd6b9f6b..c1352354 100644
--- a/apps/client/src/features/editor/readonly-page-editor.tsx
+++ b/apps/client/src/features/editor/readonly-page-editor.tsx
@@ -6,21 +6,19 @@ import { Document } from "@tiptap/extension-document";
import { Heading } from "@tiptap/extension-heading";
import { Text } from "@tiptap/extension-text";
import { Placeholder } from "@tiptap/extension-placeholder";
-import { useAtom } from "jotai/index";
-import {
- pageEditorAtom,
- readOnlyEditorAtom,
-} from "@/features/editor/atoms/editor-atoms.ts";
-import { Editor } from "@tiptap/core";
+import { useAtom } from "jotai";
+import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
interface PageEditorProps {
title: string;
content: any;
+ pageId?: string;
}
export default function ReadonlyPageEditor({
title,
content,
+ pageId,
}: PageEditorProps) {
const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
@@ -56,6 +54,9 @@ export default function ReadonlyPageEditor({
content={content}
onCreate={({ editor }) => {
if (editor) {
+ if (pageId) {
+ editor.storage.pageId = pageId;
+ }
// @ts-ignore
setReadOnlyEditor(editor);
}
diff --git a/apps/client/src/features/editor/styles/drag-handle.css b/apps/client/src/features/editor/styles/drag-handle.css
index e1d3ae4b..f77c9630 100644
--- a/apps/client/src/features/editor/styles/drag-handle.css
+++ b/apps/client/src/features/editor/styles/drag-handle.css
@@ -45,6 +45,10 @@
display: none;
pointer-events: none;
}
+
+ &[data-direction='horizontal'] {
+ rotate: 90deg;
+ }
}
.dark .drag-handle {
diff --git a/apps/client/src/features/editor/styles/table.css b/apps/client/src/features/editor/styles/table.css
index d60a299c..9926d0bc 100644
--- a/apps/client/src/features/editor/styles/table.css
+++ b/apps/client/src/features/editor/styles/table.css
@@ -8,6 +8,16 @@
}
}
+.table-dnd-preview {
+ padding: 0;
+ background-color: rgba(255, 255, 255, 0.3);
+ backdrop-filter: blur(2px);
+}
+
+.table-dnd-drop-indicator {
+ background-color: #adf;
+}
+
.ProseMirror {
table {
border-collapse: collapse;
@@ -118,3 +128,13 @@
}
}
}
+
+.editor-container:has(.table-dnd-drop-indicator[data-dragging="true"]) {
+ .prosemirror-dropcursor-block {
+ display: none;
+ }
+
+ .prosemirror-dropcursor-inline {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/apps/client/src/features/editor/title-editor.tsx b/apps/client/src/features/editor/title-editor.tsx
index 937ae374..f7665ecb 100644
--- a/apps/client/src/features/editor/title-editor.tsx
+++ b/apps/client/src/features/editor/title-editor.tsx
@@ -26,6 +26,7 @@ import { UpdateEvent } from "@/features/websocket/types";
import localEmitter from "@/lib/local-emitter.ts";
import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
import { PageEditMode } from "@/features/user/types/user.types.ts";
+import { searchSpotlight } from "@/features/search/constants.ts";
export interface TitleEditorProps {
pageId: string;
@@ -86,6 +87,20 @@ export function TitleEditor({
content: title,
immediatelyRender: true,
shouldRerenderOnTransaction: false,
+ editorProps: {
+ handleDOMEvents: {
+ keydown: (_view, event) => {
+ if ((event.ctrlKey || event.metaKey) && event.code === "KeyS") {
+ event.preventDefault();
+ return true;
+ }
+ if ((event.ctrlKey || event.metaKey) && event.code === "KeyK") {
+ searchSpotlight.open();
+ return true;
+ }
+ },
+ },
+ },
});
useEffect(() => {
@@ -193,7 +208,7 @@ export function TitleEditor({
onKeyDown={(event) => {
// First handle the search hotkey
getHotkeyHandler([["mod+F", openSearchDialog]])(event);
-
+
// Then handle other key events
handleTitleKeyDown(event);
}}
diff --git a/apps/client/src/features/page/queries/page-query.ts b/apps/client/src/features/page/queries/page-query.ts
index cfd8b10a..64d03ddd 100644
--- a/apps/client/src/features/page/queries/page-query.ts
+++ b/apps/client/src/features/page/queries/page-query.ts
@@ -252,6 +252,7 @@ export function useGetSidebarPagesQuery(
): UseInfiniteQueryResult
, unknown>> {
return useInfiniteQuery({
queryKey: ["sidebar-pages", data],
+ enabled: !!data?.pageId || !!data?.spaceId,
queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
initialPageParam: 1,
getPreviousPageParam: (firstPage) =>
diff --git a/apps/client/src/features/page/types/page.types.ts b/apps/client/src/features/page/types/page.types.ts
index 052dda35..a5078564 100644
--- a/apps/client/src/features/page/types/page.types.ts
+++ b/apps/client/src/features/page/types/page.types.ts
@@ -60,7 +60,7 @@ export interface ICopyPageToSpace {
}
export interface SidebarPagesParams {
- spaceId: string;
+ spaceId?: string;
pageId?: string;
page?: number; // pagination
}
diff --git a/apps/client/src/features/search/components/search-result-item.tsx b/apps/client/src/features/search/components/search-result-item.tsx
new file mode 100644
index 00000000..76b74f29
--- /dev/null
+++ b/apps/client/src/features/search/components/search-result-item.tsx
@@ -0,0 +1,124 @@
+import React from "react";
+import { Group, Center, Text, Badge, ActionIcon } from "@mantine/core";
+import { Spotlight } from "@mantine/spotlight";
+import { Link } from "react-router-dom";
+import { IconFile, IconDownload } from "@tabler/icons-react";
+import { buildPageUrl } from "@/features/page/page.utils";
+import { getPageIcon } from "@/lib";
+import {
+ IAttachmentSearch,
+ IPageSearch,
+} from "@/features/search/types/search.types";
+import DOMPurify from "dompurify";
+
+interface SearchResultItemProps {
+ result: IPageSearch | IAttachmentSearch;
+ isAttachmentResult: boolean;
+ showSpace?: boolean;
+}
+
+export function SearchResultItem({
+ result,
+ isAttachmentResult,
+ showSpace,
+}: SearchResultItemProps) {
+ if (isAttachmentResult) {
+ const attachmentResult = result as IAttachmentSearch;
+
+ const handleDownload = (e: React.MouseEvent) => {
+ e.preventDefault();
+ e.stopPropagation();
+ const downloadUrl = `/api/files/${attachmentResult.id}/${attachmentResult.fileName}`;
+ window.open(downloadUrl, "_blank");
+ };
+
+ return (
+
+
+
+
+
+
+
+ {attachmentResult.fileName}
+
+ {attachmentResult.space.name} • {attachmentResult.page.title}
+
+
+ {attachmentResult?.highlight && (
+
+ )}
+
+
+
+
+
+
+
+ );
+ } else {
+ const pageResult = result as IPageSearch;
+ return (
+
+
+ {getPageIcon(pageResult?.icon)}
+
+
+ {pageResult.title}
+
+ {showSpace && pageResult.space && (
+
+ {pageResult.space.name}
+
+ )}
+
+ {pageResult?.highlight && (
+
+ )}
+
+
+
+ );
+ }
+}
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.module.css b/apps/client/src/features/search/components/search-spotlight-filters.module.css
new file mode 100644
index 00000000..e8073aab
--- /dev/null
+++ b/apps/client/src/features/search/components/search-spotlight-filters.module.css
@@ -0,0 +1,19 @@
+.filtersContainer {
+ display: flex;
+ gap: 8px;
+ overflow-x: auto;
+ padding: 8px 0;
+ scrollbar-width: thin;
+}
+
+.filterButton {
+ white-space: nowrap;
+ flex-shrink: 0;
+ font-size: 13px;
+ height: 32px;
+ padding: 0 12px;
+ color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-6));
+ &:hover {
+ color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-6));
+ }
+}
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.tsx b/apps/client/src/features/search/components/search-spotlight-filters.tsx
new file mode 100644
index 00000000..d8f770e7
--- /dev/null
+++ b/apps/client/src/features/search/components/search-spotlight-filters.tsx
@@ -0,0 +1,252 @@
+import React, { useState, useMemo, useEffect } from "react";
+import {
+ Button,
+ Menu,
+ Text,
+ TextInput,
+ Divider,
+ Badge,
+ ScrollArea,
+ Avatar,
+ Group,
+ getDefaultZIndex,
+} from "@mantine/core";
+import {
+ IconChevronDown,
+ IconBuilding,
+ IconFileDescription,
+ IconSearch,
+ IconCheck,
+} from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { useDebouncedValue } from "@mantine/hooks";
+import { useGetSpacesQuery } from "@/features/space/queries/space-query";
+import { useLicense } from "@/ee/hooks/use-license";
+import classes from "./search-spotlight-filters.module.css";
+
+interface SearchSpotlightFiltersProps {
+ onFiltersChange?: (filters: any) => void;
+ spaceId?: string;
+}
+
+export function SearchSpotlightFilters({
+ onFiltersChange,
+ spaceId,
+}: SearchSpotlightFiltersProps) {
+ const { t } = useTranslation();
+ const { hasLicenseKey } = useLicense();
+ const [selectedSpaceId, setSelectedSpaceId] = useState(
+ spaceId || null,
+ );
+ const [spaceSearchQuery, setSpaceSearchQuery] = useState("");
+ const [debouncedSpaceQuery] = useDebouncedValue(spaceSearchQuery, 300);
+ const [contentType, setContentType] = useState("page");
+
+ const { data: spacesData } = useGetSpacesQuery({
+ page: 1,
+ limit: 100,
+ query: debouncedSpaceQuery,
+ });
+
+ const selectedSpaceData = useMemo(() => {
+ if (!spacesData?.items || !selectedSpaceId) return null;
+ return spacesData.items.find((space) => space.id === selectedSpaceId);
+ }, [spacesData?.items, selectedSpaceId]);
+
+ const availableSpaces = useMemo(() => {
+ const spaces = spacesData?.items || [];
+ if (!selectedSpaceId) return spaces;
+
+ // Sort to put selected space first
+ return [...spaces].sort((a, b) => {
+ if (a.id === selectedSpaceId) return -1;
+ if (b.id === selectedSpaceId) return 1;
+ return 0;
+ });
+ }, [spacesData?.items, selectedSpaceId]);
+
+ useEffect(() => {
+ if (onFiltersChange) {
+ onFiltersChange({
+ spaceId: selectedSpaceId,
+ contentType,
+ });
+ }
+ }, []);
+
+ const contentTypeOptions = [
+ { value: "page", label: "Pages" },
+ {
+ value: "attachment",
+ label: "Attachments",
+ disabled: !hasLicenseKey,
+ },
+ ];
+
+ const handleSpaceSelect = (spaceId: string | null) => {
+ setSelectedSpaceId(spaceId);
+
+ if (onFiltersChange) {
+ onFiltersChange({
+ spaceId: spaceId,
+ contentType,
+ });
+ }
+ };
+
+ const handleFilterChange = (filterType: string, value: any) => {
+ let newSelectedSpaceId = selectedSpaceId;
+ let newContentType = contentType;
+
+ switch (filterType) {
+ case "spaceId":
+ newSelectedSpaceId = value;
+ setSelectedSpaceId(value);
+ break;
+ case "contentType":
+ newContentType = value;
+ setContentType(value);
+ break;
+ }
+
+ if (onFiltersChange) {
+ onFiltersChange({
+ spaceId: newSelectedSpaceId,
+ contentType: newContentType,
+ });
+ }
+ };
+
+ return (
+
+
+
+
+
+
+
+
+
+ {query.length === 0 && resultItems.length === 0 && (
+ {t("Start typing to search...")}
+ )}
+
+ {query.length > 0 && !isLoading && resultItems.length === 0 && (
+ {t("No results found...")}
+ )}
+
+ {resultItems.length > 0 && <>{resultItems}}
+
+
+
+ );
+}
diff --git a/apps/client/src/features/search/share-search-spotlight.tsx b/apps/client/src/features/search/components/share-search-spotlight.tsx
similarity index 90%
rename from apps/client/src/features/search/share-search-spotlight.tsx
rename to apps/client/src/features/search/components/share-search-spotlight.tsx
index bfbced6e..dd0d5181 100644
--- a/apps/client/src/features/search/share-search-spotlight.tsx
+++ b/apps/client/src/features/search/components/share-search-spotlight.tsx
@@ -9,6 +9,7 @@ import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
import { getPageIcon } from "@/lib";
import { useTranslation } from "react-i18next";
import { shareSearchSpotlightStore } from "@/features/search/constants.ts";
+import DOMPurify from "dompurify";
interface ShareSearchSpotlightProps {
shareId?: string;
@@ -47,7 +48,12 @@ export function ShareSearchSpotlight({ shareId }: ShareSearchSpotlightProps) {
)}
diff --git a/apps/client/src/features/search/hooks/use-unified-search.ts b/apps/client/src/features/search/hooks/use-unified-search.ts
new file mode 100644
index 00000000..2adccc25
--- /dev/null
+++ b/apps/client/src/features/search/hooks/use-unified-search.ts
@@ -0,0 +1,42 @@
+import { useQuery, UseQueryResult } from "@tanstack/react-query";
+import {
+ searchPage,
+ searchAttachments,
+} from "@/features/search/services/search-service";
+import {
+ IAttachmentSearch,
+ IPageSearch,
+ IPageSearchParams,
+} from "@/features/search/types/search.types";
+import { useLicense } from "@/ee/hooks/use-license";
+
+export type UnifiedSearchResult = IPageSearch | IAttachmentSearch;
+
+export interface UseUnifiedSearchParams extends IPageSearchParams {
+ contentType?: string;
+}
+
+export function useUnifiedSearch(
+ params: UseUnifiedSearchParams,
+): UseQueryResult
{
+ const { hasLicenseKey } = useLicense();
+
+ const isAttachmentSearch =
+ params.contentType === "attachment" && hasLicenseKey;
+ const searchType = isAttachmentSearch ? "attachment" : "page";
+
+ return useQuery({
+ queryKey: ["unified-search", searchType, params],
+ queryFn: async () => {
+ // Remove contentType from backend params since it's only used for frontend routing
+ const { contentType, ...backendParams } = params;
+
+ if (isAttachmentSearch) {
+ return await searchAttachments(backendParams);
+ } else {
+ return await searchPage(backendParams);
+ }
+ },
+ enabled: !!params.query,
+ });
+}
diff --git a/apps/client/src/features/search/queries/search-query.ts b/apps/client/src/features/search/queries/search-query.ts
index 6b8c0296..bc91dfac 100644
--- a/apps/client/src/features/search/queries/search-query.ts
+++ b/apps/client/src/features/search/queries/search-query.ts
@@ -1,15 +1,17 @@
import { useQuery, UseQueryResult } from "@tanstack/react-query";
import {
+ searchAttachments,
searchPage,
searchShare,
searchSuggestions,
-} from "@/features/search/services/search-service";
+} from '@/features/search/services/search-service';
import {
+ IAttachmentSearch,
IPageSearch,
IPageSearchParams,
ISuggestionResult,
SearchSuggestionParams,
-} from "@/features/search/types/search.types";
+} from '@/features/search/types/search.types';
export function usePageSearchQuery(
params: IPageSearchParams,
@@ -41,3 +43,13 @@ export function useShareSearchQuery(
enabled: !!params.query,
});
}
+
+export function useAttachmentSearchQuery(
+ params: IPageSearchParams,
+): UseQueryResult {
+ return useQuery({
+ queryKey: ["attachment-search", params],
+ queryFn: () => searchAttachments(params),
+ enabled: !!params.query,
+ });
+}
diff --git a/apps/client/src/features/search/search-spotlight.tsx b/apps/client/src/features/search/search-spotlight.tsx
deleted file mode 100644
index 581524fc..00000000
--- a/apps/client/src/features/search/search-spotlight.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Group, Center, Text } from "@mantine/core";
-import { Spotlight } from "@mantine/spotlight";
-import { IconSearch } from "@tabler/icons-react";
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
-import { useDebouncedValue } from "@mantine/hooks";
-import { usePageSearchQuery } from "@/features/search/queries/search-query";
-import { buildPageUrl } from "@/features/page/page.utils.ts";
-import { getPageIcon } from "@/lib";
-import { useTranslation } from "react-i18next";
-import { searchSpotlightStore } from "./constants";
-
-interface SearchSpotlightProps {
- spaceId?: string;
-}
-export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
- const { t } = useTranslation();
- const [query, setQuery] = useState("");
- const [debouncedSearchQuery] = useDebouncedValue(query, 300);
-
- const { data: searchResults } = usePageSearchQuery({
- query: debouncedSearchQuery,
- spaceId,
- });
-
- const pages = (
- searchResults && searchResults.length > 0 ? searchResults : []
- ).map((page) => (
-
-
- {getPageIcon(page?.icon)}
-
-
- {page.title}
-
- {page?.highlight && (
-
- )}
-
-
-
- ));
-
- return (
- <>
-
- }
- />
-
- {query.length === 0 && pages.length === 0 && (
- {t("Start typing to search...")}
- )}
-
- {query.length > 0 && pages.length === 0 && (
- {t("No results found...")}
- )}
-
- {pages.length > 0 && pages}
-
-
-
- );
-}
diff --git a/apps/client/src/features/search/services/search-service.ts b/apps/client/src/features/search/services/search-service.ts
index 8ea4e6a6..417e3f11 100644
--- a/apps/client/src/features/search/services/search-service.ts
+++ b/apps/client/src/features/search/services/search-service.ts
@@ -1,10 +1,11 @@
import api from "@/lib/api-client";
import {
+ IAttachmentSearch,
IPageSearch,
IPageSearchParams,
ISuggestionResult,
SearchSuggestionParams,
-} from "@/features/search/types/search.types";
+} from '@/features/search/types/search.types';
export async function searchPage(
params: IPageSearchParams,
@@ -26,3 +27,10 @@ export async function searchShare(
const req = await api.post("/search/share-search", params);
return req.data;
}
+
+export async function searchAttachments(
+ params: IPageSearchParams,
+): Promise {
+ const req = await api.post("/search-attachments", params);
+ return req.data;
+}
diff --git a/apps/client/src/features/search/types/search.types.ts b/apps/client/src/features/search/types/search.types.ts
index 1338e121..9962b9ca 100644
--- a/apps/client/src/features/search/types/search.types.ts
+++ b/apps/client/src/features/search/types/search.types.ts
@@ -37,3 +37,25 @@ export interface IPageSearchParams {
spaceId?: string;
shareId?: string;
}
+
+export interface IAttachmentSearch {
+ id: string;
+ fileName: string;
+ pageId: string;
+ creatorId: string;
+ createdAt: Date;
+ updatedAt: Date;
+ rank: string;
+ highlight: string;
+ space: {
+ id: string;
+ name: string;
+ slug: string;
+ icon: string;
+ };
+ page: {
+ id: string;
+ title: string;
+ slugId: string;
+ };
+}
diff --git a/apps/client/src/features/share/atoms/shared-page-atom.ts b/apps/client/src/features/share/atoms/shared-page-atom.ts
new file mode 100644
index 00000000..813f5e61
--- /dev/null
+++ b/apps/client/src/features/share/atoms/shared-page-atom.ts
@@ -0,0 +1,6 @@
+import { atom } from "jotai";
+import { ISharedPageTree } from "@/features/share/types/share.types";
+import { SharedPageTreeNode } from "@/features/share/utils";
+
+export const sharedPageTreeAtom = atom(null);
+export const sharedTreeDataAtom = atom(null);
\ No newline at end of file
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index 8550f59f..a300172e 100644
--- a/apps/client/src/features/share/components/share-shell.tsx
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -1,9 +1,7 @@
-import React from "react";
+import React, { useEffect, useMemo } from "react";
import {
ActionIcon,
- Affix,
AppShell,
- Button,
Group,
ScrollArea,
Tooltip,
@@ -14,8 +12,10 @@ import SharedTree from "@/features/share/components/shared-tree.tsx";
import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
import { ThemeToggle } from "@/components/theme-toggle.tsx";
-import { useAtomValue } from "jotai";
+import { useAtomValue, useSetAtom } from "jotai";
import { useAtom } from "jotai";
+import { sharedPageTreeAtom, sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
+import { buildSharedPageTree } from "@/features/share/utils";
import {
desktopSidebarAtom,
mobileSidebarAtom,
@@ -34,7 +34,7 @@ import {
SearchControl,
SearchMobileControl,
} from "@/features/search/components/search-control.tsx";
-import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
+import { ShareSearchSpotlight } from "@/features/search/components/share-search-spotlight.tsx";
import { shareSearchSpotlight } from "@/features/search/constants";
import ShareBranding from '@/features/share/components/share-branding.tsx';
@@ -60,6 +60,22 @@ export default function ShareShell({
const { data } = useGetSharedPageTreeQuery(shareId);
const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
+ // @ts-ignore
+ const setSharedPageTree = useSetAtom(sharedPageTreeAtom);
+ // @ts-ignore
+ const setSharedTreeData = useSetAtom(sharedTreeDataAtom);
+
+ // Build and set the tree data when it changes
+ const treeData = useMemo(() => {
+ if (!data?.pageTree) return null;
+ return buildSharedPageTree(data.pageTree);
+ }, [data?.pageTree]);
+
+ useEffect(() => {
+ setSharedPageTree(data || null);
+ setSharedTreeData(treeData);
+ }, [data, treeData, setSharedPageTree, setSharedTreeData]);
+
return (
{
+ if (!treeData || !pageId) return [];
+
+ function findSubpages(nodes: SharedPageTreeNode[]): SharedPageTreeNode[] {
+ for (const node of nodes) {
+ if (node.value === pageId || node.slugId === pageId) {
+ return node.children || [];
+ }
+ if (node.children && node.children.length > 0) {
+ const subpages = findSubpages(node.children);
+ if (subpages.length > 0) {
+ return subpages;
+ }
+ }
+ }
+ return [];
+ }
+
+ return findSubpages(treeData);
+ }, [treeData, pageId]);
+}
diff --git a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
index f0235b3e..d650b178 100644
--- a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
+++ b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
@@ -19,7 +19,6 @@ import {
import classes from "./space-sidebar.module.css";
import React from "react";
import { useAtom } from "jotai";
-import { SearchSpotlight } from "@/features/search/search-spotlight.tsx";
import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
import { Link, useLocation, useParams } from "react-router-dom";
import clsx from "clsx";
@@ -195,8 +194,6 @@ export function SpaceSidebar() {
onClose={closeSettings}
spaceId={space?.slug}
/>
-
-
);
}
diff --git a/apps/client/src/features/user/atoms/current-user-atom.ts b/apps/client/src/features/user/atoms/current-user-atom.ts
index 49eab9d7..98c6f332 100644
--- a/apps/client/src/features/user/atoms/current-user-atom.ts
+++ b/apps/client/src/features/user/atoms/current-user-atom.ts
@@ -1,16 +1,41 @@
+import { atom } from "jotai";
import { atomWithStorage } from "jotai/utils";
-
-import { ICurrentUser } from "@/features/user/types/user.types";
-import { focusAtom } from "jotai-optics";
+import { ICurrentUser, IUser } from "@/features/user/types/user.types";
+import { IWorkspace } from "@/features/workspace/types/workspace.types";
export const currentUserAtom = atomWithStorage(
"currentUser",
null,
);
-export const userAtom = focusAtom(currentUserAtom, (optic) =>
- optic.prop("user"),
+export const userAtom = atom(
+ (get) => {
+ const currentUser = get(currentUserAtom);
+ return currentUser?.user ?? null;
+ },
+ (get, set, newUser: IUser) => {
+ const currentUser = get(currentUserAtom);
+ if (currentUser) {
+ set(currentUserAtom, {
+ ...currentUser,
+ user: newUser,
+ });
+ }
+ }
);
-export const workspaceAtom = focusAtom(currentUserAtom, (optic) =>
- optic.prop("workspace"),
+
+export const workspaceAtom = atom(
+ (get) => {
+ const currentUser = get(currentUserAtom);
+ return currentUser?.workspace ?? null;
+ },
+ (get, set, newWorkspace: IWorkspace) => {
+ const currentUser = get(currentUserAtom);
+ if (currentUser) {
+ set(currentUserAtom, {
+ ...currentUser,
+ workspace: newWorkspace,
+ });
+ }
+ }
);
diff --git a/apps/client/src/features/user/components/account-language.tsx b/apps/client/src/features/user/components/account-language.tsx
index b0093ed9..42a2331e 100644
--- a/apps/client/src/features/user/components/account-language.tsx
+++ b/apps/client/src/features/user/components/account-language.tsx
@@ -25,7 +25,7 @@ function LanguageSwitcher() {
const { t, i18n } = useTranslation();
const [user, setUser] = useAtom(userAtom);
const [language, setLanguage] = useState(
- user?.locale === "en" ? "en-US" : user.locale,
+ user?.locale === "en" ? "en-US" : user?.locale,
);
const handleChange = async (value: string) => {
diff --git a/apps/client/src/features/user/types/user.types.ts b/apps/client/src/features/user/types/user.types.ts
index 95060358..80d86706 100644
--- a/apps/client/src/features/user/types/user.types.ts
+++ b/apps/client/src/features/user/types/user.types.ts
@@ -20,6 +20,7 @@ export interface IUser {
deletedAt: Date;
fullPageWidth: boolean; // used for update
pageEditMode: string; // used for update
+ hasGeneratedPassword?: boolean;
}
export interface ICurrentUser {
diff --git a/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx b/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
index f8cd5d2d..60b46ed3 100644
--- a/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
+++ b/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
@@ -5,7 +5,8 @@ import { useState } from "react";
import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
import { IWorkspace } from "@/features/workspace/types/workspace.types.ts";
import { TextInput, Button } from "@mantine/core";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
import { notifications } from "@mantine/notifications";
import useUserRole from "@/hooks/use-user-role.tsx";
import { useTranslation } from "react-i18next";
diff --git a/apps/client/src/lib/app-route.ts b/apps/client/src/lib/app-route.ts
index dc42dad5..0151c856 100644
--- a/apps/client/src/lib/app-route.ts
+++ b/apps/client/src/lib/app-route.ts
@@ -1,6 +1,7 @@
const APP_ROUTE = {
HOME: "/home",
SPACES: "/spaces",
+ SEARCH: "/search",
AUTH: {
LOGIN: "/login",
SIGNUP: "/signup",
diff --git a/apps/client/src/pages/share/shared-page.tsx b/apps/client/src/pages/share/shared-page.tsx
index 50e5837d..274b76cb 100644
--- a/apps/client/src/pages/share/shared-page.tsx
+++ b/apps/client/src/pages/share/shared-page.tsx
@@ -52,6 +52,7 @@ export default function SharedPage() {
key={data.page.id}
title={data.page.title}
content={data.page.content}
+ pageId={data.page.id}
/>
diff --git a/apps/server/package.json b/apps/server/package.json
index 6d16b795..0824b522 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -67,6 +67,8 @@
"jsonwebtoken": "^9.0.2",
"kysely": "^0.28.2",
"kysely-migration-cli": "^0.4.2",
+ "ldapts": "^7.4.0",
+ "mammoth": "^1.10.0",
"mime-types": "^2.1.35",
"nanoid": "3.3.11",
"nestjs-kysely": "^1.2.0",
@@ -77,6 +79,7 @@
"p-limit": "^6.2.0",
"passport-google-oauth20": "^2.0.0",
"passport-jwt": "^4.0.1",
+ "pdfjs-dist": "^5.4.54",
"pg": "^8.16.0",
"pg-tsquery": "^8.4.2",
"pgvector": "^0.2.1",
diff --git a/apps/server/src/collaboration/collaboration.util.ts b/apps/server/src/collaboration/collaboration.util.ts
index 099d615e..37645f44 100644
--- a/apps/server/src/collaboration/collaboration.util.ts
+++ b/apps/server/src/collaboration/collaboration.util.ts
@@ -32,6 +32,7 @@ import {
Excalidraw,
Embed,
Mention,
+ Subpages,
} from '@docmost/editor-ext';
import { generateText, getSchema, JSONContent } from '@tiptap/core';
import { generateHTML } from '../common/helpers/prosemirror/html';
@@ -79,6 +80,7 @@ export const tiptapExtensions = [
Excalidraw,
Embed,
Mention,
+ Subpages,
] as any;
export function jsonToHtml(tiptapJson: any) {
diff --git a/apps/server/src/common/helpers/utils.ts b/apps/server/src/common/helpers/utils.ts
index 0bc7d708..1b672610 100644
--- a/apps/server/src/common/helpers/utils.ts
+++ b/apps/server/src/common/helpers/utils.ts
@@ -87,3 +87,12 @@ export function extractBearerTokenFromHeader(
const [type, token] = request.headers.authorization?.split(' ') ?? [];
return type === 'Bearer' ? token : undefined;
}
+
+export function hasLicenseOrEE(opts: {
+ licenseKey: string;
+ plan: string;
+ isCloud: boolean;
+}): boolean {
+ const { licenseKey, plan, isCloud } = opts;
+ return Boolean(licenseKey) || (isCloud && plan === 'business');
+}
diff --git a/apps/server/src/core/attachment/processors/attachment.processor.ts b/apps/server/src/core/attachment/processors/attachment.processor.ts
index 935c20a2..83323de5 100644
--- a/apps/server/src/core/attachment/processors/attachment.processor.ts
+++ b/apps/server/src/core/attachment/processors/attachment.processor.ts
@@ -3,12 +3,15 @@ import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
import { Job } from 'bullmq';
import { AttachmentService } from '../services/attachment.service';
import { QueueJob, QueueName } from 'src/integrations/queue/constants';
-import { Space } from '@docmost/db/types/entity.types';
+import { ModuleRef } from '@nestjs/core';
@Processor(QueueName.ATTACHMENT_QUEUE)
export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy {
private readonly logger = new Logger(AttachmentProcessor.name);
- constructor(private readonly attachmentService: AttachmentService) {
+ constructor(
+ private readonly attachmentService: AttachmentService,
+ private moduleRef: ModuleRef,
+ ) {
super();
}
@@ -25,6 +28,33 @@ export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy {
job.data.pageId,
);
}
+ if (
+ job.name === QueueJob.ATTACHMENT_INDEX_CONTENT ||
+ job.name === QueueJob.ATTACHMENT_INDEXING
+ ) {
+ let AttachmentEeModule: any;
+ try {
+ // eslint-disable-next-line @typescript-eslint/no-require-imports
+ AttachmentEeModule = require('./../../../ee/attachments-ee/attachment-ee.service');
+ } catch (err) {
+ this.logger.error(
+ 'Attachment enterprise module requested but EE module not bundled in this build',
+ );
+ return;
+ }
+ const attachmentEeService = this.moduleRef.get(
+ AttachmentEeModule.AttachmentEeService,
+ { strict: false },
+ );
+
+ if (job.name === QueueJob.ATTACHMENT_INDEX_CONTENT) {
+ await attachmentEeService.indexAttachment(job.data.attachmentId);
+ } else if (job.name === QueueJob.ATTACHMENT_INDEXING) {
+ await attachmentEeService.indexAttachments(
+ job.data.workspaceId,
+ );
+ }
+ }
} catch (err) {
throw err;
}
diff --git a/apps/server/src/core/attachment/services/attachment.service.ts b/apps/server/src/core/attachment/services/attachment.service.ts
index 6472c671..299ddb60 100644
--- a/apps/server/src/core/attachment/services/attachment.service.ts
+++ b/apps/server/src/core/attachment/services/attachment.service.ts
@@ -22,6 +22,9 @@ import { executeTx } from '@docmost/db/utils';
import { UserRepo } from '@docmost/db/repos/user/user.repo';
import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import { InjectQueue } from '@nestjs/bullmq';
+import { QueueJob, QueueName } from '../../../integrations/queue/constants';
+import { Queue } from 'bullmq';
@Injectable()
export class AttachmentService {
@@ -33,6 +36,7 @@ export class AttachmentService {
private readonly workspaceRepo: WorkspaceRepo,
private readonly spaceRepo: SpaceRepo,
@InjectKysely() private readonly db: KyselyDB,
+ @InjectQueue(QueueName.ATTACHMENT_QUEUE) private attachmentQueue: Queue,
) {}
async uploadFile(opts: {
@@ -99,6 +103,23 @@ export class AttachmentService {
pageId,
});
}
+
+ // Only index PDFs and DOCX files
+ if (['.pdf', '.docx'].includes(attachment.fileExt.toLowerCase())) {
+ await this.attachmentQueue.add(
+ QueueJob.ATTACHMENT_INDEX_CONTENT,
+ {
+ attachmentId: attachmentId,
+ },
+ {
+ attempts: 2,
+ backoff: {
+ type: 'exponential',
+ delay: 10000,
+ },
+ },
+ );
+ }
} catch (err) {
// delete uploaded file on error
this.logger.error(err);
@@ -367,4 +388,5 @@ export class AttachmentService {
throw err;
}
}
+
}
diff --git a/apps/server/src/core/auth/services/auth.service.ts b/apps/server/src/core/auth/services/auth.service.ts
index 72ffc521..d2dac116 100644
--- a/apps/server/src/core/auth/services/auth.service.ts
+++ b/apps/server/src/core/auth/services/auth.service.ts
@@ -106,6 +106,7 @@ export class AuthService {
await this.userRepo.updateUser(
{
password: newPasswordHash,
+ hasGeneratedPassword: false,
},
userId,
workspaceId,
@@ -186,6 +187,7 @@ export class AuthService {
await this.userRepo.updateUser(
{
password: newPasswordHash,
+ hasGeneratedPassword: false,
},
user.id,
workspace.id,
diff --git a/apps/server/src/core/page/dto/sidebar-page.dto.ts b/apps/server/src/core/page/dto/sidebar-page.dto.ts
index 4ea2bb20..012f64b0 100644
--- a/apps/server/src/core/page/dto/sidebar-page.dto.ts
+++ b/apps/server/src/core/page/dto/sidebar-page.dto.ts
@@ -1,7 +1,11 @@
-import { IsOptional, IsString } from 'class-validator';
+import { IsOptional, IsString, IsUUID } from 'class-validator';
import { SpaceIdDto } from './page.dto';
-export class SidebarPageDto extends SpaceIdDto {
+export class SidebarPageDto {
+ @IsOptional()
+ @IsUUID()
+ spaceId: string;
+
@IsOptional()
@IsString()
pageId: string;
diff --git a/apps/server/src/core/page/page.controller.ts b/apps/server/src/core/page/page.controller.ts
index 2f6dcf60..450874f7 100644
--- a/apps/server/src/core/page/page.controller.ts
+++ b/apps/server/src/core/page/page.controller.ts
@@ -254,21 +254,28 @@ export class PageController {
@Body() pagination: PaginationOptions,
@AuthUser() user: User,
) {
- const ability = await this.spaceAbility.createForUser(user, dto.spaceId);
+ if (!dto.spaceId && !dto.pageId) {
+ throw new BadRequestException(
+ 'Either spaceId or pageId must be provided',
+ );
+ }
+ let spaceId = dto.spaceId;
+
+ if (dto.pageId) {
+ const page = await this.pageRepo.findById(dto.pageId);
+ if (!page) {
+ throw new ForbiddenException();
+ }
+
+ spaceId = page.spaceId;
+ }
+
+ const ability = await this.spaceAbility.createForUser(user, spaceId);
if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
throw new ForbiddenException();
}
- let pageId = null;
- if (dto.pageId) {
- const page = await this.pageRepo.findById(dto.pageId);
- if (page.spaceId !== dto.spaceId) {
- throw new ForbiddenException();
- }
- pageId = page.id;
- }
-
- return this.pageService.getSidebarPages(dto.spaceId, pagination, pageId);
+ return this.pageService.getSidebarPages(spaceId, pagination, dto.pageId);
}
@HttpCode(HttpStatus.OK)
diff --git a/apps/server/src/core/search/dto/search.dto.ts b/apps/server/src/core/search/dto/search.dto.ts
index 8dffef02..40486a52 100644
--- a/apps/server/src/core/search/dto/search.dto.ts
+++ b/apps/server/src/core/search/dto/search.dto.ts
@@ -5,15 +5,13 @@ import {
IsOptional,
IsString,
} from 'class-validator';
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto';
export class SearchDTO {
@IsNotEmpty()
@IsString()
query: string;
- @IsNotEmpty()
+ @IsOptional()
@IsString()
spaceId: string;
diff --git a/apps/server/src/core/share/share.controller.ts b/apps/server/src/core/share/share.controller.ts
index b9a9fcbf..ef6e9b2a 100644
--- a/apps/server/src/core/share/share.controller.ts
+++ b/apps/server/src/core/share/share.controller.ts
@@ -31,6 +31,7 @@ import { Public } from '../../common/decorators/public.decorator';
import { ShareRepo } from '@docmost/db/repos/share/share.repo';
import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
import { EnvironmentService } from '../../integrations/environment/environment.service';
+import { hasLicenseOrEE } from '../../common/helpers';
@UseGuards(JwtAuthGuard)
@Controller('shares')
@@ -65,9 +66,11 @@ export class ShareController {
return {
...(await this.shareService.getSharedPage(dto, workspace.id)),
- hasLicenseKey:
- Boolean(workspace.licenseKey) ||
- (this.environmentService.isCloud() && workspace.plan === 'business'),
+ hasLicenseKey: hasLicenseOrEE({
+ licenseKey: workspace.licenseKey,
+ isCloud: this.environmentService.isCloud(),
+ plan: workspace.plan,
+ }),
};
}
@@ -175,9 +178,11 @@ export class ShareController {
) {
return {
...(await this.shareService.getShareTree(dto.shareId, workspace.id)),
- hasLicenseKey:
- Boolean(workspace.licenseKey) ||
- (this.environmentService.isCloud() && workspace.plan === 'business'),
+ hasLicenseKey: hasLicenseOrEE({
+ licenseKey: workspace.licenseKey,
+ isCloud: this.environmentService.isCloud(),
+ plan: workspace.plan,
+ }),
};
}
}
diff --git a/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
new file mode 100644
index 00000000..26167805
--- /dev/null
+++ b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
@@ -0,0 +1,15 @@
+import { type Kysely } from 'kysely';
+
+export async function up(db: Kysely): Promise {
+ await db.schema
+ .alterTable('auth_providers')
+ .addColumn('group_sync', 'boolean', (col) => col.defaultTo(false).notNull())
+ .execute();
+}
+
+export async function down(db: Kysely): Promise {
+ await db.schema
+ .alterTable('auth_providers')
+ .dropColumn('group_sync')
+ .execute();
+}
diff --git a/apps/server/src/database/migrations/20250831T202306-ldap-auth.ts b/apps/server/src/database/migrations/20250831T202306-ldap-auth.ts
new file mode 100644
index 00000000..82ab8493
--- /dev/null
+++ b/apps/server/src/database/migrations/20250831T202306-ldap-auth.ts
@@ -0,0 +1,68 @@
+import { type Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely): Promise {
+ // switch type to text column since you can't add value to PG types in a transaction
+ await db.schema
+ .alterTable('auth_providers')
+ .alterColumn('type', (col) => col.setDataType('text'))
+ .execute();
+
+ await db.schema.dropType('auth_provider_type').ifExists().execute();
+
+ await db.schema
+ .alterTable('users')
+ .addColumn('has_generated_password', 'boolean', (col) =>
+ col.notNull().defaultTo(false).ifNotExists(),
+ )
+ .execute();
+
+ await db.schema
+ .alterTable('auth_providers')
+ .addColumn('ldap_url', 'varchar', (col) => col)
+ .addColumn('ldap_bind_dn', 'varchar', (col) => col)
+ .addColumn('ldap_bind_password', 'varchar', (col) => col)
+ .addColumn('ldap_base_dn', 'varchar', (col) => col)
+ .addColumn('ldap_user_search_filter', 'varchar', (col) => col)
+ .addColumn('ldap_user_attributes', 'jsonb', (col) =>
+ col.defaultTo(sql`'{}'::jsonb`),
+ )
+ .addColumn('ldap_tls_enabled', 'boolean', (col) => col.defaultTo(false))
+ .addColumn('ldap_tls_ca_cert', 'text', (col) => col)
+ .addColumn('ldap_config', 'jsonb', (col) => col.defaultTo(sql`'{}'::jsonb`))
+ .addColumn('settings', 'jsonb', (col) => col.defaultTo(sql`'{}'::jsonb`))
+ .execute();
+}
+
+export async function down(db: Kysely): Promise {
+ await db.schema
+ .alterTable('users')
+ .dropColumn('has_generated_password')
+ .execute();
+
+ await db.schema
+ .alterTable('auth_providers')
+ .dropColumn('ldap_url')
+ .dropColumn('ldap_bind_dn')
+ .dropColumn('ldap_bind_password')
+ .dropColumn('ldap_base_dn')
+ .dropColumn('ldap_user_search_filter')
+ .dropColumn('ldap_user_attributes')
+ .dropColumn('ldap_tls_enabled')
+ .dropColumn('ldap_tls_ca_cert')
+ .dropColumn('ldap_config')
+ .dropColumn('settings')
+ .execute();
+
+ await db.schema
+ .createType('auth_provider_type')
+ .asEnum(['saml', 'oidc', 'google'])
+ .execute();
+
+ await db.deleteFrom('auth_providers').where('type', '=', 'ldap').execute();
+
+ await sql`
+ ALTER TABLE auth_providers
+ ALTER COLUMN type TYPE auth_provider_type
+ USING type::auth_provider_type
+ `.execute(db);
+}
diff --git a/apps/server/src/database/migrations/20250901T184612-attachments-search.ts b/apps/server/src/database/migrations/20250901T184612-attachments-search.ts
new file mode 100644
index 00000000..a543adf6
--- /dev/null
+++ b/apps/server/src/database/migrations/20250901T184612-attachments-search.ts
@@ -0,0 +1,29 @@
+import { type Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely): Promise {
+ await db.schema
+ .alterTable('attachments')
+ .addColumn('text_content', 'text', (col) => col)
+ .addColumn('tsv', sql`tsvector`, (col) => col)
+ .execute();
+
+ await db.schema
+ .createIndex('attachments_tsv_idx')
+ .on('attachments')
+ .using('GIN')
+ .column('tsv')
+ .execute();
+}
+
+export async function down(db: Kysely): Promise {
+ await db.schema
+ .alterTable('attachments')
+ .dropIndex('attachments_tsv_idx')
+ .execute();
+
+ await db.schema
+ .alterTable('attachments')
+ .dropColumn('text_content')
+ .dropColumn('tsv')
+ .execute();
+}
diff --git a/apps/server/src/database/repos/attachment/attachment.repo.ts b/apps/server/src/database/repos/attachment/attachment.repo.ts
index 784e6c84..5824ce5f 100644
--- a/apps/server/src/database/repos/attachment/attachment.repo.ts
+++ b/apps/server/src/database/repos/attachment/attachment.repo.ts
@@ -12,6 +12,23 @@ import {
export class AttachmentRepo {
constructor(@InjectKysely() private readonly db: KyselyDB) {}
+ private baseFields: Array = [
+ 'id',
+ 'fileName',
+ 'filePath',
+ 'fileSize',
+ 'fileExt',
+ 'mimeType',
+ 'type',
+ 'creatorId',
+ 'pageId',
+ 'spaceId',
+ 'workspaceId',
+ 'createdAt',
+ 'updatedAt',
+ 'deletedAt',
+ ];
+
async findById(
attachmentId: string,
opts?: {
@@ -22,7 +39,7 @@ export class AttachmentRepo {
return db
.selectFrom('attachments')
- .selectAll()
+ .select(this.baseFields)
.where('id', '=', attachmentId)
.executeTakeFirst();
}
@@ -36,7 +53,7 @@ export class AttachmentRepo {
return db
.insertInto('attachments')
.values(insertableAttachment)
- .returningAll()
+ .returning(this.baseFields)
.executeTakeFirst();
}
@@ -50,7 +67,7 @@ export class AttachmentRepo {
return db
.selectFrom('attachments')
- .selectAll()
+ .select(this.baseFields)
.where('spaceId', '=', spaceId)
.execute();
}
@@ -64,6 +81,7 @@ export class AttachmentRepo {
.updateTable('attachments')
.set(updatableAttachment)
.where('pageId', 'in', pageIds)
+ .returning(this.baseFields)
.executeTakeFirst();
}
@@ -75,7 +93,7 @@ export class AttachmentRepo {
.updateTable('attachments')
.set(updatableAttachment)
.where('id', '=', attachmentId)
- .returningAll()
+ .returning(this.baseFields)
.executeTakeFirst();
}
diff --git a/apps/server/src/database/repos/page/page.repo.ts b/apps/server/src/database/repos/page/page.repo.ts
index 26cb4745..0ceca366 100644
--- a/apps/server/src/database/repos/page/page.repo.ts
+++ b/apps/server/src/database/repos/page/page.repo.ts
@@ -401,6 +401,7 @@ export class PageRepo {
])
.$if(opts?.includeContent, (qb) => qb.select('content'))
.where('id', '=', parentPageId)
+ .where('deletedAt', 'is', null)
.unionAll((exp) =>
exp
.selectFrom('pages as p')
@@ -415,7 +416,8 @@ export class PageRepo {
'p.workspaceId',
])
.$if(opts?.includeContent, (qb) => qb.select('p.content'))
- .innerJoin('page_hierarchy as ph', 'p.parentPageId', 'ph.id'),
+ .innerJoin('page_hierarchy as ph', 'p.parentPageId', 'ph.id')
+ .where('p.deletedAt', 'is', null),
),
)
.selectFrom('page_hierarchy')
diff --git a/apps/server/src/database/repos/user/user.repo.ts b/apps/server/src/database/repos/user/user.repo.ts
index 86cc8510..c7c7b2b2 100644
--- a/apps/server/src/database/repos/user/user.repo.ts
+++ b/apps/server/src/database/repos/user/user.repo.ts
@@ -34,6 +34,7 @@ export class UserRepo {
'createdAt',
'updatedAt',
'deletedAt',
+ 'hasGeneratedPassword',
];
async findById(
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index e8662649..2f8baaf7 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -5,8 +5,6 @@
import type { ColumnType } from "kysely";
-export type AuthProviderType = "google" | "oidc" | "saml";
-
export type Generated = T extends ColumnType
? ColumnType
: ColumnType;
@@ -39,6 +37,8 @@ export interface Attachments {
mimeType: string | null;
pageId: string | null;
spaceId: string | null;
+ textContent: string | null;
+ tsv: string | null;
type: string | null;
updatedAt: Generated;
workspaceId: string;
@@ -62,13 +62,24 @@ export interface AuthProviders {
deletedAt: Timestamp | null;
id: Generated;
isEnabled: Generated;
+ groupSync: Generated;
+ ldapBaseDn: string | null;
+ ldapBindDn: string | null;
+ ldapBindPassword: string | null;
+ ldapTlsCaCert: string | null;
+ ldapTlsEnabled: Generated;
+ ldapUrl: string | null;
+ ldapUserAttributes: Json | null;
+ ldapUserSearchFilter: string | null;
+ ldapConfig: Json | null;
+ settings: Json | null;
name: string;
oidcClientId: string | null;
oidcClientSecret: string | null;
oidcIssuer: string | null;
samlCertificate: string | null;
samlUrl: string | null;
- type: AuthProviderType;
+ type: string;
updatedAt: Generated;
workspaceId: string;
}
@@ -275,6 +286,7 @@ export interface Users {
lastActiveAt: Timestamp | null;
lastLoginAt: Timestamp | null;
locale: string | null;
+ hasGeneratedPassword: Generated;
name: string | null;
password: string | null;
role: string | null;
diff --git a/apps/server/src/integrations/export/export.controller.ts b/apps/server/src/integrations/export/export.controller.ts
index 7ecea668..9d49d108 100644
--- a/apps/server/src/integrations/export/export.controller.ts
+++ b/apps/server/src/integrations/export/export.controller.ts
@@ -46,7 +46,7 @@ export class ExportController {
includeContent: true,
});
- if (!page) {
+ if (!page || page.deletedAt) {
throw new NotFoundException('Page not found');
}
diff --git a/apps/server/src/integrations/queue/constants/queue.constants.ts b/apps/server/src/integrations/queue/constants/queue.constants.ts
index c345e956..cf630817 100644
--- a/apps/server/src/integrations/queue/constants/queue.constants.ts
+++ b/apps/server/src/integrations/queue/constants/queue.constants.ts
@@ -10,6 +10,8 @@ export enum QueueName {
export enum QueueJob {
SEND_EMAIL = 'send-email',
DELETE_SPACE_ATTACHMENTS = 'delete-space-attachments',
+ ATTACHMENT_INDEX_CONTENT = 'attachment-index-content',
+ ATTACHMENT_INDEXING = 'attachment-indexing',
DELETE_PAGE_ATTACHMENTS = 'delete-page-attachments',
PAGE_CONTENT_UPDATE = 'page-content-update',
diff --git a/package.json b/package.json
index 4b14083e..707c262f 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"dependencies": {
"@braintree/sanitize-url": "^7.1.0",
"@docmost/editor-ext": "workspace:*",
+ "@floating-ui/dom": "^1.7.3",
"@hocuspocus/extension-redis": "^2.15.2",
"@hocuspocus/provider": "^2.15.2",
"@hocuspocus/server": "^2.15.2",
diff --git a/packages/editor-ext/src/index.ts b/packages/editor-ext/src/index.ts
index d3e1d53d..a0efaa1b 100644
--- a/packages/editor-ext/src/index.ts
+++ b/packages/editor-ext/src/index.ts
@@ -19,3 +19,4 @@ export * from "./lib/mention";
export * from "./lib/markdown";
export * from "./lib/search-and-replace";
export * from "./lib/embed-provider";
+export * from "./lib/subpages";
diff --git a/packages/editor-ext/src/lib/callout/callout.ts b/packages/editor-ext/src/lib/callout/callout.ts
index c756917b..97c5dfcc 100644
--- a/packages/editor-ext/src/lib/callout/callout.ts
+++ b/packages/editor-ext/src/lib/callout/callout.ts
@@ -18,6 +18,10 @@ export interface CalloutAttributes {
* The type of callout.
*/
type: CalloutType;
+ /**
+ * The custom icon name for the callout.
+ */
+ icon?: string;
}
declare module "@tiptap/core" {
@@ -27,6 +31,7 @@ declare module "@tiptap/core" {
unsetCallout: () => ReturnType;
toggleCallout: (attributes?: CalloutAttributes) => ReturnType;
updateCalloutType: (type: CalloutType) => ReturnType;
+ updateCalloutIcon: (icon: string) => ReturnType;
};
}
}
@@ -58,6 +63,13 @@ export const Callout = Node.create({
"data-callout-type": attributes.type,
}),
},
+ icon: {
+ default: null,
+ parseHTML: (element) => element.getAttribute("data-callout-icon"),
+ renderHTML: (attributes) => ({
+ "data-callout-icon": attributes.icon,
+ }),
+ },
};
},
@@ -107,6 +119,13 @@ export const Callout = Node.create({
commands.updateAttributes("callout", {
type: getValidCalloutType(type),
}),
+
+ updateCalloutIcon:
+ (icon: string) =>
+ ({ commands }) =>
+ commands.updateAttributes("callout", {
+ icon: icon || null,
+ }),
};
},
diff --git a/packages/editor-ext/src/lib/subpages/index.ts b/packages/editor-ext/src/lib/subpages/index.ts
new file mode 100644
index 00000000..27a974a6
--- /dev/null
+++ b/packages/editor-ext/src/lib/subpages/index.ts
@@ -0,0 +1,2 @@
+export { Subpages } from "./subpages";
+export type { SubpagesAttributes, SubpagesOptions } from "./subpages";
diff --git a/packages/editor-ext/src/lib/subpages/subpages.ts b/packages/editor-ext/src/lib/subpages/subpages.ts
new file mode 100644
index 00000000..620f0342
--- /dev/null
+++ b/packages/editor-ext/src/lib/subpages/subpages.ts
@@ -0,0 +1,68 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+export interface SubpagesOptions {
+ HTMLAttributes: Record;
+ view: any;
+}
+
+export interface SubpagesAttributes {}
+
+declare module "@tiptap/core" {
+ interface Commands {
+ subpages: {
+ insertSubpages: (attributes?: SubpagesAttributes) => ReturnType;
+ };
+ }
+}
+
+export const Subpages = Node.create({
+ name: "subpages",
+
+ addOptions() {
+ return {
+ HTMLAttributes: {},
+ view: null,
+ };
+ },
+
+ group: "block",
+ atom: true,
+ draggable: false,
+
+ parseHTML() {
+ return [
+ {
+ tag: `div[data-type="${this.name}"]`,
+ },
+ ];
+ },
+
+ renderHTML({ HTMLAttributes }) {
+ return [
+ "div",
+ mergeAttributes(
+ { "data-type": this.name },
+ this.options.HTMLAttributes,
+ HTMLAttributes,
+ ),
+ ];
+ },
+
+ addCommands() {
+ return {
+ insertSubpages:
+ (attributes) =>
+ ({ commands }) => {
+ return commands.insertContent({
+ type: this.name,
+ attrs: attributes,
+ });
+ },
+ };
+ },
+
+ addNodeView() {
+ return ReactNodeViewRenderer(this.options.view);
+ },
+});
diff --git a/packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts b/packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts
new file mode 100644
index 00000000..9b8304d5
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts
@@ -0,0 +1,76 @@
+import { DraggingDOMs } from "./utils";
+
+const EDGE_THRESHOLD = 100;
+const SCROLL_SPEED = 10;
+
+export class AutoScrollController {
+ private _autoScrollInterval?: number;
+
+ checkYAutoScroll = (clientY: number) => {
+ const scrollContainer = document.documentElement;
+
+ if (clientY < 0 + EDGE_THRESHOLD) {
+ this._startYAutoScroll(scrollContainer!, -1 * SCROLL_SPEED);
+ } else if (clientY > window.innerHeight - EDGE_THRESHOLD) {
+ this._startYAutoScroll(scrollContainer!, SCROLL_SPEED);
+ } else {
+ this._stopYAutoScroll();
+ }
+ }
+
+ checkXAutoScroll = (clientX: number, draggingDOMs: DraggingDOMs) => {
+ const table = draggingDOMs?.table;
+ if (!table) return;
+
+ const scrollContainer = table.closest('.tableWrapper');
+ const editorRect = scrollContainer.getBoundingClientRect();
+ if (!scrollContainer) return;
+
+ if (clientX < editorRect.left + EDGE_THRESHOLD) {
+ this._startXAutoScroll(scrollContainer!, -1 * SCROLL_SPEED);
+ } else if (clientX > editorRect.right - EDGE_THRESHOLD) {
+ this._startXAutoScroll(scrollContainer!, SCROLL_SPEED);
+ } else {
+ this._stopXAutoScroll();
+ }
+ }
+
+ stop = () => {
+ this._stopXAutoScroll();
+ this._stopYAutoScroll();
+ }
+
+ private _startXAutoScroll = (scrollContainer: HTMLElement, speed: number) => {
+ if (this._autoScrollInterval) {
+ clearInterval(this._autoScrollInterval);
+ }
+
+ this._autoScrollInterval = window.setInterval(() => {
+ scrollContainer.scrollLeft += speed;
+ }, 16);
+ }
+
+ private _stopXAutoScroll = () => {
+ if (this._autoScrollInterval) {
+ clearInterval(this._autoScrollInterval);
+ this._autoScrollInterval = undefined;
+ }
+ }
+
+ private _startYAutoScroll = (scrollContainer: HTMLElement, speed: number) => {
+ if (this._autoScrollInterval) {
+ clearInterval(this._autoScrollInterval);
+ }
+
+ this._autoScrollInterval = window.setInterval(() => {
+ scrollContainer.scrollTop += speed;
+ }, 16);
+ }
+
+ private _stopYAutoScroll = () => {
+ if (this._autoScrollInterval) {
+ clearInterval(this._autoScrollInterval);
+ this._autoScrollInterval = undefined;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts b/packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts
new file mode 100644
index 00000000..8bdb68ad
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts
@@ -0,0 +1,44 @@
+function findDragOverElement(
+ elements: Element[],
+ pointer: number,
+ axis: 'x' | 'y',
+): [Element, number] | undefined {
+ const startProp = axis === 'x' ? 'left' : 'top'
+ const endProp = axis === 'x' ? 'right' : 'bottom'
+ const lastIndex = elements.length - 1
+
+ const index = elements.findIndex((el, index) => {
+ const rect = el.getBoundingClientRect()
+ const boundaryStart = rect[startProp]
+ const boundaryEnd = rect[endProp]
+
+ // The pointer is within the boundary of the current element.
+ if (boundaryStart <= pointer && pointer <= boundaryEnd) return true
+ // The pointer is beyond the last element.
+ if (index === lastIndex && pointer > boundaryEnd) return true
+ // The pointer is before the first element.
+ if (index === 0 && pointer < boundaryStart) return true
+
+ return false
+ })
+
+ return index >= 0 ? [elements[index], index] : undefined
+}
+
+export function getDragOverColumn(
+ table: HTMLTableElement,
+ pointerX: number,
+): [element: Element, index: number] | undefined {
+ const firstRow = table.querySelector('tr')
+ if (!firstRow) return
+ const cells = Array.from(firstRow.children)
+ return findDragOverElement(cells, pointerX, 'x')
+}
+
+export function getDragOverRow(
+ table: HTMLTableElement,
+ pointerY: number,
+): [element: Element, index: number] | undefined {
+ const rows = Array.from(table.querySelectorAll('tr'))
+ return findDragOverElement(rows, pointerY, 'y')
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts b/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
new file mode 100644
index 00000000..b4ac2950
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
@@ -0,0 +1,277 @@
+import { Editor, Extension } from "@tiptap/core";
+import { PluginKey, Plugin, PluginSpec } from "@tiptap/pm/state";
+import { EditorProps, EditorView } from "@tiptap/pm/view";
+import { DraggingDOMs, getDndRelatedDOMs, getHoveringCell, HoveringCellInfo } from "./utils";
+import { getDragOverColumn, getDragOverRow } from "./calc-drag-over";
+import { moveColumn, moveRow } from "../utils";
+import { PreviewController } from "./preview/preview-controller";
+import { DropIndicatorController } from "./preview/drop-indicator-controller";
+import { DragHandleController } from "./handle/drag-handle-controller";
+import { EmptyImageController } from "./handle/empty-image-controller";
+import { AutoScrollController } from "./auto-scroll-controller";
+
+export const TableDndKey = new PluginKey('table-drag-and-drop')
+
+class TableDragHandlePluginSpec implements PluginSpec {
+ key = TableDndKey
+ props: EditorProps>
+
+ private _colDragHandle: HTMLElement;
+ private _rowDragHandle: HTMLElement;
+ private _hoveringCell?: HoveringCellInfo;
+ private _disposables: (() => void)[] = [];
+ private _draggingCoords: { x: number; y: number } = { x: 0, y: 0 };
+ private _dragging = false;
+ private _draggingDirection: 'col' | 'row' = 'col';
+ private _draggingIndex = -1;
+ private _droppingIndex = -1;
+ private _draggingDOMs?: DraggingDOMs | undefined
+ private _startCoords: { x: number; y: number } = { x: 0, y: 0 };
+ private _previewController: PreviewController;
+ private _dropIndicatorController: DropIndicatorController;
+ private _dragHandleController: DragHandleController;
+ private _emptyImageController: EmptyImageController;
+ private _autoScrollController: AutoScrollController;
+
+ constructor(public editor: Editor) {
+ this.props = {
+ handleDOMEvents: {
+ pointerover: this._pointerOver,
+ }
+ }
+
+ this._dragHandleController = new DragHandleController();
+ this._colDragHandle = this._dragHandleController.colDragHandle;
+ this._rowDragHandle = this._dragHandleController.rowDragHandle;
+
+ this._previewController = new PreviewController();
+ this._dropIndicatorController = new DropIndicatorController();
+ this._emptyImageController = new EmptyImageController();
+
+ this._autoScrollController = new AutoScrollController();
+
+ this._bindDragEvents();
+ }
+
+ view = () => {
+ const wrapper = this.editor.options.element;
+ wrapper.appendChild(this._colDragHandle)
+ wrapper.appendChild(this._rowDragHandle)
+ wrapper.appendChild(this._previewController.previewRoot)
+ wrapper.appendChild(this._dropIndicatorController.dropIndicatorRoot)
+
+ return {
+ update: this.update,
+ destroy: this.destroy,
+ }
+ }
+
+ update = () => {}
+
+ destroy = () => {
+ if (!this.editor.isDestroyed) return;
+ this._dragHandleController.destroy();
+ this._emptyImageController.destroy();
+ this._previewController.destroy();
+ this._dropIndicatorController.destroy();
+ this._autoScrollController.stop();
+
+ this._disposables.forEach(disposable => disposable());
+ }
+
+ private _pointerOver = (view: EditorView, event: PointerEvent) => {
+ if (this._dragging) return;
+
+ // Don't show drag handles in readonly mode
+ if (!this.editor.isEditable) {
+ this._dragHandleController.hide();
+ return;
+ }
+
+ const hoveringCell = getHoveringCell(view, event)
+ this._hoveringCell = hoveringCell;
+ if (!hoveringCell) {
+ this._dragHandleController.hide();
+ } else {
+ this._dragHandleController.show(this.editor, hoveringCell);
+ }
+ }
+
+ private _onDragColStart = (event: DragEvent) => {
+ this._onDragStart(event, 'col');
+ }
+
+ private _onDraggingCol = (event: DragEvent) => {
+ const draggingDOMs = this._draggingDOMs;
+ if (!draggingDOMs) return;
+
+ this._draggingCoords = { x: event.clientX, y: event.clientY };
+ this._previewController.onDragging(draggingDOMs, this._draggingCoords.x, this._draggingCoords.y, 'col');
+
+ this._autoScrollController.checkXAutoScroll(event.clientX, draggingDOMs);
+
+ const direction = this._startCoords.x > this._draggingCoords.x ? 'left' : 'right';
+ const dragOverColumn = getDragOverColumn(draggingDOMs.table, this._draggingCoords.x);
+ if (!dragOverColumn) return;
+
+ const [col, index] = dragOverColumn;
+ this._droppingIndex = index;
+ this._dropIndicatorController.onDragging(col, direction, 'col');
+ }
+
+ private _onDragRowStart = (event: DragEvent) => {
+ this._onDragStart(event, 'row');
+ }
+
+ private _onDraggingRow = (event: DragEvent) => {
+ const draggingDOMs = this._draggingDOMs;
+ if (!draggingDOMs) return;
+
+ this._draggingCoords = { x: event.clientX, y: event.clientY };
+ this._previewController.onDragging(draggingDOMs, this._draggingCoords.x, this._draggingCoords.y, 'row');
+
+ this._autoScrollController.checkYAutoScroll(event.clientY);
+
+ const direction = this._startCoords.y > this._draggingCoords.y ? 'up' : 'down';
+ const dragOverRow = getDragOverRow(draggingDOMs.table, this._draggingCoords.y);
+ if (!dragOverRow) return;
+
+ const [row, index] = dragOverRow;
+ this._droppingIndex = index;
+ this._dropIndicatorController.onDragging(row, direction, 'row');
+ }
+
+ private _onDragEnd = () => {
+ this._dragging = false;
+ this._draggingIndex = -1;
+ this._droppingIndex = -1;
+ this._startCoords = { x: 0, y: 0 };
+ this._autoScrollController.stop();
+ this._dropIndicatorController.onDragEnd();
+ this._previewController.onDragEnd();
+ }
+
+ private _bindDragEvents = () => {
+ this._colDragHandle.addEventListener('dragstart', this._onDragColStart);
+ this._disposables.push(() => {
+ this._colDragHandle.removeEventListener('dragstart', this._onDragColStart);
+ })
+
+ this._colDragHandle.addEventListener('dragend', this._onDragEnd);
+ this._disposables.push(() => {
+ this._colDragHandle.removeEventListener('dragend', this._onDragEnd);
+ })
+
+ this._rowDragHandle.addEventListener('dragstart', this._onDragRowStart);
+ this._disposables.push(() => {
+ this._rowDragHandle.removeEventListener('dragstart', this._onDragRowStart);
+ })
+
+ this._rowDragHandle.addEventListener('dragend', this._onDragEnd);
+ this._disposables.push(() => {
+ this._rowDragHandle.removeEventListener('dragend', this._onDragEnd);
+ })
+
+ const ownerDocument = this.editor.view.dom?.ownerDocument
+ if (ownerDocument) {
+ // To make `drop` event work, we need to prevent the default behavior of the
+ // `dragover` event for drop zone. Here we set the whole document as the
+ // drop zone so that even the mouse moves outside the editor, the `drop`
+ // event will still be triggered.
+ ownerDocument.addEventListener('drop', this._onDrop);
+ ownerDocument.addEventListener('dragover', this._onDrag);
+ this._disposables.push(() => {
+ ownerDocument.removeEventListener('drop', this._onDrop);
+ ownerDocument.removeEventListener('dragover', this._onDrag);
+ });
+ }
+ }
+
+ private _onDragStart = (event: DragEvent, type: 'col' | 'row') => {
+ const dataTransfer = event.dataTransfer;
+ if (dataTransfer) {
+ dataTransfer.effectAllowed = 'move';
+ this._emptyImageController.hideDragImage(dataTransfer);
+ }
+ this._dragging = true;
+ this._draggingDirection = type;
+ this._startCoords = { x: event.clientX, y: event.clientY };
+ const draggingIndex = (type === 'col' ? this._hoveringCell?.colIndex : this._hoveringCell?.rowIndex) ?? 0;
+
+ this._draggingIndex = draggingIndex;
+
+ const relatedDoms = getDndRelatedDOMs(
+ this.editor.view,
+ this._hoveringCell?.cellPos,
+ draggingIndex,
+ type
+ )
+ this._draggingDOMs = relatedDoms;
+
+ const index = type === 'col' ? this._hoveringCell?.colIndex : this._hoveringCell?.rowIndex;
+
+ this._previewController.onDragStart(relatedDoms, index, type);
+ this._dropIndicatorController.onDragStart(relatedDoms, type);
+ }
+
+ private _onDrag = (event: DragEvent) => {
+ event.preventDefault()
+ if (!this._dragging) return;
+ if (this._draggingDirection === 'col') {
+ this._onDraggingCol(event);
+ } else {
+ this._onDraggingRow(event);
+ }
+ }
+
+ private _onDrop = () => {
+ if (!this._dragging) return;
+ const direction = this._draggingDirection;
+ const from = this._draggingIndex;
+ const to = this._droppingIndex;
+ const tr = this.editor.state.tr;
+ const pos = this.editor.state.selection.from;
+
+ if (direction === 'col') {
+ const canMove = moveColumn({
+ tr,
+ originIndex: from,
+ targetIndex: to,
+ select: true,
+ pos,
+ })
+ if (canMove) {
+ this.editor.view.dispatch(tr);
+ }
+
+ return;
+ }
+
+ if (direction === 'row') {
+ const canMove = moveRow({
+ tr,
+ originIndex: from,
+ targetIndex: to,
+ select: true,
+ pos,
+ })
+ if (canMove) {
+ this.editor.view.dispatch(tr);
+ }
+
+ return;
+ }
+ }
+}
+
+export const TableDndExtension = Extension.create({
+ name: 'table-drag-and-drop',
+ addProseMirrorPlugins() {
+ const editor = this.editor
+
+ const dragHandlePluginSpec = new TableDragHandlePluginSpec(editor)
+ const dragHandlePlugin = new Plugin(dragHandlePluginSpec)
+
+ return [dragHandlePlugin]
+ }
+})
diff --git a/packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts b/packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts
new file mode 100644
index 00000000..33137e91
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts
@@ -0,0 +1,105 @@
+import { Editor } from "@tiptap/core";
+import { HoveringCellInfo } from "../utils";
+import { computePosition, offset } from "@floating-ui/dom";
+
+export class DragHandleController {
+ private _colDragHandle: HTMLElement;
+ private _rowDragHandle: HTMLElement;
+
+ constructor() {
+ this._colDragHandle = this._createDragHandleDom('col');
+ this._rowDragHandle = this._createDragHandleDom('row');
+ }
+
+ get colDragHandle() {
+ return this._colDragHandle;
+ }
+
+ get rowDragHandle() {
+ return this._rowDragHandle;
+ }
+
+ show = (editor: Editor, hoveringCell: HoveringCellInfo) => {
+ this._showColDragHandle(editor, hoveringCell);
+ this._showRowDragHandle(editor, hoveringCell);
+ }
+
+ hide = () => {
+ Object.assign(this._colDragHandle.style, {
+ display: 'none',
+ left: '-999px',
+ top: '-999px',
+ });
+ Object.assign(this._rowDragHandle.style, {
+ display: 'none',
+ left: '-999px',
+ top: '-999px',
+ });
+ }
+
+ destroy = () => {
+ this._colDragHandle.remove()
+ this._rowDragHandle.remove()
+ }
+
+ private _createDragHandleDom = (type: 'col' | 'row') => {
+ const dragHandle = document.createElement('div')
+ dragHandle.classList.add('drag-handle')
+ dragHandle.setAttribute('draggable', 'true')
+ dragHandle.setAttribute('data-direction', type === 'col' ? 'horizontal' : 'vertical')
+ dragHandle.setAttribute('data-drag-handle', '')
+ Object.assign(dragHandle.style, {
+ position: 'absolute',
+ top: '-999px',
+ left: '-999px',
+ display: 'none',
+ })
+ return dragHandle;
+ }
+
+ private _showColDragHandle(editor: Editor, hoveringCell: HoveringCellInfo) {
+ const referenceCell = editor.view.nodeDOM(hoveringCell.colFirstCellPos);
+ if (!referenceCell) return;
+
+ const yOffset = -1 * parseInt(getComputedStyle(this._colDragHandle).height) / 2;
+
+ computePosition(
+ referenceCell as HTMLElement,
+ this._colDragHandle,
+ {
+ placement: 'top',
+ middleware: [offset(yOffset)]
+ }
+ )
+ .then(({ x, y }) => {
+ Object.assign(this._colDragHandle.style, {
+ display: 'block',
+ top: `${y}px`,
+ left: `${x}px`,
+ });
+ })
+ }
+
+ private _showRowDragHandle(editor: Editor, hoveringCell: HoveringCellInfo) {
+ const referenceCell = editor.view.nodeDOM(hoveringCell.rowFirstCellPos);
+ if (!referenceCell) return;
+
+ const xOffset = -1 * parseInt(getComputedStyle(this._rowDragHandle).width) / 2;
+
+ computePosition(
+ referenceCell as HTMLElement,
+ this._rowDragHandle,
+ {
+ middleware: [offset(xOffset)],
+ placement: 'left'
+ }
+ )
+ .then(({ x, y}) => {
+ Object.assign(this._rowDragHandle.style, {
+ display: 'block',
+ top: `${y}px`,
+ left: `${x}px`,
+ });
+ })
+ }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts b/packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts
new file mode 100644
index 00000000..8848a6b0
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts
@@ -0,0 +1,21 @@
+export class EmptyImageController {
+ private _emptyImage: HTMLImageElement;
+
+ constructor() {
+ this._emptyImage = new Image(1, 1);
+ this._emptyImage.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+ }
+
+ get emptyImage() {
+ return this._emptyImage;
+ }
+
+ hideDragImage = (dataTransfer: DataTransfer) => {
+ dataTransfer.effectAllowed = 'move';
+ dataTransfer.setDragImage(this._emptyImage, 0, 0);
+ }
+
+ destroy = () => {
+ this._emptyImage.remove();
+ }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/index.ts b/packages/editor-ext/src/lib/table/dnd/index.ts
new file mode 100644
index 00000000..cb21bec1
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/index.ts
@@ -0,0 +1 @@
+export * from './dnd-extension'
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts b/packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts
new file mode 100644
index 00000000..0f079828
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts
@@ -0,0 +1,102 @@
+import { computePosition, offset } from "@floating-ui/dom";
+import { DraggingDOMs } from "../utils";
+
+const DROP_INDICATOR_WIDTH = 2;
+
+export class DropIndicatorController {
+ private _dropIndicator: HTMLElement;
+
+ constructor() {
+ this._dropIndicator = document.createElement('div');
+ this._dropIndicator.classList.add('table-dnd-drop-indicator');
+ Object.assign(this._dropIndicator.style, {
+ position: 'absolute',
+ pointerEvents: 'none'
+ });
+ }
+
+ get dropIndicatorRoot() {
+ return this._dropIndicator;
+ }
+
+ onDragStart = (relatedDoms: DraggingDOMs, type: 'col' | 'row') => {
+ this._initDropIndicatorStyle(relatedDoms.table, type);
+ this._initDropIndicatorPosition(relatedDoms.cell, type);
+ this._dropIndicator.dataset.dragging = 'true';
+ }
+
+ onDragEnd = () => {
+ Object.assign(this._dropIndicator.style, { display: 'none' });
+ this._dropIndicator.dataset.dragging = 'false';
+ }
+
+ onDragging = (target: Element, direction: 'left' | 'right' | 'up' | 'down', type: 'col' | 'row') => {
+ if (type === 'col') {
+ void computePosition(target, this._dropIndicator, {
+ placement: direction === 'left' ? 'left' : 'right',
+ middleware: [offset((direction === 'left' ? -1 * DROP_INDICATOR_WIDTH : 0))],
+ }).then(({ x }) => {
+ Object.assign(this._dropIndicator.style, { left: `${x}px` });
+ })
+
+ return;
+ }
+
+ if (type === 'row') {
+ void computePosition(target, this._dropIndicator, {
+ placement: direction === 'up' ? 'top' : 'bottom',
+ middleware: [offset((direction === 'up' ? -1 * DROP_INDICATOR_WIDTH : 0))],
+ }).then(({ y }) => {
+ Object.assign(this._dropIndicator.style, { top: `${y}px` });
+ })
+
+ return;
+ }
+ }
+
+ destroy = () => {
+ this._dropIndicator.remove();
+ }
+
+ private _initDropIndicatorStyle = (table: HTMLElement, type: 'col' | 'row') => {
+ const tableRect = table.getBoundingClientRect();
+
+ if (type === 'col') {
+ Object.assign(this._dropIndicator.style, {
+ display: 'block',
+ width: `${DROP_INDICATOR_WIDTH}px`,
+ height: `${tableRect.height}px`,
+ });
+ return;
+ }
+
+ if (type === 'row') {
+ Object.assign(this._dropIndicator.style, {
+ display: 'block',
+ width: `${tableRect.width}px`,
+ height: `${DROP_INDICATOR_WIDTH}px`,
+ });
+ }
+ }
+
+
+ private _initDropIndicatorPosition = (cell: HTMLElement, type: 'col' | 'row') => {
+ void computePosition(cell, this._dropIndicator, {
+ placement: type === 'row' ? 'right' : 'bottom',
+ middleware: [
+ offset(({ rects }) => {
+ if (type === 'col') {
+ return -rects.reference.height
+ }
+ return -rects.reference.width
+ }),
+ ],
+ }).then(({ x, y }) => {
+ Object.assign(this._dropIndicator.style, {
+ left: `${x}px`,
+ top: `${y}px`,
+ })
+ });
+ }
+
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts b/packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts
new file mode 100644
index 00000000..b7a0ea40
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts
@@ -0,0 +1,122 @@
+import { computePosition, offset, ReferenceElement } from "@floating-ui/dom";
+import { DraggingDOMs } from "../utils";
+import { clearPreviewDOM, createPreviewDOM } from "./render-preview";
+
+export class PreviewController {
+ private _preview: HTMLElement;
+
+ constructor() {
+ this._preview = document.createElement('div');
+ this._preview.classList.add('table-dnd-preview');
+ this._preview.classList.add('ProseMirror');
+ Object.assign(this._preview.style, {
+ position: 'absolute',
+ pointerEvents: 'none',
+ display: 'none',
+ });
+ }
+
+ get previewRoot(): HTMLElement {
+ return this._preview;
+ }
+
+ onDragStart = (relatedDoms: DraggingDOMs, index: number | undefined, type: 'col' | 'row') => {
+ this._initPreviewStyle(relatedDoms.table, relatedDoms.cell, type);
+ createPreviewDOM(relatedDoms.table, this._preview, index, type)
+ this._initPreviewPosition(relatedDoms.cell, type);
+ }
+
+ onDragEnd = () => {
+ clearPreviewDOM(this._preview);
+ Object.assign(this._preview.style, { display: 'none' });
+ }
+
+ onDragging = (relatedDoms: DraggingDOMs, x: number, y: number, type: 'col' | 'row') => {
+ this._updatePreviewPosition(x, y, relatedDoms.cell, type);
+ }
+
+ destroy = () => {
+ this._preview.remove();
+ }
+
+ private _initPreviewStyle(table: HTMLTableElement, cell: HTMLTableCellElement, type: 'col' | 'row') {
+ const tableRect = table.getBoundingClientRect();
+ const cellRect = cell.getBoundingClientRect();
+
+ if (type === 'col') {
+ Object.assign(this._preview.style, {
+ display: 'block',
+ width: `${cellRect.width}px`,
+ height: `${tableRect.height}px`,
+ })
+ }
+
+ if (type === 'row') {
+ Object.assign(this._preview.style, {
+ display: 'block',
+ width: `${tableRect.width}px`,
+ height: `${cellRect.height}px`,
+ })
+ }
+ }
+
+ private _initPreviewPosition(cell: HTMLElement, type: 'col' | 'row') {
+ void computePosition(cell, this._preview, {
+ placement: type === 'row' ? 'right' : 'bottom',
+ middleware: [
+ offset(({ rects }) => {
+ if (type === 'col') {
+ return -rects.reference.height
+ }
+ return -rects.reference.width
+ }),
+ ],
+ }).then(({ x, y }) => {
+ Object.assign(this._preview.style, {
+ left: `${x}px`,
+ top: `${y}px`,
+ })
+ });
+ }
+
+ private _updatePreviewPosition(x: number, y: number, cell: HTMLElement, type: 'col' | 'row') {
+ computePosition(
+ getVirtualElement(cell, x, y),
+ this._preview,
+ { placement: type === 'row' ? 'right' : 'bottom' },
+ ).then(({ x, y }) => {
+ if (type === 'row') {
+ Object.assign(this._preview.style, {
+ top: `${y}px`,
+ })
+ return
+ }
+
+ if (type === 'col') {
+ Object.assign(this._preview.style, {
+ left: `${x}px`,
+ })
+ return
+ }
+ })
+ }
+}
+
+function getVirtualElement(cell: HTMLElement, x: number, y: number): ReferenceElement {
+ return {
+ contextElement: cell,
+ getBoundingClientRect: () => {
+ const rect = cell.getBoundingClientRect()
+ return {
+ width: rect.width,
+ height: rect.height,
+ right: x + rect.width / 2,
+ bottom: y + rect.height / 2,
+ top: y - rect.height / 2,
+ left: x - rect.width / 2,
+ x: x - rect.width / 2,
+ y: y - rect.height / 2,
+ }
+ },
+ }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts b/packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts
new file mode 100644
index 00000000..fa251f8f
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts
@@ -0,0 +1,37 @@
+export function clearPreviewDOM(previewRoot: HTMLElement): void {
+ while (previewRoot.firstChild) {
+ previewRoot.removeChild(previewRoot.firstChild)
+ }
+}
+
+export function createPreviewDOM(
+ table: HTMLTableElement,
+ previewRoot: HTMLElement,
+ index: number,
+ direction: 'row' | 'col',
+): void {
+ clearPreviewDOM(previewRoot)
+
+ const previewTable = document.createElement('table')
+ const previewTableBody = document.createElement('tbody')
+ previewTable.appendChild(previewTableBody)
+ previewRoot.appendChild(previewTable)
+
+ const rows = table.querySelectorAll('tr')
+
+ if (direction === 'row') {
+ const row = rows[index]
+ const rowDOM = row.cloneNode(true)
+ previewTableBody.appendChild(rowDOM)
+ } else {
+ rows.forEach((row) => {
+ const rowDOM = row.cloneNode(false)
+ const cells = row.querySelectorAll('th,td')
+ if (cells[index]) {
+ const cellDOM = cells[index].cloneNode(true)
+ rowDOM.appendChild(cellDOM)
+ previewTableBody.appendChild(rowDOM)
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/utils.ts b/packages/editor-ext/src/lib/table/dnd/utils.ts
new file mode 100644
index 00000000..d184368f
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/utils.ts
@@ -0,0 +1,107 @@
+import { cellAround, TableMap } from "@tiptap/pm/tables"
+import { EditorView } from "@tiptap/pm/view"
+
+export function getHoveringCell(
+ view: EditorView,
+ event: MouseEvent,
+): HoveringCellInfo | undefined {
+ const domCell = domCellAround(event.target as HTMLElement | null)
+ if (!domCell) return
+
+ const { left, top, width, height } = domCell.getBoundingClientRect()
+ const eventPos = view.posAtCoords({
+ // Use the center coordinates of the cell to ensure we're within the
+ // selected cell. This prevents potential issues when the mouse is on the
+ // border of two cells.
+ left: left + width / 2,
+ top: top + height / 2,
+ })
+ if (!eventPos) return
+
+ const $cellPos = cellAround(view.state.doc.resolve(eventPos.pos))
+ if (!$cellPos) return
+
+ const map = TableMap.get($cellPos.node(-1))
+ const tableStart = $cellPos.start(-1)
+ const cellRect = map.findCell($cellPos.pos - tableStart)
+ const rowIndex = cellRect.top
+ const colIndex = cellRect.left
+
+ return {
+ rowIndex,
+ colIndex,
+ cellPos: $cellPos.pos,
+ rowFirstCellPos: getCellPos(map, tableStart, rowIndex, 0),
+ colFirstCellPos: getCellPos(map, tableStart, 0, colIndex),
+ }
+}
+
+function domCellAround(target: HTMLElement | null): HTMLElement | null {
+ while (target && target.nodeName != 'TD' && target.nodeName != 'TH') {
+ target = target.classList?.contains('ProseMirror')
+ ? null
+ : (target.parentNode as HTMLElement | null)
+ }
+ return target
+}
+
+export interface HoveringCellInfo {
+ rowIndex: number
+ colIndex: number
+ cellPos: number
+ rowFirstCellPos: number
+ colFirstCellPos: number
+}
+
+function getCellPos(
+ map: TableMap,
+ tableStart: number,
+ rowIndex: number,
+ colIndex: number,
+) {
+ const cellIndex = getCellIndex(map, rowIndex, colIndex)
+ const posInTable = map.map[cellIndex]
+ return tableStart + posInTable
+}
+
+function getCellIndex(
+ map: TableMap,
+ rowIndex: number,
+ colIndex: number,
+): number {
+ return map.width * rowIndex + colIndex
+}
+
+function getTableDOMByPos(view: EditorView, pos: number): HTMLTableElement | undefined {
+ const dom = view.domAtPos(pos).node
+ if (!dom) return
+ const element = dom instanceof HTMLElement ? dom : dom.parentElement
+ const table = element?.closest('table')
+ return table ?? undefined
+}
+
+function getTargetFirstCellDOM(table: HTMLTableElement, index: number, direction: 'row' | 'col'): HTMLTableCellElement | undefined {
+ if (direction === 'row') {
+ const row = table.querySelectorAll('tr')[index]
+ const cell = row?.querySelector('th,td')
+ return cell ?? undefined
+ } else {
+ const row = table.querySelector('tr')
+ const cell = row?.querySelectorAll('th,td')[index]
+ return cell ?? undefined
+ }
+}
+
+export type DraggingDOMs = {
+ table: HTMLTableElement
+ cell: HTMLTableCellElement
+}
+
+export function getDndRelatedDOMs(view: EditorView, cellPos: number | undefined, draggingIndex: number, direction: 'row' | 'col'): DraggingDOMs | undefined {
+ if (cellPos == null) return
+ const table = getTableDOMByPos(view, cellPos)
+ if (!table) return
+ const cell = getTargetFirstCellDOM(table, draggingIndex, direction)
+ if (!cell) return
+ return { table, cell }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/index.ts b/packages/editor-ext/src/lib/table/index.ts
index fd1d8019..9e5a9265 100644
--- a/packages/editor-ext/src/lib/table/index.ts
+++ b/packages/editor-ext/src/lib/table/index.ts
@@ -2,3 +2,4 @@ export * from "./row";
export * from "./cell";
export * from "./header";
export * from "./table";
+export * from "./dnd";
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/table.ts b/packages/editor-ext/src/lib/table/table.ts
index 549847b8..87053832 100644
--- a/packages/editor-ext/src/lib/table/table.ts
+++ b/packages/editor-ext/src/lib/table/table.ts
@@ -1,29 +1,34 @@
import Table from "@tiptap/extension-table";
import { Editor } from "@tiptap/core";
+import { DOMOutputSpec } from "@tiptap/pm/model";
const LIST_TYPES = ["bulletList", "orderedList", "taskList"];
function isInList(editor: Editor): boolean {
const { $from } = editor.state.selection;
-
+
for (let depth = $from.depth; depth > 0; depth--) {
const node = $from.node(depth);
if (LIST_TYPES.includes(node.type.name)) {
return true;
}
}
-
+
return false;
}
function handleListIndent(editor: Editor): boolean {
- return editor.commands.sinkListItem("listItem") ||
- editor.commands.sinkListItem("taskItem");
+ return (
+ editor.commands.sinkListItem("listItem") ||
+ editor.commands.sinkListItem("taskItem")
+ );
}
function handleListOutdent(editor: Editor): boolean {
- return editor.commands.liftListItem("listItem") ||
- editor.commands.liftListItem("taskItem");
+ return (
+ editor.commands.liftListItem("listItem") ||
+ editor.commands.liftListItem("taskItem")
+ );
}
export const CustomTable = Table.extend({
@@ -62,4 +67,15 @@ export const CustomTable = Table.extend({
},
};
},
-});
\ No newline at end of file
+
+ renderHTML({ node, HTMLAttributes }) {
+ // https://github.com/ueberdosis/tiptap/issues/4872#issuecomment-2717554498
+ const originalRender = this.parent?.({ node, HTMLAttributes });
+ const wrapper: DOMOutputSpec = [
+ "div",
+ { class: "tableWrapper" },
+ originalRender,
+ ];
+ return wrapper;
+ },
+});
diff --git a/packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts b/packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts
new file mode 100644
index 00000000..c959ce50
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts
@@ -0,0 +1,44 @@
+import type { Node } from '@tiptap/pm/model'
+import { TableMap } from '@tiptap/pm/tables'
+
+/**
+ * Convert an array of rows to a table node.
+ *
+ * @internal
+ */
+export function convertArrayOfRowsToTableNode(
+ tableNode: Node,
+ arrayOfNodes: (Node | null)[][],
+): Node {
+ const rowsPM = []
+ const map = TableMap.get(tableNode)
+ for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
+ const row = tableNode.child(rowIndex)
+ const rowCells = []
+
+ for (let colIndex = 0; colIndex < map.width; colIndex++) {
+ if (!arrayOfNodes[rowIndex][colIndex]) continue
+
+ const cellPos = map.map[rowIndex * map.width + colIndex]
+
+ const cell = arrayOfNodes[rowIndex][colIndex]!
+ const oldCell = tableNode.nodeAt(cellPos)!
+ const newCell = oldCell.type.createChecked(
+ Object.assign({}, cell.attrs),
+ cell.content,
+ cell.marks,
+ )
+ rowCells.push(newCell)
+ }
+
+ rowsPM.push(row.type.createChecked(row.attrs, rowCells, row.marks))
+ }
+
+ const newTable = tableNode.type.createChecked(
+ tableNode.attrs,
+ rowsPM,
+ tableNode.marks,
+ )
+
+ return newTable
+}
diff --git a/packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts b/packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts
new file mode 100644
index 00000000..5d85b68b
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts
@@ -0,0 +1,61 @@
+import type { Node } from '@tiptap/pm/model'
+import { TableMap } from '@tiptap/pm/tables'
+
+/**
+ * This function will transform the table node into a matrix of rows and columns
+ * respecting merged cells, for example this table:
+ *
+ * ```
+ * ┌──────┬──────┬─────────────┐
+ * │ A1 │ B1 │ C1 │
+ * ├──────┼──────┴──────┬──────┤
+ * │ A2 │ B2 │ │
+ * ├──────┼─────────────┤ D1 │
+ * │ A3 │ B3 │ C3 │ │
+ * └──────┴──────┴──────┴──────┘
+ * ```
+ *
+ * will be converted to the below:
+ *
+ * ```javascript
+ * [
+ * [A1, B1, C1, null],
+ * [A2, B2, null, D1],
+ * [A3, B3, C3, null],
+ * ]
+ * ```
+ * @internal
+ */
+export function convertTableNodeToArrayOfRows(tableNode: Node): (Node | null)[][] {
+ const map = TableMap.get(tableNode)
+ const rows: (Node | null)[][] = []
+ const rowCount = map.height
+ const colCount = map.width
+ for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+ const row: (Node | null)[] = []
+ for (let colIndex = 0; colIndex < colCount; colIndex++) {
+ let cellIndex = rowIndex * colCount + colIndex
+ let cellPos = map.map[cellIndex]
+ if (rowIndex > 0) {
+ const topCellIndex = cellIndex - colCount
+ const topCellPos = map.map[topCellIndex]
+ if (cellPos === topCellPos) {
+ row.push(null)
+ continue
+ }
+ }
+ if (colIndex > 0) {
+ const leftCellIndex = cellIndex - 1
+ const leftCellPos = map.map[leftCellIndex]
+ if (cellPos === leftCellPos) {
+ row.push(null)
+ continue
+ }
+ }
+ row.push(tableNode.nodeAt(cellPos))
+ }
+ rows.push(row)
+ }
+
+ return rows
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts b/packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts
new file mode 100644
index 00000000..0f9d6534
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts
@@ -0,0 +1,36 @@
+import type { Selection } from '@tiptap/pm/state'
+import { TableMap } from '@tiptap/pm/tables'
+
+import { findTable } from './query'
+import type { CellPos } from './types'
+
+/**
+ * Returns an array of cells in a column(s), where `columnIndex` could be a column index or an array of column indexes.
+ *
+ * @internal
+ */
+export function getCellsInColumn(columnIndexes: number | number[], selection: Selection): CellPos[] | undefined {
+ const table = findTable(selection.$from)
+ if (!table) {
+ return
+ }
+
+ const map = TableMap.get(table.node)
+ const indexes = Array.isArray(columnIndexes) ? columnIndexes : [columnIndexes]
+
+ return indexes
+ .filter((index) => index >= 0 && index <= map.width - 1)
+ .flatMap((index) => {
+ const cells = map.cellsInRect({
+ left: index,
+ right: index + 1,
+ top: 0,
+ bottom: map.height,
+ })
+ return cells.map((nodePos) => {
+ const node = table.node.nodeAt(nodePos)!
+ const pos = nodePos + table.start
+ return { pos, start: pos + 1, node, depth: table.depth + 2 }
+ })
+ })
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts b/packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts
new file mode 100644
index 00000000..75e73546
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts
@@ -0,0 +1,36 @@
+import type { Selection } from '@tiptap/pm/state'
+import { TableMap } from '@tiptap/pm/tables'
+
+import { findTable } from './query'
+import type { CellPos } from './types'
+
+/**
+ * Returns an array of cells in a row(s), where `rowIndex` could be a row index or an array of row indexes.
+ *
+ * @internal
+ */
+export function getCellsInRow(rowIndex: number | number[], selection: Selection): CellPos[] | undefined {
+ const table = findTable(selection.$from)
+ if (!table) {
+ return
+ }
+
+ const map = TableMap.get(table.node)
+ const indexes = Array.isArray(rowIndex) ? rowIndex : [rowIndex]
+
+ return indexes
+ .filter((index) => index >= 0 && index <= map.height - 1)
+ .flatMap((index) => {
+ const cells = map.cellsInRect({
+ left: 0,
+ right: map.width,
+ top: index,
+ bottom: index + 1,
+ })
+ return cells.map((nodePos) => {
+ const node = table.node.nodeAt(nodePos)!
+ const pos = nodePos + table.start
+ return { pos, start: pos + 1, node, depth: table.depth + 2 }
+ })
+ })
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts
new file mode 100644
index 00000000..6fda934d
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts
@@ -0,0 +1,91 @@
+import type { Transaction } from '@tiptap/pm/state'
+
+import { getCellsInColumn } from './get-cells-in-column'
+import { getCellsInRow } from './get-cells-in-row'
+import type { CellSelectionRange } from './types'
+
+/**
+ * Returns a range of rectangular selection spanning all merged cells around a
+ * column at index `columnIndex`.
+ *
+ * Original implementation from Atlassian (Apache License 2.0)
+ *
+ * https://bitbucket.org/atlassian/atlassian-frontend-mirror/src/5f91cb871e8248bc3bae5ddc30bb9fd9200fadbb/editor/editor-tables/src/utils/get-selection-range-in-column.ts#editor/editor-tables/src/utils/get-selection-range-in-column.ts
+ *
+ * @internal
+ */
+export function getSelectionRangeInColumn(tr: Transaction, startColIndex: number, endColIndex: number = startColIndex): CellSelectionRange | undefined {
+ let startIndex = startColIndex
+ let endIndex = endColIndex
+
+ // looking for selection start column (startIndex)
+ for (let i = startColIndex; i >= 0; i--) {
+ const cells = getCellsInColumn(i, tr.selection)
+ if (cells) {
+ cells.forEach((cell) => {
+ const maybeEndIndex = cell.node.attrs.colspan + i - 1
+ if (maybeEndIndex >= startIndex) {
+ startIndex = i
+ }
+ if (maybeEndIndex > endIndex) {
+ endIndex = maybeEndIndex
+ }
+ })
+ }
+ }
+ // looking for selection end column (endIndex)
+ for (let i = startColIndex; i <= endIndex; i++) {
+ const cells = getCellsInColumn(i, tr.selection)
+ if (cells) {
+ cells.forEach((cell) => {
+ const maybeEndIndex = cell.node.attrs.colspan + i - 1
+ if (cell.node.attrs.colspan > 1 && maybeEndIndex > endIndex) {
+ endIndex = maybeEndIndex
+ }
+ })
+ }
+ }
+
+ // filter out columns without cells (where all rows have colspan > 1 in the same column)
+ const indexes = []
+ for (let i = startIndex; i <= endIndex; i++) {
+ const maybeCells = getCellsInColumn(i, tr.selection)
+ if (maybeCells && maybeCells.length > 0) {
+ indexes.push(i)
+ }
+ }
+ startIndex = indexes[0]
+ endIndex = indexes[indexes.length - 1]
+
+ const firstSelectedColumnCells = getCellsInColumn(startIndex, tr.selection)
+ const firstRowCells = getCellsInRow(0, tr.selection)
+ if (!firstSelectedColumnCells || !firstRowCells) {
+ return
+ }
+
+ const $anchor = tr.doc.resolve(
+ firstSelectedColumnCells[firstSelectedColumnCells.length - 1].pos,
+ )
+
+ let headCell
+ for (let i = endIndex; i >= startIndex; i--) {
+ const columnCells = getCellsInColumn(i, tr.selection)
+ if (columnCells && columnCells.length > 0) {
+ for (let j = firstRowCells.length - 1; j >= 0; j--) {
+ if (firstRowCells[j].pos === columnCells[0].pos) {
+ headCell = columnCells[0]
+ break
+ }
+ }
+ if (headCell) {
+ break
+ }
+ }
+ }
+ if (!headCell) {
+ return
+ }
+
+ const $head = tr.doc.resolve(headCell.pos)
+ return { $anchor, $head, indexes }
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts
new file mode 100644
index 00000000..ece61d7f
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts
@@ -0,0 +1,89 @@
+import type { Transaction } from '@tiptap/pm/state'
+
+import { getCellsInColumn } from './get-cells-in-column'
+import { getCellsInRow } from './get-cells-in-row'
+import type { CellSelectionRange } from './types'
+
+/**
+ * Returns a range of rectangular selection spanning all merged cells around a
+ * row at index `rowIndex`.
+ *
+ * Original implementation from Atlassian (Apache License 2.0)
+ *
+ * https://bitbucket.org/atlassian/atlassian-frontend-mirror/src/5f91cb871e8248bc3bae5ddc30bb9fd9200fadbb/editor/editor-tables/src/utils/get-selection-range-in-row.ts#editor/editor-tables/src/utils/get-selection-range-in-row.ts
+ *
+ * @internal
+ */
+export function getSelectionRangeInRow(tr: Transaction, startRowIndex: number, endRowIndex: number = startRowIndex): CellSelectionRange | undefined {
+ let startIndex = startRowIndex
+ let endIndex = endRowIndex
+
+ // looking for selection start row (startIndex)
+ for (let i = startRowIndex; i >= 0; i--) {
+ const cells = getCellsInRow(i, tr.selection)
+ if (cells) {
+ cells.forEach((cell) => {
+ const maybeEndIndex = cell.node.attrs.rowspan + i - 1
+ if (maybeEndIndex >= startIndex) {
+ startIndex = i
+ }
+ if (maybeEndIndex > endIndex) {
+ endIndex = maybeEndIndex
+ }
+ })
+ }
+ }
+ // looking for selection end row (endIndex)
+ for (let i = startRowIndex; i <= endIndex; i++) {
+ const cells = getCellsInRow(i, tr.selection)
+ if (cells) {
+ cells.forEach((cell) => {
+ const maybeEndIndex = cell.node.attrs.rowspan + i - 1
+ if (cell.node.attrs.rowspan > 1 && maybeEndIndex > endIndex) {
+ endIndex = maybeEndIndex
+ }
+ })
+ }
+ }
+
+ // filter out rows without cells (where all columns have rowspan > 1 in the same row)
+ const indexes = []
+ for (let i = startIndex; i <= endIndex; i++) {
+ const maybeCells = getCellsInRow(i, tr.selection)
+ if (maybeCells && maybeCells.length > 0) {
+ indexes.push(i)
+ }
+ }
+ startIndex = indexes[0]
+ endIndex = indexes[indexes.length - 1]
+
+ const firstSelectedRowCells = getCellsInRow(startIndex, tr.selection)
+ const firstColumnCells = getCellsInColumn(0, tr.selection)
+ if (!firstSelectedRowCells || !firstColumnCells) {
+ return
+ }
+
+ const $anchor = tr.doc.resolve(firstSelectedRowCells[firstSelectedRowCells.length - 1].pos)
+
+ let headCell
+ for (let i = endIndex; i >= startIndex; i--) {
+ const rowCells = getCellsInRow(i, tr.selection)
+ if (rowCells && rowCells.length > 0) {
+ for (let j = firstColumnCells.length - 1; j >= 0; j--) {
+ if (firstColumnCells[j].pos === rowCells[0].pos) {
+ headCell = rowCells[0]
+ break
+ }
+ }
+ if (headCell) {
+ break
+ }
+ }
+ }
+ if (!headCell) {
+ return
+ }
+
+ const $head = tr.doc.resolve(headCell.pos)
+ return { $anchor, $head, indexes }
+}
diff --git a/packages/editor-ext/src/lib/table/utils/index.ts b/packages/editor-ext/src/lib/table/utils/index.ts
new file mode 100644
index 00000000..23169970
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/index.ts
@@ -0,0 +1,3 @@
+export * from './move-column'
+export * from './move-row'
+export * from './query'
diff --git a/packages/editor-ext/src/lib/table/utils/move-column.ts b/packages/editor-ext/src/lib/table/utils/move-column.ts
new file mode 100644
index 00000000..d73e06bf
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/move-column.ts
@@ -0,0 +1,81 @@
+import type { Node } from '@tiptap/pm/model'
+import type { Transaction } from '@tiptap/pm/state'
+import {
+ CellSelection,
+ TableMap,
+} from '@tiptap/pm/tables'
+
+import { convertArrayOfRowsToTableNode } from './convert-array-of-rows-to-table-node'
+import { convertTableNodeToArrayOfRows } from './convert-table-node-to-array-of-rows'
+import { getSelectionRangeInColumn } from './get-selection-range-in-column'
+import { moveRowInArrayOfRows } from './move-row-in-array-of-rows'
+import { findTable } from './query'
+import { transpose } from './transpose'
+
+export interface MoveColumnParams {
+ tr: Transaction
+ originIndex: number
+ targetIndex: number
+ select: boolean
+ pos: number
+}
+
+/**
+ * Move a column from index `origin` to index `target`.
+ *
+ * @internal
+ */
+export function moveColumn(moveColParams: MoveColumnParams): boolean {
+ const { tr, originIndex, targetIndex, select, pos } = moveColParams
+ const $pos = tr.doc.resolve(pos)
+ const table = findTable($pos)
+ if (!table) return false
+
+ const indexesOriginColumn = getSelectionRangeInColumn(tr, originIndex)?.indexes
+ const indexesTargetColumn = getSelectionRangeInColumn(tr, targetIndex)?.indexes
+
+ if (!indexesOriginColumn || !indexesTargetColumn) return false
+
+ if (indexesOriginColumn.includes(targetIndex)) return false
+
+ const newTable = moveTableColumn(
+ table.node,
+ indexesOriginColumn,
+ indexesTargetColumn,
+ 0,
+ )
+
+ tr.replaceWith(
+ table.pos,
+ table.pos + table.node.nodeSize,
+ newTable,
+ )
+
+ if (!select) return true
+
+ const map = TableMap.get(newTable)
+ const start = table.start
+ const index = targetIndex
+ const lastCell = map.positionAt(map.height - 1, index, newTable)
+ const $lastCell = tr.doc.resolve(start + lastCell)
+
+ const firstCell = map.positionAt(0, index, newTable)
+ const $firstCell = tr.doc.resolve(start + firstCell)
+
+ tr.setSelection(CellSelection.colSelection($lastCell, $firstCell))
+ return true
+}
+
+function moveTableColumn(
+ table: Node,
+ indexesOrigin: number[],
+ indexesTarget: number[],
+ direction: -1 | 1 | 0,
+) {
+ let rows = transpose(convertTableNodeToArrayOfRows(table))
+
+ rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction)
+ rows = transpose(rows)
+
+ return convertArrayOfRowsToTableNode(table, rows)
+}
diff --git a/packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts b/packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts
new file mode 100644
index 00000000..529df254
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts
@@ -0,0 +1,30 @@
+/**
+ * Move a row in an array of rows.
+ *
+ * @internal
+ */
+export function moveRowInArrayOfRows(
+ rows: T[],
+ indexesOrigin: number[],
+ indexesTarget: number[],
+ directionOverride: -1 | 1 | 0,
+): T[] {
+ const direction = indexesOrigin[0] > indexesTarget[0] ? -1 : 1
+
+ const rowsExtracted = rows.splice(indexesOrigin[0], indexesOrigin.length)
+ const positionOffset = rowsExtracted.length % 2 === 0 ? 1 : 0
+ let target: number
+
+ if (directionOverride === -1 && direction === 1) {
+ target = indexesTarget[0] - 1
+ } else if (directionOverride === 1 && direction === -1) {
+ target = indexesTarget[indexesTarget.length - 1] - positionOffset + 1
+ } else {
+ target = direction === -1
+ ? indexesTarget[0]
+ : indexesTarget[indexesTarget.length - 1] - positionOffset
+ }
+
+ rows.splice(target, 0, ...rowsExtracted)
+ return rows
+}
diff --git a/packages/editor-ext/src/lib/table/utils/move-row.ts b/packages/editor-ext/src/lib/table/utils/move-row.ts
new file mode 100644
index 00000000..e69e870a
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/move-row.ts
@@ -0,0 +1,74 @@
+import type { Node } from '@tiptap/pm/model'
+import type { Transaction } from '@tiptap/pm/state'
+import {
+ CellSelection,
+ TableMap,
+} from '@tiptap/pm/tables'
+
+import { convertArrayOfRowsToTableNode } from './convert-array-of-rows-to-table-node'
+import { convertTableNodeToArrayOfRows } from './convert-table-node-to-array-of-rows'
+import { getSelectionRangeInRow } from './get-selection-range-in-row'
+import { moveRowInArrayOfRows } from './move-row-in-array-of-rows'
+import { findTable } from './query'
+
+export interface MoveRowParams {
+ tr: Transaction
+ originIndex: number
+ targetIndex: number
+ select: boolean
+ pos: number
+}
+
+/**
+ * Move a row from index `origin` to index `target`.
+ *
+ * @internal
+ */
+export function moveRow(moveRowParams: MoveRowParams): boolean {
+ const { tr, originIndex, targetIndex, select, pos } = moveRowParams
+ const $pos = tr.doc.resolve(pos)
+ const table = findTable($pos)
+ if (!table) return false
+
+ const indexesOriginRow = getSelectionRangeInRow(tr, originIndex)?.indexes
+ const indexesTargetRow = getSelectionRangeInRow(tr, targetIndex)?.indexes
+
+ if (!indexesOriginRow || !indexesTargetRow) return false
+
+ if (indexesOriginRow.includes(targetIndex)) return false
+
+ const newTable = moveTableRow(table.node, indexesOriginRow, indexesTargetRow, 0)
+
+ tr.replaceWith(
+ table.pos,
+ table.pos + table.node.nodeSize,
+ newTable,
+ )
+
+ if (!select) return true
+
+ const map = TableMap.get(newTable)
+ const start = table.start
+ const index = targetIndex
+ const lastCell = map.positionAt(index, map.width - 1, newTable)
+ const $lastCell = tr.doc.resolve(start + lastCell)
+
+ const firstCell = map.positionAt(index, 0, newTable)
+ const $firstCell = tr.doc.resolve(start + firstCell)
+
+ tr.setSelection(CellSelection.rowSelection($lastCell, $firstCell))
+ return true
+}
+
+function moveTableRow(
+ table: Node,
+ indexesOrigin: number[],
+ indexesTarget: number[],
+ direction: -1 | 1 | 0,
+) {
+ let rows = convertTableNodeToArrayOfRows(table)
+
+ rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction)
+
+ return convertArrayOfRowsToTableNode(table, rows)
+}
diff --git a/packages/editor-ext/src/lib/table/utils/query.ts b/packages/editor-ext/src/lib/table/utils/query.ts
new file mode 100644
index 00000000..3d0a542b
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/query.ts
@@ -0,0 +1,122 @@
+import type {
+ Node,
+ ResolvedPos,
+} from '@tiptap/pm/model'
+import type { Selection } from '@tiptap/pm/state'
+import {
+ cellAround,
+ cellNear,
+ CellSelection,
+ inSameTable,
+} from '@tiptap/pm/tables'
+
+/**
+ * Checks if the given object is a `CellSelection` instance.
+ *
+ * @public
+ */
+export function isCellSelection(value: unknown): value is CellSelection {
+ return value instanceof CellSelection
+}
+
+/**
+ * Find the closest table node.
+ *
+ * @internal
+ */
+export function findTable($pos: ResolvedPos): FindParentNodeResult | undefined {
+ return findParentNode((node) => node.type.spec.tableRole === 'table', $pos)
+}
+
+/**
+ * Try to find the anchor and head cell in the same table by using the given
+ * anchor and head as hit points, or fallback to the selection's anchor and
+ * head.
+ *
+ * @internal
+ */
+export function findCellRange(
+ selection: Selection,
+ anchorHit?: number,
+ headHit?: number,
+): [ResolvedPos, ResolvedPos] | undefined {
+ if (anchorHit == null && headHit == null && isCellSelection(selection)) {
+ return [selection.$anchorCell, selection.$headCell]
+ }
+
+ const anchor: number = anchorHit ?? headHit ?? selection.anchor
+ const head: number = headHit ?? anchorHit ?? selection.head
+
+ const doc = selection.$head.doc
+
+ const $anchorCell = findCellPos(doc, anchor)
+ const $headCell = findCellPos(doc, head)
+
+ if ($anchorCell && $headCell && inSameTable($anchorCell, $headCell)) {
+ return [$anchorCell, $headCell]
+ }
+}
+
+/**
+ * Try to find a resolved pos of a cell by using the given pos as a hit point.
+ *
+ * @internal
+ */
+export function findCellPos(
+ doc: Node,
+ pos: number,
+): ResolvedPos | undefined {
+ const $pos = doc.resolve(pos)
+ return cellAround($pos) || cellNear($pos)
+}
+
+/**
+ * @internal
+ */
+export interface FindParentNodeResult {
+ /**
+ * The closest parent node that satisfies the predicate.
+ */
+ node: Node
+
+ /**
+ * The position directly before the node.
+ */
+ pos: number
+
+ /**
+ * The position at the start of the node.
+ */
+ start: number
+
+ /**
+ * The depth of the node.
+ */
+ depth: number
+}
+
+/**
+ * Find the closest parent node that satisfies the predicate.
+ *
+ * @internal
+ */
+export function findParentNode(
+ /**
+ * The predicate to test the parent node.
+ */
+ predicate: (node: Node) => boolean,
+ /**
+ * The position to start searching from.
+ */
+ $pos: ResolvedPos,
+): FindParentNodeResult | undefined {
+ for (let depth = $pos.depth; depth >= 0; depth -= 1) {
+ const node = $pos.node(depth)
+
+ if (predicate(node)) {
+ const pos = depth === 0 ? 0 : $pos.before(depth)
+ const start = $pos.start(depth)
+ return { node, pos, start, depth }
+ }
+ }
+}
diff --git a/packages/editor-ext/src/lib/table/utils/transpose.ts b/packages/editor-ext/src/lib/table/utils/transpose.ts
new file mode 100644
index 00000000..dffc6e26
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/transpose.ts
@@ -0,0 +1,29 @@
+/**
+ * Transposes a 2D array by flipping columns to rows.
+ *
+ * Transposition is a familiar algebra concept where the matrix is flipped
+ * along its diagonal. For more details, see:
+ * https://en.wikipedia.org/wiki/Transpose
+ *
+ * @example
+ * ```javascript
+ * const arr = [
+ * ['a1', 'a2', 'a3'],
+ * ['b1', 'b2', 'b3'],
+ * ['c1', 'c2', 'c3'],
+ * ['d1', 'd2', 'd3'],
+ * ];
+ *
+ * const result = transpose(arr);
+ * result === [
+ * ['a1', 'b1', 'c1', 'd1'],
+ * ['a2', 'b2', 'c2', 'd2'],
+ * ['a3', 'b3', 'c3', 'd3'],
+ * ]
+ * ```
+ */
+export function transpose(array: T[][]): T[][] {
+ return array[0].map((_, i) => {
+ return array.map((column) => column[i])
+ })
+}
diff --git a/packages/editor-ext/src/lib/table/utils/types.ts b/packages/editor-ext/src/lib/table/utils/types.ts
new file mode 100644
index 00000000..a45f5be1
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/types.ts
@@ -0,0 +1,18 @@
+import type {
+ Node,
+ ResolvedPos,
+} from '@tiptap/pm/model'
+
+export type CellPos = {
+ pos: number
+ start: number
+ depth: number
+ node: Node
+}
+
+export type CellSelectionRange = {
+ $anchor: ResolvedPos
+ $head: ResolvedPos
+ // an array of column/row indexes
+ indexes: number[]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5777c3f7..f724ea73 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,6 +22,9 @@ importers:
'@docmost/editor-ext':
specifier: workspace:*
version: link:packages/editor-ext
+ '@floating-ui/dom':
+ specifier: ^1.7.3
+ version: 1.7.3
'@hocuspocus/extension-redis':
specifier: ^2.15.2
version: 2.15.2(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)
@@ -534,6 +537,12 @@ importers:
kysely-migration-cli:
specifier: ^0.4.2
version: 0.4.2
+ ldapts:
+ specifier: ^7.4.0
+ version: 7.4.0
+ mammoth:
+ specifier: ^1.10.0
+ version: 1.10.0
mime-types:
specifier: ^2.1.35
version: 2.1.35
@@ -564,6 +573,9 @@ importers:
passport-jwt:
specifier: ^4.0.1
version: 4.0.1
+ pdfjs-dist:
+ specifier: ^5.4.54
+ version: 5.4.54
pg:
specifier: ^8.16.0
version: 8.16.0
@@ -2201,9 +2213,15 @@ packages:
'@floating-ui/core@1.5.3':
resolution: {integrity: sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q==}
+ '@floating-ui/core@1.7.3':
+ resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==}
+
'@floating-ui/dom@1.6.3':
resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==}
+ '@floating-ui/dom@1.7.3':
+ resolution: {integrity: sha512-uZA413QEpNuhtb3/iIKoYMSK07keHPYeXF02Zhd6e213j+d1NamLix/mCLxBUDW/Gx52sPH2m+chlUsyaBs/Ag==}
+
'@floating-ui/react-dom@2.1.2':
resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==}
peerDependencies:
@@ -2216,6 +2234,9 @@ packages:
react: '>=16.8.0'
react-dom: '>=16.8.0'
+ '@floating-ui/utils@0.2.10':
+ resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
+
'@floating-ui/utils@0.2.8':
resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==}
@@ -2626,6 +2647,70 @@ packages:
cpu: [x64]
os: [win32]
+ '@napi-rs/canvas-android-arm64@0.1.77':
+ resolution: {integrity: sha512-jC8YX0rbAnu9YrLK1A52KM2HX9EDjrJSCLVuBf9Dsov4IC6GgwMLS2pwL9GFLJnSZBFgdwnA84efBehHT9eshA==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [android]
+
+ '@napi-rs/canvas-darwin-arm64@0.1.77':
+ resolution: {integrity: sha512-VFaCaCgAV0+hPwXajDIiHaaGx4fVCuUVYp/CxCGXmTGz699ngIEBx3Sa2oDp0uk3X+6RCRLueb7vD44BKBiPIg==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@napi-rs/canvas-darwin-x64@0.1.77':
+ resolution: {integrity: sha512-uD2NSkf6I4S3o0POJDwweK85FE4rfLNA2N714MgiEEMMw5AmupfSJGgpYzcyEXtPzdaca6rBfKcqNvzR1+EyLQ==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [darwin]
+
+ '@napi-rs/canvas-linux-arm-gnueabihf@0.1.77':
+ resolution: {integrity: sha512-03GxMMZGhHRQxiA4gyoKT6iQSz8xnA6T9PAfg/WNJnbkVMFZG782DwUJUb39QIZ1uE1euMCPnDgWAJ092MmgJQ==}
+ engines: {node: '>= 10'}
+ cpu: [arm]
+ os: [linux]
+
+ '@napi-rs/canvas-linux-arm64-gnu@0.1.77':
+ resolution: {integrity: sha512-ZO+d2gRU9JU1Bb7SgJcJ1k9wtRMCpSWjJAJ+2phhu0Lw5As8jYXXXmLKmMTGs1bOya2dBMYDLzwp7KS/S/+aCA==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@napi-rs/canvas-linux-arm64-musl@0.1.77':
+ resolution: {integrity: sha512-S1KtnP1+nWs2RApzNkdNf8X4trTLrHaY7FivV61ZRaL8NvuGOkSkKa+gWN2iedIGFEDz6gecpl/JAUSewwFXYg==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@napi-rs/canvas-linux-riscv64-gnu@0.1.77':
+ resolution: {integrity: sha512-A4YIKFYUwDtrSzCtdCAO5DYmRqlhCVKHdpq0+dBGPnIEhOQDFkPBTfoTAjO3pjlEnorlfKmNMOH21sKQg2esGA==}
+ engines: {node: '>= 10'}
+ cpu: [riscv64]
+ os: [linux]
+
+ '@napi-rs/canvas-linux-x64-gnu@0.1.77':
+ resolution: {integrity: sha512-Lt6Sef5l0+5O1cSZ8ysO0JI+x+rSrqZyXs5f7+kVkCAOVq8X5WTcDVbvWvEs2aRhrWTp5y25Jf2Bn+3IcNHOuQ==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [linux]
+
+ '@napi-rs/canvas-linux-x64-musl@0.1.77':
+ resolution: {integrity: sha512-NiNFvC+D+omVeJ3IjYlIbyt/igONSABVe9z0ZZph29epHgZYu4eHwV9osfpRt1BGGOAM8LkFrHk4LBdn2EDymA==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [linux]
+
+ '@napi-rs/canvas-win32-x64-msvc@0.1.77':
+ resolution: {integrity: sha512-fP6l0hZiWykyjvpZTS3sI46iib8QEflbPakNoUijtwyxRuOPTTBfzAWZUz5z2vKpJJ/8r305wnZeZ8lhsBHY5A==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [win32]
+
+ '@napi-rs/canvas@0.1.77':
+ resolution: {integrity: sha512-N9w2DkEKE1AXGp3q55GBOP6BEoFrqChDiFqJtKViTpQCWNOSVuMz7LkoGehbnpxtidppbsC36P0kCZNqJKs29w==}
+ engines: {node: '>= 10'}
+
'@napi-rs/wasm-runtime@0.2.4':
resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==}
@@ -4119,6 +4204,9 @@ packages:
'@tybys/wasm-util@0.9.0':
resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==}
+ '@types/asn1@0.2.4':
+ resolution: {integrity: sha512-V91DSJ2l0h0gRhVP4oBfBzRBN9lAbPUkGDMCnwedqPKX2d84aAMc9CulOvxdw1f7DfEYx99afab+Rsm3e52jhA==}
+
'@types/babel__core@7.20.5':
resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
@@ -4846,6 +4934,9 @@ packages:
asap@2.0.6:
resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+ asn1@0.2.6:
+ resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+
async-lock@1.4.1:
resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
@@ -4952,6 +5043,9 @@ packages:
bl@4.1.0:
resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+ bluebird@3.4.7:
+ resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
+
bluebird@3.7.2:
resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
@@ -5686,6 +5780,9 @@ packages:
dijkstrajs@1.0.3:
resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
+ dingbat-to-unicode@1.0.1:
+ resolution: {integrity: sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==}
+
dnd-core@14.0.1:
resolution: {integrity: sha512-+PVS2VPTgKFPYWo3vAFEA8WPbTf7/xo43TifH9G8S1KqnrQu0o77A3unrF5yOugy4mIz7K5wAVFHUcha7wsz6A==}
@@ -5734,6 +5831,9 @@ packages:
resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
engines: {node: '>=12'}
+ duck@0.1.12:
+ resolution: {integrity: sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==}
+
eastasianwidth@0.2.0:
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
@@ -7071,6 +7171,10 @@ packages:
layout-base@2.0.1:
resolution: {integrity: sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==}
+ ldapts@7.4.0:
+ resolution: {integrity: sha512-QLgx2pLvxMXY1nCc85Fx+cwVJDvC0sQ3l4CJZSl1FJ/iV8Ypfl6m+5xz4lm1lhoXcUlvhPqxEoyIj/8LR6ut+A==}
+ engines: {node: '>=18'}
+
leac@0.6.0:
resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
@@ -7207,6 +7311,9 @@ packages:
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
hasBin: true
+ lop@0.4.2:
+ resolution: {integrity: sha512-RefILVDQ4DKoRZsJ4Pj22TxE3omDO47yFpkIBoDKzkqPRISs5U1cnAdg/5583YPkWPaLIYHOKRMQSvjFsO26cw==}
+
lowlight@3.3.0:
resolution: {integrity: sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==}
@@ -7253,6 +7360,11 @@ packages:
makeerror@1.0.12:
resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+ mammoth@1.10.0:
+ resolution: {integrity: sha512-9HOmqt8uJ5rz7q8XrECU5gRjNftCq4GNG0YIrA6f9iQPCeLgpvgcmRBHi9NQWJQIpT/MAXeg1oKliAK1xoB3eg==}
+ engines: {node: '>=12.0.0'}
+ hasBin: true
+
mantine-form-zod-resolver@1.3.0:
resolution: {integrity: sha512-XlXXkJCYuUuOllW0zedYW+m/lbdFQ/bso1Vz+pJOYkxgjhoGvzN2EXWCS2+0iTOT9Q7WnOwWvHmvpTJN3PxSXw==}
engines: {node: '>=16.6.0'}
@@ -7728,6 +7840,9 @@ packages:
optics-ts@2.4.1:
resolution: {integrity: sha512-HaYzMHvC80r7U/LqAd4hQyopDezC60PO2qF5GuIwALut2cl5rK1VWHsqTp0oqoJJWjiv6uXKqsO+Q2OO0C3MmQ==}
+ option@0.2.4:
+ resolution: {integrity: sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==}
+
optionator@0.9.3:
resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
engines: {node: '>= 0.8.0'}
@@ -7892,6 +8007,10 @@ packages:
pause@0.0.1:
resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
+ pdfjs-dist@5.4.54:
+ resolution: {integrity: sha512-TBAiTfQw89gU/Z4LW98Vahzd2/LoCFprVGvGbTgFt+QCB1F+woyOPmNNVgLa6djX9Z9GGTnj7qE1UzpOVJiINw==}
+ engines: {node: '>=20.16.0 || >=22.3.0'}
+
peberminta@0.9.0:
resolution: {integrity: sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==}
@@ -8841,6 +8960,9 @@ packages:
resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
engines: {node: '>=10.0.0'}
+ strict-event-emitter-types@2.0.0:
+ resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
+
string-length@4.0.2:
resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
engines: {node: '>=10'}
@@ -9080,6 +9202,10 @@ packages:
resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
engines: {node: '>=18'}
+ tr46@5.1.1:
+ resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
+ engines: {node: '>=18'}
+
tree-kill@1.2.2:
resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
hasBin: true
@@ -9274,6 +9400,9 @@ packages:
unbox-primitive@1.0.2:
resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+ underscore@1.13.7:
+ resolution: {integrity: sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==}
+
undici-types@6.20.0:
resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
@@ -9538,6 +9667,10 @@ packages:
resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
engines: {node: '>=18'}
+ whatwg-url@14.2.0:
+ resolution: {integrity: sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==}
+ engines: {node: '>=18'}
+
whatwg-url@5.0.0:
resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
@@ -9642,6 +9775,10 @@ packages:
resolution: {integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==}
engines: {node: '>=4.0.0'}
+ xmlbuilder@10.1.1:
+ resolution: {integrity: sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==}
+ engines: {node: '>=4.0'}
+
xmlbuilder@11.0.1:
resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
engines: {node: '>=4.0'}
@@ -10412,7 +10549,7 @@ snapshots:
'@babel/traverse': 7.25.9
'@babel/types': 7.26.0
convert-source-map: 2.0.0
- debug: 4.3.7
+ debug: 4.4.0
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -10452,7 +10589,7 @@ snapshots:
'@babel/traverse': 7.25.9
'@babel/types': 7.26.0
convert-source-map: 2.0.0
- debug: 4.3.4
+ debug: 4.4.0
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -10472,7 +10609,7 @@ snapshots:
'@babel/traverse': 7.27.0
'@babel/types': 7.27.0
convert-source-map: 2.0.0
- debug: 4.3.7
+ debug: 4.4.0
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -11953,11 +12090,20 @@ snapshots:
dependencies:
'@floating-ui/utils': 0.2.8
+ '@floating-ui/core@1.7.3':
+ dependencies:
+ '@floating-ui/utils': 0.2.10
+
'@floating-ui/dom@1.6.3':
dependencies:
'@floating-ui/core': 1.5.3
'@floating-ui/utils': 0.2.8
+ '@floating-ui/dom@1.7.3':
+ dependencies:
+ '@floating-ui/core': 1.7.3
+ '@floating-ui/utils': 0.2.10
+
'@floating-ui/react-dom@2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
dependencies:
'@floating-ui/dom': 1.6.3
@@ -11972,6 +12118,8 @@ snapshots:
react-dom: 18.3.1(react@18.3.1)
tabbable: 6.2.0
+ '@floating-ui/utils@0.2.10': {}
+
'@floating-ui/utils@0.2.8': {}
'@hocuspocus/common@2.15.2':
@@ -12535,6 +12683,50 @@ snapshots:
'@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2':
optional: true
+ '@napi-rs/canvas-android-arm64@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-darwin-arm64@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-darwin-x64@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-linux-arm-gnueabihf@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-linux-arm64-gnu@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-linux-arm64-musl@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-linux-riscv64-gnu@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-linux-x64-gnu@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-linux-x64-musl@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas-win32-x64-msvc@0.1.77':
+ optional: true
+
+ '@napi-rs/canvas@0.1.77':
+ optionalDependencies:
+ '@napi-rs/canvas-android-arm64': 0.1.77
+ '@napi-rs/canvas-darwin-arm64': 0.1.77
+ '@napi-rs/canvas-darwin-x64': 0.1.77
+ '@napi-rs/canvas-linux-arm-gnueabihf': 0.1.77
+ '@napi-rs/canvas-linux-arm64-gnu': 0.1.77
+ '@napi-rs/canvas-linux-arm64-musl': 0.1.77
+ '@napi-rs/canvas-linux-riscv64-gnu': 0.1.77
+ '@napi-rs/canvas-linux-x64-gnu': 0.1.77
+ '@napi-rs/canvas-linux-x64-musl': 0.1.77
+ '@napi-rs/canvas-win32-x64-msvc': 0.1.77
+ optional: true
+
'@napi-rs/wasm-runtime@0.2.4':
dependencies:
'@emnapi/core': 1.2.0
@@ -14052,6 +14244,10 @@ snapshots:
dependencies:
tslib: 2.8.1
+ '@types/asn1@0.2.4':
+ dependencies:
+ '@types/node': 22.13.4
+
'@types/babel__core@7.20.5':
dependencies:
'@babel/parser': 7.26.2
@@ -14510,7 +14706,7 @@ snapshots:
'@typescript-eslint/types': 8.17.0
'@typescript-eslint/typescript-estree': 8.17.0(typescript@5.7.2)
'@typescript-eslint/visitor-keys': 8.17.0
- debug: 4.3.7
+ debug: 4.4.0
eslint: 9.15.0(jiti@1.21.0)
optionalDependencies:
typescript: 5.7.2
@@ -14523,7 +14719,7 @@ snapshots:
'@typescript-eslint/types': 8.24.1
'@typescript-eslint/typescript-estree': 8.24.1(typescript@5.7.3)
'@typescript-eslint/visitor-keys': 8.24.1
- debug: 4.3.7
+ debug: 4.4.0
eslint: 9.20.1(jiti@1.21.0)
typescript: 5.7.3
transitivePeerDependencies:
@@ -14585,7 +14781,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 8.24.1
'@typescript-eslint/visitor-keys': 8.24.1
- debug: 4.3.7
+ debug: 4.4.0
fast-glob: 3.3.2
is-glob: 4.0.3
minimatch: 9.0.4
@@ -14941,6 +15137,10 @@ snapshots:
asap@2.0.6: {}
+ asn1@0.2.6:
+ dependencies:
+ safer-buffer: 2.1.2
+
async-lock@1.4.1: {}
async@3.2.5: {}
@@ -15126,6 +15326,8 @@ snapshots:
inherits: 2.0.4
readable-stream: 3.6.2
+ bluebird@3.4.7: {}
+
bluebird@3.7.2: {}
boolbase@1.0.0: {}
@@ -15863,7 +16065,7 @@ snapshots:
detect-port@1.5.1:
dependencies:
address: 1.2.2
- debug: 4.3.7
+ debug: 4.4.0
transitivePeerDependencies:
- supports-color
@@ -15886,6 +16088,8 @@ snapshots:
dijkstrajs@1.0.3: {}
+ dingbat-to-unicode@1.0.1: {}
+
dnd-core@14.0.1:
dependencies:
'@react-dnd/asap': 4.0.1
@@ -15943,6 +16147,10 @@ snapshots:
dotenv@16.4.7: {}
+ duck@0.1.12:
+ dependencies:
+ underscore: 1.13.7
+
eastasianwidth@0.2.0: {}
ecdsa-sig-formatter@1.0.11:
@@ -15984,7 +16192,7 @@ snapshots:
engine.io-client@6.6.2:
dependencies:
'@socket.io/component-emitter': 3.1.0
- debug: 4.3.4
+ debug: 4.3.7
engine.io-parser: 5.2.2
ws: 8.17.1
xmlhttprequest-ssl: 2.1.2
@@ -16004,7 +16212,7 @@ snapshots:
base64id: 2.0.0
cookie: 0.7.2
cors: 2.8.5
- debug: 4.3.4
+ debug: 4.3.7
engine.io-parser: 5.2.2
ws: 8.17.1
transitivePeerDependencies:
@@ -16910,7 +17118,7 @@ snapshots:
ioredis@4.28.5:
dependencies:
cluster-key-slot: 1.1.2
- debug: 4.3.7
+ debug: 4.4.0
denque: 1.5.1
lodash.defaults: 4.2.0
lodash.flatten: 4.4.0
@@ -17676,6 +17884,17 @@ snapshots:
layout-base@2.0.1: {}
+ ldapts@7.4.0:
+ dependencies:
+ '@types/asn1': 0.2.4
+ asn1: 0.2.6
+ debug: 4.4.0
+ strict-event-emitter-types: 2.0.0
+ uuid: 11.1.0
+ whatwg-url: 14.2.0
+ transitivePeerDependencies:
+ - supports-color
+
leac@0.6.0: {}
less@4.2.0:
@@ -17796,6 +18015,12 @@ snapshots:
dependencies:
js-tokens: 4.0.0
+ lop@0.4.2:
+ dependencies:
+ duck: 0.1.12
+ option: 0.2.4
+ underscore: 1.13.7
+
lowlight@3.3.0:
dependencies:
'@types/hast': 3.0.4
@@ -17842,6 +18067,19 @@ snapshots:
dependencies:
tmpl: 1.0.5
+ mammoth@1.10.0:
+ dependencies:
+ '@xmldom/xmldom': 0.8.10
+ argparse: 1.0.10
+ base64-js: 1.5.1
+ bluebird: 3.4.7
+ dingbat-to-unicode: 1.0.1
+ jszip: 3.10.1
+ lop: 0.4.2
+ path-is-absolute: 1.0.1
+ underscore: 1.13.7
+ xmlbuilder: 10.1.1
+
mantine-form-zod-resolver@1.3.0(@mantine/form@8.1.3(react@18.3.1))(zod@3.25.56):
dependencies:
'@mantine/form': 8.1.3(react@18.3.1)
@@ -18433,6 +18671,8 @@ snapshots:
optics-ts@2.4.1: {}
+ option@0.2.4: {}
+
optionator@0.9.3:
dependencies:
'@aashutoshrathi/word-wrap': 1.2.6
@@ -18610,6 +18850,10 @@ snapshots:
pause@0.0.1: {}
+ pdfjs-dist@5.4.54:
+ optionalDependencies:
+ '@napi-rs/canvas': 0.1.77
+
peberminta@0.9.0: {}
peek-readable@7.0.0: {}
@@ -19551,7 +19795,7 @@ snapshots:
socket.io-adapter@2.5.4:
dependencies:
- debug: 4.3.4
+ debug: 4.3.7
ws: 8.11.0
transitivePeerDependencies:
- bufferutil
@@ -19572,7 +19816,7 @@ snapshots:
socket.io-parser@4.2.4:
dependencies:
'@socket.io/component-emitter': 3.1.0
- debug: 4.3.4
+ debug: 4.3.7
transitivePeerDependencies:
- supports-color
@@ -19648,6 +19892,8 @@ snapshots:
streamsearch@1.1.0: {}
+ strict-event-emitter-types@2.0.0: {}
+
string-length@4.0.2:
dependencies:
char-regex: 1.0.2
@@ -19907,6 +20153,10 @@ snapshots:
dependencies:
punycode: 2.3.1
+ tr46@5.1.1:
+ dependencies:
+ punycode: 2.3.1
+
tree-kill@1.2.2: {}
truncate-utf8-bytes@1.0.2:
@@ -20117,6 +20367,8 @@ snapshots:
has-symbols: 1.0.3
which-boxed-primitive: 1.1.0
+ underscore@1.13.7: {}
+
undici-types@6.20.0: {}
undici@7.10.0: {}
@@ -20333,6 +20585,11 @@ snapshots:
tr46: 5.0.0
webidl-conversions: 7.0.0
+ whatwg-url@14.2.0:
+ dependencies:
+ tr46: 5.1.1
+ webidl-conversions: 7.0.0
+
whatwg-url@5.0.0:
dependencies:
tr46: 0.0.3
@@ -20441,6 +20698,8 @@ snapshots:
sax: 1.4.1
xmlbuilder: 11.0.1
+ xmlbuilder@10.1.1: {}
+
xmlbuilder@11.0.1: {}
xmlbuilder@15.1.1: {}