@manuscripts/body-editor 2.0.38 → 2.0.40

package/dist/cjs/configs/editor-views.js

@@ -24,7 +24,6 @@ const bibliography_element_editable_1 = __importDefault(require("../views/biblio
 const blockquote_element_editable_1 = __importDefault(require("../views/blockquote_element_editable"));
 const citation_editable_1 = __importDefault(require("../views/citation_editable"));
 const contributors_1 = __importDefault(require("../views/contributors"));
-const corresp_1 = __importDefault(require("../views/corresp"));
 const cross_reference_editable_1 = __importDefault(require("../views/cross_reference_editable"));
 const empty_1 = __importDefault(require("../views/empty"));
 const equation_editable_1 = __importDefault(require("../views/equation_editable"));
@@ -89,6 +88,5 @@ exports.default = (props, dispatch) => {
         comments: (0, empty_1.default)('comments'),
         supplements: (0, empty_1.default)('supplements'),
         author_notes: (0, author_notes_1.default)(props, dispatch),
-        corresp: (0, corresp_1.default)(props),
     };
 };

package/dist/cjs/plugins/section-category/section-category-utils.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPluginState = exports.sectionCategoryKey = void 0;
+const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_view_1 = require("prosemirror-view");
-const assets_1 = require("../../assets");
+const react_1 = require("react");
+const server_1 = require("react-dom/server");
 const popper_1 = require("../../lib/popper");
 const section_categories_1 = require("../../lib/section-categories");
 const utils_1 = require("../../lib/utils");
@@ -43,7 +45,7 @@ function createButton(view, props, node, pos, category, canEdit = true) {
     const arrow = document.createElement('div');
     arrow.className = 'section-category popper-arrow';
     const button = document.createElement('button');
-    button.innerHTML = assets_1.sectionCategoryIcon;
+    button.innerHTML = (0, server_1.renderToStaticMarkup)((0, react_1.createElement)(style_guide_1.SectionCategoryIcon));
     button.className = `section-category-button ${category && 'assigned'}`;
     if (canEdit) {
         button.addEventListener('mousedown', () => {

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 = '2.0.38';
+exports.VERSION = '2.0.40';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/cjs/views/author_notes.js

@@ -14,15 +14,78 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorNotesView = void 0;
-const base_node_view_1 = require("./base_node_view");
+const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
-class AuthorNotesView extends base_node_view_1.BaseNodeView {
+class AuthorNotesView extends block_view_1.default {
     constructor() {
         super(...arguments);
+        this.allowedTypes = ['corresp', 'footnote', 'paragraph'];
+        this.correspondenceHeader = 'Correspondence';
+        this.genericHeader = 'Author notes';
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
+        this.createElement = () => {
+            this.container = document.createElement('div');
+            this.container.classList.add('block', 'author-notes-container');
+            this.dom.appendChild(this.container);
+        };
+        this.updateContents = () => {
+            this.genericHeaderIsDisplayed = false;
+            this.dom.setAttribute('contenteditable', 'false');
+            this.container.innerHTML = '';
+            const items = {};
+            this.allowedTypes.forEach((type) => (items[type] = []));
+            this.node.descendants((node) => {
+                if (this.allowedTypes.includes(node.type.name)) {
+                    items[node.type.name].push(node);
+                    return false;
+                }
+            });
+            this.allowedTypes.forEach((typeName) => {
+                if (items[typeName] && items[typeName].length) {
+                    const content = this.createContent(typeName, items[typeName]);
+                    if (content) {
+                        this.container.appendChild(content);
+                    }
+                }
+            });
+        };
+        this.createHeader = (typeName, text) => {
+            const header = document.createElement('h1');
+            header.classList.add(`${typeName}-title`, 'block');
+            header.textContent = text;
+            return header;
+        };
+        this.createContent = (typeName, nodes) => {
+            let isNotEmpty = false;
+            if (nodes.length) {
+                const container = document.createElement('div');
+                container.classList.add(`${typeName}s-container`);
+                if (typeName === this.allowedTypes[0]) {
+                    container.append(this.createHeader(typeName, this.correspondenceHeader));
+                }
+                else if (!this.genericHeaderIsDisplayed) {
+                    this.genericHeaderIsDisplayed = true;
+                    container.append(this.createHeader(typeName, this.genericHeader));
+                }
+                nodes.forEach((node) => {
+                    if (node.textContent) {
+                        isNotEmpty = true;
+                        const div = document.createElement('div');
+                        div.classList.add(typeName);
+                        div.textContent = node.textContent;
+                        container.append(div);
+                    }
+                });
+                return isNotEmpty ? container : null;
+            }
+            return null;
+        };
     }
 }
 exports.AuthorNotesView = AuthorNotesView;

package/dist/es/configs/editor-views.js

@@ -19,7 +19,6 @@ import bibliographyElement from '../views/bibliography_element_editable';
 import blockquoteElement from '../views/blockquote_element_editable';
 import citation from '../views/citation_editable';
 import contributors from '../views/contributors';
-import corresp from '../views/corresp';
 import crossReference from '../views/cross_reference_editable';
 import empty from '../views/empty';
 import equation from '../views/equation_editable';
@@ -84,6 +83,5 @@ export default (props, dispatch) => {
         comments: empty('comments'),
         supplements: empty('supplements'),
         author_notes: authorNotes(props, dispatch),
-        corresp: corresp(props),
     };
 };

package/dist/es/plugins/section-category/section-category-utils.js

@@ -1,7 +1,9 @@
+import { SectionCategoryIcon } from '@manuscripts/style-guide';
 import { isSectionNode, schema } from '@manuscripts/transform';
 import { PluginKey } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
-import { sectionCategoryIcon } from '../../assets';
+import { createElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
 import { PopperManager } from '../../lib/popper';
 import { getCategoryName, isBackMatterSection, isEditableSectionCategoryID, isUnique, } from '../../lib/section-categories';
 import { isChildOfNodeTypes } from '../../lib/utils';
@@ -40,7 +42,7 @@ function createButton(view, props, node, pos, category, canEdit = true) {
     const arrow = document.createElement('div');
     arrow.className = 'section-category popper-arrow';
     const button = document.createElement('button');
-    button.innerHTML = sectionCategoryIcon;
+    button.innerHTML = renderToStaticMarkup(createElement(SectionCategoryIcon));
     button.className = `section-category-button ${category && 'assigned'}`;
     if (canEdit) {
         button.addEventListener('mousedown', () => {

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.0.38';
+export const VERSION = '2.0.40';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/author_notes.js

@@ -13,13 +13,73 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { BaseNodeView } from './base_node_view';
+import BlockView from './block_view';
 import { createNodeView } from './creators';
-export class AuthorNotesView extends BaseNodeView {
+export class AuthorNotesView extends BlockView {
     constructor() {
         super(...arguments);
+        this.allowedTypes = ['corresp', 'footnote', 'paragraph'];
+        this.correspondenceHeader = 'Correspondence';
+        this.genericHeader = 'Author notes';
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
+        this.createElement = () => {
+            this.container = document.createElement('div');
+            this.container.classList.add('block', 'author-notes-container');
+            this.dom.appendChild(this.container);
+        };
+        this.updateContents = () => {
+            this.genericHeaderIsDisplayed = false;
+            this.dom.setAttribute('contenteditable', 'false');
+            this.container.innerHTML = '';
+            const items = {};
+            this.allowedTypes.forEach((type) => (items[type] = []));
+            this.node.descendants((node) => {
+                if (this.allowedTypes.includes(node.type.name)) {
+                    items[node.type.name].push(node);
+                    return false;
+                }
+            });
+            this.allowedTypes.forEach((typeName) => {
+                if (items[typeName] && items[typeName].length) {
+                    const content = this.createContent(typeName, items[typeName]);
+                    if (content) {
+                        this.container.appendChild(content);
+                    }
+                }
+            });
+        };
+        this.createHeader = (typeName, text) => {
+            const header = document.createElement('h1');
+            header.classList.add(`${typeName}-title`, 'block');
+            header.textContent = text;
+            return header;
+        };
+        this.createContent = (typeName, nodes) => {
+            let isNotEmpty = false;
+            if (nodes.length) {
+                const container = document.createElement('div');
+                container.classList.add(`${typeName}s-container`);
+                if (typeName === this.allowedTypes[0]) {
+                    container.append(this.createHeader(typeName, this.correspondenceHeader));
+                }
+                else if (!this.genericHeaderIsDisplayed) {
+                    this.genericHeaderIsDisplayed = true;
+                    container.append(this.createHeader(typeName, this.genericHeader));
+                }
+                nodes.forEach((node) => {
+                    if (node.textContent) {
+                        isNotEmpty = true;
+                        const div = document.createElement('div');
+                        div.classList.add(typeName);
+                        div.textContent = node.textContent;
+                        container.append(div);
+                    }
+                });
+                return isNotEmpty ? container : null;
+            }
+            return null;
+        };
     }
 }
 export default createNodeView(AuthorNotesView);

package/dist/types/configs/editor-views.d.ts

@@ -468,6 +468,5 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         dom: HTMLDivElement;
     };
     author_notes: import("../types").NodeViewCreator<import("../views/author_notes").AuthorNotesView>;
-    corresp: import("../types").NodeViewCreator<import("../views/corresp").CorrespView>;
 };
 export default _default;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.38";
+export declare const VERSION = "2.0.40";
 export declare const MATHJAX_VERSION = "3.2.2";

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

@@ -13,11 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { BaseNodeProps, BaseNodeView } from './base_node_view';
-export declare class AuthorNotesView extends BaseNodeView<BaseNodeProps> {
+import { ManuscriptNode } from '@manuscripts/transform';
+import BlockView from './block_view';
+import { EditableBlockProps } from './editable_block';
+export declare class AuthorNotesView extends BlockView<EditableBlockProps> {
     container: HTMLElement;
+    allowedTypes: string[];
+    correspondenceHeader: string;
+    genericHeader: string;
+    genericHeaderIsDisplayed: boolean;
     ignoreMutation: () => boolean;
     stopEvent: () => boolean;
+    createElement: () => void;
+    updateContents: () => void;
+    createHeader: (typeName: string, text: string) => HTMLHeadingElement;
+    createContent: (typeName: string, nodes: ManuscriptNode[]) => HTMLDivElement | null;
 }
-declare const _default: (props: BaseNodeProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<AuthorNotesView>;
+declare const _default: (props: import("./base_node_view").BaseNodeProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<AuthorNotesView>;
 export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -32,9 +32,9 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "2.2.11",
     "@manuscripts/library": "1.3.11",
-    "@manuscripts/style-guide": "2.0.14",
+    "@manuscripts/style-guide": "2.0.16",
     "@manuscripts/track-changes-plugin": "1.7.17",
-    "@manuscripts/transform": "2.3.30",
+    "@manuscripts/transform": "2.3.31",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",
     "codemirror": "^5.58.1",

package/styles/AdvancedEditor.css

@@ -281,10 +281,8 @@ span.comment-marker {
   line-height: 16px !important;
   margin-top: 4px !important;
 }
-.ProseMirror > .author-notes {
-  margin: 1rem 0;
-}
-.ProseMirror > .author-notes > .block-section_title > h1 {
+
+.ProseMirror .author-notes-container h1 {
   color: #353535 !important;
   font-size: 16px !important;
   font-weight: 700 !important;
@@ -292,6 +290,13 @@ span.comment-marker {
   margin: 0 !important
 }
 
+.ProseMirror .author-notes-container > div {
+  margin-bottom: 16px;
+}
+.ProseMirror .author-notes-container > div:last-child {
+  margin-bottom: 0;
+}
+
 .keywords .keyword {
   display: inline-block;
   color: #353535;

package/dist/cjs/views/corresp.js

@@ -1,32 +0,0 @@
-"use strict";
-/*!
- * © 2023 Atypon Systems LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CorrespView = void 0;
-const block_view_1 = __importDefault(require("./block_view"));
-const creators_1 = require("./creators");
-class CorrespView extends block_view_1.default {
-    constructor() {
-        super(...arguments);
-        this.ignoreMutation = () => true;
-        this.stopEvent = () => true;
-    }
-}
-exports.CorrespView = CorrespView;
-exports.default = (0, creators_1.createNodeView)(CorrespView);

package/dist/es/views/corresp.js

@@ -1,25 +0,0 @@
-/*!
- * © 2023 Atypon Systems LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import BlockView from './block_view';
-import { createNodeView } from './creators';
-export class CorrespView extends BlockView {
-    constructor() {
-        super(...arguments);
-        this.ignoreMutation = () => true;
-        this.stopEvent = () => true;
-    }
-}
-export default createNodeView(CorrespView);

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

@@ -1,25 +0,0 @@
-/*!
- * © 2023 Atypon Systems LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import BlockView from './block_view';
-import { EditableBlockProps } from './editable_block';
-export declare class CorrespView extends BlockView<EditableBlockProps> {
-    version: string;
-    container: HTMLElement;
-    ignoreMutation: () => boolean;
-    stopEvent: () => boolean;
-}
-declare const _default: (props: import("./base_node_view").BaseNodeProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<CorrespView>;
-export default _default;