@manuscripts/body-editor 1.6.10 → 1.6.12

package/dist/cjs/toolbar.js

@@ -21,32 +21,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toolbar = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_commands_1 = require("prosemirror-commands");
-const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const commands_1 = require("./commands");
-const OrderListSelector_1 = require("./components/toolbar/OrderListSelector");
 const icons_1 = __importDefault(require("./icons"));
-const list_1 = require("./keys/list");
 exports.toolbar = {
     style: {
         bold: {
             title: 'Toggle bold',
             content: icons_1.default.bold,
-            active: (0, commands_1.markActive)(transform_1.schema.marks.bold),
-            enable: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.bold),
+            isActive: (0, commands_1.markActive)(transform_1.schema.marks.bold),
+            isEnabled: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.bold),
             run: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.bold),
         },
         italic: {
             title: 'Toggle italic',
             content: icons_1.default.italic,
-            active: (0, commands_1.markActive)(transform_1.schema.marks.italic),
-            enable: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.italic),
+            isActive: (0, commands_1.markActive)(transform_1.schema.marks.italic),
+            isEnabled: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.italic),
             run: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.italic),
         },
         underline: {
             title: 'Toggle underline',
             content: icons_1.default.underline,
-            active: (0, commands_1.markActive)(transform_1.schema.marks.underline),
-            enable: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.underline),
+            isActive: (0, commands_1.markActive)(transform_1.schema.marks.underline),
+            isEnabled: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.underline),
             run: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.underline),
         },
     },
@@ -54,15 +51,15 @@ exports.toolbar = {
         subscript: {
             title: 'Toggle subscript',
             content: icons_1.default.subscript,
-            active: (0, commands_1.markActive)(transform_1.schema.marks.subscript),
-            enable: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.subscript),
+            isActive: (0, commands_1.markActive)(transform_1.schema.marks.subscript),
+            isEnabled: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.subscript),
             run: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.subscript),
         },
         superscript: {
             title: 'Toggle superscript',
             content: icons_1.default.superscript,
-            active: (0, commands_1.markActive)(transform_1.schema.marks.superscript),
-            enable: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.superscript),
+            isActive: (0, commands_1.markActive)(transform_1.schema.marks.superscript),
+            isEnabled: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.superscript),
             run: (0, prosemirror_commands_1.toggleMark)(transform_1.schema.marks.superscript),
         },
     },
@@ -70,31 +67,36 @@ exports.toolbar = {
         bullet_list: {
             title: 'Wrap in bullet list',
             content: icons_1.default.bullet_list,
-            active: (0, commands_1.blockActive)(transform_1.schema.nodes.bullet_list),
-            enable: (0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list),
-            run: (0, list_1.skipTrackingChanges)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list)),
+            isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.bullet_list),
+            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list),
+            run: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list),
         },
         ordered_list: {
             title: 'Wrap in ordered list',
-            active: (0, commands_1.blockActive)(transform_1.schema.nodes.ordered_list),
-            enable: (0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.ordered_list),
-            run: (0, list_1.skipTrackingChanges)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.ordered_list, {
-                listStyleType: 'order',
-            })),
-            Component: OrderListSelector_1.OrderListSelector,
+            content: icons_1.default.ordered_list,
+            isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.ordered_list),
+            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order'),
+            run: (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order'),
+            options: {
+                order: (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order'),
+                'alpha-upper': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-upper'),
+                'alpha-lower': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-lower'),
+                'roman-upper': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-upper'),
+                'roman-lower': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-lower'),
+            },
         },
     },
     inline: {
         citation: {
             title: 'Insert citation',
             content: icons_1.default.citation,
-            enable: (0, commands_1.canInsert)(transform_1.schema.nodes.citation),
+            isEnabled: (0, commands_1.canInsert)(transform_1.schema.nodes.citation),
             run: commands_1.insertInlineCitation,
         },
-        highlight: {
+        comment: {
             title: 'Insert comment',
             content: icons_1.default.highlight,
-            enable: (0, commands_1.canInsert)(transform_1.schema.nodes.highlight_marker),
+            isEnabled: (0, commands_1.canInsert)(transform_1.schema.nodes.highlight_marker),
             run: commands_1.addComment,
         },
     },
@@ -102,26 +104,20 @@ exports.toolbar = {
         figure_element: {
             title: 'Insert figure',
             content: icons_1.default.figure_element,
-            enable: (0, commands_1.canInsert)(transform_1.schema.nodes.figure_element),
+            isEnabled: (0, commands_1.canInsert)(transform_1.schema.nodes.figure_element),
             run: (0, commands_1.insertBlock)(transform_1.schema.nodes.figure_element),
         },
         table_element: {
             title: 'Insert table',
             content: icons_1.default.table_element,
-            enable: (0, commands_1.canInsert)(transform_1.schema.nodes.table_element),
+            isEnabled: (0, commands_1.canInsert)(transform_1.schema.nodes.table_element),
             run: (0, commands_1.insertBlock)(transform_1.schema.nodes.table_element),
         },
         equation_element: {
             title: 'Insert equation',
             content: icons_1.default.equation_element,
-            enable: (0, commands_1.canInsert)(transform_1.schema.nodes.equation_element),
+            isEnabled: (0, commands_1.canInsert)(transform_1.schema.nodes.equation_element),
             run: (0, commands_1.insertBlock)(transform_1.schema.nodes.equation_element),
         },
-        listing_element: {
-            title: 'Insert listing',
-            content: icons_1.default.listing_element,
-            enable: (0, commands_1.canInsert)(transform_1.schema.nodes.listing_element),
-            run: (0, commands_1.insertBlock)(transform_1.schema.nodes.listing_element),
-        },
     },
 };

