Merge branch 'main' of github.com:sveltor/nextlint

lynhan318 · Apr 2, 2024 · 3b57805 · 3b57805
2 parents 2c43319 + 2d84060
commit 3b57805
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 22 deletions.
diff --git a/.changeset/angry-jars-switch.md b/.changeset/angry-jars-switch.md
@@ -0,0 +1,5 @@
+---
+'@nextlint/svelte': patch
+---
+
+fix: hide preview link when cursor out'
diff --git a/.changeset/cuddly-bats-admire.md b/.changeset/cuddly-bats-admire.md
diff --git a/.changeset/slimy-melons-exercise.md b/.changeset/slimy-melons-exercise.md
@@ -0,0 +1,6 @@
+---
+'@nextlint/svelte': patch
+'@nextlint/core': patch
+---
+
+remove log
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -76,9 +76,7 @@ export const nodeIdDecorator = (plugin: TiptapNode) => {
   return plugin;
 };
 export const extractTOC = (root: HTMLElement) => {
-  root.childNodes.forEach(child => {
-    console.log('childNOde', child);
-  });
+  root.childNodes.forEach(child => {});
 };
 
 export const getRootNode = (editor: Editor) => {

diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nextlint/editor
 
+## 3.0.1
+
+### Patch Changes
+
+- [`7da1e24`](https://github.com/sveltor/nextlint/commit/7da1e243a5f43c1316a0c205cb08be9b82e6569a) Thanks [@lynhan318](https://github.com/lynhan318)! - replace shikijs with shiki, add more support languages
+
 ## 3.0.0
 
 ### Major Changes

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextlint/svelte",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "scripts": {
     "playground": "vite dev",
     "dev": "pnpm dev:package",

diff --git a/packages/svelte/src/lib/plugins/image/EmbedTab.svelte b/packages/svelte/src/lib/plugins/image/EmbedTab.svelte
@@ -9,7 +9,6 @@
     const {editor, getPos, deleteNode} = $props;
 
     if (typeof getPos === 'function') {
-      console.log('deleteNode');
       const pos = getPos();
       deleteNode();
       editor

diff --git a/packages/svelte/src/lib/plugins/link/tiptap-link-v2.ts b/packages/svelte/src/lib/plugins/link/tiptap-link-v2.ts
@@ -49,24 +49,33 @@ export const LinkExtension = TiptapLinkExtension.extend<NextLinkOptions>({
       new Plugin({
         key: new PluginKey('LinkPreview'),
         view: () => {
-          return {destroy: floatingRenderer.destroy};
-        },
-        props: {
-          handleDOMEvents: {
-            mouseup: (view: EditorView, event: MouseEvent) => {
-              if (!view.state.selection.empty) {
+          return {
+            destroy: floatingRenderer.destroy,
+            update(view: EditorView) {
+              const posOfCursor = view.state.selection.anchor;
+              const {node} = view.domAtPos(posOfCursor);
+
+              if (!node.parentNode) {
                 floatingRenderer.unmount();
-                if (floatingRenderer.mounted) {
-                  floatingRenderer.unmount();
-                }
                 return;
               }
-              const pos = view.posAtDOM(event.target as unknown as Node, 0);
-              if (!pos) {
+
+              if (node.parentNode?.nodeName !== 'A') {
                 floatingRenderer.unmount();
                 return;
               }
 
+              if (!view.state.selection.empty) {
+                floatingRenderer.unmount();
+                return;
+              }
+            }
+          };
+        },
+        props: {
+          handleDOMEvents: {
+            mouseup: (view: EditorView, event: MouseEvent) => {
+              const pos = view.posAtDOM(event.target as unknown as Node, 0);
               const node = view.state.doc.nodeAt(pos);
               if (node && hasLinkMark(node.marks || [])) {
                 const mark = node.marks.find(

diff --git a/packages/svelte/src/routes/+page.svelte b/packages/svelte/src/routes/+page.svelte
@@ -18,7 +18,6 @@ This is NOT a component library. It's a collection of re-usable components that
   let html;
   const toHtml = async () => {
     html = await svelteEditorToHtml($editor);
-    console.log('html', html);
   };
 
   const handleUpload = async (file: File) => {