@pie-element/placement-ordering 7.3.18-next.85 → 7.4.1-beta.587
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.
- package/CHANGELOG.md +551 -0
- package/README.md +1 -1
- package/configure/CHANGELOG.md +503 -0
- package/configure/lib/choice-editor.js +239 -62
- package/configure/lib/choice-editor.js.map +1 -1
- package/configure/lib/choice-tile.js +71 -14
- package/configure/lib/choice-tile.js.map +1 -1
- package/configure/lib/defaults.js +29 -5
- package/configure/lib/defaults.js.map +1 -1
- package/configure/lib/design.js +230 -78
- package/configure/lib/design.js.map +1 -1
- package/configure/lib/help.js.map +1 -1
- package/configure/lib/index.js +17 -3
- package/configure/lib/index.js.map +1 -1
- package/configure/lib/utils.js +14 -0
- package/configure/lib/utils.js.map +1 -0
- package/configure/package.json +7 -6
- package/controller/CHANGELOG.md +144 -0
- package/controller/lib/defaults.js +4 -2
- package/controller/lib/defaults.js.map +1 -1
- package/controller/lib/index.js +79 -20
- package/controller/lib/index.js.map +1 -1
- package/controller/lib/scoring.js +11 -4
- package/controller/lib/scoring.js.map +1 -1
- package/controller/package.json +3 -3
- package/docs/config-schema.json +142 -23
- package/docs/config-schema.json.md +106 -16
- package/docs/demo/config.js +2 -2
- package/docs/demo/generate.js +10 -9
- package/docs/demo/index.html +1 -2
- package/docs/demo/session.js +1 -1
- package/docs/pie-schema.json +96 -42
- package/docs/pie-schema.json.md +67 -37
- package/lib/index.js +5 -2
- package/lib/index.js.map +1 -1
- package/lib/main.js +1 -1
- package/lib/main.js.map +1 -1
- package/lib/ordering.js +2 -1
- package/lib/ordering.js.map +1 -1
- package/lib/placement-ordering.js +131 -53
- package/lib/placement-ordering.js.map +1 -1
- package/lib/tile.js +1 -1
- package/lib/tile.js.map +1 -1
- package/lib/tiler.js +7 -5
- package/lib/tiler.js.map +1 -1
- package/package.json +8 -7
package/docs/pie-schema.json.md
CHANGED
|
@@ -22,19 +22,6 @@ The id of the choice
|
|
|
22
22
|
|
|
23
23
|
The label of the choice
|
|
24
24
|
|
|
25
|
-
## `moveOnDrag` (boolean)
|
|
26
|
-
|
|
27
|
-
Indicates if choice will be removed after is placed into a placement area
|
|
28
|
-
|
|
29
|
-
Default: `false`
|
|
30
|
-
|
|
31
|
-
## `lockChoiceOrder` (boolean)
|
|
32
|
-
|
|
33
|
-
If the entire array of choices can lockChoiceOrder, each choice itself
|
|
34
|
-
has this property to indicate if it should lockChoiceOrder
|
|
35
|
-
|
|
36
|
-
Default: `true`
|
|
37
|
-
|
|
38
25
|
# `correctResponse` (array)
|
|
39
26
|
|
|
40
27
|
Array of the correct responses in the correct order
|
|
@@ -56,6 +43,14 @@ Note: weights are not configurable in the existing component so we'll ignore it
|
|
|
56
43
|
|
|
57
44
|
Array that contains the correct alternate responses
|
|
58
45
|
|
|
46
|
+
The object is an array with all elements of the type `object`.
|
|
47
|
+
|
|
48
|
+
The array object has the following properties:
|
|
49
|
+
|
|
50
|
+
## `response` (array, required)
|
|
51
|
+
|
|
52
|
+
Array that contains the alternate response ids
|
|
53
|
+
|
|
59
54
|
The object is an array with all elements of the type `string`.
|
|
60
55
|
|
|
61
56
|
# `enableImages` (boolean)
|
|
@@ -156,6 +151,33 @@ Indicates if Student Instructions are enabled
|
|
|
156
151
|
|
|
157
152
|
Indicates if Teacher Instructions are enabled
|
|
158
153
|
|
|
154
|
+
# `choiceLabelEnabled` (boolean)
|
|
155
|
+
|
|
156
|
+
Indicates if Choice Label is enabled
|
|
157
|
+
|
|
158
|
+
# `spellCheckEnabled` (boolean, required)
|
|
159
|
+
|
|
160
|
+
Indicates if spellcheck is enabled for the author. Default value is true
|
|
161
|
+
|
|
162
|
+
# `note` (string)
|
|
163
|
+
|
|
164
|
+
Indicates the note for the answer
|
|
165
|
+
|
|
166
|
+
# `toolbarEditorPosition` (string, enum)
|
|
167
|
+
|
|
168
|
+
Indicates the editor's toolbar position which can be 'bottom' or 'top'
|
|
169
|
+
|
|
170
|
+
This element must be one of the following enum values:
|
|
171
|
+
|
|
172
|
+
* `bottom`
|
|
173
|
+
* `top`
|
|
174
|
+
|
|
175
|
+
Default: `": 'bottom'"`
|
|
176
|
+
|
|
177
|
+
# `rubricEnabled` (boolean, required)
|
|
178
|
+
|
|
179
|
+
Indicates if Rubric is enabled
|
|
180
|
+
|
|
159
181
|
# `id` (string, required)
|
|
160
182
|
|
|
161
183
|
Identifier to identify the Pie Element in html markup, Must be unique within a pie item config.
|
|
@@ -170,9 +192,9 @@ The html Element tag name
|
|
|
170
192
|
|
|
171
193
|
The schema defines the following additional types:
|
|
172
194
|
|
|
173
|
-
## `
|
|
195
|
+
## `ConfigureProp` (object)
|
|
174
196
|
|
|
175
|
-
Properties of the `
|
|
197
|
+
Properties of the `ConfigureProp` object:
|
|
176
198
|
|
|
177
199
|
### `settings` (boolean)
|
|
178
200
|
|
|
@@ -182,47 +204,45 @@ Indicates if the item has to be displayed in the Settings Panel
|
|
|
182
204
|
|
|
183
205
|
Indicates the label for the item that has to be displayed in the Settings Panel
|
|
184
206
|
|
|
185
|
-
|
|
207
|
+
## `ConfigureMaxImageDimensionsProp` (object)
|
|
186
208
|
|
|
187
|
-
|
|
188
|
-
(eg.: if item is a switch and displaying an input on the config-ui depends on the switch value: on/off)
|
|
209
|
+
Properties of the `ConfigureMaxImageDimensionsProp` object:
|
|
189
210
|
|
|
190
|
-
|
|
211
|
+
### `teacherInstructions` (number)
|
|
191
212
|
|
|
192
|
-
|
|
213
|
+
Indicates the max dimension for images in teacher instructions
|
|
193
214
|
|
|
194
|
-
### `
|
|
215
|
+
### `prompt` (number)
|
|
195
216
|
|
|
196
|
-
Indicates
|
|
217
|
+
Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified
|
|
197
218
|
|
|
198
|
-
### `
|
|
219
|
+
### `rationale` (number)
|
|
199
220
|
|
|
200
|
-
Indicates the
|
|
221
|
+
Indicates the max dimension for images in rationale
|
|
201
222
|
|
|
202
|
-
|
|
223
|
+
### `choicesWithPlacementArea` (number)
|
|
203
224
|
|
|
204
|
-
|
|
225
|
+
Only available for the width prop: indicates the max width for images in choices and choices labels when placement area is enabled
|
|
205
226
|
|
|
206
|
-
### `
|
|
227
|
+
### `choicesWithoutPlacementArea` (number)
|
|
207
228
|
|
|
208
|
-
|
|
229
|
+
Only available for the width prop: indicates the max width for images in choices and choices labels when placement area is disabled
|
|
209
230
|
|
|
210
|
-
### `
|
|
231
|
+
### `choices` (number)
|
|
211
232
|
|
|
212
|
-
|
|
233
|
+
Only available for the height prop: indicates the max height for images in choices and choices labels
|
|
213
234
|
|
|
214
|
-
|
|
235
|
+
## `Choice` (object)
|
|
215
236
|
|
|
216
|
-
|
|
237
|
+
Properties of the `Choice` object:
|
|
217
238
|
|
|
218
|
-
|
|
239
|
+
### `id` (string, required)
|
|
219
240
|
|
|
220
|
-
|
|
241
|
+
The id of the choice
|
|
221
242
|
|
|
222
|
-
|
|
223
|
-
has this property to indicate if it should lockChoiceOrder
|
|
243
|
+
### `label` (string)
|
|
224
244
|
|
|
225
|
-
|
|
245
|
+
The label of the choice
|
|
226
246
|
|
|
227
247
|
## `CorrectResponse` (object)
|
|
228
248
|
|
|
@@ -237,6 +257,16 @@ The id of the correct response
|
|
|
237
257
|
The weight of the correct response
|
|
238
258
|
Note: weights are not configurable in the existing component so we'll ignore it for now
|
|
239
259
|
|
|
260
|
+
## `AlternateResponse` (object)
|
|
261
|
+
|
|
262
|
+
Properties of the `AlternateResponse` object:
|
|
263
|
+
|
|
264
|
+
### `response` (array, required)
|
|
265
|
+
|
|
266
|
+
Array that contains the alternate response ids
|
|
267
|
+
|
|
268
|
+
The object is an array with all elements of the type `string`.
|
|
269
|
+
|
|
240
270
|
## `ComplexFeedbackType` (object)
|
|
241
271
|
|
|
242
272
|
Properties of the `ComplexFeedbackType` object:
|
package/lib/index.js
CHANGED
|
@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
+
exports["default"] = void 0;
|
|
8
9
|
Object.defineProperty(exports, "swap", {
|
|
9
10
|
enumerable: true,
|
|
10
11
|
get: function get() {
|
|
@@ -17,7 +18,6 @@ Object.defineProperty(exports, "withDragContext", {
|
|
|
17
18
|
return _drag.withDragContext;
|
|
18
19
|
}
|
|
19
20
|
});
|
|
20
|
-
exports["default"] = void 0;
|
|
21
21
|
|
|
22
22
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
23
23
|
|
|
@@ -51,7 +51,7 @@ var _drag = require("@pie-lib/drag");
|
|
|
51
51
|
|
|
52
52
|
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
53
|
|
|
54
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try {
|
|
54
|
+
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; } }
|
|
55
55
|
|
|
56
56
|
var log = (0, _debug["default"])('pie-elements:placement-ordering');
|
|
57
57
|
|
|
@@ -116,6 +116,9 @@ var Ordering = /*#__PURE__*/function (_HTMLElement) {
|
|
|
116
116
|
}
|
|
117
117
|
}, {
|
|
118
118
|
key: "session",
|
|
119
|
+
get: function get() {
|
|
120
|
+
return this._session;
|
|
121
|
+
},
|
|
119
122
|
set: function set(newSession) {
|
|
120
123
|
this._session = newSession;
|
|
121
124
|
this.render();
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["log","Ordering","sessionChange","bind","_model","_session","element","React","createElement","Main","model","session","onSessionChange","ReactDOM","render","value","dispatchEvent","CustomEvent","bubbles","detail","component","tagName","toLowerCase","complete","length","completeLength","newModel","newSession","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AACA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;IAIqBC,Q;;;;;AACnB,sBAAc;AAAA;;AAAA;AACZ;AACA,UAAKC,aAAL,GAAqB,MAAKA,aAAL,CAAmBC,IAAnB,gDAArB;AAFY;AAGb;;;;WAED,kBAAS;AAAA;;AACP,UAAI,KAAKC,MAAL,IAAe,KAAKC,QAAxB,EAAkC;AAChCL,QAAAA,GAAG,CAAC,oBAAD,EAAuB,KAAKK,QAA5B,CAAH;AACAL,QAAAA,GAAG,CAAC,kBAAD,EAAqB,KAAKI,MAA1B,CAAH;;AAEA,YAAME,OAAO,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACxCC,UAAAA,KAAK,EAAE,KAAKN,MAD4B;AAExCO,UAAAA,OAAO,EAAE,KAAKN,QAF0B;AAGxCO,UAAAA,eAAe,EAAE,KAAKV;AAHkB,SAA1B,CAAhB;;AAMAW,6BAASC,MAAT,CAAgBR,OAAhB,EAAyB,IAAzB,EAA+B,YAAM;AACnC,yCAAW,MAAX;AACD,SAFD;AAGD;AACF;;;WAED,uBAAcK,OAAd,EAAuB;AACrB,WAAKN,QAAL,CAAcU,KAAd,GAAsBJ,OAAO,CAACI,KAA9B;AACA,WAAKD,MAAL;AACA,WAAKE,aAAL,CACE,IAAIC,WAAJ,CAAgB,iBAAhB,EAAmC;AACjCC,QAAAA,OAAO,EAAE,IADwB;AAEjCC,QAAAA,MAAM,EAAE;AACNC,UAAAA,SAAS,EAAE,KAAKC,OAAL,CAAaC,WAAb,EADL;AAENC,UAAAA,QAAQ,EACN,KAAKlB,QAAL,
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":["log","Ordering","sessionChange","bind","_model","_session","element","React","createElement","Main","model","session","onSessionChange","ReactDOM","render","value","dispatchEvent","CustomEvent","bubbles","detail","component","tagName","toLowerCase","complete","length","completeLength","newModel","newSession","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AACA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;IAIqBC,Q;;;;;AACnB,sBAAc;AAAA;;AAAA;AACZ;AACA,UAAKC,aAAL,GAAqB,MAAKA,aAAL,CAAmBC,IAAnB,gDAArB;AAFY;AAGb;;;;WAED,kBAAS;AAAA;;AACP,UAAI,KAAKC,MAAL,IAAe,KAAKC,QAAxB,EAAkC;AAChCL,QAAAA,GAAG,CAAC,oBAAD,EAAuB,KAAKK,QAA5B,CAAH;AACAL,QAAAA,GAAG,CAAC,kBAAD,EAAqB,KAAKI,MAA1B,CAAH;;AAEA,YAAME,OAAO,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACxCC,UAAAA,KAAK,EAAE,KAAKN,MAD4B;AAExCO,UAAAA,OAAO,EAAE,KAAKN,QAF0B;AAGxCO,UAAAA,eAAe,EAAE,KAAKV;AAHkB,SAA1B,CAAhB;;AAMAW,6BAASC,MAAT,CAAgBR,OAAhB,EAAyB,IAAzB,EAA+B,YAAM;AACnC,yCAAW,MAAX;AACD,SAFD;AAGD;AACF;;;WAED,uBAAcK,OAAd,EAAuB;AACrB,WAAKN,QAAL,CAAcU,KAAd,GAAsBJ,OAAO,CAACI,KAA9B;AACA,WAAKD,MAAL;AACA,WAAKE,aAAL,CACE,IAAIC,WAAJ,CAAgB,iBAAhB,EAAmC;AACjCC,QAAAA,OAAO,EAAE,IADwB;AAEjCC,QAAAA,MAAM,EAAE;AACNC,UAAAA,SAAS,EAAE,KAAKC,OAAL,CAAaC,WAAb,EADL;AAENC,UAAAA,QAAQ,EACN,KAAKlB,QAAL,IAAiB,KAAKA,QAAL,CAAcU,KAA/B,IAAwC,yBAAQ,KAAKV,QAAL,CAAcU,KAAtB,EAA6BS,MAA7B,KAAwC,KAAKpB,MAAL,CAAYqB;AAHxF;AAFyB,OAAnC,CADF;AAUD;;;SAED,aAAUC,QAAV,EAAoB;AAClB,WAAKtB,MAAL,GAAcsB,QAAd;AACA,WAAKZ,MAAL;AACA,WAAKE,aAAL,CACE,IAAIC,WAAJ,CAAgB,WAAhB,EAA6B;AAC3BC,QAAAA,OAAO,EAAE,IADkB;AAE3BC,QAAAA,MAAM,EAAE;AACNI,UAAAA,QAAQ,EAAE;AADJ;AAFmB,OAA7B,CADF;AAQD;;;SAOD,eAAc;AACZ,aAAO,KAAKlB,QAAZ;AACD,K;SAPD,aAAYsB,UAAZ,EAAwB;AACtB,WAAKtB,QAAL,GAAgBsB,UAAhB;AACA,WAAKb,MAAL;AACD;;;kDAtDmCc,W","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';\nconst log = debug('pie-elements:placement-ordering');\n\nexport { withDragContext, swap };\n\nexport default class Ordering extends HTMLElement {\n constructor() {\n super();\n this.sessionChange = this.sessionChange.bind(this);\n }\n\n render() {\n if (this._model && this._session) {\n log('[render] session: ', this._session);\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 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 && compact(this._session.value).length === this._model.completeLength,\n },\n }),\n );\n }\n\n set model(newModel) {\n this._model = newModel;\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"],"file":"index.js"}
|
package/lib/main.js
CHANGED
|
@@ -29,7 +29,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
29
29
|
|
|
30
30
|
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); }; }
|
|
31
31
|
|
|
32
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try {
|
|
32
|
+
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; } }
|
|
33
33
|
|
|
34
34
|
var Main = /*#__PURE__*/function (_React$Component) {
|
|
35
35
|
(0, _inherits2["default"])(Main, _React$Component);
|
package/lib/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","model","session","onSessionChange","React","Component","PropTypes","object","isRequired","oneOfType","array","func","out"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;;;;;IAEMA,I;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","model","session","onSessionChange","React","Component","PropTypes","object","isRequired","oneOfType","array","func","out"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;;;;;IAEMA,I;;;;;;;;;;;;WAOJ,kBAAS;AACP,wBAA4C,KAAKC,KAAjD;AAAA,UAAQC,KAAR,eAAQA,KAAR;AAAA,UAAeC,OAAf,eAAeA,OAAf;AAAA,UAAwBC,eAAxB,eAAwBA,eAAxB;AACA,0BAAO,gCAAC,6BAAD;AAAmB,QAAA,KAAK,EAAEF,KAA1B;AAAiC,QAAA,OAAO,EAAEC,OAA1C;AAAmD,QAAA,eAAe,EAAEC;AAApE,QAAP;AACD;;;EAVgBC,kBAAMC,S;;iCAAnBN,I,eACe;AACjBE,EAAAA,KAAK,EAAEK,sBAAUC,MAAV,CAAiBC,UADP;AAEjBN,EAAAA,OAAO,EAAEI,sBAAUG,SAAV,CAAoB,CAACH,sBAAUI,KAAV,CAAgBF,UAAjB,EAA6BF,sBAAUC,MAAV,CAAiBC,UAA9C,CAApB,CAFQ;AAGjBL,EAAAA,eAAe,EAAEG,sBAAUK,IAAV,CAAeH;AAHf,C;AAWrB,IAAMI,GAAG,GAAG,2BAAgBb,IAAhB,CAAZ;eACea,G","sourcesContent":["import PlacementOrdering from './placement-ordering';\nimport React from 'react';\nimport { withDragContext } from '@pie-lib/drag';\n\nimport PropTypes from 'prop-types';\n\nclass Main extends React.Component {\n static propTypes = {\n model: PropTypes.object.isRequired,\n session: PropTypes.oneOfType([PropTypes.array.isRequired, PropTypes.object.isRequired]),\n onSessionChange: PropTypes.func.isRequired,\n };\n\n render() {\n const { model, session, onSessionChange } = this.props;\n return <PlacementOrdering model={model} session={session} onSessionChange={onSessionChange} />;\n }\n}\nconst out = withDragContext(Main);\nexport default out;\n"],"file":"main.js"}
|
package/lib/ordering.js
CHANGED
|
@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.buildState = buildState;
|
|
9
|
+
exports.push = void 0;
|
|
9
10
|
exports.reducer = reducer;
|
|
10
|
-
exports.swap =
|
|
11
|
+
exports.swap = void 0;
|
|
11
12
|
|
|
12
13
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
13
14
|
|
package/lib/ordering.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/ordering.js"],"names":["log","push","arr","fromIndex","toIndex","movedItem","find","item","index","remainingItems","filter","slice","swap","length","undefined","Error","update","tmp","removeResponse","state","targetTile","response","id","updateResponse","from","to","opts","includeTargets","type","findIndex","r","buildTiles","choices","outcomes","targets","i","choice","c","outcome","out","Object","assign","empty","draggable","processedChoices","map","m","indexOf","allowSameChoiceInTargets","droppable","concat","reduce","acc","emptyTile","choiceTile","buildState","Array","tiles","reducer","action","target"],"mappings":"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","sourcesContent":["import cloneDeep from 'lodash/cloneDeep';\nimport debug from 'debug';\nimport isEmpty from 'lodash/isEmpty';\nimport map from 'lodash/map';\nimport assign from 'lodash/assign';\n\nconst log = debug('pie-elements:placement-ordering:ordering');\n\nexport const push = (arr, fromIndex, toIndex) => {\n const movedItem = arr.find((item, index) => index === fromIndex);\n const remainingItems = arr.filter((item, index) => index !== fromIndex);\n\n return [\n ...remainingItems.slice(0, toIndex),\n movedItem,\n ...remainingItems.slice(toIndex)\n ];\n}\n\nexport const swap = (arr, fromIndex, toIndex) => {\n log('[swap]', arr, fromIndex, toIndex);\n if (\n !arr ||\n arr.length <= 1 ||\n fromIndex === undefined ||\n toIndex === undefined\n ) {\n throw new Error(\n `swap requires a non-empty array, fromIndex, toIndex: ${arr}, ${fromIndex} ${toIndex}`\n );\n }\n const update = cloneDeep(arr);\n const tmp = arr[toIndex];\n update[toIndex] = update[fromIndex];\n update[fromIndex] = tmp;\n return update;\n};\n\nfunction removeResponse(state, targetTile) {\n const update = cloneDeep(state.response);\n\n if (update[targetTile.index] === targetTile.id) {\n update[targetTile.index] = undefined;\n } else {\n throw new Error(\n `Tried to remove from index: ${\n targetTile.index\n }, but the id doesn't match: array: ${update}, target: ${targetTile.id}`\n );\n }\n return update;\n}\n\nfunction updateResponse(state, from, to) {\n const { response, opts } = state;\n const update = cloneDeep(response);\n if (opts.includeTargets) {\n if (from.type === 'choice' && to.type === 'target') {\n update[to.index] = from.id;\n return update;\n } else if (from.type === 'target' && to.type === 'choice') {\n update[from.index] = undefined;\n return update;\n } else if (from.type === 'target' && to.type === 'target') {\n return swap(response, from.index, to.index);\n } else {\n log('do nothing to the response');\n return response;\n }\n } else {\n const fromIndex = state.response.findIndex(\n r => r !== undefined && r === from.id\n );\n const toIndex = state.response.findIndex(\n r => r !== undefined && r === to.id\n );\n log('fromIndex: ', fromIndex, 'toIndex:', toIndex);\n return push(state.response, fromIndex, toIndex);\n }\n}\n\nfunction buildTiles(choices, response, outcomes, opts) {\n if (opts.includeTargets) {\n const targets = [];\n for (let i = 0; i < response.length; i++) {\n const r = response[i];\n\n const choice = choices.find(\n c => r !== undefined && r !== null && c.id === r\n );\n //TODO: index needs to match too!!\n const outcome = outcomes[i];\n\n const out = Object.assign(\n { type: 'target', index: i, empty: choice === undefined },\n choice,\n outcome,\n { draggable: choice !== undefined }\n );\n\n targets.push(out);\n }\n\n const processedChoices = choices.map(m => {\n if (response.indexOf(m.id) !== -1 && !opts.allowSameChoiceInTargets) {\n return {\n type: 'choice',\n empty: true,\n droppable: true,\n draggable: false\n };\n } else {\n return Object.assign({}, m, {\n type: 'choice',\n droppable: false,\n draggable: true\n });\n }\n });\n\n return processedChoices.concat(targets);\n } else {\n return response.reduce((acc, id, index) => {\n const emptyTile = Object.assign(\n { type: 'empty', draggable: false, droppable: true },\n choices.find(m => m.id === id),\n outcomes[index]\n );\n const choiceTile = Object.assign(\n { type: 'choice', draggable: true, droppable: true },\n choices.find(m => m.id === id),\n outcomes[index]\n )\n\n if(index === 0) {\n acc.push(emptyTile)\n }\n\n acc.push(choiceTile, emptyTile);\n\n return acc;\n }, []);\n }\n}\n\nexport function buildState(choices, response, outcomes, opts) {\n opts = assign({ includeTargets: true }, opts);\n\n outcomes = outcomes || [];\n response =\n !response || isEmpty(response)\n ? opts.includeTargets\n ? new Array(choices.length)\n : map(choices, c => c.id)\n : response;\n return {\n choices,\n response,\n opts,\n outcomes,\n tiles: buildTiles(choices, response, outcomes, opts)\n };\n}\n\nexport function reducer(action, state) {\n switch (action.type) {\n case 'move': {\n const { from, to } = action;\n const response = updateResponse(state, from, to);\n const tiles = buildTiles(\n state.choices,\n response,\n state.outcomes,\n state.opts\n );\n return Object.assign({}, state, { response, tiles });\n }\n case 'remove': {\n const { target } = action;\n const response = removeResponse(state, target);\n const tiles = buildTiles(\n state.choices,\n response,\n state.outcomes,\n state.opts\n );\n return Object.assign({}, state, { response, tiles });\n }\n }\n return state;\n}\n"],"file":"ordering.js"}
|
|
1
|
+
{"version":3,"sources":["../src/ordering.js"],"names":["log","push","arr","fromIndex","toIndex","movedItem","find","item","index","remainingItems","filter","slice","swap","length","undefined","Error","update","tmp","removeResponse","state","targetTile","response","id","updateResponse","from","to","opts","includeTargets","type","findIndex","r","buildTiles","choices","outcomes","targets","i","choice","c","outcome","out","Object","assign","empty","draggable","processedChoices","map","m","indexOf","allowSameChoiceInTargets","droppable","concat","reduce","acc","emptyTile","choiceTile","buildState","Array","tiles","reducer","action","target"],"mappings":"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","sourcesContent":["import cloneDeep from 'lodash/cloneDeep';\nimport debug from 'debug';\nimport isEmpty from 'lodash/isEmpty';\nimport map from 'lodash/map';\nimport assign from 'lodash/assign';\n\nconst log = debug('pie-elements:placement-ordering:ordering');\n\nexport const push = (arr, fromIndex, toIndex) => {\n const movedItem = arr.find((item, index) => index === fromIndex);\n const remainingItems = arr.filter((item, index) => index !== fromIndex);\n\n return [...remainingItems.slice(0, toIndex), movedItem, ...remainingItems.slice(toIndex)];\n};\n\nexport const swap = (arr, fromIndex, toIndex) => {\n log('[swap]', arr, fromIndex, toIndex);\n if (!arr || arr.length <= 1 || fromIndex === undefined || toIndex === undefined) {\n throw new Error(`swap requires a non-empty array, fromIndex, toIndex: ${arr}, ${fromIndex} ${toIndex}`);\n }\n const update = cloneDeep(arr);\n const tmp = arr[toIndex];\n update[toIndex] = update[fromIndex];\n update[fromIndex] = tmp;\n return update;\n};\n\nfunction removeResponse(state, targetTile) {\n const update = cloneDeep(state.response);\n\n if (update[targetTile.index] === targetTile.id) {\n update[targetTile.index] = undefined;\n } else {\n throw new Error(\n `Tried to remove from index: ${targetTile.index}, but the id doesn't match: array: ${update}, target: ${targetTile.id}`,\n );\n }\n return update;\n}\n\nfunction updateResponse(state, from, to) {\n const { response, opts } = state;\n const update = cloneDeep(response);\n if (opts.includeTargets) {\n if (from.type === 'choice' && to.type === 'target') {\n update[to.index] = from.id;\n return update;\n } else if (from.type === 'target' && to.type === 'choice') {\n update[from.index] = undefined;\n return update;\n } else if (from.type === 'target' && to.type === 'target') {\n return swap(response, from.index, to.index);\n } else {\n log('do nothing to the response');\n return response;\n }\n } else {\n const fromIndex = state.response.findIndex((r) => r !== undefined && r === from.id);\n const toIndex = state.response.findIndex((r) => r !== undefined && r === to.id);\n log('fromIndex: ', fromIndex, 'toIndex:', toIndex);\n return push(state.response, fromIndex, toIndex);\n }\n}\n\nfunction buildTiles(choices, response, outcomes, opts) {\n if (opts.includeTargets) {\n const targets = [];\n for (let i = 0; i < response.length; i++) {\n const r = response[i];\n\n const choice = choices.find((c) => r !== undefined && r !== null && c.id === r);\n //TODO: index needs to match too!!\n const outcome = outcomes[i];\n\n const out = Object.assign({ type: 'target', index: i, empty: choice === undefined }, choice, outcome, {\n draggable: choice !== undefined,\n });\n\n targets.push(out);\n }\n\n const processedChoices = choices.map((m) => {\n if (response.indexOf(m.id) !== -1 && !opts.allowSameChoiceInTargets) {\n return {\n type: 'choice',\n empty: true,\n droppable: true,\n draggable: false,\n };\n } else {\n return Object.assign({}, m, {\n type: 'choice',\n droppable: false,\n draggable: true,\n });\n }\n });\n\n return processedChoices.concat(targets);\n } else {\n return response.reduce((acc, id, index) => {\n const emptyTile = Object.assign(\n { type: 'empty', draggable: false, droppable: true },\n choices.find((m) => m.id === id),\n outcomes[index],\n );\n const choiceTile = Object.assign(\n { type: 'choice', draggable: true, droppable: true },\n choices.find((m) => m.id === id),\n outcomes[index],\n );\n\n if (index === 0) {\n acc.push(emptyTile);\n }\n\n acc.push(choiceTile, emptyTile);\n\n return acc;\n }, []);\n }\n}\n\nexport function buildState(choices, response, outcomes, opts) {\n opts = assign({ includeTargets: true }, opts);\n\n outcomes = outcomes || [];\n response =\n !response || isEmpty(response)\n ? opts.includeTargets\n ? new Array(choices.length)\n : map(choices, (c) => c.id)\n : response;\n return {\n choices,\n response,\n opts,\n outcomes,\n tiles: buildTiles(choices, response, outcomes, opts),\n };\n}\n\nexport function reducer(action, state) {\n switch (action.type) {\n case 'move': {\n const { from, to } = action;\n const response = updateResponse(state, from, to);\n const tiles = buildTiles(state.choices, response, state.outcomes, state.opts);\n return Object.assign({}, state, { response, tiles });\n }\n case 'remove': {\n const { target } = action;\n const response = removeResponse(state, target);\n const tiles = buildTiles(state.choices, response, state.outcomes, state.opts);\n return Object.assign({}, state, { response, tiles });\n }\n }\n return state;\n}\n"],"file":"ordering.js"}
|
|
@@ -47,9 +47,17 @@ var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
|
|
|
47
47
|
|
|
48
48
|
var _styles = require("@material-ui/core/styles");
|
|
49
49
|
|
|
50
|
+
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
51
|
+
|
|
52
|
+
var _mathRendering = require("@pie-lib/math-rendering");
|
|
53
|
+
|
|
54
|
+
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
55
|
+
|
|
56
|
+
var _excluded = ["tiler", "ordering", "onDropChoice", "onRemoveChoice"];
|
|
57
|
+
|
|
50
58
|
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); }; }
|
|
51
59
|
|
|
52
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try {
|
|
60
|
+
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; } }
|
|
53
61
|
|
|
54
62
|
var log = (0, _debug["default"])('pie-elements:placement-ordering');
|
|
55
63
|
|
|
@@ -58,7 +66,7 @@ var OrderingTiler = function OrderingTiler(props) {
|
|
|
58
66
|
ordering = props.ordering,
|
|
59
67
|
_onDropChoice = props.onDropChoice,
|
|
60
68
|
_onRemoveChoice = props.onRemoveChoice,
|
|
61
|
-
compProps = (0, _objectWithoutProperties2["default"])(props,
|
|
69
|
+
compProps = (0, _objectWithoutProperties2["default"])(props, _excluded);
|
|
62
70
|
return /*#__PURE__*/_react["default"].createElement(Comp, (0, _extends2["default"])({}, compProps, {
|
|
63
71
|
tiles: ordering.tiles,
|
|
64
72
|
onDropChoice: function onDropChoice(t, s) {
|
|
@@ -87,6 +95,16 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
87
95
|
|
|
88
96
|
(0, _classCallCheck2["default"])(this, PlacementOrdering);
|
|
89
97
|
_this = _super.call(this, props);
|
|
98
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isValidSession", function (_ref) {
|
|
99
|
+
var model = _ref.model,
|
|
100
|
+
session = _ref.session;
|
|
101
|
+
var config = model.config;
|
|
102
|
+
var compactSessionValues = session && (0, _compact["default"])(session.value) || [];
|
|
103
|
+
var completeSession = compactSessionValues.length === model.choices.length; // if it includes targets, it doesn't have to contain all the choices selected (eg: only 2 targets were filled)
|
|
104
|
+
// but if it does not include targets, it's a must to have all choices selected
|
|
105
|
+
|
|
106
|
+
return config.includeTargets || completeSession;
|
|
107
|
+
});
|
|
90
108
|
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDropChoice", function (target, source, ordering) {
|
|
91
109
|
var _this$props = _this.props,
|
|
92
110
|
onSessionChange = _this$props.onSessionChange,
|
|
@@ -160,61 +178,111 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
160
178
|
(0, _createClass2["default"])(PlacementOrdering, [{
|
|
161
179
|
key: "componentDidMount",
|
|
162
180
|
value: function componentDidMount() {
|
|
163
|
-
this
|
|
181
|
+
var _this2 = this;
|
|
182
|
+
|
|
183
|
+
var _this$props4 = this.props,
|
|
184
|
+
model = _this$props4.model,
|
|
185
|
+
session = _this$props4.session;
|
|
186
|
+
|
|
187
|
+
if (!this.isValidSession({
|
|
188
|
+
model: model,
|
|
189
|
+
session: session
|
|
190
|
+
})) {
|
|
191
|
+
this.setState({
|
|
192
|
+
defaultSessionValue: (0, _cloneDeep["default"])(session === null || session === void 0 ? void 0 : session.value)
|
|
193
|
+
}, function () {
|
|
194
|
+
return _this2.initSessionIfNeeded(_this2.props);
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}, {
|
|
199
|
+
key: "componentDidUpdate",
|
|
200
|
+
value: function componentDidUpdate() {
|
|
201
|
+
//eslint-disable-next-line
|
|
202
|
+
var domNode = _reactDom["default"].findDOMNode(this);
|
|
203
|
+
|
|
204
|
+
(0, _mathRendering.renderMath)(domNode);
|
|
164
205
|
}
|
|
165
206
|
}, {
|
|
166
207
|
key: "UNSAFE_componentWillReceiveProps",
|
|
167
208
|
value: function UNSAFE_componentWillReceiveProps(nextProps) {
|
|
209
|
+
var _this$props5, _this$props$session;
|
|
210
|
+
|
|
168
211
|
var newState = {};
|
|
169
212
|
|
|
170
|
-
|
|
213
|
+
var _nextProps$model = nextProps === null || nextProps === void 0 ? void 0 : nextProps.model,
|
|
214
|
+
correctResponse = _nextProps$model.correctResponse,
|
|
215
|
+
config = _nextProps$model.config,
|
|
216
|
+
choices = _nextProps$model.choices;
|
|
217
|
+
|
|
218
|
+
var _ref2 = ((_this$props5 = this.props) === null || _this$props5 === void 0 ? void 0 : _this$props5.model) || {},
|
|
219
|
+
oldConfig = _ref2.config,
|
|
220
|
+
oldChoices = _ref2.choices;
|
|
221
|
+
|
|
222
|
+
if (!correctResponse) {
|
|
171
223
|
newState.showingCorrect = false;
|
|
172
224
|
}
|
|
173
225
|
|
|
174
|
-
var includeTargetsChanged =
|
|
175
|
-
var
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
226
|
+
var includeTargetsChanged = config.includeTargets !== oldConfig.includeTargets;
|
|
227
|
+
var choicesChanged = !(0, _isEqual["default"])(oldChoices, choices);
|
|
228
|
+
var isDefaultSession = (0, _isEqual["default"])(this.state.defaultSessionValue, (_this$props$session = this.props.session) === null || _this$props$session === void 0 ? void 0 : _this$props$session.value);
|
|
229
|
+
var isValidSession = this.isValidSession({
|
|
230
|
+
model: nextProps.model,
|
|
231
|
+
session: nextProps.session
|
|
232
|
+
}); // if the session is not valid anymore, it has to be reset
|
|
233
|
+
// OR
|
|
234
|
+
// if the session is the default one (set if the initial session was not valid or empty)
|
|
235
|
+
// and targets or choices changed, then we can reset the session
|
|
236
|
+
// but if the session is not the default one (it was set by the student), then we do not reset it
|
|
237
|
+
|
|
238
|
+
if (!isValidSession || isDefaultSession && (includeTargetsChanged || choicesChanged)) {
|
|
239
|
+
this.initSessionIfNeeded(nextProps);
|
|
179
240
|
}
|
|
180
241
|
|
|
181
242
|
this.setState(newState);
|
|
182
243
|
}
|
|
183
244
|
}, {
|
|
184
245
|
key: "initSessionIfNeeded",
|
|
185
|
-
value: function initSessionIfNeeded(props
|
|
246
|
+
value: function initSessionIfNeeded(props) {
|
|
186
247
|
var model = props.model,
|
|
187
248
|
session = props.session,
|
|
188
249
|
onSessionChange = props.onSessionChange;
|
|
189
250
|
var newConfig = model.config;
|
|
190
|
-
var
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
var update = (0, _cloneDeep["default"])(session);
|
|
195
|
-
update.value = model.choices.map(function (m) {
|
|
196
|
-
return m.id;
|
|
197
|
-
});
|
|
198
|
-
onSessionChange(update);
|
|
199
|
-
} else if (newConfig.includeTargets) {
|
|
200
|
-
var _update = (0, _cloneDeep["default"])(session);
|
|
201
|
-
|
|
202
|
-
if (reset) {
|
|
203
|
-
delete _update.value;
|
|
204
|
-
}
|
|
251
|
+
var update = (0, _cloneDeep["default"])(session);
|
|
252
|
+
update.value = model.choices.map(function (m) {
|
|
253
|
+
return m.id;
|
|
254
|
+
});
|
|
205
255
|
|
|
206
|
-
|
|
256
|
+
if (newConfig.includeTargets) {
|
|
257
|
+
delete update.value;
|
|
207
258
|
}
|
|
259
|
+
|
|
260
|
+
this.setState({
|
|
261
|
+
defaultSessionValue: (0, _cloneDeep["default"])(update === null || update === void 0 ? void 0 : update.value)
|
|
262
|
+
}, function () {
|
|
263
|
+
return onSessionChange(update);
|
|
264
|
+
});
|
|
208
265
|
}
|
|
209
266
|
}, {
|
|
210
267
|
key: "render",
|
|
211
268
|
value: function render() {
|
|
212
|
-
var _this$
|
|
213
|
-
classes = _this$
|
|
214
|
-
model = _this$
|
|
215
|
-
var
|
|
269
|
+
var _this$props6 = this.props,
|
|
270
|
+
classes = _this$props6.classes,
|
|
271
|
+
model = _this$props6.model;
|
|
272
|
+
var correctResponse = model.correctResponse,
|
|
273
|
+
correctness = model.correctness,
|
|
274
|
+
prompt = model.prompt,
|
|
275
|
+
rationale = model.rationale,
|
|
276
|
+
feedback = model.feedback,
|
|
277
|
+
configs = model.config,
|
|
278
|
+
note = model.note,
|
|
279
|
+
showNote = model.showNote,
|
|
280
|
+
env = model.env,
|
|
281
|
+
disabled = model.disabled,
|
|
282
|
+
teacherInstructions = model.teacherInstructions;
|
|
283
|
+
var showToggle = correctResponse && correctResponse.length > 0;
|
|
216
284
|
var showingCorrect = this.state.showingCorrect;
|
|
217
|
-
var config =
|
|
285
|
+
var config = configs || {
|
|
218
286
|
orientation: 'vertical',
|
|
219
287
|
includeTargets: true
|
|
220
288
|
};
|
|
@@ -222,53 +290,60 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
222
290
|
includeTargets = config.includeTargets;
|
|
223
291
|
var vertical = orientation === 'vertical';
|
|
224
292
|
var ordering = this.createOrdering();
|
|
293
|
+
|
|
294
|
+
var _ref3 = env || {},
|
|
295
|
+
mode = _ref3.mode,
|
|
296
|
+
role = _ref3.role;
|
|
297
|
+
|
|
225
298
|
var Tiler = vertical ? _tiler.VerticalTiler : _tiler.HorizontalTiler;
|
|
299
|
+
var displayNote = (showingCorrect || mode === 'view' && role === 'instructor') && showNote && note;
|
|
226
300
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
227
301
|
className: classes.placementOrdering
|
|
228
|
-
},
|
|
302
|
+
}, teacherInstructions && (0, _renderUi.hasText)(teacherInstructions) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_renderUi.Collapsible, {
|
|
229
303
|
labels: {
|
|
230
304
|
hidden: 'Show Teacher Instructions',
|
|
231
305
|
visible: 'Hide Teacher Instructions'
|
|
232
306
|
},
|
|
233
307
|
className: classes.collapsible
|
|
234
|
-
}, /*#__PURE__*/_react["default"].createElement(
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
}
|
|
238
|
-
})), /*#__PURE__*/_react["default"].createElement("br", null), /*#__PURE__*/_react["default"].createElement(_correctAnswerToggle["default"], {
|
|
308
|
+
}, /*#__PURE__*/_react["default"].createElement(_renderUi.PreviewPrompt, {
|
|
309
|
+
prompt: teacherInstructions
|
|
310
|
+
})), /*#__PURE__*/_react["default"].createElement("br", null)), /*#__PURE__*/_react["default"].createElement(_correctAnswerToggle["default"], {
|
|
239
311
|
show: showToggle,
|
|
240
|
-
toggled:
|
|
312
|
+
toggled: showingCorrect,
|
|
241
313
|
onToggle: this.toggleCorrect
|
|
242
314
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
243
|
-
className: classes.prompt
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
}), /*#__PURE__*/_react["default"].createElement(OrderingTiler, {
|
|
315
|
+
className: classes.prompt
|
|
316
|
+
}, /*#__PURE__*/_react["default"].createElement(_renderUi.PreviewPrompt, {
|
|
317
|
+
prompt: prompt
|
|
318
|
+
})), /*#__PURE__*/_react["default"].createElement(OrderingTiler, {
|
|
248
319
|
instanceId: this.instanceId,
|
|
249
320
|
choiceLabel: config.choiceLabel,
|
|
250
321
|
targetLabel: config.targetLabel,
|
|
251
322
|
ordering: ordering,
|
|
252
323
|
tiler: Tiler,
|
|
253
|
-
disabled:
|
|
254
|
-
addGuide:
|
|
255
|
-
tileSize:
|
|
324
|
+
disabled: disabled,
|
|
325
|
+
addGuide: config.showOrdering,
|
|
326
|
+
tileSize: config.tileSize,
|
|
256
327
|
includeTargets: includeTargets,
|
|
328
|
+
choiceLabelEnabled: model.config && model.config.choiceLabelEnabled,
|
|
257
329
|
onDropChoice: this.onDropChoice,
|
|
258
330
|
onRemoveChoice: this.onRemoveChoice
|
|
259
|
-
}), /*#__PURE__*/_react["default"].createElement("br", null),
|
|
331
|
+
}), /*#__PURE__*/_react["default"].createElement("br", null), displayNote && /*#__PURE__*/_react["default"].createElement("div", {
|
|
332
|
+
className: classes.note,
|
|
333
|
+
dangerouslySetInnerHTML: {
|
|
334
|
+
__html: "<strong>Note:</strong> ".concat(note)
|
|
335
|
+
}
|
|
336
|
+
}), rationale && (0, _renderUi.hasText)(rationale) && /*#__PURE__*/_react["default"].createElement(_renderUi.Collapsible, {
|
|
260
337
|
labels: {
|
|
261
338
|
hidden: 'Show Rationale',
|
|
262
339
|
visible: 'Hide Rationale'
|
|
263
340
|
},
|
|
264
341
|
className: classes.collapsible
|
|
265
|
-
}, /*#__PURE__*/_react["default"].createElement(
|
|
266
|
-
|
|
267
|
-
__html: model.rationale
|
|
268
|
-
}
|
|
342
|
+
}, /*#__PURE__*/_react["default"].createElement(_renderUi.PreviewPrompt, {
|
|
343
|
+
prompt: rationale
|
|
269
344
|
})), !showingCorrect && /*#__PURE__*/_react["default"].createElement(_renderUi.Feedback, {
|
|
270
|
-
correctness:
|
|
271
|
-
feedback:
|
|
345
|
+
correctness: correctness,
|
|
346
|
+
feedback: feedback
|
|
272
347
|
}));
|
|
273
348
|
}
|
|
274
349
|
}]);
|
|
@@ -298,6 +373,9 @@ var styles = function styles(theme) {
|
|
|
298
373
|
padding: '5px',
|
|
299
374
|
paddingBottom: '15px'
|
|
300
375
|
},
|
|
376
|
+
note: {
|
|
377
|
+
padding: '5px'
|
|
378
|
+
},
|
|
301
379
|
collapsible: {
|
|
302
380
|
paddingTop: theme.spacing.unit * 2,
|
|
303
381
|
paddingBottom: theme.spacing.unit * 2,
|