@pie-element/hotspot 5.16.1-next.6 → 5.16.2-next.16

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.16.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/hotspot@5.16.0...@pie-element/hotspot@5.16.1) (2023-09-18)
+
+
+### Bug Fixes
+
+* add sanity checks DNA-18268 ([29d7de9](https://github.com/pie-framework/pie-elements/commit/29d7de9422c075117173a3afeb2b29acf1caab3c))
+
+
+
+
+
 # [5.16.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/hotspot@5.15.0...@pie-element/hotspot@5.16.0) (2023-09-05)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.12.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/hotspot-configure@5.12.0...@pie-element/hotspot-configure@5.12.1) (2023-09-18)
+
+
+### Bug Fixes
+
+* add sanity checks DNA-18268 ([29d7de9](https://github.com/pie-framework/pie-elements/commit/29d7de9422c075117173a3afeb2b29acf1caab3c))
+
+
+
+
+
 # [5.12.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/hotspot-configure@5.11.0...@pie-element/hotspot-configure@5.12.0) (2023-09-05)
 
 

package/configure/lib/index.js

@@ -139,20 +139,23 @@ var HotspotConfigure = /*#__PURE__*/function (_HTMLElement) {
   }, {
     key: "configuration",
     set: function set(c) {
-      var _this2 = this;
+      var _newConfiguration$lan,
+          _this2 = this;
 
-      this._configuration = c; // if language:enabled is true, then the corresponding default item model should include a language value;
+      var newConfiguration = _objectSpread(_objectSpread({}, _defaults["default"].configuration), c);
+
+      this._configuration = newConfiguration; // if language:enabled is true, then the corresponding default item model should include a language value;
       // if it is false, then the language field should be omitted from the item model.
       // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,
       // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).
 
-      if (c.language.enabled) {
-        var _c$languageChoices, _c$languageChoices$op;
+      if (newConfiguration !== null && newConfiguration !== void 0 && (_newConfiguration$lan = newConfiguration.language) !== null && _newConfiguration$lan !== void 0 && _newConfiguration$lan.enabled) {
+        var _newConfiguration$lan2, _newConfiguration$lan3;
 
-        if ((_c$languageChoices = c.languageChoices) !== null && _c$languageChoices !== void 0 && (_c$languageChoices$op = _c$languageChoices.options) !== null && _c$languageChoices$op !== void 0 && _c$languageChoices$op.length) {
-          this._model.language = c.languageChoices.options[0].value;
+        if (newConfiguration !== null && newConfiguration !== void 0 && (_newConfiguration$lan2 = newConfiguration.languageChoices) !== null && _newConfiguration$lan2 !== void 0 && (_newConfiguration$lan3 = _newConfiguration$lan2.options) !== null && _newConfiguration$lan3 !== void 0 && _newConfiguration$lan3.length) {
+          this._model.language = newConfiguration === null || newConfiguration === void 0 ? void 0 : newConfiguration.languageChoices.options[0].value;
         }
-      } else if (c.language.settings && this._model.language) {
+      } else if (newConfiguration.language.settings && this._model.language) {
         this._configuration.language.enabled = true;
 
         if (!this._configuration.languageChoices.options || !this._configuration.languageChoices.options.length) {

package/configure/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","HotspotConfigure","c","_configuration","_render","m","propertyType","_model","shapes","rectangles","polygons","map","shape","correct","onModelChanged","colorType","color","prompt","rationale","teacherInstructions","dimensions","imageUrl","handler","dispatchEvent","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","sensibleDefaults","configuration","bind","s","language","enabled","languageChoices","options","length","value","settings","find","option","push","label","reset","resetValue","ModelUpdatedEvent","dispatchModelUpdated","InsertSoundEvent","DeleteSoundEvent","element","React","createElement","Root","model","onColorChanged","onImageUpload","onRationaleChanged","onConfigurationChanged","onPromptChanged","onUpdateImageDimension","imageSupport","add","insertImage","onDeleteImage","uploadSoundSupport","insertSound","onDeleteSound","onUpdateShapes","onModelChangedByConfig","onTeacherInstructionsChanged","ReactDOM","render","HTMLElement","hotspotList","hotspotColor","outlineList","outlineColor"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport debug from 'debug';\nimport {\n  ModelUpdatedEvent,\n  DeleteImageEvent,\n  InsertImageEvent,\n  InsertSoundEvent,\n  DeleteSoundEvent,\n} from '@pie-framework/pie-configure-events';\n\nimport Root from './root';\nimport sensibleDefaults from './defaults';\n\nconst log = debug('hotspot:configure');\n\nexport default class HotspotConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => ({\n    ...sensibleDefaults.model,\n    ...model,\n    hotspotList: model.hotspotList || [model.hotspotColor] || sensibleDefaults.model.hotspotList,\n    outlineList: model.outlineList || [model.outlineColor] || sensibleDefaults.model.outlineList,\n    shapes: model.shapes || sensibleDefaults.model.shapes || {},\n  });\n\n  constructor() {\n    super();\n    this._model = HotspotConfigure.createDefaultModel();\n    this._configuration = sensibleDefaults.configuration;\n    this.onModelChanged = this.onModelChanged.bind(this);\n  }\n\n  set model(s) {\n    this._model = HotspotConfigure.createDefaultModel(s);\n    this._render();\n  }\n\n  set configuration(c) {\n    this._configuration = c;\n\n    // if language:enabled is true, then the corresponding default item model should include a language value;\n    // if it is false, then the language field should be omitted from the item model.\n    // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,\n    // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).\n    if (c.language.enabled) {\n      if (c.languageChoices?.options?.length) {\n        this._model.language = c.languageChoices.options[0].value;\n      }\n    } else if (c.language.settings && this._model.language) {\n      this._configuration.language.enabled = true;\n\n      if (!this._configuration.languageChoices.options || !this._configuration.languageChoices.options.length) {\n        this._configuration.languageChoices.options = [];\n      }\n\n      // check if the language is already included in the languageChoices.options array\n      // and if not, then add it.\n      if (!this._configuration.languageChoices.options.find(option => option.value === this._model.language)) {\n        this._configuration.languageChoices.options.push({\n          value: this._model.language,\n          label: this._model.language,\n        });\n      }\n    } else {\n      delete this._model.language;\n    }\n\n    this._render();\n  }\n\n  dispatchModelUpdated(reset) {\n    const resetValue = !!reset;\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model, resetValue));\n  }\n\n  onModelChanged(m, reset) {\n    this._model = m;\n    this.dispatchModelUpdated(reset);\n    this._render();\n  }\n\n  onConfigurationChanged = (c) => {\n    this._configuration = c;\n    this._render();\n  };\n\n  onModelChangedByConfig = (m, propertyType) => {\n    const _model = m;\n\n    if (propertyType === 'multipleCorrect') {\n      const { rectangles = [], polygons = [] } = _model.shapes || {};\n\n      _model.shapes.rectangles = rectangles.map((shape) => ({ ...shape, correct: false }));\n      _model.shapes.polygons = polygons.map((shape) => ({ ...shape, correct: false }));\n    }\n\n    this.onModelChanged(_model);\n  };\n\n  onColorChanged = (colorType, color) => {\n    this.onModelChanged({\n      ...this._model,\n      [colorType]: color,\n    });\n  };\n\n  onPromptChanged = (prompt) => {\n    this.onModelChanged({\n      ...this._model,\n      prompt,\n    });\n  };\n\n  onRationaleChanged = (rationale) => {\n    this.onModelChanged({\n      ...this._model,\n      rationale,\n    });\n  };\n\n  onTeacherInstructionsChanged = (teacherInstructions) => {\n    this.onModelChanged({\n      ...this._model,\n      teacherInstructions,\n    });\n  };\n\n  onUpdateImageDimension = (dimensions) => {\n    this.onModelChanged({\n      ...this._model,\n      dimensions,\n    });\n  };\n\n  onUpdateShapes = (shapes) => {\n    this.onModelChanged({\n      ...this._model,\n      shapes,\n    });\n  };\n\n  onImageUpload = (imageUrl) => {\n    this.onModelChanged({\n      ...this._model,\n      imageUrl,\n    });\n  };\n\n  insertImage = (handler) => {\n    this.dispatchEvent(new InsertImageEvent(handler));\n  };\n\n  onDeleteImage = (src, done) => {\n    this.dispatchEvent(new DeleteImageEvent(src, done));\n  };\n\n  insertSound(handler) {\n    this.dispatchEvent(new InsertSoundEvent(handler));\n  }\n\n  onDeleteSound(src, done) {\n    this.dispatchEvent(new DeleteSoundEvent(src, done));\n  }\n\n  _render() {\n    log('_render');\n    let element = React.createElement(Root, {\n      configuration: this._configuration,\n      model: this._model,\n      onColorChanged: this.onColorChanged,\n      onImageUpload: this.onImageUpload,\n      onRationaleChanged: this.onRationaleChanged,\n      onConfigurationChanged: this.onConfigurationChanged,\n      onPromptChanged: this.onPromptChanged,\n      onUpdateImageDimension: this.onUpdateImageDimension,\n      imageSupport: {\n        add: this.insertImage,\n        delete: this.onDeleteImage,\n      },\n      uploadSoundSupport: {\n        add: this.insertSound.bind(this),\n        delete: this.onDeleteSound.bind(this),\n      },\n      onUpdateShapes: this.onUpdateShapes,\n      onModelChangedByConfig: this.onModelChangedByConfig,\n      onTeacherInstructionsChanged: this.onTeacherInstructionsChanged,\n    });\n\n    ReactDOM.render(element, this);\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","HotspotConfigure","c","_configuration","_render","m","propertyType","_model","shapes","rectangles","polygons","map","shape","correct","onModelChanged","colorType","color","prompt","rationale","teacherInstructions","dimensions","imageUrl","handler","dispatchEvent","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","sensibleDefaults","configuration","bind","s","newConfiguration","language","enabled","languageChoices","options","length","value","settings","find","option","push","label","reset","resetValue","ModelUpdatedEvent","dispatchModelUpdated","InsertSoundEvent","DeleteSoundEvent","element","React","createElement","Root","model","onColorChanged","onImageUpload","onRationaleChanged","onConfigurationChanged","onPromptChanged","onUpdateImageDimension","imageSupport","add","insertImage","onDeleteImage","uploadSoundSupport","insertSound","onDeleteSound","onUpdateShapes","onModelChangedByConfig","onTeacherInstructionsChanged","ReactDOM","render","HTMLElement","hotspotList","hotspotColor","outlineList","outlineColor"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport debug from 'debug';\nimport {\n  ModelUpdatedEvent,\n  DeleteImageEvent,\n  InsertImageEvent,\n  InsertSoundEvent,\n  DeleteSoundEvent,\n} from '@pie-framework/pie-configure-events';\n\nimport Root from './root';\nimport sensibleDefaults from './defaults';\n\nconst log = debug('hotspot:configure');\n\nexport default class HotspotConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => ({\n    ...sensibleDefaults.model,\n    ...model,\n    hotspotList: model.hotspotList || [model.hotspotColor] || sensibleDefaults.model.hotspotList,\n    outlineList: model.outlineList || [model.outlineColor] || sensibleDefaults.model.outlineList,\n    shapes: model.shapes || sensibleDefaults.model.shapes || {},\n  });\n\n  constructor() {\n    super();\n    this._model = HotspotConfigure.createDefaultModel();\n    this._configuration = sensibleDefaults.configuration;\n    this.onModelChanged = this.onModelChanged.bind(this);\n  }\n\n  set model(s) {\n    this._model = HotspotConfigure.createDefaultModel(s);\n    this._render();\n  }\n\n  set configuration(c) {\n    const newConfiguration = {\n      ...sensibleDefaults.configuration,\n      ...c,\n    };\n\n    this._configuration = newConfiguration;\n\n    // if language:enabled is true, then the corresponding default item model should include a language value;\n    // if it is false, then the language field should be omitted from the item model.\n    // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,\n    // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).\n    if (newConfiguration?.language?.enabled) {\n      if (newConfiguration?.languageChoices?.options?.length) {\n        this._model.language = newConfiguration?.languageChoices.options[0].value;\n      }\n    } else if (newConfiguration.language.settings && this._model.language) {\n      this._configuration.language.enabled = true;\n\n      if (!this._configuration.languageChoices.options || !this._configuration.languageChoices.options.length) {\n        this._configuration.languageChoices.options = [];\n      }\n\n      // check if the language is already included in the languageChoices.options array\n      // and if not, then add it.\n      if (!this._configuration.languageChoices.options.find(option => option.value === this._model.language)) {\n        this._configuration.languageChoices.options.push({\n          value: this._model.language,\n          label: this._model.language,\n        });\n      }\n    } else {\n      delete this._model.language;\n    }\n\n    this._render();\n  }\n\n  dispatchModelUpdated(reset) {\n    const resetValue = !!reset;\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model, resetValue));\n  }\n\n  onModelChanged(m, reset) {\n    this._model = m;\n    this.dispatchModelUpdated(reset);\n    this._render();\n  }\n\n  onConfigurationChanged = (c) => {\n    this._configuration = c;\n    this._render();\n  };\n\n  onModelChangedByConfig = (m, propertyType) => {\n    const _model = m;\n\n    if (propertyType === 'multipleCorrect') {\n      const { rectangles = [], polygons = [] } = _model.shapes || {};\n\n      _model.shapes.rectangles = rectangles.map((shape) => ({ ...shape, correct: false }));\n      _model.shapes.polygons = polygons.map((shape) => ({ ...shape, correct: false }));\n    }\n\n    this.onModelChanged(_model);\n  };\n\n  onColorChanged = (colorType, color) => {\n    this.onModelChanged({\n      ...this._model,\n      [colorType]: color,\n    });\n  };\n\n  onPromptChanged = (prompt) => {\n    this.onModelChanged({\n      ...this._model,\n      prompt,\n    });\n  };\n\n  onRationaleChanged = (rationale) => {\n    this.onModelChanged({\n      ...this._model,\n      rationale,\n    });\n  };\n\n  onTeacherInstructionsChanged = (teacherInstructions) => {\n    this.onModelChanged({\n      ...this._model,\n      teacherInstructions,\n    });\n  };\n\n  onUpdateImageDimension = (dimensions) => {\n    this.onModelChanged({\n      ...this._model,\n      dimensions,\n    });\n  };\n\n  onUpdateShapes = (shapes) => {\n    this.onModelChanged({\n      ...this._model,\n      shapes,\n    });\n  };\n\n  onImageUpload = (imageUrl) => {\n    this.onModelChanged({\n      ...this._model,\n      imageUrl,\n    });\n  };\n\n  insertImage = (handler) => {\n    this.dispatchEvent(new InsertImageEvent(handler));\n  };\n\n  onDeleteImage = (src, done) => {\n    this.dispatchEvent(new DeleteImageEvent(src, done));\n  };\n\n  insertSound(handler) {\n    this.dispatchEvent(new InsertSoundEvent(handler));\n  }\n\n  onDeleteSound(src, done) {\n    this.dispatchEvent(new DeleteSoundEvent(src, done));\n  }\n\n  _render() {\n    log('_render');\n    let element = React.createElement(Root, {\n      configuration: this._configuration,\n      model: this._model,\n      onColorChanged: this.onColorChanged,\n      onImageUpload: this.onImageUpload,\n      onRationaleChanged: this.onRationaleChanged,\n      onConfigurationChanged: this.onConfigurationChanged,\n      onPromptChanged: this.onPromptChanged,\n      onUpdateImageDimension: this.onUpdateImageDimension,\n      imageSupport: {\n        add: this.insertImage,\n        delete: this.onDeleteImage,\n      },\n      uploadSoundSupport: {\n        add: this.insertSound.bind(this),\n        delete: this.onDeleteSound.bind(this),\n      },\n      onUpdateShapes: this.onUpdateShapes,\n      onModelChangedByConfig: this.onModelChangedByConfig,\n      onTeacherInstructionsChanged: this.onTeacherInstructionsChanged,\n    });\n\n    ReactDOM.render(element, this);\n  }\n}\n"],"file":"index.js"}

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/hotspot-configure",
   "private": true,
-  "version": "5.12.0",
+  "version": "5.12.1",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -10,8 +10,8 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/config-ui": "^11.9.12",
-    "@pie-lib/editable-html": "^10.0.7",
+    "@pie-lib/config-ui": "^11.9.14",
+    "@pie-lib/editable-html": "^11.0.1",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "konva": "^3.2.4",

package/configure/src/index.js

@@ -36,17 +36,22 @@ export default class HotspotConfigure extends HTMLElement {
   }
 
   set configuration(c) {
-    this._configuration = c;
+    const newConfiguration = {
+      ...sensibleDefaults.configuration,
+      ...c,
+    };
+
+    this._configuration = newConfiguration;
 
     // if language:enabled is true, then the corresponding default item model should include a language value;
     // if it is false, then the language field should be omitted from the item model.
     // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,
     // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).
-    if (c.language.enabled) {
-      if (c.languageChoices?.options?.length) {
-        this._model.language = c.languageChoices.options[0].value;
+    if (newConfiguration?.language?.enabled) {
+      if (newConfiguration?.languageChoices?.options?.length) {
+        this._model.language = newConfiguration?.languageChoices.options[0].value;
       }
-    } else if (c.language.settings && this._model.language) {
+    } else if (newConfiguration.language.settings && this._model.language) {
       this._configuration.language.enabled = true;
 
       if (!this._configuration.languageChoices.options || !this._configuration.languageChoices.options.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-element/hotspot",
-  "version": "5.16.1-next.6+26199b255",
+  "version": "5.16.2-next.16+f206ae3c9",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
@@ -9,9 +9,9 @@
   "dependencies": {
     "@material-ui/core": "^3.9.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/correct-answer-toggle": "^2.5.4",
-    "@pie-lib/math-rendering": "^2.5.18",
-    "@pie-lib/render-ui": "^4.15.2",
+    "@pie-lib/correct-answer-toggle": "^2.5.6",
+    "@pie-lib/math-rendering": "^3.1.0",
+    "@pie-lib/render-ui": "^4.15.4",
     "@pie-lib/test-utils": "^0.2.33",
     "@pie-lib/translator": "^2.3.0",
     "konva": "^3.2.5",
@@ -22,7 +22,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "26199b255ddbcb9255f2769091c7ba58f8b1dae0",
+  "gitHead": "f206ae3c9c6f9e4a092ac223de5f55c3a3cc5f83",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },