@lesjoursfr/edith 2.1.2 → 2.1.4

package/src/core/events.ts

@@ -1,148 +1,4 @@
-const eventsNamespace = "edithEvents";
-let eventsGuid = 0;
-
-type EdithEvent = { type: string; ns: Array<string> | null; handler: EventListenerOrEventListenerObject };
-
-type EdithEvents = {
-  [key: string]: EdithEvent;
-};
-
-declare global {
-  interface Window {
-    edithEvents: EdithEvents;
-  }
-  interface Document {
-    edithEvents: EdithEvents;
-  }
-  interface HTMLElement {
-    edithEvents: EdithEvents;
-  }
-}
-
 export enum Events {
   modeChanged = "edith-mode-changed",
   initialized = "edith-initialized",
 }
-
-/**
- * Parse an event type to separate the type & the namespace
- * @param {string} string
- */
-function parseEventType(string: string): Omit<EdithEvent, "handler"> {
-  const [type, ...nsArray] = string.split(".");
-  return {
-    type,
-    ns: nsArray ?? null,
-  };
-}
-
-/**
- * Set an event listener on the node.
- * @param {Window|Document|HTMLElement} node
- * @param {string} events
- * @param {Function} handler
- */
-function addEventListener(
-  node: Window | Document | HTMLElement,
-  events: string,
-  handler: EventListenerOrEventListenerObject
-): void {
-  if (node[eventsNamespace] === undefined) {
-    node[eventsNamespace] = {};
-  }
-
-  for (const event of events.split(" ")) {
-    const { type, ns } = parseEventType(event);
-    const handlerGuid = (++eventsGuid).toString(10);
-    node.addEventListener(type, handler);
-    node[eventsNamespace][handlerGuid] = { type, ns, handler };
-  }
-}
-
-/**
- * Remove event listeners from the node.
- * @param {Window|Document|HTMLElement} node
- * @param {string} events
- * @param {Function|undefined} handler
- */
-function removeEventListener(
-  node: Window | Document | HTMLElement,
-  events: string,
-  handler?: EventListenerOrEventListenerObject
-): void {
-  if (node[eventsNamespace] === undefined) {
-    node[eventsNamespace] = {};
-  }
-
-  for (const event of events.split(" ")) {
-    const { type, ns } = parseEventType(event);
-
-    for (const [guid, handlerObj] of Object.entries(node[eventsNamespace])) {
-      if (handlerObj.type !== type && type !== "*") {
-        continue;
-      }
-
-      if (
-        (ns === null || handlerObj.ns?.includes(ns[0])) &&
-        (handler === undefined || (typeof handler === "function" && handler === handlerObj.handler))
-      ) {
-        delete node[eventsNamespace][guid];
-        node.removeEventListener(handlerObj.type, handlerObj.handler);
-      }
-    }
-  }
-}
-
-/**
- * Set an event listener on every node.
- * @param {Window|Document|HTMLElement|NodeList} nodes
- * @param {string} events
- * @param {Function} handler
- */
-export function on(
-  nodes: Window | Document | HTMLElement | NodeListOf<HTMLElement>,
-  events: string,
-  handler: EventListenerOrEventListenerObject
-): void {
-  if (nodes instanceof NodeList) {
-    for (const node of nodes) {
-      addEventListener(node, events, handler);
-    }
-  } else {
-    addEventListener(nodes, events, handler);
-  }
-}
-
-/**
- * Remove event listeners from the node.
- * @param {Window|Document|HTMLElement|NodeList} node
- * @param {string} events
- * @param {Function|undefined} handler
- */
-export function off(
-  nodes: Window | Document | HTMLElement | NodeListOf<HTMLElement>,
-  events: string,
-  handler?: EventListenerOrEventListenerObject
-): void {
-  if (nodes instanceof NodeList) {
-    for (const node of nodes) {
-      removeEventListener(node, events, handler);
-    }
-  } else {
-    removeEventListener(nodes, events, handler);
-  }
-}
-
-/**
- * Trigger the EdithEvent on the node.
- * @param {Window|Document|HTMLElement} node
- * @param {string} event
- * @param {Object|undefined} payload
- */
-export function trigger(
-  node: Window | Document | HTMLElement,
-  event: string,
-  payload?: { [key: string]: unknown }
-): void {
-  node.dispatchEvent(new CustomEvent(event, { detail: payload }));
-}

package/src/core/index.ts

@@ -1,7 +1,5 @@
-export * from "./dom.js";
 export * from "./edit.js";
 export * from "./events.js";
 export * from "./history.js";
 export * from "./mode.js";
 export * from "./range.js";
-export * from "./throttle.js";

package/src/core/range.ts

@@ -1,4 +1,4 @@
-import { isHTMLElement, isSelfClosing } from "./dom.js";
+import { isHTMLElement, isSelfClosing } from "@lesjoursfr/browser-tools";
 
 /**
  * @typedef {Object} CurrentSelection

package/src/edith.ts

@@ -1,4 +1,5 @@
-import { Events, addClass, createNodeWith, off, on, removeClass, trigger } from "./core/index.js";
+import { addClass, createNodeWith, off, on, removeClass, trigger } from "@lesjoursfr/browser-tools";
+import { Events } from "./core/index.js";
 import { DefaultOptions, EdithButtonsOption, EdithOptions, EdithToolbarOption } from "./edith-options.js";
 import { EdithButton, EdithButtons, EdithEditor } from "./ui/index.js";
 

package/src/ui/button.ts

@@ -1,5 +1,6 @@
+import { createNodeWith } from "@lesjoursfr/browser-tools";
 import { createPopper } from "@popperjs/core";
-import { EditorModes, Events, createNodeWith } from "../core/index.js";
+import { EditorModes, Events } from "../core/index.js";
 import { EdithButtonsOption } from "../edith-options.js";
 import { Edith } from "../edith.js";
 

package/src/ui/editor.ts

@@ -1,4 +1,15 @@
 import { html } from "@codemirror/lang-html";
+import {
+  createNodeWith,
+  hasClass,
+  hasTagName,
+  isHTMLElement,
+  isSelfClosing,
+  isTextNode,
+  removeNodesRecursively,
+  throttle,
+  unwrapNode,
+} from "@lesjoursfr/browser-tools";
 import { EditorView, basicSetup } from "codemirror";
 import {
   EditorModes,
@@ -6,18 +17,10 @@ import {
   History,
   cleanPastedHtml,
   clearSelectionStyle,
-  createNodeWith,
   getSelection,
-  hasClass,
-  hasTagName,
-  isHTMLElement,
   isSelectionInsideNode,
-  isSelfClosing,
-  removeNodesRecursively,
   replaceSelectionByHtml,
   restoreSelection,
-  throttle,
-  unwrapNode,
   wrapInsideLink,
   wrapInsideTag,
 } from "../core/index.js";
@@ -362,7 +365,7 @@ export class EdithEditor {
       }
     } else {
       // Detect style blocs in parents
-      let dest = sel.anchorNode as HTMLElement;
+      let dest = (isTextNode(sel.anchorNode!) ? sel.anchorNode!.parentNode : sel.anchorNode) as HTMLElement;
       const style = { B: false, I: false, U: false, S: false, Q: false };
       while (dest !== null && !hasClass(dest, "edith-visual")) {
         // Check if it's a style tag

package/src/ui/modal.ts

@@ -1,4 +1,4 @@
-import { createNodeWith, getAttribute, hasAttribute } from "../core/index.js";
+import { createNodeWith, getAttribute, hasAttribute } from "@lesjoursfr/browser-tools";
 import { Edith } from "../edith.js";
 
 export enum EdithModalFieldType {