@examind/block-editor 0.7.0 → 0.8.0

package/dist/index.css

@@ -1632,38 +1632,33 @@ sl-progress-bar {
     cursor: pointer;
   }
   .excel-copy-text {
-    position: relative;
     border-radius: var(--sl-border-radius-small);
     outline-offset: 1px;
-    padding-right: 1.4em;
+    padding-right: 0.5em;
     padding-left: 0;
-    .excel-copy-text-icon {
-      font-size: 11px;
-      line-height: 1;
-      position: absolute;
-      right: 4px;
-      top: 4px;
-      color: var(--sl-color-neutral-400);
-      width: 1em;
-      height: 1em;
-      display: inline-block;
-      user-select: none;
-      cursor: pointer;
-    }
-    .excel-copy-text-icon:hover {
-      color: var(--sl-color-primary-500);
-    }
-    .excel-copy-text-icon::before {
-      content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='9' y='9' width='13' height='13' rx='2' ry='2'/%3E%3Cpath d='M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1'/%3E%3C/svg%3E");
-      display: block;
-      width: 100%;
-      height: 100%;
-    }
   }
   .excel-copy-text[data-selected] {
     outline: 1px dashed var(--sl-color-neutral-500);
     background-color: var(--sl-color-neutral-100);
   }
+  .excel-copy-text::after {
+    background-color: var(--sl-color-neutral-400);
+    content: "";
+    -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='9' y='9' width='13' height='13' rx='2' ry='2'/%3E%3Cpath d='M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1'/%3E%3C/svg%3E") no-repeat center;
+    mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='9' y='9' width='13' height='13' rx='2' ry='2'/%3E%3Cpath d='M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1'/%3E%3C/svg%3E") no-repeat center;
+    -webkit-mask-size: contain;
+    mask-size: contain;
+    display: inline-block;
+    margin-block: auto;
+    width: 1em;
+    height: 1em;
+    font-size: 11px;
+    line-height: 1;
+    margin-left: 0.5em;
+  }
+  .excel-copy-text:hover::after {
+    background-color: var(--sl-color-primary-500);
+  }
 }
 
 /* src/styles/article-fill-in-the-blank-question.css */

package/dist/index.js

@@ -4714,33 +4714,12 @@ var ExcelCopyTextNode = class _ExcelCopyTextNode extends import_lexical23.Elemen
     const dom = document.createElement("span");
     dom.setAttribute("x-copy-text", "true");
     dom.className = "excel-copy-text";
