@pie-element/placement-ordering 8.11.3-next.2 → 8.11.3-next.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,9 +8,9 @@
8
8
  "@material-ui/core": "^3.9.2",
9
9
  "@material-ui/icons": "^3.0.1",
10
10
  "@pie-framework/pie-configure-events": "^1.3.0",
11
- "@pie-lib/config-ui": "^11.5.5",
12
- "@pie-lib/editable-html": "^9.5.17",
13
- "@pie-lib/scoring-config": "^3.6.19",
11
+ "@pie-lib/config-ui": "^11.5.6",
12
+ "@pie-lib/editable-html": "^9.5.18",
13
+ "@pie-lib/scoring-config": "^3.6.20",
14
14
  "debug": "^3.1.0",
15
15
  "lodash": "^4.17.15",
16
16
  "nested-property": "^0.0.7",
@@ -2,6 +2,6 @@ module.exports = [
2
2
  {
3
3
  id: '1',
4
4
  element: 'placement-ordering',
5
- value: ['c3', 'c1', 'c2', undefined]
5
+ value: ['c3', 'c1', 'c2', 'c4']
6
6
  }
7
7
  ];
package/lib/index.js CHANGED
@@ -35,8 +35,6 @@ var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/w
35
35
 
36
36
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
37
37
 
38
- var _main = _interopRequireDefault(require("./main"));
39
-
40
38
  var _react = _interopRequireDefault(require("react"));
41
39
 
42
40
  var _reactDom = _interopRequireDefault(require("react-dom"));
@@ -47,15 +45,13 @@ var _debug = _interopRequireDefault(require("debug"));
47
45
 
48
46
  var _mathRendering = require("@pie-lib/math-rendering");
49
47
 
50
- var _ordering = require("./ordering");
51
-
52
48
  var _drag = require("@pie-lib/drag");
53
49
 
54
50
  var _piePlayerEvents = require("@pie-framework/pie-player-events");
55
51
 
56
- var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
52
+ var _main = _interopRequireDefault(require("./main"));
57
53
 
58
- var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
54
+ var _ordering = require("./ordering");
59
55
 
60
56
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
61
57
 
@@ -85,72 +81,28 @@ var Ordering = /*#__PURE__*/function (_HTMLElement) {
85
81
  var _this;
86
82
 
87
83
  (0, _classCallCheck2["default"])(this, Ordering);
88
- _this = _super.call(this);
89
- (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isComplete", function () {
90
- return (0, _compact["default"])(_this._session.value).length === _this._model.completeLength;
91
- });
92
- (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "dispatchSessionChanged", function () {
93
- _this.dispatchEvent(new _piePlayerEvents.SessionChangedEvent(_this.tagName.toLowerCase(), _this.isComplete()));
94
- });
95
- (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "verifyIfSessionUpdatesAreNeeded", function (newModel) {
96
- var _ref2 = _this._model || {},
97
- config = _ref2.config,
98
- choices = _ref2.choices;
99
-
100
- var _ref3 = newModel || {},
101
- newConfig = _ref3.config,
102
- newChoices = _ref3.choices;
103
-
104
- var session = (0, _cloneDeep["default"])(_this._session); // continue ONLY if there is a previous model with config and if there's already a session
105
-
106
- if (!config || !_this._session) {
107
- return;
108
- }
109
-
110
- var includeTargetsChanged = (config === null || config === void 0 ? void 0 : config.includeTargets) !== (newConfig === null || newConfig === void 0 ? void 0 : newConfig.includeTargets);
111
- var choicesChanged = !(0, _isEqual["default"])(newChoices, choices);
112
84
 
113
- if (includeTargetsChanged && newConfig !== null && newConfig !== void 0 && newConfig.includeTargets) {
114
- // if targets or choices changed, then we can reset the session
115
- delete session['value'];
116
- }
85
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
86
+ args[_key] = arguments[_key];
87
+ }
117
88
 
118
- var isValidSess = isValidSession({
119
- model: newModel,
120
- session: session
121
- }); // if the session is not valid anymore, it has to be reset
89
+ _this = _super.call.apply(_super, [this].concat(args));
90
+ (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isComplete", function (value) {
91
+ return value && (0, _compact["default"])(value).length === _this._model.completeLength;
92
+ });
93
+ (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "sessionChange", function (session) {
94
+ _this._session.value = session.value;
122
95
 
123
- if (!(newConfig !== null && newConfig !== void 0 && newConfig.includeTargets) && (choicesChanged || !isValidSess)) {
124
- session.value = newModel.choices.map(function (m) {
125
- return m.id;
126
- });
127
- }
96
+ _this.render();
128
97
 
129
- if (!(0, _isEqual["default"])(session, _this._session)) {
130
- _this.sessionChange(session);
131
- }
98
+ _this.dispatchEvent(new _piePlayerEvents.SessionChangedEvent(_this.tagName.toLowerCase(), _this._session && _this.isComplete(_this._session.value)));
132
99
  });
133
- _this.sessionChange = _this.sessionChange.bind((0, _assertThisInitialized2["default"])(_this));
134
100
  return _this;
135
101
  }
136
102
 
