@arquimedes.co/eureka-forms 1.9.37-test → 1.9.39-test

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.
Files changed (4) hide show
  1. package/dist/App.js +6 -0
  2. package/dist/FormComponents/Form/ColumnForm/ColumnForm.js +24 -10
  3. package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/MaterialMapperStep.js +9 -7
  4. package/package.json +1 -1
package/dist/App.js CHANGED
@@ -378,6 +378,12 @@ var mapOriginalValues = function (originalValues, form) {
378
378
  }
379
379
  }
380
380
  }
381
+ for (var _e = 0, _f = Object.keys(element); _e < _f.length; _e++) {
382
+ var idValue_1 = _f[_e];
383
+ if (!step.steps[idValue_1]) {
384
+ newValues[idValue_1] = element[idValue_1];
385
+ }
386
+ }
381
387
  mappedElements.push(mappedElement);
382
388
  }
383
389
  newValues[step.id] = mappedElements;
package/dist/FormComponents/Form/ColumnForm/ColumnForm.js CHANGED
@@ -267,8 +267,7 @@ var calcValue = function (step, values, customSteps, value) {
267
267
  var mappedId = element.ids[idStep];
268
268
  if (values[mappedId] !== undefined) {
269
269
  var substep = step.steps[idStep];
270
- var test_1 = calcValue(substep, values, customSteps, values[mappedId]);
271
- newValue[idStep] = test_1;
270
+ newValue[idStep] = calcValue(substep, values, customSteps, values[mappedId]);
272
271
  }
273
272
  }
274
273
  mappedValues.push(newValue);
@@ -302,13 +301,14 @@ function stringToDraft(text) {
302
301
  return draftStructure;
303
302
  }
304
303
  function calcDependencies(steps, originalValues, allSteps, dependencies) {
304
+ var _a;
305
305
  if (allSteps === void 0) { allSteps = steps; }
306
306
  if (dependencies === void 0) { dependencies = {}; }
307
- for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
308
- var step = _a[_i];
307
+ for (var _i = 0, _b = Object.values(steps); _i < _b.length; _i++) {
308
+ var step = _b[_i];
309
309
  if (step.dependencies) {
310
- for (var _b = 0, _c = step.dependencies; _b < _c.length; _b++) {
311
- var idDep = _c[_b];
310
+ for (var _c = 0, _d = step.dependencies; _c < _d.length; _c++) {
311
+ var idDep = _d[_c];
312
312
  var depStep = allSteps[idDep];
313
313
  if (depStep && dependencies[idDep] === undefined) {
314
314
  dependencies[idDep] = calcStepDependencyValue(depStep, originalValues);
@@ -316,23 +316,37 @@ function calcDependencies(steps, originalValues, allSteps, dependencies) {
316
316
  }
317
317
  }
318
318
  if (step.type === Types.MAPPER) {
319
- calcDependencies(step.steps, originalValues, __assign(__assign({}, allSteps), step.steps), dependencies);
319
+ var newSteps = {};
320
+ var elements = originalValues[step.id];
321
+ var _loop_1 = function (element) {
322
+ for (var _f = 0, _g = Object.keys(step.steps); _f < _g.length; _f++) {
323
+ var idSubStep = _g[_f];
324
+ var subStep = step.steps[idSubStep];
325
+ var mappedId = element.ids[idSubStep];
326
+ newSteps[mappedId] = __assign(__assign({}, subStep), { id: mappedId, dependencies: (_a = subStep.dependencies) === null || _a === void 0 ? void 0 : _a.map(function (dep) { var _a; return (_a = element.ids[dep]) !== null && _a !== void 0 ? _a : dep; }) });
327
+ }
328
+ };
329
+ for (var _e = 0, elements_2 = elements; _e < elements_2.length; _e++) {
330
+ var element = elements_2[_e];
331
+ _loop_1(element);
332
+ }
333
+ calcDependencies(newSteps, originalValues, __assign(__assign({}, allSteps), newSteps), dependencies);
320
334
  }
321
335
  }
322
336
  return dependencies;
323
337
  }
324
338
  export function calcStepDependencyValue(depStep, originalValues) {
325
- var _a;
339
+ var _a, _b;
326
340
  switch (depStep.type) {
327
341
  case Types.TEXTAREA: {
328
342
  if (depStep.hasTextEditor) {
329
343
  return null;
330
344
  }
331
345
  else {
332
- return originalValues[depStep.id].value;
346
+ return (_a = originalValues[depStep.id]) === null || _a === void 0 ? void 0 : _a.value;
333
347
  }
334
348
  }
335
349
  default:
336
- return (_a = originalValues[depStep.id]) !== null && _a !== void 0 ? _a : null;
350
+ return (_b = originalValues[depStep.id]) !== null && _b !== void 0 ? _b : null;
337
351
  }
338
352
  }
package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/MaterialMapperStep.js CHANGED
@@ -49,6 +49,7 @@ function Elements(_a) {
49
49
  setFirstRender(true);
50
50
  }, []);
51
51
  useEffect(function () {
52
+ var _a;
52
53
  if (firstRender) {
53
54
  if (elements.length > 0) {
54
55
  var newSteps = {};
@@ -56,15 +57,15 @@ function Elements(_a) {
56
57
  for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
57
58
  var element = elements_1[_i];
58
59
  var elemSteps = {};
59
- for (var _a = 0, _b = Object.keys(step.steps); _a < _b.length; _a++) {
60
- var idStep = _b[_a];
61
- var baseStep = JSON.parse(JSON.stringify(form.steps[idStep]));
60
+ for (var _b = 0, _c = Object.keys(step.steps); _b < _c.length; _b++) {
61
+ var idStep = _c[_b];
62
+ var baseStep = JSON.parse(JSON.stringify((_a = step.steps[idStep]) !== null && _a !== void 0 ? _a : '{}'));
62
63
  var newIdStep = element.ids[idStep];
63
64
  baseStep.id = newIdStep;
64
65
  elemSteps[newIdStep] = baseStep;
65
66
  newSteps[newIdStep] = baseStep;
66
67
  }
67
- calcRecursiveData(element, elemSteps, deps);
68
+ calcRecursiveData(element, elemSteps, deps, others.originalValues);
68
69
  }
69
70
  setDependencyStore(deps);
70
71
  setLocalSteps(__assign(__assign({}, localSteps), newSteps));
@@ -131,7 +132,8 @@ function MapperStep(props) {
131
132
  } }));
132
133
  }
133
134
  export default MapperStep;
134
- function calcRecursiveData(element, newSteps, deps) {
135
+ function calcRecursiveData(element, newSteps, deps, originalValues) {
136
+ if (originalValues === void 0) { originalValues = {}; }
135
137
  for (var _i = 0, _a = Object.keys(newSteps); _i < _a.length; _i++) {
136
138
  var idStep = _a[_i];
137
139
  var step = newSteps[idStep];
@@ -141,7 +143,7 @@ function calcRecursiveData(element, newSteps, deps) {
141
143
  var newId = element.ids[idDep];
142
144
  if (newId) {
143
145
  step.dependencies[i] = newId;
144
- deps[newId] = calcStepDependencyValue(newSteps[newId], {});
146
+ deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
145
147
  }
146
148
  }
147
149
  }
@@ -191,7 +193,7 @@ function calcRecursiveData(element, newSteps, deps) {
191
193
  var newId = element.ids[filter.idStep];
192
194
  if (newId) {
193
195
  filter.idStep = newId;
194
- deps[newId] = calcStepDependencyValue(newSteps[newId], {});
196
+ deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
195
197
  }
196
198
  }
197
199
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@arquimedes.co/eureka-forms",
3
3
  "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
4
- "version":"1.9.37-test",
4
+ "version":"1.9.39-test",
5
5
  "scripts": {
6
6
  "start": "react-scripts start",
7
7
  "build": "react-scripts build",