@manuscripts/body-editor 3.12.58 → 3.12.60

package/dist/cjs/commands.js

@@ -294,14 +294,19 @@ const insertTable = (config, state, dispatch) => {
     return true;
 };
 exports.insertTable = insertTable;
-const insertSupplement = (file, view) => {
+const insertSupplement = (file, view, setSelection = true) => {
     const supplement = transform_1.schema.nodes.supplement.createAndFill({
         id: (0, transform_1.generateNodeID)(transform_1.schema.nodes.supplement),
         href: file.id,
     }, createAndFillCaption());
-    const tr = view.state.tr;
+    let tr = view.state.tr;
     const { pos } = (0, doc_1.upsertSupplementsSection)(tr, supplement);
-    tr.setSelection(prosemirror_state_1.NodeSelection.create(tr.doc, pos));
+    if (setSelection) {
+        tr.setSelection(prosemirror_state_1.NodeSelection.create(tr.doc, pos));
+    }
+    else {
+        tr = (0, track_changes_plugin_1.skipSelect)(tr);
+    }
     view.focus();
     view.dispatch(tr.scrollIntoView());
     return true;

package/dist/cjs/components/affiliations/AffiliationsModal.js

@@ -392,7 +392,7 @@ const AffiliationsModal = ({ authors: $authors, affiliations: $affiliations, aff
                             setPendingAction(null);
                             setAffiliationDetailsUnsavedContinue(true);
                         }, onSecondary: handleConfirmationCancel, type: ConfirmationDialog_1.DialogType.SAVE, entityType: "affiliation" }))) : (react_1.default.createElement(FormPlaceholder_1.FormPlaceholder, { type: "affiliation", title: "Affiliation Details", message: "Select an affiliation from the list to display it's details here.", placeholderIcon: react_1.default.createElement(style_guide_1.AffiliationPlaceholderIcon, null) })))),
