@cu-mkp/editioncrafter 0.0.4 → 0.0.6

package/dist/editioncrafter.min.js.LICENSE.txt

@@ -31,7 +31,7 @@
  */
 
 /**
- * @remix-run/router v1.6.0
+ * @remix-run/router v1.6.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -50,7 +50,7 @@
  */
 
 /**
- * React Router DOM v6.11.0
+ * React Router DOM v6.11.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -61,7 +61,7 @@
  */
 
 /**
- * React Router v6.11.0
+ * React Router v6.11.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/es/src/component/DocumentView.js

@@ -168,19 +168,18 @@ var DocumentView = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "findBookFolios",
-    value: function findBookFolios(shortID) {
+    value: function findBookFolios(folioID) {
       var document = this.props.document;
-      var versoFolio = document.folioNameByIDIndex[shortID];
-      var versoIndex = document.folioIndex.indexOf(shortID);
-      if (!versoFolio.endsWith('v')) {
-        if (versoFolio.endsWith('r')) {
-          versoIndex -= 1;
-        } else {
-          return [null, null];
+      var versoFolio = document.folioIndex[folioID];
+      var name = versoFolio.name,
+        pageNumber = versoFolio.pageNumber;
+      if (!name.endsWith('v')) {
+        if (name.endsWith('r')) {
+          return [document.folios[pageNumber - 1].id, document.folios[pageNumber].id];
         }
+        return [null, null];
       }
-      var rectoIndex = versoIndex + 1;
-      return [document.folioIndex[versoIndex], document.folioIndex[rectoIndex]];
+      return [document.folios[pageNumber].id, document.folios[pageNumber + 1].id];
     }
   }, {
     key: "changeTranscriptionType",
@@ -320,8 +319,9 @@ var DocumentView = /*#__PURE__*/function (_Component) {
     value: function renderPane(side, docView) {
       var viewType = this.determineViewType(side);
       var key = this.viewPaneKey(side);
+      var folioID = docView[side].iiifShortID;
+      var transcriptionType = docView[side].transcriptionType;
       if (viewType === 'ImageView') {
-        var folioID = docView[side].iiifShortID;
         return /*#__PURE__*/React.createElement(ImageView, {
           key: key,
           folioID: folioID,
@@ -331,20 +331,20 @@ var DocumentView = /*#__PURE__*/function (_Component) {
         });
       }
       if (viewType === 'TranscriptionView') {
-        var _folioID2 = docView[side].iiifShortID;
-        var transcriptionType = docView[side].transcriptionType;
         return /*#__PURE__*/React.createElement(TranscriptionView, {
           key: key,
           documentView: docView,
           documentViewActions: this.documentViewActions,
           side: side,
-          folioID: _folioID2,
+          folioID: folioID,
           transcriptionType: transcriptionType
         });
       }
       if (viewType === 'XMLView') {
         return /*#__PURE__*/React.createElement(XMLView, {
           key: key,
+          folioID: folioID,
+          transcriptionType: transcriptionType,
           documentView: docView,
           documentViewActions: this.documentViewActions,
           side: side

package/dist/es/src/component/HelpPopper.js

@@ -7,6 +7,11 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import { FaArrowCircleLeft, FaArrowCircleRight } from 'react-icons/fa';
+import asterisk from '../icons/howtouse-asterisk.png';
+import curly from '../icons/howtouse-curly.png';
+import beaker from '../icons/howtouse-beaker.png';
+import square from '../icons/howtouse-square.png';
+import ups from '../icons/howtouse-ups.png';
 var HelpPopper = function HelpPopper(props) {
   return /*#__PURE__*/React.createElement(Popper, {
     anchorEl: props.anchorEl,
@@ -25,21 +30,23 @@ var HelpPopper = function HelpPopper(props) {
     variant: "h6",
     component: "h2"
   }, "Toolbar Buttons"), /*#__PURE__*/React.createElement(List, null, /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement("span", {
-    className: "fa fa-lock active"
+    className: "fa fa-lock"
   }), /*#__PURE__*/React.createElement(ListItemText, {
     primary: "Toggle Sync Views"
   })), /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement("span", {
-    className: "fa fa-book active"
+    className: "fa fa-book"
   }), /*#__PURE__*/React.createElement(ListItemText, {
     primary: "Toggle Book Mode"
   })), /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement("span", {
-    className: "fa fa-code active"
+    className: "fa fa-code"
   }), /*#__PURE__*/React.createElement(ListItemText, {
     primary: "Toggle XML Mode"
-  })), /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(FaArrowCircleLeft, null), /*#__PURE__*/React.createElement(FaArrowCircleRight, null)), /*#__PURE__*/React.createElement(ListItemText, {
+  })), /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement("span", {
+    className: "horizontal-buttons"
+  }, /*#__PURE__*/React.createElement(FaArrowCircleLeft, null), /*#__PURE__*/React.createElement(FaArrowCircleRight, null)), /*#__PURE__*/React.createElement(ListItemText, {
     primary: "Go Forward / Back"
   })), /*#__PURE__*/React.createElement(ListItem, null, /*#__PURE__*/React.createElement("span", {
-    className: "fa fa-hand-point-right active"
+    className: "fa fa-hand-point-right"
   }), /*#__PURE__*/React.createElement(ListItemText, {
     primary: "Jump to folio"
   })), /*#__PURE__*/React.createElement("div", {
@@ -54,22 +61,22 @@ var HelpPopper = function HelpPopper(props) {
     variant: "overline",
     component: "span"
   }, "Meaning")))), /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/howtouse-ups.png",
+    src: ups,
     alt: "howtouse-ups"
   })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Text is under the paper strip"))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/howtouse-curly.png",
