@pie-element/number-line 7.4.1-next.14 → 7.4.1-next.18

package/configure/lib/index.js

@@ -91,6 +91,15 @@ var NumberLine = /*#__PURE__*/function (_HTMLElement) {
 
     (0, _classCallCheck2["default"])(this, NumberLine);
     _this = _super.call(this);
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resetModelAfterConfigurationIsSet", function () {
+      if (_this.hasPlayerAsParent) {
+        if (_this._modelCopy) {
+          _this._model = _this._modelCopy;
+        } else {
+          delete _this._modelCopy;
+        }
+      }
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (o) {
       _this._model = _objectSpread(_objectSpread({}, _this._model), o);
 
@@ -99,7 +108,16 @@ var NumberLine = /*#__PURE__*/function (_HTMLElement) {
       _this._rerender();
     });
     _this._model = NumberLine.createDefaultModel();
-    _this._configuration = defaults.configuration;
+    _this._configuration = defaults.configuration; // In environments that use pie-player-components, model is set before configuration.
+    // This is the reason why sometimes the model gets altered non-reversible
+    // (altered using default configuration instead of client configuration, because at that point client configuration was not set yet)
+    // Therefore, in such environments, we will make sure to keep a modelCopy (initialised in set model) and use it to reset
+    // the model in set configuration (resetModelAfterConfigurationIsSet) if set configuration is ever called
+
+    var pieAuthors = document.querySelectorAll('pie-author');
+    _this.hasPlayerAsParent = Array.from(pieAuthors).some(function (author) {
+      return author.contains((0, _assertThisInitialized2["default"])(_this));
+    });
     return _this;
   }
 