137
103
  (0, _createClass2["default"])(Ordering, [{
138
- key: "sessionChange",
139
- value: function sessionChange(session) {
140
- this._session.value = session.value;
141
- this.render();
142
- this.dispatchEvent(new CustomEvent('session-changed', {
143
- bubbles: true,
144
- detail: {
145
- component: this.tagName.toLowerCase(),
146
- complete: this._session && this._session.value && this.isComplete()
147
- }
148
- }));
149
- }
150
- }, {
151
104
  key: "model",
152
105
  set: function set(newModel) {
153
- this.verifyIfSessionUpdatesAreNeeded(newModel);
154
106
  this._model = newModel;
155
107
  this.render();
156
108
  this.dispatchEvent(new CustomEvent('model-set', {
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.js"],"names":["log","isValidSession","model","session","config","compactSessionValues","value","completeSession","length","choices","includeTargets","Ordering","_session","_model","completeLength","dispatchEvent","SessionChangedEvent","tagName","toLowerCase","isComplete","newModel","newConfig","newChoices","includeTargetsChanged","choicesChanged","isValidSess","map","m","id","sessionChange","bind","render","CustomEvent","bubbles","detail","component","complete","verifyIfSessionUpdatesAreNeeded","newSession","element","React","createElement","Main","onSessionChange","ReactDOM","HTMLElement"],"mappings":"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","sourcesContent":["import Main from './main';\nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport compact from 'lodash/compact';\nimport debug from 'debug';\nimport { renderMath } from '@pie-lib/math-rendering';\nimport { swap } from './ordering';\nimport { withDragContext } from '@pie-lib/drag';\nimport { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport isEqual from 'lodash/isEqual';\nimport cloneDeep from 'lodash/cloneDeep';\n\nconst log = debug('pie-elements:placement-ordering');\n\nexport { withDragContext, swap };\n\nexport const isValidSession = ({ model, session }) => {\n const { config } = model;\n\n const compactSessionValues = (session && compact(session.value)) || [];\n const completeSession = compactSessionValues.length === model.choices.length;\n\n // if it includes targets, it doesn't have to contain all the choices selected (eg: only 2 targets were filled)\n // but if it does not include targets, it's a must to have all choices selected\n return config.includeTargets || completeSession;\n};\n\nexport default class Ordering extends HTMLElement {\n constructor() {\n super();\n this.sessionChange = this.sessionChange.bind(this);\n }\n\n sessionChange(session) {\n this._session.value = session.value;\n this.render();\n this.dispatchEvent(\n new CustomEvent('session-changed', {\n bubbles: true,\n detail: {\n component: this.tagName.toLowerCase(),\n complete:\n this._session && this._session.value && this.isComplete(),\n },\n }),\n );\n }\n\n isComplete = () => compact(this._session.value).length === this._model.completeLength;\n\n dispatchSessionChanged = () => {\n this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete()));\n }\n\n verifyIfSessionUpdatesAreNeeded = (newModel) => {\n const { config, choices } = this._model || {};\n const { config: newConfig, choices: newChoices } = newModel || {};\n const session = cloneDeep(this._session);\n\n // continue ONLY if there is a previous model with config and if there's already a session\n if (!config || !this._session) {\n return;\n }\n\n const includeTargetsChanged = config?.includeTargets !== newConfig?.includeTargets;\n const choicesChanged = !isEqual(newChoices, choices);\n\n\n if (includeTargetsChanged && newConfig?.includeTargets) {\n // if targets or choices changed, then we can reset the session\n delete session['value'];\n }\n\n const isValidSess = isValidSession({ model: newModel, session });\n\n // if the session is not valid anymore, it has to be reset\n if (!newConfig?.includeTargets && (choicesChanged || !isValidSess)) {\n session.value = newModel.choices.map((m) => m.id);\n }\n\n if (!isEqual(session, this._session)) {\n this.sessionChange(session);\n }\n };\n\n set model(newModel) {\n this.verifyIfSessionUpdatesAreNeeded(newModel);\n\n this._model = newModel;\n\n this.render();\n this.dispatchEvent(\n new CustomEvent('model-set', {\n bubbles: true,\n detail: {\n complete: false,\n },\n }),\n );\n }\n\n set session(newSession) {\n this._session = newSession;\n this.render();\n }\n\n get session() {\n return this._session;\n }\n\n render() {\n if (this._model && this._session) {\n log('[render] session: ', this._session.value);\n log('[render] model: ', this._model);\n\n const element = React.createElement(Main, {\n model: this._model,\n session: this._session,\n onSessionChange: this.sessionChange,\n });\n\n ReactDOM.render(element, this, () => {\n renderMath(this);\n });\n }\n }\n}\n"],"file":"index.js"}
1
+ {"version":3,"sources":["../src/index.js"],"names":["log","isValidSession","model","session","config","compactSessionValues","value","completeSession","length","choices","includeTargets","Ordering","_model","completeLength","_session","render","dispatchEvent","SessionChangedEvent","tagName","toLowerCase","isComplete","newModel","CustomEvent","bubbles","detail","complete","newSession","element","React","createElement","Main","onSessionChange","sessionChange","ReactDOM","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;AAIO,IAAMC,cAAc,GAAG,SAAjBA,cAAiB,OAAwB;AAAA,MAArBC,KAAqB,QAArBA,KAAqB;AAAA,MAAdC,OAAc,QAAdA,OAAc;AACpD,MAAQC,MAAR,GAAmBF,KAAnB,CAAQE,MAAR;AAEA,MAAMC,oBAAoB,GAAIF,OAAO,IAAI,yBAAQA,OAAO,CAACG,KAAhB,CAAZ,IAAuC,EAApE;AACA,MAAMC,eAAe,GAAGF,oBAAoB,CAACG,MAArB,KAAgCN,KAAK,CAACO,OAAN,CAAcD,MAAtE,CAJoD,CAMpD;AACA;;AACA,SAAOJ,MAAM,CAACM,cAAP,IAAyBH,eAAhC;AACD,CATM;;;;IAWcI,Q;;;;;;;;;;;;;;;mGACN,UAACL,KAAD;AAAA,aAAWA,KAAK,IAAI,yBAAQA,KAAR,EAAeE,MAAf,KAA0B,MAAKI,MAAL,CAAYC,cAA1D;AAAA,K;sGAEG,UAACV,OAAD,EAAa;AAC3B,YAAKW,QAAL,CAAcR,KAAd,GAAsBH,OAAO,CAACG,KAA9B;;AACA,YAAKS,MAAL;;AACA,YAAKC,aAAL,CAAmB,IAAIC,oCAAJ,CAAwB,MAAKC,OAAL,CAAaC,WAAb,EAAxB,EAAoD,MAAKL,QAAL,IAAiB,MAAKM,UAAL,CAAgB,MAAKN,QAAL,CAAcR,KAA9B,CAArE,CAAnB;AACD,K;;;;;;SAED,aAAUe,QAAV,EAAoB;AAClB,WAAKT,MAAL,GAAcS,QAAd;AAEA,WAAKN,MAAL;AACA,WAAKC,aAAL,CACE,IAAIM,WAAJ,CAAgB,WAAhB,EAA6B;AAC3BC,QAAAA,OAAO,EAAE,IADkB;AAE3BC,QAAAA,MAAM,EAAE;AACNC,UAAAA,QAAQ,EAAE;AADJ;AAFmB,OAA7B,CADF;AAQD;;;SAOD,eAAc;AACZ,aAAO,KAAKX,QAAZ;AACD,K;SAPD,aAAYY,UAAZ,EAAwB;AACtB,WAAKZ,QAAL,GAAgBY,UAAhB;AACA,WAAKX,MAAL;AACD;;;WAMD,kBAAS;AAAA;;AACP,UAAI,KAAKH,MAAL,IAAe,KAAKE,QAAxB,EAAkC;AAChCd,QAAAA,GAAG,CAAC,oBAAD,EAAuB,KAAKc,QAAL,CAAcR,KAArC,CAAH;AACAN,QAAAA,GAAG,CAAC,kBAAD,EAAqB,KAAKY,MAA1B,CAAH;;AAEA,YAAMe,OAAO,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACxC5B,UAAAA,KAAK,EAAE,KAAKU,MAD4B;AAExCT,UAAAA,OAAO,EAAE,KAAKW,QAF0B;AAGxCiB,UAAAA,eAAe,EAAE,KAAKC;AAHkB,SAA1B,CAAhB;;AAMAC,6BAASlB,MAAT,CAAgBY,OAAhB,EAAyB,IAAzB,EAA+B,YAAM;AACnC,yCAAW,MAAX;AACD,SAFD;AAGD;AACF;;;kDA/CmCO,W","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport compact from 'lodash/compact';\nimport debug from 'debug';\nimport { renderMath } from '@pie-lib/math-rendering';\nimport { withDragContext } from '@pie-lib/drag';\nimport { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport Main from './main';\nimport { swap } from './ordering';\n\nconst log = debug('pie-elements:placement-ordering');\n\nexport { withDragContext, swap };\n\nexport const isValidSession = ({ model, session }) => {\n const { config } = model;\n\n const compactSessionValues = (session && compact(session.value)) || [];\n const completeSession = compactSessionValues.length === model.choices.length;\n\n // if it includes targets, it doesn't have to contain all the choices selected (eg: only 2 targets were filled)\n // but if it does not include targets, it's a must to have all choices selected\n return config.includeTargets || completeSession;\n};\n\nexport default class Ordering extends HTMLElement {\n isComplete = (value) => value && compact(value).length === this._model.completeLength;\n\n sessionChange = (session) => {\n this._session.value = session.value;\n this.render();\n this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), this._session && this.isComplete(this._session.value)))\n }\n\n set model(newModel) {\n this._model = newModel;\n\n this.render();\n this.dispatchEvent(\n new CustomEvent('model-set', {\n bubbles: true,\n detail: {\n complete: false,\n },\n }),\n );\n }\n\n set session(newSession) {\n this._session = newSession;\n this.render();\n }\n\n get session() {\n return this._session;\n }\n\n render() {\n if (this._model && this._session) {\n log('[render] session: ', this._session.value);\n log('[render] model: ', this._model);\n\n const element = React.createElement(Main, {\n model: this._model,\n session: this._session,\n onSessionChange: this.sessionChange,\n });\n\n ReactDOM.render(element, this, () => {\n renderMath(this);\n });\n }\n }\n}\n"],"file":"index.js"}
@@ -47,8 +47,16 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
47
47
 
48
48
  var _mathRendering = require("@pie-lib/math-rendering");
49
49
 
50
+ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
51
+
52
+ var _difference = _interopRequireDefault(require("lodash/difference"));
53
+
50
54
  var _excluded = ["tiler", "ordering", "onDropChoice", "onRemoveChoice"];
51
55
 
56
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
57
+
58
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
59
+
52
60
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
53
61
 
54
62
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -89,6 +97,82 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
89
97
 
90
98
  (0, _classCallCheck2["default"])(this, PlacementOrdering);
91
99
  _this = _super.call(this, props);
100
+ (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toggleCorrect", function (showingCorrect) {
101
+ return _this.setState({
102
+ showingCorrect: showingCorrect
103
+ });
104
+ });
105
+ (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "validateSession", function (_ref) {
106
+ var model = _ref.model,
107
+ session = _ref.session;
108
+
109
+ var _ref2 = model || {},
110
+ config = _ref2.config,
111
+ choices = _ref2.choices,
112
+ env = _ref2.env;
113
+
114
+ var _ref3 = env || {},
115
+ mode = _ref3.mode;
116
+
117
+ var _ref4 = config || {},
118
+ includeTargets = _ref4.includeTargets;
119
+
120
+ var _ref5 = session || {},
121
+ value = _ref5.value;
122
+
123
+ var needsReset;
124
+
125
+ if (mode !== 'gather') {
126
+ return {
127
+ value: value
128
+ };
129
+ }
130
+
131
+ var choicesIds = choices.map(function (c) {
132
+ return c.id;
133
+ });
134
+
135
+ if (!includeTargets) {
136
+ if (!value || !value.length) {
137
+ // if there's no value on session in No Targets Mode, we need to set an initial session
138
+ value = choicesIds;
139
+ } else {
140
+ // in No Targets Mode, all choice ids need to be used
141
+ var missingChoiceIds = (0, _difference["default"])(choicesIds, value); // this is the case that handles extra choice ids in session
142
+
143
+ var extraChoiceIds = (0, _difference["default"])(value, choicesIds);
144
+
145
+ if (missingChoiceIds.length || extraChoiceIds.length) {
146
+ value = choicesIds;
147
+ }
148
+ }
149
+
150
+ needsReset = !(0, _isEqual["default"])(session.value, value);
151
+ } else {
152
+ // in Targets Area selected, it's important to check the length of session
153
+ if (value && choicesIds.length !== value.length) {
154
+ needsReset = true; // if choices were added, add value in session
155
+
156
+ if (value.length < choicesIds.length) {
157
+ value = value.concat(new Array(choicesIds.length - value.length));
158
+ } else {
159
+ // if choices were removed, make sure to remove from session as well
160
+ value = value.filter(function (cId) {
161
+ return choicesIds.includes(cId);
162
+ });
163
+ }
164
+ }
165
+ }
166
+
167
+ if (needsReset) {
168
+ console.warn('This session is not valid anymore. It will be reset.');
169
+ }
170
+
171
+ return {
172
+ value: value,
173
+ needsReset: needsReset
174
+ };
175
+ });
92
176
  (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDropChoice", function (target, source, ordering) {
93
177
  var _this$props = _this.props,
94
178
  onSessionChange = _this$props.onSessionChange,
@@ -145,16 +229,21 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
145
229
  allowSameChoiceInTargets: model.config.allowSameChoiceInTargets
146
230
  });
147
231
  });
232
+ _this.instanceId = (0, _uniqueId["default"])();
233
+
234
+ var _this$validateSession = _this.validateSession(props),
235
+ _value = _this$validateSession.value,
236
+ _needsReset = _this$validateSession.needsReset;
237
+
148
238
  _this.state = {
149
239
  showingCorrect: false
150
240
  };
151
- _this.instanceId = (0, _uniqueId["default"])();
152
241
 
153
- _this.toggleCorrect = function (showingCorrect) {
154
- _this.setState({
155
- showingCorrect: showingCorrect
156
- });
157
- };
242
+ if (_needsReset) {
243
+ _this.props.onSessionChange(_objectSpread(_objectSpread({}, props.session), {}, {
244
+ value: _value
245
+ }));
246
+ }
158
247
 
159
248
  return _this;
160
249
  }
@@ -170,16 +259,43 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
170
259
  }, {
171
260
  key: "UNSAFE_componentWillReceiveProps",
172
261
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
262
+ var _this$props$model,
263
+ _this$props$model$con,
264
+ _this2 = this;
265
+
173
266
  var newState = {};
174
267
 
175
268
  var _nextProps$model = nextProps === null || nextProps === void 0 ? void 0 : nextProps.model,
176
- correctResponse = _nextProps$model.correctResponse;
269
+ correctResponse = _nextProps$model.correctResponse,
270
+ config = _nextProps$model.config;
271
+
272
+ var _ref6 = config || {},
273
+ includeTargets = _ref6.includeTargets;
177
274
 
178
275
  if (!correctResponse) {
179
276
  newState.showingCorrect = false;
180
277
  }
181
278
 
182
- this.setState(newState);
279
+ var validatedSession = this.validateSession(nextProps);
280
+ var value = validatedSession.value,
281
+ needsReset = validatedSession.needsReset;
282
+
283
+ var newSession = _objectSpread(_objectSpread({}, nextProps.session), {}, {
284
+ value: value
285
+ });
286
+
287
+ var includeTargetsChanged = ((_this$props$model = this.props.model) === null || _this$props$model === void 0 ? void 0 : (_this$props$model$con = _this$props$model.config) === null || _this$props$model$con === void 0 ? void 0 : _this$props$model$con.includeTargets) !== includeTargets;
288
+
289
+ if (includeTargets && includeTargetsChanged) {
290
+ needsReset = true;
291
+ delete newSession.value;
292
+ }
293
+
294
+ this.setState(newState, function () {
295
+ if (needsReset) {
296
+ _this2.props.onSessionChange(newSession);
297
+ }
298
+ });
183
299
  }
184
300
  }, {
185
301
  key: "render",
@@ -209,9 +325,9 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
209
325
  var vertical = orientation === 'vertical';
210
326
  var ordering = this.createOrdering();
211
327
 
212
- var _ref = env || {},
213
- mode = _ref.mode,
214
- role = _ref.role;
328
+ var _ref7 = env || {},
329
+ mode = _ref7.mode,
330
+ role = _ref7.role;
215
331
 
216
332
  var Tiler = vertical ? _tiler.VerticalTiler : _tiler.HorizontalTiler;
217
333
  var displayNote = (showingCorrect || mode === 'view' && role === 'instructor') && showNote && note;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/placement-ordering.jsx"],"names":["log","OrderingTiler","props","Comp","tiler","ordering","onDropChoice","onRemoveChoice","compProps","tiles","t","s","propTypes","PropTypes","func","any","PlacementOrdering","target","source","onSessionChange","session","from","find","id","type","to","update","sessionUpdate","Object","assign","value","response","model","showingCorrect","state","config","orientation","includeTargets","choices","correctResponse","map","outcome","allowSameChoiceInTargets","outcomes","instanceId","toggleCorrect","setState","domNode","ReactDOM","findDOMNode","nextProps","newState","classes","correctness","prompt","rationale","feedback","configs","note","showNote","env","disabled","teacherInstructions","showToggle","length","vertical","createOrdering","mode","role","Tiler","VerticalTiler","HorizontalTiler","displayNote","placementOrdering","hidden","visible","collapsible","toggle","choiceLabel","targetLabel","showOrdering","tileSize","choiceLabelEnabled","__html","React","Component","isRequired","object","oneOfType","array","styles","theme","color","text","backgroundColor","background","display","flexDirection","alignItems","boxSizing","paddingBottom","spacing","unit","marginBottom","alignSelf"],"mappings":"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","sourcesContent":["import { HorizontalTiler, VerticalTiler } from './tiler';\nimport { buildState, reducer } from './ordering';\nimport { color, Feedback, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\nimport PropTypes from 'prop-types';\nimport React from 'react';\nimport debug from 'debug';\nimport uniqueId from 'lodash/uniqueId';\nimport { withStyles } from '@material-ui/core/styles';\nimport ReactDOM from 'react-dom';\nimport { renderMath } from '@pie-lib/math-rendering';\n\nconst log = debug('pie-elements:placement-ordering');\n\nconst OrderingTiler = (props) => {\n const { tiler: Comp, ordering, onDropChoice, onRemoveChoice, ...compProps } = props;\n\n return (\n <Comp\n {...compProps}\n tiles={ordering.tiles}\n onDropChoice={(t, s) => onDropChoice(t, s, ordering)}\n onRemoveChoice={(t) => onRemoveChoice(t, ordering)}\n />\n );\n};\n\nOrderingTiler.propTypes = {\n tiler: PropTypes.func,\n ordering: PropTypes.any,\n onDropChoice: PropTypes.func,\n onRemoveChoice: PropTypes.func,\n};\n\nexport class PlacementOrdering extends React.Component {\n static propTypes = {\n onSessionChange: PropTypes.func.isRequired,\n model: PropTypes.object.isRequired,\n session: PropTypes.oneOfType([PropTypes.array.isRequired, PropTypes.object.isRequired]),\n classes: PropTypes.object.isRequired,\n };\n\n constructor(props) {\n super(props);\n this.state = {\n showingCorrect: false,\n };\n\n this.instanceId = uniqueId();\n\n this.toggleCorrect = (showingCorrect) => {\n this.setState({ showingCorrect });\n };\n }\n\n componentDidUpdate() {\n //eslint-disable-next-line\n const domNode = ReactDOM.findDOMNode(this);\n\n renderMath(domNode);\n }\n\n UNSAFE_componentWillReceiveProps(nextProps) {\n const newState = {};\n const { correctResponse } = nextProps?.model;\n\n if (!correctResponse) {\n newState.showingCorrect = false;\n }\n\n this.setState(newState);\n }\n\n onDropChoice = (target, source, ordering) => {\n const { onSessionChange, session } = this.props;\n const from = ordering.tiles.find((t) => t.id === source.id && t.type === source.type);\n const to = target;\n log('[onDropChoice] ', from, to);\n const update = reducer({ type: 'move', from, to }, ordering);\n const sessionUpdate = Object.assign({}, session, {\n value: update.response,\n });\n\n onSessionChange(sessionUpdate);\n };\n\n onRemoveChoice = (target, ordering) => {\n const { onSessionChange, session } = this.props;\n log('[onRemoveChoice]', target);\n const update = reducer({ type: 'remove', target }, ordering);\n const sessionUpdate = Object.assign({}, session, {\n value: update.response,\n });\n onSessionChange(sessionUpdate);\n };\n\n createOrdering = () => {\n const { model, session } = this.props;\n const { showingCorrect } = this.state;\n const config = model.config || {\n orientation: 'vertical',\n includeTargets: true,\n };\n const { includeTargets } = config;\n\n return showingCorrect\n ? buildState(\n model.choices,\n model.correctResponse,\n model.correctResponse.map((id) => ({ id, outcome: 'correct' })),\n {\n includeTargets,\n allowSameChoiceInTargets: model.config.allowSameChoiceInTargets,\n },\n )\n : buildState(model.choices, session.value, model.outcomes, {\n includeTargets,\n allowSameChoiceInTargets: model.config.allowSameChoiceInTargets,\n });\n };\n\n render() {\n const { classes, model } = this.props;\n const {\n correctResponse,\n correctness,\n prompt,\n rationale,\n feedback,\n config: configs,\n note,\n showNote,\n env,\n disabled,\n teacherInstructions,\n } = model;\n const showToggle = correctResponse && correctResponse.length > 0;\n const { showingCorrect } = this.state;\n const config = configs || {\n orientation: 'vertical',\n includeTargets: true,\n };\n const { orientation, includeTargets } = config;\n const vertical = orientation === 'vertical';\n const ordering = this.createOrdering();\n const { mode, role } = env || {};\n\n const Tiler = vertical ? VerticalTiler : HorizontalTiler;\n const displayNote = (showingCorrect || (mode === 'view' && role === 'instructor')) && showNote && note;\n\n return (\n <div className={classes.placementOrdering}>\n {teacherInstructions && hasText(teacherInstructions) && (\n <Collapsible\n labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}\n className={classes.collapsible}\n >\n <PreviewPrompt prompt={teacherInstructions} />\n </Collapsible>\n )}\n\n <div className={classes.prompt}>\n <PreviewPrompt prompt={prompt} />\n </div>\n\n <CorrectAnswerToggle\n className={classes.toggle}\n show={showToggle}\n toggled={showingCorrect}\n onToggle={this.toggleCorrect}\n />\n\n <OrderingTiler\n instanceId={this.instanceId}\n choiceLabel={config.choiceLabel}\n targetLabel={config.targetLabel}\n ordering={ordering}\n tiler={Tiler}\n disabled={disabled}\n addGuide={config.showOrdering}\n tileSize={config.tileSize}\n includeTargets={includeTargets}\n choiceLabelEnabled={model.config && model.config.choiceLabelEnabled}\n onDropChoice={this.onDropChoice}\n onRemoveChoice={this.onRemoveChoice}\n />\n\n {displayNote && (\n <div className={classes.note} dangerouslySetInnerHTML={{ __html: `<strong>Note:</strong> ${note}` }} />\n )}\n\n {rationale && hasText(rationale) && (\n <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }} className={classes.collapsible}>\n <PreviewPrompt prompt={rationale} />\n </Collapsible>\n )}\n\n {!showingCorrect && <Feedback correctness={correctness} feedback={feedback} />}\n </div>\n );\n }\n}\n\nconst styles = (theme) => ({\n placementOrdering: {\n color: color.text(),\n backgroundColor: color.background(),\n display: 'flex',\n flexDirection: 'column',\n alignItems: 'center',\n boxSizing: 'border-box',\n },\n prompt: {\n paddingBottom: theme.spacing.unit,\n },\n toggle: {\n paddingBottom: theme.spacing.unit,\n },\n note: {\n paddingBottom: theme.spacing.unit * 2,\n },\n collapsible: {\n marginBottom: theme.spacing.unit * 2,\n alignSelf: 'flex-start',\n },\n});\n\nexport default withStyles(styles)(PlacementOrdering);\n"],"file":"placement-ordering.js"}
1
+ {"version":3,"sources":["../src/placement-ordering.jsx"],"names":["log","OrderingTiler","props","Comp","tiler","ordering","onDropChoice","onRemoveChoice","compProps","tiles","t","s","propTypes","PropTypes","func","any","PlacementOrdering","showingCorrect","setState","model","session","config","choices","env","mode","includeTargets","value","needsReset","choicesIds","map","c","id","length","missingChoiceIds","extraChoiceIds","concat","Array","filter","cId","includes","console","warn","target","source","onSessionChange","from","find","type","to","update","sessionUpdate","Object","assign","response","state","orientation","correctResponse","outcome","allowSameChoiceInTargets","outcomes","instanceId","validateSession","domNode","ReactDOM","findDOMNode","nextProps","newState","validatedSession","newSession","includeTargetsChanged","classes","correctness","prompt","rationale","feedback","configs","note","showNote","disabled","teacherInstructions","showToggle","vertical","createOrdering","role","Tiler","VerticalTiler","HorizontalTiler","displayNote","placementOrdering","hidden","visible","collapsible","toggle","toggleCorrect","choiceLabel","targetLabel","showOrdering","tileSize","choiceLabelEnabled","__html","React","Component","isRequired","object","oneOfType","array","styles","theme","color","text","backgroundColor","background","display","flexDirection","alignItems","boxSizing","paddingBottom","spacing","unit","marginBottom","alignSelf"],"mappings":"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","sourcesContent":["import { HorizontalTiler, VerticalTiler } from './tiler';\nimport { buildState, reducer } from './ordering';\nimport { color, Feedback, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\nimport PropTypes from 'prop-types';\nimport React from 'react';\nimport debug from 'debug';\nimport uniqueId from 'lodash/uniqueId';\nimport { withStyles } from '@material-ui/core/styles';\nimport ReactDOM from 'react-dom';\nimport { renderMath } from '@pie-lib/math-rendering';\nimport isEqual from 'lodash/isEqual';\nimport difference from 'lodash/difference';\n\nconst log = debug('pie-elements:placement-ordering');\n\nconst OrderingTiler = (props) => {\n const { tiler: Comp, ordering, onDropChoice, onRemoveChoice, ...compProps } = props;\n\n return (\n <Comp\n {...compProps}\n tiles={ordering.tiles}\n onDropChoice={(t, s) => onDropChoice(t, s, ordering)}\n onRemoveChoice={(t) => onRemoveChoice(t, ordering)}\n />\n );\n};\n\nOrderingTiler.propTypes = {\n tiler: PropTypes.func,\n ordering: PropTypes.any,\n onDropChoice: PropTypes.func,\n onRemoveChoice: PropTypes.func,\n};\n\nexport class PlacementOrdering extends React.Component {\n static propTypes = {\n onSessionChange: PropTypes.func.isRequired,\n model: PropTypes.object.isRequired,\n session: PropTypes.oneOfType([PropTypes.array.isRequired, PropTypes.object.isRequired]),\n classes: PropTypes.object.isRequired,\n };\n\n constructor(props) {\n super(props);\n\n this.instanceId = uniqueId();\n\n const { value, needsReset } = this.validateSession(props);\n\n this.state = {\n showingCorrect: false,\n };\n\n if (needsReset) {\n this.props.onSessionChange({\n ...props.session,\n value\n });\n }\n }\n\n toggleCorrect = showingCorrect => this.setState({ showingCorrect });\n\n componentDidUpdate() {\n //eslint-disable-next-line\n const domNode = ReactDOM.findDOMNode(this);\n\n renderMath(domNode);\n }\n\n validateSession = ({ model, session }) => {\n const { config, choices, env } = model || {};\n const { mode } = env || {};\n const { includeTargets } = config || {};\n let { value } = session || {};\n let needsReset;\n\n if (mode !== 'gather') {\n return { value };\n }\n\n const choicesIds = choices.map(c => c.id);\n\n if (!includeTargets) {\n if (!value || !value.length) {\n // if there's no value on session in No Targets Mode, we need to set an initial session\n value = choicesIds;\n } else {\n // in No Targets Mode, all choice ids need to be used\n const missingChoiceIds = difference(choicesIds, value);\n // this is the case that handles extra choice ids in session\n const extraChoiceIds = difference(value, choicesIds);\n\n if (missingChoiceIds.length || extraChoiceIds.length) {\n value = choicesIds;\n }\n }\n\n needsReset = !isEqual(session.value, value);\n } else {\n // in Targets Area selected, it's important to check the length of session\n if (value && choicesIds.length !== value.length) {\n needsReset = true;\n\n // if choices were added, add value in session\n if (value.length < choicesIds.length) {\n value = value.concat(new Array(choicesIds.length - value.length));\n } else {\n // if choices were removed, make sure to remove from session as well\n value = value.filter(cId => choicesIds.includes(cId));\n }\n }\n }\n\n if (needsReset) {\n console.warn('This session is not valid anymore. It will be reset.')\n }\n\n return { value, needsReset };\n };\n\n UNSAFE_componentWillReceiveProps(nextProps) {\n const newState = {};\n const { correctResponse, config } = nextProps?.model;\n const { includeTargets } = config || {};\n\n if (!correctResponse) {\n newState.showingCorrect = false;\n }\n\n const validatedSession = this.validateSession(nextProps);\n let { value, needsReset } = validatedSession;\n\n const newSession = {\n ...nextProps.session,\n value\n };\n const includeTargetsChanged = this.props.model?.config?.includeTargets !== includeTargets;\n\n if (includeTargets && includeTargetsChanged) {\n needsReset = true;\n\n delete newSession.value;\n }\n\n this.setState(newState, () => {\n if (needsReset) {\n this.props.onSessionChange(newSession);\n }\n });\n }\n\n onDropChoice = (target, source, ordering) => {\n const { onSessionChange, session } = this.props;\n const from = ordering.tiles.find((t) => t.id === source.id && t.type === source.type);\n const to = target;\n log('[onDropChoice] ', from, to);\n const update = reducer({ type: 'move', from, to }, ordering);\n const sessionUpdate = Object.assign({}, session, {\n value: update.response,\n });\n\n onSessionChange(sessionUpdate);\n };\n\n onRemoveChoice = (target, ordering) => {\n const { onSessionChange, session } = this.props;\n log('[onRemoveChoice]', target);\n const update = reducer({ type: 'remove', target }, ordering);\n const sessionUpdate = Object.assign({}, session, {\n value: update.response,\n });\n onSessionChange(sessionUpdate);\n };\n\n createOrdering = () => {\n const { model, session } = this.props;\n const { showingCorrect } = this.state;\n const config = model.config || {\n orientation: 'vertical',\n includeTargets: true,\n };\n const { includeTargets } = config;\n\n return showingCorrect\n ? buildState(\n model.choices,\n model.correctResponse,\n model.correctResponse.map((id) => ({ id, outcome: 'correct' })),\n {\n includeTargets,\n allowSameChoiceInTargets: model.config.allowSameChoiceInTargets,\n },\n )\n : buildState(model.choices, session.value, model.outcomes, {\n includeTargets,\n allowSameChoiceInTargets: model.config.allowSameChoiceInTargets,\n });\n };\n\n render() {\n const { classes, model } = this.props;\n const {\n correctResponse,\n correctness,\n prompt,\n rationale,\n feedback,\n config: configs,\n note,\n showNote,\n env,\n disabled,\n teacherInstructions,\n } = model;\n const showToggle = correctResponse && correctResponse.length > 0;\n const { showingCorrect } = this.state;\n const config = configs || {\n orientation: 'vertical',\n includeTargets: true,\n };\n const { orientation, includeTargets } = config;\n const vertical = orientation === 'vertical';\n const ordering = this.createOrdering();\n const { mode, role } = env || {};\n\n const Tiler = vertical ? VerticalTiler : HorizontalTiler;\n const displayNote = (showingCorrect || (mode === 'view' && role === 'instructor')) && showNote && note;\n\n return (\n <div className={classes.placementOrdering}>\n {teacherInstructions && hasText(teacherInstructions) && (\n <Collapsible\n labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}\n className={classes.collapsible}\n >\n <PreviewPrompt prompt={teacherInstructions}/>\n </Collapsible>\n )}\n\n <div className={classes.prompt}>\n <PreviewPrompt prompt={prompt}/>\n </div>\n\n <CorrectAnswerToggle\n className={classes.toggle}\n show={showToggle}\n toggled={showingCorrect}\n onToggle={this.toggleCorrect}\n />\n\n <OrderingTiler\n instanceId={this.instanceId}\n choiceLabel={config.choiceLabel}\n targetLabel={config.targetLabel}\n ordering={ordering}\n tiler={Tiler}\n disabled={disabled}\n addGuide={config.showOrdering}\n tileSize={config.tileSize}\n includeTargets={includeTargets}\n choiceLabelEnabled={model.config && model.config.choiceLabelEnabled}\n onDropChoice={this.onDropChoice}\n onRemoveChoice={this.onRemoveChoice}\n />\n\n {displayNote && (\n <div className={classes.note} dangerouslySetInnerHTML={{ __html: `<strong>Note:</strong> ${note}` }}/>\n )}\n\n {rationale && hasText(rationale) && (\n <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }} className={classes.collapsible}>\n <PreviewPrompt prompt={rationale}/>\n </Collapsible>\n )}\n\n {!showingCorrect && <Feedback correctness={correctness} feedback={feedback}/>}\n </div>\n );\n }\n}\n\nconst styles = (theme) => ({\n placementOrdering: {\n color: color.text(),\n backgroundColor: color.background(),\n display: 'flex',\n flexDirection: 'column',\n alignItems: 'center',\n boxSizing: 'border-box',\n },\n prompt: {\n paddingBottom: theme.spacing.unit,\n },\n toggle: {\n paddingBottom: theme.spacing.unit,\n },\n note: {\n paddingBottom: theme.spacing.unit * 2,\n },\n collapsible: {\n marginBottom: theme.spacing.unit * 2,\n alignSelf: 'flex-start',\n },\n});\n\nexport default withStyles(styles)(PlacementOrdering);\n"],"file":"placement-ordering.js"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pie-element/placement-ordering",
3
- "version": "8.11.3-next.2+4f245295f",
3
+ "version": "8.11.3-next.20+29d73c8aa",
4
4
  "description": "",
5
5
  "repository": "pie-framework/pie-elements",
6
6
  "publishConfig": {
@@ -8,10 +8,11 @@
8
8
  },
9
9
  "dependencies": {
10
10
  "@material-ui/core": "^3.9.2",
11
- "@pie-lib/correct-answer-toggle": "^2.3.67",
11
+ "@pie-framework/pie-player-events": "^0.1.0",
12
+ "@pie-lib/correct-answer-toggle": "^2.3.68",
12
13
  "@pie-lib/drag": "^2.1.15",
13
14
  "@pie-lib/math-rendering": "^2.5.13",
14
- "@pie-lib/render-ui": "^4.14.17",
15
+ "@pie-lib/render-ui": "^4.14.18",
15
16
  "debug": "^4.1.1",
16
17
  "decimal.js": "^10.0.0",
17
18
  "lodash": "^4.17.10",
@@ -24,7 +25,7 @@
24
25
  },
25
26
  "author": "",
26
27
  "license": "ISC",
27
- "gitHead": "4f245295f132aa8e9cc54276e31bdf136859a8e4",
28
+ "gitHead": "29d73c8aa7c962080bb45b2e91acb001b47b0dfc",
28
29
  "scripts": {
29
30
  "postpublish": "../../scripts/postpublish"
30
31
  },