@manuscripts/body-editor 1.11.1-LEAN-3519.0 → 1.11.2

package/dist/cjs/commands.js

@@ -129,12 +129,9 @@ exports.createBlock = createBlock;
 const insertGeneralFootnote = (tableNode, position, view, tableElementFooter) => {
     var _a;
     const { state, dispatch } = view;
-    const paragraph = state.schema.nodes.paragraph.create({
+    const generalNote = state.schema.nodes.paragraph.create({
         placeholder: 'Add general note here',
     });
-    const generalNote = state.schema.nodes.general_table_footnote.create({}, [
-        paragraph,
-    ]);
     const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(tableNode, transform_1.schema.nodes.table_colgroup)[0];
     const tr = state.tr;
     const pos = (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length)

package/dist/cjs/components/authors/AuthorActions.js

@@ -47,7 +47,7 @@ const StyledButtonGroup = (0, styled_components_1.default)(style_guide_1.ButtonG
 `;
 const AuthorActions = ({ author, onSave, onDelete, onCancel, }) => {
     const [showDeleteDialog, setShowDeleteDialog] = (0, react_1.useState)(false);
-    return (react_1.default.createElement(AuthorActionsContainer, null,
+    return (react_1.default.createElement(AuthorActionsContainer, { "data-cy": "author-action" },
         react_1.default.createElement(DeleteAuthorConfirmationDialog_1.DeleteAuthorConfirmationDialog, { author: author, isOpen: showDeleteDialog, onDelete: () => {
                 setShowDeleteDialog(true);
                 onDelete();

package/dist/cjs/components/authors/AuthorAffiliations.js

@@ -109,7 +109,7 @@ const AuthorAffiliations = ({ author, affiliations, onSave, onAdd, onRemove, })
         onSave(affiliation);
         onAdd(affiliation);
     };
-    return (react_1.default.createElement(react_1.default.Fragment, null,
+    return (react_1.default.createElement("div", { "data-cy": "affiliations-editor" },
         authorAffiliations.map((a) => (react_1.default.createElement(AffiliationButton_1.AffiliationButton, { key: `${author.id}-${a.id}`, affiliation: a, onSave: onSave, onRemove: () => onRemove(a) }))),
         react_1.default.createElement(creatable_1.default, { options: options, isMulti: false, isClearable: true, value: null, inputValue: searchText, components: {
                 IndicatorsContainer: exports.AddAffiliationIndicator,

package/dist/cjs/components/authors/AuthorList.js

@@ -30,7 +30,7 @@ const AuthorListContainer = styled_components_1.default.div `
 `;
 const AuthorList = ({ author, authors, onSelect, moveAuthor, }) => {
     return (react_1.default.createElement(react_dnd_1.DndProvider, { backend: react_dnd_html5_backend_1.HTML5Backend },
-        react_1.default.createElement(AuthorListContainer, null, authors.map((a) => {
+        react_1.default.createElement(AuthorListContainer, { "data-cy": "authors-list" }, authors.map((a) => {
             return (react_1.default.createElement(DraggableAuthor_1.DraggableAuthor, { key: a.id, author: a, isSelected: a.id === (author === null || author === void 0 ? void 0 : author.id), onClick: () => onSelect(a), moveAuthor: moveAuthor }));
         }))));
 };

package/dist/cjs/components/authors/AuthorsModal.js

@@ -221,11 +221,11 @@ const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, author,
                     react_1.default.createElement(style_guide_1.ModalSidebarHeader, null,
                         react_1.default.createElement(style_guide_1.ModalSidebarTitle, null, "Authors")),
                     react_1.default.createElement(style_guide_1.SidebarContent, null,
-                        react_1.default.createElement(AddAuthorButton, { onClick: handleAddAuthor },
+                        react_1.default.createElement(AddAuthorButton, { "data-cy": "add-author-button", onClick: handleAddAuthor },
                             react_1.default.createElement(style_guide_1.AddIcon, { width: 40, height: 40 }),
                             react_1.default.createElement(ActionTitle, null, "Add Author")),
                         react_1.default.createElement(AuthorList_1.AuthorList, { author: selection, authors: authors, onSelect: handleSelect, moveAuthor: handleMoveAuthor }))),
-                react_1.default.createElement(style_guide_1.ScrollableModalContent, null, selection ? (react_1.default.createElement(AuthorForms, null,
+                react_1.default.createElement(style_guide_1.ScrollableModalContent, { "data-cy": "author-modal-content" }, selection ? (react_1.default.createElement(AuthorForms, null,
                     react_1.default.createElement(SaveAuthorConfirmationDialog_1.SaveAuthorConfirmationDialog, { isOpen: showConfirmationDialog, onSave: () => handleSaveAuthor(valuesRef.current), onCancel: handleResetAuthor }),
                     react_1.default.createElement(AuthorActions_1.AuthorActions, { author: selection, onSave: () => handleSaveAuthor(valuesRef.current), onDelete: handleDeleteAuthor, onCancel: () => setOpen(false) }),
                     react_1.default.createElement(FormLabel, null, "Details"),

package/dist/cjs/components/authors/DraggableAuthor.js

@@ -142,15 +142,22 @@ const DraggableAuthor = ({ author, isSelected, onClick, moveAuthor, }) => {
         }),
     });
     dragRef(dropRef(ref));
-    const dragClass = isDragging ? 'dragging' : '';
-    const dropClass = isOver && dropSide ? `drop-${dropSide}` : '';
-    const activeClass = isSelected ? 'active' : '';
-    return (react_1.default.createElement(AuthorContainer, { ref: ref, className: `${dragClass} ${dropClass} ${activeClass}`, onClick: onClick },
-        react_1.default.createElement(AvatarContainer, null,
+    const classes = [];
+    if (isDragging) {
+        classes.push('dragging');
+    }
+    if (isOver && dropSide) {
+        classes.push(`drop-${dropSide}`);
+    }
+    if (isSelected) {
+        classes.push('active');
+    }
+    return (react_1.default.createElement(AuthorContainer, { ref: ref, className: classes.join(' '), onClick: onClick, "data-cy": "author-item" },
+        react_1.default.createElement(AvatarContainer, { "data-cy": "author-avatar" },
             react_1.default.createElement(style_guide_1.Avatar, { size: 36, color: '#6e6e6e' }),
-            react_1.default.createElement(AuthorNotes, null, author.isCorresponding && (react_1.default.createElement(AuthorBadge, null,
+            react_1.default.createElement(AuthorNotes, { "data-cy": "author-notes" }, author.isCorresponding && (react_1.default.createElement(AuthorBadge, null,
                 react_1.default.createElement(style_guide_1.CorrespondingAuthorIcon, null))))),
-        react_1.default.createElement(AuthorName, null, (0, authors_1.authorLabel)(author)),
+        react_1.default.createElement(AuthorName, { "data-cy": "author-name" }, (0, authors_1.authorLabel)(author)),
         isSelected && react_1.default.createElement(DragHandle, null)));
 };
 exports.DraggableAuthor = DraggableAuthor;

package/dist/cjs/lib/context-menu.js

@@ -27,7 +27,6 @@ const footnotes_utils_1 = require("../plugins/footnotes/footnotes-utils");
 const ReactSubView_1 = __importDefault(require("../views/ReactSubView"));
 const popper_1 = require("./popper");
 const track_changes_utils_1 = require("./track-changes-utils");
-const utils_1 = require("./utils");
 const popper = new popper_1.PopperManager();
 const listTypes = [transform_1.schema.nodes.ordered_list, transform_1.schema.nodes.bullet_list];
 const readonlyTypes = [transform_1.schema.nodes.keywords, transform_1.schema.nodes.bibliography_element];
@@ -144,7 +143,7 @@ class ContextMenu {
             this.addPopperEventListeners();
         };
         this.showEditMenu = (target) => {
-            var _a;
+            var _a, _b;
             const menu = document.createElement('div');
             menu.className = 'menu';
             const $pos = this.resolvePos();
@@ -180,9 +179,9 @@ class ContextMenu {
                 const tableElementFooter = (0, prosemirror_utils_1.findChildrenByType)(this.node, transform_1.schema.nodes.table_element_footer);
                 let isDeletedOrRejected = false;
                 const hasGeneralNote = tableElementFooter.length &&
-                    (0, utils_1.getChildOfType)(tableElementFooter[0].node, transform_1.schema.nodes.general_table_footnote, true);
+                    ((_a = tableElementFooter[0].node.firstChild) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.paragraph;
                 if (hasGeneralNote) {
-                    const generalFootnote = (_a = tableElementFooter[0]) === null || _a === void 0 ? void 0 : _a.node.firstChild;
+                    const generalFootnote = (_b = tableElementFooter[0]) === null || _b === void 0 ? void 0 : _b.node.firstChild;
                     if (generalFootnote) {
                         isDeletedOrRejected =
                             (0, track_changes_utils_1.isDeleted)(generalFootnote) || (0, track_changes_utils_1.isRejectedInsert)(generalFootnote);

package/dist/cjs/plugins/footnotes/index.js

@@ -82,7 +82,7 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
                 }
                 else {
                     node.content.forEach((item) => {
-                        if (item.type === transform_1.schema.nodes.general_table_footnote && pos) {
+                        if (item.type === transform_1.schema.nodes.paragraph && pos) {
                             tr.delete(pos - 1, pos + item.nodeSize + 1);
                         }
                     });

package/dist/es/commands.js

@@ -120,12 +120,9 @@ export const createBlock = (nodeType, position, state, dispatch) => {
 export const insertGeneralFootnote = (tableNode, position, view, tableElementFooter) => {
     var _a;
     const { state, dispatch } = view;
-    const paragraph = state.schema.nodes.paragraph.create({
+    const generalNote = state.schema.nodes.paragraph.create({
         placeholder: 'Add general note here',
     });
-    const generalNote = state.schema.nodes.general_table_footnote.create({}, [
-        paragraph,
-    ]);
     const tableColGroup = findChildrenByType(tableNode, schema.nodes.table_colgroup)[0];
     const tr = state.tr;
     const pos = (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length)

package/dist/es/components/authors/AuthorActions.js

@@ -18,7 +18,7 @@ const StyledButtonGroup = styled(ButtonGroup) `
 `;
 export const AuthorActions = ({ author, onSave, onDelete, onCancel, }) => {
     const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-    return (React.createElement(AuthorActionsContainer, null,
+    return (React.createElement(AuthorActionsContainer, { "data-cy": "author-action" },
         React.createElement(DeleteAuthorConfirmationDialog, { author: author, isOpen: showDeleteDialog, onDelete: () => {
                 setShowDeleteDialog(true);
                 onDelete();

package/dist/es/components/authors/AuthorAffiliations.js

@@ -79,7 +79,7 @@ export const AuthorAffiliations = ({ author, affiliations, onSave, onAdd, onRemo
         onSave(affiliation);
         onAdd(affiliation);
     };
-    return (React.createElement(React.Fragment, null,
+    return (React.createElement("div", { "data-cy": "affiliations-editor" },
         authorAffiliations.map((a) => (React.createElement(AffiliationButton, { key: `${author.id}-${a.id}`, affiliation: a, onSave: onSave, onRemove: () => onRemove(a) }))),
         React.createElement(CreatableSelect, { options: options, isMulti: false, isClearable: true, value: null, inputValue: searchText, components: {
                 IndicatorsContainer: AddAffiliationIndicator,

package/dist/es/components/authors/AuthorList.js

@@ -24,7 +24,7 @@ const AuthorListContainer = styled.div `
 `;
 export const AuthorList = ({ author, authors, onSelect, moveAuthor, }) => {
     return (React.createElement(DndProvider, { backend: HTML5Backend },
-        React.createElement(AuthorListContainer, null, authors.map((a) => {
+        React.createElement(AuthorListContainer, { "data-cy": "authors-list" }, authors.map((a) => {
             return (React.createElement(DraggableAuthor, { key: a.id, author: a, isSelected: a.id === (author === null || author === void 0 ? void 0 : author.id), onClick: () => onSelect(a), moveAuthor: moveAuthor }));
         }))));
 };

package/dist/es/components/authors/AuthorsModal.js

@@ -192,11 +192,11 @@ export const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, a
                     React.createElement(ModalSidebarHeader, null,
                         React.createElement(ModalSidebarTitle, null, "Authors")),
                     React.createElement(SidebarContent, null,
-                        React.createElement(AddAuthorButton, { onClick: handleAddAuthor },
+                        React.createElement(AddAuthorButton, { "data-cy": "add-author-button", onClick: handleAddAuthor },
                             React.createElement(AddIcon, { width: 40, height: 40 }),
                             React.createElement(ActionTitle, null, "Add Author")),
                         React.createElement(AuthorList, { author: selection, authors: authors, onSelect: handleSelect, moveAuthor: handleMoveAuthor }))),
-                React.createElement(ScrollableModalContent, null, selection ? (React.createElement(AuthorForms, null,
+                React.createElement(ScrollableModalContent, { "data-cy": "author-modal-content" }, selection ? (React.createElement(AuthorForms, null,
                     React.createElement(SaveAuthorConfirmationDialog, { isOpen: showConfirmationDialog, onSave: () => handleSaveAuthor(valuesRef.current), onCancel: handleResetAuthor }),
                     React.createElement(AuthorActions, { author: selection, onSave: () => handleSaveAuthor(valuesRef.current), onDelete: handleDeleteAuthor, onCancel: () => setOpen(false) }),
                     React.createElement(FormLabel, null, "Details"),

package/dist/es/components/authors/DraggableAuthor.js

@@ -113,14 +113,21 @@ export const DraggableAuthor = ({ author, isSelected, onClick, moveAuthor, }) =>
         }),
     });
     dragRef(dropRef(ref));
-    const dragClass = isDragging ? 'dragging' : '';
-    const dropClass = isOver && dropSide ? `drop-${dropSide}` : '';
-    const activeClass = isSelected ? 'active' : '';
-    return (React.createElement(AuthorContainer, { ref: ref, className: `${dragClass} ${dropClass} ${activeClass}`, onClick: onClick },
-        React.createElement(AvatarContainer, null,
+    const classes = [];
+    if (isDragging) {
+        classes.push('dragging');
+    }
+    if (isOver && dropSide) {
+        classes.push(`drop-${dropSide}`);
+    }
+    if (isSelected) {
+        classes.push('active');
+    }
+    return (React.createElement(AuthorContainer, { ref: ref, className: classes.join(' '), onClick: onClick, "data-cy": "author-item" },
+        React.createElement(AvatarContainer, { "data-cy": "author-avatar" },
             React.createElement(Avatar, { size: 36, color: '#6e6e6e' }),
-            React.createElement(AuthorNotes, null, author.isCorresponding && (React.createElement(AuthorBadge, null,
+            React.createElement(AuthorNotes, { "data-cy": "author-notes" }, author.isCorresponding && (React.createElement(AuthorBadge, null,
                 React.createElement(CorrespondingAuthorIcon, null))))),
-        React.createElement(AuthorName, null, authorLabel(author)),
+        React.createElement(AuthorName, { "data-cy": "author-name" }, authorLabel(author)),
         isSelected && React.createElement(DragHandle, null)));
 };

package/dist/es/lib/context-menu.js

@@ -21,7 +21,6 @@ import { buildTableFootnoteLabels } from '../plugins/footnotes/footnotes-utils';
 import ReactSubView from '../views/ReactSubView';
 import { PopperManager } from './popper';
 import { isDeleted, isRejectedInsert } from './track-changes-utils';
-import { getChildOfType } from './utils';
 const popper = new PopperManager();
 const listTypes = [schema.nodes.ordered_list, schema.nodes.bullet_list];
 const readonlyTypes = [schema.nodes.keywords, schema.nodes.bibliography_element];
@@ -137,7 +136,7 @@ export class ContextMenu {
             this.addPopperEventListeners();
         };
         this.showEditMenu = (target) => {
-            var _a;
+            var _a, _b;
             const menu = document.createElement('div');
             menu.className = 'menu';
             const $pos = this.resolvePos();
@@ -173,9 +172,9 @@ export class ContextMenu {
                 const tableElementFooter = findChildrenByType(this.node, schema.nodes.table_element_footer);
                 let isDeletedOrRejected = false;
                 const hasGeneralNote = tableElementFooter.length &&
-                    getChildOfType(tableElementFooter[0].node, schema.nodes.general_table_footnote, true);
+                    ((_a = tableElementFooter[0].node.firstChild) === null || _a === void 0 ? void 0 : _a.type) === schema.nodes.paragraph;
                 if (hasGeneralNote) {
-                    const generalFootnote = (_a = tableElementFooter[0]) === null || _a === void 0 ? void 0 : _a.node.firstChild;
+                    const generalFootnote = (_b = tableElementFooter[0]) === null || _b === void 0 ? void 0 : _b.node.firstChild;
                     if (generalFootnote) {
                         isDeletedOrRejected =
                             isDeleted(generalFootnote) || isRejectedInsert(generalFootnote);

package/dist/es/plugins/footnotes/index.js

@@ -75,7 +75,7 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
                 }
                 else {
                     node.content.forEach((item) => {
-                        if (item.type === schema.nodes.general_table_footnote && pos) {
+                        if (item.type === schema.nodes.paragraph && pos) {
                             tr.delete(pos - 1, pos + item.nodeSize + 1);
                         }
                     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.11.1-LEAN-3519.0",
+  "version": "1.11.2",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -30,9 +30,9 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "2.2.8",
     "@manuscripts/library": "1.3.7",
-    "@manuscripts/style-guide": "1.12.12-LEAN-3519.0",
+    "@manuscripts/style-guide": "1.12.12",
     "@manuscripts/track-changes-plugin": "1.7.12",
-    "@manuscripts/transform": "2.3.7-LEAN-3519.1",
+    "@manuscripts/transform": "2.3.6",
     "astrocite-eutils": "^0.16.4",
     "mathjax-full": "^3.2.2",
     "codemirror": "^5.58.1",

package/styles/Editor.css

@@ -971,8 +971,7 @@
   fill: #353535;
 }
 .ProseMirror .table-footnotes-element > div,
-.ProseMirror .block-footnotes_element > .block > div,
-.ProseMirror .general-table-footnote
+.ProseMirror .block-footnotes_element > .block > div
  {
   position: relative;
 }
@@ -996,27 +995,37 @@
   margin-top: 0px;
 }
 
+.ProseMirror .footnote-selected, .table-footer > div:has(> p.footnote-selected) > p  {
+  background-color: #f2fbfc;
+  padding: 4px;
+}
 .table-footer > div {
   position: relative;
 }
 
-.general-table-footnote > p {
-  padding-bottom: 8px;
-}
-
-.general-table-footnote:has(> p.footnote-selected) > p:last-child {
-  padding-bottom: 0;
+.table-footer > div > p {
+  padding-bottom: 10px;
 }
 
 .ProseMirror .table-footnotes-element .footnote-selected,
-.ProseMirror .block-footnotes_element .footnote-selected,
-.ProseMirror .general-table-footnote:has(> p.footnote-selected)
+.ProseMirror .block-footnotes_element .footnote-selected
 {
-  background-color: #f2fbfc;
-  padding: 4px;
   border: 1px solid #bce7f6;
 }
-
+.table-footer > div:has(> p.footnote-selected) > p {
+  border-left: 1px solid #bce7f6;
+  border-right: 1px solid #bce7f6;
+}
+.table-footer > div:has(> p.footnote-selected) > p:first-child {
+  border-top: 1px solid #bce7f6;
+  position: relative;
+}
+.table-footer > div:has(> p.footnote-selected) > p:last-of-type {
+  border-bottom: 1px solid #bce7f6;
+}
+.table-footer > div:has(> p.footnote-selected) > p:last-child {
+  border-bottom: 1px solid #bce7f6;
+}
 .ProseMirror .footnote-label {
   vertical-align: super;
   font-size: 75%;