@manuscripts/body-editor 1.5.16 → 1.6.0

package/dist/cjs/views/citation.js

@@ -49,6 +49,7 @@ const react_dom_1 = __importDefault(require("react-dom"));
 const TrackChangesReview_1 = require("../components/track-changes/TrackChangesReview");
 const dompurify_1 = require("../lib/dompurify");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
+const bibliography_1 = require("../plugins/bibliography");
 const bibliography_utils_1 = require("../plugins/bibliography/bibliography-utils");
 const base_node_view_1 = require("./base_node_view");
 const creators_1 = require("./creators");
@@ -56,20 +57,8 @@ class CitationView extends base_node_view_1.BaseNodeView {
     constructor() {
         super(...arguments);
         this.showPopper = () => {
-            const { components: { CitationViewer }, getLibraryItem, projectID, renderReactComponent, } = this.props;
-            const citation = this.getCitation();
-            const items = citation.embeddedCitationItems.map((citationItem) => {
-                const libraryItem = getLibraryItem(citationItem.bibliographyItem);
-                if (!libraryItem) {
-                    const placeholderItem = {
-                        _id: citationItem.bibliographyItem,
-                        objectType: json_schema_1.ObjectTypes.BibliographyItem,
-                        title: '[missing library item]',
-                    };
-                    return placeholderItem;
-                }
-                return libraryItem;
-            });
+            const { components: { CitationViewer }, projectID, renderReactComponent, } = this.props;
+            const items = this.getBibliographyItems();
             if (!this.popperContainer) {
                 this.popperContainer = document.createElement('div');
                 this.popperContainer.className = 'citation-editor';
@@ -111,27 +100,25 @@ class CitationView extends base_node_view_1.BaseNodeView {
             return this;
         };
         this.updateContents = () => {
+            const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
             const citation = this.getCitation();
-            const nodeClasses = ['citation', ...(0, track_changes_utils_1.getChangeClasses)(this.node)];
-            const citationElement = document.createElement('span');
-            citationElement.className = nodeClasses.join(' ');
-            const citeprocCitations = this.props.getCiteprocCitations();
-            const citeprocContent = citeprocCitations === null || citeprocCitations === void 0 ? void 0 : citeprocCitations.get(this.node.attrs.rid);
-            const fragment = (0, dompurify_1.sanitize)(citeprocContent && citeprocContent !== '[NO_PRINTED_FORM]'
-                ? citeprocContent
-                : ' ', {
+            const classes = ['citation', ...(0, track_changes_utils_1.getChangeClasses)(this.node)];
+            const element = document.createElement('span');
+            element.className = classes.join(' ');
+            const text = bib.renderedCitations.get(citation._id);
+            const fragment = (0, dompurify_1.sanitize)(text && text !== '[NO_PRINTED_FORM]' ? text : ' ', {
                 ALLOWED_TAGS: ['i', 'b', 'span', 'sup', 'sub', '#text'],
             });
-            citationElement.appendChild(fragment);
+            element.appendChild(fragment);
             this.dom.className = 'citation-wrapper';
             this.dom.innerHTML = '';
-            this.dom.appendChild(citationElement);
+            this.dom.appendChild(element);
             if ((0, track_changes_utils_1.isPendingSetAttrs)(this.node) &&
                 !(0, track_changes_utils_1.isDeleted)(this.node) &&
                 citation.embeddedCitationItems.length) {
                 this.dom.appendChild(this.renderTrackChangesReview());
             }
-            this.setDomAttrs(this.node, this.dom, ['rid', 'contents', 'selectedText']);
+            this.setDomAttrs(this.node, this.dom, ['rids', 'contents', 'selectedText']);
         };
         this.renderTrackChangesReview = () => {
             const { popper } = this.props;
@@ -145,12 +132,28 @@ class CitationView extends base_node_view_1.BaseNodeView {
             return el;
         };
         this.getCitation = () => {
-            const citation = (0, bibliography_utils_1.getNodeModel)(this.node);
+            const citation = (0, bibliography_utils_1.getCitation)(this.node);
             if (!citation) {
                 throw new Error('Citation not found');
             }
             return citation;
         };
+        this.getBibliographyItems = () => {
+            const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
+            const citation = this.node;
+            return citation.attrs.rids.map((rid) => {
+                const item = bib.bibliographyItems.get(rid);
+                if (!item) {
+                    const placeholder = {
+                        _id: rid,
+                        objectType: json_schema_1.ObjectTypes.BibliographyItem,
+                        title: '[missing library item]',
+                    };
+                    return placeholder;
+                }
+                return item;
+            });
+        };
     }
 }
 exports.CitationView = CitationView;

package/dist/cjs/views/citation_editable.js

@@ -45,7 +45,6 @@ const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
 const react_1 = __importDefault(require("react"));
 const bibliography_1 = require("../plugins/bibliography");
-const bibliography_utils_1 = require("../plugins/bibliography/bibliography-utils");
 const citation_1 = require("./citation");
 const creators_1 = require("./creators");
 const createBibliographySection = (bibItem) => transform_1.schema.nodes.bibliography_section.createAndFill({}, [
@@ -59,20 +58,9 @@ class CitationEditableView extends citation_1.CitationView {
             const { components: { CitationEditor, CitationViewer }, getCapabilities, projectID, renderReactComponent, } = this.props;
             const capabilities = getCapabilities();
             const citation = this.getCitation();
-            const items = citation.embeddedCitationItems.map((citationItem) => {
-                const libraryItem = (0, bibliography_utils_1.getReferencesModelMap)(this.view.state.doc).get(citationItem.bibliographyItem);
-                if (!libraryItem) {
-                    const placeholderItem = {
-                        _id: citationItem.bibliographyItem,
-                        objectType: json_schema_1.ObjectTypes.BibliographyItem,
-                        title: '[missing library item]',
-                    };
-                    return placeholderItem;
-                }
-                return libraryItem;
-            });
+            const items = this.getBibliographyItems();
             const updateCitation = (data) => __awaiter(this, void 0, void 0, function* () {
-                this.updateInlineNode(Object.assign(Object.assign({}, citation), data));
+                this.updateNode(Object.assign(Object.assign({}, citation), data));
                 this.props.popper.update();
             });
             const findPosition = (doc, id) => {
@@ -99,7 +87,8 @@ class CitationEditableView extends citation_1.CitationView {
                 this.popperContainer = document.createElement('div');
                 this.popperContainer.className = 'citation-editor';
             }
-            const component = (capabilities === null || capabilities === void 0 ? void 0 : capabilities.editArticle) ? (react_1.default.createElement(CitationEditor, { items: items, saveModel: handleSave, deleteModel: this.deleteNode, modelMap: (0, bibliography_utils_1.getReferencesModelMap)(this.view.state.doc, true), insertBibliographyNode: (item) => this.insertBibliographyNode(this.view, item), importItems: this.importItems, selectedText: this.node.attrs.selectedText, setComment: this.props.setComment, handleCancel: this.handleCancel, handleClose: this.handleClose, handleRemove: this.handleRemove, updatePopper: this.updatePopper, handleCite: this.handleCite, canEdit: capabilities.editCitationsAndRefs, citation: citation, updateCitation: updateCitation, projectID: projectID, scheduleUpdate: this.props.popper.update })) : (react_1.default.createElement(CitationViewer, { items: items, setComment: this.props.setComment, scheduleUpdate: this.props.popper.update }));
+            const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
+            const component = (capabilities === null || capabilities === void 0 ? void 0 : capabilities.editArticle) ? (react_1.default.createElement(CitationEditor, { items: items, saveModel: handleSave, deleteModel: this.deleteNode, insertBibliographyNode: (item) => this.insertBibliographyNode(this.view, item), modelMap: bib.bibliographyItems, importItems: this.importItems, selectedText: this.node.attrs.selectedText, setComment: this.props.setComment, handleCancel: this.handleCancel, handleClose: this.handleClose, handleRemove: this.handleRemove, updatePopper: this.updatePopper, handleCite: this.handleCite, canEdit: capabilities.editCitationsAndRefs, citation: citation, updateCitation: updateCitation, projectID: projectID, scheduleUpdate: this.props.popper.update })) : (react_1.default.createElement(CitationViewer, { items: items, setComment: this.props.setComment, scheduleUpdate: this.props.popper.update }));
             renderReactComponent(component, this.popperContainer);
             this.props.popper.show(this.dom, this.popperContainer, 'right');
         };
@@ -117,10 +106,10 @@ class CitationEditableView extends citation_1.CitationView {
         };
         this.handleRemove = (id) => __awaiter(this, void 0, void 0, function* () {
             const citation = this.getCitation();
-            const embeddedCitationItems = citation.embeddedCitationItems.filter((item) => item.bibliographyItem !== id);
-            if (embeddedCitationItems.length > 0) {
-                citation.embeddedCitationItems = embeddedCitationItems;
-                this.updateInlineNode(citation);
+            const items = citation.embeddedCitationItems.filter((i) => i.bibliographyItem !== id);
+            if (items.length > 0) {
+                citation.embeddedCitationItems = items;
+                this.updateNode(citation);
                 window.setTimeout(() => {
                     this.showPopper();
                 }, 100);
@@ -131,9 +120,6 @@ class CitationEditableView extends citation_1.CitationView {
                 tr.delete(pos, pos + 1);
                 this.view.dispatch(tr);
             }
-            this.view.dispatch(this.view.state.tr.setMeta(bibliography_1.bibliographyKey, {
-                bibliographyInserted: true,
-            }));
             this.props.popper.destroy();
         });
         this.updatePopper = () => {
@@ -143,46 +129,43 @@ class CitationEditableView extends citation_1.CitationView {
             }, 100);
         };
         this.handleCite = (items) => __awaiter(this, void 0, void 0, function* () {
+            const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
             const citation = this.getCitation();
-            let triggerUpdate = false;
             for (const item of items) {
-                const existingItem = (0, library_1.matchLibraryItemByIdentifier)(item, (0, bibliography_utils_1.getReferencesModelMap)(this.view.state.doc));
+                const existingItem = (0, library_1.findMatchingBibliographyItem)(item, bib.bibliographyItems);
                 if (existingItem) {
                     item._id = existingItem._id;
                 }
                 else {
-                    triggerUpdate = true;
-                    yield this.insertBibliographyNode(this.view, item);
+                    this.insertBibliographyNode(this.view, item);
                 }
-                citation.embeddedCitationItems.push((0, transform_1.buildEmbeddedCitationItem)(item._id));
-            }
-            this.updateInlineNode(citation);
-            if (triggerUpdate) {
-                this.view.dispatch(this.view.state.tr.setMeta(bibliography_1.bibliographyKey, {
-                    bibliographyInserted: true,
-                }));
+                citation.embeddedCitationItems.push({
+                    _id: '_',
+                    objectType: json_schema_1.ObjectTypes.CitationItem,
+                    bibliographyItem: item._id,
+                });
             }
+            this.updateNode(citation);
             this.handleClose();
         });
         this.importItems = (items) => __awaiter(this, void 0, void 0, function* () {
+            const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
             const newItems = [];
             for (const item of items) {
-                const existingItem = (0, library_1.matchLibraryItemByIdentifier)(item, (0, bibliography_utils_1.getReferencesModelMap)(this.view.state.doc));
+                const existingItem = (0, library_1.findMatchingBibliographyItem)(item, bib.bibliographyItems);
                 if (!existingItem) {
-                    yield this.insertBibliographyNode(this.view, item);
+                    this.insertBibliographyNode(this.view, item);
                     newItems.push(item);
                 }
             }
             return newItems;
         });
-        this.updateInlineNode = (citation) => {
+        this.updateNode = (citation) => {
+            const rids = citation.embeddedCitationItems.map((i) => i.bibliographyItem);
             const { tr } = this.view.state;
             this.view.dispatch(tr.setNodeMarkup(this.getPos(), undefined, {
-                rid: citation._id,
-                embeddedCitationItems: citation.embeddedCitationItems.map((item) => ({
-                    id: item._id,
-                    bibliographyItem: item.bibliographyItem,
-                })),
+                id: citation._id,
+                rids,
             }));
         };
     }
@@ -204,9 +187,7 @@ class CitationEditableView extends citation_1.CitationView {
             newTr = tr.insert(pos + 1, bibItem);
         }
         else {
-            newTr = tr
-                .insert(tr.doc.content.size, createBibliographySection(bibItem))
-                .setMeta(bibliography_1.bibliographyKey, { bibliographyInserted: true });
+            newTr = tr.insert(tr.doc.content.size, createBibliographySection(bibItem));
         }
         view.dispatch(newTr);
         return false;

package/dist/cjs/views/{contributors_section.js → contributors.js}

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContributorsSectionView = void 0;
+exports.ContributorsView = void 0;
 const base_node_view_1 = require("./base_node_view");
 const creators_1 = require("./creators");
 const ReactSubView_1 = __importDefault(require("./ReactSubView"));
-class ContributorsSectionView extends base_node_view_1.BaseNodeView {
+class ContributorsView extends base_node_view_1.BaseNodeView {
     constructor() {
         super(...arguments);
         this.initialise = () => {
@@ -31,5 +31,5 @@ class ContributorsSectionView extends base_node_view_1.BaseNodeView {
         this.stopEvent = () => true;
     }
 }
-exports.ContributorsSectionView = ContributorsSectionView;
-exports.default = (0, creators_1.createNodeView)(ContributorsSectionView);
+exports.ContributorsView = ContributorsView;
+exports.default = (0, creators_1.createNodeView)(ContributorsView);

package/dist/cjs/views/cross_reference.js

@@ -14,14 +14,9 @@
  * 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.CrossReferenceView = void 0;
-const react_1 = __importDefault(require("react"));
 const track_changes_utils_1 = require("../lib/track-changes-utils");
-const objects_1 = require("../plugins/objects");
 const base_node_view_1 = require("./base_node_view");
 const creators_1 = require("./creators");
 class CrossReferenceView extends base_node_view_1.BaseNodeView {
@@ -30,38 +25,15 @@ class CrossReferenceView extends base_node_view_1.BaseNodeView {
         this.selectNode = () => {
         };
         this.handleClick = () => {
-            const auxiliaryObjectReference = this.getAuxiliaryObjectReference(this.node.attrs.rid);
-            if (auxiliaryObjectReference) {
-                if (auxiliaryObjectReference.referencedObjects) {
-                    this.showPopper(auxiliaryObjectReference.referencedObjects);
-                }
-                else {
-                    this.props.history.push({
-                        pathname: this.props.history.location.pathname,
-                        hash: '#' + auxiliaryObjectReference.referencedObject,
-                    });
-                }
+            const xref = this.node;
+            const rids = xref.attrs.rids;
+            if (!rids.length) {
+                return;
             }
-        };
-        this.showPopper = (referencedObjects) => {
-            const { components: { ReferencesViewer }, renderReactComponent, } = this.props;
-            if (!this.popperContainer) {
-                this.popperContainer = document.createElement('div');
-                this.popperContainer.className = 'citation-references';
-            }
-            const targets = objects_1.objectsKey.getState(this.view.state);
-            const items = [];
-            referencedObjects.map((referencedObject) => {
-                const target = targets.get(referencedObject);
-                if (target && target.label) {
-                    items.push({
-                        label: target.label,
-                        referencedObject,
-                    });
-                }
+            this.props.history.push({
+                pathname: this.props.history.location.pathname,
+                hash: '#' + rids[0],
             });
-            renderReactComponent(react_1.default.createElement(ReferencesViewer, { items: items, history: this.props.history }), this.popperContainer);
-            this.props.popper.show(this.dom, this.popperContainer, 'right');
         };
         this.updateContents = () => {
             const nodeClasses = ['cross-reference', ...(0, track_changes_utils_1.getChangeClasses)(this.node)];
@@ -74,7 +46,6 @@ class CrossReferenceView extends base_node_view_1.BaseNodeView {
             this.updateContents();
         };
         this.ignoreMutation = () => true;
-        this.getAuxiliaryObjectReference = (id) => this.props.getModelMap().get(id);
         this.createDOM = () => {
             this.dom = document.createElement('span');
             this.dom.className = 'cross-reference';

package/dist/cjs/views/cross_reference_editable.js

@@ -29,7 +29,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrossReferenceEditableView = void 0;
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
-const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
 const react_1 = __importDefault(require("react"));
 const CrossReferenceItems_1 = require("../components/views/CrossReferenceItems");
@@ -41,21 +40,17 @@ class CrossReferenceEditableView extends cross_reference_1.CrossReferenceView {
         super(...arguments);
         this.selectNode = () => {
             const { getCapabilities, renderReactComponent } = this.props;
+            const xref = this.node;
+            const rids = xref.attrs.rids;
             const can = getCapabilities();
-            const { rid } = this.node.attrs;
-            const auxiliaryObjectReference = rid
-                ? this.getAuxiliaryObjectReference(rid)
-                : null;
-            if (!(can === null || can === void 0 ? void 0 : can.editArticle) ||
-                (auxiliaryObjectReference === null || auxiliaryObjectReference === void 0 ? void 0 : auxiliaryObjectReference.referencedObject) ||
-                (auxiliaryObjectReference === null || auxiliaryObjectReference === void 0 ? void 0 : auxiliaryObjectReference.referencedObjects)) {
+            if (!(can === null || can === void 0 ? void 0 : can.editArticle) || rids.length) {
                 return;
             }
             if (!this.popperContainer) {
                 this.popperContainer = document.createElement('div');
                 this.popperContainer.className = 'cross-reference-editor';
             }
-            renderReactComponent(react_1.default.createElement(CrossReferenceItems_1.CrossReferenceItems, { handleSelect: this.handleSelect, targets: this.getTargets(), handleCancel: this.handleCancel, currentTargetId: auxiliaryObjectReference === null || auxiliaryObjectReference === void 0 ? void 0 : auxiliaryObjectReference.referencedObject, currentCustomLabel: this.node.attrs.customLabel }), this.popperContainer);
+            renderReactComponent(react_1.default.createElement(CrossReferenceItems_1.CrossReferenceItems, { handleSelect: this.handleSelect, targets: this.getTargets(), handleCancel: this.handleCancel, currentTargetId: rids[0], currentCustomLabel: this.node.attrs.customLabel }), this.popperContainer);
             this.props.popper.show(this.dom, this.popperContainer, 'right');
         };
         this.destroy = () => {
@@ -72,7 +67,7 @@ class CrossReferenceEditableView extends cross_reference_1.CrossReferenceView {
             return Array.from(targets.values());
         };
         this.handleCancel = () => {
-            if (!this.node.attrs.rid) {
+            if (!this.node.attrs.rids.length) {
                 const { state } = this.view;
                 const pos = this.getPos();
                 const tr = state.tr.delete(pos, pos + this.node.nodeSize);
@@ -87,10 +82,7 @@ class CrossReferenceEditableView extends cross_reference_1.CrossReferenceView {
         this.handleSelect = (rid, customLabel) => __awaiter(this, void 0, void 0, function* () {
             const { state } = this.view;
             const pos = this.getPos();
-            const $pos = state.doc.resolve(pos);
-            const rids = rid.trim().split(/\s+/);
-            const auxiliaryObjectReference = (0, transform_1.buildAuxiliaryObjectReference)($pos.parent.attrs.id, rids);
-            const tr = state.tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, this.node.attrs), { customLabel: customLabel || '', rid: auxiliaryObjectReference._id }));
+            const tr = state.tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, this.node.attrs), { customLabel: customLabel || '', rids: [rid] }));
             const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos);
             this.view.dispatch(tr.setSelection(selection));
             this.destroy();

package/dist/cjs/views/editable_block.js

@@ -71,8 +71,8 @@ const EditableBlock = (Base) => {
             this.createAddButton = (after) => {
                 var _a;
                 const $pos = this.view.state.doc.resolve(this.getPos());
-                if (!((_a = this.props.getCapabilities()) === null || _a === void 0 ? void 0 : _a.editArticle) ||
-                    $pos.parent.type === this.node.type.schema.nodes.keywords_section) {
+                const hasAccess = (_a = this.props.getCapabilities()) === null || _a === void 0 ? void 0 : _a.editArticle;
+                if (!hasAccess || $pos.parent.type === transform_1.schema.nodes.keywords) {
                     return null;
                 }
                 const button = document.createElement('a');

package/dist/cjs/views/{meta_section.js → empty.js}

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = () => {
-    const dom = document.createElement('section');
-    dom.setAttribute('data-type', 'meta');
+exports.default = (type) => () => {
+    const dom = document.createElement('div');
+    dom.setAttribute('data-type', type);
     dom.setAttribute('contenteditable', 'false');
     dom.style.display = 'inline';
     return { dom };

package/dist/cjs/views/section_title.js

@@ -18,31 +18,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SectionTitleView = exports.isSpecialSection = void 0;
-const transform_1 = require("@manuscripts/transform");
+exports.SectionTitleView = void 0;
 const context_menu_1 = require("../lib/context-menu");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
-const isSpecialSection = (node) => {
-    if ((0, transform_1.isSectionNode)(node)) {
-        const { attrs } = node;
-        return (attrs.category === 'MPSectionCategory:abstracts' ||
-            attrs.category === 'MPSectionCategory:body' ||
-            attrs.category === 'MPSectionCategory:backmatter');
-    }
-};
-exports.isSpecialSection = isSpecialSection;
 class SectionTitleView extends block_view_1.default {
     constructor() {
         super(...arguments);
         this.elementType = 'h1';
         this.updateContents = () => {
             const $pos = this.view.state.doc.resolve(this.getPos());
-            if ((0, exports.isSpecialSection)($pos.parent)) {
-                this.dom = document.createElement('div');
-                this.dom.classList.add('no-title');
-                return;
-            }
             if (this.node.childCount) {
                 this.contentDOM.classList.remove('empty-node');
             }