@manuscripts/body-editor 1.6.12 → 1.6.13

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

@@ -46,6 +46,7 @@ const pullquote_element_editable_1 = __importDefault(require("../views/pullquote
 const section_label_1 = __importDefault(require("../views/section_label"));
 const section_title_editable_1 = __importDefault(require("../views/section_title_editable"));
 const table_element_editable_1 = __importDefault(require("../views/table_element_editable"));
+const table_element_footer_editable_1 = __importDefault(require("../views/table_element_footer_editable"));
 const title_editable_1 = __importDefault(require("../views/title_editable"));
 const toc_element_editable_1 = __importDefault(require("../views/toc_element_editable"));
 exports.default = (props, dispatch) => {
@@ -78,6 +79,7 @@ exports.default = (props, dispatch) => {
         section_title: (0, section_title_editable_1.default)(props),
         section_label: (0, section_label_1.default)(props),
         table_element: (0, table_element_editable_1.default)(props),
+        table_element_footer: (0, table_element_footer_editable_1.default)(props),
         toc_element: (0, toc_element_editable_1.default)(props),
         comments: (0, empty_1.default)('comments'),
     };

package/dist/cjs/plugins/footnotes/index.js

@@ -19,14 +19,18 @@ exports.buildPluginState = exports.footnotesKey = void 0;
 const transform_1 = require("@manuscripts/transform");
 const lodash_es_1 = require("lodash-es");
 const prosemirror_state_1 = require("prosemirror-state");
+const prosemirror_utils_1 = require("prosemirror-utils");
 const prosemirror_view_1 = require("prosemirror-view");
+const utils_1 = require("../../lib/utils");
 exports.footnotesKey = new prosemirror_state_1.PluginKey('footnotes');
 const buildPluginState = (doc) => {
     const nodes = [];
     let index = 0;
     const labels = new Map();
-    doc.descendants((node, pos) => {
-        if ((0, transform_1.isInlineFootnoteNode)(node)) {
+    doc.descendants((node, pos, parentNode) => {
+        if ((0, transform_1.isInlineFootnoteNode)(node) &&
+            parentNode &&
+            parentNode.type !== transform_1.schema.nodes.table_cell) {
             nodes.push([node, pos]);
             node.attrs.rids.forEach((rid) => {
                 labels.set(rid, String(++index));
@@ -86,9 +90,18 @@ exports.default = () => {
         props: {
             decorations: (state) => {
                 const decorations = [];
+                const isInTableElementFooter = (0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.table_element_footer)(state.selection);
+                if (isInTableElementFooter) {
+                    const parent = (0, utils_1.findParentNodeWithIdValue)(state.selection);
+                    if (parent) {
+                        decorations.push(prosemirror_view_1.Decoration.node(parent.pos, parent.pos + parent.node.nodeSize, {
+                            class: 'footnote-selected',
+                        }));
+                    }
+                }
                 const { labels } = exports.footnotesKey.getState(state);
-                if (labels) {
-                    state.doc.descendants((node, pos) => {
+                state.doc.descendants((node, pos) => {
+                    if (labels) {
                         if ((0, transform_1.isFootnoteNode)(node)) {
                             const id = node.attrs.id;
                             const label = labels.get(id);
@@ -98,8 +111,13 @@ exports.default = () => {
                                 }));
                             }
                         }
-                    });
-                }
+                    }
+                    if (node.type === transform_1.schema.nodes.footnotes_element) {
+                        decorations.push(prosemirror_view_1.Decoration.node(pos, pos + node.nodeSize, {
+                            class: 'footnote-element',
+                        }));
+                    }
+                });
                 return prosemirror_view_1.DecorationSet.create(state.doc, decorations);
             },
         },

package/dist/cjs/views/table_element_footer.js

@@ -0,0 +1,37 @@
+"use strict";
+/*!
+ * © 2019 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TableElementFooterView = void 0;
+const base_node_view_1 = require("./base_node_view");
+const creators_1 = require("./creators");
+class TableElementFooterView extends base_node_view_1.BaseNodeView {
+    constructor() {
+        super(...arguments);
+        this.initialise = () => {
+            this.createDOM();
+        };
+        this.createDOM = () => {
+            this.dom = document.createElement('div');
+            this.dom.classList.add('table-footer');
+            this.dom.setAttribute('id', this.node.attrs.id);
+            this.contentDOM = document.createElement('div');
+            this.dom.appendChild(this.contentDOM);
+        };
+    }
+}
+exports.TableElementFooterView = TableElementFooterView;
+exports.default = (0, creators_1.createNodeView)(TableElementFooterView);

package/dist/cjs/views/table_element_footer_editable.js

@@ -0,0 +1,20 @@
+"use strict";
+/*!
+ * © 2019 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const creators_1 = require("./creators");
+const table_element_footer_1 = require("./table_element_footer");
+exports.default = (0, creators_1.createEditableNodeView)(table_element_footer_1.TableElementFooterView);

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

@@ -41,6 +41,7 @@ import pullquoteElement from '../views/pullquote_element_editable';
 import sectionLabel from '../views/section_label';
 import sectionTitle from '../views/section_title_editable';
 import tableElement from '../views/table_element_editable';
+import tableElementFooter from '../views/table_element_footer_editable';
 import title from '../views/title_editable';
 import tocElement from '../views/toc_element_editable';
 export default (props, dispatch) => {
@@ -73,6 +74,7 @@ export default (props, dispatch) => {
         section_title: sectionTitle(props),
         section_label: sectionLabel(props),
         table_element: tableElement(props),
+        table_element_footer: tableElementFooter(props),
         toc_element: tocElement(props),
         comments: empty('comments'),
     };

package/dist/es/plugins/footnotes/index.js

@@ -13,17 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isFootnoteNode, isInlineFootnoteNode, } from '@manuscripts/transform';
+import { isFootnoteNode, isInlineFootnoteNode, schema, } from '@manuscripts/transform';
 import { isEqual } from 'lodash-es';
 import { NodeSelection, Plugin, PluginKey } from 'prosemirror-state';
+import { hasParentNodeOfType } from 'prosemirror-utils';
 import { Decoration, DecorationSet } from 'prosemirror-view';
+import { findParentNodeWithIdValue } from '../../lib/utils';
 export const footnotesKey = new PluginKey('footnotes');
 export const buildPluginState = (doc) => {
     const nodes = [];
     let index = 0;
     const labels = new Map();
-    doc.descendants((node, pos) => {
-        if (isInlineFootnoteNode(node)) {
+    doc.descendants((node, pos, parentNode) => {
+        if (isInlineFootnoteNode(node) &&
+            parentNode &&
+            parentNode.type !== schema.nodes.table_cell) {
             nodes.push([node, pos]);
             node.attrs.rids.forEach((rid) => {
                 labels.set(rid, String(++index));
@@ -82,9 +86,18 @@ export default () => {
         props: {
             decorations: (state) => {
                 const decorations = [];
+                const isInTableElementFooter = hasParentNodeOfType(schema.nodes.table_element_footer)(state.selection);
+                if (isInTableElementFooter) {
+                    const parent = findParentNodeWithIdValue(state.selection);
+                    if (parent) {
+                        decorations.push(Decoration.node(parent.pos, parent.pos + parent.node.nodeSize, {
+                            class: 'footnote-selected',
+                        }));
+                    }
+                }
                 const { labels } = footnotesKey.getState(state);
-                if (labels) {
-                    state.doc.descendants((node, pos) => {
+                state.doc.descendants((node, pos) => {
+                    if (labels) {
                         if (isFootnoteNode(node)) {
                             const id = node.attrs.id;
                             const label = labels.get(id);
@@ -94,8 +107,13 @@ export default () => {
                                 }));
                             }
                         }
-                    });
-                }
+                    }
+                    if (node.type === schema.nodes.footnotes_element) {
+                        decorations.push(Decoration.node(pos, pos + node.nodeSize, {
+                            class: 'footnote-element',
+                        }));
+                    }
+                });
                 return DecorationSet.create(state.doc, decorations);
             },
         },

package/dist/es/views/table_element_footer.js

@@ -0,0 +1,33 @@
+/*!
+ * © 2019 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 { BaseNodeView } from './base_node_view';
+import { createNodeView } from './creators';
+export class TableElementFooterView extends BaseNodeView {
+    constructor() {
+        super(...arguments);
+        this.initialise = () => {
+            this.createDOM();
+        };
+        this.createDOM = () => {
+            this.dom = document.createElement('div');
+            this.dom.classList.add('table-footer');
+            this.dom.setAttribute('id', this.node.attrs.id);
+            this.contentDOM = document.createElement('div');
+            this.dom.appendChild(this.contentDOM);
+        };
+    }
+}
+export default createNodeView(TableElementFooterView);

package/dist/es/views/table_element_footer_editable.js

@@ -0,0 +1,18 @@
+/*!
+ * © 2019 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 { createEditableNodeView } from './creators';
+import { TableElementFooterView } from './table_element_footer';
+export default createEditableNodeView(TableElementFooterView);

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

@@ -532,6 +532,7 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         updateNodeAttrs: (attrs: import("prosemirror-model").Attrs) => void;
         deleteNode: (id: string) => void;
     } & import("../views/table_element").TableElementView>;
+    table_element_footer: import("../types").NodeViewCreator<import("../views/table_element_footer").TableElementFooterView<any>>;
     toc_element: import("../types").NodeViewCreator<{
         gutterButtons: () => HTMLElement[];
         actionGutterButtons: () => HTMLElement[];

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

@@ -0,0 +1,23 @@
+/*!
+ * © 2019 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 { ManuscriptNodeView } from '@manuscripts/transform';
+import { BaseNodeProps, BaseNodeView } from './base_node_view';
+export declare class TableElementFooterView<PropsType extends BaseNodeProps> extends BaseNodeView<PropsType> implements ManuscriptNodeView {
+    initialise: () => void;
+    createDOM: () => void;
+}
+declare const _default: (props: BaseNodeProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<TableElementFooterView<any>>;
+export default _default;

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

@@ -0,0 +1,18 @@
+/*!
+ * © 2019 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 { TableElementFooterView } from './table_element_footer';
+declare const _default: (props: import("./editable_block").EditableBlockProps, dispatch?: import("..").Dispatch | undefined) => import("../types").NodeViewCreator<TableElementFooterView<any>>;
+export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -29,11 +29,11 @@
   "dependencies": {
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/assets": "^0.6.4",
-    "@manuscripts/json-schema": "2.2.1",
-    "@manuscripts/library": "1.3.0",
-    "@manuscripts/style-guide": "1.6.0",
+    "@manuscripts/json-schema": "^2.2.2",
+    "@manuscripts/library": "1.3.2",
+    "@manuscripts/style-guide": "1.6.1",
     "@manuscripts/track-changes-plugin": "^1.7.5",
-    "@manuscripts/transform": "2.0.1",
+    "@manuscripts/transform": "2.0.4",
     "astrocite-eutils": "^0.16.4",
     "axios": "^1.2.2",
     "codemirror": "^5.58.1",
@@ -126,4 +126,4 @@
   "resolutions": {
     "@types/react": "^17.0.2"
   }
-}
+}

package/styles/Editor.css

@@ -939,6 +939,47 @@
   font-size: 75%;
 }
 
+.ProseMirror .table-footer {
+  font-size: 14px;
+}
+
+.ProseMirror .table-footer .footnote-element:first-child {
+  padding-top: 8px;
+}
+
+.ProseMirror .table-footer .footnote-element:not(:first-child)::before {
+  content: '';
+  border-bottom: 1px dashed #C9C9C9;
+  display: block;
+  margin-bottom: 8px;
+}
+
+.ProseMirror .table-footer .footnote-element {
+  counter-reset: table_footnote;
+}
+
+.ProseMirror .table-footer .footnote-element p::before {
+  counter-increment: table_footnote;
+  content: counter(table_footnote);
+  display: inline-block;
+  position: relative;
+  cursor: pointer;
+  vertical-align: super;
+  font-size: 75%;
+  margin-right: 4px;
+}
+
+.ProseMirror .table-footer .footnote-element p {
+  margin-bottom: 0px;
+  margin-top: 0px;
+}
+
+.ProseMirror .table-footer .footnote-element .footnote-selected {
+  padding: 8px 0 8px 0;
+  border: 1px solid #bce7f6;
+  background-color: #f2fbfc;
+}
+
 .ProseMirror .footnote-label {
   vertical-align: super;
   font-size: 75%;