-    const copyIconElement = document.createElement("span");
-    copyIconElement.className = "excel-copy-text-icon";
-    copyIconElement.contentEditable = "false";
-    copyIconElement.addEventListener("click", (e) => {
-      e.stopPropagation();
-      e.preventDefault();
-      window.dispatchEvent(
-        new CustomEvent(
-          EXCEL_COPY_TEXT_REMOVE_COMMAND,
-          {
-            detail: {
-              nodeKey: this.__key
-            }
-          }
-        )
-      );
-    });
-    copyIconElement.addEventListener("mouseenter", () => {
+    dom.addEventListener("mouseenter", () => {
       dom.setAttribute("data-selected", "true");
     });
-    copyIconElement.addEventListener("mouseleave", () => {
+    dom.addEventListener("mouseleave", () => {
       dom.removeAttribute("data-selected");
     });
-    const tooltip = document.createElement("sl-tooltip");
-    tooltip.setAttribute("content", "Click to remove copy mark.");
-    tooltip.appendChild(copyIconElement);
-    dom.appendChild(tooltip);
     return dom;
   }
   exportDOM() {
@@ -4782,6 +4761,7 @@ var EXCEL_COPY_TEXT_CREATE_COMMAND = (0, import_lexical24.createCommand)("EXCEL_
 function ExcelCopyTextPlugin() {
   const [editor] = (0, import_LexicalComposerContext19.useLexicalComposerContext)();
   function createNode() {
+    let copyTextNode = void 0;
     editor.update(() => {
       const selection = (0, import_lexical24.$getSelection)();
       if ((0, import_lexical24.$isRangeSelection)(selection)) {
@@ -4801,7 +4781,7 @@ function ExcelCopyTextPlugin() {
             for (const node of nodes) {
               if ((0, import_lexical24.$isTextNode)(node)) {
                 if (node.getFormat() !== 0) {
-                  const copyTextNode = $createExcelCopyTextNode();
+                  copyTextNode = $createExcelCopyTextNode();
                   node.insertBefore(copyTextNode);
                   copyTextNode.append(node);
                   copyTextNode.select();
@@ -4817,7 +4797,7 @@ function ExcelCopyTextPlugin() {
                 node.remove();
                 isAppended = true;
               } else if ($isExcelWorksheetLinkNode(node)) {
-                const copyTextNode = $createExcelCopyTextNode();
+                copyTextNode = $createExcelCopyTextNode();
                 node.insertBefore(copyTextNode);
                 copyTextNode.append(node);
                 copyTextNode.select();
@@ -4830,7 +4810,7 @@ function ExcelCopyTextPlugin() {
         if (!isAppended) {
           const anchorNode = $extractSelectionNode();
           if (anchorNode) {
-            const copyTextNode = $createExcelCopyTextNode();
+            copyTextNode = $createExcelCopyTextNode();
             anchorNode.insertBefore(copyTextNode);
             copyTextNode.append(anchorNode);
             copyTextNode.select();
@@ -14412,6 +14392,18 @@ function TextToolbarPlugin() {
       }
     });
   }
+  function createExcelWorkspaceLink() {
+    let currentSelection;
+    activeEditorRef.current?.getEditorState().read(() => {
+      currentSelection = (0, import_lexical75.$getSelection)()?.clone();
+      if (currentSelection) {
+        activeEditorRef.current?.dispatchCommand(
+          EXCEL_WORKSHEET_LINK_CREATE_COMMAND,
+          void 0
+        );
+      }
+    });
+  }
   function createSpaceFromSelection() {
     if (hasModule("Questions")) {
       if (activeDecoratorRef.current === FillInTheBlankQuestionNode) {
@@ -14484,6 +14476,10 @@ function TextToolbarPlugin() {
             );
             e.preventDefault();
             e.stopPropagation();
+          } else if (e.shiftKey && (e.key === "k" || e.key === "K")) {
+            createExcelWorkspaceLink();
+            e.preventDefault();
+            e.stopPropagation();
           } else if (e.shiftKey && (e.key === "b" || e.key === "B")) {
             createSpaceFromSelection();
             e.preventDefault();
@@ -14526,6 +14522,10 @@ function TextToolbarPlugin() {
           );
           e.preventDefault();
           e.stopPropagation();
+        } else if (e.ctrlKey && e.shiftKey && (e.key === "k" || e.key === "K")) {
+          createExcelWorkspaceLink();
+          e.preventDefault();
+          e.stopPropagation();
         } else if (e.ctrlKey && e.shiftKey && (e.key === "b" || e.key === "B")) {
           createSpaceFromSelection();
           e.preventDefault();
@@ -14766,7 +14766,7 @@ function TextToolbarPlugin() {
             }
           }
         );
-        if (hasModule("Link") && activeDecoratorRef.current !== ExcelQuestionNode2) {
+        if (hasModule("Link")) {
           resultList.push({
             id: "link",
             label: "",
@@ -14781,8 +14781,8 @@ function TextToolbarPlugin() {
           resultList.push({
             id: "link",
             label: "",
-            Icon: import_lucide_react20.Link2,
-            tooltip: `Link Worksheet ${plt === "macOS" /* macOS */ ? "(\u2318K)" : "(Ctrl+K)"}`,
+            Icon: import_lucide_react20.FileSymlink,
+            tooltip: `Link Worksheet ${plt === "macOS" /* macOS */ ? "(\u2318\u21E7K)" : "(Ctrl+Shift+K)"}`,
             onClick: () => {
               activeEditorRef.current?.dispatchCommand(
                 EXCEL_WORKSHEET_LINK_CREATE_COMMAND,

package/dist/index.mjs

@@ -4830,33 +4830,12 @@ var ExcelCopyTextNode = class _ExcelCopyTextNode extends ElementNode2 {
     const dom = document.createElement("span");
     dom.setAttribute("x-copy-text", "true");
     dom.className = "excel-copy-text";
-    const copyIconElement = document.createElement("span");
-    copyIconElement.className = "excel-copy-text-icon";
-    copyIconElement.contentEditable = "false";
-    copyIconElement.addEventListener("click", (e) => {
-      e.stopPropagation();
-      e.preventDefault();
-      window.dispatchEvent(
-        new CustomEvent(
-          EXCEL_COPY_TEXT_REMOVE_COMMAND,
-          {
-            detail: {
-              nodeKey: this.__key
-            }
-          }
-        )
-      );
-    });
-    copyIconElement.addEventListener("mouseenter", () => {
+    dom.addEventListener("mouseenter", () => {
       dom.setAttribute("data-selected", "true");
     });
-    copyIconElement.addEventListener("mouseleave", () => {
+    dom.addEventListener("mouseleave", () => {
       dom.removeAttribute("data-selected");
     });
-    const tooltip = document.createElement("sl-tooltip");
-    tooltip.setAttribute("content", "Click to remove copy mark.");
-    tooltip.appendChild(copyIconElement);
-    dom.appendChild(tooltip);
     return dom;
   }
   exportDOM() {
@@ -4898,6 +4877,7 @@ var EXCEL_COPY_TEXT_CREATE_COMMAND = createCommand4("EXCEL_COPY_TEXT_CREATE_COMM
 function ExcelCopyTextPlugin() {
   const [editor] = useLexicalComposerContext19();
   function createNode() {
+    let copyTextNode = void 0;
     editor.update(() => {
       const selection = $getSelection5();
       if ($isRangeSelection3(selection)) {
@@ -4917,7 +4897,7 @@ function ExcelCopyTextPlugin() {
             for (const node of nodes) {
               if ($isTextNode2(node)) {
                 if (node.getFormat() !== 0) {
-                  const copyTextNode = $createExcelCopyTextNode();
+                  copyTextNode = $createExcelCopyTextNode();
                   node.insertBefore(copyTextNode);
                   copyTextNode.append(node);
                   copyTextNode.select();
@@ -4933,7 +4913,7 @@ function ExcelCopyTextPlugin() {
                 node.remove();
                 isAppended = true;
               } else if ($isExcelWorksheetLinkNode(node)) {
-                const copyTextNode = $createExcelCopyTextNode();
+                copyTextNode = $createExcelCopyTextNode();
                 node.insertBefore(copyTextNode);
                 copyTextNode.append(node);
                 copyTextNode.select();
@@ -4946,7 +4926,7 @@ function ExcelCopyTextPlugin() {
         if (!isAppended) {
           const anchorNode = $extractSelectionNode();
           if (anchorNode) {
-            const copyTextNode = $createExcelCopyTextNode();
+            copyTextNode = $createExcelCopyTextNode();
             anchorNode.insertBefore(copyTextNode);
             copyTextNode.append(anchorNode);
             copyTextNode.select();
@@ -14692,6 +14672,7 @@ import {
   Brush,
   Circle,
   ClipboardCheck,
+  FileSymlink,
   Highlighter,
   Italic,
   Link2,
@@ -14860,6 +14841,18 @@ function TextToolbarPlugin() {
       }
     });
   }
+  function createExcelWorkspaceLink() {
+    let currentSelection;
+    activeEditorRef.current?.getEditorState().read(() => {
+      currentSelection = $getSelection13()?.clone();
+      if (currentSelection) {
+        activeEditorRef.current?.dispatchCommand(
+          EXCEL_WORKSHEET_LINK_CREATE_COMMAND,
+          void 0
+        );
+      }
+    });
+  }
   function createSpaceFromSelection() {
     if (hasModule("Questions")) {
       if (activeDecoratorRef.current === FillInTheBlankQuestionNode) {
@@ -14932,6 +14925,10 @@ function TextToolbarPlugin() {
             );
             e.preventDefault();
             e.stopPropagation();
+          } else if (e.shiftKey && (e.key === "k" || e.key === "K")) {
+            createExcelWorkspaceLink();
+            e.preventDefault();
+            e.stopPropagation();
           } else if (e.shiftKey && (e.key === "b" || e.key === "B")) {
             createSpaceFromSelection();
             e.preventDefault();
@@ -14974,6 +14971,10 @@ function TextToolbarPlugin() {
           );
           e.preventDefault();
           e.stopPropagation();
+        } else if (e.ctrlKey && e.shiftKey && (e.key === "k" || e.key === "K")) {
+          createExcelWorkspaceLink();
+          e.preventDefault();
+          e.stopPropagation();
         } else if (e.ctrlKey && e.shiftKey && (e.key === "b" || e.key === "B")) {
           createSpaceFromSelection();
           e.preventDefault();
@@ -15214,7 +15215,7 @@ function TextToolbarPlugin() {
             }
           }
         );
-        if (hasModule("Link") && activeDecoratorRef.current !== ExcelQuestionNode2) {
+        if (hasModule("Link")) {
           resultList.push({
             id: "link",
             label: "",
@@ -15229,8 +15230,8 @@ function TextToolbarPlugin() {
           resultList.push({
             id: "link",
             label: "",
-            Icon: Link2,
-            tooltip: `Link Worksheet ${plt === "macOS" /* macOS */ ? "(\u2318K)" : "(Ctrl+K)"}`,
+            Icon: FileSymlink,
+            tooltip: `Link Worksheet ${plt === "macOS" /* macOS */ ? "(\u2318\u21E7K)" : "(Ctrl+Shift+K)"}`,
             onClick: () => {
               activeEditorRef.current?.dispatchCommand(
                 EXCEL_WORKSHEET_LINK_CREATE_COMMAND,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examind/block-editor",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "@comment version": [
     "Don't specify package version here. It will be injected by publish workflow."
   ],
@@ -62,7 +62,7 @@
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
     "typescript-eslint": "^8.18.2",
-    "@examind/block-types": "0.7.0"
+    "@examind/block-types": "0.8.0"
   },
   "dependencies": {
     "@dnd-kit/core": "6.3.1",