@contentful/field-editor-rich-text 2.0.0-next.5 → 2.0.0-next.9

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

@@ -14,11 +14,11 @@ var plateCore = require('@udecode/plate-core');
 var emotion = require('emotion');
 var deepEquals = _interopDefault(require('fast-deep-equal'));
 var noop = _interopDefault(require('lodash/noop'));
+var slate = require('slate');
 var constate = _interopDefault(require('constate'));
 var plateSerializerDocx = require('@udecode/plate-serializer-docx');
 var plateBreak = require('@udecode/plate-break');
 var isHotkey = _interopDefault(require('is-hotkey'));
-var slate = require('slate');
 var Slate = require('slate-react');
 var f36Components = require('@contentful/f36-components');
 var mimetype = _interopDefault(require('@contentful/mimetype'));
@@ -28,6 +28,7 @@ var tokens = _interopDefault(require('@contentful/f36-tokens'));
 var find = _interopDefault(require('lodash/find'));
 var flow = _interopDefault(require('lodash/flow'));
 var plateList = require('@udecode/plate-list');
+var plateResetNode = require('@udecode/plate-reset-node');
 var plateBasicMarks = require('@udecode/plate-basic-marks');
 var isPlainObject = _interopDefault(require('is-plain-obj'));
 var plateParagraph = require('@udecode/plate-paragraph');
