@pie-element/drawing-response 3.7.3-next.135 → 3.7.3-next.1357

package/configure/src/__tests__/__snapshots__/root.test.jsx.snap

@@ -8,27 +8,45 @@ exports[`Root snapshot renders 1`] = `
         configuration={
           Object {
             "backgroundImage": Object {
-              "enabled": true,
               "label": "Background Image",
               "settings": true,
             },
+            "maxImageHeight": Object {
+              "prompt": 300,
+              "teacherInstructions": 300,
+            },
+            "maxImageWidth": Object {
+              "prompt": 300,
+              "teacherInstructions": 300,
+            },
             "prompt": Object {
               "label": "Prompt",
               "settings": true,
             },
+            "spellCheck": Object {
+              "enabled": true,
+              "label": "Spellcheck",
+              "settings": false,
+            },
             "teacherInstructions": Object {
               "label": "Teacher Instructions",
               "settings": true,
             },
+            "withRubric": Object {
+              "label": "Add Rubric",
+              "settings": false,
+            },
           }
         }
         groups={
           Object {
             "Properties": Object {
+              "rubricEnabled": false,
+              "spellCheckEnabled": false,
               "teacherInstructionsEnabled": undefined,
             },
             "Settings": Object {
-              "backgroundImage.enabled": undefined,
+              "backgroundImageEnabled": undefined,
               "promptEnabled": undefined,
             },
           }
@@ -54,7 +72,19 @@ exports[`Root snapshot renders 1`] = `
         label="Item Stem"
       >
         <EditableHtml
+          languageCharactersProps={
+            Array [
+              Object {
+                "language": "spanish",
+              },
+              Object {
+                "language": "special",
+              },
+            ]
+          }
           markup="Test Prompt"
