@manuscripts/body-editor 1.10.6-LEAN-3604.0 → 1.10.6

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

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContextMenu = exports.sectionLevel = void 0;
+exports.ContextMenu = exports.contextMenuBtnClass = exports.sectionLevel = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
@@ -42,6 +42,7 @@ exports.sectionLevel = sectionLevel;
 const hasAny = (set, ...items) => {
     return items.some((i) => set.has(i));
 };
+exports.contextMenuBtnClass = 'btn-context-menu';
 class ContextMenu {
     constructor(node, view, getPos, actions = {}, props) {
         this.showAddMenu = (target, after) => {
@@ -355,7 +356,11 @@ class ContextMenu {
         };
         this.resolvePos = () => this.view.state.doc.resolve(this.getPos());
         this.addPopperEventListeners = () => {
-            const mouseListener = () => {
+            const mouseListener = (event) => {
+                const target = event.target;
+                if (target.classList.contains(exports.contextMenuBtnClass)) {
+                    return;
+                }
                 window.requestAnimationFrame(() => {
                     window.removeEventListener('mousedown', mouseListener);
                     popper.destroy();

package/dist/cjs/lib/popper.js

@@ -22,9 +22,7 @@ exports.PopperManager = void 0;
 const popper_js_1 = __importDefault(require("popper.js"));
 class PopperManager {
     show(target, contents, placement = 'bottom', showArrow = true, modifiers = {}) {
-        if (this.activePopper) {
-            return this.destroy();
-        }
+        this.destroy();
         window.requestAnimationFrame(() => {
             const container = document.createElement('div');
             container.className = 'popper';
@@ -64,7 +62,9 @@ class PopperManager {
                     this.destroy();
                 }
             };
-            document.addEventListener('click', this.handleDocumentClick);
+            if (contents.classList.contains('context-menu')) {
+                window.addEventListener('click', this.handleDocumentClick);
+            }
         });
     }
     destroy() {
@@ -72,7 +72,7 @@ class PopperManager {
             this.removeContainerClass(this.activePopper.reference);
             this.activePopper.destroy();
             if (this.handleDocumentClick) {
-                document.removeEventListener('click', this.handleDocumentClick);
+                window.removeEventListener('click', this.handleDocumentClick);
             }
             delete this.activePopper;
         }

package/dist/cjs/views/bibliography_element.js

@@ -36,7 +36,6 @@ class BibliographyElementBlockView extends block_view_1.default {
     constructor() {
         super(...arguments);
         this.showPopper = (id) => {
-            this.props.popper.destroy();
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
             if (!bib) {
                 return;
@@ -57,6 +56,7 @@ class BibliographyElementBlockView extends block_view_1.default {
             this.showPopper(citationId);
         };
         this.handleComment = (citationId) => {
+            this.props.popper.destroy();
             this.props.setComment((0, transform_1.buildComment)(citationId));
         };
         this.showContextMenu = (element) => {

package/dist/cjs/views/citation_editable.js

@@ -59,10 +59,6 @@ class CitationEditableView extends citation_1.CitationView {
                 }
             }
         };
-        this.deselectNode = () => {
-            this.dom.classList.remove('ProseMirror-selectednode');
-            this.props.popper.destroy();
-        };
         this.destroy = () => {
             var _a;
             (_a = this.editor) === null || _a === void 0 ? void 0 : _a.remove();

package/dist/cjs/views/editable_block.js

@@ -41,13 +41,12 @@ const EditableBlock = (Base) => {
                 }
                 const after = !hasParent($pos, transform_1.schema.nodes.bibliography_section);
                 const button = document.createElement('a');
-                button.classList.add('add-block');
+                button.classList.add('add-block', context_menu_1.contextMenuBtnClass);
                 button.classList.add(after ? 'add-block-after' : 'add-block-before');
                 button.setAttribute('aria-label', `Add an element ${after ? 'below' : 'above'}`);
                 button.setAttribute('data-balloon-pos', 'down-left');
                 button.addEventListener('mousedown', (event) => {
                     event.preventDefault();
-                    event.stopPropagation();
                     const menu = this.createMenu();
                     menu.showAddMenu(event.currentTarget, after);
                 });
@@ -59,12 +58,11 @@ const EditableBlock = (Base) => {
                     return null;
                 }
                 const button = document.createElement('a');
-                button.classList.add('edit-block');
+                button.classList.add('edit-block', context_menu_1.contextMenuBtnClass);
                 button.setAttribute('aria-label', 'Open menu');
                 button.setAttribute('data-balloon-pos', 'down-left');
                 button.addEventListener('mousedown', (event) => {
                     event.preventDefault();
-                    event.stopPropagation();
                     const menu = this.createMenu();
                     menu.showEditMenu(event.currentTarget);
                 });

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

@@ -35,6 +35,7 @@ export const sectionLevel = (depth) => {
 const hasAny = (set, ...items) => {
     return items.some((i) => set.has(i));
 };
+export const contextMenuBtnClass = 'btn-context-menu';
 export class ContextMenu {
     constructor(node, view, getPos, actions = {}, props) {
         this.showAddMenu = (target, after) => {
@@ -348,7 +349,11 @@ export class ContextMenu {
         };
         this.resolvePos = () => this.view.state.doc.resolve(this.getPos());
         this.addPopperEventListeners = () => {
-            const mouseListener = () => {
+            const mouseListener = (event) => {
+                const target = event.target;
+                if (target.classList.contains(contextMenuBtnClass)) {
+                    return;
+                }
                 window.requestAnimationFrame(() => {
                     window.removeEventListener('mousedown', mouseListener);
                     popper.destroy();

package/dist/es/lib/popper.js

@@ -16,9 +16,7 @@
 import Popper from 'popper.js';
 export class PopperManager {
     show(target, contents, placement = 'bottom', showArrow = true, modifiers = {}) {
-        if (this.activePopper) {
-            return this.destroy();
-        }
+        this.destroy();
         window.requestAnimationFrame(() => {
             const container = document.createElement('div');
             container.className = 'popper';
@@ -58,7 +56,9 @@ export class PopperManager {
                     this.destroy();
                 }
             };
-            document.addEventListener('click', this.handleDocumentClick);
+            if (contents.classList.contains('context-menu')) {
+                window.addEventListener('click', this.handleDocumentClick);
+            }
         });
     }
     destroy() {
@@ -66,7 +66,7 @@ export class PopperManager {
             this.removeContainerClass(this.activePopper.reference);
             this.activePopper.destroy();
             if (this.handleDocumentClick) {
-                document.removeEventListener('click', this.handleDocumentClick);
+                window.removeEventListener('click', this.handleDocumentClick);
             }
             delete this.activePopper;
         }

package/dist/es/views/bibliography_element.js

@@ -30,7 +30,6 @@ export class BibliographyElementBlockView extends BlockView {
     constructor() {
         super(...arguments);
         this.showPopper = (id) => {
-            this.props.popper.destroy();
             const bib = getBibliographyPluginState(this.view.state);
             if (!bib) {
                 return;
@@ -51,6 +50,7 @@ export class BibliographyElementBlockView extends BlockView {
             this.showPopper(citationId);
         };
         this.handleComment = (citationId) => {
+            this.props.popper.destroy();
             this.props.setComment(buildComment(citationId));
         };
         this.showContextMenu = (element) => {

package/dist/es/views/citation_editable.js

@@ -53,10 +53,6 @@ export class CitationEditableView extends CitationView {
                 }
             }
         };
-        this.deselectNode = () => {
-            this.dom.classList.remove('ProseMirror-selectednode');
-            this.props.popper.destroy();
-        };
         this.destroy = () => {
             var _a;
             (_a = this.editor) === null || _a === void 0 ? void 0 : _a.remove();

package/dist/es/views/editable_block.js

@@ -15,7 +15,7 @@
  */
 import { schema } from '@manuscripts/transform';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
-import { ContextMenu } from '../lib/context-menu';
+import { ContextMenu, contextMenuBtnClass } from '../lib/context-menu';
 const isNotNull = (a) => a !== null;
 const hasParent = ($pos, type) => {
     return !!findParentNodeOfTypeClosestToPos($pos, type);
@@ -38,13 +38,12 @@ export const EditableBlock = (Base) => {
                 }
                 const after = !hasParent($pos, schema.nodes.bibliography_section);
                 const button = document.createElement('a');
-                button.classList.add('add-block');
+                button.classList.add('add-block', contextMenuBtnClass);
                 button.classList.add(after ? 'add-block-after' : 'add-block-before');
                 button.setAttribute('aria-label', `Add an element ${after ? 'below' : 'above'}`);
                 button.setAttribute('data-balloon-pos', 'down-left');
                 button.addEventListener('mousedown', (event) => {
                     event.preventDefault();
-                    event.stopPropagation();
                     const menu = this.createMenu();
                     menu.showAddMenu(event.currentTarget, after);
                 });
@@ -56,12 +55,11 @@ export const EditableBlock = (Base) => {
                     return null;
                 }
                 const button = document.createElement('a');
-                button.classList.add('edit-block');
+                button.classList.add('edit-block', contextMenuBtnClass);
                 button.setAttribute('aria-label', 'Open menu');
                 button.setAttribute('data-balloon-pos', 'down-left');
                 button.addEventListener('mousedown', (event) => {
                     event.preventDefault();
-                    event.stopPropagation();
                     const menu = this.createMenu();
                     menu.showEditMenu(event.currentTarget);
                 });

package/dist/types/lib/context-menu.d.ts

@@ -20,6 +20,7 @@ export declare const sectionLevel: (depth: number) => string;
 interface Actions {
     setComment?: (comment: CommentAnnotation) => void;
 }
+export declare const contextMenuBtnClass = "btn-context-menu";
 export declare class ContextMenu {
     private readonly node;
     private readonly view;

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

@@ -20,7 +20,6 @@ export declare class CitationEditableView extends CitationView<EditableBlockProp
     private contextMenu;
     stopEvent: (event: Event) => boolean;
     selectNode: () => void;
-    deselectNode: () => void;
     destroy: () => void;
     showContextMenu: () => void;
     showPopper: () => void;

package/package.json

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

package/styles/AdvancedEditor.css

@@ -687,78 +687,64 @@ Next levels are shifted 'up' by 1
 }
 
 .ProseMirror {
-  --inserted-pending-bg-color: #e6ffdb;
-  --inserted-pending-color: #01872e;
-  --accepted-bg-color: transparent;
-  --deleted-color: #F35143;
-  --deleted-pending-bg-color: #FFF1F0;
+  --pending-bg-color: #e6f7fc;
+  --accepted-bg-color: #d1edaf;
+  --deleted-color: #f35143;
   --highlight-bg-color: #ffeebf;
+  --selection-bg-color: #bce7f6;
 }
 
 .selected-suggestion::selection {
   background: none;
 }
 
-span.selected-suggestion, 
-div.selected-suggestion > .block-container .block, 
-div.selected-suggestion:not(:has(> .block-container)) {
-  background-color: #bce7f6 !important;
-  color: #353535 !important;
-  text-decoration: none !important;
+span.selected-suggestion, div.selected-suggestion > .block-container .block, div.selected-suggestion:not(:has(> .block-container)) {
+  background: #bce7f6 !important;
   border-width: 2px 0 2px 0 !important;
   border-color: #20aedf !important;
   border-radius: 3px !important;
   border-style: solid !important;
 }
 
-.accepted span.selected-suggestion, 
-.accepted div.selected-suggestion > .block-container .block, 
-.accepted div.selected-suggestion:not(:has(> .block-container)) {
-  background-color: #F2F2F2 !important;
-  border-width: 2px 0 2px 0 !important;
-  border-color: #C9C9C9 !important;
-  border-radius: 3px !important;
-  border-style: solid !important;
-}
-
 .block-bullet_list .selected-suggestion p, .block-ordered_list .selected-suggestion p {
   margin: 0;
 }
 
 .block-bullet_list .selected-suggestion, .block-ordered_list .selected-suggestion {
   margin: 16px 0;
+}
 
 .ProseMirror .inserted.pending {
-  background: var(--inserted-pending-bg-color);
-  color: var(--inserted-pending-color);
-  text-decoration: underline;
+  background: var(--pending-bg-color);
+  text-decoration: none;
 }
 .ProseMirror .inserted.accepted {
+  background: var(--accepted-bg-color);
   text-decoration: none;
 }
 .ProseMirror .inserted.rejected {
   display: none;
 }
 
-/* Is this needed? */
 .ProseMirror .set_attrs.pending {
-  background: var(--inserted-pending-bg-color);
+  background: var(--pending-bg-color);
   text-decoration: none;
 }
-/* Is this needed? */
 .ProseMirror .set_attrs.accepted {
   background: var(--accepted-bg-color);
   text-decoration: none;
 }
 .ProseMirror .deleted.pending::before,
 .ProseMirror .deleted.pending {
-  background: var(--deleted-pending-bg-color);
+  background: var(--pending-bg-color);
   color: var(--deleted-color);
   text-decoration: line-through;
 }
 
 .ProseMirror .deleted.accepted::before,
 .ProseMirror .deleted.accepted {
+  background: var(--accepted-bg-color);
+  color: var(--deleted-color);
   text-decoration: line-through;
 }
 .ProseMirror .deleted.rejected {
@@ -785,6 +771,13 @@ div.selected-suggestion:not(:has(> .block-container)) {
   display: inline-block;
 }
 
+.affiliation[data-track-status='pending'],
+.contributor[data-track-status='pending'],
+.ProseMirror .inserted.pending,
+.ProseMirror .set_attrs.pending,
+.ProseMirror .deleted.pending {
+  background: #ddf3fa;
+}
 .ProseMirror .affiliation[data-track-status='rejected'][data-track-op='insert'],
 .ProseMirror .contributor[data-track-status='rejected'][data-track-op='insert'],
 .ProseMirror figure[data-track-status='rejected'][data-track-op='insert'],
@@ -794,22 +787,24 @@ div.selected-suggestion:not(:has(> .block-container)) {
   display: none;
 }
 
-.contributor[data-track-status='pending'][data-track-op='delete'] .name,
-.affiliation[data-track-status='pending'][data-track-op='delete'] {
+.contributor[data-track-op='delete']:not([data-track-status='rejected']) .name,
+.affiliation[data-track-op='delete']:not([data-track-status='rejected']) {
   text-decoration: line-through;
   color: var(--deleted-color);
-  background-color: var(--deleted-pending-bg-color)
 }
 
-.contributor[data-track-op='delete']:not([data-track-status='rejected']) .name {
-  text-decoration: line-through;
+.contributor[data-track-op='delete']:not([data-track-status='rejected']) {
+  color: var(--deleted-color);
+}
+
+.affiliation[data-track-status='pending'],
+.contributor[data-track-status='pending'] {
+  background: var(--pending-bg-color);
 }
 
-.affiliation[data-track-status='pending'][data-track-op='insert'],
-.contributor[data-track-status='pending'][data-track-op='insert'] .name {
-  background: var(--inserted-pending-bg-color);
-  color: var(--inserted-pending-color);
-  text-decoration: underline;
+.affiliation[data-track-status='accepted'],
+.contributor[data-track-status='accepted'] {
+  background: var(--accepted-bg-color);
 }
 
 .contributors {