@pie-element/passage 2.21.4-next.3 → 2.21.5-next.16

package/module/print.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.24.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_lodash, _dll_debug} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.24.2/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@4.24.3/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {
@@ -8604,6 +8604,7 @@ const styles = theme => ({
     marginBottom: theme.spacing.unit * 2
   }
 });
+const getContent = html => (html || '').replace(/(<(?!img|iframe)([^>]+)>)/gi, '');
 class StimulusTabs extends React$1.Component {
   constructor(...args) {
     super(...args);
@@ -8678,8 +8679,8 @@ class StimulusTabs extends React$1.Component {
       return div.innerHTML;
     };
   }
-  renderInstructions(showTeacherInstructions, teacherInstructions, disabledTabs = false) {
-    if (!showTeacherInstructions || !teacherInstructions) {
+  renderInstructions(teacherInstructions, disabledTabs = false) {
+    if (!getContent(teacherInstructions)) {
       return;
     }
     const teacherInstructionsDiv = React$1.createElement(PreviewPrompt, {
@@ -8690,7 +8691,7 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 140
+        lineNumber: 142
       }
     });
     if (disabledTabs) {
@@ -8704,11 +8705,11 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 153
+        lineNumber: 155
       }
     }, teacherInstructionsDiv);
   }
-  renderTab(tab, showTeacherInstructions, disabledTabs) {
+  renderTab(tab, disabledTabs) {
     const {classes} = this.props;
     return React$1.createElement('div', {
       className: classNames(classes.passage, 'passage'),
@@ -8719,15 +8720,15 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 168
+        lineNumber: 170
       }
-    }, this.renderInstructions(showTeacherInstructions, tab.teacherInstructions, disabledTabs), React$1.createElement('h2', {
+    }, this.renderInstructions(tab.teacherInstructions, disabledTabs), (getContent(tab.title) || getContent(tab.subtitle)) && React$1.createElement('h2', {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 176
+        lineNumber: 180
       }
-    }, React$1.createElement('div', {
+    }, getContent(tab.title) && React$1.createElement('div', {
       className: classNames(classes.passageTitle, 'title'),
       dangerouslySetInnerHTML: {
         __html: this.parsedText(tab.title)
@@ -8735,9 +8736,9 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 177
+        lineNumber: 182
       }
-    }), React$1.createElement('div', {
+    }), getContent(tab.subtitle) && React$1.createElement('div', {
       className: classNames(classes.passageSubtitle, 'subtitle'),
       dangerouslySetInnerHTML: {
         __html: this.parsedText(tab.subtitle)
@@ -8745,9 +8746,9 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 181
+        lineNumber: 188
       }
-    })), React$1.createElement('div', {
+    })), getContent(tab.author) && React$1.createElement('div', {
       className: classNames(classes.passageAuthor, 'author'),
       dangerouslySetInnerHTML: {
         __html: this.parsedText(tab.author)
@@ -8755,9 +8756,9 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 186
+        lineNumber: 197
       }
-    }), React$1.createElement('div', {
+    }), getContent(tab.text) && React$1.createElement('div', {
       key: tab.id,
       className: classNames(classes.passageText, 'text'),
       dangerouslySetInnerHTML: {
@@ -8766,12 +8767,12 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 190
+        lineNumber: 204
       }
     }));
   }
   render() {
-    const {classes, tabs, disabledTabs, showTeacherInstructions} = this.props;
+    const {classes, tabs, disabledTabs} = this.props;
     const {activeTab} = this.state;
     if (!_optionalChain([tabs, 'optionalAccess', _ => _.length])) {
       return;
@@ -8782,9 +8783,9 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 210
+        lineNumber: 225
       }
-    }, disabledTabs || tabs.length === 1 ? tabs.map(tab => this.renderTab(tab, showTeacherInstructions, disabledTabs)) : React$1.createElement(React$1.Fragment, null, React$1.createElement(Tabs, {
+    }, disabledTabs || tabs.length === 1 ? tabs.map(tab => this.renderTab(tab, disabledTabs)) : React$1.createElement(React$1.Fragment, null, React$1.createElement(Tabs, {
       classes: {
         root: classes.stickyTabs,
         flexContainer: classes.tabButton
@@ -8794,7 +8795,7 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 215
+        lineNumber: 230
       }
     }, tabs.map(tab => React$1.createElement(Tab, {
       className: classes.tab,
@@ -8802,12 +8803,12 @@ class StimulusTabs extends React$1.Component {
       id: `button-${tab.id}`,
       label: React$1.createElement('span', {
         dangerouslySetInnerHTML: {
-          __html: this.parsedText(tab.title)
+          __html: this.parsedText(tab.label)
         },
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 228
+          lineNumber: 243
         }
       }),
       value: tab.id,
@@ -8819,23 +8820,23 @@ class StimulusTabs extends React$1.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 224
+        lineNumber: 239
       }
-    }))), selectedTab ? this.renderTab(selectedTab, showTeacherInstructions, disabledTabs) : null));
+    }))), selectedTab ? this.renderTab(selectedTab, disabledTabs) : null));
   }
 }
 StimulusTabs.propTypes = {
   classes: PropTypes.object.isRequired,
   tabs: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.number.isRequired,
+    label: PropTypes.string.isRequired,
     title: PropTypes.string.isRequired,
     subtitle: PropTypes.string,
     author: PropTypes.string,
     text: PropTypes.string.isRequired,
     teacherInstructions: PropTypes.string
   }).isRequired).isRequired,
-  disabledTabs: PropTypes.bool,
-  showTeacherInstructions: PropTypes.bool
+  disabledTabs: PropTypes.bool
 };
 var StimulusTabs$1 = styles$1.withStyles(styles)(StimulusTabs);
 const React = _dll_react;
@@ -8847,11 +8848,12 @@ const preparePrintPassage = (model, opts) => {
   const isInstructor = opts.role === 'instructor';
   return model.passages.map((passage, index) => ({
     id: index,
-    title: passage.title,
-    subtitle: passage.subtitle,
-    author: passage.author,
-    text: passage.text,
-    teacherInstructions: isInstructor && passage.teacherInstructions
+    teacherInstructions: model.teacherInstructionsEnabled ? isInstructor && passage.teacherInstructions || '' : '',
+    label: passage.title || `Passage ${index + 1}`,
+    title: model.titleEnabled ? passage.title || '' : '',
+    author: model.authorEnabled ? passage.author || '' : '',
+    subtitle: model.subtitleEnabled ? passage.subtitle || '' : '',
+    text: model.textEnabled ? passage.text || '' : ''
   }));
 };
 class PassagePrint extends HTMLElement {
@@ -8865,9 +8867,8 @@ class PassagePrint extends HTMLElement {
         if (this._model.passages && this._model.passages.length > 0) {
           const printPassage = preparePrintPassage(this._model, this._options);
           const element = React.createElement(StimulusTabs$1, {
-            tabs: printPassage,
             disabledTabs: true,
-            showTeacherInstructions: this._options.role === 'instructor'
+            tabs: printPassage
           });
           ReactDOM.render(element, this);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-element/passage",
-  "version": "2.21.4-next.3+3f46db2cf",
+  "version": "2.21.5-next.16+faca98267",
   "publishConfig": {
     "access": "public"
   },
@@ -11,13 +11,13 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "1.31.2",
+    "@pie-lib/pie-toolbox": "1.31.3",
     "classnames": "^2.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
-  "gitHead": "3f46db2cf8b31e3dfabd60b0f5664e294d50e500",
+  "gitHead": "faca982675bfd2df70f11ca2b9e20333af8f9790",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },