@@ -26,10 +26,6 @@ import {
   TableHandlesExtension,
   TrailingNodeExtension,
 } from "../../../extensions/index.js";
-import {
-  DEFAULT_LINK_PROTOCOL,
-  VALID_LINK_PROTOCOLS,
-} from "../../../extensions/LinkToolbar/protocols.js";
 import {
   BackgroundColorExtension,
   HardBreak,
@@ -49,8 +45,6 @@ import {
 import { ExtensionFactoryInstance } from "../../BlockNoteExtension.js";
 import { CollaborationExtension } from "../../../extensions/Collaboration/Collaboration.js";
 
-let LINKIFY_INITIALIZED = false;
-
 /**
  * Get all the Tiptap extensions BlockNote is configured with by default
  */
@@ -78,22 +72,7 @@ export function getDefaultTiptapExtensions(
     SuggestionAddMark,
     SuggestionDeleteMark,
     SuggestionModificationMark,
-    Link.extend({
-      inclusive: false,
-    })
-      .extend({
-        // Remove the title attribute to avoid unnecessary null attributes in serialized output
-        addAttributes() {
-          const attrs = this.parent?.() || {};
-          delete (attrs as Record<string, unknown>).title;
-          return attrs;
-        },
-      })
-      .configure({
-      defaultProtocol: DEFAULT_LINK_PROTOCOL,
-      // only call this once if we have multiple editors installed. Or fix https://github.com/ueberdosis/tiptap/issues/5450
-      protocols: LINKIFY_INITIALIZED ? [] : VALID_LINK_PROTOCOLS,
-    }),
+    Link,
     ...(Object.values(editor.schema.styleSpecs).map((styleSpec) => {
       return styleSpec.implementation.mark.configure({
         editor: editor,
@@ -170,8 +149,6 @@ export function getDefaultTiptapExtensions(
     createDropFileExtension(editor),
   ];
 
-  LINKIFY_INITIALIZED = true;
-
   return tiptapExtensions;
 }
 
 
@@ -18,12 +18,6 @@ import {
 /**
  * Check if the provided tokens form a valid link structure, which can either be a single link token
  * or a link token surrounded by parentheses or square brackets.
- *
- * This ensures that only complete and valid text is hyperlinked, preventing cases where a valid
- * top-level domain (TLD) is immediately followed by an invalid character, like a number. For
- * example, with the `find` method from Linkify, entering `example.com1` would result in
- * `example.com` being linked and the trailing `1` left as plain text. By using the `tokenize`
- * method, we can perform more comprehensive validation on the input text.
  */
 function isValidLinkStructure(tokens: LinkMatch[]) {
   if (tokens.length === 1) {
@@ -42,36 +36,23 @@ type AutolinkOptions = {
   defaultProtocol: string;
   validate: (url: string) => boolean;
   shouldAutoLink: (url: string) => boolean;
-  protocols: Array<{ scheme: string; optionalSlashes?: boolean } | string>;
 };
 
 /**
- * This plugin allows you to automatically add links to your editor.
- * @param options The plugin options
- * @returns The plugin instance
+ * Plugin that automatically adds link marks when typing URLs.
  */
 export function autolink(options: AutolinkOptions): Plugin {
   return new Plugin({
     key: new PluginKey("autolink"),
     appendTransaction: (transactions, oldState, newState) => {
-      /**
-       * Does the transaction change the document?
-       */
       const docChanges =
         transactions.some((transaction) => transaction.docChanged) &&
         !oldState.doc.eq(newState.doc);
 
-      /**
-       * Prevent autolink if the transaction is not a document change or if the transaction has the meta `preventAutolink`.
-       */
       const preventAutolink = transactions.some((transaction) =>
         transaction.getMeta("preventAutolink")
       );
 
-      /**
-       * Prevent autolink if the transaction is not a document change
-       * or if the transaction has the meta `preventAutolink`.
-       */
       if (!docChanges || preventAutolink) {
         return;
       }
@@ -83,7 +64,6 @@ export function autolink(options: AutolinkOptions): Plugin {
       const changes = getChangedRanges(transform);
 
       changes.forEach(({ newRange }) => {
-        // Now let's see if we can add new links.
         const nodesInChangedRanges = findChildrenInRange(
           newState.doc,
           newRange,
@@ -94,7 +74,6 @@ export function autolink(options: AutolinkOptions): Plugin {
         let textBeforeWhitespace: string | undefined;
 
         if (nodesInChangedRanges.length > 1) {
-          // Grab the first node within the changed ranges (ex. the first of two paragraphs when hitting enter).
           textBlock = nodesInChangedRanges[0];
           textBeforeWhitespace = newState.doc.textBetween(
             textBlock.pos,
@@ -151,7 +130,6 @@ export function autolink(options: AutolinkOptions): Plugin {
 
           linksBeforeSpace
             .filter((link) => link.isLink)
-            // Calculate link position.
             .map((link) => ({
               ...link,
               from: lastWordAndBlockOffset + link.start + 1,
@@ -169,11 +147,8 @@ export function autolink(options: AutolinkOptions): Plugin {
                 newState.schema.marks.code
               );
             })
-            // validate link
             .filter((link) => options.validate(link.value))
-            // check whether should autolink
             .filter((link) => options.shouldAutoLink(link.value))
-            // Add link mark.
             .forEach((link) => {
               if (
                 getMarksBetween(link.from, link.to, newState.doc).some(
 
@@ -6,8 +6,6 @@ import { Plugin, PluginKey } from "@tiptap/pm/state";
 type ClickHandlerOptions = {
   type: MarkType;
   editor: Editor;
-  openOnClick?: boolean;
-  enableClickSelection?: boolean;
 };
 
 export function clickHandler(options: ClickHandlerOptions): Plugin {
@@ -48,27 +46,16 @@ export function clickHandler(options: ClickHandlerOptions): Plugin {
           return false;
         }
 
-        let handled = false;
+        const attrs = getAttributes(view.state, options.type.name);
+        const href = link.href ?? attrs.href;
+        const target = link.target ?? attrs.target;
 
-        if (options.enableClickSelection) {
-          const commandResult = options.editor.commands.extendMarkRange(
-            options.type.name
-          );
-          handled = commandResult;
+        if (href) {
+          window.open(href, target);
+          return true;
         }
 
-        if (options.openOnClick) {
-          const attrs = getAttributes(view.state, options.type.name);
-          const href = link.href ?? attrs.href;
-          const target = link.target ?? attrs.target;
-
-          if (href) {
-            window.open(href, target);
-            handled = true;
-          }
-        }
-
-        return handled;
+        return false;
       },
     },
   });
 
@@ -37,8 +37,6 @@ const SPECIAL_HOSTS = new Set(["localhost"]);
 // Regex building blocks
 // ---------------------------------------------------------------------------
 
-// URL-safe characters in path/query/fragment (everything except whitespace)
-const URL_BODY = "[^\\s]";
 // Characters that are unlikely to be part of a URL when they appear at the end
 const TRAILING_PUNCT = /[.,;:!?"']+$/;
 
 
@@ -1,14 +1,13 @@
 import type { Editor } from "@tiptap/core";
 import type { MarkType } from "@tiptap/pm/model";
 import { Plugin, PluginKey } from "@tiptap/pm/state";
-import type { LinkOptions } from "../link.js";
 import { findLinks } from "./linkDetector.js";
 
 type PasteHandlerOptions = {
   editor: Editor;
   defaultProtocol: string;
   type: MarkType;
-  shouldAutoLink?: LinkOptions["shouldAutoLink"];
+  shouldAutoLink?: (url: string) => boolean;
 };
 
 export function pasteHandler(options: PasteHandlerOptions): Plugin {
 
@@ -1,3 +1,2 @@
 export { Link } from "./link.js";
-export type { LinkOptions, LinkProtocolOptions } from "./link.js";
-export { isAllowedUri, pasteRegex } from "./link.js";
+export { isAllowedUri } from "./link.js";