@manuscripts/body-editor 1.10.5-LEAN-3535.0 → 1.10.5

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.contextMenuBtnClass = exports.sectionLevel = void 0;
+exports.ContextMenu = 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,7 +42,6 @@ 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) => {
@@ -356,11 +355,7 @@ class ContextMenu {
         };
         this.resolvePos = () => this.view.state.doc.resolve(this.getPos());
         this.addPopperEventListeners = () => {
-            const mouseListener = (event) => {
-                const target = event.target;
-                if (target.classList.contains(exports.contextMenuBtnClass)) {
-                    return;
-                }
+            const mouseListener = () => {
                 window.requestAnimationFrame(() => {
                     window.removeEventListener('mousedown', mouseListener);
                     popper.destroy();

package/dist/cjs/lib/popper.js

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

package/dist/cjs/views/bibliography_element.js

@@ -36,6 +36,7 @@ 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;
@@ -56,7 +57,6 @@ 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.js

@@ -27,7 +27,6 @@ class CitationView extends base_node_view_1.BaseNodeView {
     constructor() {
         super(...arguments);
         this.ignoreMutation = () => true;
-        this.wasUpdated = false;
         this.initialise = () => {
             if (!this.node.type.spec.toDOM) {
                 throw Error(`Node view ${this.node.type} doesn't have toDOM method`);
@@ -41,7 +40,6 @@ class CitationView extends base_node_view_1.BaseNodeView {
         };
         this.updateContents = () => {
             var _a;
-            console.log('citation view updateContents');
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
             if (!bib) {
                 return;
@@ -62,12 +60,6 @@ class CitationView extends base_node_view_1.BaseNodeView {
             this.dom.appendChild(element);
             (0, comment_annotation_1.addCommentToLeafNode)(this.getPos(), this.getPos() + this.node.nodeSize, this.view.state, this.dom);
             this.setDomAttrs(this.node, this.dom, ['rids', 'contents', 'selectedText']);
-            if (!this.wasUpdated) {
-                this.dom.addEventListener('click', () => this.onClickHandler());
-            }
-            this.wasUpdated = true;
-        };
-        this.onClickHandler = () => {
         };
     }
 }

package/dist/cjs/views/citation_editable.js

@@ -47,16 +47,7 @@ class CitationEditableView extends citation_1.CitationView {
                 ((_a = element.parentElement) === null || _a === void 0 ? void 0 : _a.classList.contains('comment-icon')));
         };
         this.selectNode = () => {
-            console.log('selectNode...');
             this.dom.classList.add('ProseMirror-selectednode');
-        };
-        this.destroy = () => {
-            var _a;
-            (_a = this.editor) === null || _a === void 0 ? void 0 : _a.remove();
-            this.props.popper.destroy();
-        };
-        this.onClickHandler = () => {
-            console.log('citation_editable click handler...');
             const can = this.props.getCapabilities();
             if (can.seeReferencesButtons && !(0, track_changes_utils_1.isDeleted)(this.node)) {
                 const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
@@ -68,6 +59,15 @@ 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();
+            this.props.popper.destroy();
+        };
         this.showContextMenu = () => {
             this.props.popper.destroy();
             const componentProps = {

package/dist/cjs/views/editable_block.js

@@ -41,12 +41,13 @@ const EditableBlock = (Base) => {
                 }
                 const after = !hasParent($pos, transform_1.schema.nodes.bibliography_section);
                 const button = document.createElement('a');
-                button.classList.add('add-block', context_menu_1.contextMenuBtnClass);
+                button.classList.add('add-block');
                 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);
                 });
@@ -58,11 +59,12 @@ const EditableBlock = (Base) => {
                     return null;
                 }
                 const button = document.createElement('a');
-                button.classList.add('edit-block', context_menu_1.contextMenuBtnClass);
+                button.classList.add('edit-block');
                 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,7 +35,6 @@ 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) => {
@@ -349,11 +348,7 @@ export class ContextMenu {
         };
         this.resolvePos = () => this.view.state.doc.resolve(this.getPos());
         this.addPopperEventListeners = () => {
-            const mouseListener = (event) => {
-                const target = event.target;
-                if (target.classList.contains(contextMenuBtnClass)) {
-                    return;
-                }
+            const mouseListener = () => {
                 window.requestAnimationFrame(() => {
                     window.removeEventListener('mousedown', mouseListener);
                     popper.destroy();

package/dist/es/lib/popper.js

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

package/dist/es/views/bibliography_element.js

@@ -30,6 +30,7 @@ export class BibliographyElementBlockView extends BlockView {
     constructor() {
         super(...arguments);
         this.showPopper = (id) => {
+            this.props.popper.destroy();
             const bib = getBibliographyPluginState(this.view.state);
             if (!bib) {
                 return;
@@ -50,7 +51,6 @@ 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.js

@@ -24,7 +24,6 @@ export class CitationView extends BaseNodeView {
     constructor() {
         super(...arguments);
         this.ignoreMutation = () => true;
-        this.wasUpdated = false;
         this.initialise = () => {
             if (!this.node.type.spec.toDOM) {
                 throw Error(`Node view ${this.node.type} doesn't have toDOM method`);
@@ -38,7 +37,6 @@ export class CitationView extends BaseNodeView {
         };
         this.updateContents = () => {
             var _a;
-            console.log('citation view updateContents');
             const bib = getBibliographyPluginState(this.view.state);
             if (!bib) {
                 return;
@@ -59,12 +57,6 @@ export class CitationView extends BaseNodeView {
             this.dom.appendChild(element);
             addCommentToLeafNode(this.getPos(), this.getPos() + this.node.nodeSize, this.view.state, this.dom);
             this.setDomAttrs(this.node, this.dom, ['rids', 'contents', 'selectedText']);
-            if (!this.wasUpdated) {
-                this.dom.addEventListener('click', () => this.onClickHandler());
-            }
-            this.wasUpdated = true;
-        };
-        this.onClickHandler = () => {
         };
     }
 }

package/dist/es/views/citation_editable.js

@@ -41,16 +41,7 @@ export class CitationEditableView extends CitationView {
                 ((_a = element.parentElement) === null || _a === void 0 ? void 0 : _a.classList.contains('comment-icon')));
         };
         this.selectNode = () => {
-            console.log('selectNode...');
             this.dom.classList.add('ProseMirror-selectednode');
-        };
-        this.destroy = () => {
-            var _a;
-            (_a = this.editor) === null || _a === void 0 ? void 0 : _a.remove();
-            this.props.popper.destroy();
-        };
-        this.onClickHandler = () => {
-            console.log('citation_editable click handler...');
             const can = this.props.getCapabilities();
             if (can.seeReferencesButtons && !isDeleted(this.node)) {
                 const attrs = getActualAttrs(this.node);
@@ -62,6 +53,15 @@ 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();
+            this.props.popper.destroy();
+        };
         this.showContextMenu = () => {
             this.props.popper.destroy();
             const componentProps = {

package/dist/es/views/editable_block.js

@@ -15,7 +15,7 @@
  */
 import { schema } from '@manuscripts/transform';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
-import { ContextMenu, contextMenuBtnClass } from '../lib/context-menu';
+import { ContextMenu } from '../lib/context-menu';
 const isNotNull = (a) => a !== null;
 const hasParent = ($pos, type) => {
     return !!findParentNodeOfTypeClosestToPos($pos, type);
@@ -38,12 +38,13 @@ export const EditableBlock = (Base) => {
                 }
                 const after = !hasParent($pos, schema.nodes.bibliography_section);
                 const button = document.createElement('a');
-                button.classList.add('add-block', contextMenuBtnClass);
+                button.classList.add('add-block');
                 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);
                 });
@@ -55,11 +56,12 @@ export const EditableBlock = (Base) => {
                     return null;
                 }
                 const button = document.createElement('a');
-                button.classList.add('edit-block', contextMenuBtnClass);
+                button.classList.add('edit-block');
                 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,7 +20,6 @@ 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.d.ts

@@ -17,10 +17,8 @@ import { ManuscriptNodeView } from '@manuscripts/transform';
 import { BaseNodeProps, BaseNodeView } from './base_node_view';
 export declare class CitationView<PropsType extends BaseNodeProps> extends BaseNodeView<PropsType> implements ManuscriptNodeView {
     ignoreMutation: () => boolean;
-    wasUpdated: boolean;
     initialise: () => this;
     updateContents: () => void;
-    onClickHandler: () => void;
 }
 declare const _default: (props: BaseNodeProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<CitationView<any>>;
 export default _default;

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

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

package/package.json

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