@limetech/lime-elements 37.76.1 → 37.76.3

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [37.76.3](https://github.com/Lundalogik/lime-elements/compare/v37.76.2...v37.76.3) (2024-12-18)
+
+
+### Bug Fixes
+
+
+* **text-editor:** avoid occasional null reference error ([26860c4](https://github.com/Lundalogik/lime-elements/commit/26860c4a7b6e27a2de5ba5ca6271216877656bdf))
+
+## [37.76.2](https://github.com/Lundalogik/lime-elements/compare/v37.76.1...v37.76.2) (2024-12-17)
+
+
+### Bug Fixes
+
+
+* **text-editor:** fix triggers not working on iOS and on text-editor inside form ([5e7eaa3](https://github.com/Lundalogik/lime-elements/commit/5e7eaa3fe4eb56801a6400a74389b6c55a317fc8)), closes [Lundalogik/crm-feature#4498](https://github.com/Lundalogik/crm-feature/issues/4498) [Lundalogik/limepkg-email#1273](https://github.com/Lundalogik/limepkg-email/issues/1273)
+
 ## [37.76.1](https://github.com/Lundalogik/lime-elements/compare/v37.76.0...v37.76.1) (2024-12-12)
 
 

package/dist/cjs/limel-prosemirror-adapter.cjs.entry.js

@@ -25814,7 +25814,7 @@ const findEnd = (doc, pos, href) => {
  */
 const getLinkDataAtPosition = (view, event) => {
   const pos = view.posAtCoords({ left: event.clientX, top: event.clientY });
-  const node = view.state.doc.nodeAt(pos.pos);
+  const node = view.state.doc.nodeAt(pos === null || pos === void 0 ? void 0 : pos.pos);
   if (!node) {
     return null;
   }
@@ -26135,15 +26135,14 @@ const createHtmlInserter = (view, contentConverter, startPos, dispatchTransactio
   };
 };
 
-const inserterFactory = (view, contentConverter) => {
-  const startPos = getTriggerStartPosition(view);
+const inserterFactory = (view, contentConverter, trigger) => {
   return {
-    insert: createNodeAndTextInserter(view, startPos),
-    insertHtml: createHtmlInserter(view, contentConverter, startPos, dispatchTransaction),
+    insert: createNodeAndTextInserter(view, trigger),
+    insertHtml: createHtmlInserter(view, contentConverter, trigger.position, dispatchTransaction),
     stopTrigger: () => stopTriggerTransaction(view),
   };
 };
-const createNodeAndTextInserter = (view, startPos) => (input) => {
+const createNodeAndTextInserter = (view, trigger) => (input) => {
   const schema = view.state.schema;
   let node;
   try {
@@ -26156,7 +26155,7 @@ const createNodeAndTextInserter = (view, startPos) => (input) => {
   }
   const spaceNode = schema.text(' ');
   const fragment = schema.nodes.doc.create(null, [node, spaceNode]);
-  dispatchTransaction(view, startPos, fragment);
+  dispatchTransaction(view, trigger.position, fragment);
 };
 const stopTriggerTransaction = (view) => {
   const { state, dispatch } = view;
@@ -26166,8 +26165,8 @@ const stopTriggerTransaction = (view) => {
 };
 const dispatchTransaction = (view, startPos, fragment) => {
   const state = view.state;
-  const dispatch = view.dispatch;
   const fromPos = state.selection.$from.pos;
+  const dispatch = view.dispatch;
   const transaction = state.tr.replaceWith(startPos, fromPos, fragment);
   transaction.setMeta('stopTrigger', true);
   dispatch(transaction);
@@ -26194,47 +26193,16 @@ const getCustomNode = (name, schema) => {
   }
   return customNode;
 };
-const getTriggerStartPosition = (view) => {
-  var _a, _b, _c;
-  return (_c = (_b = (_a = view.state) === null || _a === void 0 ? void 0 : _a.selection) === null || _b === void 0 ? void 0 : _b.$from) === null || _c === void 0 ? void 0 : _c.pos;
-};
 
-const isTrigger = (key, validTriggers) => {
-  return key.length === 1 && validTriggers.includes(key);
-};
-const shouldTrigger = (state) => {
-  const { $from } = state.selection;
-  if ($from.pos === 1) {
-    return true;
-  }
-  // Getting the position immediately before the current selection
-  const prevPos = $from.pos - 1;
-  if (prevPos > 0) {
-    // allow trigger if the cursor is at the start of a new paragraph
-    if ($from.parentOffset === 0) {
-      return true;
-    }
-    const prevChar = state.doc.textBetween(prevPos, $from.pos);
-    return prevChar === ' ' || prevChar === '\n';
-  }
-  return false;
-};
-const stillHasTrigger = (state, activeTrigger, triggerPosition, triggerLength) => {
-  const cursorPosition = state.selection.$from.pos;
-  if (cursorPosition < triggerPosition ||
-    cursorPosition > triggerPosition + triggerLength + 1) {
-    return false;
-  }
-  return (state.doc.textBetween(triggerPosition, triggerPosition + 1) ===
-    activeTrigger);
-};
 const getTriggerEventDetail = (view, contentConverter, trigger, value) => {
-  return {
-    trigger: trigger,
-    textEditor: inserterFactory(view, contentConverter),
+  const returnValue = {
+    trigger: trigger.character,
+    textEditor: inserterFactory(view, contentConverter, trigger),
     value: value,
   };
+  return returnValue;
 };
+
 const sendTriggerEvent = (type, view, contentConverter, trigger, value) => {
   const event = new CustomEvent(type, {
     detail: getTriggerEventDetail(view, contentConverter, trigger, value),
@@ -26243,83 +26211,93 @@ const sendTriggerEvent = (type, view, contentConverter, trigger, value) => {
   });
   view.dom.dispatchEvent(event);
 };
-const processTransactions = (text, transactions, oldState) => {
-  let textAdded = '';
-  let textRemoved = '';
-  transactions.forEach((transaction) => {
-    if (transaction.docChanged) {
-      transaction.steps.forEach((step) => {
-        if (step instanceof ReplaceStep ||
-          step instanceof ReplaceAroundStep) {
-          const slice = step.slice;
-          const fromPos = step.from;
-          const toPos = step.to;
-          if (slice === null || slice === void 0 ? void 0 : slice.size) {
-            // Text added
-            textAdded += slice.content.textBetween(0, slice.size);
-          }
-          else if (fromPos !== toPos) {
-            // Text removed
-            const removedText = oldState.doc.textBetween(fromPos, toPos);
-            textRemoved += removedText;
-          }
+
+const getTextInputHandler = (contentConverter, triggerCharacters, updateActiveTrigger) => {
+  return (view, _from, _to, text) => {
+    if (!triggerCharacters.includes(text)) {
+      return false;
+    }
+    const doc = view.state.doc;
+    const precedingText = doc.textBetween(_from - 1, _from, '');
+    if (/\s/.test(precedingText) || precedingText === '') {
+      const trigger = {
+        character: text,
+        position: _from,
+      };
+      updateActiveTrigger(trigger);
+      sendTriggerEvent('triggerStart', view, contentConverter, trigger, text);
+    }
+    return false;
+  };
+};
+
+const detectTriggerRemoval = (transaction, activeTrigger, resetActiveTrigger, contentConverter, view) => {
+  if (!activeTrigger || activeTrigger.position < 1) {
+    return false;
+  }
+  for (const step of transaction.steps) {
+    if (step instanceof ReplaceStep) {
+      const { from, to, slice } = step; // Access properties specific to ReplaceStep
+      // Check if the step affects the trigger position
+      if (from <= activeTrigger.position &&
+        to >= activeTrigger.position) {
+        const text = slice.content.textBetween(0, slice.content.size, '');
+        // Check if the trigger character has been removed
+        // `text` is the text after the step has been applied
+        if (!text.includes(activeTrigger.character)) {
+          resetActiveTrigger();
+          sendTriggerEvent('triggerStop', view, contentConverter, activeTrigger, '');
+          return true;
         }
-      });
+      }
     }
-  });
-  if (textAdded) {
-    text += textAdded;
   }
-  else if (textRemoved) {
-    text = text.slice(0, -textRemoved.length);
+  return false;
+};
+
+const monitorTriggeredText = (doc, activeTrigger, cursorPosition, contentConverter, view) => {
+  let newValue = '';
+  if (cursorPosition > activeTrigger.position) {
+    // Start extracting text after the trigger character
+    newValue = doc.textBetween(activeTrigger.position + 1, cursorPosition, '');
   }
-  return text;
+  sendTriggerEvent('triggerChange', view, contentConverter, activeTrigger, newValue);
+  return newValue;
+};
+
+const getAppendTransactionHandler = (getCurrentView, getActiveTrigger, resetActiveTrigger, contentConverter) => {
+  return (transactions, _oldState, newState) => {
+    const activeTrigger = getActiveTrigger();
+    if (!activeTrigger) {
+      return;
+    }
+    const triggerRemoved = detectTriggerRemoval(transactions[0], // Pass the first transaction
+    activeTrigger, resetActiveTrigger, contentConverter, getCurrentView());
+    if (triggerRemoved) {
+      resetActiveTrigger();
+      return;
+    }
+    monitorTriggeredText(newState.doc, activeTrigger, newState.selection.from, contentConverter, getCurrentView());
+  };
 };
+
 const createTriggerPlugin = (triggerCharacters, contentConverter) => {
-  let activeTrigger = null;
-  let triggerText = '';
   let pluginView = null;
-  let triggerPosition = null;
-  const stopTrigger = () => {
-    triggerText = '';
-    sendTriggerEvent('triggerStop', pluginView, contentConverter, activeTrigger, triggerText);
-    triggerPosition = null;
-    activeTrigger = null;
+  let activeTrigger = null;
+  const getCurrentView = () => {
+    return pluginView;
   };
-  const handleKeyDown = (_, event) => {
-    if (event.key === 'Escape') {
-      stopTrigger();
-      return true;
-    }
-    return false;
+  const getActiveTrigger = () => {
+    return activeTrigger;
   };
-  const handleInput = (view, event) => {
-    const { state } = view;
-    if (event.inputType === 'insertText' &&
-      isTrigger(event.data, triggerCharacters) &&
-      shouldTrigger(state)) {
-      activeTrigger = event.data;
-      triggerText = '';
-      triggerPosition = state.selection.$from.pos - triggerText.length;
-      sendTriggerEvent('triggerStart', view, contentConverter, activeTrigger, triggerText);
-      return false;
-    }
-    return false;
+  const resetActiveTrigger = () => {
+    activeTrigger = null;
   };
-  const appendTransactions = (transactions, oldState, newState) => {
-    if (!activeTrigger || !triggerPosition || !pluginView) {
-      return;
-    }
-    if (!stillHasTrigger(newState, activeTrigger, triggerPosition, triggerText.length)) {
-      stopTrigger();
-      return;
-    }
-    const updatedText = processTransactions(triggerText, transactions, oldState);
-    if (updatedText !== triggerText) {
-      triggerText = updatedText;
-      sendTriggerEvent('triggerChange', pluginView, contentConverter, activeTrigger, triggerText.slice(1));
-    }
+  const updateActiveTrigger = (trigger) => {
+    activeTrigger = trigger;
   };
+  const textInputHandler = getTextInputHandler(contentConverter, triggerCharacters, updateActiveTrigger);
+  const appendTransactionHandler = getAppendTransactionHandler(getCurrentView, getActiveTrigger, resetActiveTrigger, contentConverter);
   return new Plugin({
     key: new PluginKey('triggerPlugin'),
     view: (view) => {
@@ -26332,18 +26310,16 @@ const createTriggerPlugin = (triggerCharacters, contentConverter) => {
       },
       apply: (transaction) => {
         if (transaction.getMeta('stopTrigger')) {
-          stopTrigger();
+          sendTriggerEvent('triggerStop', pluginView, contentConverter, activeTrigger, '');
+          resetActiveTrigger();
         }
         return {};
       },
     },
     props: {
-      handleKeyDown: handleKeyDown,
-      handleDOMEvents: {
-        input: handleInput,
-      },
+      handleTextInput: textInputHandler,
     },
-    appendTransaction: appendTransactions,
+    appendTransaction: appendTransactionHandler,
   });
 };
 
@@ -28029,8 +28005,8 @@ const ProsemirrorAdapter = class {
       plugins: [
         ...exampleSetup({ schema: this.schema, menuBar: false }),
         keymap(this.menuCommandFactory.buildKeymap()),
-        createLinkPlugin(this.handleNewLinkSelection),
         createTriggerPlugin(this.triggerCharacters, this.contentConverter),
+        createLinkPlugin(this.handleNewLinkSelection),
         createImageRemoverPlugin(),
         createMenuStateTrackingPlugin(editorMenuTypesArray, this.menuCommandFactory, this.updateActiveActionBarItems),
         createActionBarInteractionPlugin(this.menuCommandFactory),