@progress/kendo-react-editor 5.1.0-dev.202202101059 → 5.1.0-dev.202202180916

package/dist/es/Editor.js

@@ -26,7 +26,7 @@ import * as React from 'react';
 import * as PropTypes from 'prop-types';
 import { ButtonGroup, Toolbar, ToolbarSeparator } from '@progress/kendo-react-buttons';
 import { classNames } from '@progress/kendo-react-common';
-import { EditorState, Plugin, PluginKey, EditorView, Schema, baseKeymap, keymap, history, dropCursor, gapCursor, getMark, spacesFix, tableEditing } from '@progress/kendo-editor-common';
+import { EditorState, Plugin, PluginKey, EditorView, Schema, baseKeymap, keymap, history, dropCursor, gapCursor, getMark, spacesFix, tableEditing, caretColor } from '@progress/kendo-editor-common';
 import { marks, nodes } from './config/schema';
 import { defaultStyle, tablesStyles, rtlStyles } from './config/defaultStyles';
 import { EditorToolsSettings } from './config/toolsSettings';
@@ -324,6 +324,7 @@ var Editor = /** @class */ (function (_super) {
                 }
             }),
             spacesFix(),
+            caretColor(),
             history(),
             dropCursor(),
             gapCursor(),

package/dist/es/package-metadata.js

@@ -5,7 +5,7 @@ export var packageMetadata = {
     name: '@progress/kendo-react-editor',
     productName: 'KendoReact',
     productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
-    publishDate: 1644490106,
+    publishDate: 1645175078,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-react-ui/my-license/?utm_medium=product&utm_source=kendoreact&utm_campaign=kendo-ui-react-purchase-license-keys-warning'
 };

package/dist/es/tools/lists-styled.js

@@ -10,238 +10,9 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import * as React from 'react';
-import { Fragment, Slice, NodeRange, TextSelection, NodeSelection, liftTarget, ReplaceAroundStep, autoJoin, wrapInList as pmWrapInList } from '@progress/kendo-editor-common';
+import { toggleList, listStyle } from '@progress/kendo-editor-common';
 import { SplitButton } from '@progress/kendo-react-buttons';
 import { listsTypes } from './../config/toolsSettings';
