@dangl/angular-material-shared 2.5.1-beta0012 → 2.6.0-beta0019

package/tinymce-assets/plugins/lists/plugin.js

@@ -1,192 +1,205 @@
 /**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- *
- * Version: 5.10.9 (2023-11-15)
+ * TinyMCE version 7.0.1 (2024-04-10)
  */
+
 (function () {
     'use strict';
 
     var global$7 = tinymce.util.Tools.resolve('tinymce.PluginManager');
 
-    var typeOf = function (x) {
-      var t = typeof x;
+    const hasProto = (v, constructor, predicate) => {
+      var _a;
+      if (predicate(v, constructor.prototype)) {
+        return true;
+      } else {
+        return ((_a = v.constructor) === null || _a === void 0 ? void 0 : _a.name) === constructor.name;
+      }
+    };
+    const typeOf = x => {
+      const t = typeof x;
       if (x === null) {
         return 'null';
-      } else if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
+      } else if (t === 'object' && Array.isArray(x)) {
         return 'array';
-      } else if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
+      } else if (t === 'object' && hasProto(x, String, (o, proto) => proto.isPrototypeOf(o))) {
         return 'string';
       } else {
         return t;
       }
     };
-    var isType$1 = function (type) {
-      return function (value) {
-        return typeOf(value) === type;
-      };
-    };
-    var isSimpleType = function (type) {
-      return function (value) {
-        return typeof value === type;
-      };
-    };
-    var isString = isType$1('string');
-    var isObject = isType$1('object');
-    var isArray = isType$1('array');
-    var isBoolean = isSimpleType('boolean');
-    var isFunction = isSimpleType('function');
-    var isNumber = isSimpleType('number');
+    const isType$1 = type => value => typeOf(value) === type;
+    const isSimpleType = type => value => typeof value === type;
+    const isString = isType$1('string');
+    const isObject = isType$1('object');
+    const isArray = isType$1('array');
+    const isBoolean = isSimpleType('boolean');
+    const isNullable = a => a === null || a === undefined;
+    const isNonNullable = a => !isNullable(a);
+    const isFunction = isSimpleType('function');
+    const isNumber = isSimpleType('number');
 
-    var noop = function () {
+    const noop = () => {
     };
-    var constant = function (value) {
-      return function () {
+    const compose1 = (fbc, fab) => a => fbc(fab(a));
+    const constant = value => {
+      return () => {
         return value;
       };
     };
-    var identity = function (x) {
-      return x;
-    };
-    var tripleEquals = function (a, b) {
+    const tripleEquals = (a, b) => {
       return a === b;
     };
-    var not = function (f) {
-      return function (t) {
-        return !f(t);
+    function curry(fn, ...initialArgs) {
+      return (...restArgs) => {
+        const all = initialArgs.concat(restArgs);
+        return fn.apply(null, all);
       };
-    };
-    var never = constant(false);
-    var always = constant(true);
+    }
+    const not = f => t => !f(t);
+    const never = constant(false);
 
-    var none = function () {
-      return NONE;
-    };
-    var NONE = function () {
-      var call = function (thunk) {
-        return thunk();
-      };
-      var id = identity;
-      var me = {
-        fold: function (n, _s) {
-          return n();
-        },
-        isSome: never,
-        isNone: always,
-        getOr: id,
-        getOrThunk: call,
-        getOrDie: function (msg) {
-          throw new Error(msg || 'error: getOrDie called on none.');
-        },
-        getOrNull: constant(null),
-        getOrUndefined: constant(undefined),
-        or: id,
-        orThunk: call,
-        map: none,
-        each: noop,
-        bind: none,
-        exists: never,
-        forall: always,
-        filter: function () {
-          return none();
-        },
-        toArray: function () {
-          return [];
-        },
-        toString: constant('none()')
-      };
-      return me;
-    }();
-    var some = function (a) {
-      var constant_a = constant(a);
-      var self = function () {
-        return me;
-      };
-      var bind = function (f) {
-        return f(a);
-      };
-      var me = {
-        fold: function (n, s) {
-          return s(a);
-        },
-        isSome: always,
-        isNone: never,
-        getOr: constant_a,
-        getOrThunk: constant_a,
-        getOrDie: constant_a,
-        getOrNull: constant_a,
-        getOrUndefined: constant_a,
-        or: self,
-        orThunk: self,
-        map: function (f) {
-          return some(f(a));
-        },
-        each: function (f) {
-          f(a);
-        },
-        bind: bind,
-        exists: bind,
-        forall: bind,
-        filter: function (f) {
-          return f(a) ? me : NONE;
-        },
-        toArray: function () {
-          return [a];
-        },
-        toString: function () {
-          return 'some(' + a + ')';
+    class Optional {
+      constructor(tag, value) {
+        this.tag = tag;
+        this.value = value;
+      }
+      static some(value) {
+        return new Optional(true, value);
+      }
+      static none() {
+        return Optional.singletonNone;
+      }
+      fold(onNone, onSome) {
+        if (this.tag) {
+          return onSome(this.value);
+        } else {
+          return onNone();
         }
-      };
-      return me;
-    };
-    var from = function (value) {
-      return value === null || value === undefined ? NONE : some(value);
-    };
-    var Optional = {
-      some: some,
-      none: none,
-      from: from
+      }
+      isSome() {
+        return this.tag;
+      }
+      isNone() {
+        return !this.tag;
+      }
+      map(mapper) {
+        if (this.tag) {
+          return Optional.some(mapper(this.value));
+        } else {
+          return Optional.none();
+        }
+      }
+      bind(binder) {
+        if (this.tag) {
+          return binder(this.value);
+        } else {
+          return Optional.none();
+        }
+      }
+      exists(predicate) {
+        return this.tag && predicate(this.value);
+      }
+      forall(predicate) {
+        return !this.tag || predicate(this.value);
+      }
+      filter(predicate) {
+        if (!this.tag || predicate(this.value)) {
+          return this;
+        } else {
+          return Optional.none();
+        }
+      }
+      getOr(replacement) {
+        return this.tag ? this.value : replacement;
+      }
+      or(replacement) {
+        return this.tag ? this : replacement;
+      }
+      getOrThunk(thunk) {
+        return this.tag ? this.value : thunk();
+      }
+      orThunk(thunk) {
+        return this.tag ? this : thunk();
+      }
+      getOrDie(message) {
+        if (!this.tag) {
+          throw new Error(message !== null && message !== void 0 ? message : 'Called getOrDie on None');
+        } else {
+          return this.value;
+        }
+      }
+      static from(value) {
+        return isNonNullable(value) ? Optional.some(value) : Optional.none();
+      }
+      getOrNull() {
+        return this.tag ? this.value : null;
+      }
+      getOrUndefined() {
+        return this.value;
+      }
+      each(worker) {
+        if (this.tag) {
+          worker(this.value);
+        }
+      }
+      toArray() {
+        return this.tag ? [this.value] : [];
+      }
+      toString() {
+        return this.tag ? `some(${ this.value })` : 'none()';
+      }
+    }
+    Optional.singletonNone = new Optional(false);
+
+    const nativeSlice = Array.prototype.slice;
+    const nativeIndexOf = Array.prototype.indexOf;
+    const nativePush = Array.prototype.push;
+    const rawIndexOf = (ts, t) => nativeIndexOf.call(ts, t);
+    const contains$1 = (xs, x) => rawIndexOf(xs, x) > -1;
+    const exists = (xs, pred) => {
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
+        if (pred(x, i)) {
+          return true;
+        }
+      }
+      return false;
     };
-
-    var nativeSlice = Array.prototype.slice;
-    var nativePush = Array.prototype.push;
-    var map = function (xs, f) {
-      var len = xs.length;
-      var r = new Array(len);
-      for (var i = 0; i < len; i++) {
-        var x = xs[i];
+    const map = (xs, f) => {
+      const len = xs.length;
+      const r = new Array(len);
+      for (let i = 0; i < len; i++) {
+        const x = xs[i];
         r[i] = f(x, i);
       }
       return r;
     };
-    var each$1 = function (xs, f) {
-      for (var i = 0, len = xs.length; i < len; i++) {
-        var x = xs[i];
+    const each$1 = (xs, f) => {
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
         f(x, i);
       }
     };
-    var filter$1 = function (xs, pred) {
-      var r = [];
-      for (var i = 0, len = xs.length; i < len; i++) {
-        var x = xs[i];
+    const filter$1 = (xs, pred) => {
+      const r = [];
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
         if (pred(x, i)) {
           r.push(x);
         }
       }
       return r;
     };
-    var groupBy = function (xs, f) {
+    const groupBy = (xs, f) => {
       if (xs.length === 0) {
         return [];
       } else {
-        var wasType = f(xs[0]);
-        var r = [];
-        var group = [];
-        for (var i = 0, len = xs.length; i < len; i++) {
-          var x = xs[i];
-          var type = f(x);
+        let wasType = f(xs[0]);
+        const r = [];
+        let group = [];
+        for (let i = 0, len = xs.length; i < len; i++) {
+          const x = xs[i];
+          const type = f(x);
           if (type !== wasType) {
             r.push(group);
             group = [];
@@ -200,15 +213,15 @@
         return r;
       }
     };
-    var foldl = function (xs, f, acc) {
-      each$1(xs, function (x, i) {
+    const foldl = (xs, f, acc) => {
+      each$1(xs, (x, i) => {
         acc = f(acc, x, i);
       });
       return acc;
     };
-    var findUntil = function (xs, pred, until) {
-      for (var i = 0, len = xs.length; i < len; i++) {
-        var x = xs[i];
+    const findUntil = (xs, pred, until) => {
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
         if (pred(x, i)) {
           return Optional.some(x);
         } else if (until(x, i)) {
@@ -217,12 +230,12 @@
       }
       return Optional.none();
     };
-    var find$1 = function (xs, pred) {
+    const find = (xs, pred) => {
       return findUntil(xs, pred, never);
     };
-    var flatten = function (xs) {
-      var r = [];
-      for (var i = 0, len = xs.length; i < len; ++i) {
+    const flatten = xs => {
+      const r = [];
+      for (let i = 0, len = xs.length; i < len; ++i) {
         if (!isArray(xs[i])) {
           throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs);
         }
@@ -230,477 +243,79 @@
       }
       return r;
     };
-    var bind = function (xs, f) {
-      return flatten(map(xs, f));
-    };
-    var reverse = function (xs) {
-      var r = nativeSlice.call(xs, 0);
+    const bind = (xs, f) => flatten(map(xs, f));
+    const reverse = xs => {
+      const r = nativeSlice.call(xs, 0);
       r.reverse();
       return r;
     };
-    var get$1 = function (xs, i) {
-      return i >= 0 && i < xs.length ? Optional.some(xs[i]) : Optional.none();
-    };
-    var head = function (xs) {
-      return get$1(xs, 0);
-    };
-    var last = function (xs) {
-      return get$1(xs, xs.length - 1);
-    };
-    var findMap = function (arr, f) {
-      for (var i = 0; i < arr.length; i++) {
-        var r = f(arr[i], i);
-        if (r.isSome()) {
-          return r;
-        }
-      }
-      return Optional.none();
-    };
-
-    var __assign = function () {
-      __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-          s = arguments[i];
-          for (var p in s)
-            if (Object.prototype.hasOwnProperty.call(s, p))
-              t[p] = s[p];
-        }
-        return t;
-      };
-      return __assign.apply(this, arguments);
-    };
-    function __spreadArray(to, from, pack) {
-      if (pack || arguments.length === 2)
-        for (var i = 0, l = from.length, ar; i < l; i++) {
-          if (ar || !(i in from)) {
-            if (!ar)
-              ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-          }
-        }
-      return to.concat(ar || Array.prototype.slice.call(from));
-    }
-
-    var cached = function (f) {
-      var called = false;
-      var r;
-      return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-          args[_i] = arguments[_i];
-        }
-        if (!called) {
-          called = true;
-          r = f.apply(null, args);
-        }
-        return r;
-      };
-    };
-
-    var DeviceType = function (os, browser, userAgent, mediaMatch) {
-      var isiPad = os.isiOS() && /ipad/i.test(userAgent) === true;
-      var isiPhone = os.isiOS() && !isiPad;
-      var isMobile = os.isiOS() || os.isAndroid();
-      var isTouch = isMobile || mediaMatch('(pointer:coarse)');
-      var isTablet = isiPad || !isiPhone && isMobile && mediaMatch('(min-device-width:768px)');
-      var isPhone = isiPhone || isMobile && !isTablet;
-      var iOSwebview = browser.isSafari() && os.isiOS() && /safari/i.test(userAgent) === false;
-      var isDesktop = !isPhone && !isTablet && !iOSwebview;
-      return {
-        isiPad: constant(isiPad),
-        isiPhone: constant(isiPhone),
-        isTablet: constant(isTablet),
-        isPhone: constant(isPhone),
-        isTouch: constant(isTouch),
-        isAndroid: os.isAndroid,
-        isiOS: os.isiOS,
-        isWebView: constant(iOSwebview),
-        isDesktop: constant(isDesktop)
-      };
-    };
-
-    var firstMatch = function (regexes, s) {
-      for (var i = 0; i < regexes.length; i++) {
-        var x = regexes[i];
-        if (x.test(s)) {
-          return x;
-        }
-      }
-      return undefined;
-    };
-    var find = function (regexes, agent) {
-      var r = firstMatch(regexes, agent);
-      if (!r) {
-        return {
-          major: 0,
-          minor: 0
-        };
-      }
-      var group = function (i) {
-        return Number(agent.replace(r, '$' + i));
-      };
-      return nu$2(group(1), group(2));
-    };
-    var detect$3 = function (versionRegexes, agent) {
-      var cleanedAgent = String(agent).toLowerCase();
-      if (versionRegexes.length === 0) {
-        return unknown$2();
-      }
-      return find(versionRegexes, cleanedAgent);
-    };
-    var unknown$2 = function () {
-      return nu$2(0, 0);
-    };
-    var nu$2 = function (major, minor) {
-      return {
-        major: major,
-        minor: minor
-      };
-    };
-    var Version = {
-      nu: nu$2,
-      detect: detect$3,
-      unknown: unknown$2
-    };
-
-    var detectBrowser$1 = function (browsers, userAgentData) {
-      return findMap(userAgentData.brands, function (uaBrand) {
-        var lcBrand = uaBrand.brand.toLowerCase();
-        return find$1(browsers, function (browser) {
-          var _a;
-          return lcBrand === ((_a = browser.brand) === null || _a === void 0 ? void 0 : _a.toLowerCase());
-        }).map(function (info) {
-          return {
-            current: info.name,
-            version: Version.nu(parseInt(uaBrand.version, 10), 0)
-          };
-        });
-      });
-    };
-
-    var detect$2 = function (candidates, userAgent) {
-      var agent = String(userAgent).toLowerCase();
-      return find$1(candidates, function (candidate) {
-        return candidate.search(agent);
-      });
-    };
-    var detectBrowser = function (browsers, userAgent) {
-      return detect$2(browsers, userAgent).map(function (browser) {
-        var version = Version.detect(browser.versionRegexes, userAgent);
-        return {
-          current: browser.name,
-          version: version
-        };
-      });
-    };
-    var detectOs = function (oses, userAgent) {
-      return detect$2(oses, userAgent).map(function (os) {
-        var version = Version.detect(os.versionRegexes, userAgent);
-        return {
-          current: os.name,
-          version: version
-        };
-      });
-    };
-
-    var contains$1 = function (str, substr) {
-      return str.indexOf(substr) !== -1;
-    };
-    var blank = function (r) {
-      return function (s) {
-        return s.replace(r, '');
-      };
-    };
-    var trim = blank(/^\s+|\s+$/g);
-    var isNotEmpty = function (s) {
-      return s.length > 0;
-    };
-    var isEmpty$1 = function (s) {
-      return !isNotEmpty(s);
-    };
-
-    var normalVersionRegex = /.*?version\/\ ?([0-9]+)\.([0-9]+).*/;
-    var checkContains = function (target) {
-      return function (uastring) {
-        return contains$1(uastring, target);
-      };
-    };
-    var browsers = [
-      {
-        name: 'Edge',
-        versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],
-        search: function (uastring) {
-          return contains$1(uastring, 'edge/') && contains$1(uastring, 'chrome') && contains$1(uastring, 'safari') && contains$1(uastring, 'applewebkit');
-        }
-      },
-      {
-        name: 'Chrome',
-        brand: 'Chromium',
-        versionRegexes: [
-          /.*?chrome\/([0-9]+)\.([0-9]+).*/,
-          normalVersionRegex
-        ],
-        search: function (uastring) {
-          return contains$1(uastring, 'chrome') && !contains$1(uastring, 'chromeframe');
-        }
-      },
-      {
-        name: 'IE',
-        versionRegexes: [
-          /.*?msie\ ?([0-9]+)\.([0-9]+).*/,
-          /.*?rv:([0-9]+)\.([0-9]+).*/
-        ],
-        search: function (uastring) {
-          return contains$1(uastring, 'msie') || contains$1(uastring, 'trident');
-        }
-      },
-      {
-        name: 'Opera',
-        versionRegexes: [
-          normalVersionRegex,
-          /.*?opera\/([0-9]+)\.([0-9]+).*/
-        ],
-        search: checkContains('opera')
-      },
-      {
-        name: 'Firefox',
-        versionRegexes: [/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],
-        search: checkContains('firefox')
-      },
-      {
-        name: 'Safari',
-        versionRegexes: [
-          normalVersionRegex,
-          /.*?cpu os ([0-9]+)_([0-9]+).*/
-        ],
-        search: function (uastring) {
-          return (contains$1(uastring, 'safari') || contains$1(uastring, 'mobile/')) && contains$1(uastring, 'applewebkit');
+    const get$1 = (xs, i) => i >= 0 && i < xs.length ? Optional.some(xs[i]) : Optional.none();
+    const head = xs => get$1(xs, 0);
+    const last = xs => get$1(xs, xs.length - 1);
+    const unique = (xs, comparator) => {
+      const r = [];
+      const isDuplicated = isFunction(comparator) ? x => exists(r, i => comparator(i, x)) : x => contains$1(r, x);
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
+        if (!isDuplicated(x)) {
+          r.push(x);
         }
       }
-    ];
-    var oses = [
-      {
-        name: 'Windows',
-        search: checkContains('win'),
-        versionRegexes: [/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]
-      },
-      {
-        name: 'iOS',
-        search: function (uastring) {
-          return contains$1(uastring, 'iphone') || contains$1(uastring, 'ipad');
-        },
-        versionRegexes: [
-          /.*?version\/\ ?([0-9]+)\.([0-9]+).*/,
-          /.*cpu os ([0-9]+)_([0-9]+).*/,
-          /.*cpu iphone os ([0-9]+)_([0-9]+).*/
-        ]
-      },
-      {
-        name: 'Android',
-        search: checkContains('android'),
-        versionRegexes: [/.*?android\ ?([0-9]+)\.([0-9]+).*/]
-      },
-      {
-        name: 'OSX',
-        search: checkContains('mac os x'),
-        versionRegexes: [/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]
-      },
-      {
-        name: 'Linux',
-        search: checkContains('linux'),
-        versionRegexes: []
-      },
-      {
-        name: 'Solaris',
-        search: checkContains('sunos'),
-        versionRegexes: []
-      },
-      {
-        name: 'FreeBSD',
-        search: checkContains('freebsd'),
-        versionRegexes: []
-      },
-      {
-        name: 'ChromeOS',
-        search: checkContains('cros'),
-        versionRegexes: [/.*?chrome\/([0-9]+)\.([0-9]+).*/]
-      }
-    ];
-    var PlatformInfo = {
-      browsers: constant(browsers),
-      oses: constant(oses)
-    };
-
-    var edge = 'Edge';
-    var chrome = 'Chrome';
-    var ie = 'IE';
-    var opera = 'Opera';
-    var firefox = 'Firefox';
-    var safari = 'Safari';
-    var unknown$1 = function () {
-      return nu$1({
-        current: undefined,
-        version: Version.unknown()
-      });
-    };
-    var nu$1 = function (info) {
-      var current = info.current;
-      var version = info.version;
-      var isBrowser = function (name) {
-        return function () {
-          return current === name;
-        };
-      };
-      return {
-        current: current,
-        version: version,
-        isEdge: isBrowser(edge),
-        isChrome: isBrowser(chrome),
-        isIE: isBrowser(ie),
-        isOpera: isBrowser(opera),
-        isFirefox: isBrowser(firefox),
-        isSafari: isBrowser(safari)
-      };
-    };
-    var Browser = {
-      unknown: unknown$1,
-      nu: nu$1,
-      edge: constant(edge),
-      chrome: constant(chrome),
-      ie: constant(ie),
-      opera: constant(opera),
-      firefox: constant(firefox),
-      safari: constant(safari)
-    };
-
-    var windows = 'Windows';
-    var ios = 'iOS';
-    var android = 'Android';
-    var linux = 'Linux';
-    var osx = 'OSX';
-    var solaris = 'Solaris';
-    var freebsd = 'FreeBSD';
-    var chromeos = 'ChromeOS';
-    var unknown = function () {
-      return nu({
-        current: undefined,
-        version: Version.unknown()
-      });
-    };
-    var nu = function (info) {
-      var current = info.current;
-      var version = info.version;
-      var isOS = function (name) {
-        return function () {
-          return current === name;
-        };
-      };
-      return {
-        current: current,
-        version: version,
-        isWindows: isOS(windows),
-        isiOS: isOS(ios),
-        isAndroid: isOS(android),
-        isOSX: isOS(osx),
-        isLinux: isOS(linux),
-        isSolaris: isOS(solaris),
-        isFreeBSD: isOS(freebsd),
-        isChromeOS: isOS(chromeos)
-      };
-    };
-    var OperatingSystem = {
-      unknown: unknown,
-      nu: nu,
-      windows: constant(windows),
-      ios: constant(ios),
-      android: constant(android),
-      linux: constant(linux),
-      osx: constant(osx),
-      solaris: constant(solaris),
-      freebsd: constant(freebsd),
-      chromeos: constant(chromeos)
-    };
-
-    var detect$1 = function (userAgent, userAgentDataOpt, mediaMatch) {
-      var browsers = PlatformInfo.browsers();
-      var oses = PlatformInfo.oses();
-      var browser = userAgentDataOpt.bind(function (userAgentData) {
-        return detectBrowser$1(browsers, userAgentData);
-      }).orThunk(function () {
-        return detectBrowser(browsers, userAgent);
-      }).fold(Browser.unknown, Browser.nu);
-      var os = detectOs(oses, userAgent).fold(OperatingSystem.unknown, OperatingSystem.nu);
-      var deviceType = DeviceType(os, browser, userAgent, mediaMatch);
-      return {
-        browser: browser,
-        os: os,
-        deviceType: deviceType
-      };
-    };
-    var PlatformDetection = { detect: detect$1 };
-
-    var mediaMatch = function (query) {
-      return window.matchMedia(query).matches;
-    };
-    var platform = cached(function () {
-      return PlatformDetection.detect(navigator.userAgent, Optional.from(navigator.userAgentData), mediaMatch);
-    });
-    var detect = function () {
-      return platform();
+      return r;
     };
 
-    var compareDocumentPosition = function (a, b, match) {
-      return (a.compareDocumentPosition(b) & match) !== 0;
-    };
-    var documentPositionContainedBy = function (a, b) {
-      return compareDocumentPosition(a, b, Node.DOCUMENT_POSITION_CONTAINED_BY);
-    };
+    const is$2 = (lhs, rhs, comparator = tripleEquals) => lhs.exists(left => comparator(left, rhs));
+    const equals = (lhs, rhs, comparator = tripleEquals) => lift2(lhs, rhs, comparator).getOr(lhs.isNone() && rhs.isNone());
+    const lift2 = (oa, ob, f) => oa.isSome() && ob.isSome() ? Optional.some(f(oa.getOrDie(), ob.getOrDie())) : Optional.none();
 
-    var ELEMENT = 1;
+    const COMMENT = 8;
+    const DOCUMENT = 9;
+    const DOCUMENT_FRAGMENT = 11;
+    const ELEMENT = 1;
+    const TEXT = 3;
 
-    var fromHtml = function (html, scope) {
-      var doc = scope || document;
-      var div = doc.createElement('div');
+    const fromHtml = (html, scope) => {
+      const doc = scope || document;
+      const div = doc.createElement('div');
       div.innerHTML = html;
       if (!div.hasChildNodes() || div.childNodes.length > 1) {
-        console.error('HTML does not have a single root node', html);
-        throw new Error('HTML must have a single root node');
+        const message = 'HTML does not have a single root node';
+        console.error(message, html);
+        throw new Error(message);
       }
-      return fromDom(div.childNodes[0]);
+      return fromDom$1(div.childNodes[0]);
     };
-    var fromTag = function (tag, scope) {
-      var doc = scope || document;
-      var node = doc.createElement(tag);
-      return fromDom(node);
+    const fromTag = (tag, scope) => {
+      const doc = scope || document;
+      const node = doc.createElement(tag);
+      return fromDom$1(node);
     };
-    var fromText = function (text, scope) {
-      var doc = scope || document;
-      var node = doc.createTextNode(text);
-      return fromDom(node);
+    const fromText = (text, scope) => {
+      const doc = scope || document;
+      const node = doc.createTextNode(text);
+      return fromDom$1(node);
     };
-    var fromDom = function (node) {
+    const fromDom$1 = node => {
       if (node === null || node === undefined) {
         throw new Error('Node cannot be null or undefined');
       }
       return { dom: node };
     };
-    var fromPoint = function (docElm, x, y) {
-      return Optional.from(docElm.dom.elementFromPoint(x, y)).map(fromDom);
-    };
-    var SugarElement = {
-      fromHtml: fromHtml,
-      fromTag: fromTag,
-      fromText: fromText,
-      fromDom: fromDom,
-      fromPoint: fromPoint
+    const fromPoint = (docElm, x, y) => Optional.from(docElm.dom.elementFromPoint(x, y)).map(fromDom$1);
+    const SugarElement = {
+      fromHtml,
+      fromTag,
+      fromText,
+      fromDom: fromDom$1,
+      fromPoint
     };
 
-    var is$2 = function (element, selector) {
-      var dom = element.dom;
+    const is$1 = (element, selector) => {
+      const dom = element.dom;
       if (dom.nodeType !== ELEMENT) {
         return false;
       } else {
-        var elem = dom;
+        const elem = dom;
         if (elem.matches !== undefined) {
           return elem.matches(selector);
         } else if (elem.msMatchesSelector !== undefined) {
@@ -715,158 +330,253 @@
       }
     };
 
-    var eq = function (e1, e2) {
-      return e1.dom === e2.dom;
-    };
-    var regularContains = function (e1, e2) {
-      var d1 = e1.dom;
-      var d2 = e2.dom;
+    const eq = (e1, e2) => e1.dom === e2.dom;
+    const contains = (e1, e2) => {
+      const d1 = e1.dom;
+      const d2 = e2.dom;
       return d1 === d2 ? false : d1.contains(d2);
     };
-    var ieContains = function (e1, e2) {
-      return documentPositionContainedBy(e1.dom, e2.dom);
-    };
-    var contains = function (e1, e2) {
-      return detect().browser.isIE() ? ieContains(e1, e2) : regularContains(e1, e2);
-    };
-    var is$1 = is$2;
-
-    var global$6 = tinymce.util.Tools.resolve('tinymce.dom.RangeUtils');
+    const is = is$1;
 
-    var global$5 = tinymce.util.Tools.resolve('tinymce.dom.TreeWalker');
+    const Global = typeof window !== 'undefined' ? window : Function('return this;')();
 
-    var global$4 = tinymce.util.Tools.resolve('tinymce.util.VK');
-
-    var keys = Object.keys;
-    var each = function (obj, f) {
-      var props = keys(obj);
-      for (var k = 0, len = props.length; k < len; k++) {
-        var i = props[k];
-        var x = obj[i];
-        f(x, i);
+    const path = (parts, scope) => {
+      let o = scope !== undefined && scope !== null ? scope : Global;
+      for (let i = 0; i < parts.length && o !== undefined && o !== null; ++i) {
+        o = o[parts[i]];
       }
+      return o;
     };
-    var objAcc = function (r) {
-      return function (x, i) {
-        r[i] = x;
-      };
+    const resolve = (p, scope) => {
+      const parts = p.split('.');
+      return path(parts, scope);
     };
-    var internalFilter = function (obj, pred, onTrue, onFalse) {
-      var r = {};
-      each(obj, function (x, i) {
-        (pred(x, i) ? onTrue : onFalse)(x, i);
-      });
-      return r;
+
+    const unsafe = (name, scope) => {
+      return resolve(name, scope);
     };
-    var filter = function (obj, pred) {
-      var t = {};
-      internalFilter(obj, pred, objAcc(t), noop);
-      return t;
+    const getOrDie = (name, scope) => {
+      const actual = unsafe(name, scope);
+      if (actual === undefined || actual === null) {
+        throw new Error(name + ' not available on this browser');
+      }
+      return actual;
     };
 
-    typeof window !== 'undefined' ? window : Function('return this;')();
+    const getPrototypeOf = Object.getPrototypeOf;
+    const sandHTMLElement = scope => {
+      return getOrDie('HTMLElement', scope);
+    };
+    const isPrototypeOf = x => {
+      const scope = resolve('ownerDocument.defaultView', x);
+      return isObject(x) && (sandHTMLElement(scope).prototype.isPrototypeOf(x) || /^HTML\w*Element$/.test(getPrototypeOf(x).constructor.name));
+    };
 
-    var name = function (element) {
-      var r = element.dom.nodeName;
+    const name = element => {
+      const r = element.dom.nodeName;
       return r.toLowerCase();
     };
-    var type = function (element) {
-      return element.dom.nodeType;
+    const type = element => element.dom.nodeType;
+    const isType = t => element => type(element) === t;
+    const isComment = element => type(element) === COMMENT || name(element) === '#comment';
+    const isHTMLElement = element => isElement$1(element) && isPrototypeOf(element.dom);
+    const isElement$1 = isType(ELEMENT);
+    const isText = isType(TEXT);
+    const isDocument = isType(DOCUMENT);
+    const isDocumentFragment = isType(DOCUMENT_FRAGMENT);
+    const isTag = tag => e => isElement$1(e) && name(e) === tag;
+
+    const owner = element => SugarElement.fromDom(element.dom.ownerDocument);
+    const documentOrOwner = dos => isDocument(dos) ? dos : owner(dos);
+    const parent = element => Optional.from(element.dom.parentNode).map(SugarElement.fromDom);
+    const parentElement = element => Optional.from(element.dom.parentElement).map(SugarElement.fromDom);
+    const nextSibling = element => Optional.from(element.dom.nextSibling).map(SugarElement.fromDom);
+    const children = element => map(element.dom.childNodes, SugarElement.fromDom);
+    const child = (element, index) => {
+      const cs = element.dom.childNodes;
+      return Optional.from(cs[index]).map(SugarElement.fromDom);
     };
-    var isType = function (t) {
-      return function (element) {
-        return type(element) === t;
-      };
+    const firstChild = element => child(element, 0);
+    const lastChild = element => child(element, element.dom.childNodes.length - 1);
+
+    const isShadowRoot = dos => isDocumentFragment(dos) && isNonNullable(dos.dom.host);
+    const supported = isFunction(Element.prototype.attachShadow) && isFunction(Node.prototype.getRootNode);
+    const getRootNode = supported ? e => SugarElement.fromDom(e.dom.getRootNode()) : documentOrOwner;
+    const getShadowRoot = e => {
+      const r = getRootNode(e);
+      return isShadowRoot(r) ? Optional.some(r) : Optional.none();
     };
-    var isElement = isType(ELEMENT);
-    var isTag = function (tag) {
-      return function (e) {
-        return isElement(e) && name(e) === tag;
-      };
+    const getShadowHost = e => SugarElement.fromDom(e.dom.host);
+
+    const inBody = element => {
+      const dom = isText(element) ? element.dom.parentNode : element.dom;
+      if (dom === undefined || dom === null || dom.ownerDocument === null) {
+        return false;
+      }
+      const doc = dom.ownerDocument;
+      return getShadowRoot(SugarElement.fromDom(dom)).fold(() => doc.body.contains(dom), compose1(inBody, getShadowHost));
     };
 
-    var rawSet = function (dom, key, value) {
-      if (isString(value) || isBoolean(value) || isNumber(value)) {
-        dom.setAttribute(key, value + '');
+    var ClosestOrAncestor = (is, ancestor, scope, a, isRoot) => {
+      if (is(scope, a)) {
+        return Optional.some(scope);
+      } else if (isFunction(isRoot) && isRoot(scope)) {
+        return Optional.none();
       } else {
-        console.error('Invalid call to Attribute.set. Key ', key, ':: Value ', value, ':: Element ', dom);
-        throw new Error('Attribute value was not simple');
+        return ancestor(scope, a, isRoot);
       }
     };
-    var setAll = function (element, attrs) {
-      var dom = element.dom;
-      each(attrs, function (v, k) {
-        rawSet(dom, k, v);
-      });
-    };
-    var clone$1 = function (element) {
-      return foldl(element.dom.attributes, function (acc, attr) {
-        acc[attr.name] = attr.value;
-        return acc;
-      }, {});
-    };
 
-    var parent = function (element) {
-      return Optional.from(element.dom.parentNode).map(SugarElement.fromDom);
-    };
-    var children = function (element) {
-      return map(element.dom.childNodes, SugarElement.fromDom);
+    const ancestor$3 = (scope, predicate, isRoot) => {
+      let element = scope.dom;
+      const stop = isFunction(isRoot) ? isRoot : never;
+      while (element.parentNode) {
+        element = element.parentNode;
+        const el = SugarElement.fromDom(element);
+        if (predicate(el)) {
+          return Optional.some(el);
+        } else if (stop(el)) {
+          break;
+        }
+      }
+      return Optional.none();
     };
-    var child = function (element, index) {
-      var cs = element.dom.childNodes;
-      return Optional.from(cs[index]).map(SugarElement.fromDom);
+    const closest$2 = (scope, predicate, isRoot) => {
+      const is = (s, test) => test(s);
+      return ClosestOrAncestor(is, ancestor$3, scope, predicate, isRoot);
     };
-    var firstChild = function (element) {
-      return child(element, 0);
+
+    const ancestor$2 = (scope, selector, isRoot) => ancestor$3(scope, e => is$1(e, selector), isRoot);
+    const closest$1 = (scope, selector, isRoot) => {
+      const is = (element, selector) => is$1(element, selector);
+      return ClosestOrAncestor(is, ancestor$2, scope, selector, isRoot);
     };
-    var lastChild = function (element) {
-      return child(element, element.dom.childNodes.length - 1);
+
+    const closest = target => closest$1(target, '[contenteditable]');
+    const isEditable = (element, assumeEditable = false) => {
+      if (inBody(element)) {
+        return element.dom.isContentEditable;
+      } else {
+        return closest(element).fold(constant(assumeEditable), editable => getRaw(editable) === 'true');
+      }
     };
+    const getRaw = element => element.dom.contentEditable;
 
-    var before$1 = function (marker, element) {
-      var parent$1 = parent(marker);
-      parent$1.each(function (v) {
+    const before$1 = (marker, element) => {
+      const parent$1 = parent(marker);
+      parent$1.each(v => {
         v.dom.insertBefore(element.dom, marker.dom);
       });
     };
-    var append$1 = function (parent, element) {
+    const after = (marker, element) => {
+      const sibling = nextSibling(marker);
+      sibling.fold(() => {
+        const parent$1 = parent(marker);
+        parent$1.each(v => {
+          append$1(v, element);
+        });
+      }, v => {
+        before$1(v, element);
+      });
+    };
+    const prepend = (parent, element) => {
+      const firstChild$1 = firstChild(parent);
+      firstChild$1.fold(() => {
+        append$1(parent, element);
+      }, v => {
+        parent.dom.insertBefore(element.dom, v.dom);
+      });
+    };
+    const append$1 = (parent, element) => {
       parent.dom.appendChild(element.dom);
     };
 
-    var before = function (marker, elements) {
-      each$1(elements, function (x) {
+    const before = (marker, elements) => {
+      each$1(elements, x => {
         before$1(marker, x);
       });
     };
-    var append = function (parent, elements) {
-      each$1(elements, function (x) {
+    const append = (parent, elements) => {
+      each$1(elements, x => {
         append$1(parent, x);
       });
     };
 
-    var remove = function (element) {
-      var dom = element.dom;
+    const empty = element => {
+      element.dom.textContent = '';
+      each$1(children(element), rogue => {
+        remove(rogue);
+      });
+    };
+    const remove = element => {
+      const dom = element.dom;
       if (dom.parentNode !== null) {
         dom.parentNode.removeChild(dom);
       }
     };
 
-    var clone = function (original, isDeep) {
-      return SugarElement.fromDom(original.dom.cloneNode(isDeep));
+    var global$6 = tinymce.util.Tools.resolve('tinymce.dom.RangeUtils');
+
+    var global$5 = tinymce.util.Tools.resolve('tinymce.dom.TreeWalker');
+
+    var global$4 = tinymce.util.Tools.resolve('tinymce.util.VK');
+
+    const fromDom = nodes => map(nodes, SugarElement.fromDom);
+
+    const keys = Object.keys;
+    const each = (obj, f) => {
+      const props = keys(obj);
+      for (let k = 0, len = props.length; k < len; k++) {
+        const i = props[k];
+        const x = obj[i];
+        f(x, i);
+      }
+    };
+    const objAcc = r => (x, i) => {
+      r[i] = x;
+    };
+    const internalFilter = (obj, pred, onTrue, onFalse) => {
+      each(obj, (x, i) => {
+        (pred(x, i) ? onTrue : onFalse)(x, i);
+      });
+    };
+    const filter = (obj, pred) => {
+      const t = {};
+      internalFilter(obj, pred, objAcc(t), noop);
+      return t;
+    };
+
+    const rawSet = (dom, key, value) => {
+      if (isString(value) || isBoolean(value) || isNumber(value)) {
+        dom.setAttribute(key, value + '');
+      } else {
+        console.error('Invalid call to Attribute.set. Key ', key, ':: Value ', value, ':: Element ', dom);
+        throw new Error('Attribute value was not simple');
+      }
     };
-    var deep = function (original) {
-      return clone(original, true);
+    const setAll = (element, attrs) => {
+      const dom = element.dom;
+      each(attrs, (v, k) => {
+        rawSet(dom, k, v);
+      });
     };
-    var shallowAs = function (original, tag) {
-      var nu = SugarElement.fromTag(tag);
-      var attributes = clone$1(original);
+    const clone$1 = element => foldl(element.dom.attributes, (acc, attr) => {
+      acc[attr.name] = attr.value;
+      return acc;
+    }, {});
+
+    const clone = (original, isDeep) => SugarElement.fromDom(original.dom.cloneNode(isDeep));
+    const deep = original => clone(original, true);
+    const shallowAs = (original, tag) => {
+      const nu = SugarElement.fromTag(tag);
+      const attributes = clone$1(original);
       setAll(nu, attributes);
       return nu;
     };
-    var mutate = function (original, tag) {
-      var nu = shallowAs(original, tag);
-      before$1(original, nu);
-      var children$1 = children(original);
+    const mutate = (original, tag) => {
+      const nu = shallowAs(original, tag);
+      after(original, nu);
+      const children$1 = children(original);
       append(nu, children$1);
       remove(original);
       return nu;
@@ -876,131 +586,104 @@
 
     var global$2 = tinymce.util.Tools.resolve('tinymce.util.Tools');
 
-    var matchNodeName = function (name) {
-      return function (node) {
-        return node && node.nodeName.toLowerCase() === name;
-      };
-    };
-    var matchNodeNames = function (regex) {
-      return function (node) {
-        return node && regex.test(node.nodeName);
-      };
-    };
-    var isTextNode = function (node) {
-      return node && node.nodeType === 3;
-    };
-    var isListNode = matchNodeNames(/^(OL|UL|DL)$/);
-    var isOlUlNode = matchNodeNames(/^(OL|UL)$/);
-    var isOlNode = matchNodeName('ol');
-    var isListItemNode = matchNodeNames(/^(LI|DT|DD)$/);
-    var isDlItemNode = matchNodeNames(/^(DT|DD)$/);
-    var isTableCellNode = matchNodeNames(/^(TH|TD)$/);
-    var isBr = matchNodeName('br');
-    var isFirstChild = function (node) {
-      return node.parentNode.firstChild === node;
-    };
-    var isTextBlock = function (editor, node) {
-      return node && !!editor.schema.getTextBlockElements()[node.nodeName];
-    };
-    var isBlock = function (node, blockElements) {
-      return node && node.nodeName in blockElements;
-    };
-    var isBogusBr = function (dom, node) {
+    const matchNodeName = name => node => isNonNullable(node) && node.nodeName.toLowerCase() === name;
+    const matchNodeNames = regex => node => isNonNullable(node) && regex.test(node.nodeName);
+    const isTextNode$1 = node => isNonNullable(node) && node.nodeType === 3;
+    const isElement = node => isNonNullable(node) && node.nodeType === 1;
+    const isListNode = matchNodeNames(/^(OL|UL|DL)$/);
+    const isOlUlNode = matchNodeNames(/^(OL|UL)$/);
+    const isOlNode = matchNodeName('ol');
+    const isListItemNode = matchNodeNames(/^(LI|DT|DD)$/);
+    const isDlItemNode = matchNodeNames(/^(DT|DD)$/);
+    const isTableCellNode = matchNodeNames(/^(TH|TD)$/);
+    const isBr = matchNodeName('br');
+    const isFirstChild = node => {
+      var _a;
+      return ((_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.firstChild) === node;
+    };
+    const isTextBlock = (editor, node) => isNonNullable(node) && node.nodeName in editor.schema.getTextBlockElements();
+    const isBlock = (node, blockElements) => isNonNullable(node) && node.nodeName in blockElements;
+    const isVoid = (editor, node) => isNonNullable(node) && node.nodeName in editor.schema.getVoidElements();
+    const isBogusBr = (dom, node) => {
       if (!isBr(node)) {
         return false;
       }
       return dom.isBlock(node.nextSibling) && !isBr(node.previousSibling);
     };
-    var isEmpty = function (dom, elm, keepBookmarks) {
-      var empty = dom.isEmpty(elm);
+    const isEmpty$2 = (dom, elm, keepBookmarks) => {
+      const empty = dom.isEmpty(elm);
       if (keepBookmarks && dom.select('span[data-mce-type=bookmark]', elm).length > 0) {
         return false;
       }
       return empty;
     };
-    var isChildOfBody = function (dom, elm) {
-      return dom.isChildOf(elm, dom.getRoot());
-    };
+    const isChildOfBody = (dom, elm) => dom.isChildOf(elm, dom.getRoot());
 
-    var shouldIndentOnTab = function (editor) {
-      return editor.getParam('lists_indent_on_tab', true);
-    };
-    var getForcedRootBlock = function (editor) {
-      var block = editor.getParam('forced_root_block', 'p');
-      if (block === false) {
-        return '';
-      } else if (block === true) {
-        return 'p';
-      } else {
-        return block;
-      }
-    };
-    var getForcedRootBlockAttrs = function (editor) {
-      return editor.getParam('forced_root_block_attrs', {});
+    const option = name => editor => editor.options.get(name);
+    const register$3 = editor => {
+      const registerOption = editor.options.register;
+      registerOption('lists_indent_on_tab', {
+        processor: 'boolean',
+        default: true
+      });
     };
-
-    var createTextBlock = function (editor, contentNode) {
-      var dom = editor.dom;
-      var blockElements = editor.schema.getBlockElements();
-      var fragment = dom.createFragment();
-      var blockName = getForcedRootBlock(editor);
-      var node, textBlock, hasContentNode;
-      if (blockName) {
-        textBlock = dom.create(blockName);
-        if (textBlock.tagName === blockName.toUpperCase()) {
-          dom.setAttribs(textBlock, getForcedRootBlockAttrs(editor));
+    const shouldIndentOnTab = option('lists_indent_on_tab');
+    const getForcedRootBlock = option('forced_root_block');
+    const getForcedRootBlockAttrs = option('forced_root_block_attrs');
+
+    const createTextBlock = (editor, contentNode) => {
+      const dom = editor.dom;
+      const blockElements = editor.schema.getBlockElements();
+      const fragment = dom.createFragment();
+      const blockName = getForcedRootBlock(editor);
+      const blockAttrs = getForcedRootBlockAttrs(editor);
+      let node;
+      let textBlock;
+      let hasContentNode = false;
+      textBlock = dom.create(blockName, blockAttrs);
+      if (!isBlock(contentNode.firstChild, blockElements)) {
+        fragment.appendChild(textBlock);
+      }
+      while (node = contentNode.firstChild) {
+        const nodeName = node.nodeName;
+        if (!hasContentNode && (nodeName !== 'SPAN' || node.getAttribute('data-mce-type') !== 'bookmark')) {
+          hasContentNode = true;
         }
-        if (!isBlock(contentNode.firstChild, blockElements)) {
-          fragment.appendChild(textBlock);
-        }
-      }
-      if (contentNode) {
-        while (node = contentNode.firstChild) {
-          var nodeName = node.nodeName;
-          if (!hasContentNode && (nodeName !== 'SPAN' || node.getAttribute('data-mce-type') !== 'bookmark')) {
-            hasContentNode = true;
-          }
-          if (isBlock(node, blockElements)) {
-            fragment.appendChild(node);
-            textBlock = null;
-          } else {
-            if (blockName) {
-              if (!textBlock) {
-                textBlock = dom.create(blockName);
-                fragment.appendChild(textBlock);
-              }
-              textBlock.appendChild(node);
-            } else {
-              fragment.appendChild(node);
-            }
+        if (isBlock(node, blockElements)) {
+          fragment.appendChild(node);
+          textBlock = null;
+        } else {
+          if (!textBlock) {
+            textBlock = dom.create(blockName, blockAttrs);
+            fragment.appendChild(textBlock);
           }
+          textBlock.appendChild(node);
         }
       }
-      if (!blockName) {
-        fragment.appendChild(dom.create('br'));
-      } else {
-        if (!hasContentNode) {
-          textBlock.appendChild(dom.create('br', { 'data-mce-bogus': '1' }));
-        }
+      if (!hasContentNode && textBlock) {
+        textBlock.appendChild(dom.create('br', { 'data-mce-bogus': '1' }));
       }
       return fragment;
     };
 
-    var DOM$2 = global$3.DOM;
-    var splitList = function (editor, list, li) {
-      var removeAndKeepBookmarks = function (targetNode) {
-        global$2.each(bookmarks, function (node) {
-          targetNode.parentNode.insertBefore(node, li.parentNode);
-        });
+    const DOM$2 = global$3.DOM;
+    const splitList = (editor, list, li) => {
+      const removeAndKeepBookmarks = targetNode => {
+        const parent = targetNode.parentNode;
+        if (parent) {
+          global$2.each(bookmarks, node => {
+            parent.insertBefore(node, li.parentNode);
+          });
+        }
         DOM$2.remove(targetNode);
       };
-      var bookmarks = DOM$2.select('span[data-mce-type="bookmark"]', list);
-      var newBlock = createTextBlock(editor, li);
-      var tmpRng = DOM$2.createRng();
+      const bookmarks = DOM$2.select('span[data-mce-type="bookmark"]', list);
+      const newBlock = createTextBlock(editor, li);
+      const tmpRng = DOM$2.createRng();
       tmpRng.setStartAfter(li);
       tmpRng.setEndAfter(list);
-      var fragment = tmpRng.extractContents();
-      for (var node = fragment.firstChild; node; node = node.firstChild) {
+      const fragment = tmpRng.extractContents();
+      for (let node = fragment.firstChild; node; node = node.firstChild) {
         if (node.nodeName === 'LI' && editor.dom.isEmpty(node)) {
           DOM$2.remove(node);
           break;
@@ -1010,173 +693,189 @@
         DOM$2.insertAfter(fragment, list);
       }
       DOM$2.insertAfter(newBlock, list);
-      if (isEmpty(editor.dom, li.parentNode)) {
-        removeAndKeepBookmarks(li.parentNode);
+      const parent = li.parentElement;
+      if (parent && isEmpty$2(editor.dom, parent)) {
+        removeAndKeepBookmarks(parent);
       }
       DOM$2.remove(li);
-      if (isEmpty(editor.dom, list)) {
+      if (isEmpty$2(editor.dom, list)) {
         DOM$2.remove(list);
       }
     };
 
-    var isDescriptionDetail = isTag('dd');
-    var isDescriptionTerm = isTag('dt');
-    var outdentDlItem = function (editor, item) {
+    const isDescriptionDetail = isTag('dd');
+    const isDescriptionTerm = isTag('dt');
+    const outdentDlItem = (editor, item) => {
       if (isDescriptionDetail(item)) {
         mutate(item, 'dt');
       } else if (isDescriptionTerm(item)) {
-        parent(item).each(function (dl) {
-          return splitList(editor, dl.dom, item.dom);
-        });
+        parentElement(item).each(dl => splitList(editor, dl.dom, item.dom));
       }
     };
-    var indentDlItem = function (item) {
+    const indentDlItem = item => {
       if (isDescriptionTerm(item)) {
         mutate(item, 'dd');
       }
     };
-    var dlIndentation = function (editor, indentation, dlItems) {
+    const dlIndentation = (editor, indentation, dlItems) => {
       if (indentation === 'Indent') {
         each$1(dlItems, indentDlItem);
       } else {
-        each$1(dlItems, function (item) {
-          return outdentDlItem(editor, item);
-        });
+        each$1(dlItems, item => outdentDlItem(editor, item));
       }
     };
 
-    var getNormalizedPoint = function (container, offset) {
-      if (isTextNode(container)) {
+    const getNormalizedPoint = (container, offset) => {
+      if (isTextNode$1(container)) {
         return {
-          container: container,
-          offset: offset
+          container,
+          offset
         };
       }
-      var node = global$6.getNode(container, offset);
-      if (isTextNode(node)) {
+      const node = global$6.getNode(container, offset);
+      if (isTextNode$1(node)) {
         return {
           container: node,
           offset: offset >= container.childNodes.length ? node.data.length : 0
         };
-      } else if (node.previousSibling && isTextNode(node.previousSibling)) {
+      } else if (node.previousSibling && isTextNode$1(node.previousSibling)) {
         return {
           container: node.previousSibling,
           offset: node.previousSibling.data.length
         };
-      } else if (node.nextSibling && isTextNode(node.nextSibling)) {
+      } else if (node.nextSibling && isTextNode$1(node.nextSibling)) {
         return {
           container: node.nextSibling,
           offset: 0
         };
       }
       return {
-        container: container,
-        offset: offset
+        container,
+        offset
       };
     };
-    var normalizeRange = function (rng) {
-      var outRng = rng.cloneRange();
-      var rangeStart = getNormalizedPoint(rng.startContainer, rng.startOffset);
+    const normalizeRange = rng => {
+      const outRng = rng.cloneRange();
+      const rangeStart = getNormalizedPoint(rng.startContainer, rng.startOffset);
       outRng.setStart(rangeStart.container, rangeStart.offset);
-      var rangeEnd = getNormalizedPoint(rng.endContainer, rng.endOffset);
+      const rangeEnd = getNormalizedPoint(rng.endContainer, rng.endOffset);
       outRng.setEnd(rangeEnd.container, rangeEnd.offset);
       return outRng;
     };
 
-    var global$1 = tinymce.util.Tools.resolve('tinymce.dom.DomQuery');
-
-    var getParentList = function (editor, node) {
-      var selectionStart = node || editor.selection.getStart(true);
-      return editor.dom.getParent(selectionStart, 'OL,UL,DL', getClosestListRootElm(editor, selectionStart));
-    };
-    var isParentListSelected = function (parentList, selectedBlocks) {
-      return parentList && selectedBlocks.length === 1 && selectedBlocks[0] === parentList;
-    };
-    var findSubLists = function (parentList) {
-      return filter$1(parentList.querySelectorAll('ol,ul,dl'), isListNode);
-    };
-    var getSelectedSubLists = function (editor) {
-      var parentList = getParentList(editor);
-      var selectedBlocks = editor.selection.getSelectedBlocks();
+    const listNames = [
+      'OL',
+      'UL',
+      'DL'
+    ];
+    const listSelector = listNames.join(',');
+    const getParentList = (editor, node) => {
+      const selectionStart = node || editor.selection.getStart(true);
+      return editor.dom.getParent(selectionStart, listSelector, getClosestListHost(editor, selectionStart));
+    };
+    const isParentListSelected = (parentList, selectedBlocks) => isNonNullable(parentList) && selectedBlocks.length === 1 && selectedBlocks[0] === parentList;
+    const findSubLists = parentList => filter$1(parentList.querySelectorAll(listSelector), isListNode);
+    const getSelectedSubLists = editor => {
+      const parentList = getParentList(editor);
+      const selectedBlocks = editor.selection.getSelectedBlocks();
       if (isParentListSelected(parentList, selectedBlocks)) {
         return findSubLists(parentList);
       } else {
-        return filter$1(selectedBlocks, function (elm) {
+        return filter$1(selectedBlocks, elm => {
           return isListNode(elm) && parentList !== elm;
         });
       }
     };
-    var findParentListItemsNodes = function (editor, elms) {
-      var listItemsElms = global$2.map(elms, function (elm) {
-        var parentLi = editor.dom.getParent(elm, 'li,dd,dt', getClosestListRootElm(editor, elm));
+    const findParentListItemsNodes = (editor, elms) => {
+      const listItemsElms = global$2.map(elms, elm => {
+        const parentLi = editor.dom.getParent(elm, 'li,dd,dt', getClosestListHost(editor, elm));
         return parentLi ? parentLi : elm;
       });
-      return global$1.unique(listItemsElms);
+      return unique(listItemsElms);
     };
-    var getSelectedListItems = function (editor) {
-      var selectedBlocks = editor.selection.getSelectedBlocks();
+    const getSelectedListItems = editor => {
+      const selectedBlocks = editor.selection.getSelectedBlocks();
       return filter$1(findParentListItemsNodes(editor, selectedBlocks), isListItemNode);
     };
-    var getSelectedDlItems = function (editor) {
-      return filter$1(getSelectedListItems(editor), isDlItemNode);
-    };
-    var getClosestListRootElm = function (editor, elm) {
-      var parentTableCell = editor.dom.getParents(elm, 'TD,TH');
+    const getSelectedDlItems = editor => filter$1(getSelectedListItems(editor), isDlItemNode);
+    const getClosestEditingHost = (editor, elm) => {
+      const parentTableCell = editor.dom.getParents(elm, 'TD,TH');
       return parentTableCell.length > 0 ? parentTableCell[0] : editor.getBody();
     };
-    var findLastParentListNode = function (editor, elm) {
-      var parentLists = editor.dom.getParents(elm, 'ol,ul', getClosestListRootElm(editor, elm));
+    const isListHost = (schema, node) => !isListNode(node) && !isListItemNode(node) && exists(listNames, listName => schema.isValidChild(node.nodeName, listName));
+    const getClosestListHost = (editor, elm) => {
+      const parentBlocks = editor.dom.getParents(elm, editor.dom.isBlock);
+      const isNotForcedRootBlock = elm => elm.nodeName.toLowerCase() !== getForcedRootBlock(editor);
+      const parentBlock = find(parentBlocks, elm => isNotForcedRootBlock(elm) && isListHost(editor.schema, elm));
+      return parentBlock.getOr(editor.getBody());
+    };
+    const isListInsideAnLiWithFirstAndLastNotListElement = list => parent(list).exists(parent => isListItemNode(parent.dom) && firstChild(parent).exists(firstChild => !isListNode(firstChild.dom)) && lastChild(parent).exists(lastChild => !isListNode(lastChild.dom)));
+    const findLastParentListNode = (editor, elm) => {
+      const parentLists = editor.dom.getParents(elm, 'ol,ul', getClosestListHost(editor, elm));
       return last(parentLists);
     };
-    var getSelectedLists = function (editor) {
-      var firstList = findLastParentListNode(editor, editor.selection.getStart());
-      var subsequentLists = filter$1(editor.selection.getSelectedBlocks(), isOlUlNode);
+    const getSelectedLists = editor => {
+      const firstList = findLastParentListNode(editor, editor.selection.getStart());
+      const subsequentLists = filter$1(editor.selection.getSelectedBlocks(), isOlUlNode);
       return firstList.toArray().concat(subsequentLists);
     };
-    var getSelectedListRoots = function (editor) {
-      var selectedLists = getSelectedLists(editor);
-      return getUniqueListRoots(editor, selectedLists);
+    const getParentLists = editor => {
+      const elm = editor.selection.getStart();
+      return editor.dom.getParents(elm, 'ol,ul', getClosestListHost(editor, elm));
     };
-    var getUniqueListRoots = function (editor, lists) {
-      var listRoots = map(lists, function (list) {
-        return findLastParentListNode(editor, list).getOr(list);
-      });
-      return global$1.unique(listRoots);
+    const getSelectedListRoots = editor => {
+      const selectedLists = getSelectedLists(editor);
+      const parentLists = getParentLists(editor);
+      return find(parentLists, p => isListInsideAnLiWithFirstAndLastNotListElement(SugarElement.fromDom(p))).fold(() => getUniqueListRoots(editor, selectedLists), l => [l]);
+    };
+    const getUniqueListRoots = (editor, lists) => {
+      const listRoots = map(lists, list => findLastParentListNode(editor, list).getOr(list));
+      return unique(listRoots);
     };
 
-    var is = function (lhs, rhs, comparator) {
-      if (comparator === void 0) {
-        comparator = tripleEquals;
-      }
-      return lhs.exists(function (left) {
-        return comparator(left, rhs);
-      });
+    const isCustomList = list => /\btox\-/.test(list.className);
+    const inList = (parents, listName) => findUntil(parents, isListNode, isTableCellNode).exists(list => list.nodeName === listName && !isCustomList(list));
+    const isWithinNonEditable = (editor, element) => element !== null && !editor.dom.isEditable(element);
+    const selectionIsWithinNonEditableList = editor => {
+      const parentList = getParentList(editor);
+      return isWithinNonEditable(editor, parentList);
     };
-    var lift2 = function (oa, ob, f) {
-      return oa.isSome() && ob.isSome() ? Optional.some(f(oa.getOrDie(), ob.getOrDie())) : Optional.none();
+    const isWithinNonEditableList = (editor, element) => {
+      const parentList = editor.dom.getParent(element, 'ol,ul,dl');
+      return isWithinNonEditable(editor, parentList);
+    };
+    const setNodeChangeHandler = (editor, nodeChangeHandler) => {
+      const initialNode = editor.selection.getNode();
+      nodeChangeHandler({
+        parents: editor.dom.getParents(initialNode),
+        element: initialNode
+      });
+      editor.on('NodeChange', nodeChangeHandler);
+      return () => editor.off('NodeChange', nodeChangeHandler);
     };
 
-    var fromElements = function (elements, scope) {
-      var doc = scope || document;
-      var fragment = doc.createDocumentFragment();
-      each$1(elements, function (element) {
+    const fromElements = (elements, scope) => {
+      const doc = scope || document;
+      const fragment = doc.createDocumentFragment();
+      each$1(elements, element => {
         fragment.appendChild(element.dom);
       });
       return SugarElement.fromDom(fragment);
     };
 
-    var fireListEvent = function (editor, action, element) {
-      return editor.fire('ListMutation', {
-        action: action,
-        element: element
-      });
-    };
+    const fireListEvent = (editor, action, element) => editor.dispatch('ListMutation', {
+      action,
+      element
+    });
 
-    var isSupported = function (dom) {
-      return dom.style !== undefined && isFunction(dom.style.getPropertyValue);
-    };
+    const blank = r => s => s.replace(r, '');
+    const trim = blank(/^\s+|\s+$/g);
+    const isNotEmpty = s => s.length > 0;
+    const isEmpty$1 = s => !isNotEmpty(s);
 
-    var internalSet = function (dom, property, value) {
+    const isSupported = dom => dom.style !== undefined && isFunction(dom.style.getPropertyValue);
+
+    const internalSet = (dom, property, value) => {
       if (!isString(value)) {
         console.error('Invalid call to CSS.set. Property ', property, ':: Value ', value, ':: Element ', dom);
         throw new Error('CSS value must be a string: ' + value);
@@ -1185,124 +884,137 @@
         dom.style.setProperty(property, value);
       }
     };
-    var set = function (element, property, value) {
-      var dom = element.dom;
+    const set = (element, property, value) => {
+      const dom = element.dom;
       internalSet(dom, property, value);
     };
 
-    var joinSegment = function (parent, child) {
+    const isList = el => is(el, 'OL,UL');
+    const isListItem = el => is(el, 'LI');
+    const hasFirstChildList = el => firstChild(el).exists(isList);
+    const hasLastChildList = el => lastChild(el).exists(isList);
+
+    const isEntryList = entry => 'listAttributes' in entry;
+    const isEntryComment = entry => 'isComment' in entry;
+    const isEntryFragment = entry => 'isFragment' in entry;
+    const isIndented = entry => entry.depth > 0;
+    const isSelected = entry => entry.isSelected;
+    const cloneItemContent = li => {
+      const children$1 = children(li);
+      const content = hasLastChildList(li) ? children$1.slice(0, -1) : children$1;
+      return map(content, deep);
+    };
+    const createEntry = (li, depth, isSelected) => parent(li).filter(isElement$1).map(list => ({
+      depth,
+      dirty: false,
+      isSelected,
+      content: cloneItemContent(li),
+      itemAttributes: clone$1(li),
+      listAttributes: clone$1(list),
+      listType: name(list),
+      isInPreviousLi: false
+    }));
+
+    const joinSegment = (parent, child) => {
       append$1(parent.item, child.list);
     };
-    var joinSegments = function (segments) {
-      for (var i = 1; i < segments.length; i++) {
+    const joinSegments = segments => {
+      for (let i = 1; i < segments.length; i++) {
         joinSegment(segments[i - 1], segments[i]);
       }
     };
-    var appendSegments = function (head$1, tail) {
+    const appendSegments = (head$1, tail) => {
       lift2(last(head$1), head(tail), joinSegment);
     };
-    var createSegment = function (scope, listType) {
-      var segment = {
+    const createSegment = (scope, listType) => {
+      const segment = {
         list: SugarElement.fromTag(listType, scope),
         item: SugarElement.fromTag('li', scope)
       };
       append$1(segment.list, segment.item);
       return segment;
     };
-    var createSegments = function (scope, entry, size) {
-      var segments = [];
-      for (var i = 0; i < size; i++) {
-        segments.push(createSegment(scope, entry.listType));
+    const createSegments = (scope, entry, size) => {
+      const segments = [];
+      for (let i = 0; i < size; i++) {
+        segments.push(createSegment(scope, isEntryList(entry) ? entry.listType : entry.parentListType));
       }
       return segments;
     };
-    var populateSegments = function (segments, entry) {
-      for (var i = 0; i < segments.length - 1; i++) {
+    const populateSegments = (segments, entry) => {
+      for (let i = 0; i < segments.length - 1; i++) {
         set(segments[i].item, 'list-style-type', 'none');
       }
-      last(segments).each(function (segment) {
-        setAll(segment.list, entry.listAttributes);
-        setAll(segment.item, entry.itemAttributes);
+      last(segments).each(segment => {
+        if (isEntryList(entry)) {
+          setAll(segment.list, entry.listAttributes);
+          setAll(segment.item, entry.itemAttributes);
+        }
         append(segment.item, entry.content);
       });
     };
-    var normalizeSegment = function (segment, entry) {
+    const normalizeSegment = (segment, entry) => {
       if (name(segment.list) !== entry.listType) {
         segment.list = mutate(segment.list, entry.listType);
       }
       setAll(segment.list, entry.listAttributes);
     };
-    var createItem = function (scope, attr, content) {
-      var item = SugarElement.fromTag('li', scope);
+    const createItem = (scope, attr, content) => {
+      const item = SugarElement.fromTag('li', scope);
       setAll(item, attr);
       append(item, content);
       return item;
     };
-    var appendItem = function (segment, item) {
+    const appendItem = (segment, item) => {
       append$1(segment.list, item);
       segment.item = item;
     };
-    var writeShallow = function (scope, cast, entry) {
-      var newCast = cast.slice(0, entry.depth);
-      last(newCast).each(function (segment) {
-        var item = createItem(scope, entry.itemAttributes, entry.content);
-        appendItem(segment, item);
-        normalizeSegment(segment, entry);
+    const writeShallow = (scope, cast, entry) => {
+      const newCast = cast.slice(0, entry.depth);
+      last(newCast).each(segment => {
+        if (isEntryList(entry)) {
+          const item = createItem(scope, entry.itemAttributes, entry.content);
+          appendItem(segment, item);
+          normalizeSegment(segment, entry);
+        } else if (isEntryFragment(entry)) {
+          append(segment.item, entry.content);
+        } else {
+          const item = SugarElement.fromHtml(`<!--${ entry.content }-->`);
+          append$1(segment.list, item);
+        }
       });
       return newCast;
     };
-    var writeDeep = function (scope, cast, entry) {
-      var segments = createSegments(scope, entry, entry.depth - cast.length);
+    const writeDeep = (scope, cast, entry) => {
+      const segments = createSegments(scope, entry, entry.depth - cast.length);
       joinSegments(segments);
       populateSegments(segments, entry);
       appendSegments(cast, segments);
       return cast.concat(segments);
     };
-    var composeList = function (scope, entries) {
-      var cast = foldl(entries, function (cast, entry) {
-        return entry.depth > cast.length ? writeDeep(scope, cast, entry) : writeShallow(scope, cast, entry);
+    const composeList = (scope, entries) => {
+      let firstCommentEntryOpt = Optional.none();
+      const cast = foldl(entries, (cast, entry, i) => {
+        if (!isEntryComment(entry)) {
+          return entry.depth > cast.length ? writeDeep(scope, cast, entry) : writeShallow(scope, cast, entry);
+        } else {
+          if (i === 0) {
+            firstCommentEntryOpt = Optional.some(entry);
+            return cast;
+          }
+          return writeShallow(scope, cast, entry);
+        }
       }, []);
-      return head(cast).map(function (segment) {
-        return segment.list;
-      });
-    };
-
-    var isList = function (el) {
-      return is$1(el, 'OL,UL');
-    };
-    var hasFirstChildList = function (el) {
-      return firstChild(el).exists(isList);
-    };
-    var hasLastChildList = function (el) {
-      return lastChild(el).exists(isList);
-    };
-
-    var isIndented = function (entry) {
-      return entry.depth > 0;
-    };
-    var isSelected = function (entry) {
-      return entry.isSelected;
-    };
-    var cloneItemContent = function (li) {
-      var children$1 = children(li);
-      var content = hasLastChildList(li) ? children$1.slice(0, -1) : children$1;
-      return map(content, deep);
-    };
-    var createEntry = function (li, depth, isSelected) {
-      return parent(li).filter(isElement).map(function (list) {
-        return {
-          depth: depth,
-          dirty: false,
-          isSelected: isSelected,
-          content: cloneItemContent(li),
-          itemAttributes: clone$1(li),
-          listAttributes: clone$1(list),
-          listType: name(list)
-        };
+      firstCommentEntryOpt.each(firstCommentEntry => {
+        const item = SugarElement.fromHtml(`<!--${ firstCommentEntry.content }-->`);
+        head(cast).each(fistCast => {
+          prepend(fistCast.list, item);
+        });
       });
+      return head(cast).map(segment => segment.list);
     };
 
-    var indentEntry = function (indentation, entry) {
+    const indentEntry = (indentation, entry) => {
       switch (indentation) {
       case 'Indent':
         entry.depth++;
@@ -1316,130 +1028,138 @@
       entry.dirty = true;
     };
 
-    var cloneListProperties = function (target, source) {
-      target.listType = source.listType;
-      target.listAttributes = __assign({}, source.listAttributes);
+    const cloneListProperties = (target, source) => {
+      if (isEntryList(target) && isEntryList(source)) {
+        target.listType = source.listType;
+        target.listAttributes = { ...source.listAttributes };
+      }
     };
-    var cleanListProperties = function (entry) {
-      entry.listAttributes = filter(entry.listAttributes, function (_value, key) {
-        return key !== 'start';
-      });
+    const cleanListProperties = entry => {
+      entry.listAttributes = filter(entry.listAttributes, (_value, key) => key !== 'start');
     };
-    var closestSiblingEntry = function (entries, start) {
-      var depth = entries[start].depth;
-      var matches = function (entry) {
-        return entry.depth === depth && !entry.dirty;
-      };
-      var until = function (entry) {
-        return entry.depth < depth;
-      };
-      return findUntil(reverse(entries.slice(0, start)), matches, until).orThunk(function () {
-        return findUntil(entries.slice(start + 1), matches, until);
-      });
+    const closestSiblingEntry = (entries, start) => {
+      const depth = entries[start].depth;
+      const matches = entry => entry.depth === depth && !entry.dirty;
+      const until = entry => entry.depth < depth;
+      return findUntil(reverse(entries.slice(0, start)), matches, until).orThunk(() => findUntil(entries.slice(start + 1), matches, until));
     };
-    var normalizeEntries = function (entries) {
-      each$1(entries, function (entry, i) {
-        closestSiblingEntry(entries, i).fold(function () {
-          if (entry.dirty) {
+    const normalizeEntries = entries => {
+      each$1(entries, (entry, i) => {
+        closestSiblingEntry(entries, i).fold(() => {
+          if (entry.dirty && isEntryList(entry)) {
             cleanListProperties(entry);
           }
-        }, function (matchingEntry) {
-          return cloneListProperties(entry, matchingEntry);
-        });
+        }, matchingEntry => cloneListProperties(entry, matchingEntry));
       });
       return entries;
     };
 
-    var Cell = function (initial) {
-      var value = initial;
-      var get = function () {
+    const Cell = initial => {
+      let value = initial;
+      const get = () => {
         return value;
       };
-      var set = function (v) {
+      const set = v => {
         value = v;
       };
       return {
-        get: get,
-        set: set
+        get,
+        set
       };
     };
 
-    var parseItem = function (depth, itemSelection, selectionState, item) {
-      return firstChild(item).filter(isList).fold(function () {
-        itemSelection.each(function (selection) {
-          if (eq(selection.start, item)) {
-            selectionState.set(true);
-          }
-        });
-        var currentItemEntry = createEntry(item, depth, selectionState.get());
-        itemSelection.each(function (selection) {
-          if (eq(selection.end, item)) {
-            selectionState.set(false);
-          }
-        });
-        var childListEntries = lastChild(item).filter(isList).map(function (list) {
-          return parseList(depth, itemSelection, selectionState, list);
-        }).getOr([]);
-        return currentItemEntry.toArray().concat(childListEntries);
-      }, function (list) {
-        return parseList(depth, itemSelection, selectionState, list);
-      });
-    };
-    var parseList = function (depth, itemSelection, selectionState, list) {
-      return bind(children(list), function (element) {
-        var parser = isList(element) ? parseList : parseItem;
-        var newDepth = depth + 1;
-        return parser(newDepth, itemSelection, selectionState, element);
+    const parseSingleItem = (depth, itemSelection, selectionState, item) => {
+      var _a;
+      if (isComment(item)) {
+        return [{
+            depth: depth + 1,
+            content: (_a = item.dom.nodeValue) !== null && _a !== void 0 ? _a : '',
+            dirty: false,
+            isSelected: false,
+            isComment: true
+          }];
+      }
+      itemSelection.each(selection => {
+        if (eq(selection.start, item)) {
+          selectionState.set(true);
+        }
       });
-    };
-    var parseLists = function (lists, itemSelection) {
-      var selectionState = Cell(false);
-      var initialDepth = 0;
-      return map(lists, function (list) {
-        return {
-          sourceList: list,
-          entries: parseList(initialDepth, itemSelection, selectionState, list)
-        };
+      const currentItemEntry = createEntry(item, depth, selectionState.get());
+      itemSelection.each(selection => {
+        if (eq(selection.end, item)) {
+          selectionState.set(false);
+        }
       });
+      const childListEntries = lastChild(item).filter(isList).map(list => parseList(depth, itemSelection, selectionState, list)).getOr([]);
+      return currentItemEntry.toArray().concat(childListEntries);
     };
-
-    var outdentedComposer = function (editor, entries) {
-      var normalizedEntries = normalizeEntries(entries);
-      return map(normalizedEntries, function (entry) {
-        var content = fromElements(entry.content);
+    const parseItem = (depth, itemSelection, selectionState, item) => firstChild(item).filter(isList).fold(() => parseSingleItem(depth, itemSelection, selectionState, item), list => {
+      const parsedSiblings = foldl(children(item), (acc, liChild, i) => {
+        if (i === 0) {
+          return acc;
+        } else {
+          if (isListItem(liChild)) {
+            return acc.concat(parseSingleItem(depth, itemSelection, selectionState, liChild));
+          } else {
+            const fragment = {
+              isFragment: true,
+              depth,
+              content: [liChild],
+              isSelected: false,
+              dirty: false,
+              parentListType: name(list)
+            };
+            return acc.concat(fragment);
+          }
+        }
+      }, []);
+      return parseList(depth, itemSelection, selectionState, list).concat(parsedSiblings);
+    });
+    const parseList = (depth, itemSelection, selectionState, list) => bind(children(list), element => {
+      const parser = isList(element) ? parseList : parseItem;
+      const newDepth = depth + 1;
+      return parser(newDepth, itemSelection, selectionState, element);
+    });
+    const parseLists = (lists, itemSelection) => {
+      const selectionState = Cell(false);
+      const initialDepth = 0;
+      return map(lists, list => ({
+        sourceList: list,
+        entries: parseList(initialDepth, itemSelection, selectionState, list)
+      }));
+    };
+
+    const outdentedComposer = (editor, entries) => {
+      const normalizedEntries = normalizeEntries(entries);
+      return map(normalizedEntries, entry => {
+        const content = !isEntryComment(entry) ? fromElements(entry.content) : fromElements([SugarElement.fromHtml(`<!--${ entry.content }-->`)]);
         return SugarElement.fromDom(createTextBlock(editor, content.dom));
       });
     };
-    var indentedComposer = function (editor, entries) {
-      var normalizedEntries = normalizeEntries(entries);
+    const indentedComposer = (editor, entries) => {
+      const normalizedEntries = normalizeEntries(entries);
       return composeList(editor.contentDocument, normalizedEntries).toArray();
     };
-    var composeEntries = function (editor, entries) {
-      return bind(groupBy(entries, isIndented), function (entries) {
-        var groupIsIndented = head(entries).exists(isIndented);
-        return groupIsIndented ? indentedComposer(editor, entries) : outdentedComposer(editor, entries);
-      });
-    };
-    var indentSelectedEntries = function (entries, indentation) {
-      each$1(filter$1(entries, isSelected), function (entry) {
-        return indentEntry(indentation, entry);
-      });
-    };
-    var getItemSelection = function (editor) {
-      var selectedListItems = map(getSelectedListItems(editor), SugarElement.fromDom);
-      return lift2(find$1(selectedListItems, not(hasFirstChildList)), find$1(reverse(selectedListItems), not(hasFirstChildList)), function (start, end) {
-        return {
-          start: start,
-          end: end
-        };
-      });
-    };
-    var listIndentation = function (editor, lists, indentation) {
-      var entrySets = parseLists(lists, getItemSelection(editor));
-      each$1(entrySets, function (entrySet) {
+    const composeEntries = (editor, entries) => bind(groupBy(entries, isIndented), entries => {
+      const groupIsIndented = head(entries).exists(isIndented);
+      return groupIsIndented ? indentedComposer(editor, entries) : outdentedComposer(editor, entries);
+    });
+    const indentSelectedEntries = (entries, indentation) => {
+      each$1(filter$1(entries, isSelected), entry => indentEntry(indentation, entry));
+    };
+    const getItemSelection = editor => {
+      const selectedListItems = map(getSelectedListItems(editor), SugarElement.fromDom);
+      return lift2(find(selectedListItems, not(hasFirstChildList)), find(reverse(selectedListItems), not(hasFirstChildList)), (start, end) => ({
+        start,
+        end
+      }));
+    };
+    const listIndentation = (editor, lists, indentation) => {
+      const entrySets = parseLists(lists, getItemSelection(editor));
+      each$1(entrySets, entrySet => {
         indentSelectedEntries(entrySet.entries, indentation);
-        var composedLists = composeEntries(editor, entrySet.entries);
-        each$1(composedLists, function (composedList) {
+        const composedLists = composeEntries(editor, entrySet.entries);
+        each$1(composedLists, composedList => {
           fireListEvent(editor, indentation === 'Indent' ? 'IndentList' : 'OutdentList', composedList.dom);
         });
         before(entrySet.sourceList, composedLists);
@@ -1447,12 +1167,12 @@
       });
     };
 
-    var selectionIndentation = function (editor, indentation) {
-      var lists = map(getSelectedListRoots(editor), SugarElement.fromDom);
-      var dlItems = map(getSelectedDlItems(editor), SugarElement.fromDom);
-      var isHandled = false;
+    const selectionIndentation = (editor, indentation) => {
+      const lists = fromDom(getSelectedListRoots(editor));
+      const dlItems = fromDom(getSelectedDlItems(editor));
+      let isHandled = false;
       if (lists.length || dlItems.length) {
-        var bookmark = editor.selection.getBookmark();
+        const bookmark = editor.selection.getBookmark();
         listIndentation(editor, lists, indentation);
         dlIndentation(editor, indentation, dlItems);
         editor.selection.moveToBookmark(bookmark);
@@ -1462,26 +1182,28 @@
       }
       return isHandled;
     };
-    var indentListSelection = function (editor) {
-      return selectionIndentation(editor, 'Indent');
-    };
-    var outdentListSelection = function (editor) {
-      return selectionIndentation(editor, 'Outdent');
-    };
-    var flattenListSelection = function (editor) {
-      return selectionIndentation(editor, 'Flatten');
-    };
+    const handleIndentation = (editor, indentation) => !selectionIsWithinNonEditableList(editor) && selectionIndentation(editor, indentation);
+    const indentListSelection = editor => handleIndentation(editor, 'Indent');
+    const outdentListSelection = editor => handleIndentation(editor, 'Outdent');
+    const flattenListSelection = editor => handleIndentation(editor, 'Flatten');
+
+    const zeroWidth = '\uFEFF';
+    const isZwsp = char => char === zeroWidth;
+
+    const ancestor$1 = (scope, predicate, isRoot) => ancestor$3(scope, predicate, isRoot).isSome();
+
+    const ancestor = (element, target) => ancestor$1(element, curry(eq, target));
 
-    var global = tinymce.util.Tools.resolve('tinymce.dom.BookmarkManager');
+    var global$1 = tinymce.util.Tools.resolve('tinymce.dom.BookmarkManager');
 
-    var DOM$1 = global$3.DOM;
-    var createBookmark = function (rng) {
-      var bookmark = {};
-      var setupEndPoint = function (start) {
-        var container = rng[start ? 'startContainer' : 'endContainer'];
-        var offset = rng[start ? 'startOffset' : 'endOffset'];
-        if (container.nodeType === 1) {
-          var offsetNode = DOM$1.create('span', { 'data-mce-type': 'bookmark' });
+    const DOM$1 = global$3.DOM;
+    const createBookmark = rng => {
+      const bookmark = {};
+      const setupEndPoint = start => {
+        let container = rng[start ? 'startContainer' : 'endContainer'];
+        let offset = rng[start ? 'startOffset' : 'endOffset'];
+        if (isElement(container)) {
+          const offsetNode = DOM$1.create('span', { 'data-mce-type': 'bookmark' });
           if (container.hasChildNodes()) {
             offset = Math.min(offset, container.childNodes.length - 1);
             if (start) {
@@ -1504,28 +1226,30 @@
       }
       return bookmark;
     };
-    var resolveBookmark = function (bookmark) {
-      var restoreEndPoint = function (start) {
-        var node;
-        var nodeIndex = function (container) {
-          var node = container.parentNode.firstChild, idx = 0;
+    const resolveBookmark = bookmark => {
+      const restoreEndPoint = start => {
+        const nodeIndex = container => {
+          var _a;
+          let node = (_a = container.parentNode) === null || _a === void 0 ? void 0 : _a.firstChild;
+          let idx = 0;
           while (node) {
             if (node === container) {
               return idx;
             }
-            if (node.nodeType !== 1 || node.getAttribute('data-mce-type') !== 'bookmark') {
+            if (!isElement(node) || node.getAttribute('data-mce-type') !== 'bookmark') {
               idx++;
             }
             node = node.nextSibling;
           }
           return -1;
         };
-        var container = node = bookmark[start ? 'startContainer' : 'endContainer'];
-        var offset = bookmark[start ? 'startOffset' : 'endOffset'];
+        let container = bookmark[start ? 'startContainer' : 'endContainer'];
+        let offset = bookmark[start ? 'startOffset' : 'endOffset'];
         if (!container) {
           return;
         }
-        if (container.nodeType === 1) {
+        if (isElement(container) && container.parentNode) {
+          const node = container;
           offset = nodeIndex(container);
           container = container.parentNode;
           DOM$1.remove(node);
@@ -1538,7 +1262,7 @@
       };
       restoreEndPoint(true);
       restoreEndPoint();
-      var rng = DOM$1.createRng();
+      const rng = DOM$1.createRng();
       rng.setStart(bookmark.startContainer, bookmark.startOffset);
       if (bookmark.endContainer) {
         rng.setEnd(bookmark.endContainer, bookmark.endOffset);
@@ -1546,7 +1270,7 @@
       return normalizeRange(rng);
     };
 
-    var listToggleActionFromListName = function (listName) {
+    const listToggleActionFromListName = listName => {
       switch (listName) {
       case 'UL':
         return 'ToggleUlList';
@@ -1557,83 +1281,107 @@
       }
     };
 
-    var isCustomList = function (list) {
-      return /\btox\-/.test(list.className);
-    };
-    var listState = function (editor, listName, activate) {
-      var nodeChangeHandler = function (e) {
-        var inList = findUntil(e.parents, isListNode, isTableCellNode).filter(function (list) {
-          return list.nodeName === listName && !isCustomList(list);
-        }).isSome();
-        activate(inList);
-      };
-      var parents = editor.dom.getParents(editor.selection.getNode());
-      nodeChangeHandler({ parents: parents });
-      editor.on('NodeChange', nodeChangeHandler);
-      return function () {
-        return editor.off('NodeChange', nodeChangeHandler);
-      };
-    };
-
-    var updateListStyle = function (dom, el, detail) {
-      var type = detail['list-style-type'] ? detail['list-style-type'] : null;
+    const updateListStyle = (dom, el, detail) => {
+      const type = detail['list-style-type'] ? detail['list-style-type'] : null;
       dom.setStyle(el, 'list-style-type', type);
     };
-    var setAttribs = function (elm, attrs) {
-      global$2.each(attrs, function (value, key) {
+    const setAttribs = (elm, attrs) => {
+      global$2.each(attrs, (value, key) => {
         elm.setAttribute(key, value);
       });
     };
-    var updateListAttrs = function (dom, el, detail) {
+    const updateListAttrs = (dom, el, detail) => {
       setAttribs(el, detail['list-attributes']);
-      global$2.each(dom.select('li', el), function (li) {
+      global$2.each(dom.select('li', el), li => {
         setAttribs(li, detail['list-item-attributes']);
       });
     };
-    var updateListWithDetails = function (dom, el, detail) {
+    const updateListWithDetails = (dom, el, detail) => {
       updateListStyle(dom, el, detail);
       updateListAttrs(dom, el, detail);
     };
-    var removeStyles = function (dom, element, styles) {
-      global$2.each(styles, function (style) {
-        var _a;
-        return dom.setStyle(element, (_a = {}, _a[style] = '', _a));
-      });
+    const removeStyles = (dom, element, styles) => {
+      global$2.each(styles, style => dom.setStyle(element, style, ''));
     };
-    var getEndPointNode = function (editor, rng, start, root) {
-      var container = rng[start ? 'startContainer' : 'endContainer'];
-      var offset = rng[start ? 'startOffset' : 'endOffset'];
-      if (container.nodeType === 1) {
+    const isInline = (editor, node) => isNonNullable(node) && !isBlock(node, editor.schema.getBlockElements());
+    const getEndPointNode = (editor, rng, start, root) => {
+      let container = rng[start ? 'startContainer' : 'endContainer'];
+      const offset = rng[start ? 'startOffset' : 'endOffset'];
+      if (isElement(container)) {
         container = container.childNodes[Math.min(offset, container.childNodes.length - 1)] || container;
       }
       if (!start && isBr(container.nextSibling)) {
         container = container.nextSibling;
       }
+      const findBlockAncestor = node => {
+        while (!editor.dom.isBlock(node) && node.parentNode && root !== node) {
+          node = node.parentNode;
+        }
+        return node;
+      };
+      const findBetterContainer = (container, forward) => {
+        var _a;
+        const walker = new global$5(container, findBlockAncestor(container));
+        const dir = forward ? 'next' : 'prev';
+        let node;
+        while (node = walker[dir]()) {
+          if (!(isVoid(editor, node) || isZwsp(node.textContent) || ((_a = node.textContent) === null || _a === void 0 ? void 0 : _a.length) === 0)) {
+            return Optional.some(node);
+          }
+        }
+        return Optional.none();
+      };
+      if (start && isTextNode$1(container)) {
+        if (isZwsp(container.textContent)) {
+          container = findBetterContainer(container, false).getOr(container);
+        } else {
+          if (container.parentNode !== null && isInline(editor, container.parentNode)) {
+            container = container.parentNode;
+          }
+          while (container.previousSibling !== null && (isInline(editor, container.previousSibling) || isTextNode$1(container.previousSibling))) {
+            container = container.previousSibling;
+          }
+        }
+      }
+      if (!start && isTextNode$1(container)) {
+        if (isZwsp(container.textContent)) {
+          container = findBetterContainer(container, true).getOr(container);
+        } else {
+          if (container.parentNode !== null && isInline(editor, container.parentNode)) {
+            container = container.parentNode;
+          }
+          while (container.nextSibling !== null && (isInline(editor, container.nextSibling) || isTextNode$1(container.nextSibling))) {
+            container = container.nextSibling;
+          }
+        }
+      }
       while (container.parentNode !== root) {
+        const parent = container.parentNode;
         if (isTextBlock(editor, container)) {
           return container;
         }
-        if (/^(TD|TH)$/.test(container.parentNode.nodeName)) {
+        if (/^(TD|TH)$/.test(parent.nodeName)) {
           return container;
         }
-        container = container.parentNode;
+        container = parent;
       }
       return container;
     };
-    var getSelectedTextBlocks = function (editor, rng, root) {
-      var textBlocks = [];
-      var dom = editor.dom;
-      var startNode = getEndPointNode(editor, rng, true, root);
-      var endNode = getEndPointNode(editor, rng, false, root);
-      var block;
-      var siblings = [];
-      for (var node = startNode; node; node = node.nextSibling) {
+    const getSelectedTextBlocks = (editor, rng, root) => {
+      const textBlocks = [];
+      const dom = editor.dom;
+      const startNode = getEndPointNode(editor, rng, true, root);
+      const endNode = getEndPointNode(editor, rng, false, root);
+      let block;
+      const siblings = [];
+      for (let node = startNode; node; node = node.nextSibling) {
         siblings.push(node);
         if (node === endNode) {
           break;
         }
       }
-      global$2.each(siblings, function (node) {
+      global$2.each(siblings, node => {
+        var _a;
         if (isTextBlock(editor, node)) {
           textBlocks.push(node);
           block = null;
@@ -1646,8 +1394,8 @@
           block = null;
           return;
         }
-        var nextSibling = node.nextSibling;
-        if (global.isBookmarkNode(node)) {
+        const nextSibling = node.nextSibling;
+        if (global$1.isBookmarkNode(node)) {
           if (isListNode(nextSibling) || isTextBlock(editor, nextSibling) || !nextSibling && node.parentNode === root) {
             block = null;
             return;
@@ -1655,24 +1403,33 @@
         }
         if (!block) {
           block = dom.create('p');
-          node.parentNode.insertBefore(block, node);
+          (_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(block, node);
           textBlocks.push(block);
         }
         block.appendChild(node);
       });
       return textBlocks;
     };
-    var hasCompatibleStyle = function (dom, sib, detail) {
-      var sibStyle = dom.getStyle(sib, 'list-style-type');
-      var detailStyle = detail ? detail['list-style-type'] : '';
+    const hasCompatibleStyle = (dom, sib, detail) => {
+      const sibStyle = dom.getStyle(sib, 'list-style-type');
+      let detailStyle = detail ? detail['list-style-type'] : '';
       detailStyle = detailStyle === null ? '' : detailStyle;
       return sibStyle === detailStyle;
     };
-    var applyList = function (editor, listName, detail) {
-      var rng = editor.selection.getRng();
-      var listItemName = 'LI';
-      var root = getClosestListRootElm(editor, editor.selection.getStart(true));
-      var dom = editor.dom;
+    const getRootSearchStart = (editor, range) => {
+      const start = editor.selection.getStart(true);
+      const startPoint = getEndPointNode(editor, range, true, editor.getBody());
+      if (ancestor(SugarElement.fromDom(startPoint), SugarElement.fromDom(range.commonAncestorContainer))) {
+        return range.commonAncestorContainer;
+      } else {
+        return start;
+      }
+    };
+    const applyList = (editor, listName, detail) => {
+      const rng = editor.selection.getRng();
+      let listItemName = 'LI';
+      const root = getClosestListHost(editor, getRootSearchStart(editor, rng));
+      const dom = editor.dom;
       if (dom.getContentEditable(editor.selection.getNode()) === 'false') {
         return;
       }
@@ -1680,12 +1437,12 @@
       if (listName === 'DL') {
         listItemName = 'DT';
       }
-      var bookmark = createBookmark(rng);
-      var selectedTextBlocks = getSelectedTextBlocks(editor, rng, root);
-      global$2.each(selectedTextBlocks, function (block) {
-        var listBlock;
-        var sibling = block.previousSibling;
-        var parent = block.parentNode;
+      const bookmark = createBookmark(rng);
+      const selectedTextBlocks = filter$1(getSelectedTextBlocks(editor, rng, root), editor.dom.isEditable);
+      global$2.each(selectedTextBlocks, block => {
+        let listBlock;
+        const sibling = block.previousSibling;
+        const parent = block.parentNode;
         if (!isListItemNode(parent)) {
           if (sibling && isListNode(sibling) && sibling.nodeName === listName && hasCompatibleStyle(dom, sibling, detail)) {
             listBlock = sibling;
@@ -1693,7 +1450,7 @@
             sibling.appendChild(block);
           } else {
             listBlock = dom.create(listName);
-            block.parentNode.insertBefore(listBlock, block);
+            parent.insertBefore(listBlock, block);
             listBlock.appendChild(block);
             block = dom.rename(block, listItemName);
           }
@@ -1715,40 +1472,42 @@
       });
       editor.selection.setRng(resolveBookmark(bookmark));
     };
-    var isValidLists = function (list1, list2) {
-      return list1 && list2 && isListNode(list1) && list1.nodeName === list2.nodeName;
+    const isValidLists = (list1, list2) => {
+      return isListNode(list1) && list1.nodeName === (list2 === null || list2 === void 0 ? void 0 : list2.nodeName);
     };
-    var hasSameListStyle = function (dom, list1, list2) {
-      var targetStyle = dom.getStyle(list1, 'list-style-type', true);
-      var style = dom.getStyle(list2, 'list-style-type', true);
+    const hasSameListStyle = (dom, list1, list2) => {
+      const targetStyle = dom.getStyle(list1, 'list-style-type', true);
+      const style = dom.getStyle(list2, 'list-style-type', true);
       return targetStyle === style;
     };
-    var hasSameClasses = function (elm1, elm2) {
+    const hasSameClasses = (elm1, elm2) => {
       return elm1.className === elm2.className;
     };
-    var shouldMerge = function (dom, list1, list2) {
+    const shouldMerge = (dom, list1, list2) => {
       return isValidLists(list1, list2) && hasSameListStyle(dom, list1, list2) && hasSameClasses(list1, list2);
     };
-    var mergeWithAdjacentLists = function (dom, listBlock) {
-      var sibling, node;
-      sibling = listBlock.nextSibling;
+    const mergeWithAdjacentLists = (dom, listBlock) => {
+      let node;
+      let sibling = listBlock.nextSibling;
       if (shouldMerge(dom, listBlock, sibling)) {
-        while (node = sibling.firstChild) {
+        const liSibling = sibling;
+        while (node = liSibling.firstChild) {
           listBlock.appendChild(node);
         }
-        dom.remove(sibling);
+        dom.remove(liSibling);
       }
       sibling = listBlock.previousSibling;
       if (shouldMerge(dom, listBlock, sibling)) {
-        while (node = sibling.lastChild) {
+        const liSibling = sibling;
+        while (node = liSibling.lastChild) {
           listBlock.insertBefore(node, listBlock.firstChild);
         }
-        dom.remove(sibling);
+        dom.remove(liSibling);
       }
     };
-    var updateList$1 = function (editor, list, listName, detail) {
+    const updateList$1 = (editor, list, listName, detail) => {
       if (list.nodeName !== listName) {
-        var newList = editor.dom.rename(list, listName);
+        const newList = editor.dom.rename(list, listName);
         updateListWithDetails(editor.dom, newList, detail);
         fireListEvent(editor, listToggleActionFromListName(listName), newList);
       } else {
@@ -1756,24 +1515,46 @@
         fireListEvent(editor, listToggleActionFromListName(listName), list);
       }
     };
-    var toggleMultipleLists = function (editor, parentList, lists, listName, detail) {
-      var parentIsList = isListNode(parentList);
-      if (parentIsList && parentList.nodeName === listName && !hasListStyleDetail(detail)) {
+    const updateCustomList = (editor, list, listName, detail) => {
+      list.classList.forEach((cls, _, classList) => {
+        if (cls.startsWith('tox-')) {
+          classList.remove(cls);
+          if (classList.length === 0) {
+            list.removeAttribute('class');
+          }
+        }
+      });
+      if (list.nodeName !== listName) {
+        const newList = editor.dom.rename(list, listName);
+        updateListWithDetails(editor.dom, newList, detail);
+        fireListEvent(editor, listToggleActionFromListName(listName), newList);
+      } else {
+        updateListWithDetails(editor.dom, list, detail);
+        fireListEvent(editor, listToggleActionFromListName(listName), list);
+      }
+    };
+    const toggleMultipleLists = (editor, parentList, lists, listName, detail) => {
+      const parentIsList = isListNode(parentList);
+      if (parentIsList && parentList.nodeName === listName && !hasListStyleDetail(detail) && !isCustomList(parentList)) {
         flattenListSelection(editor);
       } else {
         applyList(editor, listName, detail);
-        var bookmark = createBookmark(editor.selection.getRng());
-        var allLists = parentIsList ? __spreadArray([parentList], lists, true) : lists;
-        global$2.each(allLists, function (elm) {
-          updateList$1(editor, elm, listName, detail);
+        const bookmark = createBookmark(editor.selection.getRng());
+        const allLists = parentIsList ? [
+          parentList,
+          ...lists
+        ] : lists;
+        const updateFunction = parentIsList && isCustomList(parentList) ? updateCustomList : updateList$1;
+        global$2.each(allLists, elm => {
+          updateFunction(editor, elm, listName, detail);
         });
         editor.selection.setRng(resolveBookmark(bookmark));
       }
     };
-    var hasListStyleDetail = function (detail) {
+    const hasListStyleDetail = detail => {
       return 'list-style-type' in detail;
     };
-    var toggleSingleList = function (editor, parentList, listName, detail) {
+    const toggleSingleList = (editor, parentList, listName, detail) => {
       if (parentList === editor.getBody()) {
         return;
       }
@@ -1781,9 +1562,19 @@
         if (parentList.nodeName === listName && !hasListStyleDetail(detail) && !isCustomList(parentList)) {
           flattenListSelection(editor);
         } else {
-          var bookmark = createBookmark(editor.selection.getRng());
+          const bookmark = createBookmark(editor.selection.getRng());
+          if (isCustomList(parentList)) {
+            parentList.classList.forEach((cls, _, classList) => {
+              if (cls.startsWith('tox-')) {
+                classList.remove(cls);
+                if (classList.length === 0) {
+                  parentList.removeAttribute('class');
+                }
+              }
+            });
+          }
           updateListWithDetails(editor.dom, parentList, detail);
-          var newList = editor.dom.rename(parentList, listName);
+          const newList = editor.dom.rename(parentList, listName);
           mergeWithAdjacentLists(editor.dom, newList);
           editor.selection.setRng(resolveBookmark(bookmark));
           applyList(editor, listName, detail);
@@ -1794,10 +1585,13 @@
         fireListEvent(editor, listToggleActionFromListName(listName), parentList);
       }
     };
-    var toggleList = function (editor, listName, _detail) {
-      var parentList = getParentList(editor);
-      var selectedSubLists = getSelectedSubLists(editor);
-      var detail = isObject(_detail) ? _detail : {};
+    const toggleList = (editor, listName, _detail) => {
+      const parentList = getParentList(editor);
+      if (isWithinNonEditableList(editor, parentList)) {
+        return;
+      }
+      const selectedSubLists = getSelectedSubLists(editor);
+      const detail = isObject(_detail) ? _detail : {};
       if (selectedSubLists.length > 0) {
         toggleMultipleLists(editor, parentList, selectedSubLists, listName, detail);
       } else {
@@ -1805,14 +1599,14 @@
       }
     };
 
-    var DOM = global$3.DOM;
-    var normalizeList = function (dom, list) {
-      var parentNode = list.parentNode;
-      if (parentNode.nodeName === 'LI' && parentNode.firstChild === list) {
-        var sibling = parentNode.previousSibling;
+    const DOM = global$3.DOM;
+    const normalizeList = (dom, list) => {
+      const parentNode = list.parentElement;
+      if (parentNode && parentNode.nodeName === 'LI' && parentNode.firstChild === list) {
+        const sibling = parentNode.previousSibling;
         if (sibling && sibling.nodeName === 'LI') {
           sibling.appendChild(list);
-          if (isEmpty(dom, parentNode)) {
+          if (isEmpty$2(dom, parentNode)) {
             DOM.remove(parentNode);
           }
         } else {
@@ -1820,69 +1614,72 @@
         }
       }
       if (isListNode(parentNode)) {
-        var sibling = parentNode.previousSibling;
+        const sibling = parentNode.previousSibling;
         if (sibling && sibling.nodeName === 'LI') {
           sibling.appendChild(list);
         }
       }
     };
-    var normalizeLists = function (dom, element) {
-      var lists = global$2.grep(dom.select('ol,ul', element));
-      global$2.each(lists, function (list) {
+    const normalizeLists = (dom, element) => {
+      const lists = global$2.grep(dom.select('ol,ul', element));
+      global$2.each(lists, list => {
         normalizeList(dom, list);
       });
     };
 
-    var findNextCaretContainer = function (editor, rng, isForward, root) {
-      var node = rng.startContainer;
-      var offset = rng.startOffset;
-      if (isTextNode(node) && (isForward ? offset < node.data.length : offset > 0)) {
+    const findNextCaretContainer = (editor, rng, isForward, root) => {
+      let node = rng.startContainer;
+      const offset = rng.startOffset;
+      if (isTextNode$1(node) && (isForward ? offset < node.data.length : offset > 0)) {
         return node;
       }
-      var nonEmptyBlocks = editor.schema.getNonEmptyElements();
-      if (node.nodeType === 1) {
+      const nonEmptyBlocks = editor.schema.getNonEmptyElements();
+      if (isElement(node)) {
         node = global$6.getNode(node, offset);
       }
-      var walker = new global$5(node, root);
+      const walker = new global$5(node, root);
       if (isForward) {
         if (isBogusBr(editor.dom, node)) {
           walker.next();
         }
       }
-      while (node = walker[isForward ? 'next' : 'prev2']()) {
+      const walkFn = isForward ? walker.next.bind(walker) : walker.prev2.bind(walker);
+      while (node = walkFn()) {
         if (node.nodeName === 'LI' && !node.hasChildNodes()) {
           return node;
         }
         if (nonEmptyBlocks[node.nodeName]) {
           return node;
         }
-        if (isTextNode(node) && node.data.length > 0) {
+        if (isTextNode$1(node) && node.data.length > 0) {
           return node;
         }
       }
+      return null;
     };
-    var hasOnlyOneBlockChild = function (dom, elm) {
-      var childNodes = elm.childNodes;
+    const hasOnlyOneBlockChild = (dom, elm) => {
+      const childNodes = elm.childNodes;
       return childNodes.length === 1 && !isListNode(childNodes[0]) && dom.isBlock(childNodes[0]);
     };
-    var unwrapSingleBlockChild = function (dom, elm) {
-      if (hasOnlyOneBlockChild(dom, elm)) {
+    const isUnwrappable = node => Optional.from(node).map(SugarElement.fromDom).filter(isHTMLElement).exists(el => isEditable(el) && !contains$1(['details'], name(el)));
+    const unwrapSingleBlockChild = (dom, elm) => {
+      if (hasOnlyOneBlockChild(dom, elm) && isUnwrappable(elm.firstChild)) {
         dom.remove(elm.firstChild, true);
       }
     };
-    var moveChildren = function (dom, fromElm, toElm) {
-      var node;
-      var targetElm = hasOnlyOneBlockChild(dom, toElm) ? toElm.firstChild : toElm;
+    const moveChildren = (dom, fromElm, toElm) => {
+      let node;
+      const targetElm = hasOnlyOneBlockChild(dom, toElm) ? toElm.firstChild : toElm;
       unwrapSingleBlockChild(dom, fromElm);
-      if (!isEmpty(dom, fromElm, true)) {
+      if (!isEmpty$2(dom, fromElm, true)) {
         while (node = fromElm.firstChild) {
           targetElm.appendChild(node);
         }
       }
     };
-    var mergeLiElements = function (dom, fromElm, toElm) {
-      var listNode;
-      var ul = fromElm.parentNode;
+    const mergeLiElements = (dom, fromElm, toElm) => {
+      let listNode;
+      const ul = fromElm.parentNode;
       if (!isChildOfBody(dom, fromElm) || !isChildOfBody(dom, toElm)) {
         return;
       }
@@ -1894,75 +1691,88 @@
           dom.remove(ul.previousSibling);
         }
       }
-      var node = toElm.lastChild;
+      const node = toElm.lastChild;
       if (node && isBr(node) && fromElm.hasChildNodes()) {
         dom.remove(node);
       }
-      if (isEmpty(dom, toElm, true)) {
-        dom.$(toElm).empty();
+      if (isEmpty$2(dom, toElm, true)) {
+        empty(SugarElement.fromDom(toElm));
       }
       moveChildren(dom, fromElm, toElm);
       if (listNode) {
         toElm.appendChild(listNode);
       }
-      var contains$1 = contains(SugarElement.fromDom(toElm), SugarElement.fromDom(fromElm));
-      var nestedLists = contains$1 ? dom.getParents(fromElm, isListNode, toElm) : [];
+      const contains$1 = contains(SugarElement.fromDom(toElm), SugarElement.fromDom(fromElm));
+      const nestedLists = contains$1 ? dom.getParents(fromElm, isListNode, toElm) : [];
       dom.remove(fromElm);
-      each$1(nestedLists, function (list) {
-        if (isEmpty(dom, list) && list !== dom.getRoot()) {
+      each$1(nestedLists, list => {
+        if (isEmpty$2(dom, list) && list !== dom.getRoot()) {
           dom.remove(list);
         }
       });
     };
-    var mergeIntoEmptyLi = function (editor, fromLi, toLi) {
-      editor.dom.$(toLi).empty();
+    const mergeIntoEmptyLi = (editor, fromLi, toLi) => {
+      empty(SugarElement.fromDom(toLi));
       mergeLiElements(editor.dom, fromLi, toLi);
       editor.selection.setCursorLocation(toLi, 0);
     };
-    var mergeForward = function (editor, rng, fromLi, toLi) {
-      var dom = editor.dom;
+    const mergeForward = (editor, rng, fromLi, toLi) => {
+      const dom = editor.dom;
       if (dom.isEmpty(toLi)) {
         mergeIntoEmptyLi(editor, fromLi, toLi);
       } else {
-        var bookmark = createBookmark(rng);
+        const bookmark = createBookmark(rng);
         mergeLiElements(dom, fromLi, toLi);
         editor.selection.setRng(resolveBookmark(bookmark));
       }
     };
-    var mergeBackward = function (editor, rng, fromLi, toLi) {
-      var bookmark = createBookmark(rng);
+    const mergeBackward = (editor, rng, fromLi, toLi) => {
+      const bookmark = createBookmark(rng);
       mergeLiElements(editor.dom, fromLi, toLi);
-      var resolvedBookmark = resolveBookmark(bookmark);
+      const resolvedBookmark = resolveBookmark(bookmark);
       editor.selection.setRng(resolvedBookmark);
     };
-    var backspaceDeleteFromListToListCaret = function (editor, isForward) {
-      var dom = editor.dom, selection = editor.selection;
-      var selectionStartElm = selection.getStart();
-      var root = getClosestListRootElm(editor, selectionStartElm);
-      var li = dom.getParent(selection.getStart(), 'LI', root);
+    const backspaceDeleteFromListToListCaret = (editor, isForward) => {
+      const dom = editor.dom, selection = editor.selection;
+      const selectionStartElm = selection.getStart();
+      const root = getClosestEditingHost(editor, selectionStartElm);
+      const li = dom.getParent(selection.getStart(), 'LI', root);
       if (li) {
-        var ul = li.parentNode;
-        if (ul === editor.getBody() && isEmpty(dom, ul)) {
+        const ul = li.parentElement;
+        if (ul === editor.getBody() && isEmpty$2(dom, ul)) {
           return true;
         }
-        var rng_1 = normalizeRange(selection.getRng());
-        var otherLi_1 = dom.getParent(findNextCaretContainer(editor, rng_1, isForward, root), 'LI', root);
-        if (otherLi_1 && otherLi_1 !== li) {
-          editor.undoManager.transact(function () {
+        const rng = normalizeRange(selection.getRng());
+        const otherLi = dom.getParent(findNextCaretContainer(editor, rng, isForward, root), 'LI', root);
+        const willMergeParentIntoChild = otherLi && (isForward ? dom.isChildOf(li, otherLi) : dom.isChildOf(otherLi, li));
+        if (otherLi && otherLi !== li && !willMergeParentIntoChild) {
+          editor.undoManager.transact(() => {
             if (isForward) {
-              mergeForward(editor, rng_1, otherLi_1, li);
+              mergeForward(editor, rng, otherLi, li);
             } else {
               if (isFirstChild(li)) {
                 outdentListSelection(editor);
               } else {
-                mergeBackward(editor, rng_1, li, otherLi_1);
+                mergeBackward(editor, rng, li, otherLi);
               }
             }
           });
           return true;
-        } else if (!otherLi_1) {
-          if (!isForward && rng_1.startOffset === 0 && rng_1.endOffset === 0) {
-            editor.undoManager.transact(function () {
+        } else if (willMergeParentIntoChild && !isForward && otherLi !== li) {
+          editor.undoManager.transact(() => {
+            if (rng.commonAncestorContainer.parentElement) {
+              const bookmark = createBookmark(rng);
+              const oldParentElRef = rng.commonAncestorContainer.parentElement;
+              moveChildren(dom, rng.commonAncestorContainer.parentElement, otherLi);
+              oldParentElRef.remove();
+              const resolvedBookmark = resolveBookmark(bookmark);
+              editor.selection.setRng(resolvedBookmark);
+            }
+          });
+          return true;
+        } else if (!otherLi) {
+          if (!isForward && rng.startOffset === 0 && rng.endOffset === 0) {
+            editor.undoManager.transact(() => {
               flattenListSelection(editor);
             });
             return true;
@@ -1971,26 +1781,38 @@
       }
       return false;
     };
-    var removeBlock = function (dom, block, root) {
-      var parentBlock = dom.getParent(block.parentNode, dom.isBlock, root);
+    const removeBlock = (dom, block, root) => {
+      const parentBlock = dom.getParent(block.parentNode, dom.isBlock, root);
       dom.remove(block);
       if (parentBlock && dom.isEmpty(parentBlock)) {
         dom.remove(parentBlock);
       }
     };
-    var backspaceDeleteIntoListCaret = function (editor, isForward) {
-      var dom = editor.dom;
-      var selectionStartElm = editor.selection.getStart();
-      var root = getClosestListRootElm(editor, selectionStartElm);
-      var block = dom.getParent(selectionStartElm, dom.isBlock, root);
-      if (block && dom.isEmpty(block)) {
-        var rng = normalizeRange(editor.selection.getRng());
-        var otherLi_2 = dom.getParent(findNextCaretContainer(editor, rng, isForward, root), 'LI', root);
-        if (otherLi_2) {
-          editor.undoManager.transact(function () {
+    const backspaceDeleteIntoListCaret = (editor, isForward) => {
+      const dom = editor.dom;
+      const selectionStartElm = editor.selection.getStart();
+      const root = getClosestEditingHost(editor, selectionStartElm);
+      const block = dom.getParent(selectionStartElm, dom.isBlock, root);
+      if (block && dom.isEmpty(block, undefined, { checkRootAsContent: true })) {
+        const rng = normalizeRange(editor.selection.getRng());
+        const otherLi = dom.getParent(findNextCaretContainer(editor, rng, isForward, root), 'LI', root);
+        if (otherLi) {
+          const findValidElement = element => contains$1([
+            'td',
+            'th',
+            'caption'
+          ], name(element));
+          const findRoot = node => node.dom === root;
+          const otherLiCell = closest$2(SugarElement.fromDom(otherLi), findValidElement, findRoot);
+          const caretCell = closest$2(SugarElement.fromDom(rng.startContainer), findValidElement, findRoot);
+          if (!equals(otherLiCell, caretCell, eq)) {
+            return false;
+          }
+          editor.undoManager.transact(() => {
+            const parentNode = otherLi.parentNode;
             removeBlock(dom, block, root);
-            mergeWithAdjacentLists(dom, otherLi_2.parentNode);
-            editor.selection.select(otherLi_2, true);
+            mergeWithAdjacentLists(dom, parentNode);
+            editor.selection.select(otherLi, true);
             editor.selection.collapse(isForward);
           });
           return true;
@@ -1998,15 +1820,18 @@
       }
       return false;
     };
-    var backspaceDeleteCaret = function (editor, isForward) {
+    const backspaceDeleteCaret = (editor, isForward) => {
       return backspaceDeleteFromListToListCaret(editor, isForward) || backspaceDeleteIntoListCaret(editor, isForward);
     };
-    var backspaceDeleteRange = function (editor) {
-      var selectionStartElm = editor.selection.getStart();
-      var root = getClosestListRootElm(editor, selectionStartElm);
-      var startListParent = editor.dom.getParent(selectionStartElm, 'LI,DT,DD', root);
-      if (startListParent || getSelectedListItems(editor).length > 0) {
-        editor.undoManager.transact(function () {
+    const hasListSelection = editor => {
+      const selectionStartElm = editor.selection.getStart();
+      const root = getClosestEditingHost(editor, selectionStartElm);
+      const startListParent = editor.dom.getParent(selectionStartElm, 'LI,DT,DD', root);
+      return startListParent || getSelectedListItems(editor).length > 0;
+    };
+    const backspaceDeleteRange = editor => {
+      if (hasListSelection(editor)) {
+        editor.undoManager.transact(() => {
           editor.execCommand('Delete');
           normalizeLists(editor.dom, editor.getBody());
         });
@@ -2014,11 +1839,18 @@
       }
       return false;
     };
-    var backspaceDelete = function (editor, isForward) {
-      return editor.selection.isCollapsed() ? backspaceDeleteCaret(editor, isForward) : backspaceDeleteRange(editor);
+    const backspaceDelete = (editor, isForward) => {
+      const selection = editor.selection;
+      return !isWithinNonEditableList(editor, selection.getNode()) && (selection.isCollapsed() ? backspaceDeleteCaret(editor, isForward) : backspaceDeleteRange(editor));
     };
-    var setup$1 = function (editor) {
-      editor.on('keydown', function (e) {
+    const setup$2 = editor => {
+      editor.on('ExecCommand', e => {
+        const cmd = e.command.toLowerCase();
+        if ((cmd === 'delete' || cmd === 'forwarddelete') && hasListSelection(editor)) {
+          normalizeLists(editor.dom, editor.getBody());
+        }
+      });
+      editor.on('keydown', e => {
         if (e.keyCode === global$4.BACKSPACE) {
           if (backspaceDelete(editor, false)) {
             e.preventDefault();
@@ -2031,60 +1863,51 @@
       });
     };
 
-    var get = function (editor) {
-      return {
-        backspaceDelete: function (isForward) {
-          backspaceDelete(editor, isForward);
-        }
-      };
-    };
+    const get = editor => ({
+      backspaceDelete: isForward => {
+        backspaceDelete(editor, isForward);
+      }
+    });
 
-    var updateList = function (editor, update) {
-      var parentList = getParentList(editor);
-      editor.undoManager.transact(function () {
+    const updateList = (editor, update) => {
+      const parentList = getParentList(editor);
+      if (parentList === null || isWithinNonEditableList(editor, parentList)) {
+        return;
+      }
+      editor.undoManager.transact(() => {
         if (isObject(update.styles)) {
           editor.dom.setStyles(parentList, update.styles);
         }
         if (isObject(update.attrs)) {
-          each(update.attrs, function (v, k) {
-            return editor.dom.setAttrib(parentList, k, v);
-          });
+          each(update.attrs, (v, k) => editor.dom.setAttrib(parentList, k, v));
         }
       });
     };
 
-    var parseAlphabeticBase26 = function (str) {
-      var chars = reverse(trim(str).split(''));
-      var values = map(chars, function (char, i) {
-        var charValue = char.toUpperCase().charCodeAt(0) - 'A'.charCodeAt(0) + 1;
+    const parseAlphabeticBase26 = str => {
+      const chars = reverse(trim(str).split(''));
+      const values = map(chars, (char, i) => {
+        const charValue = char.toUpperCase().charCodeAt(0) - 'A'.charCodeAt(0) + 1;
         return Math.pow(26, i) * charValue;
       });
-      return foldl(values, function (sum, v) {
-        return sum + v;
-      }, 0);
+      return foldl(values, (sum, v) => sum + v, 0);
     };
-    var composeAlphabeticBase26 = function (value) {
+    const composeAlphabeticBase26 = value => {
       value--;
       if (value < 0) {
         return '';
       } else {
-        var remainder = value % 26;
-        var quotient = Math.floor(value / 26);
-        var rest = composeAlphabeticBase26(quotient);
-        var char = String.fromCharCode('A'.charCodeAt(0) + remainder);
+        const remainder = value % 26;
+        const quotient = Math.floor(value / 26);
+        const rest = composeAlphabeticBase26(quotient);
+        const char = String.fromCharCode('A'.charCodeAt(0) + remainder);
         return rest + char;
       }
     };
-    var isUppercase = function (str) {
-      return /^[A-Z]+$/.test(str);
-    };
-    var isLowercase = function (str) {
-      return /^[a-z]+$/.test(str);
-    };
-    var isNumeric = function (str) {
-      return /^[0-9]+$/.test(str);
-    };
-    var deduceListType = function (start) {
+    const isUppercase = str => /^[A-Z]+$/.test(str);
+    const isLowercase = str => /^[a-z]+$/.test(str);
+    const isNumeric = str => /^[0-9]+$/.test(str);
+    const deduceListType = start => {
       if (isNumeric(start)) {
         return 2;
       } else if (isUppercase(start)) {
@@ -2097,12 +1920,12 @@
         return 4;
       }
     };
-    var parseStartValue = function (start) {
+    const parseStartValue = start => {
       switch (deduceListType(start)) {
       case 2:
         return Optional.some({
           listStyleType: Optional.none(),
-          start: start
+          start
         });
       case 0:
         return Optional.some({
@@ -2123,20 +1946,20 @@
         return Optional.none();
       }
     };
-    var parseDetail = function (detail) {
-      var start = parseInt(detail.start, 10);
-      if (is(detail.listStyleType, 'upper-alpha')) {
+    const parseDetail = detail => {
+      const start = parseInt(detail.start, 10);
+      if (is$2(detail.listStyleType, 'upper-alpha')) {
         return composeAlphabeticBase26(start);
-      } else if (is(detail.listStyleType, 'lower-alpha')) {
+      } else if (is$2(detail.listStyleType, 'lower-alpha')) {
         return composeAlphabeticBase26(start).toLowerCase();
       } else {
         return detail.start;
       }
     };
 
-    var open = function (editor) {
-      var currentList = getParentList(editor);
-      if (!isOlNode(currentList)) {
+    const open = editor => {
+      const currentList = getParentList(editor);
+      if (!isOlNode(currentList) || isWithinNonEditableList(editor, currentList)) {
         return;
       }
       editor.windowManager.open({
@@ -2153,7 +1976,7 @@
         initialData: {
           start: parseDetail({
             start: editor.dom.getAttrib(currentList, 'start', '1'),
-            listStyleType: Optional.some(editor.dom.getStyle(currentList, 'list-style-type'))
+            listStyleType: Optional.from(editor.dom.getStyle(currentList, 'list-style-type'))
           })
         },
         buttons: [
@@ -2169,9 +1992,9 @@
             primary: true
           }
         ],
-        onSubmit: function (api) {
-          var data = api.getData();
-          parseStartValue(data.start).each(function (detail) {
+        onSubmit: api => {
+          const data = api.getData();
+          parseStartValue(data.start).each(detail => {
             editor.execCommand('mceListUpdate', false, {
               attrs: { start: detail.start === '1' ? '' : detail.start },
               styles: { 'list-style-type': detail.listStyleType.getOr('') }
@@ -2182,40 +2005,38 @@
       });
     };
 
-    var queryListCommandState = function (editor, listName) {
-      return function () {
-        var parentList = getParentList(editor);
-        return parentList && parentList.nodeName === listName;
-      };
+    const queryListCommandState = (editor, listName) => () => {
+      const parentList = getParentList(editor);
+      return isNonNullable(parentList) && parentList.nodeName === listName;
     };
-    var registerDialog = function (editor) {
-      editor.addCommand('mceListProps', function () {
+    const registerDialog = editor => {
+      editor.addCommand('mceListProps', () => {
         open(editor);
       });
     };
-    var register$2 = function (editor) {
-      editor.on('BeforeExecCommand', function (e) {
-        var cmd = e.command.toLowerCase();
+    const register$2 = editor => {
+      editor.on('BeforeExecCommand', e => {
+        const cmd = e.command.toLowerCase();
         if (cmd === 'indent') {
           indentListSelection(editor);
         } else if (cmd === 'outdent') {
           outdentListSelection(editor);
         }
       });
-      editor.addCommand('InsertUnorderedList', function (ui, detail) {
+      editor.addCommand('InsertUnorderedList', (ui, detail) => {
         toggleList(editor, 'UL', detail);
       });
-      editor.addCommand('InsertOrderedList', function (ui, detail) {
+      editor.addCommand('InsertOrderedList', (ui, detail) => {
         toggleList(editor, 'OL', detail);
       });
-      editor.addCommand('InsertDefinitionList', function (ui, detail) {
+      editor.addCommand('InsertDefinitionList', (ui, detail) => {
         toggleList(editor, 'DL', detail);
       });
-      editor.addCommand('RemoveList', function () {
+      editor.addCommand('RemoveList', () => {
         flattenListSelection(editor);
       });
       registerDialog(editor);
-      editor.addCommand('mceListUpdate', function (ui, detail) {
+      editor.addCommand('mceListUpdate', (ui, detail) => {
         if (isObject(detail)) {
           updateList(editor, detail);
         }
@@ -2225,78 +2046,117 @@
       editor.addQueryStateHandler('InsertDefinitionList', queryListCommandState(editor, 'DL'));
     };
 
-    var setupTabKey = function (editor) {
-      editor.on('keydown', function (e) {
+    var global = tinymce.util.Tools.resolve('tinymce.html.Node');
+
+    const isTextNode = node => node.type === 3;
+    const isEmpty = nodeBuffer => nodeBuffer.length === 0;
+    const wrapInvalidChildren = list => {
+      const insertListItem = (buffer, refNode) => {
+        const li = global.create('li');
+        each$1(buffer, node => li.append(node));
+        if (refNode) {
+          list.insert(li, refNode, true);
+        } else {
+          list.append(li);
+        }
+      };
+      const reducer = (buffer, node) => {
+        if (isTextNode(node)) {
+          return [
+            ...buffer,
+            node
+          ];
+        } else if (!isEmpty(buffer) && !isTextNode(node)) {
+          insertListItem(buffer, node);
+          return [];
+        } else {
+          return buffer;
+        }
+      };
+      const restBuffer = foldl(list.children(), reducer, []);
+      if (!isEmpty(restBuffer)) {
+        insertListItem(restBuffer);
+      }
+    };
+    const setup$1 = editor => {
+      editor.on('PreInit', () => {
+        const {parser} = editor;
+        parser.addNodeFilter('ul,ol', nodes => each$1(nodes, wrapInvalidChildren));
+      });
+    };
+
+    const setupTabKey = editor => {
+      editor.on('keydown', e => {
         if (e.keyCode !== global$4.TAB || global$4.metaKeyPressed(e)) {
           return;
         }
-        editor.undoManager.transact(function () {
+        editor.undoManager.transact(() => {
           if (e.shiftKey ? outdentListSelection(editor) : indentListSelection(editor)) {
             e.preventDefault();
           }
         });
       });
     };
-    var setup = function (editor) {
+    const setup = editor => {
       if (shouldIndentOnTab(editor)) {
         setupTabKey(editor);
       }
-      setup$1(editor);
+      setup$2(editor);
     };
 
-    var register$1 = function (editor) {
-      var exec = function (command) {
-        return function () {
-          return editor.execCommand(command);
-        };
+    const setupToggleButtonHandler = (editor, listName) => api => {
+      const toggleButtonHandler = e => {
+        api.setActive(inList(e.parents, listName));
+        api.setEnabled(!isWithinNonEditableList(editor, e.element) && editor.selection.isEditable());
       };
+      api.setEnabled(editor.selection.isEditable());
+      return setNodeChangeHandler(editor, toggleButtonHandler);
+    };
+    const register$1 = editor => {
+      const exec = command => () => editor.execCommand(command);
       if (!editor.hasPlugin('advlist')) {
         editor.ui.registry.addToggleButton('numlist', {
           icon: 'ordered-list',
           active: false,
           tooltip: 'Numbered list',
           onAction: exec('InsertOrderedList'),
-          onSetup: function (api) {
-            return listState(editor, 'OL', api.setActive);
-          }
+          onSetup: setupToggleButtonHandler(editor, 'OL')
         });
         editor.ui.registry.addToggleButton('bullist', {
           icon: 'unordered-list',
           active: false,
           tooltip: 'Bullet list',
           onAction: exec('InsertUnorderedList'),
-          onSetup: function (api) {
-            return listState(editor, 'UL', api.setActive);
-          }
+          onSetup: setupToggleButtonHandler(editor, 'UL')
         });
       }
     };
 
-    var register = function (editor) {
-      var listProperties = {
+    const setupMenuButtonHandler = (editor, listName) => api => {
+      const menuButtonHandler = e => api.setEnabled(inList(e.parents, listName) && !isWithinNonEditableList(editor, e.element));
+      return setNodeChangeHandler(editor, menuButtonHandler);
+    };
+    const register = editor => {
+      const listProperties = {
         text: 'List properties...',
         icon: 'ordered-list',
-        onAction: function () {
-          return editor.execCommand('mceListProps');
-        },
-        onSetup: function (api) {
-          return listState(editor, 'OL', function (active) {
-            return api.setDisabled(!active);
-          });
-        }
+        onAction: () => editor.execCommand('mceListProps'),
+        onSetup: setupMenuButtonHandler(editor, 'OL')
       };
       editor.ui.registry.addMenuItem('listprops', listProperties);
       editor.ui.registry.addContextMenu('lists', {
-        update: function (node) {
-          var parentList = getParentList(editor, node);
+        update: node => {
+          const parentList = getParentList(editor, node);
           return isOlNode(parentList) ? ['listprops'] : [];
         }
       });
     };
 
-    function Plugin () {
-      global$7.add('lists', function (editor) {
-        if (editor.hasPlugin('rtc', true) === false) {
+    var Plugin = () => {
+      global$7.add('lists', editor => {
+        register$3(editor);
+        setup$1(editor);
+        if (!editor.hasPlugin('rtc', true)) {
           setup(editor);
           register$2(editor);
         } else {
@@ -2306,8 +2166,8 @@
         register(editor);
         return get(editor);
       });
-    }
+    };
 
     Plugin();
 
-}());
+})();