+          maxImageHeight={300}
+          maxImageWidth={300}
           onChange={[Function]}
           toolbarOpts={
             Object {
@@ -63,18 +93,6 @@ exports[`Root snapshot renders 1`] = `
           }
         />
       </Component>
-      <div>
-        <WithStyles(Typography)
-          variant="subheading"
-        >
-          Define Background Image
-        </WithStyles(Typography)>
-        <WithStyles(ImageContainer)
-          imageUrl=""
-          onImageUpload={[Function]}
-          onUpdateImageDimension={[Function]}
-        />
-      </div>
     </div>
   </ConfigLayout>
 </div>

package/configure/src/__tests__/image-container.test.jsx

@@ -138,7 +138,7 @@ describe('ImageContainer', () => {
     });
 
     it('handleOnImageLoad calls onUpdateImageDimension', () => {
-      w.instance().handleOnImageLoad({ target: { offsetHeight: 50, offsetWidth: 50 }});
+      w.instance().handleOnImageLoad({ target: { offsetHeight: 50, offsetWidth: 50, naturalWidth: 50, naturalHeight: 50 }});
 
       expect(onUpdateImageDimension).toHaveBeenCalledWith({
         height: 50,
@@ -147,7 +147,7 @@ describe('ImageContainer', () => {
     });
 
     it('stopResizing calls onUpdateImageDimension', () => {
-      w.instance().handleOnImageLoad({ target: { offsetHeight: 50, offsetWidth: 50 }});
+      w.instance().handleOnImageLoad({ target: { offsetHeight: 50, offsetWidth: 50, naturalWidth: 50, naturalHeight: 50 }});
 
       expect(onUpdateImageDimension).toHaveBeenCalledWith(w.instance().state.dimensions);
     });

package/configure/src/defaults.js

@@ -9,13 +9,19 @@ export default {
     promptEnabled: true,
     teacherInstructionsEnabled: true,
     studentInstructionsEnabled: true,
+    backgroundImageEnabled: true,
+    spellCheckEnabled:true,
     toolbarEditorPosition: 'bottom',
   },
   configuration: {
+    spellCheck: {
+      label: 'Spellcheck',
+      settings:false,
+      enabled:true
+    },
     backgroundImage: {
       settings: true,
-      label: 'Background Image',
-      enabled: true
+      label: 'Background Image'
     },
     prompt: {
       settings: true,
@@ -24,6 +30,18 @@ export default {
     teacherInstructions: {
       settings: true,
       label: 'Teacher Instructions',
+    },
+    maxImageWidth: {
+      teacherInstructions: 300,
+      prompt: 300
+    },
+    maxImageHeight: {
+      teacherInstructions: 300,
+      prompt: 300
+    },
+    withRubric: {
+      settings: false,
+      label: 'Add Rubric'
     }
   }
 };

package/configure/src/image-container.jsx

@@ -13,11 +13,11 @@ export class ImageContainer extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      maxImageWidth: 0,
-      maxImageHeight: 0,
+      maxImageWidth: "100%",
+      maxImageHeight: "auto",
       dragEnabled: true,
       dropzoneActive: false,
-    }
+    };
   }
 
   componentDidMount() {
@@ -26,7 +26,7 @@ export class ImageContainer extends Component {
       const { height, width } = positionInfo;
       this.setState({
         maxImageWidth: width,
-        maxImageHeight: height
+        maxImageHeight: height,
       });
     }
   }
@@ -46,7 +46,7 @@ export class ImageContainer extends Component {
     this.handleFileRead(file);
   };
 
-  makeDropzoneActive= () => this.setState({ dropzoneActive: true });
+  makeDropzoneActive = () => this.setState({ dropzoneActive: true });
 
   makeDropzoneInactive = () => this.setState({ dropzoneActive: false });
 
@@ -84,15 +84,22 @@ export class ImageContainer extends Component {
   handleDisableDrag = () => this.setState({ dragEnabled: false });
   handleInputClick = () => this.input.click();
 
-  handleOnImageLoad = ({ target: { offsetHeight, offsetWidth } }) => {
-    const { onUpdateImageDimension } = this.props;
+  handleOnImageLoad = ({ target: { offsetHeight, offsetWidth, naturalHeight, naturalWidth } }) => {
+    const { onUpdateImageDimension, imageDimensions } = this.props;
     const resizeHandle = this.resize;
 
     const dimensions = {
-      height: offsetHeight,
-      width: offsetWidth
+      height: (imageDimensions && imageDimensions.height) || offsetHeight || naturalHeight,
+      width: (imageDimensions && imageDimensions.width) || offsetWidth || naturalWidth,
     };
 
+    // check if aspect ratio is not respected on replacing image
+    const imageAspectRatio = naturalWidth / naturalHeight;
+
+    if (dimensions.width !== dimensions.height * imageAspectRatio) {
+      dimensions.width = dimensions.height * imageAspectRatio;
+    }
+
     this.setState({ dimensions });
     onUpdateImageDimension(dimensions);
 
@@ -117,20 +124,26 @@ export class ImageContainer extends Component {
 
   startResizing = (e) => {
     const box = this.image;
-    const { maxImageWidth } = this.state;
+    const { maxImageWidth, maxImageHeight, dimensions } = this.state;
 
     const bounds = e.target.getBoundingClientRect();
     const x = e.clientX - bounds.left;
     const y = e.clientY - bounds.top;
 
-    const fitsContainer = x <= maxImageWidth + 5;
+    const imageAspectRatio = dimensions.width / dimensions.height;
+    const fitsContainer = x <= maxImageWidth + 5 && (x / imageAspectRatio) <= maxImageHeight + 5;
     const hasMinimumWidth = x > 150 && y > 150;
 
-    if (fitsContainer && hasMinimumWidth) {
+    if (fitsContainer && hasMinimumWidth && box) {
       box.style.width = `${x}px`;
-      box.style.height = `${y}px`;
+      box.style.height = `${x / imageAspectRatio}px`;
 
-      this.setState({ dimensions: { height: y, width: x }});
+      this.setState({
+        dimensions: {
+          width: x,
+          height: x / imageAspectRatio,
+        },
+      });
     }
 
     this.handleDisableDrag();
@@ -141,26 +154,22 @@ export class ImageContainer extends Component {
 
     return (
       <div>
-        <Button
-          label={label}
-          onClick={this.handleInputClick}
-        />
+        <Button label={label} onClick={this.handleInputClick} />
         <input
           accept="image/*"
           className={classes.input}
           onChange={this.handleUploadImage}
-          ref={ref => { this.input = ref; }}
+          ref={(ref) => {
+            this.input = ref;
+          }}
           type="file"
         />
       </div>
-    )
+    );
   }
 
   render() {
-    const {
-      classes,
-      imageUrl
-    } = this.props;
+    const { classes, imageUrl, imageDimensions } = this.props;
     const {
       dropzoneActive,
       dragEnabled,
@@ -169,32 +178,55 @@ export class ImageContainer extends Component {
     } = this.state;
 
     return (
-      <div className={classes.base} >
-        <div className={`${classes.box} ${dropzoneActive ? classes.boxActive : ''}`}
-             {...dragEnabled ? {
-               onDragExit: this.handleOnDragExit,
-               onDragLeave: this.handleOnDragExit,
-               onDragOver: this.handleOnDragOver ,
-               onDrop: this.handleOnDrop
-             } : {}}
+      <div className={classes.base}>
+        <div
+          className={`${classes.box} ${
+            dropzoneActive ? classes.boxActive : ''
+          }`}
+          {...(dragEnabled
+            ? {
+                onDragExit: this.handleOnDragExit,
+                onDragLeave: this.handleOnDragExit,
+                onDragOver: this.handleOnDragOver,
+                onDrop: this.handleOnDrop,
+              }
+            : {})}
         >
           <div className={classes.toolbar}>
-            {this.renderUploadControl(imageUrl ? 'Replace Image' : 'Upload Image')}
+            {this.renderUploadControl(
+              imageUrl ? 'Replace Image' : 'Upload Image'
+            )}
           </div>
 
-          <div ref={ref => { this.imageSection = ref; }} className={classes.drawableHeight}>
+          <div
+            ref={(ref) => {
+              this.imageSection = ref;
+            }}
+            className={classes.drawableHeight}
+          >
             {imageUrl ? (
               <div className={classes.imageContainer}>
                 <img
                   className={classes.image}
                   height="auto"
                   onLoad={this.handleOnImageLoad}
-                  ref={ref => { this.image = ref; }}
+                  ref={(ref) => {
+                    this.image = ref;
+                  }}
                   src={imageUrl}
-                  style={{ maxWidth: maxImageWidth, maxHeight: maxImageHeight }}
-                  alt=''
+                  style={{
+                    width: imageDimensions && imageDimensions.width ? imageDimensions.width : undefined,
+                    maxWidth: maxImageWidth,
+                    maxHeight: maxImageHeight
+                  }}
+                  alt=""
+                />
+                <div
+                  ref={(ref) => {
+                    this.resize = ref;
+                  }}
+                  className={classes.resize}
                 />
-                <div ref={ref => { this.resize = ref; }} className={classes.resize} />
               </div>
             ) : (
               <div className={`${classes.drawableHeight} ${classes.centered}`}>
@@ -210,25 +242,25 @@ export class ImageContainer extends Component {
   }
 }
 
-const styles = theme => ({
+const styles = (theme) => ({
   base: {
-    marginTop: theme.spacing.unit * 2
+    marginTop: theme.spacing.unit * 2,
   },
   box: {
     border: '1px solid #E0E1E6',
-    borderRadius: '5px'
+    borderRadius: '5px',
   },
   boxActive: {
-    border: '1px solid #0032C2'
+    border: '1px solid #0032C2',
   },
   centered: {
     alignItems: 'center',
     display: 'flex',
     flexDirection: 'column',
-    justifyContent: 'center'
+    justifyContent: 'center',
   },
   drawableHeight: {
-    minHeight: 350
+    minHeight: 350,
   },
   image: {
     alignItems: 'center',
@@ -237,7 +269,7 @@ const styles = theme => ({
   },
   imageContainer: {
     position: 'relative',
-    width: 'fit-content'
+    width: 'fit-content',
   },
   resize: {
     borderBottom: '1px solid #727272',
@@ -247,10 +279,10 @@ const styles = theme => ({
     height: '10px',
     position: 'absolute',
     right: '-10px',
-    width: '10px'
+    width: '10px',
   },
   input: {
-    display: 'none'
+    display: 'none',
   },
   toolbar: {
     backgroundColor: '#ECEDF1',
@@ -258,15 +290,15 @@ const styles = theme => ({
     borderTopLeftRadius: '5px',
     borderTopRightRadius: '5px',
     display: 'flex',
-    padding: '12px 8px'
-  }
+    padding: '12px 8px',
+  },
 });
 
 ImageContainer.propTypes = {
   classes: PropTypes.object.isRequired,
   imageUrl: PropTypes.string.isRequired,
   onImageUpload: PropTypes.func.isRequired,
-  onUpdateImageDimension: PropTypes.func.isRequired
+  onUpdateImageDimension: PropTypes.func.isRequired,
 };
 
 export default withStyles(styles)(ImageContainer);

package/configure/src/index.js

@@ -2,6 +2,8 @@ import {
   ModelUpdatedEvent,
   DeleteImageEvent,
   InsertImageEvent,
+  InsertSoundEvent,
+  DeleteSoundEvent
 } from '@pie-framework/pie-configure-events';
 
 import React from 'react';
@@ -49,12 +51,6 @@ export default class DrawableResponseConfigure extends HTMLElement {
   };
 
   onConfigurationChanged = (c) => {
-    if (!c.backgroundImage.enabled) {
-      this.onModelChanged({
-        ...this._model,
-        imageUrl: ''
-      });
-    }
     this._configuration = c;
     this._render();
   };
@@ -67,6 +63,14 @@ export default class DrawableResponseConfigure extends HTMLElement {
     this.dispatchEvent(new DeleteImageEvent(src, done));
   };
 
+  insertSound(handler) {
+    this.dispatchEvent(new InsertSoundEvent(handler));
+  }
+
+  onDeleteSound(src, done) {
+    this.dispatchEvent(new DeleteSoundEvent(src, done));
+  }
+
   _render() {
     log('_render');
     let element = React.createElement(Root, {
@@ -77,6 +81,10 @@ export default class DrawableResponseConfigure extends HTMLElement {
       imageSupport: {
         add: this.insertImage,
         delete: this.onDeleteImage
+      },
+      uploadSoundSupport: {
+        add: this.insertSound.bind(this),
+        delete: this.onDeleteSound.bind(this)
       }
     });
     ReactDOM.render(element, this);

package/configure/src/root.jsx

@@ -11,22 +11,22 @@ import cloneDeep from 'lodash/cloneDeep';
 const { Panel, toggle } = settings;
 
 export class Root extends React.Component {
-  onPromptChanged = prompt => {
+  onPromptChanged = (prompt) => {
     const { model, onModelChanged } = this.props;
     const update = cloneDeep(model);
 
     onModelChanged({
       ...update,
-      prompt
+      prompt,
     });
   };
 
-  onTeacherInstructionsChanged = teacherInstructions => {
+  onTeacherInstructionsChanged = (teacherInstructions) => {
     const { model, onModelChanged } = this.props;
 
     onModelChanged({
       ...model,
-      teacherInstructions
+      teacherInstructions,
     });
   };
 
@@ -35,34 +35,62 @@ export class Root extends React.Component {
 
     onModelChanged({
       ...model,
-      imageDimensions: dimensions
+      imageDimensions: dimensions,
     });
   };
 
-  onImageUpload = imageUrl => {
+  onImageUpload = (imageUrl) => {
     const { model, onModelChanged } = this.props;
 
     onModelChanged({
       ...model,
-      imageUrl
+      imageUrl,
     });
   };
 
+  componentDidMount() {
+    const { model, onModelChanged, configuration } = this.props || {};
+    const { withRubric } = configuration || {};
+
+    if (withRubric.enabled) {
+      onModelChanged({
+        ...model,
+        rubricEnabled: true,
+      });
+    }
+  }
+
   render() {
     const {
       classes,
       configuration,
       model,
       imageSupport,
+      uploadSoundSupport,
       onConfigurationChanged,
-      onModelChanged
+      onModelChanged,
     } = this.props;
-    const { backgroundImage = {}, prompt = {}, teacherInstructions = {} } =
-      configuration || {};
-    const { teacherInstructionsEnabled, promptEnabled } =
-      model || {};
+    const {
+      backgroundImage = {},
+      prompt = {},
+      teacherInstructions = {},
+      spellCheck = {},
+      maxImageWidth = {},
+      maxImageHeight = {},
+      withRubric,
+    } = configuration || {};
+    const {
+      teacherInstructionsEnabled,
+      promptEnabled,
+      spellCheckEnabled,
+      backgroundImageEnabled,
+      rubricEnabled
+    } = model || {};
     const toolbarOpts = {};
 
+    const defaultImageMaxWidth = maxImageWidth && maxImageWidth.prompt;
+    const defaultImageMaxHeight = maxImageHeight && maxImageHeight.prompt;
+
     switch (model.toolbarEditorPosition) {
       case 'top':
         toolbarOpts.position = 'top';
@@ -83,16 +111,17 @@ export class Root extends React.Component {
               onChangeConfiguration={onConfigurationChanged}
               groups={{
                 Settings: {
-                  'backgroundImage.enabled':
-                    backgroundImage.settings &&
-                    toggle(backgroundImage.label, true),
+                  backgroundImageEnabled: backgroundImage.settings && toggle(backgroundImage.label),
                   promptEnabled: prompt.settings && toggle(prompt.label)
                 },
                 Properties: {
                   teacherInstructionsEnabled:
                     teacherInstructions.settings &&
-                    toggle(teacherInstructions.label)
-                }
+                    toggle(teacherInstructions.label),
+                  spellCheckEnabled:
+                    spellCheck.settings && toggle(spellCheck.label),
+                  rubricEnabled: withRubric.settings && toggle(withRubric.label)
+                },
               }}
             />
           }
@@ -109,6 +138,11 @@ export class Root extends React.Component {
                   imageSupport={imageSupport}
                   nonEmpty={false}
                   toolbarOpts={toolbarOpts}
+                  spellCheck={spellCheckEnabled}
+                  maxImageWidth={maxImageWidth && maxImageWidth.teacherInstructions || defaultImageMaxWidth}
+                  maxImageHeight={maxImageHeight && maxImageHeight.teacherInstructions || defaultImageMaxHeight}
+                  uploadSoundSupport={uploadSoundSupport}
+                  languageCharactersProps={[{ language: 'spanish' }, { language: 'special' }]}
                 />
               </InputContainer>
             )}
@@ -119,11 +153,17 @@ export class Root extends React.Component {
                   markup={model.prompt}
                   onChange={this.onPromptChanged}
                   toolbarOpts={toolbarOpts}
+                  spellCheck={spellCheckEnabled}
+                  imageSupport={imageSupport}
+                  maxImageWidth={defaultImageMaxWidth}
+                  maxImageHeight={defaultImageMaxHeight}
+                  uploadSoundSupport={uploadSoundSupport}
+                  languageCharactersProps={[{ language: 'spanish' }, { language: 'special' }]}
                 />
               </InputContainer>
             )}
 
-            {backgroundImage.enabled && (
+            {backgroundImageEnabled && (
               <div>
                 <Typography className={classes.label} variant="subheading">
                   Define Background Image
@@ -133,6 +173,7 @@ export class Root extends React.Component {
                   imageUrl={model.imageUrl}
                   onUpdateImageDimension={this.onUpdateImageDimension}
                   onImageUpload={this.onImageUpload}
+                  imageDimensions={model.imageDimensions}
                 />
               </div>
             )}
@@ -143,20 +184,20 @@ export class Root extends React.Component {
   }
 }
 
-const styles = theme => ({
+const styles = (theme) => ({
   base: {
-    marginTop: theme.spacing.unit * 3
+    marginTop: theme.spacing.unit * 3,
   },
   label: {
-    marginTop: theme.spacing.unit * 4
+    marginTop: theme.spacing.unit * 4,
   },
   prompt: {
     paddingTop: theme.spacing.unit * 2,
-    width: '100%'
+    width: '100%',
   },
   regular: {
-    marginBottom: theme.spacing.unit * 3
-  }
+    marginBottom: theme.spacing.unit * 3,
+  },
 });
 
 Root.propTypes = {
@@ -165,7 +206,11 @@ Root.propTypes = {
   model: PropTypes.object.isRequired,
   imageSupport: PropTypes.shape({
     add: PropTypes.func,
-    delete: PropTypes.func
+    delete: PropTypes.func,
+  }),
+  uploadSoundSupport: PropTypes.shape({
+    add: PropTypes.func,
+    delete: PropTypes.func,
   }),
   onModelChanged: PropTypes.func.isRequired,
   onConfigurationChanged: PropTypes.func.isRequired,