@pie-element/placement-ordering 8.11.2 → 8.11.3-next.12
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/lib/index.js +90 -24
- package/lib/index.js.map +1 -1
- package/lib/placement-ordering.js +7 -89
- package/lib/placement-ordering.js.map +1 -1
- package/package.json +3 -2
package/lib/index.js
CHANGED
|
@@ -5,7 +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
|
+
exports.isValidSession = exports["default"] = void 0;
|
|
9
9
|
Object.defineProperty(exports, "swap", {
|
|
10
10
|
enumerable: true,
|
|
11
11
|
get: function get() {
|
|
@@ -33,7 +33,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
33
33
|
|
|
34
34
|
var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
|
|
35
35
|
|
|
36
|
-
var
|
|
36
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
37
37
|
|
|
38
38
|
var _react = _interopRequireDefault(require("react"));
|
|
39
39
|
|
|
@@ -41,20 +41,41 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
|
41
41
|
|
|
42
42
|
var _compact = _interopRequireDefault(require("lodash/compact"));
|
|
43
43
|
|
|
44
|
+
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
45
|
+
|
|
46
|
+
var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
|
|
47
|
+
|
|
44
48
|
var _debug = _interopRequireDefault(require("debug"));
|
|
45
49
|
|
|
46
50
|
var _mathRendering = require("@pie-lib/math-rendering");
|
|
47
51
|
|
|
48
|
-
var _ordering = require("./ordering");
|
|
49
|
-
|
|
50
52
|
var _drag = require("@pie-lib/drag");
|
|
51
53
|
|
|
54
|
+
var _piePlayerEvents = require("@pie-framework/pie-player-events");
|
|
55
|
+
|
|
56
|
+
var _main = _interopRequireDefault(require("./main"));
|
|
57
|
+
|
|
58
|
+
var _ordering = require("./ordering");
|
|
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; } }
|
|
55
63
|
|
|
56
64
|
var log = (0, _debug["default"])('pie-elements:placement-ordering');
|
|
57
65
|
|
|
66
|
+
var isValidSession = function isValidSession(_ref) {
|
|
67
|
+
var model = _ref.model,
|
|
68
|
+
session = _ref.session;
|
|
69
|
+
var config = model.config;
|
|
70
|
+
var compactSessionValues = session && (0, _compact["default"])(session.value) || [];
|
|
71
|
+
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)
|
|
72
|
+
// but if it does not include targets, it's a must to have all choices selected
|
|
73
|
+
|
|
74
|
+
return config.includeTargets || completeSession;
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
exports.isValidSession = isValidSession;
|
|
78
|
+
|
|
58
79
|
var Ordering = /*#__PURE__*/function (_HTMLElement) {
|
|
59
80
|
(0, _inherits2["default"])(Ordering, _HTMLElement);
|
|
60
81
|
|
|
@@ -65,31 +86,55 @@ var Ordering = /*#__PURE__*/function (_HTMLElement) {
|
|
|
65
86
|
|
|
66
87
|
(0, _classCallCheck2["default"])(this, Ordering);
|
|
67
88
|
_this = _super.call(this);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
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
|
+
}
|
|
71
109
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
value: function render() {
|
|
75
|
-
var _this2 = this;
|
|
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);
|
|
76
112
|
|
|
77
|
-
if (
|
|
78
|
-
|
|
79
|
-
|
|
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
|
+
}
|
|
80
117
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
});
|
|
118
|
+
var isValidSess = isValidSession({
|
|
119
|
+
model: newModel,
|
|
120
|
+
session: session
|
|
121
|
+
}); // if the session is not valid anymore, it has to be reset
|
|
86
122
|
|
|
87
|
-
|
|
88
|
-
|
|
123
|
+
if (!(newConfig !== null && newConfig !== void 0 && newConfig.includeTargets) && (choicesChanged || !isValidSess)) {
|
|
124
|
+
session.value = newModel.choices.map(function (m) {
|
|
125
|
+
return m.id;
|
|
89
126
|
});
|
|
90
127
|
}
|
|
91
|
-
|
|
92
|
-
|
|
128
|
+
|
|
129
|
+
if (!(0, _isEqual["default"])(session, _this._session)) {
|
|
130
|
+
_this.sessionChange(session);
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
_this.sessionChange = _this.sessionChange.bind((0, _assertThisInitialized2["default"])(_this));
|
|
134
|
+
return _this;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
(0, _createClass2["default"])(Ordering, [{
|
|
93
138
|
key: "sessionChange",
|
|
94
139
|
value: function sessionChange(session) {
|
|
95
140
|
this._session.value = session.value;
|
|
@@ -98,13 +143,14 @@ var Ordering = /*#__PURE__*/function (_HTMLElement) {
|
|
|
98
143
|
bubbles: true,
|
|
99
144
|
detail: {
|
|
100
145
|
component: this.tagName.toLowerCase(),
|
|
101
|
-
complete: this._session && this._session.value &&
|
|
146
|
+
complete: this._session && this._session.value && this.isComplete()
|
|
102
147
|
}
|
|
103
148
|
}));
|
|
104
149
|
}
|
|
105
150
|
}, {
|
|
106
151
|
key: "model",
|
|
107
152
|
set: function set(newModel) {
|
|
153
|
+
this.verifyIfSessionUpdatesAreNeeded(newModel);
|
|
108
154
|
this._model = newModel;
|
|
109
155
|
this.render();
|
|
110
156
|
this.dispatchEvent(new CustomEvent('model-set', {
|
|
@@ -123,6 +169,26 @@ var Ordering = /*#__PURE__*/function (_HTMLElement) {
|
|
|
123
169
|
this._session = newSession;
|
|
124
170
|
this.render();
|
|
125
171
|
}
|
|
172
|
+
}, {
|
|
173
|
+
key: "render",
|
|
174
|
+
value: function render() {
|
|
175
|
+
var _this2 = this;
|
|
176
|
+
|
|
177
|
+
if (this._model && this._session) {
|
|
178
|
+
log('[render] session: ', this._session.value);
|
|
179
|
+
log('[render] model: ', this._model);
|
|
180
|
+
|
|
181
|
+
var element = /*#__PURE__*/_react["default"].createElement(_main["default"], {
|
|
182
|
+
model: this._model,
|
|
183
|
+
session: this._session,
|
|
184
|
+
onSessionChange: this.sessionChange
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
_reactDom["default"].render(element, this, function () {
|
|
188
|
+
(0, _mathRendering.renderMath)(_this2);
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
}
|
|
126
192
|
}]);
|
|
127
193
|
return Ordering;
|
|
128
194
|
}( /*#__PURE__*/(0, _wrapNativeSuper2["default"])(HTMLElement));
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["log","
|
|
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 React from 'react';\nimport ReactDOM from 'react-dom';\nimport compact from 'lodash/compact';\nimport isEqual from 'lodash/isEqual';\nimport cloneDeep from 'lodash/cloneDeep';\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 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"}
|
|
@@ -37,10 +37,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
37
37
|
|
|
38
38
|
var _react = _interopRequireDefault(require("react"));
|
|
39
39
|
|
|
40
|
-
var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
|
|
41
|
-
|
|
42
|
-
var _compact = _interopRequireDefault(require("lodash/compact"));
|
|
43
|
-
|
|
44
40
|
var _debug = _interopRequireDefault(require("debug"));
|
|
45
41
|
|
|
46
42
|
var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
|
|
@@ -51,8 +47,6 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
|
51
47
|
|
|
52
48
|
var _mathRendering = require("@pie-lib/math-rendering");
|
|
53
49
|
|
|
54
|
-
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
55
|
-
|
|
56
50
|
var _excluded = ["tiler", "ordering", "onDropChoice", "onRemoveChoice"];
|
|
57
51
|
|
|
58
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); }; }
|
|
@@ -95,16 +89,6 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
95
89
|
|
|
96
90
|
(0, _classCallCheck2["default"])(this, PlacementOrdering);
|
|
97
91
|
_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
|
-
});
|
|
108
92
|
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDropChoice", function (target, source, ordering) {
|
|
109
93
|
var _this$props = _this.props,
|
|
110
94
|
onSessionChange = _this$props.onSessionChange,
|
|
@@ -176,26 +160,6 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
176
160
|
}
|
|
177
161
|
|
|
178
162
|
(0, _createClass2["default"])(PlacementOrdering, [{
|
|
179
|
-
key: "componentDidMount",
|
|
180
|
-
value: function componentDidMount() {
|
|
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
163
|
key: "componentDidUpdate",
|
|
200
164
|
value: function componentDidUpdate() {
|
|
201
165
|
//eslint-disable-next-line
|
|
@@ -206,69 +170,23 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
206
170
|
}, {
|
|
207
171
|
key: "UNSAFE_componentWillReceiveProps",
|
|
208
172
|
value: function UNSAFE_componentWillReceiveProps(nextProps) {
|
|
209
|
-
var _this$props5, _this$props$session;
|
|
210
|
-
|
|
211
173
|
var newState = {};
|
|
212
174
|
|
|
213
175
|
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;
|
|
176
|
+
correctResponse = _nextProps$model.correctResponse;
|
|
221
177
|
|
|
222
178
|
if (!correctResponse) {
|
|
223
179
|
newState.showingCorrect = false;
|
|
224
180
|
}
|
|
225
181
|
|
|
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);
|
|
240
|
-
}
|
|
241
|
-
|
|
242
182
|
this.setState(newState);
|
|
243
183
|
}
|
|
244
|
-
}, {
|
|
245
|
-
key: "initSessionIfNeeded",
|
|
246
|
-
value: function initSessionIfNeeded(props) {
|
|
247
|
-
var model = props.model,
|
|
248
|
-
session = props.session,
|
|
249
|
-
onSessionChange = props.onSessionChange;
|
|
250
|
-
var newConfig = model.config;
|
|
251
|
-
var update = (0, _cloneDeep["default"])(session);
|
|
252
|
-
update.value = model.choices.map(function (m) {
|
|
253
|
-
return m.id;
|
|
254
|
-
});
|
|
255
|
-
|
|
256
|
-
if (newConfig.includeTargets) {
|
|
257
|
-
delete update.value;
|
|
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
|
-
});
|
|
265
|
-
}
|
|
266
184
|
}, {
|
|
267
185
|
key: "render",
|
|
268
186
|
value: function render() {
|
|
269
|
-
var _this$
|
|
270
|
-
classes = _this$
|
|
271
|
-
model = _this$
|
|
187
|
+
var _this$props4 = this.props,
|
|
188
|
+
classes = _this$props4.classes,
|
|
189
|
+
model = _this$props4.model;
|
|
272
190
|
var correctResponse = model.correctResponse,
|
|
273
191
|
correctness = model.correctness,
|
|
274
192
|
prompt = model.prompt,
|
|
@@ -291,9 +209,9 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
291
209
|
var vertical = orientation === 'vertical';
|
|
292
210
|
var ordering = this.createOrdering();
|
|
293
211
|
|
|
294
|
-
var
|
|
295
|
-
mode =
|
|
296
|
-
role =
|
|
212
|
+
var _ref = env || {},
|
|
213
|
+
mode = _ref.mode,
|
|
214
|
+
role = _ref.role;
|
|
297
215
|
|
|
298
216
|
var Tiler = vertical ? _tiler.VerticalTiler : _tiler.HorizontalTiler;
|
|
299
217
|
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","model","session","config","compactSessionValues","value","completeSession","length","choices","includeTargets","target","source","onSessionChange","from","find","id","type","to","update","sessionUpdate","Object","assign","response","showingCorrect","state","orientation","correctResponse","map","outcome","allowSameChoiceInTargets","outcomes","instanceId","toggleCorrect","setState","isValidSession","defaultSessionValue","initSessionIfNeeded","domNode","ReactDOM","findDOMNode","nextProps","newState","oldConfig","oldChoices","includeTargetsChanged","choicesChanged","isDefaultSession","newConfig","m","classes","correctness","prompt","rationale","feedback","configs","note","showNote","env","disabled","teacherInstructions","showToggle","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 cloneDeep from 'lodash/cloneDeep';\nimport compact from 'lodash/compact';\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';\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 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\n componentDidMount() {\n const { model, session } = this.props;\n\n if (!this.isValidSession({ model, session })) {\n this.setState(\n {\n defaultSessionValue: cloneDeep(session?.value),\n },\n () => this.initSessionIfNeeded(this.props),\n );\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, config, choices } = nextProps?.model;\n const { config: oldConfig, choices: oldChoices } = this.props?.model || {};\n\n if (!correctResponse) {\n newState.showingCorrect = false;\n }\n\n const includeTargetsChanged = config.includeTargets !== oldConfig.includeTargets;\n const choicesChanged = !isEqual(oldChoices, choices);\n const isDefaultSession = isEqual(this.state.defaultSessionValue, this.props.session?.value);\n const isValidSession = this.isValidSession({ model: nextProps.model, session: nextProps.session });\n\n // if the session is not valid anymore, it has to be reset\n // OR\n // if the session is the default one (set if the initial session was not valid or empty)\n // and targets or choices changed, then we can reset the session\n // but if the session is not the default one (it was set by the student), then we do not reset it\n if (!isValidSession || (isDefaultSession && (includeTargetsChanged || choicesChanged))) {\n this.initSessionIfNeeded(nextProps);\n }\n\n this.setState(newState);\n }\n\n initSessionIfNeeded(props) {\n const { model, session, onSessionChange } = props;\n const { config: newConfig } = model;\n\n const update = cloneDeep(session);\n\n update.value = model.choices.map((m) => m.id);\n\n if (newConfig.includeTargets) {\n delete update.value;\n }\n\n this.setState({ defaultSessionValue: cloneDeep(update?.value) }, () => onSessionChange(update));\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","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":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;AAEA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;AAEA,IAAMC,aAAa,GAAG,SAAhBA,aAAgB,CAACC,KAAD,EAAW;AAC/B,MAAeC,IAAf,GAA8ED,KAA9E,CAAQE,KAAR;AAAA,MAAqBC,QAArB,GAA8EH,KAA9E,CAAqBG,QAArB;AAAA,MAA+BC,aAA/B,GAA8EJ,KAA9E,CAA+BI,YAA/B;AAAA,MAA6CC,eAA7C,GAA8EL,KAA9E,CAA6CK,cAA7C;AAAA,MAAgEC,SAAhE,6CAA8EN,KAA9E;AAEA,sBACE,gCAAC,IAAD,gCACMM,SADN;AAEE,IAAA,KAAK,EAAEH,QAAQ,CAACI,KAFlB;AAGE,IAAA,YAAY,EAAE,sBAACC,CAAD,EAAIC,CAAJ;AAAA,aAAUL,aAAY,CAACI,CAAD,EAAIC,CAAJ,EAAON,QAAP,CAAtB;AAAA,KAHhB;AAIE,IAAA,cAAc,EAAE,wBAACK,CAAD;AAAA,aAAOH,eAAc,CAACG,CAAD,EAAIL,QAAJ,CAArB;AAAA;AAJlB,KADF;AAQD,CAXD;;AAaAJ,aAAa,CAACW,SAAd,GAA0B;AACxBR,EAAAA,KAAK,EAAES,sBAAUC,IADO;AAExBT,EAAAA,QAAQ,EAAEQ,sBAAUE,GAFI;AAGxBT,EAAAA,YAAY,EAAEO,sBAAUC,IAHA;AAIxBP,EAAAA,cAAc,EAAEM,sBAAUC;AAJF,CAA1B;;IAOaE,iB;;;;;AAQX,6BAAYd,KAAZ,EAAmB;AAAA;;AAAA;AACjB,8BAAMA,KAAN;AADiB,qGA+BJ,UAACe,MAAD,EAASC,MAAT,EAAiBb,QAAjB,EAA8B;AAC3C,wBAAqC,MAAKH,KAA1C;AAAA,UAAQiB,eAAR,eAAQA,eAAR;AAAA,UAAyBC,OAAzB,eAAyBA,OAAzB;AACA,UAAMC,IAAI,GAAGhB,QAAQ,CAACI,KAAT,CAAea,IAAf,CAAoB,UAACZ,CAAD;AAAA,eAAOA,CAAC,CAACa,EAAF,KAASL,MAAM,CAACK,EAAhB,IAAsBb,CAAC,CAACc,IAAF,KAAWN,MAAM,CAACM,IAA/C;AAAA,OAApB,CAAb;AACA,UAAMC,EAAE,GAAGR,MAAX;AACAjB,MAAAA,GAAG,CAAC,iBAAD,EAAoBqB,IAApB,EAA0BI,EAA1B,CAAH;AACA,UAAMC,MAAM,GAAG,uBAAQ;AAAEF,QAAAA,IAAI,EAAE,MAAR;AAAgBH,QAAAA,IAAI,EAAJA,IAAhB;AAAsBI,QAAAA,EAAE,EAAFA;AAAtB,OAAR,EAAoCpB,QAApC,CAAf;AACA,UAAMsB,aAAa,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBT,OAAlB,EAA2B;AAC/CU,QAAAA,KAAK,EAAEJ,MAAM,CAACK;AADiC,OAA3B,CAAtB;AAIAZ,MAAAA,eAAe,CAACQ,aAAD,CAAf;AACD,KA1CkB;AAAA,uGA4CF,UAACV,MAAD,EAASZ,QAAT,EAAsB;AACrC,yBAAqC,MAAKH,KAA1C;AAAA,UAAQiB,eAAR,gBAAQA,eAAR;AAAA,UAAyBC,OAAzB,gBAAyBA,OAAzB;AACApB,MAAAA,GAAG,CAAC,kBAAD,EAAqBiB,MAArB,CAAH;AACA,UAAMS,MAAM,GAAG,uBAAQ;AAAEF,QAAAA,IAAI,EAAE,QAAR;AAAkBP,QAAAA,MAAM,EAANA;AAAlB,OAAR,EAAoCZ,QAApC,CAAf;AACA,UAAMsB,aAAa,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBT,OAAlB,EAA2B;AAC/CU,QAAAA,KAAK,EAAEJ,MAAM,CAACK;AADiC,OAA3B,CAAtB;AAGAZ,MAAAA,eAAe,CAACQ,aAAD,CAAf;AACD,KApDkB;AAAA,uGAsDF,YAAM;AACrB,yBAA2B,MAAKzB,KAAhC;AAAA,UAAQ8B,KAAR,gBAAQA,KAAR;AAAA,UAAeZ,OAAf,gBAAeA,OAAf;AACA,UAAQa,cAAR,GAA2B,MAAKC,KAAhC,CAAQD,cAAR;AACA,UAAME,MAAM,GAAGH,KAAK,CAACG,MAAN,IAAgB;AAC7BC,QAAAA,WAAW,EAAE,UADgB;AAE7BC,QAAAA,cAAc,EAAE;AAFa,OAA/B;AAIA,UAAQA,cAAR,GAA2BF,MAA3B,CAAQE,cAAR;AAEA,aAAOJ,cAAc,GACjB,0BACED,KAAK,CAACM,OADR,EAEEN,KAAK,CAACO,eAFR,EAGEP,KAAK,CAACO,eAAN,CAAsBC,GAAtB,CAA0B,UAACjB,EAAD;AAAA,eAAS;AAAEA,UAAAA,EAAE,EAAFA,EAAF;AAAMkB,UAAAA,OAAO,EAAE;AAAf,SAAT;AAAA,OAA1B,CAHF,EAIE;AACEJ,QAAAA,cAAc,EAAdA,cADF;AAEEK,QAAAA,wBAAwB,EAAEV,KAAK,CAACG,MAAN,CAAaO;AAFzC,OAJF,CADiB,GAUjB,0BAAWV,KAAK,CAACM,OAAjB,EAA0BlB,OAAO,CAACU,KAAlC,EAAyCE,KAAK,CAACW,QAA/C,EAAyD;AACvDN,QAAAA,cAAc,EAAdA,cADuD;AAEvDK,QAAAA,wBAAwB,EAAEV,KAAK,CAACG,MAAN,CAAaO;AAFgB,OAAzD,CAVJ;AAcD,KA7EkB;AAEjB,UAAKR,KAAL,GAAa;AACXD,MAAAA,cAAc,EAAE;AADL,KAAb;AAIA,UAAKW,UAAL,GAAkB,2BAAlB;;AAEA,UAAKC,aAAL,GAAqB,UAACZ,cAAD,EAAoB;AACvC,YAAKa,QAAL,CAAc;AAAEb,QAAAA,cAAc,EAAdA;AAAF,OAAd;AACD,KAFD;;AARiB;AAWlB;;;;WAED,8BAAqB;AACnB;AACA,UAAMc,OAAO,GAAGC,qBAASC,WAAT,CAAqB,IAArB,CAAhB;;AAEA,qCAAWF,OAAX;AACD;;;WAED,0CAAiCG,SAAjC,EAA4C;AAC1C,UAAMC,QAAQ,GAAG,EAAjB;;AACA,6BAA4BD,SAA5B,aAA4BA,SAA5B,uBAA4BA,SAAS,CAAElB,KAAvC;AAAA,UAAQO,eAAR,oBAAQA,eAAR;;AAEA,UAAI,CAACA,eAAL,EAAsB;AACpBY,QAAAA,QAAQ,CAAClB,cAAT,GAA0B,KAA1B;AACD;;AAED,WAAKa,QAAL,CAAcK,QAAd;AACD;;;WAkDD,kBAAS;AACP,yBAA2B,KAAKjD,KAAhC;AAAA,UAAQkD,OAAR,gBAAQA,OAAR;AAAA,UAAiBpB,KAAjB,gBAAiBA,KAAjB;AACA,UACEO,eADF,GAYIP,KAZJ,CACEO,eADF;AAAA,UAEEc,WAFF,GAYIrB,KAZJ,CAEEqB,WAFF;AAAA,UAGEC,MAHF,GAYItB,KAZJ,CAGEsB,MAHF;AAAA,UAIEC,SAJF,GAYIvB,KAZJ,CAIEuB,SAJF;AAAA,UAKEC,QALF,GAYIxB,KAZJ,CAKEwB,QALF;AAAA,UAMUC,OANV,GAYIzB,KAZJ,CAMEG,MANF;AAAA,UAOEuB,IAPF,GAYI1B,KAZJ,CAOE0B,IAPF;AAAA,UAQEC,QARF,GAYI3B,KAZJ,CAQE2B,QARF;AAAA,UASEC,GATF,GAYI5B,KAZJ,CASE4B,GATF;AAAA,UAUEC,QAVF,GAYI7B,KAZJ,CAUE6B,QAVF;AAAA,UAWEC,mBAXF,GAYI9B,KAZJ,CAWE8B,mBAXF;AAaA,UAAMC,UAAU,GAAGxB,eAAe,IAAIA,eAAe,CAACyB,MAAhB,GAAyB,CAA/D;AACA,UAAQ/B,cAAR,GAA2B,KAAKC,KAAhC,CAAQD,cAAR;AACA,UAAME,MAAM,GAAGsB,OAAO,IAAI;AACxBrB,QAAAA,WAAW,EAAE,UADW;AAExBC,QAAAA,cAAc,EAAE;AAFQ,OAA1B;AAIA,UAAQD,WAAR,GAAwCD,MAAxC,CAAQC,WAAR;AAAA,UAAqBC,cAArB,GAAwCF,MAAxC,CAAqBE,cAArB;AACA,UAAM4B,QAAQ,GAAG7B,WAAW,KAAK,UAAjC;AACA,UAAM/B,QAAQ,GAAG,KAAK6D,cAAL,EAAjB;;AACA,iBAAuBN,GAAG,IAAI,EAA9B;AAAA,UAAQO,IAAR,QAAQA,IAAR;AAAA,UAAcC,IAAd,QAAcA,IAAd;;AAEA,UAAMC,KAAK,GAAGJ,QAAQ,GAAGK,oBAAH,GAAmBC,sBAAzC;AACA,UAAMC,WAAW,GAAG,CAACvC,cAAc,IAAKkC,IAAI,KAAK,MAAT,IAAmBC,IAAI,KAAK,YAAhD,KAAkET,QAAlE,IAA8ED,IAAlG;AAEA,0BACE;AAAK,QAAA,SAAS,EAAEN,OAAO,CAACqB;AAAxB,SACGX,mBAAmB,IAAI,uBAAQA,mBAAR,CAAvB,iBACC,gCAAC,qBAAD;AACE,QAAA,MAAM,EAAE;AAAEY,UAAAA,MAAM,EAAE,2BAAV;AAAuCC,UAAAA,OAAO,EAAE;AAAhD,SADV;AAEE,QAAA,SAAS,EAAEvB,OAAO,CAACwB;AAFrB,sBAIE,gCAAC,uBAAD;AAAe,QAAA,MAAM,EAAEd;AAAvB,QAJF,CAFJ,eAUE;AAAK,QAAA,SAAS,EAAEV,OAAO,CAACE;AAAxB,sBACE,gCAAC,uBAAD;AAAe,QAAA,MAAM,EAAEA;AAAvB,QADF,CAVF,eAcE,gCAAC,+BAAD;AACE,QAAA,SAAS,EAAEF,OAAO,CAACyB,MADrB;AAEE,QAAA,IAAI,EAAEd,UAFR;AAGE,QAAA,OAAO,EAAE9B,cAHX;AAIE,QAAA,QAAQ,EAAE,KAAKY;AAJjB,QAdF,eAqBE,gCAAC,aAAD;AACE,QAAA,UAAU,EAAE,KAAKD,UADnB;AAEE,QAAA,WAAW,EAAET,MAAM,CAAC2C,WAFtB;AAGE,QAAA,WAAW,EAAE3C,MAAM,CAAC4C,WAHtB;AAIE,QAAA,QAAQ,EAAE1E,QAJZ;AAKE,QAAA,KAAK,EAAEgE,KALT;AAME,QAAA,QAAQ,EAAER,QANZ;AAOE,QAAA,QAAQ,EAAE1B,MAAM,CAAC6C,YAPnB;AAQE,QAAA,QAAQ,EAAE7C,MAAM,CAAC8C,QARnB;AASE,QAAA,cAAc,EAAE5C,cATlB;AAUE,QAAA,kBAAkB,EAAEL,KAAK,CAACG,MAAN,IAAgBH,KAAK,CAACG,MAAN,CAAa+C,kBAVnD;AAWE,QAAA,YAAY,EAAE,KAAK5E,YAXrB;AAYE,QAAA,cAAc,EAAE,KAAKC;AAZvB,QArBF,EAoCGiE,WAAW,iBACV;AAAK,QAAA,SAAS,EAAEpB,OAAO,CAACM,IAAxB;AAA8B,QAAA,uBAAuB,EAAE;AAAEyB,UAAAA,MAAM,mCAA4BzB,IAA5B;AAAR;AAAvD,QArCJ,EAwCGH,SAAS,IAAI,uBAAQA,SAAR,CAAb,iBACC,gCAAC,qBAAD;AAAa,QAAA,MAAM,EAAE;AAAEmB,UAAAA,MAAM,EAAE,gBAAV;AAA4BC,UAAAA,OAAO,EAAE;AAArC,SAArB;AAA8E,QAAA,SAAS,EAAEvB,OAAO,CAACwB;AAAjG,sBACE,gCAAC,uBAAD;AAAe,QAAA,MAAM,EAAErB;AAAvB,QADF,CAzCJ,EA8CG,CAACtB,cAAD,iBAAmB,gCAAC,kBAAD;AAAU,QAAA,WAAW,EAAEoB,WAAvB;AAAoC,QAAA,QAAQ,EAAEG;AAA9C,QA9CtB,CADF;AAkDD;;;EAtKoC4B,kBAAMC,S;;;iCAAhCrE,iB,eACQ;AACjBG,EAAAA,eAAe,EAAEN,sBAAUC,IAAV,CAAewE,UADf;AAEjBtD,EAAAA,KAAK,EAAEnB,sBAAU0E,MAAV,CAAiBD,UAFP;AAGjBlE,EAAAA,OAAO,EAAEP,sBAAU2E,SAAV,CAAoB,CAAC3E,sBAAU4E,KAAV,CAAgBH,UAAjB,EAA6BzE,sBAAU0E,MAAV,CAAiBD,UAA9C,CAApB,CAHQ;AAIjBlC,EAAAA,OAAO,EAAEvC,sBAAU0E,MAAV,CAAiBD;AAJT,C;;AAwKrB,IAAMI,MAAM,GAAG,SAATA,MAAS,CAACC,KAAD;AAAA,SAAY;AACzBlB,IAAAA,iBAAiB,EAAE;AACjBmB,MAAAA,KAAK,EAAEA,gBAAMC,IAAN,EADU;AAEjBC,MAAAA,eAAe,EAAEF,gBAAMG,UAAN,EAFA;AAGjBC,MAAAA,OAAO,EAAE,MAHQ;AAIjBC,MAAAA,aAAa,EAAE,QAJE;AAKjBC,MAAAA,UAAU,EAAE,QALK;AAMjBC,MAAAA,SAAS,EAAE;AANM,KADM;AASzB7C,IAAAA,MAAM,EAAE;AACN8C,MAAAA,aAAa,EAAET,KAAK,CAACU,OAAN,CAAcC;AADvB,KATiB;AAYzBzB,IAAAA,MAAM,EAAE;AACNuB,MAAAA,aAAa,EAAET,KAAK,CAACU,OAAN,CAAcC;AADvB,KAZiB;AAezB5C,IAAAA,IAAI,EAAE;AACJ0C,MAAAA,aAAa,EAAET,KAAK,CAACU,OAAN,CAAcC,IAAd,GAAqB;AADhC,KAfmB;AAkBzB1B,IAAAA,WAAW,EAAE;AACX2B,MAAAA,YAAY,EAAEZ,KAAK,CAACU,OAAN,CAAcC,IAAd,GAAqB,CADxB;AAEXE,MAAAA,SAAS,EAAE;AAFA;AAlBY,GAAZ;AAAA,CAAf;;eAwBe,wBAAWd,MAAX,EAAmB1E,iBAAnB,C","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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pie-element/placement-ordering",
|
|
3
|
-
"version": "8.11.
|
|
3
|
+
"version": "8.11.3-next.12+52611f46c",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": "pie-framework/pie-elements",
|
|
6
6
|
"publishConfig": {
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@material-ui/core": "^3.9.2",
|
|
11
|
+
"@pie-framework/pie-player-events": "^0.1.0",
|
|
11
12
|
"@pie-lib/correct-answer-toggle": "^2.3.67",
|
|
12
13
|
"@pie-lib/drag": "^2.1.15",
|
|
13
14
|
"@pie-lib/math-rendering": "^2.5.13",
|
|
@@ -24,7 +25,7 @@
|
|
|
24
25
|
},
|
|
25
26
|
"author": "",
|
|
26
27
|
"license": "ISC",
|
|
27
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "52611f46c1ec29312ffa471d5970ddecc7be8803",
|
|
28
29
|
"scripts": {
|
|
29
30
|
"postpublish": "../../scripts/postpublish"
|
|
30
31
|
},
|