+    src: curly,
     alt: "howtouse-curly"
   })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Expanded version implied by abbreviation marks"))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/howtouse-square.png",
+    src: square,
     alt: "howtouse-square"
   })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Editorial interventions and corrections"))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/howtouse-beaker.png",
+    src: beaker,
     alt: "howtouse-beaker"
   })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Associated research essay"))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/howtouse-asterisk.png",
+    src: asterisk,
     alt: "howtouse-asterisk"
-  })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Editorial Comments"))))))), /*#__PURE__*/React.createElement(Typography, null, "See", /*#__PURE__*/React.createElement("a", {
+  })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Editorial Comments"))))))), /*#__PURE__*/React.createElement(Typography, null, "See \xA0", /*#__PURE__*/React.createElement("a", {
     href: "#/content/how-to-use"
-  }, "How to Use"), ' ', "for more information.")))));
+  }, "How to Use"), "\xA0 for more information.")))));
 };
 export default HelpPopper;

package/dist/es/src/component/ImageGridView.js

@@ -74,16 +74,14 @@ var ImageGridView = /*#__PURE__*/function (_React$Component) {
     };
     return _this;
   }
-
-  // TODO REFACTOR
   _createClass(ImageGridView, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
       var documentView = this.props.documentView;
       var folioID = documentView[this.props.side].iiifShortID;
-      var nextFolioID = nextProps.documentView[this.props.side].iiifShortID;
+      var nextFolioID = this.props.documentView[this.props.side].iiifShortID;
       if (folioID !== nextFolioID) {
-        var thumbs = this.generateThumbs(nextFolioID, nextProps.document.folios);
+        var thumbs = this.generateThumbs(nextFolioID, this.props.document.folios);
         var thumbCount = thumbs.length > this.loadIncrement ? this.loadIncrement : thumbs.length;
         var visibleThumbs = thumbs.slice(0, thumbCount);
         this.setState({

package/dist/es/src/component/ImageView.js

@@ -80,11 +80,6 @@ var ImageView = /*#__PURE__*/function (_Component) {
         folioID = _this$props2.folioID,
         side = _this$props2.side;
       var folio = document.folioIndex[folioID];
-      // if( folio.loading ) {
-      //   window.loadingModal_start();
-      // } else {
-      //   window.loadingModal_stop();
-      // }
       return /*#__PURE__*/React.createElement("div", null, folio.tileSource && /*#__PURE__*/React.createElement("div", {
         className: "image-view imageViewComponent ".concat(this.props.side)
       }, /*#__PURE__*/React.createElement(Navigation, {

package/dist/es/src/component/JumpToFolio.js

@@ -44,10 +44,10 @@ var JumpToFolio = /*#__PURE__*/function (_React$Component) {
       });
     }
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
       // FIXME: this is an over-clever hack, but how else do you force focus?
-      if (nextProps.isVisible) {
+      if (this.props.isVisible) {
         var script = document.createElement('script');
         var id = "".concat(this.props.side, "_jumpInput");
         script.innerHTML = "setTimeout(function() { document.getElementById('".concat(id, "').focus(); }, 250);");

package/dist/es/src/component/Navigation.js

@@ -45,7 +45,7 @@ var Navigation = /*#__PURE__*/function (_React$Component) {
       });
     };
     _this.toggleBookmode = function toggleBookmode(event) {
-      if (!this.props.documentView.bookMode === true) {
+      if (!this.props.documentView.bookMode) {
         this.props.documentViewActions.changeCurrentFolio(this.props.documentView.left.iiifShortID, 'left', this.props.documentView.left.transcriptionType);
         this.props.documentViewActions.changeCurrentFolio(this.props.documentView.left.nextFolioShortID, 'right', this.props.documentView.left.transcriptionType);
       }

package/dist/es/src/component/TranscriptionView.js

@@ -17,6 +17,7 @@ import Navigation from './Navigation';
 import Pagination from './Pagination';
 import EditorComment from './EditorComment';
 import ErrorBoundary from './ErrorBoundary';
+import Watermark from './Watermark';
 var TranscriptionView = /*#__PURE__*/function (_Component) {
   _inherits(TranscriptionView, _Component);
   var _super = _createSuper(TranscriptionView);
@@ -52,11 +53,19 @@ var TranscriptionView = /*#__PURE__*/function (_Component) {
         documentView = _this$props.documentView,
         documentViewActions = _this$props.documentViewActions;
       if (folioID === '-1') {
-        return watermark(documentView, documentViewActions, side);
+        return /*#__PURE__*/React.createElement(Watermark, {
+          documentView: documentView,
+          documentViewActions: documentViewActions,
+          side: side
+        });
       }
       var folio = document.folioIndex[folioID];
       if (!folio.transcription) {
-        return watermark(documentView, documentViewActions, side);
+        return /*#__PURE__*/React.createElement(Watermark, {
+          documentView: documentView,
+          documentViewActions: documentViewActions,
+          side: side
+        });
       }
       var transcriptionData = folio.transcription[transcriptionType];
 
@@ -110,24 +119,6 @@ function htmlToReactParserOptions() {
   };
   return parserOptions;
 }
-function watermark(documentView, documentViewActions, side) {
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Navigation, {
-    side: side,
-    documentView: documentView,
-    documentViewActions: documentViewActions
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "transcriptContent"
-  }, /*#__PURE__*/React.createElement(Pagination, {
-    side: side,
-    className: "pagination_upper",
-    documentView: documentView,
-    documentViewActions: documentViewActions
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "watermark"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "watermark_contents"
-  }))));
-}
 function mapStateToProps(state) {
   return {
     annotations: state.annotations,

package/dist/es/src/component/Watermark.js

@@ -0,0 +1,25 @@
+import React from 'react';
+import Navigation from './Navigation';
+import Pagination from './Pagination';
+var Watermark = function Watermark(_ref) {
+  var side = _ref.side,
+    documentView = _ref.documentView,
+    documentViewActions = _ref.documentViewActions;
+  return /*#__PURE__*/React.createElement("div", null, documentView.left.iiifShortID !== '-1' && documentView.right.iiifShortID !== '-1' ? /*#__PURE__*/React.createElement(Navigation, {
+    side: side,
+    documentView: documentView,
+    documentViewActions: documentViewActions
+  }) : null, /*#__PURE__*/React.createElement("div", {
+    className: "transcriptContent"
+  }, /*#__PURE__*/React.createElement(Pagination, {
+    side: side,
+    className: "pagination_upper",
+    documentView: documentView,
+    documentViewActions: documentViewActions
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "watermark"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "watermark_contents"
+  }))));
+};
+export default Watermark;

package/dist/es/src/component/XMLView.js

@@ -14,83 +14,24 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import Navigation from './Navigation';
 import Pagination from './Pagination';
-import DocumentHelper from '../model/DocumentHelper';
+import Watermark from './Watermark';
 var XMLView = /*#__PURE__*/function (_Component) {
   _inherits(XMLView, _Component);
   var _super = _createSuper(XMLView);
-  function XMLView(props) {
-    var _this;
+  function XMLView() {
     _classCallCheck(this, XMLView);
-    _this = _super.call(this, props);
-    _this.state = {
-      folio: [],
-      isLoaded: false,
-      currentlyLoaded: ''
-    };
-    _this.contentChange = true;
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(XMLView, [{
-    key: "loadFolio",
-    value: function loadFolio(folio) {
-      var _this2 = this;
+    key: "render",
+    value:
+    // RENDER
+    function render() {
       var _this$props = this.props,
         side = _this$props.side,
-        documentView = _this$props.documentView;
-      if (typeof folio === 'undefined') {
-        // console.log("TranscriptView: Folio is undefined when you called loadFolio()!");
-        return;
-      }
-      folio.load().then(function (folio) {
-        var folioID = documentView[side].iiifShortID;
-        _this2.setState({
-          folio: folio,
-          isLoaded: true,
-          currentlyLoaded: folioID
-        });
-        // this.forceUpdate();
-      }, function (error) {
-        console.log("Unable to load transcription: ".concat(error));
-        // this.forceUpdate();
-      });
-    }
-
-    // Refresh the content if there is an incoming change
-  }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      this.contentChange = false;
-      var nextFolioID = nextProps.documentView[this.props.side].iiifShortID;
-      if (this.state.currentlyLoaded !== nextFolioID) {
-        this.contentChange = true;
-        this.loadFolio(this.props.document.folioIndex[nextFolioID]);
-      }
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate() {
-      // TODO make this work for XML view
-
-      if (this.contentChange) {
-        // Scroll content to top
-        var selector = "xmlViewComponent_".concat(this.props.side);
-        var el = document.getElementById(selector);
-        if (el !== null) {
-          // console.log(selector + "scroll to top");
-          el.scrollTop = 0;
-        }
-      }
-    }
-
-    // RENDER
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-        side = _this$props2.side,
-        document = _this$props2.document,
-        documentView = _this$props2.documentView,
-        documentViewActions = _this$props2.documentViewActions;
+        document = _this$props.document,
+        documentView = _this$props.documentView,
+        documentViewActions = _this$props.documentViewActions;
       var thisClass = "xmlViewComponent ".concat(side);
       var thisID = "xmlViewComponent_".concat(side);
 
@@ -103,18 +44,17 @@ var XMLView = /*#__PURE__*/function (_Component) {
           className: "watermark_contents"
         }));
       }
-      if (!this.state.isLoaded) {
-        this.loadFolio(document.folioIndex[folioID]);
-        return /*#__PURE__*/React.createElement("div", {
-          className: "watermark"
-        }, /*#__PURE__*/React.createElement("div", {
-          className: "watermark_contents"
-        }));
+      var folio = document.folioIndex[folioID];
+      if (!folio.transcription) {
+        return /*#__PURE__*/React.createElement(Watermark, {
+          documentView: documentView,
+          documentViewActions: documentViewActions,
+          side: side
+        });
       }
-
-      // get the xml for this transcription
       var transcriptionType = documentView[side].transcriptionType;
-      var xmlContent = this.state.folio.transcription["".concat(transcriptionType, "_xml")];
+      var transcriptionData = folio.transcription[transcriptionType];
+      var xmlContent = transcriptionData.xml;
       return /*#__PURE__*/React.createElement("div", {
         id: thisID,
         className: thisClass
@@ -122,16 +62,14 @@ var XMLView = /*#__PURE__*/function (_Component) {
         side: side,
         documentView: documentView,
         documentViewActions: documentViewActions
-      }), /*#__PURE__*/React.createElement("div", {
-        className: "xmlContent"
-      }, /*#__PURE__*/React.createElement(Pagination, {
+      }), /*#__PURE__*/React.createElement(Pagination, {
         side: side,
         className: "pagination_upper",
         documentView: documentView,
         documentViewActions: documentViewActions
       }), /*#__PURE__*/React.createElement("div", {
         className: "xmlContentInner"
-      }, /*#__PURE__*/React.createElement("pre", null, xmlContent))));
+      }, /*#__PURE__*/React.createElement("pre", null, xmlContent)));
     }
   }]);
   return XMLView;

package/dist/es/src/index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { createTheme, ThemeProvider } from '@material-ui/core/styles';
 import DiploMatic from './component/DiploMatic';
 import { createReduxStore } from './model/ReduxStore';
+import './scss/editioncrafter.scss';
 
 /**
  * Default instantiation