@manuscripts/body-editor 1.7.28-LEAN-3417-3 → 1.7.29

package/dist/cjs/views/affiliations.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AffiliationsView = void 0;
-const prosemirror_state_1 = require("prosemirror-state");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 class AffiliationsView extends block_view_1.default {
@@ -19,14 +18,6 @@ class AffiliationsView extends block_view_1.default {
             this.dom.setAttribute('contenteditable', 'false');
             this.dom.appendChild(this.contentDOM);
         };
-        this.updateContents = () => {
-            this.dom.addEventListener('click', () => {
-                const { tr, doc } = this.view.state;
-                tr.setSelection(prosemirror_state_1.NodeSelection.create(doc, this.getPos()));
-                this.view.dispatch(tr);
-                console.log(tr.selection);
-            });
-        };
     }
 }
 exports.AffiliationsView = AffiliationsView;

package/dist/cjs/views/citation_editable.js

@@ -74,7 +74,6 @@ class CitationEditableView extends citation_1.CitationView {
             this.props.popper.destroy();
         };
         this.showContextMenu = () => {
-            this.props.popper.destroy();
             const componentProps = {
                 actions: [
                     { label: 'Edit', action: this.handleEdit, icon: 'EditIcon' },

package/dist/cjs/views/contributors.js

@@ -20,9 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContributorsView = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
-const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
-const prosemirror_state_1 = require("prosemirror-state");
 const AuthorsModal_1 = require("../components/authors/AuthorsModal");
 const authors_1 = require("../lib/authors");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
@@ -81,9 +79,7 @@ class ContributorsView extends block_view_1.default {
             const pluginState = affiliations_1.affiliationsKey.getState(this.view.state);
             const attrs = node.attrs;
             const displayAttr = (0, track_changes_utils_1.getActualAttrs)(node);
-            const containerWrapper = document.createElement('div');
             const container = document.createElement('button');
-            containerWrapper.classList.add('contributor-wrapper');
             container.classList.add('contributor');
             container.setAttribute('id', attrs.id);
             container.setAttribute('contenteditable', 'false');
@@ -99,12 +95,9 @@ class ContributorsView extends block_view_1.default {
             }
             const can = this.props.getCapabilities();
             const disableEditButton = !can.editMetadata;
-            const { isCorresponding, email, id } = displayAttr;
+            const { isCorresponding, email } = displayAttr;
             if (!disableEditButton) {
-                container.addEventListener('click', () => {
-                    const dataTracked = attrs.dataTracked;
-                    this.onClickHandler(id, dataTracked ? dataTracked[0] : undefined);
-                });
+                container.addEventListener('click', this.handleClick);
             }
             const name = (0, authors_1.authorLabel)(displayAttr);
             container.innerHTML =
@@ -132,8 +125,7 @@ class ContributorsView extends block_view_1.default {
             if (selectedAuthor && selectedAuthor === attrs.id) {
                 container.classList.add('selected-suggestion');
             }
-            containerWrapper.appendChild(container);
-            return containerWrapper;
+            return container;
         };
         this.isJointFirstAuthor = (authors, index) => {
             const author = index === 0 ? authors[index] : authors[index - 1];
@@ -155,7 +147,7 @@ class ContributorsView extends block_view_1.default {
             const can = this.props.getCapabilities();
             const button = (0, ReactSubView_1.default)(this.props, style_guide_1.SecondaryButton, {
                 mini: true,
-                onClick: () => this.handleEdit(''),
+                onClick: this.handleClick,
                 className: 'edit-authors-button',
                 disabled: !can.editMetadata,
                 children: 'Edit Authors',
@@ -175,48 +167,17 @@ class ContributorsView extends block_view_1.default {
                 }
             }
         };
-        this.onClickHandler = (elementId, dataTracked) => {
-            var _a;
-            this.props.popper.destroy();
-            const isSelectedSuggestion = !!((_a = selected_suggestion_ui_1.selectedSuggestionKey
-                .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.find(this.getPos(), this.getPos() + this.node.nodeSize).length);
-            const { tr } = this.view.state;
-            tr.setSelection(prosemirror_state_1.NodeSelection.create(this.view.state.doc, this.getPos()));
-            if (dataTracked && dataTracked.status !== track_changes_plugin_1.CHANGE_STATUS.rejected) {
-                tr.setMeta(selected_suggestion_ui_1.SET_SUGGESTION_ID, dataTracked.id);
-            }
-            else {
-                if (isSelectedSuggestion) {
-                    tr.setMeta(selected_suggestion_ui_1.CLEAR_SUGGESTION_ID, true);
-                }
-            }
-            this.view.dispatch(tr);
-            if (!((dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.operation) === track_changes_plugin_1.CHANGE_OPERATION.delete &&
-                (dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.status) !== track_changes_plugin_1.CHANGE_STATUS.rejected)) {
-                this.showContextMenu(elementId);
-            }
-        };
-        this.showContextMenu = (elementId) => {
-            this.props.popper.destroy();
-            const element = document.getElementById(elementId);
-            const componentProps = {
-                actions: [
-                    {
-                        label: 'Edit',
-                        action: () => this.handleEdit(elementId),
-                        icon: 'EditIcon',
-                    },
-                ],
-            };
-            this.contextMenu = (0, ReactSubView_1.default)(this.props, style_guide_1.ContextMenu, componentProps, this.node, this.getPos, this.view, 'context-menu');
-            this.props.popper.show(element, this.contextMenu, 'right-start');
-        };
-        this.handleEdit = (id) => {
-            var _a;
-            this.props.popper.destroy();
+        this.handleClick = (e) => {
+            var _a, _b;
+            e.stopPropagation();
             const contributors = (0, view_1.findChildrenAttrsByType)(this.view, transform_1.schema.nodes.contributor);
             const affiliations = (0, view_1.findChildrenAttrsByType)(this.view, transform_1.schema.nodes.affiliation);
-            const author = id ? contributors.filter((a) => a.id === id)[0] : undefined;
+            let author = undefined;
+            const target = e.target;
+            if (target) {
+                const id = (_a = target.closest('.contributor')) === null || _a === void 0 ? void 0 : _a.getAttribute('id');
+                author = contributors.filter((a) => a.id === id)[0];
+            }
             const componentProps = {
                 author,
                 authors: contributors,
@@ -225,7 +186,7 @@ class ContributorsView extends block_view_1.default {
                 onDeleteAuthor: this.handleDeleteAuthor,
                 onSaveAffiliation: this.handleSaveAffiliation,
             };
-            (_a = this.popper) === null || _a === void 0 ? void 0 : _a.remove();
+            (_b = this.popper) === null || _b === void 0 ? void 0 : _b.remove();
             this.popper = (0, ReactSubView_1.default)(this.props, AuthorsModal_1.AuthorsModal, componentProps, this.node, this.getPos, this.view);
             this.container.appendChild(this.popper);
         };

package/dist/es/views/affiliations.js

@@ -1,4 +1,3 @@
-import { NodeSelection } from 'prosemirror-state';
 import BlockView from './block_view';
 import { createNodeView } from './creators';
 export class AffiliationsView extends BlockView {
@@ -13,14 +12,6 @@ export class AffiliationsView extends BlockView {
             this.dom.setAttribute('contenteditable', 'false');
             this.dom.appendChild(this.contentDOM);
         };
-        this.updateContents = () => {
-            this.dom.addEventListener('click', () => {
-                const { tr, doc } = this.view.state;
-                tr.setSelection(NodeSelection.create(doc, this.getPos()));
-                this.view.dispatch(tr);
-                console.log(tr.selection);
-            });
-        };
     }
 }
 export default createNodeView(AffiliationsView);

package/dist/es/views/citation_editable.js

@@ -68,7 +68,6 @@ export class CitationEditableView extends CitationView {
             this.props.popper.destroy();
         };
         this.showContextMenu = () => {
-            this.props.popper.destroy();
             const componentProps = {
                 actions: [
                     { label: 'Edit', action: this.handleEdit, icon: 'EditIcon' },

package/dist/es/views/contributors.js

@@ -13,16 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ContextMenu, SecondaryButton, } from '@manuscripts/style-guide';
-import { CHANGE_OPERATION, CHANGE_STATUS, } from '@manuscripts/track-changes-plugin';
+import { SecondaryButton } from '@manuscripts/style-guide';
 import { isContributorNode, schema, } from '@manuscripts/transform';
-import { NodeSelection } from 'prosemirror-state';
 import { AuthorsModal, } from '../components/authors/AuthorsModal';
 import { authorLabel } from '../lib/authors';
 import { getActualAttrs } from '../lib/track-changes-utils';
 import { deleteNode, findChildByID, findChildByType, findChildrenAttrsByType, updateNodeAttrs, } from '../lib/view';
 import { affiliationsKey } from '../plugins/affiliations';
-import { CLEAR_SUGGESTION_ID, selectedSuggestionKey, SET_SUGGESTION_ID, } from '../plugins/selected-suggestion-ui';
+import { selectedSuggestionKey } from '../plugins/selected-suggestion-ui';
 import BlockView from './block_view';
 import { createNodeView } from './creators';
 import ReactSubView from './ReactSubView';
@@ -75,9 +73,7 @@ export class ContributorsView extends BlockView {
             const pluginState = affiliationsKey.getState(this.view.state);
             const attrs = node.attrs;
             const displayAttr = getActualAttrs(node);
-            const containerWrapper = document.createElement('div');
             const container = document.createElement('button');
-            containerWrapper.classList.add('contributor-wrapper');
             container.classList.add('contributor');
             container.setAttribute('id', attrs.id);
             container.setAttribute('contenteditable', 'false');
@@ -93,12 +89,9 @@ export class ContributorsView extends BlockView {
             }
             const can = this.props.getCapabilities();
             const disableEditButton = !can.editMetadata;
-            const { isCorresponding, email, id } = displayAttr;
+            const { isCorresponding, email } = displayAttr;
             if (!disableEditButton) {
-                container.addEventListener('click', () => {
-                    const dataTracked = attrs.dataTracked;
-                    this.onClickHandler(id, dataTracked ? dataTracked[0] : undefined);
-                });
+                container.addEventListener('click', this.handleClick);
             }
             const name = authorLabel(displayAttr);
             container.innerHTML =
@@ -126,8 +119,7 @@ export class ContributorsView extends BlockView {
             if (selectedAuthor && selectedAuthor === attrs.id) {
                 container.classList.add('selected-suggestion');
             }
-            containerWrapper.appendChild(container);
-            return containerWrapper;
+            return container;
         };
         this.isJointFirstAuthor = (authors, index) => {
             const author = index === 0 ? authors[index] : authors[index - 1];
@@ -149,7 +141,7 @@ export class ContributorsView extends BlockView {
             const can = this.props.getCapabilities();
             const button = ReactSubView(this.props, SecondaryButton, {
                 mini: true,
-                onClick: () => this.handleEdit(''),
+                onClick: this.handleClick,
                 className: 'edit-authors-button',
                 disabled: !can.editMetadata,
                 children: 'Edit Authors',
@@ -169,48 +161,17 @@ export class ContributorsView extends BlockView {
                 }
             }
         };
-        this.onClickHandler = (elementId, dataTracked) => {
-            var _a;
-            this.props.popper.destroy();
-            const isSelectedSuggestion = !!((_a = selectedSuggestionKey
-                .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.find(this.getPos(), this.getPos() + this.node.nodeSize).length);
-            const { tr } = this.view.state;
-            tr.setSelection(NodeSelection.create(this.view.state.doc, this.getPos()));
-            if (dataTracked && dataTracked.status !== CHANGE_STATUS.rejected) {
-                tr.setMeta(SET_SUGGESTION_ID, dataTracked.id);
-            }
-            else {
-                if (isSelectedSuggestion) {
-                    tr.setMeta(CLEAR_SUGGESTION_ID, true);
-                }
-            }
-            this.view.dispatch(tr);
-            if (!((dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.operation) === CHANGE_OPERATION.delete &&
-                (dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.status) !== CHANGE_STATUS.rejected)) {
-                this.showContextMenu(elementId);
-            }
-        };
-        this.showContextMenu = (elementId) => {
-            this.props.popper.destroy();
-            const element = document.getElementById(elementId);
-            const componentProps = {
-                actions: [
-                    {
-                        label: 'Edit',
-                        action: () => this.handleEdit(elementId),
-                        icon: 'EditIcon',
-                    },
-                ],
-            };
-            this.contextMenu = ReactSubView(this.props, ContextMenu, componentProps, this.node, this.getPos, this.view, 'context-menu');
-            this.props.popper.show(element, this.contextMenu, 'right-start');
-        };
-        this.handleEdit = (id) => {
-            var _a;
-            this.props.popper.destroy();
+        this.handleClick = (e) => {
+            var _a, _b;
+            e.stopPropagation();
             const contributors = findChildrenAttrsByType(this.view, schema.nodes.contributor);
             const affiliations = findChildrenAttrsByType(this.view, schema.nodes.affiliation);
-            const author = id ? contributors.filter((a) => a.id === id)[0] : undefined;
+            let author = undefined;
+            const target = e.target;
+            if (target) {
+                const id = (_a = target.closest('.contributor')) === null || _a === void 0 ? void 0 : _a.getAttribute('id');
+                author = contributors.filter((a) => a.id === id)[0];
+            }
             const componentProps = {
                 author,
                 authors: contributors,
@@ -219,7 +180,7 @@ export class ContributorsView extends BlockView {
                 onDeleteAuthor: this.handleDeleteAuthor,
                 onSaveAffiliation: this.handleSaveAffiliation,
             };
-            (_a = this.popper) === null || _a === void 0 ? void 0 : _a.remove();
+            (_b = this.popper) === null || _b === void 0 ? void 0 : _b.remove();
             this.popper = ReactSubView(this.props, AuthorsModal, componentProps, this.node, this.getPos, this.view);
             this.container.appendChild(this.popper);
         };

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

@@ -4,7 +4,6 @@ export declare class AffiliationsView<PropsType extends EditableBlockProps> exte
     ignoreMutation: () => boolean;
     stopEvent: () => boolean;
     createElement: () => void;
-    updateContents: () => void;
 }
 declare const _default: (props: import("./base_node_view").BaseNodeProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<AffiliationsView<any>>;
 export default _default;

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

@@ -24,23 +24,20 @@ export interface ContributorsProps extends EditableBlockProps {
     selectAuthorForEditing: (authorId: string) => void;
 }
 export declare class ContributorsView<PropsType extends ContributorsProps> extends BlockView<PropsType> {
-    contextMenu: HTMLElement;
     container: HTMLElement;
     inner: HTMLElement;
     popper?: HTMLElement;
     initialise: () => void;
     updateContents: () => void;
     buildAuthors: () => void;
-    buildAuthor: (node: ContributorNode, isJointFirstAuthor: boolean, selectedAuthor?: string) => HTMLDivElement;
+    buildAuthor: (node: ContributorNode, isJointFirstAuthor: boolean, selectedAuthor?: string) => HTMLButtonElement;
     createNote(text?: string, title?: string): HTMLSpanElement;
     isJointFirstAuthor: (authors: ContributorNode[], index: number) => boolean;
     createElement: () => void;
     createDOM: () => void;
     createEditButton: () => void;
     createLegend: () => void;
-    private onClickHandler;
-    showContextMenu: (elementId: string) => void;
-    handleEdit: (id: string) => void;
+    handleClick: (e: Event) => void;
     handleSaveAuthor: (author: ContributorAttrs) => void;
     handleDeleteAuthor: (author: ContributorAttrs) => void;
     handleSaveAffiliation: (affiliation: AffiliationAttrs) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.7.28-LEAN-3417-3",
+  "version": "1.7.29",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -112,4 +112,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}

package/styles/AdvancedEditor.css

@@ -780,6 +780,12 @@ Next levels are shifted 'up' by 1
   color: var(--deleted-color);
 }
 
+.contributor[data-track-op='delete']:not([data-track-status='rejected']),
+.contributor[data-track-op='delete']:not([data-track-status='rejected']) .name,
+.affiliation[data-track-op='delete']:not([data-track-status='rejected']) {
+  pointer-events: none;
+}
+
 .contributor[data-track-op='delete']:not([data-track-status='rejected']) {
   color: var(--deleted-color);
 }
@@ -797,52 +803,29 @@ Next levels are shifted 'up' by 1
 .contributors {
   white-space: initial;
   margin-top: 24px;
+  align-items: center;
   display: flex;
   justify-content: space-between;
-  align-items: flex-start;
-  gap: 0 .5em;
 }
 .contributors-list {
-  display: flex;
-  max-width: 100%;
   flex: 0 1 auto;
-  flex-wrap: wrap;
-  gap: 0 .25em;
 }
+
 .contributors .tools-panel {
   position: initial;
-  display: flex;
   flex: 1;
-  align-items: center;
-}
-.contributor-wrapper {
-  display: flex;
-}
-.contributor-wrapper:after {
-  content: ', ';
-  color: #353535;
-}
-.contributor-wrapper:last-child::after {
-  content: '';
-  margin-right: 0;
-}
-.contributor-wrapper .contributor-comment {
-  left: 0;
-  top: -8px;
-  width: auto;
-  height: auto; 
 }
+
 .contributor {
-  position: relative;
   display: inline-flex;
   background: transparent;
   border: 0;
+  font-family: 'PT Sans', sans-serif;
   font-size: 1rem;
   text-decoration: none;
   color: inherit;
   outline: none;
-  padding: 4px;
-  /* margin: 0 6px; */
+  padding: 0;
 }
 
 .contributor:not(:disabled):hover {
@@ -858,6 +841,16 @@ Next levels are shifted 'up' by 1
   cursor: pointer !important;
 }
 
+.contributor:after {
+  content: ', ';
+  color: #353535;
+  margin-right: 5px;
+}
+.contributor:last-child::after {
+  content: '';
+  margin-right: 0;
+}
+
 .contributors-legend {
   margin: 16px 0 0 0;
 }
@@ -869,7 +862,11 @@ Next levels are shifted 'up' by 1
   vertical-align: top;
 }
 
-
+.contributors .tools-panel {
+  align-items: center;
+  display: flex;
+  margin-left: 8px;
+}
 
 .contributor-note {
   display: inline-block;
@@ -898,4 +895,4 @@ Next levels are shifted 'up' by 1
 
 * {
   scroll-behavior: smooth;
-}
+}