@@ -348,8 +349,8 @@ var schema = {
 function getContentfulEditorId(sdk) {
   var entry = sdk.entry,
       field = sdk.field;
-  var entrySys = entry.getSys();
-  return "rich-text-editor-" + entrySys.id + "-" + field.id + "-" + field.locale + "-v" + entrySys.version;
+  var sys = entry.getSys();
+  return "rich-text-editor-" + sys.id + "-" + field.id + "-" + field.locale;
 }
 
 function useContentfulEditorHook(_ref) {
@@ -490,6 +491,18 @@ function getParents(el) {
   return parents;
 }
 
+// "modern" Edge was released at 79.x
+var IS_EDGE_LEGACY = typeof navigator !== 'undefined' && /*#__PURE__*/ /Edge?\/(?:[0-6][0-9]|[0-7][0-8])/i.test(navigator.userAgent); // Native `beforeInput` events don't work well with react on Chrome 75
+// and older, Chrome 76+ can use `beforeInput` though.
+
+var IS_CHROME_LEGACY = typeof navigator !== 'undefined' && /*#__PURE__*/ /Chrome?\/(?:[0-7][0-5]|[0-6][0-9])/i.test(navigator.userAgent); // COMPAT: Firefox/Edge Legacy don't support the `beforeinput` event
+// Chrome Legacy doesn't support `beforeinput` correctly
+
+var HAS_BEFORE_INPUT_SUPPORT = !IS_CHROME_LEGACY && !IS_EDGE_LEGACY && // globalThis is undefined in older browsers
+typeof globalThis !== 'undefined' && globalThis.InputEvent && typeof globalThis.InputEvent.prototype.getTargetRanges === 'function'; // The `getTargetRanges` property isn't recognized.
+
+var IS_SAFARI = typeof navigator !== 'undefined' && /*#__PURE__*/ /Version\/[\d.]+.*Safari/.test(navigator.userAgent);
+
 var LINK_TYPES = [Contentful.INLINES.HYPERLINK, Contentful.INLINES.ENTRY_HYPERLINK, Contentful.INLINES.ASSET_HYPERLINK];
 function isBlockSelected(editor, type) {
   var _Array$from = Array.from(slate.Editor.nodes(editor, {
@@ -707,16 +720,27 @@ var isInlineOrText = function isInlineOrText(node) {
   // either text or inline elements
   return slate.Text.isText(node) || slate.Element.isElement(node) && INLINE_TYPES.includes(node.type);
 };
+var focus = function focus(editor) {
+  var x = window.scrollX;
+  var y = window.scrollY;
+  Slate.ReactEditor.focus(editor); // Safari has issues with `editor.focus({ preventScroll: true })`, it ignores the option `preventScroll`
+
+  if (IS_SAFARI) {
+    setTimeout(function () {
+      window.scrollTo(x, y); // restore position
+    }, 0);
+  }
+};
 
-// "modern" Edge was released at 79.x
-var IS_EDGE_LEGACY = typeof navigator !== 'undefined' && /*#__PURE__*/ /Edge?\/(?:[0-6][0-9]|[0-7][0-8])/i.test(navigator.userAgent); // Native `beforeInput` events don't work well with react on Chrome 75
-// and older, Chrome 76+ can use `beforeInput` though.
-
-var IS_CHROME_LEGACY = typeof navigator !== 'undefined' && /*#__PURE__*/ /Chrome?\/(?:[0-7][0-5]|[0-6][0-9])/i.test(navigator.userAgent); // COMPAT: Firefox/Edge Legacy don't support the `beforeinput` event
-// Chrome Legacy doesn't support `beforeinput` correctly
-
-var HAS_BEFORE_INPUT_SUPPORT = !IS_CHROME_LEGACY && !IS_EDGE_LEGACY && // globalThis is undefined in older browsers
-typeof globalThis !== 'undefined' && globalThis.InputEvent && typeof globalThis.InputEvent.prototype.getTargetRanges === 'function'; // The `getTargetRanges` property isn't recognized.
+function withLinkTracking(tracking, Component) {
+  return function ComponentWithTracking(props) {
+    return /*#__PURE__*/React__default.createElement(Component, Object.assign({}, props, {
+      onEntityFetchComplete: function onEntityFetchComplete() {
+        tracking.onViewportAction('linkRendered');
+      }
+    }));
+  };
+}
 
 function useSdk(_ref) {
   var sdk = _ref.sdk;
@@ -854,10 +878,19 @@ function FetchingWrappedAssetCard(props) {
   var asset = assets[props.assetId];
   var defaultLocaleCode = props.sdk.locales["default"];
   var entityFile = asset != null && (_asset$fields = asset.fields) != null && _asset$fields.file ? asset.fields.file[props.locale] || asset.fields.file[defaultLocaleCode] : undefined;
+  var onEntityFetchComplete = props.onEntityFetchComplete;
   React.useEffect(function () {
     getOrLoadAsset(props.assetId);
   }, [props.assetId]); // eslint-disable-line
 
+  React.useEffect(function () {
+    if (!asset) {
+      return;
+    }
+
+    onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
+  }, [asset, onEntityFetchComplete]);
+
   function getAssetSrc() {
     if (!(entityFile != null && entityFile.url)) return '';
     return entityFile.url + "?h=300";
@@ -982,6 +1015,7 @@ function FetchingWrappedEntryCard(props) {
     });
   }, [props.sdk, entry]);
   var defaultLocaleCode = props.sdk.locales["default"];
+  var onEntityFetchComplete = props.onEntityFetchComplete;
   React.useEffect(function () {
     if (!entry || entry === 'failed') return;
     fieldEditorShared.entityHelpers.getEntryImage({
@@ -997,6 +1031,14 @@ function FetchingWrappedEntryCard(props) {
     getOrLoadEntry(props.entryId);
   }, [props.entryId]); // eslint-disable-line
 
+  React.useEffect(function () {
+    if (!entry) {
+      return;
+    }
+
+    onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
+  }, [entry, onEntityFetchComplete]);
+
   function renderDropdown() {
     if (!props.onEdit || !props.onRemove) return undefined;
     return [props.onEdit ? /*#__PURE__*/React.createElement(f36Components.MenuItem, {
@@ -1078,13 +1120,14 @@ function FetchingWrappedEntryCard(props) {
 
 var styles$3 = {
   root: /*#__PURE__*/emotion.css({
-    marginBottom: '1.25rem'
+    marginBottom: '1.25rem !important'
   })
 };
 function LinkedEntityBlock(props) {
   var attributes = props.attributes,
       children = props.children,
-      element = props.element;
+      element = props.element,
+      onEntityFetchComplete = props.onEntityFetchComplete;
   var isSelected = Slate.useSelected();
   var editor = useContentfulEditor();
   var sdk = useSdkContext();
@@ -1126,7 +1169,8 @@ function LinkedEntityBlock(props) {
     isDisabled: isDisabled,
     isSelected: isSelected,
     onRemove: handleRemoveClick,
-    onEdit: handleEditClick
+    onEdit: handleEditClick,
+    onEntityFetchComplete: onEntityFetchComplete
   }), entityType === 'Asset' && /*#__PURE__*/React__default.createElement(FetchingWrappedAssetCard, {
     sdk: sdk,
     assetId: entityId,
@@ -1134,7 +1178,8 @@ function LinkedEntityBlock(props) {
     isDisabled: isDisabled,
     isSelected: isSelected,
     onRemove: handleRemoveClick,
-    onEdit: handleEditClick
+    onEdit: handleEditClick,
+    onEntityFetchComplete: onEntityFetchComplete
   })), children);
 }
 
@@ -1142,201 +1187,197 @@ function createCommonjsModule(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
 }
 
-var runtime_1 = createCommonjsModule(function (module) {
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
+var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
+  /**
+   * Copyright (c) 2014-present, Facebook, Inc.
+   *
+   * This source code is licensed under the MIT license found in the
+   * LICENSE file in the root directory of this source tree.
+   */
+  var runtime = function (exports) {
+
+    var Op = Object.prototype;
+    var hasOwn = Op.hasOwnProperty;
+    var undefined$1; // More compressible than void 0.
+
+    var $Symbol = typeof Symbol === "function" ? Symbol : {};
+    var iteratorSymbol = $Symbol.iterator || "@@iterator";
+    var asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator";
+    var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
+
+    function define(obj, key, value) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+      return obj[key];
+    }
 
-var runtime = (function (exports) {
-
-  var Op = Object.prototype;
-  var hasOwn = Op.hasOwnProperty;
-  var undefined$1; // More compressible than void 0.
-  var $Symbol = typeof Symbol === "function" ? Symbol : {};
-  var iteratorSymbol = $Symbol.iterator || "@@iterator";
-  var asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator";
-  var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
-
-  function define(obj, key, value) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-    return obj[key];
-  }
-  try {
-    // IE 8 has a broken Object.defineProperty that only works on DOM objects.
-    define({}, "");
-  } catch (err) {
-    define = function(obj, key, value) {
-      return obj[key] = value;
-    };
-  }
+    try {
+      // IE 8 has a broken Object.defineProperty that only works on DOM objects.
+      define({}, "");
+    } catch (err) {
+      define = function define(obj, key, value) {
+        return obj[key] = value;
+      };
+    }
 
-  function wrap(innerFn, outerFn, self, tryLocsList) {
-    // If outerFn provided and outerFn.prototype is a Generator, then outerFn.prototype instanceof Generator.
-    var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
-    var generator = Object.create(protoGenerator.prototype);
-    var context = new Context(tryLocsList || []);
+    function wrap(innerFn, outerFn, self, tryLocsList) {
+      // If outerFn provided and outerFn.prototype is a Generator, then outerFn.prototype instanceof Generator.
+      var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
+      var generator = Object.create(protoGenerator.prototype);
+      var context = new Context(tryLocsList || []); // The ._invoke method unifies the implementations of the .next,
+      // .throw, and .return methods.
 
-    // The ._invoke method unifies the implementations of the .next,
-    // .throw, and .return methods.
-    generator._invoke = makeInvokeMethod(innerFn, self, context);
+      generator._invoke = makeInvokeMethod(innerFn, self, context);
+      return generator;
+    }
 
-    return generator;
-  }
-  exports.wrap = wrap;
-
-  // Try/catch helper to minimize deoptimizations. Returns a completion
-  // record like context.tryEntries[i].completion. This interface could
-  // have been (and was previously) designed to take a closure to be
-  // invoked without arguments, but in all the cases we care about we
-  // already have an existing method we want to call, so there's no need
-  // to create a new function object. We can even get away with assuming
-  // the method takes exactly one argument, since that happens to be true
-  // in every case, so we don't have to touch the arguments object. The
-  // only additional allocation required is the completion record, which
-  // has a stable shape and so hopefully should be cheap to allocate.
-  function tryCatch(fn, obj, arg) {
-    try {
-      return { type: "normal", arg: fn.call(obj, arg) };
-    } catch (err) {
-      return { type: "throw", arg: err };
+    exports.wrap = wrap; // Try/catch helper to minimize deoptimizations. Returns a completion
+    // record like context.tryEntries[i].completion. This interface could
+    // have been (and was previously) designed to take a closure to be
+    // invoked without arguments, but in all the cases we care about we
+    // already have an existing method we want to call, so there's no need
+    // to create a new function object. We can even get away with assuming
+    // the method takes exactly one argument, since that happens to be true
+    // in every case, so we don't have to touch the arguments object. The
+    // only additional allocation required is the completion record, which
+    // has a stable shape and so hopefully should be cheap to allocate.
+
+    function tryCatch(fn, obj, arg) {
+      try {
+        return {
+          type: "normal",
+          arg: fn.call(obj, arg)
+        };
+      } catch (err) {
+        return {
+          type: "throw",
+          arg: err
+        };
+      }
     }
-  }
 
-  var GenStateSuspendedStart = "suspendedStart";
-  var GenStateSuspendedYield = "suspendedYield";
-  var GenStateExecuting = "executing";
-  var GenStateCompleted = "completed";
-
-  // Returning this object from the innerFn has the same effect as
-  // breaking out of the dispatch switch statement.
-  var ContinueSentinel = {};
-
-  // Dummy constructor functions that we use as the .constructor and
-  // .constructor.prototype properties for functions that return Generator
-  // objects. For full spec compliance, you may wish to configure your
-  // minifier not to mangle the names of these two functions.
-  function Generator() {}
-  function GeneratorFunction() {}
-  function GeneratorFunctionPrototype() {}
-
-  // This is a polyfill for %IteratorPrototype% for environments that
-  // don't natively support it.
-  var IteratorPrototype = {};
-  define(IteratorPrototype, iteratorSymbol, function () {
-    return this;
-  });
+    var GenStateSuspendedStart = "suspendedStart";
+    var GenStateSuspendedYield = "suspendedYield";
+    var GenStateExecuting = "executing";
+    var GenStateCompleted = "completed"; // Returning this object from the innerFn has the same effect as
+    // breaking out of the dispatch switch statement.
 
-  var getProto = Object.getPrototypeOf;
-  var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
-  if (NativeIteratorPrototype &&
-      NativeIteratorPrototype !== Op &&
-      hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
-    // This environment has a native %IteratorPrototype%; use it instead
-    // of the polyfill.
-    IteratorPrototype = NativeIteratorPrototype;
-  }
+    var ContinueSentinel = {}; // Dummy constructor functions that we use as the .constructor and
+    // .constructor.prototype properties for functions that return Generator
+    // objects. For full spec compliance, you may wish to configure your
+    // minifier not to mangle the names of these two functions.
 
-  var Gp = GeneratorFunctionPrototype.prototype =
-    Generator.prototype = Object.create(IteratorPrototype);
-  GeneratorFunction.prototype = GeneratorFunctionPrototype;
-  define(Gp, "constructor", GeneratorFunctionPrototype);
-  define(GeneratorFunctionPrototype, "constructor", GeneratorFunction);
-  GeneratorFunction.displayName = define(
-    GeneratorFunctionPrototype,
-    toStringTagSymbol,
-    "GeneratorFunction"
-  );
+    function Generator() {}
 
-  // Helper for defining the .next, .throw, and .return methods of the
-  // Iterator interface in terms of a single ._invoke method.
-  function defineIteratorMethods(prototype) {
-    ["next", "throw", "return"].forEach(function(method) {
-      define(prototype, method, function(arg) {
-        return this._invoke(method, arg);
-      });
+    function GeneratorFunction() {}
+
+    function GeneratorFunctionPrototype() {} // This is a polyfill for %IteratorPrototype% for environments that
+    // don't natively support it.
+
+
+    var IteratorPrototype = {};
+    define(IteratorPrototype, iteratorSymbol, function () {
+      return this;
     });
-  }
+    var getProto = Object.getPrototypeOf;
+    var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
 
-  exports.isGeneratorFunction = function(genFun) {
-    var ctor = typeof genFun === "function" && genFun.constructor;
-    return ctor
-      ? ctor === GeneratorFunction ||
-        // For the native GeneratorFunction constructor, the best we can
-        // do is to check its .name property.
-        (ctor.displayName || ctor.name) === "GeneratorFunction"
-      : false;
-  };
+    if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
+      // This environment has a native %IteratorPrototype%; use it instead
+      // of the polyfill.
+      IteratorPrototype = NativeIteratorPrototype;
+    }
 
-  exports.mark = function(genFun) {
-    if (Object.setPrototypeOf) {
-      Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
-    } else {
-      genFun.__proto__ = GeneratorFunctionPrototype;
-      define(genFun, toStringTagSymbol, "GeneratorFunction");
+    var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
+    GeneratorFunction.prototype = GeneratorFunctionPrototype;
+    define(Gp, "constructor", GeneratorFunctionPrototype);
+    define(GeneratorFunctionPrototype, "constructor", GeneratorFunction);
+    GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"); // Helper for defining the .next, .throw, and .return methods of the
+    // Iterator interface in terms of a single ._invoke method.
+
+    function defineIteratorMethods(prototype) {
+      ["next", "throw", "return"].forEach(function (method) {
+        define(prototype, method, function (arg) {
+          return this._invoke(method, arg);
+        });
+      });
     }
-    genFun.prototype = Object.create(Gp);
-    return genFun;
-  };
 
-  // Within the body of any async function, `await x` is transformed to
-  // `yield regeneratorRuntime.awrap(x)`, so that the runtime can test
-  // `hasOwn.call(value, "__await")` to determine if the yielded value is
-  // meant to be awaited.
-  exports.awrap = function(arg) {
-    return { __await: arg };
-  };
+    exports.isGeneratorFunction = function (genFun) {
+      var ctor = typeof genFun === "function" && genFun.constructor;
+      return ctor ? ctor === GeneratorFunction || // For the native GeneratorFunction constructor, the best we can
+      // do is to check its .name property.
+      (ctor.displayName || ctor.name) === "GeneratorFunction" : false;
+    };
 
-  function AsyncIterator(generator, PromiseImpl) {
-    function invoke(method, arg, resolve, reject) {
-      var record = tryCatch(generator[method], generator, arg);
-      if (record.type === "throw") {
-        reject(record.arg);
+    exports.mark = function (genFun) {
+      if (Object.setPrototypeOf) {
+        Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
       } else {
-        var result = record.arg;
-        var value = result.value;
-        if (value &&
-            typeof value === "object" &&
-            hasOwn.call(value, "__await")) {
-          return PromiseImpl.resolve(value.__await).then(function(value) {
-            invoke("next", value, resolve, reject);
-          }, function(err) {
-            invoke("throw", err, resolve, reject);
+        genFun.__proto__ = GeneratorFunctionPrototype;
+        define(genFun, toStringTagSymbol, "GeneratorFunction");
+      }
+
+      genFun.prototype = Object.create(Gp);
+      return genFun;
+    }; // Within the body of any async function, `await x` is transformed to
+    // `yield regeneratorRuntime.awrap(x)`, so that the runtime can test
+    // `hasOwn.call(value, "__await")` to determine if the yielded value is
+    // meant to be awaited.
+
+
+    exports.awrap = function (arg) {
+      return {
+        __await: arg
+      };
+    };
+
+    function AsyncIterator(generator, PromiseImpl) {
+      function invoke(method, arg, resolve, reject) {
+        var record = tryCatch(generator[method], generator, arg);
+
+        if (record.type === "throw") {
+          reject(record.arg);
+        } else {
+          var result = record.arg;
+          var value = result.value;
+
+          if (value && typeof value === "object" && hasOwn.call(value, "__await")) {
+            return PromiseImpl.resolve(value.__await).then(function (value) {
+              invoke("next", value, resolve, reject);
+            }, function (err) {
+              invoke("throw", err, resolve, reject);
+            });
+          }
+
+          return PromiseImpl.resolve(value).then(function (unwrapped) {
+            // When a yielded Promise is resolved, its final value becomes
+            // the .value of the Promise<{value,done}> result for the
+            // current iteration.
+            result.value = unwrapped;
+            resolve(result);
+          }, function (error) {
+            // If a rejected Promise was yielded, throw the rejection back
+            // into the async generator function so it can be handled there.
+            return invoke("throw", error, resolve, reject);
           });
         }
-
-        return PromiseImpl.resolve(value).then(function(unwrapped) {
-          // When a yielded Promise is resolved, its final value becomes
-          // the .value of the Promise<{value,done}> result for the
-          // current iteration.
-          result.value = unwrapped;
-          resolve(result);
-        }, function(error) {
-          // If a rejected Promise was yielded, throw the rejection back
-          // into the async generator function so it can be handled there.
-          return invoke("throw", error, resolve, reject);
-        });
       }
-    }
 
-    var previousPromise;
+      var previousPromise;
 
-    function enqueue(method, arg) {
-      function callInvokeWithMethodAndArg() {
-        return new PromiseImpl(function(resolve, reject) {
-          invoke(method, arg, resolve, reject);
-        });
-      }
+      function enqueue(method, arg) {
+        function callInvokeWithMethodAndArg() {
+          return new PromiseImpl(function (resolve, reject) {
+            invoke(method, arg, resolve, reject);
+          });
+        }
 
-      return previousPromise =
-        // If enqueue has been called before, then we want to wait until
+        return previousPromise = // If enqueue has been called before, then we want to wait until
         // all previous Promises have been resolved before calling invoke,
         // so that results are always delivered in the correct order. If
         // enqueue has not been called before, then it is important to
@@ -1348,554 +1389,527 @@ var runtime = (function (exports) {
         // execute code before the first await. Since we implement simple
         // async functions in terms of async generators, it is especially
         // important to get this right, even though it requires care.
-        previousPromise ? previousPromise.then(
-          callInvokeWithMethodAndArg,
-          // Avoid propagating failures to Promises returned by later
-          // invocations of the iterator.
-          callInvokeWithMethodAndArg
-        ) : callInvokeWithMethodAndArg();
+        previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, // Avoid propagating failures to Promises returned by later
+        // invocations of the iterator.
+        callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+      } // Define the unified helper method that is used to implement .next,
+      // .throw, and .return (see defineIteratorMethods).
+
+
+      this._invoke = enqueue;
     }
 
-    // Define the unified helper method that is used to implement .next,
-    // .throw, and .return (see defineIteratorMethods).
-    this._invoke = enqueue;
-  }
+    defineIteratorMethods(AsyncIterator.prototype);
+    define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
+      return this;
+    });
+    exports.AsyncIterator = AsyncIterator; // Note that simple async functions are implemented on top of
+    // AsyncIterator objects; they just return a Promise for the value of
+    // the final result produced by the iterator.
+
+    exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
+      if (PromiseImpl === void 0) PromiseImpl = Promise;
+      var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
+      return exports.isGeneratorFunction(outerFn) ? iter // If outerFn is a generator, return the full iterator.
+      : iter.next().then(function (result) {
+        return result.done ? result.value : iter.next();
+      });
+    };
 
-  defineIteratorMethods(AsyncIterator.prototype);
-  define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
-    return this;
-  });
-  exports.AsyncIterator = AsyncIterator;
-
-  // Note that simple async functions are implemented on top of
-  // AsyncIterator objects; they just return a Promise for the value of
-  // the final result produced by the iterator.
-  exports.async = function(innerFn, outerFn, self, tryLocsList, PromiseImpl) {
-    if (PromiseImpl === void 0) PromiseImpl = Promise;
-
-    var iter = new AsyncIterator(
-      wrap(innerFn, outerFn, self, tryLocsList),
-      PromiseImpl
-    );
-
-    return exports.isGeneratorFunction(outerFn)
-      ? iter // If outerFn is a generator, return the full iterator.
-      : iter.next().then(function(result) {
-          return result.done ? result.value : iter.next();
-        });
-  };
+    function makeInvokeMethod(innerFn, self, context) {
+      var state = GenStateSuspendedStart;
+      return function invoke(method, arg) {
+        if (state === GenStateExecuting) {
+          throw new Error("Generator is already running");
+        }
 
-  function makeInvokeMethod(innerFn, self, context) {
-    var state = GenStateSuspendedStart;
+        if (state === GenStateCompleted) {
+          if (method === "throw") {
+            throw arg;
+          } // Be forgiving, per 25.3.3.3.3 of the spec:
+          // https://people.mozilla.org/~jorendorff/es6-draft.html#sec-generatorresume
 
-    return function invoke(method, arg) {
-      if (state === GenStateExecuting) {
-        throw new Error("Generator is already running");
-      }
 
-      if (state === GenStateCompleted) {
-        if (method === "throw") {
-          throw arg;
+          return doneResult();
         }
 
-        // Be forgiving, per 25.3.3.3.3 of the spec:
-        // https://people.mozilla.org/~jorendorff/es6-draft.html#sec-generatorresume
-        return doneResult();
-      }
+        context.method = method;
+        context.arg = arg;
+
+        while (true) {
+          var delegate = context.delegate;
 
-      context.method = method;
-      context.arg = arg;
+          if (delegate) {
+            var delegateResult = maybeInvokeDelegate(delegate, context);
 
-      while (true) {
-        var delegate = context.delegate;
-        if (delegate) {
-          var delegateResult = maybeInvokeDelegate(delegate, context);
-          if (delegateResult) {
-            if (delegateResult === ContinueSentinel) continue;
-            return delegateResult;
+            if (delegateResult) {
+              if (delegateResult === ContinueSentinel) continue;
+              return delegateResult;
+            }
           }
-        }
 
-        if (context.method === "next") {
-          // Setting context._sent for legacy support of Babel's
-          // function.sent implementation.
-          context.sent = context._sent = context.arg;
+          if (context.method === "next") {
+            // Setting context._sent for legacy support of Babel's
+            // function.sent implementation.
+            context.sent = context._sent = context.arg;
+          } else if (context.method === "throw") {
+            if (state === GenStateSuspendedStart) {
+              state = GenStateCompleted;
+              throw context.arg;
+            }
 
-        } else if (context.method === "throw") {
-          if (state === GenStateSuspendedStart) {
-            state = GenStateCompleted;
-            throw context.arg;
+            context.dispatchException(context.arg);
+          } else if (context.method === "return") {
+            context.abrupt("return", context.arg);
           }
 
-          context.dispatchException(context.arg);
+          state = GenStateExecuting;
+          var record = tryCatch(innerFn, self, context);
 
-        } else if (context.method === "return") {
-          context.abrupt("return", context.arg);
-        }
+          if (record.type === "normal") {
+            // If an exception is thrown from innerFn, we leave state ===
+            // GenStateExecuting and loop back for another invocation.
+            state = context.done ? GenStateCompleted : GenStateSuspendedYield;
 
-        state = GenStateExecuting;
+            if (record.arg === ContinueSentinel) {
+              continue;
+            }
 
-        var record = tryCatch(innerFn, self, context);
-        if (record.type === "normal") {
-          // If an exception is thrown from innerFn, we leave state ===
-          // GenStateExecuting and loop back for another invocation.
-          state = context.done
-            ? GenStateCompleted
-            : GenStateSuspendedYield;
+            return {
+              value: record.arg,
+              done: context.done
+            };
+          } else if (record.type === "throw") {
+            state = GenStateCompleted; // Dispatch the exception by looping back around to the
+            // context.dispatchException(context.arg) call above.
 
-          if (record.arg === ContinueSentinel) {
-            continue;
+            context.method = "throw";
+            context.arg = record.arg;
+          }
+        }
+      };
+    } // Call delegate.iterator[context.method](context.arg) and handle the
+    // result, either by returning a { value, done } result from the
+    // delegate iterator, or by modifying context.method and context.arg,
+    // setting context.delegate to null, and returning the ContinueSentinel.
+
+
+    function maybeInvokeDelegate(delegate, context) {
+      var method = delegate.iterator[context.method];
+
+      if (method === undefined$1) {
+        // A .throw or .return when the delegate iterator has no .throw
+        // method always terminates the yield* loop.
+        context.delegate = null;
+
+        if (context.method === "throw") {
+          // Note: ["return"] must be used for ES3 parsing compatibility.
+          if (delegate.iterator["return"]) {
+            // If the delegate iterator has a return method, give it a
+            // chance to clean up.
+            context.method = "return";
+            context.arg = undefined$1;
+            maybeInvokeDelegate(delegate, context);
+
+            if (context.method === "throw") {
+              // If maybeInvokeDelegate(context) changed context.method from
+              // "return" to "throw", let that override the TypeError below.
+              return ContinueSentinel;
+            }
           }
 
-          return {
-            value: record.arg,
-            done: context.done
-          };
-
-        } else if (record.type === "throw") {
-          state = GenStateCompleted;
-          // Dispatch the exception by looping back around to the
-          // context.dispatchException(context.arg) call above.
           context.method = "throw";
-          context.arg = record.arg;
+          context.arg = new TypeError("The iterator does not provide a 'throw' method");
         }
+
+        return ContinueSentinel;
       }
-    };
-  }
 
-  // Call delegate.iterator[context.method](context.arg) and handle the
-  // result, either by returning a { value, done } result from the
-  // delegate iterator, or by modifying context.method and context.arg,
-  // setting context.delegate to null, and returning the ContinueSentinel.
-  function maybeInvokeDelegate(delegate, context) {
-    var method = delegate.iterator[context.method];
-    if (method === undefined$1) {
-      // A .throw or .return when the delegate iterator has no .throw
-      // method always terminates the yield* loop.
-      context.delegate = null;
+      var record = tryCatch(method, delegate.iterator, context.arg);
 
-      if (context.method === "throw") {
-        // Note: ["return"] must be used for ES3 parsing compatibility.
-        if (delegate.iterator["return"]) {
-          // If the delegate iterator has a return method, give it a
-          // chance to clean up.
-          context.method = "return";
-          context.arg = undefined$1;
-          maybeInvokeDelegate(delegate, context);
+      if (record.type === "throw") {
+        context.method = "throw";
+        context.arg = record.arg;
+        context.delegate = null;
+        return ContinueSentinel;
+      }
 
-          if (context.method === "throw") {
-            // If maybeInvokeDelegate(context) changed context.method from
-            // "return" to "throw", let that override the TypeError below.
-            return ContinueSentinel;
-          }
-        }
+      var info = record.arg;
 
+      if (!info) {
         context.method = "throw";
-        context.arg = new TypeError(
-          "The iterator does not provide a 'throw' method");
+        context.arg = new TypeError("iterator result is not an object");
+        context.delegate = null;
+        return ContinueSentinel;
       }
 
-      return ContinueSentinel;
-    }
+      if (info.done) {
+        // Assign the result of the finished delegate to the temporary
+        // variable specified by delegate.resultName (see delegateYield).
+        context[delegate.resultName] = info.value; // Resume execution at the desired location (see delegateYield).
 
-    var record = tryCatch(method, delegate.iterator, context.arg);
+        context.next = delegate.nextLoc; // If context.method was "throw" but the delegate handled the
+        // exception, let the outer generator proceed normally. If
+        // context.method was "next", forget context.arg since it has been
+        // "consumed" by the delegate iterator. If context.method was
+        // "return", allow the original .return call to continue in the
+        // outer generator.
 
-    if (record.type === "throw") {
-      context.method = "throw";
-      context.arg = record.arg;
-      context.delegate = null;
-      return ContinueSentinel;
-    }
+        if (context.method !== "return") {
+          context.method = "next";
+          context.arg = undefined$1;
+        }
+      } else {
+        // Re-yield the result returned by the delegate method.
+        return info;
+      } // The delegate iterator is finished, so forget it and continue with
+      // the outer generator.
 
-    var info = record.arg;
 
-    if (! info) {
-      context.method = "throw";
-      context.arg = new TypeError("iterator result is not an object");
       context.delegate = null;
       return ContinueSentinel;
-    }
+    } // Define Generator.prototype.{next,throw,return} in terms of the
+    // unified ._invoke helper method.
 
-    if (info.done) {
-      // Assign the result of the finished delegate to the temporary
-      // variable specified by delegate.resultName (see delegateYield).
-      context[delegate.resultName] = info.value;
-
-      // Resume execution at the desired location (see delegateYield).
-      context.next = delegate.nextLoc;
-
-      // If context.method was "throw" but the delegate handled the
-      // exception, let the outer generator proceed normally. If
-      // context.method was "next", forget context.arg since it has been
-      // "consumed" by the delegate iterator. If context.method was
-      // "return", allow the original .return call to continue in the
-      // outer generator.
-      if (context.method !== "return") {
-        context.method = "next";
-        context.arg = undefined$1;
-      }
-
-    } else {
-      // Re-yield the result returned by the delegate method.
-      return info;
-    }
 
-    // The delegate iterator is finished, so forget it and continue with
-    // the outer generator.
-    context.delegate = null;
-    return ContinueSentinel;
-  }
-
-  // Define Generator.prototype.{next,throw,return} in terms of the
-  // unified ._invoke helper method.
-  defineIteratorMethods(Gp);
+    defineIteratorMethods(Gp);
+    define(Gp, toStringTagSymbol, "Generator"); // A Generator should always return itself as the iterator object when the
+    // @@iterator function is called on it. Some browsers' implementations of the
+    // iterator prototype chain incorrectly implement this, causing the Generator
+    // object to not be returned from this call. This ensures that doesn't happen.
+    // See https://github.com/facebook/regenerator/issues/274 for more details.
 
-  define(Gp, toStringTagSymbol, "Generator");
+    define(Gp, iteratorSymbol, function () {
+      return this;
+    });
+    define(Gp, "toString", function () {
+      return "[object Generator]";
+    });
 
-  // A Generator should always return itself as the iterator object when the
-  // @@iterator function is called on it. Some browsers' implementations of the
-  // iterator prototype chain incorrectly implement this, causing the Generator
-  // object to not be returned from this call. This ensures that doesn't happen.
-  // See https://github.com/facebook/regenerator/issues/274 for more details.
-  define(Gp, iteratorSymbol, function() {
-    return this;
-  });
+    function pushTryEntry(locs) {
+      var entry = {
+        tryLoc: locs[0]
+      };
 
-  define(Gp, "toString", function() {
-    return "[object Generator]";
-  });
+      if (1 in locs) {
+        entry.catchLoc = locs[1];
+      }
 
-  function pushTryEntry(locs) {
-    var entry = { tryLoc: locs[0] };
+      if (2 in locs) {
+        entry.finallyLoc = locs[2];
+        entry.afterLoc = locs[3];
+      }
 
-    if (1 in locs) {
-      entry.catchLoc = locs[1];
+      this.tryEntries.push(entry);
     }
 
-    if (2 in locs) {
-      entry.finallyLoc = locs[2];
-      entry.afterLoc = locs[3];
+    function resetTryEntry(entry) {
+      var record = entry.completion || {};
+      record.type = "normal";
+      delete record.arg;
+      entry.completion = record;
     }
 
-    this.tryEntries.push(entry);
-  }
-
-  function resetTryEntry(entry) {
-    var record = entry.completion || {};
-    record.type = "normal";
-    delete record.arg;
-    entry.completion = record;
-  }
-
-  function Context(tryLocsList) {
-    // The root entry object (effectively a try statement without a catch
-    // or a finally block) gives us a place to store values thrown from
-    // locations where there is no enclosing try statement.
-    this.tryEntries = [{ tryLoc: "root" }];
-    tryLocsList.forEach(pushTryEntry, this);
-    this.reset(true);
-  }
-
-  exports.keys = function(object) {
-    var keys = [];
-    for (var key in object) {
-      keys.push(key);
+    function Context(tryLocsList) {
+      // The root entry object (effectively a try statement without a catch
+      // or a finally block) gives us a place to store values thrown from
+      // locations where there is no enclosing try statement.
+      this.tryEntries = [{
+        tryLoc: "root"
+      }];
+      tryLocsList.forEach(pushTryEntry, this);
+      this.reset(true);
     }
-    keys.reverse();
-
-    // Rather than returning an object with a next method, we keep
-    // things simple and return the next function itself.
-    return function next() {
-      while (keys.length) {
-        var key = keys.pop();
-        if (key in object) {
-          next.value = key;
-          next.done = false;
-          return next;
-        }
-      }
 
-      // To avoid creating an additional object, we just hang the .value
-      // and .done properties off the next function object itself. This
-      // also ensures that the minifier will not anonymize the function.
-      next.done = true;
-      return next;
-    };
-  };
+    exports.keys = function (object) {
+      var keys = [];
 
-  function values(iterable) {
-    if (iterable) {
-      var iteratorMethod = iterable[iteratorSymbol];
-      if (iteratorMethod) {
-        return iteratorMethod.call(iterable);
+      for (var key in object) {
+        keys.push(key);
       }
 
-      if (typeof iterable.next === "function") {
-        return iterable;
-      }
+      keys.reverse(); // Rather than returning an object with a next method, we keep
+      // things simple and return the next function itself.
 
-      if (!isNaN(iterable.length)) {
-        var i = -1, next = function next() {
-          while (++i < iterable.length) {
-            if (hasOwn.call(iterable, i)) {
-              next.value = iterable[i];
-              next.done = false;
-              return next;
-            }
-          }
+      return function next() {
+        while (keys.length) {
+          var key = keys.pop();
 
-          next.value = undefined$1;
-          next.done = true;
+          if (key in object) {
+            next.value = key;
+            next.done = false;
+            return next;
+          }
+        } // To avoid creating an additional object, we just hang the .value
+        // and .done properties off the next function object itself. This
+        // also ensures that the minifier will not anonymize the function.
 
-          return next;
-        };
 
-        return next.next = next;
-      }
-    }
+        next.done = true;
+        return next;
+      };
+    };
 
-    // Return an iterator with no values.
-    return { next: doneResult };
-  }
-  exports.values = values;
+    function values(iterable) {
+      if (iterable) {
+        var iteratorMethod = iterable[iteratorSymbol];
 
-  function doneResult() {
-    return { value: undefined$1, done: true };
-  }
+        if (iteratorMethod) {
+          return iteratorMethod.call(iterable);
+        }
 
-  Context.prototype = {
-    constructor: Context,
-
-    reset: function(skipTempReset) {
-      this.prev = 0;
-      this.next = 0;
-      // Resetting context._sent for legacy support of Babel's
-      // function.sent implementation.
-      this.sent = this._sent = undefined$1;
-      this.done = false;
-      this.delegate = null;
-
-      this.method = "next";
-      this.arg = undefined$1;
-
-      this.tryEntries.forEach(resetTryEntry);
-
-      if (!skipTempReset) {
-        for (var name in this) {
-          // Not sure about the optimal order of these conditions:
-          if (name.charAt(0) === "t" &&
-              hasOwn.call(this, name) &&
-              !isNaN(+name.slice(1))) {
-            this[name] = undefined$1;
-          }
+        if (typeof iterable.next === "function") {
+          return iterable;
         }
-      }
-    },
 
-    stop: function() {
-      this.done = true;
+        if (!isNaN(iterable.length)) {
+          var i = -1,
+              next = function next() {
+            while (++i < iterable.length) {
+              if (hasOwn.call(iterable, i)) {
+                next.value = iterable[i];
+                next.done = false;
+                return next;
+              }
+            }
 
-      var rootEntry = this.tryEntries[0];
-      var rootRecord = rootEntry.completion;
-      if (rootRecord.type === "throw") {
-        throw rootRecord.arg;
-      }
+            next.value = undefined$1;
+            next.done = true;
+            return next;
+          };
 
-      return this.rval;
-    },
+          return next.next = next;
+        }
+      } // Return an iterator with no values.
 
-    dispatchException: function(exception) {
-      if (this.done) {
-        throw exception;
-      }
 
-      var context = this;
-      function handle(loc, caught) {
-        record.type = "throw";
-        record.arg = exception;
-        context.next = loc;
+      return {
+        next: doneResult
+      };
+    }
 
-        if (caught) {
-          // If the dispatched exception was caught by a catch block,
-          // then let that catch block handle the exception normally.
-          context.method = "next";
-          context.arg = undefined$1;
-        }
+    exports.values = values;
 
-        return !! caught;
-      }
+    function doneResult() {
+      return {
+        value: undefined$1,
+        done: true
+      };
+    }
 
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        var record = entry.completion;
+    Context.prototype = {
+      constructor: Context,
+      reset: function reset(skipTempReset) {
+        this.prev = 0;
+        this.next = 0; // Resetting context._sent for legacy support of Babel's
+        // function.sent implementation.
+
+        this.sent = this._sent = undefined$1;
+        this.done = false;
+        this.delegate = null;
+        this.method = "next";
+        this.arg = undefined$1;
+        this.tryEntries.forEach(resetTryEntry);
 
-        if (entry.tryLoc === "root") {
-          // Exception thrown outside of any try block that could handle
-          // it, so set the completion value of the entire function to
-          // throw the exception.
-          return handle("end");
+        if (!skipTempReset) {
+          for (var name in this) {
+            // Not sure about the optimal order of these conditions:
+            if (name.charAt(0) === "t" && hasOwn.call(this, name) && !isNaN(+name.slice(1))) {
+              this[name] = undefined$1;
+            }
+          }
         }
+      },
+      stop: function stop() {
+        this.done = true;
+        var rootEntry = this.tryEntries[0];
+        var rootRecord = rootEntry.completion;
 
-        if (entry.tryLoc <= this.prev) {
-          var hasCatch = hasOwn.call(entry, "catchLoc");
-          var hasFinally = hasOwn.call(entry, "finallyLoc");
+        if (rootRecord.type === "throw") {
+          throw rootRecord.arg;
+        }
 
-          if (hasCatch && hasFinally) {
-            if (this.prev < entry.catchLoc) {
-              return handle(entry.catchLoc, true);
-            } else if (this.prev < entry.finallyLoc) {
-              return handle(entry.finallyLoc);
-            }
+        return this.rval;
+      },
+      dispatchException: function dispatchException(exception) {
+        if (this.done) {
+          throw exception;
+        }
 
-          } else if (hasCatch) {
-            if (this.prev < entry.catchLoc) {
-              return handle(entry.catchLoc, true);
-            }
+        var context = this;
 
-          } else if (hasFinally) {
-            if (this.prev < entry.finallyLoc) {
-              return handle(entry.finallyLoc);
-            }
+        function handle(loc, caught) {
+          record.type = "throw";
+          record.arg = exception;
+          context.next = loc;
 
-          } else {
-            throw new Error("try statement without catch or finally");
+          if (caught) {
+            // If the dispatched exception was caught by a catch block,
+            // then let that catch block handle the exception normally.
+            context.method = "next";
+            context.arg = undefined$1;
           }
-        }
-      }
-    },
 
-    abrupt: function(type, arg) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc <= this.prev &&
-            hasOwn.call(entry, "finallyLoc") &&
-            this.prev < entry.finallyLoc) {
-          var finallyEntry = entry;
-          break;
+          return !!caught;
         }
-      }
 
-      if (finallyEntry &&
-          (type === "break" ||
-           type === "continue") &&
-          finallyEntry.tryLoc <= arg &&
-          arg <= finallyEntry.finallyLoc) {
-        // Ignore the finally entry if control is not jumping to a
-        // location outside the try/catch block.
-        finallyEntry = null;
-      }
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
+          var record = entry.completion;
 
-      var record = finallyEntry ? finallyEntry.completion : {};
-      record.type = type;
-      record.arg = arg;
+          if (entry.tryLoc === "root") {
+            // Exception thrown outside of any try block that could handle
+            // it, so set the completion value of the entire function to
+            // throw the exception.
+            return handle("end");
+          }
 
-      if (finallyEntry) {
-        this.method = "next";
-        this.next = finallyEntry.finallyLoc;
-        return ContinueSentinel;
-      }
+          if (entry.tryLoc <= this.prev) {
+            var hasCatch = hasOwn.call(entry, "catchLoc");
+            var hasFinally = hasOwn.call(entry, "finallyLoc");
 
-      return this.complete(record);
-    },
+            if (hasCatch && hasFinally) {
+              if (this.prev < entry.catchLoc) {
+                return handle(entry.catchLoc, true);
+              } else if (this.prev < entry.finallyLoc) {
+                return handle(entry.finallyLoc);
+              }
+            } else if (hasCatch) {
+              if (this.prev < entry.catchLoc) {
+                return handle(entry.catchLoc, true);
+              }
+            } else if (hasFinally) {
+              if (this.prev < entry.finallyLoc) {
+                return handle(entry.finallyLoc);
+              }
+            } else {
+              throw new Error("try statement without catch or finally");
+            }
+          }
+        }
+      },
+      abrupt: function abrupt(type, arg) {
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
 
-    complete: function(record, afterLoc) {
-      if (record.type === "throw") {
-        throw record.arg;
-      }
+          if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
+            var finallyEntry = entry;
+            break;
+          }
+        }
 
-      if (record.type === "break" ||
-          record.type === "continue") {
-        this.next = record.arg;
-      } else if (record.type === "return") {
-        this.rval = this.arg = record.arg;
-        this.method = "return";
-        this.next = "end";
-      } else if (record.type === "normal" && afterLoc) {
-        this.next = afterLoc;
-      }
+        if (finallyEntry && (type === "break" || type === "continue") && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc) {
+          // Ignore the finally entry if control is not jumping to a
+          // location outside the try/catch block.
+          finallyEntry = null;
+        }
 
-      return ContinueSentinel;
-    },
+        var record = finallyEntry ? finallyEntry.completion : {};
+        record.type = type;
+        record.arg = arg;
 
-    finish: function(finallyLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.finallyLoc === finallyLoc) {
-          this.complete(entry.completion, entry.afterLoc);
-          resetTryEntry(entry);
+        if (finallyEntry) {
+          this.method = "next";
+          this.next = finallyEntry.finallyLoc;
           return ContinueSentinel;
         }
-      }
-    },
 
-    "catch": function(tryLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc === tryLoc) {
-          var record = entry.completion;
-          if (record.type === "throw") {
-            var thrown = record.arg;
+        return this.complete(record);
+      },
+      complete: function complete(record, afterLoc) {
+        if (record.type === "throw") {
+          throw record.arg;
+        }
+
+        if (record.type === "break" || record.type === "continue") {
+          this.next = record.arg;
+        } else if (record.type === "return") {
+          this.rval = this.arg = record.arg;
+          this.method = "return";
+          this.next = "end";
+        } else if (record.type === "normal" && afterLoc) {
+          this.next = afterLoc;
+        }
+
+        return ContinueSentinel;
+      },
+      finish: function finish(finallyLoc) {
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
+
+          if (entry.finallyLoc === finallyLoc) {
+            this.complete(entry.completion, entry.afterLoc);
             resetTryEntry(entry);
+            return ContinueSentinel;
           }
-          return thrown;
         }
-      }
+      },
+      "catch": function _catch(tryLoc) {
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
 
-      // The context.catch method must only be called with a location
-      // argument that corresponds to a known catch block.
-      throw new Error("illegal catch attempt");
-    },
+          if (entry.tryLoc === tryLoc) {
+            var record = entry.completion;
 
-    delegateYield: function(iterable, resultName, nextLoc) {
-      this.delegate = {
-        iterator: values(iterable),
-        resultName: resultName,
-        nextLoc: nextLoc
-      };
+            if (record.type === "throw") {
+              var thrown = record.arg;
+              resetTryEntry(entry);
+            }
 
-      if (this.method === "next") {
-        // Deliberately forget the last sent value so that we don't
-        // accidentally pass it on to the delegate.
-        this.arg = undefined$1;
-      }
+            return thrown;
+          }
+        } // The context.catch method must only be called with a location
+        // argument that corresponds to a known catch block.
 
-      return ContinueSentinel;
-    }
-  };
 
-  // Regardless of whether this script is executing as a CommonJS module
-  // or not, return the runtime object so that we can declare the variable
-  // regeneratorRuntime in the outer scope, which allows this module to be
-  // injected easily by `bin/regenerator --include-runtime script.js`.
-  return exports;
+        throw new Error("illegal catch attempt");
+      },
+      delegateYield: function delegateYield(iterable, resultName, nextLoc) {
+        this.delegate = {
+          iterator: values(iterable),
+          resultName: resultName,
+          nextLoc: nextLoc
+        };
+
+        if (this.method === "next") {
+          // Deliberately forget the last sent value so that we don't
+          // accidentally pass it on to the delegate.
+          this.arg = undefined$1;
+        }
 
-}(
-  // If this script is executing as a CommonJS module, use module.exports
+        return ContinueSentinel;
+      }
+    }; // Regardless of whether this script is executing as a CommonJS module
+    // or not, return the runtime object so that we can declare the variable
+    // regeneratorRuntime in the outer scope, which allows this module to be
+    // injected easily by `bin/regenerator --include-runtime script.js`.
+
+    return exports;
+  }( // If this script is executing as a CommonJS module, use module.exports
   // as the regeneratorRuntime namespace. Otherwise create a new empty
   // object. Either way, the resulting object will be used to initialize
   // the regeneratorRuntime variable at the top of this file.
-   module.exports 
-));
-
-try {
-  regeneratorRuntime = runtime;
-} catch (accidentalStrictMode) {
-  // This module should not be running in strict mode, so the above
-  // assignment should always work unless something is misconfigured. Just
-  // in case runtime.js accidentally runs in strict mode, in modern engines
-  // we can explicitly access globalThis. In older engines we can escape
-  // strict mode using a global Function call. This could conceivably fail
-  // if a Content Security Policy forbids using Function, but in that case
-  // the proper solution is to fix the accidental strict mode problem. If
-  // you've misconfigured your bundler to force strict mode and applied a
-  // CSP to forbid Function, and you're not willing to fix either of those
-  // problems, please detail your unique predicament in a GitHub issue.
-  if (typeof globalThis === "object") {
-    globalThis.regeneratorRuntime = runtime;
-  } else {
-    Function("r", "regeneratorRuntime = r")(runtime);
+   module.exports );
+
+  try {
+    regeneratorRuntime = runtime;
+  } catch (accidentalStrictMode) {
+    // This module should not be running in strict mode, so the above
+    // assignment should always work unless something is misconfigured. Just
+    // in case runtime.js accidentally runs in strict mode, in modern engines
+    // we can explicitly access globalThis. In older engines we can escape
+    // strict mode using a global Function call. This could conceivably fail
+    // if a Content Security Policy forbids using Function, but in that case
+    // the proper solution is to fix the accidental strict mode problem. If
+    // you've misconfigured your bundler to force strict mode and applied a
+    // CSP to forbid Function, and you're not willing to fix either of those
+    // problems, please detail your unique predicament in a GitHub issue.
+    if (typeof globalThis === "object") {
+      globalThis.regeneratorRuntime = runtime;
+    } else {
+      Function("r", "regeneratorRuntime = r")(runtime);
+    }
   }
-}
 });
 
 /* eslint-disable you-dont-need-lodash-underscore/find */
@@ -2070,7 +2084,7 @@ function insertBlock(editor, nodeType, entity) {
     slate.Transforms.setNodes(editor, linkedEntityBlock);
   }
 
-  Slate.ReactEditor.focus(editor);
+  focus(editor);
 }
 
 var styles$4 = {
@@ -2164,13 +2178,13 @@ function getWithEmbeddedEntityEvents(nodeType, sdk) {
 }
 
 var createEmbeddedEntityPlugin = function createEmbeddedEntityPlugin(nodeType, hotkey) {
-  return function (sdk) {
+  return function (sdk, tracking) {
     return {
       key: nodeType,
       type: nodeType,
       isElement: true,
       isVoid: true,
-      component: LinkedEntityBlock,
+      component: withLinkTracking(tracking, LinkedEntityBlock),
       options: {
         hotkey: hotkey
       },
@@ -2228,12 +2242,20 @@ function FetchingWrappedInlineEntryCard(props) {
     return entries[props.entryId];
   }, [entries, props.entryId]);
   var allContentTypes = props.sdk.space.getCachedContentTypes();
+  var onEntityFetchComplete = props.onEntityFetchComplete;
   var contentType = React__default.useMemo(function () {
     if (!entry || entry === 'failed' || !allContentTypes) return undefined;
     return allContentTypes.find(function (contentType) {
       return contentType.sys.id === entry.sys.contentType.sys.id;
     });
   }, [allContentTypes, entry]);
+  React__default.useEffect(function () {
+    if (!entry) {
+      return;
+    }
+
+    onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
+  }, [entry, onEntityFetchComplete]);
   var contentTypeName = contentType ? contentType.name : '';
   var title = React__default.useMemo(function () {
     return getEntryTitle({
@@ -2329,12 +2351,10 @@ var styles$6 = {
     marginRight: '10px'
   }),
   root: /*#__PURE__*/emotion.css({
-    margin: '0 1px',
+    display: 'inline-block',
+    margin: "0 " + tokens.spacing2Xs,
     fontSize: 'inherit',
     span: {
-      webkitUserSelect: 'none',
-      mozUserSelect: 'none',
-      msUserSelect: 'none',
       userSelect: 'none'
     }
   })
@@ -2377,7 +2397,8 @@ function EmbeddedEntityInline(props) {
     isSelected: isSelected,
     isDisabled: isDisabled,
     onRemove: handleRemoveClick,
-    onEdit: handleEditClick
+    onEdit: handleEditClick,
+    onEntityFetchComplete: props.onEntityFetchComplete
   })), props.children);
 }
 
@@ -2401,7 +2422,7 @@ function _selectEntityAndInsert$1() {
 
           case 4:
             entry = _context2.sent;
-            Slate.ReactEditor.focus(editor); // Dialog steals focus from editor, return it.
+            focus(editor); // Dialog steals focus from editor, return it.
 
             if (entry) {
               _context2.next = 8;
@@ -2487,7 +2508,7 @@ function ToolbarEmbeddedEntityInlineButton(props) {
     className: "rich-text__embedded-entry-list-icon " + styles$6.icon
   }), /*#__PURE__*/React.createElement("span", null, "Inline entry")));
 }
-function createEmbeddedEntityInlinePlugin(sdk) {
+function createEmbeddedEntityInlinePlugin(sdk, tracking) {
   var htmlAttributeName = 'data-embedded-entity-inline-id';
   return {
     key: Contentful.INLINES.EMBEDDED_ENTRY,
@@ -2495,7 +2516,7 @@ function createEmbeddedEntityInlinePlugin(sdk) {
     isElement: true,
     isInline: true,
     isVoid: true,
-    component: EmbeddedEntityInline,
+    component: withLinkTracking(tracking, EmbeddedEntityInline),
     options: {
       hotkey: 'mod+shift+2'
     },
@@ -2609,14 +2630,25 @@ function ToolbarHeadingButton(props) {
         unwrapFromRoot(editor);
       }
 
+      var prevOnChange = editor.onChange;
+      /*
+       The focus might happen at point in time when
+       `toggleNodeType` changes aren't rendered yet, causing the browser
+       to place the cursor at the start of the text.
+       We wait for the change event before focusing
+       the editor again. This ensures the cursor is back at the previous
+       position.*/
+
+      editor.onChange = function () {
+        focus(editor);
+        editor.onChange = prevOnChange;
+        prevOnChange.apply(void 0, arguments);
+      };
+
       plateCore.toggleNodeType(editor, {
         activeType: type,
         inactiveType: type
-      }); // TODO: Figure out why focus only works with timeout here.
-
-      setTimeout(function () {
-        Slate.ReactEditor.focus(editor);
-      }, 0);
+      });
     };
   }
 
@@ -2746,16 +2778,6 @@ var createHeadingPlugin = function createHeadingPlugin() {
         allow: Contentful.HEADINGS
       }
     }],
-    exitBreak: [// Pressing ENTER at the start or end of a heading text inserts a
-    // normal paragraph
-    {
-      hotkey: 'enter',
-      query: {
-        allow: Contentful.HEADINGS,
-        end: true,
-        start: true
-      }
-    }],
     normalizer: [{
       match: {
         type: Contentful.HEADINGS
@@ -2766,6 +2788,31 @@ var createHeadingPlugin = function createHeadingPlugin() {
       },
       transform: (_transform = {}, _transform[Contentful.BLOCKS.PARAGRAPH] = transformUnwrap, _transform["default"] = transformLift, _transform)
     }],
+    then: function then(editor) {
+      return {
+        exitBreak: [// Pressing ENTER at the start or end of a heading text inserts a
+        // normal paragraph.
+        {
+          hotkey: 'enter',
+          query: {
+            allow: Contentful.HEADINGS,
+            end: true,
+            start: true,
+            // Exclude headings inside lists as it interferes with the list's
+            // insertBreak implementation
+            filter: function filter(_ref2) {
+              var path = _ref2[1];
+              return !plateCore.getAbove(editor, {
+                at: path,
+                match: {
+                  type: Contentful.BLOCKS.LIST_ITEM
+                }
+              });
+            }
+          }
+        }]
+      };
+    },
     plugins: Contentful.HEADINGS.map(function (nodeType, idx) {
       var level = idx + 1;
       var tagName = "h" + level;
@@ -2888,7 +2935,7 @@ function ToolbarHrButton(props) {
     hasText ? slate.Transforms.insertNodes(editor, hr) : plateCore.setNodes(editor, hr); // Move focus to the next paragraph (added by TrailingParagraph plugin)
 
     moveToTheNextLine(editor);
-    Slate.ReactEditor.focus(editor);
+    focus(editor);
   }
 
   if (!editor) return null;
@@ -3380,7 +3427,7 @@ function _addOrEditLink() {
                 path: path
               });
             });
-            Slate.ReactEditor.focus(editor);
+            focus(editor);
 
           case 15:
           case "end":
@@ -3469,6 +3516,13 @@ function EntityHyperlink(props) {
   var isReadOnly = Slate.useReadOnly();
   var sdk = useSdkContext();
   var target = props.element.data.target;
+  var onEntityFetchComplete = props.onEntityFetchComplete;
+  React.useEffect(function () {
+    // The real entity loading happens in the tooltip
+    // Since that is deferred the link is considered rendered as soon
+    // the component mounts (link text displayed)
+    onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
+  }, [onEntityFetchComplete]);
   if (!target) return null;
 
   function handleClick(event) {
@@ -3599,7 +3653,7 @@ var getNodeOfType = function getNodeOfType(type) {
   };
 };
 
-var createHyperlinkPlugin = function createHyperlinkPlugin(sdk) {
+var createHyperlinkPlugin = function createHyperlinkPlugin(sdk, tracking) {
   var common = {
     isElement: true,
     isInline: true
@@ -3630,7 +3684,7 @@ var createHyperlinkPlugin = function createHyperlinkPlugin(sdk) {
     _extends({}, common, {
       key: Contentful.INLINES.ENTRY_HYPERLINK,
       type: Contentful.INLINES.ENTRY_HYPERLINK,
-      component: EntityHyperlink,
+      component: withLinkTracking(tracking, EntityHyperlink),
       deserializeHtml: {
         rules: [{
           validNodeName: ['A']
@@ -3644,7 +3698,7 @@ var createHyperlinkPlugin = function createHyperlinkPlugin(sdk) {
     _extends({}, common, {
       key: Contentful.INLINES.ASSET_HYPERLINK,
       type: Contentful.INLINES.ASSET_HYPERLINK,
-      component: EntityHyperlink,
+      component: withLinkTracking(tracking, EntityHyperlink),
       deserializeHtml: {
         rules: [{
           validNodeName: ['A']
@@ -3666,7 +3720,7 @@ var createHyperlinkPlugin = function createHyperlinkPlugin(sdk) {
 };
 
 var _templateObject$4, _templateObject2$3, _templateObject3$3, _styles;
-var baseStyle = /*#__PURE__*/emotion.css(_templateObject$4 || (_templateObject$4 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  padding: 0;\n  margin: 0 0 1.25rem 1.25rem;\n  div:first-child {\n    margin: 0;\n    line-height: ", ";\n  }\n"])), tokens.lineHeightDefault);
+var baseStyle = /*#__PURE__*/emotion.css(_templateObject$4 || (_templateObject$4 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  padding: 0;\n  margin: 0 0 1.25rem 1.25rem;\n\n  div:first-child {\n    margin: 0;\n    line-height: ", ";\n  }\n"])), tokens.lineHeightDefault);
 var styles$d = (_styles = {}, _styles[Contentful.BLOCKS.UL_LIST] = /*#__PURE__*/emotion.css(_templateObject2$3 || (_templateObject2$3 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n    list-style-type: disc;\n    ul {\n      list-style-type: circle;\n      ul {\n        list-style-type: square;\n      }\n    }\n  "]))), _styles[Contentful.BLOCKS.OL_LIST] = /*#__PURE__*/emotion.css(_templateObject3$3 || (_templateObject3$3 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n    list-style-type: decimal;\n    ol {\n      list-style-type: upper-alpha;\n      ol {\n        list-style-type: lower-roman;\n        ol {\n          list-style-type: lower-alpha;\n        }\n      }\n    }\n  "]))), _styles);
 
 function createList(Tag, block) {
@@ -3681,7 +3735,7 @@ var ListUL = /*#__PURE__*/createList('ul', Contentful.BLOCKS.UL_LIST);
 var ListOL = /*#__PURE__*/createList('ol', Contentful.BLOCKS.OL_LIST);
 
 var _templateObject$5;
-var style = /*#__PURE__*/emotion.css(_templateObject$5 || (_templateObject$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0;\n  list-style: inherit;\n  ol,\n  ul {\n    margin: 0 0 0 ", ";\n  }\n"])), tokens.spacingL);
+var style = /*#__PURE__*/emotion.css(_templateObject$5 || (_templateObject$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0;\n  list-style: inherit;\n  margin-top: ", ";\n\n  ol,\n  ul {\n    margin: 0 0 0 ", ";\n  }\n"])), tokens.spacingXs, tokens.spacingL);
 function ListItem(props) {
   return /*#__PURE__*/React.createElement("li", Object.assign({}, props.attributes, {
     className: style
@@ -3749,66 +3803,285 @@ var insertParagraphAsChild = function insertParagraphAsChild(editor, _ref5) {
 };
 
 /**
- * A copy of Plate's list plugin with a few adjustments
- * to support pasting any element
+ * Build a new list item node while preserving marks
  */
-var getListInsertFragment = function getListInsertFragment(editor) {
-  var insertFragment = editor.insertFragment;
-  var li = plateCore.getPlugin(editor, plateList.ELEMENT_LI);
-  var ul = plateCore.getPlugin(editor, plateList.ELEMENT_UL);
-  var ol = plateCore.getPlugin(editor, plateList.ELEMENT_OL);
 
-  var isListRoot = function isListRoot(node) {
-    return [ul.type, ol.type].includes(node.type);
+var emptyListItemNode = function emptyListItemNode(editor, withChildren) {
+  if (withChildren === void 0) {
+    withChildren = false;
+  }
+
+  var children = [];
+
+  if (withChildren) {
+    var marks = slate.Editor.marks(editor) || {};
+    children = [{
+      type: Contentful.BLOCKS.PARAGRAPH,
+      data: {},
+      children: [_extends({
+        text: ''
+      }, marks)]
+    }];
+  }
+
+  return {
+    type: Contentful.BLOCKS.LIST_ITEM,
+    data: {},
+    children: children
   };
+};
+/**
+ * Insert list item if selection is in li>p.
+ */
 
-  var getFirstAncestorOfType = function getFirstAncestorOfType(root, entry, _ref) {
-    var type = _ref.type;
-    var ancestor = slate.Path.parent(entry[1]);
 
-    while (slate.Node.get(root, ancestor).type !== type) {
-      ancestor = slate.Path.parent(ancestor);
+var insertListItem = function insertListItem(editor) {
+  if (!editor.selection) {
+    return false;
+  } // Naming it paragraph for simplicity but can be a heading as well
+
+
+  var paragraph = plateCore.getAbove(editor, {
+    match: {
+      type: Contentful.TEXT_CONTAINERS
     }
+  });
 
-    return [slate.Node.get(root, ancestor), ancestor];
-  };
+  if (!paragraph) {
+    return false;
+  }
+
+  var paragraphPath = paragraph[1];
+  var listItem = plateCore.getParent(editor, paragraphPath);
+
+  if (!listItem) {
+    return false;
+  }
+
+  var listItemNode = listItem[0],
+      listItemPath = listItem[1];
+
+  if (listItemNode.type !== Contentful.BLOCKS.LIST_ITEM) {
+    return false;
+  } // We are in a li>p (or heading)
+
+
+  slate.Editor.withoutNormalizing(editor, function () {
+    if (!editor.selection) {
+      return;
+    } // Check the cursor position in the current paragraph
+
+
+    var isAtStart = plateCore.isSelectionAtBlockStart(editor);
+    var isAtEnd = plateCore.isSelectionAtBlockEnd(editor);
+    var isAtStartOfListItem = isAtStart && plateCore.isFirstChild(paragraphPath);
+    var shouldSplit = !isAtStart && !isAtEnd; // Split the current paragraph content if necessary
+
+    if (shouldSplit) {
+      slate.Transforms.splitNodes(editor);
+    } // Insert the new li
+
+
+    var newListItemPath = isAtStartOfListItem ? listItemPath : slate.Path.next(listItemPath);
+    plateCore.insertNodes(editor, // Add an empty paragraph to the new li if We will not move some
+    // paragraphs over there.
+    emptyListItemNode(editor, !shouldSplit), {
+      at: newListItemPath
+    }); // Move children *after* selection to the new li
+
+    var fromPath = isAtStart ? paragraphPath : slate.Path.next(paragraphPath);
+    var fromStartIndex = fromPath[fromPath.length - 1] || 0; // On split we don't add paragraph to the new li so we move
+    // content to the very beginning. Otherwise, account for the empty
+    // paragraph at the beginning by moving the content after
+
+    var toPath = newListItemPath.concat([shouldSplit ? 0 : 1]);
+
+    if (!isAtStartOfListItem) {
+      plateCore.moveChildren(editor, {
+        at: listItemPath,
+        to: toPath,
+        fromStartIndex: fromStartIndex
+      });
+    } // Move cursor to the start of the new li
+
+
+    slate.Transforms.select(editor, newListItemPath);
+    slate.Transforms.collapse(editor, {
+      edge: 'start'
+    });
+  }); // Returning True skips processing other editor.insertBreak handlers
+
+  return true;
+};
+
+/**
+ * Credit: Copied & modified version from Plate's list plugin to support
+ * list items with multiple children.
+ *
+ * See: https://github.com/udecode/plate/blob/main/packages/nodes/list
+ */
+
+var listBreak = function listBreak(editor) {
+  if (!editor.selection) return false;
+  var res = plateList.getListItemEntry(editor, {});
+  var moved; // If selection is in a li
+
+  if (res) {
+    var list = res.list,
+        listItem = res.listItem;
+    var childNode = listItem[0].children[0]; // If selected li is empty, move it up.
+
+    if (plateCore.isBlockAboveEmpty(editor) && listItem[0].children.length === 1 && Contentful.TEXT_CONTAINERS.includes(childNode.type)) {
+      moved = plateList.moveListItemUp(editor, {
+        list: list,
+        listItem: listItem
+      });
+      if (moved) return true;
+    }
+  }
+
+  var didReset = plateResetNode.onKeyDownResetNode(editor, plateCore.mockPlugin({
+    options: {
+      rules: [{
+        types: [plateCore.getPluginType(editor, plateList.ELEMENT_LI)],
+        defaultType: plateCore.getPluginType(editor, plateCore.ELEMENT_DEFAULT),
+        predicate: function predicate() {
+          return !moved && plateCore.isBlockAboveEmpty(editor);
+        },
+        onReset: function onReset(_editor) {
+          return plateList.unwrapList(_editor);
+        }
+      }]
+    }
+  }))(plateResetNode.SIMULATE_BACKSPACE);
+
+  if (didReset) {
+    return true;
+  }
   /**
-   * Removes the "empty" leading lis. Empty in this context means lis only with other lis as children.
-   *
-   * @returns If argument is not a list root, returns it, otherwise returns ul[] or li[].
+   * If selection is in li > p, insert li.
    */
 
 
-  var trimList = function trimList(listRoot) {
-    if (!isListRoot(listRoot)) {
-      return [listRoot];
-    }
+  if (!moved) {
+    var inserted = insertListItem(editor);
+    if (inserted) return true;
+  }
+
+  return false;
+};
 
-    var textEntries = Array.from(slate.Node.texts(listRoot));
-    var commonAncestorEntry = textEntries.reduce(function (commonAncestor, textEntry) {
-      return slate.Path.isAncestor(commonAncestor[1], textEntry[1]) ? commonAncestor : slate.Node.common(listRoot, textEntry[1], commonAncestor[1]);
-    }, // any list item would do, we grab the first one
-    getFirstAncestorOfType(listRoot, textEntries[0], li));
-    return isListRoot(commonAncestorEntry[0]) ? commonAncestorEntry[0].children : [commonAncestorEntry[0]];
+var insertListBreak = function insertListBreak(editor) {
+  var insertBreak = editor.insertBreak;
+  return function () {
+    if (listBreak(editor)) return;
+    insertBreak();
   };
+};
 
+/**
+ * Credit: Modified version of Plate's list plugin
+ * See: https://github.com/udecode/plate/blob/main/packages/nodes/list
+ */
+
+var getFirstAncestorOfType = function getFirstAncestorOfType(root, entry) {
+  var ancestor = slate.Path.parent(entry[1]);
+
+  while (slate.Node.get(root, ancestor).type !== Contentful.BLOCKS.LIST_ITEM) {
+    ancestor = slate.Path.parent(ancestor);
+  }
+
+  return [slate.Node.get(root, ancestor), ancestor];
+};
+
+var isListRoot = function isListRoot(node) {
+  return [Contentful.BLOCKS.UL_LIST, Contentful.BLOCKS.OL_LIST].includes(node.type);
+};
+/**
+ * Removes the "empty" leading lis. Empty in this context means lis only with other lis as children.
+ *
+ * @returns If argument is not a list root, returns it, otherwise returns ul[] or li[].
+ */
+
+
+var trimList = function trimList(listRoot) {
+  if (!isListRoot(listRoot)) {
+    return [listRoot];
+  }
+
+  var textEntries = Array.from(slate.Node.texts(listRoot));
+  var commonAncestorEntry = textEntries.reduce(function (commonAncestor, textEntry) {
+    return slate.Path.isAncestor(commonAncestor[1], textEntry[1]) ? commonAncestor : slate.Node.common(listRoot, textEntry[1], commonAncestor[1]);
+  }, // any list item would do, we grab the first one
+  getFirstAncestorOfType(listRoot, textEntries[0]));
+  return isListRoot(commonAncestorEntry[0]) ? commonAncestorEntry[0].children : [commonAncestorEntry[0]];
+};
+/**
+ * Removes leading li when pasting a single li with a single child.
+ */
+
+
+var trimLiWrapper = function trimLiWrapper(nodes) {
+  if (nodes.length !== 1) {
+    return nodes;
+  }
+
+  var node = nodes[0];
+
+  if (node.type !== Contentful.BLOCKS.LIST_ITEM || node.children.length !== 1) {
+    return nodes;
+  }
+
+  return node.children;
+};
+
+var unwrapTextContainerAtStart = function unwrapTextContainerAtStart(nodes) {
+  var node = nodes[0];
+
+  if (Contentful.TEXT_CONTAINERS.includes(node.type)) {
+    return [].concat(node.children, nodes.slice(1));
+  }
+
+  return nodes;
+};
+
+var insertListFragment = function insertListFragment(editor) {
+  var insertFragment = editor.insertFragment;
   return function (fragment) {
+    if (!editor.selection) {
+      return;
+    }
+
     var liEntry = plateCore.findNode(editor, {
       match: {
-        type: li.type
+        type: Contentful.BLOCKS.LIST_ITEM
       },
       mode: 'lowest'
     });
 
     if (liEntry) {
-      var liPath = liEntry[1]; // FIXME: this is a temporarily workaround and needs a follow-up to properly
-      // non-text elements
-
-      var nodes = fragment.flatMap(function (node) {
+      var nodes = unwrapTextContainerAtStart(trimLiWrapper(fragment.flatMap(function (node) {
         return trimList(node);
+      })));
+      var firstBlockIndex = nodes.findIndex(function (node) {
+        return slate.Editor.isBlock(editor, node);
       });
-      return slate.Transforms.insertNodes(editor, nodes, {
-        at: editor.selection || slate.Path.next(liPath),
+
+      if (firstBlockIndex < 0) {
+        firstBlockIndex = nodes.length;
+      }
+
+      var inlines = nodes.slice(0, firstBlockIndex);
+      var blocks = nodes.slice(firstBlockIndex); // Two calls to insertNodes are required here. Otherwise, all blocks
+      // after a text or inline element occurrence will be unwrapped for
+      // some reason.
+
+      slate.Transforms.insertNodes(editor, inlines, {
+        at: editor.selection,
+        select: true
+      });
+      return slate.Transforms.insertNodes(editor, blocks, {
+        at: editor.selection,
         select: true
       });
     }
@@ -3820,18 +4093,37 @@ var getListInsertFragment = function getListInsertFragment(editor) {
   };
 };
 
-var options = {
-  validLiChildrenTypes: Contentful.LIST_ITEM_BLOCKS
-};
-var withList = function withList(editor, plugin) {
-  var insertFragment = editor.insertFragment;
-  plateList.withList(editor, _extends({}, plugin, {
-    options: options
-  })); // Reverts any overrides to insertFragment
+/**
+ * Credit: Modified version of Plate's list plugin
+ * See: https://github.com/udecode/plate/blob/main/packages/nodes/list
+ */
+var validLiChildrenTypes = Contentful.LIST_ITEM_BLOCKS;
+var withList = function withList(editor) {
+  var deleteBackward = editor.deleteBackward,
+      deleteForward = editor.deleteForward,
+      deleteFragment = editor.deleteFragment;
+
+  editor.deleteBackward = function (unit) {
+    if (plateList.deleteBackwardList(editor, unit)) return;
+    deleteBackward(unit);
+  };
 
-  editor.insertFragment = insertFragment; // Use our custom getListInsertFragment
+  editor.deleteForward = function (unit) {
+    if (plateList.deleteForwardList(editor)) return;
+    deleteForward(unit);
+  };
+
+  editor.deleteFragment = function () {
+    if (plateList.deleteFragmentList(editor)) return;
+    deleteFragment();
+  };
+
+  editor.insertBreak = insertListBreak(editor);
+  editor.insertFragment = insertListFragment(editor); // TODO: replace with Normalizer rules
 
-  editor.insertFragment = getListInsertFragment(editor);
+  editor.normalizeNode = plateList.normalizeList(editor, {
+    validLiChildrenTypes: validLiChildrenTypes
+  });
   return editor;
 };
 
@@ -3889,7 +4181,7 @@ function ToolbarListButton(props) {
       plateList.toggleList(editor, {
         type: type
       });
-      Slate.ReactEditor.focus(editor);
+      focus(editor);
     };
   }
 
@@ -3917,7 +4209,7 @@ function ToolbarBoldButton(props) {
     plateCore.toggleMark(editor, {
       key: Contentful.MARKS.BOLD
     });
-    Slate.ReactEditor.focus(editor);
+    focus(editor);
   }
 
   if (!editor) return null;
@@ -3976,7 +4268,7 @@ function ToolbarCodeButton(props) {
     plateCore.toggleMark(editor, {
       key: Contentful.MARKS.CODE
     });
-    Slate.ReactEditor.focus(editor);
+    focus(editor);
   }
 
   if (!editor) return null;
@@ -4026,7 +4318,7 @@ function ToolbarItalicButton(props) {
     plateCore.toggleMark(editor, {
       key: Contentful.MARKS.ITALIC
     });
-    Slate.ReactEditor.focus(editor);
+    focus(editor);
   }
 
   if (!editor) return null;
@@ -4080,7 +4372,7 @@ function ToolbarUnderlineButton(props) {
     plateCore.toggleMark(editor, {
       key: Contentful.MARKS.UNDERLINE
     });
-    Slate.ReactEditor.focus(editor);
+    focus(editor);
   }
 
   if (!editor) return null;
@@ -4565,7 +4857,7 @@ function ToolbarQuoteButton(props) {
   function handleOnClick() {
     if (!editor) return;
     toggleQuote(editor);
-    Slate.ReactEditor.focus(editor);
+    focus(editor);
   }
 
   if (!editor) return null;
@@ -4921,11 +5213,7 @@ var TableActions = function TableActions() {
 
   var close = React__default.useCallback(function () {
     setOpen(false);
-    if (!editor) return; // Makes sure we keep the editor in focus when clicking on/out
-    // the dropdown menu
-
-    Slate.ReactEditor.focus(editor);
-  }, [editor]);
+  }, []);
   React__default.useEffect(function () {
     setHeaderEnabled(Boolean(editor && isTableHeaderEnabled(editor)));
   }, [editor]);
@@ -5194,7 +5482,7 @@ function ToolbarTableButton(props) {
             case 2:
               onViewportAction('insertTable');
               insertTableAndFocusFirstCell(editor);
-              Slate.ReactEditor.focus(editor);
+              focus(editor);
 
             case 5:
             case "end":
@@ -5221,36 +5509,49 @@ function createTextPlugin() {
   return {
     key: 'TextPlugin',
     withOverrides: function withOverrides(editor) {
-      var deleteForward = editor.deleteForward; // When pressing delete instead of backspace
+      // Reverts the change made upstream that caused the cursor
+      // to be trapped inside inline elements.
+      //
+      // Reverts https://github.com/ianstormtaylor/slate/pull/4578/
+      // Related https://github.com/ianstormtaylor/slate/issues/4704
+      var insertText = editor.insertText;
+
+      editor.insertText = function (text) {
+        var selection = editor.selection; // If the cursor is at the end of an inline, move it outside
+        // before inserting
+
+        if (selection && slate.Range.isCollapsed(selection)) {
+          var _Editor$above;
+
+          var inlinePath = (_Editor$above = slate.Editor.above(editor, {
+            match: function match(n) {
+              return slate.Editor.isInline(editor, n);
+            },
+            mode: 'highest'
+          })) == null ? void 0 : _Editor$above[1];
+
+          if (inlinePath && slate.Editor.isEnd(editor, selection.anchor, inlinePath)) {
+            var point = slate.Editor.after(editor, inlinePath);
+            slate.Transforms.setSelection(editor, {
+              anchor: point,
+              focus: point
+            });
+          }
+        }
 
-      editor.deleteForward = function (unit) {
-        var _editor$selection;
+        return insertText(text);
+      }; // When pressing delete instead of backspace
 
-        var _Editor$nodes = slate.Editor.nodes(editor, {
-          at: (_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.path,
-          match: function match(node) {
-            return Contentful.TEXT_CONTAINERS.includes(node.type);
-          }
-        }),
-            nodes = _Editor$nodes[0];
 
-        if (nodes) {
-          var paragraphOrHeading = nodes[0],
-              path = nodes[1];
-          var isTextEmpty = plateCore.isAncestorEmpty(editor, paragraphOrHeading); // We ignore paragraphs/headings that are children of ul, ol, blockquote, tables, etc
+      var deleteForward = editor.deleteForward,
+          deleteBackward = editor.deleteBackward;
 
-          var isRootLevel = path.length === 1;
+      editor.deleteBackward = function (unit) {
+        deleteEmptyParagraph(unit, editor, deleteBackward);
+      };
 
-          if (isTextEmpty && isRootLevel) {
-            slate.Transforms.removeNodes(editor, {
-              at: path
-            });
-          } else {
-            deleteForward(unit);
-          }
-        } else {
-          deleteForward(unit);
-        }
+      editor.deleteForward = function (unit) {
+        deleteEmptyParagraph(unit, editor, deleteForward);
       };
 
       return editor;
@@ -5258,6 +5559,32 @@ function createTextPlugin() {
   };
 }
 
+function deleteEmptyParagraph(unit, editor, deleteFunction) {
+  var entry = plateCore.getAbove(editor, {
+    match: {
+      type: Contentful.TEXT_CONTAINERS
+    }
+  });
+
+  if (entry) {
+    var paragraphOrHeading = entry[0],
+        path = entry[1];
+    var isTextEmpty = plateCore.isAncestorEmpty(editor, paragraphOrHeading); // We ignore paragraphs/headings that are children of ul, ol, blockquote, tables, etc
+
+    var isRootLevel = path.length === 1;
+
+    if (isTextEmpty && isRootLevel) {
+      slate.Transforms.removeNodes(editor, {
+        at: path
+      });
+    } else {
+      deleteFunction(unit);
+    }
+  } else {
+    deleteFunction(unit);
+  }
+}
+
 var createTrailingParagraphPlugin = function createTrailingParagraphPlugin() {
   return plateTrailingBlock.createTrailingBlockPlugin({
     options: {
@@ -5293,8 +5620,9 @@ var transformVoid = function transformVoid(editor, _ref) {
 var createVoidsPlugin = function createVoidsPlugin() {
   return {
     key: 'VoidsPlugin',
-    exitBreak: [// Can insert before first void block
-    {
+    exitBreak: [{
+      // Inserts a new paragraph *before* a void element if it's the very first
+      // node on the editor
       hotkey: 'enter',
       before: true,
       query: {
@@ -5304,14 +5632,17 @@ var createVoidsPlugin = function createVoidsPlugin() {
           return isRootLevel(path) && plateCore.isFirstChild(path) && !!node.isVoid;
         }
       }
-    }, // Can insert after a void block
-    {
+    }, {
+      // Inserts a new paragraph on enter when a void element is focused
       hotkey: 'enter',
+      // exploit the internal use of Array.slice(0, level + 1) by the exitBreak plugin
+      // to stay in the parent element
+      level: -2,
       query: {
         filter: function filter(_ref2) {
           var node = _ref2[0],
               path = _ref2[1];
-          return !plateCore.isFirstChild(path) && !!node.isVoid;
+          return !(isRootLevel(path) && plateCore.isFirstChild(path)) && !!node.isVoid;
         }
       }
     }],
@@ -5340,8 +5671,8 @@ var getPlugins = function getPlugins(sdk, tracking) {
   return [// AST must come after the HTML deserializer
   plateCore.createDeserializeHtmlPlugin(), plateCore.createDeserializeAstPlugin(), plateSerializerDocx.createDeserializeDocxPlugin(), // Global shortcuts
   createDragAndDropPlugin(), // Block Elements
-  createParagraphPlugin(), createListPlugin(), createHrPlugin(), createHeadingPlugin(), createQuotePlugin(), createTablePlugin(tracking), createEmbeddedEntryBlockPlugin(sdk), createEmbeddedAssetBlockPlugin(sdk), // Inline elements
-  createHyperlinkPlugin(sdk), createEmbeddedEntityInlinePlugin(sdk), // Marks
+  createParagraphPlugin(), createListPlugin(), createHrPlugin(), createHeadingPlugin(), createQuotePlugin(), createTablePlugin(tracking), createEmbeddedEntryBlockPlugin(sdk, tracking), createEmbeddedAssetBlockPlugin(sdk, tracking), // Inline elements
+  createHyperlinkPlugin(sdk, tracking), createEmbeddedEntityInlinePlugin(sdk, tracking), // Marks
   createMarksPlugin(), // Other
   createTrailingParagraphPlugin(), createTextPlugin(), createVoidsPlugin(), createSelectOnBackspacePlugin(), // Pasting content from other sources
   createPasteHTMLPlugin(), // These plugins drive their configurations from the list of plugins
@@ -5612,13 +5943,9 @@ var StickyToolbarWrapper = function StickyToolbarWrapper(_ref) {
 var _excluded = ["sdk", "isInitiallyDisabled", "onAction"];
 var ConnectedRichTextEditor = function ConnectedRichTextEditor(props) {
   var tracking = useTrackingContext();
-  var docFromAdapter = contentfulSlatejsAdapter.toSlatejsDocument({
-    document: props.value || Contentful.EMPTY_DOCUMENT,
-    schema: schema
-  });
-  var doc = sanitizeIncomingSlateDoc(docFromAdapter);
+  var editor = useContentfulEditor();
 
-  var _useState = React.useState(doc),
+  var _useState = React.useState([]),
       value = _useState[0],
       setValue = _useState[1];
 
@@ -5628,12 +5955,33 @@ var ConnectedRichTextEditor = function ConnectedRichTextEditor(props) {
   var plugins = React__default.useMemo(function () {
     return getPlugins(props.sdk, tracking);
   }, [props.sdk, tracking]);
+  React__default.useEffect(function () {
+    if (!editor) {
+      return;
+    }
+
+    var docFromAdapter = contentfulSlatejsAdapter.toSlatejsDocument({
+      document: props.value || Contentful.EMPTY_DOCUMENT,
+      schema: schema
+    });
+    var doc = sanitizeIncomingSlateDoc(docFromAdapter); // Slate throws an error if the value on the initial render is invalid
+    // so we directly set the value on the editor in order
+    // to be able to trigger normalization on the initial value before rendering
+    // TODO: use https://plate.udecode.io/docs/Plate#normalizeinitialvalue when working
+
+    editor.children = doc;
+    slate.Editor.normalize(editor, {
+      force: true
+    }); // We set the value so that the rendering can take over from here
+
+    setValue(editor.children);
+  }, [props.value, editor]);
   return /*#__PURE__*/React__default.createElement("div", {
     className: styles$j.root,
     "data-test-id": "rich-text-editor"
   }, /*#__PURE__*/React__default.createElement(plateCore.Plate, {
     id: getContentfulEditorId(props.sdk),
-    initialValue: value,
+    value: value,
     plugins: plugins,
     disableCorePlugins: disableCorePlugins,
     editableProps: {