@dxos/react-ui-editor 0.3.11-main.474ad53 → 0.3.11-main.47fbf79

package/dist/lib/browser/index.mjs

@@ -1836,7 +1836,7 @@ import { syntaxTree as syntaxTree2 } from "@codemirror/language";
 import { RangeSetBuilder as RangeSetBuilder2, EditorSelection } from "@codemirror/state";
 import { Decoration as Decoration4, EditorView as EditorView9, keymap as keymap5, ViewPlugin as ViewPlugin4 } from "@codemirror/view";
 import { useState, useMemo } from "react";
-var compareFormatting = (a, b) => a.blockType === b.blockType && a.strong === b.strong && a.emphasis === b.emphasis && a.strikethrough === b.strikethrough && a.code === b.code && a.link === b.link && a.listStyle === b.listStyle && a.blockQuote === b.blockQuote;
+var compareFormatting = (a, b) => a.blockType === b.blockType && a.strong === b.strong && a.emphasis === b.emphasis && a.strikethrough === b.strikethrough && a.code === b.code && a.link === b.link && a.listStyle === b.listStyle && a.blockquote === b.blockquote;
 var Inline;
 (function(Inline2) {
   Inline2[Inline2["Strong"] = 0] = "Strong";
@@ -2108,18 +2108,15 @@ var skipSpaces = (pos, doc, dir, limit) => {
 };
 var snippets = {
   codeblock: snippet([
-    //
-    "```#{}",
+    "```#{lang}",
     "#{}",
     "```"
   ].join("\n")),
   table: snippet([
-    //
     "| #{col1} | #{col2} |",
     "| ---- | ---- |",
     "| #{val1} | #{val2} |",
-    "| #{val3} | #{val4} |",
-    ""
+    "| #{val3} | #{val4} |"
   ].join("\n"))
 };
 var insertTable = (view) => {
@@ -2313,20 +2310,6 @@ var addList = (type) => ({ state, dispatch }) => {
     });
   }
   if (!blocks.length) {
-    const { from, to } = state.doc.lineAt(state.selection.main.anchor);
-    if (from === to) {
-      dispatch(state.update({
-        changes: [
-          {
-            from,
-            insert: type === 1 ? "- " : type === 0 ? "1. " : "- [ ] "
-          }
-        ],
-        userEvent: "format.list.add",
-        scrollIntoView: true
-      }));
-      return true;
-    }
     return false;
   }
   const changes = [];
@@ -2541,7 +2524,7 @@ var setBlockquote = (enable) => ({ state, dispatch }) => {
 var addBlockquote = setBlockquote(true);
 var removeBlockquote = setBlockquote(false);
 var toggleBlockquote = (target) => {
-  return (getFormatting(target.state).blockQuote ? removeBlockquote : addBlockquote)(target);
+  return (getFormatting(target.state).blockquote ? removeBlockquote : addBlockquote)(target);
 };
 var addCodeblock = (target) => {
   const { state, dispatch } = target;
@@ -2723,37 +2706,37 @@ var InlineMarker = {
   Strikethrough: 2
 };
 var IgnoreInline = /* @__PURE__ */ new Set([
-  "Autolink",
-  "CodeMark",
-  "CodeText",
-  "Comment",
-  "EmphasisMark",
   "Hardbreak",
-  "HeaderMark",
   "HTMLTag",
-  "LinkMark",
-  "ListMark",
+  "Comment",
   "ProcessingInstruction",
+  "Autolink",
+  "HeaderMark",
   "QuoteMark",
+  "ListMark",
+  "LinkMark",
+  "EmphasisMark",
+  "CodeMark",
+  "CodeText",
   "StrikethroughMark",
-  "SubscriptMark",
+  "TaskMarker",
   "SuperscriptMark",
-  "TaskMarker"
+  "SubscriptMark"
 ]);
 var Textblocks = {
+  Paragraph: "paragraph",
+  Task: "paragraph",
+  CodeBlock: "codeblock",
+  FencedCode: "codeblock",
   ATXHeading1: "heading1",
   ATXHeading2: "heading2",
   ATXHeading3: "heading3",
   ATXHeading4: "heading4",
   ATXHeading5: "heading5",
   ATXHeading6: "heading6",
-  CodeBlock: "codeblock",
-  FencedCode: "codeblock",
-  Paragraph: "paragraph",
   SetextHeading1: "heading1",
   SetextHeading2: "heading2",
-  TableCell: "tablecell",
-  Task: "paragraph"
+  TableCell: "tablecell"
 };
 var getFormatting = (state) => {
   let blockType = null;
@@ -2764,7 +2747,7 @@ var getFormatting = (state) => {
     null
   ];
   let link2 = false;
-  let blockQuote = null;
+  let blockquote2 = null;
   let listStyle = null;
   const stack = [];
   let currentBlock = null;
@@ -2873,10 +2856,10 @@ var getFormatting = (state) => {
               hasList = stack[i] === "TaskList" ? "task" : stack[i] === "BulletList" ? "bullet" : "ordered";
             }
           }
-          if (blockQuote === null) {
-            blockQuote = hasQuote;
-          } else if (!hasQuote && blockQuote) {
-            blockQuote = false;
+          if (blockquote2 === null) {
+            blockquote2 = hasQuote;
+          } else if (!hasQuote && blockquote2) {
+            blockquote2 = false;
           }
           if (listStyle === null) {
             listStyle = hasList;
@@ -2890,17 +2873,14 @@ var getFormatting = (state) => {
       }
     });
   }
-  const { from, to } = state.doc.lineAt(selection.main.anchor);
-  const blankLine = from === to;
   return {
-    blankLine,
     blockType: blockType || null,
-    blockQuote: blockQuote ?? false,
-    code: inline[3] ?? false,
-    emphasis: inline[1] ?? false,
     strong: inline[0] ?? false,
+    emphasis: inline[1] ?? false,
+    code: inline[3] ?? false,
     strikethrough: inline[2] ?? false,
     link: link2,
+    blockquote: blockquote2 ?? false,
     listStyle: listStyle || null
   };
 };
@@ -3934,20 +3914,11 @@ var defaultMarkdownSlots = {
 };
 
 // packages/ui/react-ui-editor/src/components/Toolbar/Toolbar.tsx
-import { CaretRight, ChatText, Code, CodeBlock, Link, ListBullets, ListChecks, ListNumbers, Paragraph, TextStrikethrough, Table as Table2, TextB, TextHOne, TextHTwo, TextHThree, TextHFour, TextHFive, TextHSix, TextItalic } from "@phosphor-icons/react";
+import { CaretRight, ChatText, Code, Link, ListBullets, ListChecks, ListNumbers, Paragraph, TextStrikethrough, Table as Table2, TextB, TextItalic } from "@phosphor-icons/react";
 import { createContext } from "@radix-ui/react-context";
 import React2 from "react";
 import { Button, DensityProvider, Select } from "@dxos/react-ui";
 import { getSize, mx as mx4 } from "@dxos/react-ui-theme";
-var HeadingIcons = {
-  "0": Paragraph,
-  "1": TextHOne,
-  "2": TextHTwo,
-  "3": TextHThree,
-  "4": TextHFour,
-  "5": TextHFive,
-  "6": TextHSix
-};
 var [ToolbarContextProvider, useToolbarContext] = createContext("Toolbar");
 var ToolbarRoot = ({ children, onAction, state }) => {
   return /* @__PURE__ */ React2.createElement(ToolbarContextProvider, {
@@ -3957,7 +3928,7 @@ var ToolbarRoot = ({ children, onAction, state }) => {
     density: "fine"
   }, /* @__PURE__ */ React2.createElement("div", {
     role: "toolbar",
-    className: "flex w-full shrink-0 p-1 gap-4 items-center whitespace-nowrap overflow-hidden"
+    className: "flex w-full shrink-0 p-1 gap-2 items-center whitespace-nowrap overflow-hidden"
   }, children)));
 };
 var ToolbarButton = ({ Icon, onClick, title, getState, disable }) => {
@@ -3988,8 +3959,7 @@ var MarkdownHeading = () => {
   const { onAction, state } = useToolbarContext("MarkdownFormatting");
   const blockType = state ? state.blockType : "paragraph";
   const header = blockType && /heading(\d)/.exec(blockType);
-  const value = header ? header[1] : blockType === "paragraph" || !blockType ? "0" : void 0;
-  const HeadingIcon = HeadingIcons[value ?? "0"];
+  const value = header ? header[1] : blockType === "paragraph" || !blockType ? "0" : null;
   return /* @__PURE__ */ React2.createElement(Select.Root, {
     disabled: value === null,
     value: value ?? "0",
@@ -3997,7 +3967,7 @@ var MarkdownHeading = () => {
       type: "heading",
       data: parseInt(value2)
     })
-  }, /* @__PURE__ */ React2.createElement(Select.TriggerButton, null, /* @__PURE__ */ React2.createElement(HeadingIcon, {
+  }, /* @__PURE__ */ React2.createElement(Select.TriggerButton, null, /* @__PURE__ */ React2.createElement(Paragraph, {
     className: getSize(5)
   })), /* @__PURE__ */ React2.createElement(Select.Portal, null, /* @__PURE__ */ React2.createElement(Select.Content, null, /* @__PURE__ */ React2.createElement(Select.Viewport, null, /* @__PURE__ */ React2.createElement(Select.Option, {
     value: "0"
@@ -4084,15 +4054,14 @@ var MarkdownBlocks = () => /* @__PURE__ */ React2.createElement("div", {
 }, /* @__PURE__ */ React2.createElement(ToolbarButton, {
   Icon: CaretRight,
   title: "Block quote",
-  getState: (s) => s.blockQuote,
+  getState: (s) => s.blockquote,
   onClick: (s) => ({
     type: "blockquote",
-    data: s ? !s.blockQuote : null
+    data: s ? !s.blockquote : null
   })
 }), /* @__PURE__ */ React2.createElement(ToolbarButton, {
-  Icon: CodeBlock,
+  Icon: Code,
   title: "Code block",
-  disable: (s) => !s.blankLine,
   getState: (s) => s.blockType === "codeblock",
   onClick: (s) => ({
     type: "codeblock",
@@ -4101,7 +4070,6 @@ var MarkdownBlocks = () => /* @__PURE__ */ React2.createElement("div", {
 }), /* @__PURE__ */ React2.createElement(ToolbarButton, {
   Icon: Table2,
   title: "Table",
-  disable: (s) => !s.blankLine,
   onClick: () => ({
     type: "table"
   })