-var rootListDepth = function (pos, nodes) {
-    // Get the depth of the nearest ancestor list
-    var bulletList = nodes.bulletList, orderedList = nodes.orderedList, listItem = nodes.listItem;
-    var depth;
-    for (var i = pos.depth - 1; i > 0; i--) {
-        var node = pos.node(i);
-        if (node.type === bulletList || node.type === orderedList) {
-            depth = i;
-        }
-        if (node.type !== bulletList && node.type !== orderedList && node.type !== listItem) {
-            break;
-        }
-    }
-    return depth;
-};
-var getListLiftTarget = function (schema, resPos, options) {
-    // This will return (depth - 1) for root list parent of a list.
-    var target = resPos.depth;
-    var bulletList = schema.nodes[options.bulletList];
-    var orderedList = schema.nodes[options.orderedList];
-    var listItem = schema.nodes[options.listItem];
-    for (var i = resPos.depth; i > 0; i--) {
-        var node = resPos.node(i);
-        if (node.type === bulletList || node.type === orderedList) {
-            target = i;
-        }
-        if (node.type !== bulletList && node.type !== orderedList && node.type !== listItem) {
-            break;
-        }
-    }
-    return target - 1;
-};
-function liftSelectionList(state, tr, options) {
-    // The function will list paragraphs in selection out to level 1 below root list.
-    var _a = state.selection, from = _a.from, to = _a.to;
-    var _b = state.schema.nodes, paragraph = _b.paragraph, heading = _b.heading;
-    var listCol = [];
-    tr.doc.nodesBetween(from, to, function (node, pos) {
-        if (node.type === paragraph || node.type === heading) {
-            listCol.push({ node: node, pos: pos });
-        }
-    });
-    for (var i = listCol.length - 1; i >= 0; i--) {
-        var block = listCol[i];
-        var start = tr.doc.resolve(tr.mapping.map(block.pos));
-        if (start.depth > 0) {
-            var end = void 0;
-            if (block.node.textContent && block.node.textContent.length > 0) {
-                end = tr.doc.resolve(tr.mapping.map(block.pos + block.node.textContent.length));
-            }
-            else {
-                end = tr.doc.resolve(tr.mapping.map(block.pos + 1));
-            }
-            var range = start.blockRange(end);
-            if (range) {
-                tr.lift(range, getListLiftTarget(state.schema, start, options));
-            }
-        }
-    }
-    return tr;
-}
-function toggleListCommand(options) {
-    return function (state, dispatch, view) {
-        if (!view) {
-            return false;
-        }
-        state = view.state;
-        var listNode = state.schema.nodes[options.listType];
-        var _a = state.selection, $from = _a.$from, $to = _a.$to;
-        var parent = $from.node(-2);
-        var grandgrandParent = $from.node(-3);
-        var isRangeOfSingleType = isRangeOfType(state.doc, $from, $to, listNode);
-        if (((parent && parent.type === listNode) ||
-            (grandgrandParent && grandgrandParent.type === listNode)) &&
-            isRangeOfSingleType) {
-            // Untoggles list
-            return liftListItems(options)(state, dispatch);
-        }
-        else {
-            // Wraps selection in list and converts list type e.g. bullet_list -> ordered_list if needed
-            if (!isRangeOfSingleType) {
-                liftListItems(options)(state, dispatch);
-                state = view.state;
-            }
-            return wrapInList(listNode, options.listAttrs)(state, dispatch);
-        }
-    };
-}
-function liftListItem(state, selection, tr, nodeType) {
-    var listItemNodeType = nodeType || state.schema.nodes.listItem;
-    var $from = selection.$from, $to = selection.$to;
-    var range = $from.blockRange($to, function (node) { return node.childCount && node.firstChild.type === listItemNodeType; });
-    if (!range || range.depth < 2 || $from.node(range.depth - 1).type !== listItemNodeType) {
-        return tr;
-    }
-    var end = range.end;
-    var endOfList = $to.end(range.depth);
-    if (end < endOfList) {
-        tr.step(new ReplaceAroundStep(end - 1, endOfList, end, endOfList, new Slice(Fragment.from(listItemNodeType.create(undefined, range.parent.copy())), 1, 0), 1, true));
-        range = new NodeRange(tr.doc.resolve($from.pos), tr.doc.resolve(endOfList), range.depth);
-    }
-    return tr.lift(range, liftTarget(range)).scrollIntoView();
-}
-function liftFollowingList(state, from, to, rootListDepthNum, tr, listItem) {
-    // Function will lift list item following selection to level-1.
-    if (!listItem) {
-        listItem = state.schema.nodes.listItem;
-    }
-    var lifted = false;
-    tr.doc.nodesBetween(from, to, function (node, pos) {
-        if (!lifted && node.type === listItem && pos > from) {
-            lifted = true;
-            var listDepth = rootListDepthNum + 3;
-            while (listDepth > rootListDepthNum + 2) {
-                var start = tr.doc.resolve(tr.mapping.map(pos));
-                listDepth = start.depth;
-                var end = tr.doc.resolve(tr.mapping.map(pos + node.textContent.length));
-                var sel = new TextSelection(start, end);
-                tr = liftListItem(state, sel, tr, listItem);
-            }
-        }
-    });
-    return tr;
-}
-function isRangeOfType(doc, $from, $to, nodeType) {
-    // Step through block-nodes between $from and $to and returns false if a node is
-    // found that isn't of the specified type
-    return getAncestorNodesBetween(doc, $from, $to).filter(function (node) { return node.type !== nodeType; }).length === 0;
-}
-function getAncestorNodesBetween(doc, $from, $to) {
-    // Returns all top-level ancestor-nodes between $from and $to
-    var nodes = Array();
-    var maxDepth = findAncestorPosition(doc, $from).depth;
-    var current = doc.resolve($from.start(maxDepth));
-    while (current.pos <= $to.start($to.depth)) {
-        var depth = Math.min(current.depth, maxDepth);
-        var node = current.node(depth);
-        if (node) {
-            nodes.push(node);
-        }
-        if (depth === 0) {
-            break;
-        }
-        var next = doc.resolve(current.after(depth));
-        if (next.start(depth) >= doc.nodeSize - 2) {
-            break;
-        }
-        if (next.depth !== current.depth) {
-            next = doc.resolve(next.pos + 2);
-        }
-        if (next.depth) {
-            current = doc.resolve(next.start(next.depth));
-        }
-        else {
-            current = doc.resolve(next.end(next.depth));
-        }
-    }
-    return nodes;
-}
-function findAncestorPosition(doc, pos) {
-    // Traverse the document until an "ancestor" is found. Any nestable block can be an ancestor.
-    var nestableBlocks = ['blockquote', 'bulletList', 'orderedList'];
-    if (pos.depth === 1) {
-        return pos;
-    }
-    var node = pos.node(pos.depth);
-    var newPos = pos;
-    while (pos.depth >= 1) {
-        pos = doc.resolve(pos.before(pos.depth));
-        node = pos.node(pos.depth);
-        if (node && nestableBlocks.indexOf(node.type.name) !== -1) {
-            newPos = pos;
-        }
-    }
-    return newPos;
-}
-function liftListItems(options) {
-    return function (state, dispatch) {
-        var tr = state.tr;
-        var _a = state.selection, $from = _a.$from, $to = _a.$to;
-        tr.doc.nodesBetween($from.pos, $to.pos, function (node, pos) {
-            // Following condition will ensure that block types `paragraph`, `heading`, `codeBlock`, `blockquote`, `div` are lifted.
-            // isTextblock is true for paragraph, heading, codeBlock.
-            if (node.isTextblock || node.type.name === 'blockquote' || node.type.name === 'div') {
-                var sel = new NodeSelection(tr.doc.resolve(tr.mapping.map(pos)));
-                var range = sel.$from.blockRange(sel.$to);
-                if (!range || sel.$from.parent.type !== state.schema.nodes[options.listItem]) {
-                    return false;
-                }
-                var target = range && liftTarget(range);
-                if (target === undefined || target === null) {
-                    return false;
-                }
-                tr.lift(range, target);
-            }
-        });
-        if (dispatch) {
-            dispatch(tr);
-        }
-        return true;
-    };
-}
-function wrapInList(nodeType, attrs) {
-    if (attrs === void 0) { attrs = {}; }
-    return autoJoin(pmWrapInList(nodeType, attrs), function (before, after) { return before.type === after.type && before.type === nodeType; });
-}
-var toggleList = function (state, dispatch, view, options, command) {
-    var listType = options.listType;
-    var selection = state.selection;
-    var fromNode = selection.$from.node(selection.$from.depth - 2);
-    var endNode = selection.$to.node(selection.$to.depth - 2);
-    if (!fromNode || fromNode.type.name !== listType || (!endNode || endNode.type.name !== listType)) {
-        return toggleListCommand(options)(state, dispatch, view);
-    }
-    else {
-        var nodes = view.state.schema.nodes;
-        var listNodes = {
-            bulletList: nodes[options.bulletList],
-            orderedList: nodes[options.orderedList],
-            listItem: nodes[options.listItem]
-        };
-        var depth = rootListDepth(selection.$to, listNodes);
-        var tr = liftFollowingList(state, selection.$to.pos, selection.$to.end(depth), depth, view.state.tr, listNodes.listItem);
-        tr = liftSelectionList(state, tr, options);
-        tr.setMeta('commandName', command);
-        dispatch(tr);
-        return true;
-    }
-};
 var parentNode = function (state, nodeType) {
     var _a = state.selection, from = _a.from, to = _a.to;
     var result = null;
@@ -251,12 +22,6 @@ var parentNode = function (state, nodeType) {
     });
     return result;
 };