package/dist/cjs/views/editable_block.js

@@ -26,13 +26,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditableBlock = void 0;
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_utils_1 = require("prosemirror-utils");
 const context_menu_1 = require("../lib/context-menu");
 const isNotNull = (a) => a !== null;
+const hasParent = ($pos, type) => {
+    return !!(0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, type);
+};
 const EditableBlock = (Base) => {
     return class extends Base {
         constructor() {
             super(...arguments);
-            this.gutterButtons = () => [this.createAddButton(true), this.createEditButton()].filter(isNotNull);
+            this.gutterButtons = () => [this.createAddButton(), this.createEditButton()].filter(isNotNull);
             this.actionGutterButtons = () => [this.createSyncWarningButton()].filter(isNotNull);
             this.createSyncWarningButton = () => {
                 var _a;
@@ -68,13 +72,17 @@ const EditableBlock = (Base) => {
                 });
                 return warningButton;
             };
-            this.createAddButton = (after) => {
+            this.createAddButton = () => {
                 var _a;
-                const $pos = this.view.state.doc.resolve(this.getPos());
                 const hasAccess = (_a = this.props.getCapabilities()) === null || _a === void 0 ? void 0 : _a.editArticle;
-                if (!hasAccess || $pos.parent.type === transform_1.schema.nodes.keywords) {
+                if (!hasAccess) {
+                    return null;
+                }
+                const $pos = this.view.state.doc.resolve(this.getPos());
+                if (hasParent($pos, transform_1.schema.nodes.keywords)) {
                     return null;
                 }
+                const after = !hasParent($pos, transform_1.schema.nodes.bibliography_section);
                 const button = document.createElement('a');
                 button.classList.add('add-block');
                 button.classList.add(after ? 'add-block-after' : 'add-block-before');

package/dist/es/commands.js

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 import { ObjectTypes } from '@manuscripts/json-schema';
-import { buildComment, buildInlineMathFragment, generateID, isElementNodeType, isInBibliographySection, isSectionNodeType, schema, } from '@manuscripts/transform';
+import { skipTracking } from '@manuscripts/track-changes-plugin';
+import { buildComment, buildInlineMathFragment, generateID, isElementNodeType, isInBibliographySection, isListNode, isSectionNodeType, schema, } from '@manuscripts/transform';
 import { NodeRange } from 'prosemirror-model';
+import { wrapInList } from 'prosemirror-schema-list';
 import { NodeSelection, TextSelection, } from 'prosemirror-state';
 import { findWrapping } from 'prosemirror-transform';
-import { findChildrenByType, findParentNodeOfType } from 'prosemirror-utils';
+import { findChildrenByType, findParentNodeOfType, } from 'prosemirror-utils';
+import { skipCommandTracking } from './keys/list';
 import { isNodeOfType, nearestAncestor } from './lib/helpers';
 import { findParentNodeWithId, getChildOfType } from './lib/utils';
 import { commentAnnotation } from './plugins/comment_annotation';
@@ -319,6 +322,58 @@ export const insertSection = (subsection = false) => (state, dispatch) => {
     }
     return true;
 };
+const findSelectedList = findParentNodeOfType([
+    schema.nodes.ordered_list,
+    schema.nodes.bullet_list,
+]);
+const findRootList = ($pos) => {
+    for (let i = 0; i <= $pos.depth; i++) {
+        const node = $pos.node(i);
+        if (isListNode(node)) {
+            const pos = $pos.start(i);
+            return {
+                node,
+                pos,
+            };
+        }
+    }
+};
+const findListsAtSameLevel = (doc, list) => {
+    const $pos = doc.resolve(list.pos + 1);
+    const root = findRootList($pos);
+    if (!root) {
+        return [list];
+    }
+    const target = $pos.depth;
+    const lists = [];
+    root.node.descendants((node, pos) => {
+        const $pos = doc.resolve(root.pos + pos + 1);
+        if ($pos.depth === target && isListNode(node)) {
+            lists.push({ node, pos: $pos.before(target) });
+        }
+        return $pos.depth <= target;
+    });
+    return lists;
+};
+export const insertList = (type, style) => (state, dispatch) => {
+    const list = findSelectedList(state.selection);
+    if (list) {
+        if (!dispatch) {
+            return true;
+        }
+        const nodes = findListsAtSameLevel(state.doc, list);
+        const tr = state.tr;
+        for (const { node, pos } of nodes) {
+            tr.setNodeMarkup(pos, type, Object.assign(Object.assign({}, node.attrs), { listStyleType: style }), node.marks);
+        }
+        dispatch(skipTracking(tr));
+        return true;
+    }
+    else {
+        const command = wrapInList(type, { listStyleType: style });
+        return skipCommandTracking(command)(state, dispatch);
+    }
+};
 export const insertBibliographySection = (state, dispatch) => {
     return false;
 };

package/dist/es/components/toolbar/LevelSelector.js

@@ -1,5 +1,5 @@
 /*!
- * © 2019 Atypon Systems LLC
+ * © 2024 Atypon Systems LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -320,7 +320,7 @@ const buildOptions = (state, dispatch, view) => {
             }));
             return [{ options: typeOptions }, { options: sectionOptions }];
         }
-        case parentElementType.schema.nodes.bullet_list: {
+        case schema.nodes.bullet_list: {
             return [
                 {
                     options: [

package/dist/es/index.js

@@ -15,16 +15,14 @@
  */
 export * from './citation-sources';
 export * from './commands';
-export * from './components/application-menu';
-export { DialogController, DialogNames } from './components/dialog';
 export { ManuscriptOutline } from './components/outline/ManuscriptOutline';
 export { OutlineItemIcon } from './components/outline/Outline';
 export { OutlineManuscript } from './components/outline/OutlineManuscript';
-export { ManuscriptToolbar, } from './components/toolbar/ManuscriptToolbar';
+export { LevelSelector } from './components/toolbar/LevelSelector';
 export * from './menus';
 export { CollabProvider } from './classes/collabProvider';
 export { PopperManager } from './lib/popper';
-export { toolbar } from './toolbar';
+export * from './toolbar';
 export * from './plugins/highlight';
 export { commentScroll, isThereSelector, isHighlightComment, } from './plugins/comment_annotation';
 export * from './lib/utils';

package/dist/es/keys/list.js

@@ -16,7 +16,7 @@
 import { skipTracking } from '@manuscripts/track-changes-plugin';
 import { schema } from '@manuscripts/transform';
 import { liftListItem, sinkListItem, splitListItem, wrapInList, } from 'prosemirror-schema-list';
-export const skipTrackingChanges = (command) => (state, dispatch) => {
+export const skipCommandTracking = (command) => (state, dispatch) => {
     command(state, (tr) => {
         if (dispatch) {
             skipTracking(tr);
@@ -45,11 +45,11 @@ const liftToOuterList = (itemType) => {
 };
 const listKeymap = {
     Enter: splitListItem(schema.nodes.list_item),
-    'Mod-[': skipTrackingChanges(liftToOuterList(schema.nodes.list_item)),
-    'Mod-]': skipTrackingChanges(sinkListItem(schema.nodes.list_item)),
-    'Mod-Alt-o': skipTrackingChanges(wrapInList(schema.nodes.ordered_list)),
-    'Mod-Alt-k': skipTrackingChanges(wrapInList(schema.nodes.bullet_list)),
-    'Shift-Tab': skipTrackingChanges(liftToOuterList(schema.nodes.list_item)),
-    Tab: skipTrackingChanges(sinkListItem(schema.nodes.list_item)),
+    'Mod-[': skipCommandTracking(liftToOuterList(schema.nodes.list_item)),
+    'Mod-]': skipCommandTracking(sinkListItem(schema.nodes.list_item)),
+    'Mod-Alt-o': skipCommandTracking(wrapInList(schema.nodes.ordered_list)),
+    'Mod-Alt-k': skipCommandTracking(wrapInList(schema.nodes.bullet_list)),
+    'Shift-Tab': skipCommandTracking(liftToOuterList(schema.nodes.list_item)),
+    Tab: skipCommandTracking(sinkListItem(schema.nodes.list_item)),
 };
 export default listKeymap;