@manuscripts/body-editor 1.10.0 → 1.10.1-LEAN-3607.0

package/dist/cjs/commands.js

@@ -24,7 +24,6 @@ const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_transform_1 = require("prosemirror-transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
-const list_1 = require("./keys/list");
 const helpers_1 = require("./lib/helpers");
 const track_changes_utils_1 = require("./lib/track-changes-utils");
 const utils_1 = require("./lib/utils");
@@ -450,7 +449,7 @@ function toggleOffList(state, dispatch) {
         return false;
     }
 }
-const insertList = (type, style) => (state, dispatch) => {
+const insertList = (type, style) => (state, dispatch, view) => {
     const list = findSelectedList(state.selection);
     if (list) {
         if (!dispatch) {
@@ -468,8 +467,23 @@ const insertList = (type, style) => (state, dispatch) => {
         return true;
     }
     else {
-        const command = (0, prosemirror_schema_list_1.wrapInList)(type, { listStyleType: style });
-        return (0, list_1.skipCommandTracking)(command)(state, dispatch);
+        const { selection } = state;
+        let tr = state.tr;
+        return (0, prosemirror_schema_list_1.wrapInList)(type, { listStyleType: style })(state, (tempTr) => {
+            const range = selection.$from.blockRange(selection.$to);
+            if (range && dispatch) {
+                tempTr.steps.map((step) => {
+                    if (step instanceof prosemirror_transform_1.ReplaceAroundStep) {
+                        dispatch(tr.step(step));
+                        tr = (view === null || view === void 0 ? void 0 : view.state.tr) || tr;
+                    }
+                    else {
+                        tr.step(step);
+                    }
+                });
+                dispatch(tr);
+            }
+        });
     }
 };
 exports.insertList = insertList;

package/dist/cjs/configs/editor-views.js

@@ -38,6 +38,7 @@ const inline_footnote_editable_1 = __importDefault(require("../views/inline_foot
 const keyword_1 = __importDefault(require("../views/keyword"));
 const keyword_group_1 = __importDefault(require("../views/keyword_group"));
 const link_editable_1 = __importDefault(require("../views/link_editable"));
+const list_item_1 = __importDefault(require("../views/list_item"));
 const listing_editable_1 = __importDefault(require("../views/listing_editable"));
 const listing_element_editable_1 = __importDefault(require("../views/listing_element_editable"));
 const ordered_list_editable_1 = __importDefault(require("../views/ordered_list_editable"));
@@ -75,6 +76,7 @@ exports.default = (props, dispatch) => {
         link: (0, link_editable_1.default)(props, dispatch),
         listing: (0, listing_editable_1.default)(props),
         listing_element: (0, listing_element_editable_1.default)(props),
+        list_item: (0, list_item_1.default)(props),
         ordered_list: (0, ordered_list_editable_1.default)(props),
         paragraph: (0, paragraph_editable_1.default)(props),
         placeholder: (0, placeholder_1.default)(props),

package/dist/cjs/views/bullet_list.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulletListCallback = exports.BulletListView = void 0;
+const track_changes_utils_1 = require("../lib/track-changes-utils");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 const ordered_list_1 = require("./ordered_list");
@@ -30,6 +31,16 @@ class BulletListView extends block_view_1.default {
             if (this.contentDOM) {
                 const type = this.node.attrs.listStyleType || 'bullet';
                 this.contentDOM.style.listStyleType = ordered_list_1.JATS_HTML_LIST_STYLE_MAPPING[type];
+                if (this.node.attrs.dataTracked) {
+                    const classes = (0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked);
+                    this.contentDOM.className = classes.join(' ');
+                    this.dom.setAttribute('data-track-status', this.node.attrs.dataTracked[0].status);
+                    this.dom.setAttribute('data-track-op', this.node.attrs.dataTracked[0].operation);
+                }
+                else {
+                    this.dom.removeAttribute('data-track-status');
+                    this.dom.removeAttribute('data-track-op');
+                }
             }
         };
     }

package/dist/cjs/views/list_item.js

@@ -0,0 +1,39 @@
+"use strict";
+/*!
+ * © 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listItemCallback = exports.ListItemView = void 0;
+const track_changes_utils_1 = require("../lib/track-changes-utils");
+const block_view_1 = __importDefault(require("./block_view"));
+const creators_1 = require("./creators");
+class ListItemView extends block_view_1.default {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'li';
+    }
+}
+exports.ListItemView = ListItemView;
+const listItemCallback = (node, dom) => {
+    if (node.attrs.dataTracked) {
+        const classes = (0, track_changes_utils_1.getChangeClasses)(node.attrs.dataTracked);
+        dom.className = classes.join(' ');
+    }
+};
+exports.listItemCallback = listItemCallback;
+exports.default = (0, creators_1.createNodeOrElementView)(ListItemView, 'li', exports.listItemCallback);

package/dist/cjs/views/ordered_list.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.orderedListCallback = exports.OrderedListView = exports.JATS_HTML_LIST_STYLE_MAPPING = void 0;
+const track_changes_utils_1 = require("../lib/track-changes-utils");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 exports.JATS_HTML_LIST_STYLE_MAPPING = {
@@ -38,6 +39,16 @@ class OrderedListView extends block_view_1.default {
             if (this.contentDOM) {
                 const type = this.node.attrs.listStyleType || 'order';
                 this.contentDOM.style.listStyleType = exports.JATS_HTML_LIST_STYLE_MAPPING[type];
+                if (this.node.attrs.dataTracked) {
+                    const classes = (0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked);
+                    this.contentDOM.className = classes.join(' ');
+                    this.dom.setAttribute('data-track-status', this.node.attrs.dataTracked[0].status);
+                    this.dom.setAttribute('data-track-op', this.node.attrs.dataTracked[0].operation);
+                }
+                else {
+                    this.dom.removeAttribute('data-track-status');
+                    this.dom.removeAttribute('data-track-op');
+                }
             }
         };
     }

package/dist/es/commands.js

@@ -19,9 +19,8 @@ import { buildComment, generateID, isElementNodeType, isFootnoteNode, isInBiblio
 import { NodeRange } from 'prosemirror-model';
 import { wrapInList } from 'prosemirror-schema-list';
 import { NodeSelection, TextSelection, } from 'prosemirror-state';
-import { findWrapping, liftTarget } from 'prosemirror-transform';
+import { findWrapping, liftTarget, ReplaceAroundStep, } from 'prosemirror-transform';
 import { findChildrenByType, findParentNodeOfType, } from 'prosemirror-utils';
-import { skipCommandTracking } from './keys/list';
 import { isNodeOfType, nearestAncestor } from './lib/helpers';
 import { isDeleted, isRejectedInsert } from './lib/track-changes-utils';
 import { findParentNodeWithId, getChildOfType } from './lib/utils';
@@ -428,7 +427,7 @@ function toggleOffList(state, dispatch) {
         return false;
     }
 }
-export const insertList = (type, style) => (state, dispatch) => {
+export const insertList = (type, style) => (state, dispatch, view) => {
     const list = findSelectedList(state.selection);
     if (list) {
         if (!dispatch) {
@@ -446,8 +445,23 @@ export const insertList = (type, style) => (state, dispatch) => {
         return true;
     }
     else {
-        const command = wrapInList(type, { listStyleType: style });
-        return skipCommandTracking(command)(state, dispatch);
+        const { selection } = state;
+        let tr = state.tr;
+        return wrapInList(type, { listStyleType: style })(state, (tempTr) => {
+            const range = selection.$from.blockRange(selection.$to);
+            if (range && dispatch) {
+                tempTr.steps.map((step) => {
+                    if (step instanceof ReplaceAroundStep) {
+                        dispatch(tr.step(step));
+                        tr = (view === null || view === void 0 ? void 0 : view.state.tr) || tr;
+                    }
+                    else {
+                        tr.step(step);
+                    }
+                });
+                dispatch(tr);
+            }
+        });
     }
 };
 export const insertBibliographySection = () => {

package/dist/es/configs/editor-views.js

@@ -33,6 +33,7 @@ import inlineFootnote from '../views/inline_footnote_editable';
 import keyword from '../views/keyword';
 import keywordGroup from '../views/keyword_group';
 import link from '../views/link_editable';
+import list_item from '../views/list_item';
 import listing from '../views/listing_editable';
 import listingElement from '../views/listing_element_editable';
 import orderedList from '../views/ordered_list_editable';
@@ -70,6 +71,7 @@ export default (props, dispatch) => {
         link: link(props, dispatch),
         listing: listing(props),
         listing_element: listingElement(props),
+        list_item: list_item(props),
         ordered_list: orderedList(props),
         paragraph: paragraph(props),
         placeholder: placeholder(props),

package/dist/es/views/bullet_list.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { getChangeClasses } from '../lib/track-changes-utils';
 import BlockView from './block_view';
 import { createNodeOrElementView } from './creators';
 import { JATS_HTML_LIST_STYLE_MAPPING } from './ordered_list';
@@ -24,6 +25,16 @@ export class BulletListView extends BlockView {
             if (this.contentDOM) {
                 const type = this.node.attrs.listStyleType || 'bullet';
                 this.contentDOM.style.listStyleType = JATS_HTML_LIST_STYLE_MAPPING[type];
+                if (this.node.attrs.dataTracked) {
+                    const classes = getChangeClasses(this.node.attrs.dataTracked);
+                    this.contentDOM.className = classes.join(' ');
+                    this.dom.setAttribute('data-track-status', this.node.attrs.dataTracked[0].status);
+                    this.dom.setAttribute('data-track-op', this.node.attrs.dataTracked[0].operation);
+                }
+                else {
+                    this.dom.removeAttribute('data-track-status');
+                    this.dom.removeAttribute('data-track-op');
+                }
             }
         };
     }

package/dist/es/views/list_item.js

@@ -0,0 +1,31 @@
+/*!
+ * © 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getChangeClasses } from '../lib/track-changes-utils';
+import BlockView from './block_view';
+import { createNodeOrElementView } from './creators';
+export class ListItemView extends BlockView {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'li';
+    }
+}
+export const listItemCallback = (node, dom) => {
+    if (node.attrs.dataTracked) {
+        const classes = getChangeClasses(node.attrs.dataTracked);
+        dom.className = classes.join(' ');
+    }
+};
+export default createNodeOrElementView(ListItemView, 'li', listItemCallback);

package/dist/es/views/ordered_list.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { getChangeClasses } from '../lib/track-changes-utils';
 import BlockView from './block_view';
 import { createNodeOrElementView } from './creators';
 export const JATS_HTML_LIST_STYLE_MAPPING = {
@@ -32,6 +33,16 @@ export class OrderedListView extends BlockView {
             if (this.contentDOM) {
                 const type = this.node.attrs.listStyleType || 'order';
                 this.contentDOM.style.listStyleType = JATS_HTML_LIST_STYLE_MAPPING[type];
+                if (this.node.attrs.dataTracked) {
+                    const classes = getChangeClasses(this.node.attrs.dataTracked);
+                    this.contentDOM.className = classes.join(' ');
+                    this.dom.setAttribute('data-track-status', this.node.attrs.dataTracked[0].status);
+                    this.dom.setAttribute('data-track-op', this.node.attrs.dataTracked[0].operation);
+                }
+                else {
+                    this.dom.removeAttribute('data-track-status');
+                    this.dom.removeAttribute('data-track-op');
+                }
             }
         };
     }

package/dist/types/commands.d.ts

@@ -41,7 +41,7 @@ export declare const insertInlineEquation: (state: ManuscriptEditorState, dispat
 export declare const insertInlineFootnote: (kind: 'footnote' | 'endnote') => (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const insertGraphicalAbstract: (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const insertSection: (subsection?: boolean) => (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
-export declare const insertList: (type: ManuscriptNodeType, style?: string) => (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
+export declare const insertList: (type: ManuscriptNodeType, style?: string) => (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
 export declare const insertBibliographySection: () => boolean;
 export declare const insertTOCSection: () => boolean;
 export declare const ifInTableBody: (command: (state: ManuscriptEditorState) => boolean) => (state: ManuscriptEditorState) => boolean;

package/dist/types/configs/editor-views.d.ts

@@ -281,6 +281,7 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         destroy: () => void;
         handleDecorations: (decorations: readonly import("prosemirror-view").Decoration[]) => void;
     } & import("../views/listing_element").ListingElementView<any>>;
+    list_item: import("../types").NodeViewCreator<import("../views/list_item").ListItemView<any>>;
     ordered_list: import("../types").NodeViewCreator<{
         gutterButtons: () => HTMLElement[];
         actionGutterButtons: () => HTMLElement[];

package/dist/types/toolbar.d.ts

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 import { EditorState } from 'prosemirror-state';
+import { EditorView } from 'prosemirror-view';
 import { ReactNode } from 'react';
 import { Dispatch } from './commands';
 export interface ToolbarButtonConfig {
     title: string;
     content: ReactNode;
     isActive?: (state: EditorState) => boolean;
-    run: (state: EditorState, dispatch: Dispatch) => void;
+    run: (state: EditorState, dispatch: Dispatch, view?: EditorView) => void;
     isEnabled: (state: EditorState) => boolean;
     options?: {
-        [key: string]: (state: EditorState, dispatch: Dispatch) => void;
+        [key: string]: (state: EditorState, dispatch: Dispatch, view?: EditorView) => void;
     };
 }
 export interface ToolbarConfig {

package/dist/types/views/list_item.d.ts

@@ -0,0 +1,24 @@
+/*!
+ * © 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ManuscriptNode } from '@manuscripts/transform';
+import { BaseNodeProps } from './base_node_view';
+import BlockView from './block_view';
+export declare class ListItemView<PropsType extends BaseNodeProps> extends BlockView<PropsType> {
+    elementType: string;
+}
+export declare const listItemCallback: (node: ManuscriptNode, dom: HTMLElement) => void;
+declare const _default: (props: BaseNodeProps) => import("../types").NodeViewCreator<ListItemView<any>>;
+export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.10.0",
+  "version": "1.10.1-LEAN-3607.0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",