@@ -119,7 +137,8 @@ var NumberLine = /*#__PURE__*/function (_HTMLElement) {
 
       var newConfiguration = _objectSpread(_objectSpread({}, defaults.configuration), c);
 
-      this._configuration = newConfiguration; // if language:enabled is true, then the corresponding default item model should include a language value;
+      this._configuration = newConfiguration;
+      this.resetModelAfterConfigurationIsSet(); // 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).
@@ -151,7 +170,7 @@ var NumberLine = /*#__PURE__*/function (_HTMLElement) {
         delete this._model.language;
       }
 
-      this.onChange(this._modelCopy);
+      this._rerender();
     }
   }, {
     key: "insertSound",

package/configure/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["updateTicks","model","graph","domain","labelStep","ticks","minor","major","min","Number","toFixed","max","match","fraction","step","math","evaluate","NumberLine","o","_model","dispatchEvent","ModelUpdatedEvent","_rerender","createDefaultModel","_configuration","defaults","configuration","m","_modelCopy","c","newConfiguration","language","enabled","languageChoices","options","length","value","settings","find","option","push","label","onChange","handler","InsertSoundEvent","src","done","DeleteSoundEvent","element","React","createElement","Main","uploadSoundSupport","add","insertSound","bind","onDeleteSound","ReactDOM","render","HTMLElement","normalizedModel"],"mappings":"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","sourcesContent":["import Main from './main';\nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport { ModelUpdatedEvent, InsertSoundEvent, DeleteSoundEvent } from '@pie-framework/pie-configure-events';\nimport * as defaults from './defaults';\nimport * as math from 'mathjs';\nimport cloneDeep from 'lodash/cloneDeep';\n\n// this function is duplicated in controller; at some point, use the same shared function\nconst updateTicks = (model) => {\n  const { graph: { domain, labelStep, ticks = {} } = {} } = model;\n  const { minor, major } = ticks;\n\n  if (domain) {\n    domain.min = Number((domain.min || 0).toFixed(2));\n    domain.max = Number((domain.max || 0).toFixed(2));\n  }\n\n  if (labelStep && typeof labelStep === 'string' && labelStep.match(/^[1-9][0-9]*\\/[1-9][0-9]*$/g)) {\n    model.graph.fraction = true;\n\n    // update the ticks frequency and label value to match the label step if needed\n    const step = math.evaluate(labelStep);\n\n    if (step !== major) {\n      ticks.major = step;\n      ticks.minor = step / (major / minor);\n    }\n  }\n\n  return model;\n};\n\nexport default class NumberLine extends HTMLElement {\n  static createDefaultModel = (model = {}) => {\n    const c = defaults.configuration;\n    let language = model.language || '';\n\n    if (!language && c.language && c.language.enabled) {\n      if (c.languageChoices?.options?.length) {\n        language = c.languageChoices.options[0].value;\n      }\n    }\n\n    const normalizedModel = {\n      ...defaults.model,\n      ...model,\n      language,\n    };\n\n    return updateTicks(normalizedModel);\n  };\n\n  constructor() {\n    super();\n    this._model = NumberLine.createDefaultModel();\n    this._configuration = defaults.configuration;\n  }\n\n  set model(m) {\n    this._model = NumberLine.createDefaultModel(m);\n    this._modelCopy = cloneDeep(this._model);\n    this._rerender();\n  }\n\n  set configuration(c) {\n    const newConfiguration = {\n      ...defaults.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.onChange(this._modelCopy);\n  }\n\n  onChange = (o) => {\n    this._model = { ...this._model, ...o };\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model));\n\n    this._rerender();\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  _rerender() {\n    let element = React.createElement(Main, {\n      model: this._model,\n      configuration: this._configuration,\n      onChange: this.onChange,\n      uploadSoundSupport: {\n        add: this.insertSound.bind(this),\n        delete: this.onDeleteSound.bind(this),\n      },\n    });\n\n    ReactDOM.render(element, this);\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["updateTicks","model","graph","domain","labelStep","ticks","minor","major","min","Number","toFixed","max","match","fraction","step","math","evaluate","NumberLine","hasPlayerAsParent","_modelCopy","_model","o","dispatchEvent","ModelUpdatedEvent","_rerender","createDefaultModel","_configuration","defaults","configuration","pieAuthors","document","querySelectorAll","Array","from","some","author","contains","m","c","newConfiguration","resetModelAfterConfigurationIsSet","language","enabled","languageChoices","options","length","value","settings","find","option","push","label","handler","InsertSoundEvent","src","done","DeleteSoundEvent","element","React","createElement","Main","onChange","uploadSoundSupport","add","insertSound","bind","onDeleteSound","ReactDOM","render","HTMLElement","normalizedModel"],"mappings":"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","sourcesContent":["import Main from './main';\nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport { ModelUpdatedEvent, InsertSoundEvent, DeleteSoundEvent } from '@pie-framework/pie-configure-events';\nimport * as defaults from './defaults';\nimport * as math from 'mathjs';\nimport cloneDeep from 'lodash/cloneDeep';\n\n// this function is duplicated in controller; at some point, use the same shared function\nconst updateTicks = (model) => {\n  const { graph: { domain, labelStep, ticks = {} } = {} } = model;\n  const { minor, major } = ticks;\n\n  if (domain) {\n    domain.min = Number((domain.min || 0).toFixed(2));\n    domain.max = Number((domain.max || 0).toFixed(2));\n  }\n\n  if (labelStep && typeof labelStep === 'string' && labelStep.match(/^[1-9][0-9]*\\/[1-9][0-9]*$/g)) {\n    model.graph.fraction = true;\n\n    // update the ticks frequency and label value to match the label step if needed\n    const step = math.evaluate(labelStep);\n\n    if (step !== major) {\n      ticks.major = step;\n      ticks.minor = step / (major / minor);\n    }\n  }\n\n  return model;\n};\n\nexport default class NumberLine extends HTMLElement {\n  static createDefaultModel = (model = {}) => {\n    const c = defaults.configuration;\n    let language = model.language || '';\n\n    if (!language && c.language && c.language.enabled) {\n      if (c.languageChoices?.options?.length) {\n        language = c.languageChoices.options[0].value;\n      }\n    }\n\n    const normalizedModel = {\n      ...defaults.model,\n      ...model,\n      language,\n    };\n\n    return updateTicks(normalizedModel);\n  };\n\n  constructor() {\n    super();\n    this._model = NumberLine.createDefaultModel();\n    this._configuration = defaults.configuration;\n\n    // In environments that use pie-player-components, model is set before configuration.\n    // This is the reason why sometimes the model gets altered non-reversible\n    // (altered using default configuration instead of client configuration, because at that point client configuration was not set yet)\n    // Therefore, in such environments, we will make sure to keep a modelCopy (initialised in set model) and use it to reset\n    // the model in set configuration (resetModelAfterConfigurationIsSet) if set configuration is ever called\n    const pieAuthors = document.querySelectorAll('pie-author');\n    this.hasPlayerAsParent = Array.from(pieAuthors).some(author => author.contains(this));\n  }\n\n  set model(m) {\n    this._model = NumberLine.createDefaultModel(m);\n    this._modelCopy = cloneDeep(this._model);\n\n    this._rerender();\n  }\n\n  resetModelAfterConfigurationIsSet = () => {\n    if (this.hasPlayerAsParent) {\n      if (this._modelCopy) {\n        this._model = this._modelCopy;\n      } else {\n        delete this._modelCopy;\n      }\n    }\n  }\n\n  set configuration(c) {\n    const newConfiguration = {\n      ...defaults.configuration,\n      ...c,\n    };\n\n    this._configuration = newConfiguration;\n\n    this.resetModelAfterConfigurationIsSet();\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._rerender();\n  }\n\n  onChange = (o) => {\n    this._model = { ...this._model, ...o };\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model));\n\n    this._rerender();\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  _rerender() {\n    let element = React.createElement(Main, {\n      model: this._model,\n      configuration: this._configuration,\n      onChange: this.onChange,\n      uploadSoundSupport: {\n        add: this.insertSound.bind(this),\n        delete: this.onDeleteSound.bind(this),\n      },\n    });\n\n    ReactDOM.render(element, this);\n  }\n}\n"],"file":"index.js"}

package/configure/package.json

@@ -8,6 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
     "@pie-lib/pie-toolbox": "1.5.7",
+    "lodash": "^4.17.15",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-element/number-line",
-  "version": "7.4.1-next.14+337db61fe",
+  "version": "7.4.1-next.18+eabe903d2",
   "repository": "pie-framework/pie-elements",
   "description": "",
   "publishConfig": {
@@ -23,7 +23,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "337db61fed3313c87c443d259e7c0221650a7f04",
+  "gitHead": "eabe903d28484d90d783bffb82743ca77a303276",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },