Merge branch 'main' into pro

apps/www/src/components/plate-ui/playground-insert-dropdown-menu.tsx

@@ -10,7 +10,8 @@ import { CodeBlockPlugin } from '@udecode/plate-code-block/react';
 import { insertEmptyElement } from '@udecode/plate-common';
 import { ParagraphPlugin, focusEditor } from '@udecode/plate-common/react';
 import { ExcalidrawPlugin } from '@udecode/plate-excalidraw/react';
-import { HEADING_KEYS } from '@udecode/plate-heading';
+import { HEADING_KEYS, insertToc } from '@udecode/plate-heading';
+import { TocPlugin } from '@udecode/plate-heading/react';
 import { HorizontalRulePlugin } from '@udecode/plate-horizontal-rule/react';
 import { toggleIndentList } from '@udecode/plate-indent-list';
 import { IndentListPlugin } from '@udecode/plate-indent-list/react';
@@ -117,6 +118,12 @@ const items = [
         label: 'Columns',
         value: ColumnPlugin.key,
       },
+      {
+        description: 'Table of Contents',
+        icon: Icons.h3,
+        label: 'Table of Contents',
+        value: TocPlugin.key,
+      },
     ],
     label: 'Basic blocks',
   },
@@ -241,6 +248,11 @@ export function PlaygroundInsertDropdownMenu(props: DropdownMenuProps) {
 
                           break;
                         }
+                        case TocPlugin.key: {
+                          insertToc(editor);
+
+                          break;
+                        }
                         default: {
                           insertEmptyElement(editor, type, {
                             nextBlock: true,

apps/www/src/lib/plate/create-plate-ui.ts

@@ -28,6 +28,7 @@ import { EmojiInputPlugin } from '@udecode/plate-emoji/react';
 import { ExcalidrawPlugin } from '@udecode/plate-excalidraw/react';
 import { FindReplacePlugin } from '@udecode/plate-find-replace';
 import { HEADING_KEYS } from '@udecode/plate-heading';
+import { TocPlugin } from '@udecode/plate-heading/react';
 import { HighlightPlugin } from '@udecode/plate-highlight/react';
 import { HorizontalRulePlugin } from '@udecode/plate-horizontal-rule/react';
 import { KbdPlugin } from '@udecode/plate-kbd/react';
@@ -84,6 +85,7 @@ import {
 } from '@/registry/default/plate-ui/table-cell-element';
 import { TableElement } from '@/registry/default/plate-ui/table-element';
 import { TableRowElement } from '@/registry/default/plate-ui/table-row-element';
+import { TocElement } from '@/registry/default/plate-ui/toc-element';
 import { TodoListElement } from '@/registry/default/plate-ui/todo-list-element';
 import { ToggleElement } from '@/registry/default/plate-ui/toggle-element';
 import { withDraggables } from '@/registry/default/plate-ui/with-draggables';
@@ -133,6 +135,7 @@ export const createPlateUI = ({
     [TableCellPlugin.key]: TableCellElement,
     [TablePlugin.key]: TableElement,
     [TableRowPlugin.key]: TableRowElement,
+    [TocPlugin.key]: TocElement,
     [TodoListPlugin.key]: TodoListElement,
     [TogglePlugin.key]: ToggleElement,
     [UnderlinePlugin.key]: withProps(PlateLeaf, { as: 'u' }),

apps/www/src/registry/default/example/playground-demo.tsx

@@ -39,7 +39,7 @@ import {
   FontSizePlugin,
 } from '@udecode/plate-font/react';
 import { HEADING_KEYS } from '@udecode/plate-heading';
-import { HeadingPlugin } from '@udecode/plate-heading/react';
+import { HeadingPlugin, TocPlugin } from '@udecode/plate-heading/react';
 import { HighlightPlugin } from '@udecode/plate-highlight/react';
 import { HorizontalRulePlugin } from '@udecode/plate-horizontal-rule/react';
 import { IndentPlugin } from '@udecode/plate-indent/react';
@@ -123,6 +123,13 @@ export const usePlaygroundEditor = (id: any = '', scrollSelector?: string) => {
         copilotPlugin,
         // Nodes
         HeadingPlugin,
+        TocPlugin.configure({
+          options: {
+            isScroll: true,
+            scrollContainerSelector: `#${scrollSelector}`,
+            topOffset: 80,
+          },
+        }),
         BlockquotePlugin,
         CodeBlockPlugin.configure({
           options: {

apps/www/src/registry/default/plate-ui/toc-element.tsx

@@ -0,0 +1,56 @@
+import { cn } from '@udecode/cn';
+import { PlateElement } from '@udecode/plate-common/react';
+import {
+  useTocElement,
+  useTocElementState,
+} from '@udecode/plate-heading/react';
+import { withRef } from '@udecode/react-utils';
+import { cva } from 'class-variance-authority';
+
+import { Button } from './button';
+
+const headingItemVariants = cva(
+  'block h-auto w-full cursor-pointer truncate rounded-none px-0.5 py-1.5 text-left font-medium text-muted-foreground underline decoration-[0.5px] underline-offset-4 hover:bg-accent hover:text-muted-foreground',
+  {
+    variants: {
+      depth: {
+        1: 'pl-0.5',
+        2: 'pl-[26px]',
+        3: 'pl-[50px]',
+      },
+    },
+  }
+);
+
+export const TocElement = withRef<typeof PlateElement>(
+  ({ children, className, ...props }, ref) => {
+    const state = useTocElementState();
+
+    const { props: btnProps } = useTocElement(state);
+
+    const { headingList } = state;
+
+    return (
+      <PlateElement
+        ref={ref}
+        className={cn('relative mb-1 p-0', className)}
+        {...props}
+      >
+        <nav contentEditable={false}>
+          {headingList.map((item) => (
+            <Button
+              key={item.id}
+              variant="ghost"
+              className={cn(headingItemVariants({ depth: item.depth as any }))}
+              onClick={(e) => btnProps.onClick(e, item, 'smooth')}
+              aria-current
+            >
+              {item.title}
+            </Button>
+          ))}
+        </nav>
+        {children}
+      </PlateElement>
+    );
+  }
+);

packages/basic-elements/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @udecode/plate-basic-elements
 
+## 38.0.12
+
 ## 38.0.1
 
 ### Patch Changes

packages/basic-elements/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-basic-elements",
-  "version": "38.0.1",
+  "version": "38.0.12",
   "description": "Basic elements plugin for Plate",
   "keywords": [
     "plate",
@@ -52,7 +52,7 @@
   "dependencies": {
     "@udecode/plate-block-quote": "38.0.1",
     "@udecode/plate-code-block": "38.0.1",
-    "@udecode/plate-heading": "38.0.1"
+    "@udecode/plate-heading": "38.0.12"
   },
   "devDependencies": {
     "@udecode/plate-common": "workspace:^"

packages/docx/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @udecode/plate-docx-serializer
 
+## 38.0.12
+
 ## 38.0.10
 
 ## 38.0.8

packages/docx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-docx",
-  "version": "38.0.10",
+  "version": "38.0.12",
   "description": "Docx serializer plugin for Plate",
   "keywords": [
     "docx",
@@ -46,7 +46,7 @@
     "typecheck": "yarn p:typecheck"
   },
   "dependencies": {
-    "@udecode/plate-heading": "38.0.1",
+    "@udecode/plate-heading": "38.0.12",
     "@udecode/plate-indent": "38.0.1",
     "@udecode/plate-indent-list": "38.0.10",
     "@udecode/plate-media": "38.0.6",

packages/heading/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @udecode/plate-heading
 
+## 38.0.12
+
+### Patch Changes
+
+- [#3586](https://github.com/udecode/plate/pull/3586) by [@felixfeng33](https://github.com/felixfeng33) – Remove useless props move config from `useTocElementState` to TocPlugin `options`
+
 ## 38.0.1
 
 ### Patch Changes

packages/heading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-heading",
-  "version": "38.0.1",
+  "version": "38.0.12",
   "description": "Headings plugin for Plate",
   "keywords": [
     "plate",

packages/heading/src/lib/BaseTocPlugin.ts

@@ -9,11 +9,19 @@ import type { Heading } from './types';
 export type TocConfig = PluginConfig<
   'toc',
   {
+    isScroll: boolean;
+    topOffset: number;
     queryHeading?: (editor: SlateEditor) => Heading[];
+    scrollContainerSelector?: string;
   }
 >;
 
 export const BaseTocPlugin = createTSlatePlugin<TocConfig>({
   key: 'toc',
   node: { isElement: true, isVoid: true },
+  options: {
+    isScroll: true,
+    scrollContainerSelector: '#scroll_container',
+    topOffset: 80,
+  },
 });

packages/heading/src/react/hooks/useTocController.ts

@@ -5,21 +5,18 @@ import { useTocObserver } from './useTocObserver';
 interface UseTocController {
   activeId: string;
   isObserve: boolean;
-  showHeader: boolean;
   tocRef: React.RefObject<HTMLElement>;
 }
 
 export const useTocController = ({
   activeId,
   isObserve,
-  showHeader,
   tocRef,
 }: UseTocController) => {
   const [activeTocId, setActiveTocId] = React.useState('');
   const { offset, visible } = useTocObserver({
     activeId: activeTocId,
     isObserve,
-    showHeader,
     tocRef,
   });
 

packages/heading/src/react/hooks/useTocElement.ts

@@ -3,27 +3,19 @@ import React, { useEffect } from 'react';
 import { getNode } from '@udecode/plate-common';
 import {
   toDOMNode,
-  useEditorRef,
+  useEditorPlugin,
   useEditorSelector,
 } from '@udecode/plate-common/react';
 
 import type { Heading } from '../../lib/types';
 
 import { getHeadingList } from '../../internal/getHeadingList';
+import { TocPlugin } from '../TocPlugin';
 import { heightToTop } from '../utils';
 
-export type useTocElementStateProps = {
-  isScroll: boolean;
-  topOffset: number;
-  scrollContainerSelector?: string;
-};
-
-export const useTocElementState = ({
-  isScroll,
-  scrollContainerSelector,
-  topOffset,
-}: useTocElementStateProps) => {
-  const editor = useEditorRef();
+export const useTocElementState = () => {
+  const { editor, getOptions } = useEditorPlugin(TocPlugin);
+  const { isScroll, scrollContainerSelector, topOffset } = getOptions();
 
   const headingList = useEditorSelector(getHeadingList, []);
 

packages/heading/src/react/hooks/useTocObserver.ts

@@ -3,7 +3,6 @@ import React from 'react';
 interface UseTocObserver {
   activeId: string;
   isObserve: boolean;
-  showHeader: boolean;
   tocRef: React.RefObject<HTMLElement>;
 }
 

packages/heading/src/react/hooks/useTocSideBarState.ts

@@ -3,7 +3,7 @@ import React from 'react';
 import { getNode } from '@udecode/plate-common';
 import {
   toDOMNode,
-  useEditorRef,
+  useEditorPlugin,
   useEditorSelector,
 } from '@udecode/plate-common/react';
 
@@ -12,19 +12,25 @@ import type { TocSideBarProps } from '../types';
 
 import { useContentController, useTocController } from '.';
 import { getHeadingList } from '../../internal/getHeadingList';
+import { TocPlugin } from '../TocPlugin';
 import { checkIn } from '../utils';
 
 export const useTocSideBarState = ({
-  containerRef,
   open = true,
   rootMargin = '0px 0px 0px 0px',
-  showHeader = true,
-  style,
   topOffset = 0,
-  onOpenChange,
 }: TocSideBarProps) => {
-  const editor = useEditorRef();
+  const { editor, getOptions } = useEditorPlugin(TocPlugin);
+  const { scrollContainerSelector } = getOptions();
   const headingList = useEditorSelector(getHeadingList, []);
+  const scrollContainerRef = React.useRef<HTMLDivElement | null>(null);
+
+  React.useEffect(() => {
+    scrollContainerRef.current = document.querySelector(
+      scrollContainerSelector ?? '#scroll_container'
+    )!;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const tocRef = React.useRef<HTMLElement>(null);
 
@@ -33,7 +39,7 @@ export const useTocSideBarState = ({
   const [isObserve, setIsObserve] = React.useState(open);
 
   const { activeContentId, onContentScroll } = useContentController({
-    containerRef,
+    containerRef: scrollContainerRef,
     isObserve,
     rootMargin,
     topOffset,
@@ -42,7 +48,6 @@ export const useTocSideBarState = ({
   useTocController({
     activeId: activeContentId,
     isObserve,
-    showHeader,
     tocRef,
   });
 
@@ -54,11 +59,8 @@ export const useTocSideBarState = ({
     open,
     setIsObserve,
     setMouseInToc,
-    showHeader,
-    style,
     tocRef,
     onContentScroll,
-    onOpenChange,
   };
 };
 

packages/heading/src/react/types.ts

@@ -1,11 +1,6 @@
 export interface TocSideBarProps {
-  containerRef: React.RefObject<HTMLDivElement>;
-  className?: string;
-  onOpenChange?: (open: boolean) => void;
   open?: boolean;
   rootMargin?: string;
-  showHeader?: boolean;
-  style?: React.CSSProperties;
   topOffset?: number;
 }
 

packages/plate/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @udecode/plate
 
+## 38.0.12
+
 ## 38.0.11
 
 ## 38.0.10