@cu-mkp/editioncrafter 1.0.0 → 1.0.2

package/dist/es/src/action/DocumentActions.js

@@ -66,6 +66,9 @@ function parseImageURLs(canvas) {
           if (annotation.type !== 'Annotation') throwError("Expected Annotation in items property of ".concat(annotationPage.id));
           if (annotation.motivation === 'painting') {
             if (!annotation.body) throwError("Expected body property in Annotation ".concat(annotation.id));
+            if (!annotation.body.id) {
+              return null;
+            }
             return {
               bodyId: annotation.body.id,
               imageURL: "".concat(annotation.body.id, "/info.json")
@@ -171,33 +174,35 @@ function parseSingleManifest(manifest, transcriptionTypes, document) {
     var canvas = canvases[i];
     if (canvas.type !== 'Canvas') throwError("Expected items[".concat(i, "] to be of type 'Canvas'."));
     if (!canvas.id) throwError("Expected items[".concat(i, "] to have an id property."));
-    var folioID = canvas.id.substr(canvas.id.lastIndexOf('/') + 1);
-    var canvasLabel = parseLabel(canvas);
-    var _parseImageURLs = parseImageURLs(canvas),
-      bodyId = _parseImageURLs.bodyId,
-      imageURL = _parseImageURLs.imageURL;
-    var annotationURLs = parseAnnotationURLs(canvas, transcriptionTypes);
-    var ratio = canvas.width / canvas.height;
-    var thumbnailDimensions = [];
-    if (ratio > 1) {
-      thumbnailDimensions = [MAX_THUMBNAIL_DIMENSION, Math.round(MAX_THUMBNAIL_DIMENSION / ratio)];
-    } else {
-      thumbnailDimensions = [Math.round(MAX_THUMBNAIL_DIMENSION * ratio), MAX_THUMBNAIL_DIMENSION];
+    if (parseImageURLs(canvas)) {
+      var folioID = canvas.id.substr(canvas.id.lastIndexOf('/') + 1);
+      var canvasLabel = parseLabel(canvas);
+      var _parseImageURLs = parseImageURLs(canvas),
+        bodyId = _parseImageURLs.bodyId,
+        imageURL = _parseImageURLs.imageURL;
+      var annotationURLs = parseAnnotationURLs(canvas, transcriptionTypes);
+      var ratio = canvas.width / canvas.height;
+      var thumbnailDimensions = [];
+      if (ratio > 1) {
+        thumbnailDimensions = [MAX_THUMBNAIL_DIMENSION, Math.round(MAX_THUMBNAIL_DIMENSION / ratio)];
+      } else {
+        thumbnailDimensions = [Math.round(MAX_THUMBNAIL_DIMENSION * ratio), MAX_THUMBNAIL_DIMENSION];
+      }
+      var thumbnailURL = "".concat(bodyId, "/full/").concat(thumbnailDimensions.join(','), "/0/default.jpg");
+      var folio = {
+        id: document ? "".concat(document, "_").concat(folioID) : folioID,
+        doc_id: document || manifest.id,
+        name: canvasLabel,
+        pageNumber: i,
+        image_zoom_url: imageURL,
+        image_thumbnail_url: thumbnailURL,
+        annotationURLs: annotationURLs,
+        annotations: canvas.annotations ? canvas.annotations.filter(function (a) {
+          return a.motivation === 'tagging';
+        }) : []
+      };
+      folios.push(folio);
     }
-    var thumbnailURL = "".concat(bodyId, "/full/").concat(thumbnailDimensions.join(','), "/0/default.jpg");
-    var folio = {
-      id: folioID,
-      doc_id: document || manifest.id,
-      name: canvasLabel,
-      pageNumber: i,
-      image_zoom_url: imageURL,
-      image_thumbnail_url: thumbnailURL,
-      annotationURLs: annotationURLs,
-      annotations: canvas.annotations ? canvas.annotations.filter(function (a) {
-        return a.motivation === 'tagging';
-      }) : []
-    };
-    folios.push(folio);
   }
   return folios;
 }

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

@@ -36,7 +36,7 @@ var DiploMatic = function DiploMatic(props) {
     }
   }, [containerRef]);
   var fixedFrameMode = props.diplomatic.fixedFrameMode;
-  var fixedFrameModeClass = fixedFrameMode ? 'fixed' : 'sticky';
+  var fixedFrameModeClass = fixedFrameMode ? 'editioncrafter' : 'editioncrafter sticky';
   return /*#__PURE__*/React.createElement(Provider, {
     store: props.store
   }, /*#__PURE__*/React.createElement(HashRouter, null, /*#__PURE__*/React.createElement("div", {

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

@@ -53,6 +53,11 @@ var DocumentView = function DocumentView(props) {
   var params = useParams();
   var navigate = useNavigate();
   var location = useLocation();
+
+  //"reload" the page if the config props change
+  useEffect(function () {
+    dispatchAction(props, 'RouteListenerSaga.userNavigatation', location);
+  }, [props.config]);
   useEffect(function () {
     setSinglePaneMode(props.containerWidth < 960);
   }, [props.containerWidth]);
@@ -87,7 +92,8 @@ var DocumentView = function DocumentView(props) {
         }
       };
     }
-    var leftFolioID = folioID;
+    var leftFolioValid = Object.keys(document.folioIndex).includes(folioID);
+    var leftFolioID = leftFolioValid ? folioID : '-1';
     var leftTranscriptionType;
     var rightFolioID;
     var rightTranscriptionType;
@@ -95,13 +101,15 @@ var DocumentView = function DocumentView(props) {
     var thirdTranscriptionType;
     if (folioID2) {
       // route /ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2
-      leftTranscriptionType = transcriptionType;
-      rightFolioID = folioID2;
-      rightTranscriptionType = transcriptionType2 || firstTranscriptionType;
+      var rightFolioValid = Object.keys(document.folioIndex).includes(folioID2);
+      leftTranscriptionType = leftFolioValid ? transcriptionType : 'g';
+      rightFolioID = rightFolioValid ? folioID2 : '-1';
+      rightTranscriptionType = rightFolioValid ? transcriptionType2 ? transcriptionType2 : firstTranscriptionType : 'g';
       if (folioID3) {
         // route /ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2/:folioID3/:transcriptionType3
-        thirdFolioID = folioID3;
-        thirdTranscriptionType = transcriptionType3 || firstTranscriptionType;
+        var thirdFolioValid = Object.keys(document.folioIndex).includes(folioID3);
+        thirdFolioID = thirdFolioValid ? folioID3 : '-1';
+        thirdTranscriptionType = thirdFolioValid ? transcriptionType3 ? transcriptionType3 : firstTranscriptionType : 'g';
       } else {
         thirdFolioID = '-1';
         thirdTranscriptionType = 'g';
@@ -110,8 +118,8 @@ var DocumentView = function DocumentView(props) {
       // route /ec/:folioID
       // route /ec/:folioID/:transcriptionType
       leftTranscriptionType = 'f';
-      rightFolioID = folioID;
-      rightTranscriptionType = transcriptionType || firstTranscriptionType;
+      rightFolioID = leftFolioValid ? folioID : '-1';
+      rightTranscriptionType = leftFolioValid ? transcriptionType ? transcriptionType : firstTranscriptionType : 'g';
       thirdFolioID = '-1';
       thirdTranscriptionType = 'g';
     }
@@ -334,7 +342,8 @@ var DocumentView = function DocumentView(props) {
       hasPrevious: current_hasPrev,
       hasNext: current_hasNext,
       previousFolioShortID: prevID,
-      nextFolioShortID: nextID
+      nextFolioShortID: nextID,
+      documentID: doc.variorum ? doc.folioIndex[shortID].doc_id : doc.documentName
     });
   };
   var documentViewActions = {
@@ -349,6 +358,7 @@ var DocumentView = function DocumentView(props) {
     var viewType = determineViewType(side);
     var key = viewPaneKey(side);
     var folioID = docView[side].iiifShortID;
+    var document = docView[side].documentID;
     var transcriptionType = docView[side].transcriptionType;
     if (viewType === 'ImageView') {
       return /*#__PURE__*/React.createElement(ImageView, {
@@ -385,7 +395,7 @@ var DocumentView = function DocumentView(props) {
         documentView: docView,
         documentViewActions: documentViewActions,
         side: side,
-        selectedDoc: props.document.variorum && Object.keys(props.document.derivativeNames)[side === 'left' ? 0 : side === 'right' ? 1 : Object.keys(props.document.derivativeNames).length > 2 ? 2 : 1]
+        selectedDoc: document ? document : props.document.variorum && Object.keys(props.document.derivativeNames)[side === 'left' ? 0 : side === 'right' ? 1 : Object.keys(props.document.derivativeNames).length > 2 ? 2 : 1]
       });
     }
     if (viewType === 'GlossaryView') {
@@ -449,7 +459,8 @@ var DocumentView = function DocumentView(props) {
 };
 function mapStateToProps(state) {
   return {
-    document: state.document
+    document: state.document,
+    glossary: state.glossary
   };
 }
 export default withWidth()(connect(mapStateToProps)(DocumentView));

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

@@ -184,9 +184,11 @@ var ImageGridView = /*#__PURE__*/function (_React$Component) {
       var _this4 = this;
       var documentView = this.props.documentView;
       var folioID = documentView[this.props.side].iiifShortID;
-      var thumbs = this.generateThumbs(folioID, this.state.currentDoc ? this.props.document.folios.filter(function (folio) {
+      var thumbs = this.generateThumbs(folioID, this.props.document.variorum && this.state.currentDoc ? this.props.document.folios.filter(function (folio) {
         return folio.doc_id === _this4.state.currentDoc;
       }) : this.props.document.folios);
+      console.log(thumbs);
+      console.log(this.props.document.folios);
       var thumbCount = thumbs.length > this.loadIncrement ? this.loadIncrement : thumbs.length;
       var visibleThumbs = thumbs.slice(0, thumbCount);
       this.setState({
@@ -205,9 +207,7 @@ var ImageGridView = /*#__PURE__*/function (_React$Component) {
           React.createElement("li", {
             key: "thumb-".concat(index),
             className: "thumbnail"
-          }, /*#__PURE__*/React.createElement("figure", {
-            className: folio.id === currentID ? 'current' : ''
-          }, /*#__PURE__*/React.createElement("a", {
+          }, /*#__PURE__*/React.createElement("figure", null, /*#__PURE__*/React.createElement("a", {
             id: folio.id,
             onClick: _this5.onClickThumb.bind(_this5, folio.id)
           }, /*#__PURE__*/React.createElement("img", {
@@ -220,11 +220,13 @@ var ImageGridView = /*#__PURE__*/function (_React$Component) {
             onError: function onError(_ref) {
               var currentTarget = _ref.currentTarget;
               currentTarget.onerror = null;
-              currentTarget.src = "".concat(folio.image_zoom_url.slice(0, -9), "full/full/0/default.jpg");
+              if (folio.image_zoom_url && currentTarget.src !== "".concat(folio.image_zoom_url.slice(0, -9), "full/full/0/default.jpg")) {
+                currentTarget.src = "".concat(folio.image_zoom_url.slice(0, -9), "full/full/0/default.jpg");
+              }
             }
           }))), /*#__PURE__*/React.createElement("figcaption", {
-            className: folio.id === currentID ? 'thumbnail-caption current' : 'thumbnail-caption'
-          }, folio.id === currentID ? "*".concat(folio.name) : folio.name))
+            className: "thumbnail-caption"
+          }, folio.name))
         );
       });
       return thumbs;

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

@@ -122,8 +122,8 @@ var SplitPaneView = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       this.updateUI();
-      window.addEventListener('mousemove', this.onDrag);
-      window.addEventListener('mouseup', this.onEndDrag);
+      window.addEventListener('pointermove', this.onDrag);
+      window.addEventListener('pointerup', this.onEndDrag);
       window.addEventListener('resize', this.onResize);
       console.log(this.props);
       // Set the default width on mount
@@ -144,8 +144,8 @@ var SplitPaneView = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      window.removeEventListener('mousemove', this.onDrag);
-      window.removeEventListener('mouseup', this.onEndDrag);
+      window.removeEventListener('pointermove', this.onDrag);
+      window.removeEventListener('pointerup', this.onEndDrag);
       window.removeEventListener('resize', this.onResize);
     }
   }, {
@@ -155,7 +155,7 @@ var SplitPaneView = /*#__PURE__*/function (_Component) {
       var drawerIconClass = 'drawer-icon fas fa-caret-left fa-2x';
       return /*#__PURE__*/React.createElement("div", {
         className: "divider ".concat(position, "_divider"),
-        onMouseDown: function onMouseDown() {
+        onPointerDown: function onPointerDown() {
           return _this2.onStartDrag(position);
         }
       }, /*#__PURE__*/React.createElement("div", {