-            react_1.default.createElement(FormFooter_1.default, { onCancel: handleClose, primaryAction: selection ? (react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "affiliation-form", newEntity: newAffiliation, isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
+            react_1.default.createElement(FormFooter_1.default, { onCancel: handleClose, primaryAction: selection ? (react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "affiliation-form", isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
 };
 exports.AffiliationsModal = AffiliationsModal;
 function createEmptyAffiliation(priority) {

package/dist/cjs/components/affiliations/CreateAffiliationModal.js

@@ -91,6 +91,6 @@ const CreateAffiliationModal = ({ affiliationsCount, onSave, onClose, }) => {
                 react_1.default.createElement(CreateModalStyles_1.StyledScrollableModalContent, null,
                     react_1.default.createElement(CreateModalStyles_1.FormTitle, null, "Create New Affiliation"),
                     react_1.default.createElement(AffiliationForm_1.AffiliationForm, { values: (0, normalize_1.checkID)(selection, 'affiliation'), onSave: handleSave, onChange: handleChange, actionsRef: actionsRef, newEntity: true, onAffiliationErrorChange: setHasError }))),
-            react_1.default.createElement(FormFooter_1.default, { onCancel: () => setIsOpen(false), primaryAction: react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "affiliation-form", newEntity: true, isDisableSave: isDisableSave || hasError, createLabel: "Create New Affiliation", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
+            react_1.default.createElement(FormFooter_1.default, { onCancel: () => setIsOpen(false), primaryAction: react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "affiliation-form", isDisableSave: isDisableSave || hasError, label: "Create New Affiliation", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
 };
 exports.CreateAffiliationModal = CreateAffiliationModal;

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

@@ -383,7 +383,7 @@ const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, author,
                             setNextAuthor(null);
                             setAuthorDetailsUnsavedContinue(true);
                         }, onSecondary: cancel, type: ConfirmationDialog_1.DialogType.SAVE, entityType: "author" }))) : (react_1.default.createElement(FormPlaceholder_1.FormPlaceholder, { type: "author", title: "Author Details", message: "Select an author from the list to display their details here.", placeholderIcon: react_1.default.createElement(style_guide_1.AuthorPlaceholderIcon, null) })))),
-            react_1.default.createElement(FormFooter_1.default, { onCancel: close, primaryAction: selection ? (react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "author-details-form", newEntity: newEntity, isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
+            react_1.default.createElement(FormFooter_1.default, { onCancel: close, primaryAction: selection ? (react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "author-details-form", isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
 };
 exports.AuthorsModal = AuthorsModal;
 function createEmptyAuthor(priority) {

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

@@ -96,7 +96,7 @@ const CreateAuthorModal = ({ authorsCount, affiliations: $affiliations, onSave,
                 react_1.default.createElement(CreateModalStyles_1.StyledScrollableModalContent, null,
                     react_1.default.createElement(CreateModalStyles_1.FormTitle, null, "Create New Author"),
                     react_1.default.createElement(AuthorDetailsForm_1.AuthorDetailsForm, { values: (0, normalize_1.normalizeAuthor)(selection), onChange: handleChange, onSave: handleSave, actionsRef: actionsRef, isEmailRequired: isEmailRequired, selectedAffiliations: selectedAffiliations.map((a) => a.id), authorFormRef: authorFormRef, selectedCreditRoles: selectedCreditRoles, newEntity: true, onAuthorDetailsTabErrorChange: setHasError }))),
-            react_1.default.createElement(FormFooter_1.default, { onCancel: () => setIsOpen(false), primaryAction: react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "author-details-form", newEntity: true, isDisableSave: isDisableSave || hasError, createLabel: "Create New Author", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
+            react_1.default.createElement(FormFooter_1.default, { onCancel: () => setIsOpen(false), primaryAction: react_1.default.createElement(ModalFormActions_1.ModalFormSaveButton, { form: "author-details-form", isDisableSave: isDisableSave || hasError, label: "Create New Author", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
 };
 exports.CreateAuthorModal = CreateAuthorModal;
 function createEmptyAuthor(priority) {

package/dist/cjs/components/form/ModalFormActions.js

@@ -8,11 +8,9 @@ const style_guide_1 = require("@manuscripts/style-guide");
 const react_1 = __importDefault(require("react"));
 const ConfirmationDialog_1 = require("../dialog/ConfirmationDialog");
 const styled_components_1 = __importDefault(require("styled-components"));
-const ModalFormSaveButton = ({ form, newEntity, isDisableSave, onSubmitForm, createLabel, updateLabel, }) => {
-    const label = newEntity
-        ? (createLabel ?? 'Save Changes')
-        : (updateLabel ?? 'Update Changes');
-    const saveButton = onSubmitForm ? (react_1.default.createElement(StylePrimaryButton, { disabled: isDisableSave, type: "button", onClick: () => {
+const ModalFormSaveButton = ({ form, isDisableSave, onSubmitForm, label, }) => {
+    label = label || 'Save Changes';
+    const saveButton = onSubmitForm ? (react_1.default.createElement(StylePrimaryButton, { "data-cy": "save-changes", disabled: isDisableSave, type: "button", onClick: () => {
             if (!isDisableSave) {
                 void onSubmitForm();
             }

package/dist/cjs/lib/navigation-utils.js

@@ -98,7 +98,21 @@ const focusNearestElement = (state, dispatch, view) => {
     const { from } = view.state.selection;
     const coords = view.coordsAtPos(from);
     const container = getCursorContainer(view);
-    const target = findNearestTabbable(container, coords.top);
+    let target = findNearestTabbable(container, coords.top);
+    if (!target) {
+        const parent = (0, utils_1.findParentNodeWithIdValue)(view.state.selection);
+        const grandparent = parent
+            ? (0, utils_1.findParentNodeWithIdValue)({
+                $from: view.state.doc.resolve(parent.pos),
+            })
+            : null;
+        if (grandparent) {
+            const dom = view.nodeDOM(grandparent.pos);
+            if (dom instanceof HTMLElement) {
+                target = findNearestTabbable(dom, coords.top);
+            }
+        }
+    }
     if (!target) {
         return false;
     }

package/dist/cjs/versions.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATHJAX_VERSION = exports.VERSION = void 0;
-exports.VERSION = '3.12.58';
+exports.VERSION = '3.12.60';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isDeleted, skipTracking } from '@manuscripts/track-changes-plugin';
+import { isDeleted, skipTracking, skipSelect } from '@manuscripts/track-changes-plugin';
 import { generateNodeID, isElementNodeType, isListNode, isSectionNodeType, isTableElementNode, schema, } from '@manuscripts/transform';
 import { Fragment, NodeRange, Slice, } from 'prosemirror-model';
 import { wrapInList } from 'prosemirror-schema-list';
@@ -278,14 +278,19 @@ export const insertTable = (config, state, dispatch) => {
     dispatch && dispatch(tr);
     return true;
 };
-export const insertSupplement = (file, view) => {
+export const insertSupplement = (file, view, setSelection = true) => {
     const supplement = schema.nodes.supplement.createAndFill({
         id: generateNodeID(schema.nodes.supplement),
         href: file.id,
     }, createAndFillCaption());
-    const tr = view.state.tr;
+    let tr = view.state.tr;
     const { pos } = upsertSupplementsSection(tr, supplement);
-    tr.setSelection(NodeSelection.create(tr.doc, pos));
+    if (setSelection) {
+        tr.setSelection(NodeSelection.create(tr.doc, pos));
+    }
+    else {
+        tr = skipSelect(tr);
+    }
     view.focus();
     view.dispatch(tr.scrollIntoView());
     return true;

package/dist/es/components/affiliations/AffiliationsModal.js

@@ -353,7 +353,7 @@ export const AffiliationsModal = ({ authors: $authors, affiliations: $affiliatio
                             setPendingAction(null);
                             setAffiliationDetailsUnsavedContinue(true);
                         }, onSecondary: handleConfirmationCancel, type: DialogType.SAVE, entityType: "affiliation" }))) : (React.createElement(FormPlaceholder, { type: "affiliation", title: "Affiliation Details", message: "Select an affiliation from the list to display it's details here.", placeholderIcon: React.createElement(AffiliationPlaceholderIcon, null) })))),
-            React.createElement(FormFooter, { onCancel: handleClose, primaryAction: selection ? (React.createElement(ModalFormSaveButton, { form: "affiliation-form", newEntity: newAffiliation, isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
+            React.createElement(FormFooter, { onCancel: handleClose, primaryAction: selection ? (React.createElement(ModalFormSaveButton, { form: "affiliation-form", isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
 };
 function createEmptyAffiliation(priority) {
     return {

package/dist/es/components/affiliations/CreateAffiliationModal.js

@@ -52,5 +52,5 @@ export const CreateAffiliationModal = ({ affiliationsCount, onSave, onClose, })
                 React.createElement(StyledScrollableModalContent, null,
                     React.createElement(FormTitle, null, "Create New Affiliation"),
                     React.createElement(AffiliationForm, { values: checkID(selection, 'affiliation'), onSave: handleSave, onChange: handleChange, actionsRef: actionsRef, newEntity: true, onAffiliationErrorChange: setHasError }))),
-            React.createElement(FormFooter, { onCancel: () => setIsOpen(false), primaryAction: React.createElement(ModalFormSaveButton, { form: "affiliation-form", newEntity: true, isDisableSave: isDisableSave || hasError, createLabel: "Create New Affiliation", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
+            React.createElement(FormFooter, { onCancel: () => setIsOpen(false), primaryAction: React.createElement(ModalFormSaveButton, { form: "affiliation-form", isDisableSave: isDisableSave || hasError, label: "Create New Affiliation", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
 };

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

@@ -344,7 +344,7 @@ export const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, a
                             setNextAuthor(null);
                             setAuthorDetailsUnsavedContinue(true);
                         }, onSecondary: cancel, type: DialogType.SAVE, entityType: "author" }))) : (React.createElement(FormPlaceholder, { type: "author", title: "Author Details", message: "Select an author from the list to display their details here.", placeholderIcon: React.createElement(AuthorPlaceholderIcon, null) })))),
-            React.createElement(FormFooter, { onCancel: close, primaryAction: selection ? (React.createElement(ModalFormSaveButton, { form: "author-details-form", newEntity: newEntity, isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
+            React.createElement(FormFooter, { onCancel: close, primaryAction: selection ? (React.createElement(ModalFormSaveButton, { form: "author-details-form", isDisableSave: isDisableSave, onSubmitForm: () => actionsRef.current?.submitForm?.() })) : undefined }))));
 };
 function createEmptyAuthor(priority) {
     return {

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

@@ -57,7 +57,7 @@ export const CreateAuthorModal = ({ authorsCount, affiliations: $affiliations, o
                 React.createElement(StyledScrollableModalContent, null,
                     React.createElement(FormTitle, null, "Create New Author"),
                     React.createElement(AuthorDetailsForm, { values: normalizeAuthor(selection), onChange: handleChange, onSave: handleSave, actionsRef: actionsRef, isEmailRequired: isEmailRequired, selectedAffiliations: selectedAffiliations.map((a) => a.id), authorFormRef: authorFormRef, selectedCreditRoles: selectedCreditRoles, newEntity: true, onAuthorDetailsTabErrorChange: setHasError }))),
-            React.createElement(FormFooter, { onCancel: () => setIsOpen(false), primaryAction: React.createElement(ModalFormSaveButton, { form: "author-details-form", newEntity: true, isDisableSave: isDisableSave || hasError, createLabel: "Create New Author", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
+            React.createElement(FormFooter, { onCancel: () => setIsOpen(false), primaryAction: React.createElement(ModalFormSaveButton, { form: "author-details-form", isDisableSave: isDisableSave || hasError, label: "Create New Author", onSubmitForm: () => actionsRef.current?.submitForm?.() }) }))));
 };
 function createEmptyAuthor(priority) {
     return {

package/dist/es/components/form/ModalFormActions.js

@@ -2,11 +2,9 @@ import { PrimaryButton } from '@manuscripts/style-guide';
 import React from 'react';
 import { ConfirmationDialog, DialogType } from '../dialog/ConfirmationDialog';
 import styled from 'styled-components';
-export const ModalFormSaveButton = ({ form, newEntity, isDisableSave, onSubmitForm, createLabel, updateLabel, }) => {
-    const label = newEntity
-        ? (createLabel ?? 'Save Changes')
-        : (updateLabel ?? 'Update Changes');
-    const saveButton = onSubmitForm ? (React.createElement(StylePrimaryButton, { disabled: isDisableSave, type: "button", onClick: () => {
+export const ModalFormSaveButton = ({ form, isDisableSave, onSubmitForm, label, }) => {
+    label = label || 'Save Changes';
+    const saveButton = onSubmitForm ? (React.createElement(StylePrimaryButton, { "data-cy": "save-changes", disabled: isDisableSave, type: "button", onClick: () => {
             if (!isDisableSave) {
                 void onSubmitForm();
             }

package/dist/es/lib/navigation-utils.js

@@ -89,7 +89,21 @@ export const focusNearestElement = (state, dispatch, view) => {
     const { from } = view.state.selection;
     const coords = view.coordsAtPos(from);
     const container = getCursorContainer(view);
-    const target = findNearestTabbable(container, coords.top);
+    let target = findNearestTabbable(container, coords.top);
+    if (!target) {
+        const parent = findParentNodeWithIdValue(view.state.selection);
+        const grandparent = parent
+            ? findParentNodeWithIdValue({
+                $from: view.state.doc.resolve(parent.pos),
+            })
+            : null;
+        if (grandparent) {
+            const dom = view.nodeDOM(grandparent.pos);
+            if (dom instanceof HTMLElement) {
+                target = findNearestTabbable(dom, coords.top);
+            }
+        }
+    }
     if (!target) {
         return false;
     }

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.12.58';
+export const VERSION = '3.12.60';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/commands.d.ts

@@ -33,7 +33,7 @@ export declare const insertGeneralTableFootnote: (element: [ManuscriptNode, numb
 export declare const insertFigure: (file: FileAttachment, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const insertEmbed: (state: ManuscriptEditorState, dispatch?: Dispatch, attrs?: Attrs) => boolean;
 export declare const insertTable: (config: TableConfig, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
-export declare const insertSupplement: (file: FileAttachment, view: ManuscriptEditorView) => boolean;
+export declare const insertSupplement: (file: FileAttachment, view: ManuscriptEditorView, setSelection?: boolean) => boolean;
 export declare const insertAttachment: (file: FileAttachment, state: ManuscriptEditorState, type: string, dispatch?: Dispatch) => boolean;
 export declare const insertBlock: (nodeType: ManuscriptNodeType) => (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const deleteBlock: (typeToDelete: string) => (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;

package/dist/types/components/form/ModalFormActions.d.ts

@@ -1,11 +1,9 @@
 import React from 'react';
 export interface ModalFormSaveButtonProps {
     form: string;
-    newEntity: boolean;
     isDisableSave: boolean;
     onSubmitForm?: () => void | Promise<void>;
-    createLabel?: string;
-    updateLabel?: string;
+    label?: string;
 }
 export declare const ModalFormSaveButton: React.FC<ModalFormSaveButtonProps>;
 interface ModalFormActionsProps {

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.12.58";
+export declare const VERSION = "3.12.60";
 export declare const MATHJAX_VERSION = "3.2.2";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "3.12.58",
+  "version": "3.12.60",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -40,8 +40,8 @@
     "@citation-js/plugin-pubmed": "0.3.0",
     "@citation-js/plugin-ris": "0.7.18",
     "@iarna/word-count": "1.1.2",
-    "@manuscripts/style-guide": "3.5.27",
-    "@manuscripts/track-changes-plugin": "2.3.13",
+    "@manuscripts/style-guide": "3.5.28",
+    "@manuscripts/track-changes-plugin": "2.3.15",
     "@manuscripts/transform": "4.3.51",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",