@contentful/field-editor-rich-text 3.4.8 → 3.4.10

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.4.10](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.4.9...@contentful/field-editor-rich-text@3.4.10) (2023-03-09)
+
+### Bug Fixes
+
+- **RTE:** remove whitespaces only in tables and lists [TOL-104] ([#1362](https://github.com/contentful/field-editors/issues/1362)) ([8b106c8](https://github.com/contentful/field-editors/commit/8b106c8eb08d79cb6c5ae8353d5a1fcf7afab1cf))
+
+## [3.4.9](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.4.8...@contentful/field-editor-rich-text@3.4.9) (2023-03-03)
+
+### Bug Fixes
+
+- 🐛 do not focus RTE on inline embed + create entry ([#1354](https://github.com/contentful/field-editors/issues/1354)) ([3c54787](https://github.com/contentful/field-editors/commit/3c54787d740f7220e55976bac97fb8d542f26d4d))
+
 ## [3.4.8](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.4.7...@contentful/field-editor-rich-text@3.4.8) (2023-03-01)
 
 ### Bug Fixes

package/dist/field-editor-rich-text.cjs.development.js

@@ -2779,21 +2779,24 @@ function watchCurrentSlide(navigator) {
     };
   };
 
-  var off = navigator.onSlideInNavigation(function (info) {
+  var off = navigator.onSlideInNavigation(function (_ref) {
+    var oldSlideLevel = _ref.oldSlideLevel,
+        newSlideLevel = _ref.newSlideLevel;
+
     if (initialSlideLevel === undefined) {
-      initialSlideLevel = info.oldSlideLevel;
+      initialSlideLevel = oldSlideLevel;
     }
 
-    lastSlideLevel = info.newSlideLevel;
+    lastSlideLevel = newSlideLevel;
 
-    if (info.newSlideLevel < initialSlideLevel) {
+    if (newSlideLevel < initialSlideLevel) {
       wasSlideClosed = true;
       off(); // No more point in watching, slide got closed.
 
       onActiveCallbacks.clear();
     }
 
-    if (status().isActive) {
+    if (status().isActive && newSlideLevel !== oldSlideLevel) {
       onActiveCallbacks.forEach(function (cb) {
         return cb();
       });
@@ -3244,7 +3247,11 @@ function EmbeddedEntityInline(props) {
 
   function handleEditClick() {
     return sdk.navigator.openEntry(entryId, {
-      slideIn: true
+      slideIn: {
+        waitForClose: true
+      }
+    }).then(function () {
+      editor && focus(editor);
     });
   }
 
@@ -3283,7 +3290,7 @@ function selectEntityAndInsert$1(_x, _x2, _x3) {
 
 function _selectEntityAndInsert$1() {
   _selectEntityAndInsert$1 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(editor, sdk, logAction) {
-    var config, selection, entry, inlineEntryNode;
+    var config, rteSlide, entry;
     return runtime_1.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -3294,39 +3301,30 @@ function _selectEntityAndInsert$1() {
             config = _extends({}, newEntitySelectorConfigFromRichTextField(sdk.field, Contentful.INLINES.EMBEDDED_ENTRY), {
               withCreate: true
             });
-            selection = editor.selection;
+            rteSlide = watchCurrentSlide(sdk.navigator);
             _context2.next = 5;
             return sdk.dialogs.selectSingleEntry(config);
 
           case 5:
             entry = _context2.sent;
-            focus(editor); // Dialog steals focus from editor, return it.
 
-            if (entry) {
-              _context2.next = 10;
-              break;
+            if (!entry) {
+              logAction('cancelCreateEmbedDialog', {
+                nodeType: Contentful.INLINES.EMBEDDED_ENTRY
+              });
+            } else {
+              insertNodes(editor, createInlineEntryNode$1(entry.sys.id));
+              logAction('insert', {
+                nodeType: Contentful.INLINES.EMBEDDED_ENTRY
+              });
             }
 
-            logAction('cancelCreateEmbedDialog', {
-              nodeType: Contentful.INLINES.EMBEDDED_ENTRY
+            rteSlide.onActive(function () {
+              rteSlide.unwatch();
+              focus(editor);
             });
-            return _context2.abrupt("return");
 
-          case 10:
-            inlineEntryNode = createInlineEntryNode$1(entry.sys.id);
-            logAction('insert', {
-              nodeType: Contentful.INLINES.EMBEDDED_ENTRY
-            }); // Got to wait until focus is really back on the editor or setSelection() won't work.
-
-            return _context2.abrupt("return", new Promise(function (resolve) {
-              setTimeout(function () {
-                setSelection(editor, selection);
-                insertNodes(editor, inlineEntryNode);
-                resolve();
-              }, 0);
-            }));
-
-          case 13:
+          case 8:
           case "end":
             return _context2.stop();
         }
@@ -6176,15 +6174,43 @@ var stripStyleTags = function stripStyleTags(doc) {
   });
   return doc;
 };
+/**
+ * Remove all <meta /> tags
+ */
+
+
+var stripMetaTags = function stripMetaTags(doc) {
+  doc.querySelectorAll('meta').forEach(function (el) {
+    return el.remove();
+  });
+  return doc;
+}; // Attention: Order is important
+
 
-var transformers = [stripStyleTags, sanitizeSheets];
+var transformers = [stripStyleTags, sanitizeSheets, stripMetaTags];
 var sanitizeHTML = function sanitizeHTML(html) {
   // Parse the HTML string and pipe it through our transformers
   var doc = transformers.reduce(function (value, cb) {
     return cb(value);
   }, new DOMParser().parseFromString(html, 'text/html'));
-  return doc.body.innerHTML.replace(/>\s+</g, '><') // Remove whitespace between tags
-  .replace(/(.*)<div.*>(<table.*<\/table>)<\/div>(.*)/g, '$1$2$3'); // remove div containers from tables
+  var previous;
+
+  do {
+    // save previous first before doing modifications
+    previous = doc.body.innerHTML; // Update the body with the cleaned up content
+
+    doc.body.innerHTML = doc.body.innerHTML // remove div container from tables
+    // capture groups explained:
+    // 1. and 3. every content/linebreaks before and after the div container
+    // 2. the table inside the container, including content and linebreaks
+    // The div container including attributes and possible linebreaks inside wil be removed
+    .replace(/(.*\s)?<div.*>\s*(<table(?:.|\s)*<\/table>)\s*<\/div>(.*\s)?/g, '$1$2$3') // remove whitespaces between some tags, as this can lead to unwanted behaviour:
+    // - table -> empty table cells
+    // - list -> leading whitespaces
+    .replace(/<(\/)?(table|thead|tbody|tr|td|th|caption|col|colgroup|ol|ul|li)(.*)>\s+</g, '<$1$2$3><');
+  } while (doc.body.innerHTML !== previous);
+
+  return doc.body.innerHTML;
 };
 
 /**