-var reListStyle = /list\-style\-type:\s?([\w-]+)/;
-var getListStyle = function (node) {
-    var style = node.attrs.style;
-    var listStyle = reListStyle.exec(style);
-    return (listStyle && listStyle[1]) || '';
-};
 /**
  * @hidden
  */
@@ -272,12 +37,7 @@ export var ListTool = function (props) {
         var nodes = state && state.schema.nodes;
         ol = nodes && parentNode(state, nodes[types.orderedList]);
         ul = nodes && parentNode(state, nodes[types.bulletList]);
-        if (listType === types.orderedList) {
-            isActive = Boolean(ol && !ul);
-        }
-        else {
-            isActive = Boolean(!ol && ul);
-        }
+        isActive = Boolean(listType === types.orderedList ? (ol && !ul) : (!ol && ul));
     }
     var onButtonClick = function (_event) {
         if (view) {
@@ -289,9 +49,9 @@ export var ListTool = function (props) {
         if (view) {
             var listAttrs = event.item.style ? { style: 'list-style-type: ' + event.item.style + ';' } : {};
             var currentList = ol || ul;
-            if (currentList && getListStyle(currentList) !== event.item.style) {
+            if (currentList && listStyle(currentList.attrs) !== event.item.style) {
                 var pos = view.state.selection.$head.posAtIndex(0, -2) - 1;
-                view.dispatch(view.state.tr.setNodeMarkup(pos, view.state.schema.nodes[listType], { style: 'list-style-type: ' + event.item.style + ';' }));
+                view.dispatch(view.state.tr.setNodeMarkup(pos, view.state.schema.nodes[listType], listAttrs));
             }
             else {
                 toggleList(view.state, view.dispatch, view, __assign({ listType: listType }, types, { listAttrs: listAttrs }), 'InsertList');
@@ -300,9 +60,9 @@ export var ListTool = function (props) {
         }
     };
     if (isActive && (ol || ul)) {
-        var listStyleType_1 = getListStyle(ol || ul);
-        items = listStyleType_1 ? items.map(function (i) { return (__assign({}, i, { selected: i.style === listStyleType_1 })); }) : items;
+        var listStyleType_1 = listStyle((ol || ul).attrs);
+        items = items.map(function (item, index) { return (__assign({}, item, { selected: listStyleType_1 ? item.style === listStyleType_1 : index === 0 })); });
     }
     return (React.createElement("span", { onMouseDown: function (e) { e.preventDefault(); } },
-        React.createElement(SplitButton, { textField: "text", items: items, icon: props.icon, onButtonClick: onButtonClick, onItemClick: onItemClick, buttonClass: isActive ? 'k-state-selected k-selected' : '' })));
+        React.createElement(SplitButton, { textField: "text", items: items, icon: props.icon, onButtonClick: onButtonClick, onItemClick: onItemClick, buttonClass: isActive ? 'k-selected' : undefined })));
 };

package/dist/es/tools/main.js

@@ -412,7 +412,7 @@ export var EditorTools;
     EditorTools.BulletedList = function (props) {
         var ulItems = [
             { icon: 'list-unordered', text: 'Disc', style: 'disc' },
-            // { icon: 'list-unordered-circle', text: 'Circle', style: 'circle' },
+            // { icon: 'list-unordered-outline', text: 'Circle', style: 'circle' },
             { icon: 'list-unordered-square', text: 'Square', style: 'square' }
         ];
         return (React.createElement(ListTool, __assign({ listType: EditorToolsSettings.bulletList.listType, items: ulItems, icon: "list-unordered" }, props)));

package/dist/npm/Editor.js

@@ -326,6 +326,7 @@ var Editor = /** @class */ (function (_super) {
                 }
             }),
             kendo_editor_common_1.spacesFix(),
+            kendo_editor_common_1.caretColor(),
             kendo_editor_common_1.history(),
             kendo_editor_common_1.dropCursor(),
             kendo_editor_common_1.gapCursor(),

package/dist/npm/package-metadata.js

@@ -7,7 +7,7 @@ exports.packageMetadata = {
     name: '@progress/kendo-react-editor',
     productName: 'KendoReact',
     productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
-    publishDate: 1644490106,
+    publishDate: 1645175078,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-react-ui/my-license/?utm_medium=product&utm_source=kendoreact&utm_campaign=kendo-ui-react-purchase-license-keys-warning'
 };

package/dist/npm/tools/lists-styled.js

@@ -15,235 +15,6 @@ var React = require("react");
 var kendo_editor_common_1 = require("@progress/kendo-editor-common");
 var kendo_react_buttons_1 = require("@progress/kendo-react-buttons");
 var toolsSettings_1 = require("./../config/toolsSettings");
-var rootListDepth = function (pos, nodes) {
-    // Get the depth of the nearest ancestor list
-    var bulletList = nodes.bulletList, orderedList = nodes.orderedList, listItem = nodes.listItem;
-    var depth;
-    for (var i = pos.depth - 1; i > 0; i--) {
-        var node = pos.node(i);
-        if (node.type === bulletList || node.type === orderedList) {
-            depth = i;
-        }
-        if (node.type !== bulletList && node.type !== orderedList && node.type !== listItem) {
-            break;
-        }
-    }
-    return depth;
-};
-var getListLiftTarget = function (schema, resPos, options) {
-    // This will return (depth - 1) for root list parent of a list.
-    var target = resPos.depth;
-    var bulletList = schema.nodes[options.bulletList];
-    var orderedList = schema.nodes[options.orderedList];
-    var listItem = schema.nodes[options.listItem];
-    for (var i = resPos.depth; i > 0; i--) {
-        var node = resPos.node(i);
-        if (node.type === bulletList || node.type === orderedList) {
-            target = i;
-        }
-        if (node.type !== bulletList && node.type !== orderedList && node.type !== listItem) {
-            break;
-        }
-    }
-    return target - 1;
-};
-function liftSelectionList(state, tr, options) {
-    // The function will list paragraphs in selection out to level 1 below root list.
-    var _a = state.selection, from = _a.from, to = _a.to;
-    var _b = state.schema.nodes, paragraph = _b.paragraph, heading = _b.heading;
-    var listCol = [];
-    tr.doc.nodesBetween(from, to, function (node, pos) {
-        if (node.type === paragraph || node.type === heading) {
-            listCol.push({ node: node, pos: pos });
-        }
-    });
-    for (var i = listCol.length - 1; i >= 0; i--) {
-        var block = listCol[i];
-        var start = tr.doc.resolve(tr.mapping.map(block.pos));
-        if (start.depth > 0) {
-            var end = void 0;
-            if (block.node.textContent && block.node.textContent.length > 0) {
-                end = tr.doc.resolve(tr.mapping.map(block.pos + block.node.textContent.length));
-            }
-            else {
-                end = tr.doc.resolve(tr.mapping.map(block.pos + 1));
-            }
-            var range = start.blockRange(end);
-            if (range) {
-                tr.lift(range, getListLiftTarget(state.schema, start, options));
-            }
-        }
-    }
-    return tr;
-}
-function toggleListCommand(options) {
-    return function (state, dispatch, view) {
-        if (!view) {
-            return false;
-        }
-        state = view.state;
-        var listNode = state.schema.nodes[options.listType];
-        var _a = state.selection, $from = _a.$from, $to = _a.$to;
-        var parent = $from.node(-2);
-        var grandgrandParent = $from.node(-3);
-        var isRangeOfSingleType = isRangeOfType(state.doc, $from, $to, listNode);
-        if (((parent && parent.type === listNode) ||
-            (grandgrandParent && grandgrandParent.type === listNode)) &&
-            isRangeOfSingleType) {
-            // Untoggles list
-            return liftListItems(options)(state, dispatch);
-        }
-        else {
-            // Wraps selection in list and converts list type e.g. bullet_list -> ordered_list if needed
-            if (!isRangeOfSingleType) {
-                liftListItems(options)(state, dispatch);
-                state = view.state;
-            }
-            return wrapInList(listNode, options.listAttrs)(state, dispatch);
-        }
-    };
-}
-function liftListItem(state, selection, tr, nodeType) {
-    var listItemNodeType = nodeType || state.schema.nodes.listItem;
-    var $from = selection.$from, $to = selection.$to;
-    var range = $from.blockRange($to, function (node) { return node.childCount && node.firstChild.type === listItemNodeType; });
-    if (!range || range.depth < 2 || $from.node(range.depth - 1).type !== listItemNodeType) {
-        return tr;
-    }
-    var end = range.end;
-    var endOfList = $to.end(range.depth);
-    if (end < endOfList) {
-        tr.step(new kendo_editor_common_1.ReplaceAroundStep(end - 1, endOfList, end, endOfList, new kendo_editor_common_1.Slice(kendo_editor_common_1.Fragment.from(listItemNodeType.create(undefined, range.parent.copy())), 1, 0), 1, true));
-        range = new kendo_editor_common_1.NodeRange(tr.doc.resolve($from.pos), tr.doc.resolve(endOfList), range.depth);
-    }
-    return tr.lift(range, kendo_editor_common_1.liftTarget(range)).scrollIntoView();
-}
-function liftFollowingList(state, from, to, rootListDepthNum, tr, listItem) {
-    // Function will lift list item following selection to level-1.
-    if (!listItem) {
-        listItem = state.schema.nodes.listItem;
-    }
-    var lifted = false;
-    tr.doc.nodesBetween(from, to, function (node, pos) {
-        if (!lifted && node.type === listItem && pos > from) {
-            lifted = true;
-            var listDepth = rootListDepthNum + 3;
-            while (listDepth > rootListDepthNum + 2) {
-                var start = tr.doc.resolve(tr.mapping.map(pos));
-                listDepth = start.depth;
-                var end = tr.doc.resolve(tr.mapping.map(pos + node.textContent.length));
-                var sel = new kendo_editor_common_1.TextSelection(start, end);
-                tr = liftListItem(state, sel, tr, listItem);
-            }
-        }
-    });
-    return tr;
-}
-function isRangeOfType(doc, $from, $to, nodeType) {
-    // Step through block-nodes between $from and $to and returns false if a node is
-    // found that isn't of the specified type
-    return getAncestorNodesBetween(doc, $from, $to).filter(function (node) { return node.type !== nodeType; }).length === 0;
-}
-function getAncestorNodesBetween(doc, $from, $to) {
-    // Returns all top-level ancestor-nodes between $from and $to
-    var nodes = Array();
-    var maxDepth = findAncestorPosition(doc, $from).depth;
-    var current = doc.resolve($from.start(maxDepth));
-    while (current.pos <= $to.start($to.depth)) {
-        var depth = Math.min(current.depth, maxDepth);
-        var node = current.node(depth);
-        if (node) {
-            nodes.push(node);
-        }
-        if (depth === 0) {
-            break;
-        }
-        var next = doc.resolve(current.after(depth));
-        if (next.start(depth) >= doc.nodeSize - 2) {
-            break;
-        }
-        if (next.depth !== current.depth) {
-            next = doc.resolve(next.pos + 2);
-        }
-        if (next.depth) {
-            current = doc.resolve(next.start(next.depth));
-        }
-        else {
-            current = doc.resolve(next.end(next.depth));
-        }
-    }
-    return nodes;
-}
-function findAncestorPosition(doc, pos) {
-    // Traverse the document until an "ancestor" is found. Any nestable block can be an ancestor.
-    var nestableBlocks = ['blockquote', 'bulletList', 'orderedList'];
-    if (pos.depth === 1) {
-        return pos;
-    }
-    var node = pos.node(pos.depth);
-    var newPos = pos;
-    while (pos.depth >= 1) {
-        pos = doc.resolve(pos.before(pos.depth));
-        node = pos.node(pos.depth);
-        if (node && nestableBlocks.indexOf(node.type.name) !== -1) {
-            newPos = pos;
-        }
-    }
-    return newPos;
-}
-function liftListItems(options) {
-    return function (state, dispatch) {
-        var tr = state.tr;
-        var _a = state.selection, $from = _a.$from, $to = _a.$to;
-        tr.doc.nodesBetween($from.pos, $to.pos, function (node, pos) {
-            // Following condition will ensure that block types `paragraph`, `heading`, `codeBlock`, `blockquote`, `div` are lifted.
-            // isTextblock is true for paragraph, heading, codeBlock.
-            if (node.isTextblock || node.type.name === 'blockquote' || node.type.name === 'div') {
-                var sel = new kendo_editor_common_1.NodeSelection(tr.doc.resolve(tr.mapping.map(pos)));
-                var range = sel.$from.blockRange(sel.$to);
-                if (!range || sel.$from.parent.type !== state.schema.nodes[options.listItem]) {
-                    return false;
-                }
-                var target = range && kendo_editor_common_1.liftTarget(range);
-                if (target === undefined || target === null) {
-                    return false;
-                }
-                tr.lift(range, target);
-            }
-        });
-        if (dispatch) {
-            dispatch(tr);
-        }
-        return true;
-    };
-}
-function wrapInList(nodeType, attrs) {
-    if (attrs === void 0) { attrs = {}; }
-    return kendo_editor_common_1.autoJoin(kendo_editor_common_1.wrapInList(nodeType, attrs), function (before, after) { return before.type === after.type && before.type === nodeType; });
-}
-var toggleList = function (state, dispatch, view, options, command) {
-    var listType = options.listType;
-    var selection = state.selection;
-    var fromNode = selection.$from.node(selection.$from.depth - 2);
-    var endNode = selection.$to.node(selection.$to.depth - 2);
-    if (!fromNode || fromNode.type.name !== listType || (!endNode || endNode.type.name !== listType)) {
-        return toggleListCommand(options)(state, dispatch, view);
-    }
-    else {
-        var nodes = view.state.schema.nodes;
-        var listNodes = {
-            bulletList: nodes[options.bulletList],
-            orderedList: nodes[options.orderedList],
-            listItem: nodes[options.listItem]
-        };
-        var depth = rootListDepth(selection.$to, listNodes);
-        var tr = liftFollowingList(state, selection.$to.pos, selection.$to.end(depth), depth, view.state.tr, listNodes.listItem);
-        tr = liftSelectionList(state, tr, options);
-        tr.setMeta('commandName', command);
-        dispatch(tr);
-        return true;
-    }
-};
 var parentNode = function (state, nodeType) {
     var _a = state.selection, from = _a.from, to = _a.to;
     var result = null;
@@ -253,12 +24,6 @@ var parentNode = function (state, nodeType) {
     });
     return result;
 };
-var reListStyle = /list\-style\-type:\s?([\w-]+)/;
-var getListStyle = function (node) {
-    var style = node.attrs.style;
-    var listStyle = reListStyle.exec(style);
-    return (listStyle && listStyle[1]) || '';
-};
 /**
  * @hidden
  */
@@ -274,16 +39,11 @@ exports.ListTool = function (props) {
         var nodes = state && state.schema.nodes;
         ol = nodes && parentNode(state, nodes[types.orderedList]);
         ul = nodes && parentNode(state, nodes[types.bulletList]);
-        if (listType === types.orderedList) {
-            isActive = Boolean(ol && !ul);
-        }
-        else {
-            isActive = Boolean(!ol && ul);
-        }
+        isActive = Boolean(listType === types.orderedList ? (ol && !ul) : (!ol && ul));
     }
     var onButtonClick = function (_event) {
         if (view) {
-            toggleList(view.state, view.dispatch, view, __assign({ listType: listType }, types, { listAttrs: {} }), 'InsertList');
+            kendo_editor_common_1.toggleList(view.state, view.dispatch, view, __assign({ listType: listType }, types, { listAttrs: {} }), 'InsertList');
             view.focus();
         }
     };
@@ -291,20 +51,20 @@ exports.ListTool = function (props) {
         if (view) {
             var listAttrs = event.item.style ? { style: 'list-style-type: ' + event.item.style + ';' } : {};
             var currentList = ol || ul;
-            if (currentList && getListStyle(currentList) !== event.item.style) {
+            if (currentList && kendo_editor_common_1.listStyle(currentList.attrs) !== event.item.style) {
                 var pos = view.state.selection.$head.posAtIndex(0, -2) - 1;
-                view.dispatch(view.state.tr.setNodeMarkup(pos, view.state.schema.nodes[listType], { style: 'list-style-type: ' + event.item.style + ';' }));
+                view.dispatch(view.state.tr.setNodeMarkup(pos, view.state.schema.nodes[listType], listAttrs));
             }
             else {
-                toggleList(view.state, view.dispatch, view, __assign({ listType: listType }, types, { listAttrs: listAttrs }), 'InsertList');
+                kendo_editor_common_1.toggleList(view.state, view.dispatch, view, __assign({ listType: listType }, types, { listAttrs: listAttrs }), 'InsertList');
             }
             view.focus();
         }
     };
     if (isActive && (ol || ul)) {
-        var listStyleType_1 = getListStyle(ol || ul);
-        items = listStyleType_1 ? items.map(function (i) { return (__assign({}, i, { selected: i.style === listStyleType_1 })); }) : items;
+        var listStyleType_1 = kendo_editor_common_1.listStyle((ol || ul).attrs);
+        items = items.map(function (item, index) { return (__assign({}, item, { selected: listStyleType_1 ? item.style === listStyleType_1 : index === 0 })); });
     }
     return (React.createElement("span", { onMouseDown: function (e) { e.preventDefault(); } },
-        React.createElement(kendo_react_buttons_1.SplitButton, { textField: "text", items: items, icon: props.icon, onButtonClick: onButtonClick, onItemClick: onItemClick, buttonClass: isActive ? 'k-state-selected k-selected' : '' })));
+        React.createElement(kendo_react_buttons_1.SplitButton, { textField: "text", items: items, icon: props.icon, onButtonClick: onButtonClick, onItemClick: onItemClick, buttonClass: isActive ? 'k-selected' : undefined })));
 };

package/dist/npm/tools/main.js

@@ -414,7 +414,7 @@ var EditorTools;
     EditorTools.BulletedList = function (props) {
         var ulItems = [
             { icon: 'list-unordered', text: 'Disc', style: 'disc' },
-            // { icon: 'list-unordered-circle', text: 'Circle', style: 'circle' },
+            // { icon: 'list-unordered-outline', text: 'Circle', style: 'circle' },
             { icon: 'list-unordered-square', text: 'Square', style: 'square' }
         ];
         return (React.createElement(lists_styled_1.ListTool, __assign({ listType: toolsSettings_1.EditorToolsSettings.bulletList.listType, items: ulItems, icon: "list-unordered" }, props)));