@arquimedes.co/eureka-forms 1.9.32-test → 1.9.33-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.
@@ -275,13 +275,13 @@ export var mapOriginalValues = function (originalValues, form) {
275
275
  return newValues;
276
276
  };
277
277
  var calcValue = function (step, values, customSteps, value) {
278
- var _a, _b;
279
- if (value === void 0) { value = values[step.id]; }
278
+ var _a, _b, _c;
279
+ if (value === void 0) { value = values[(_a = step === null || step === void 0 ? void 0 : step.id) !== null && _a !== void 0 ? _a : '']; }
280
280
  if (!step)
281
281
  return;
282
282
  var custom = customSteps[step === null || step === void 0 ? void 0 : step.type];
283
283
  if (custom !== undefined) {
284
- return (_b = (_a = custom.calcValue) === null || _a === void 0 ? void 0 : _a.call(custom, step, value)) !== null && _b !== void 0 ? _b : value;
284
+ return (_c = (_b = custom.calcValue) === null || _b === void 0 ? void 0 : _b.call(custom, step, value)) !== null && _c !== void 0 ? _c : value;
285
285
  }
286
286
  else {
287
287
  switch (step === null || step === void 0 ? void 0 : step.type) {
@@ -316,10 +316,10 @@ var calcValue = function (step, values, customSteps, value) {
316
316
  for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
317
317
  var element = elements_1[_i];
318
318
  var newValue = {};
319
- for (var _c = 0, _d = Object.keys(element.ids); _c < _d.length; _c++) {
320
- var idStep = _d[_c];
319
+ for (var _d = 0, _e = Object.keys(step.steps); _d < _e.length; _d++) {
320
+ var idStep = _e[_d];
321
321
  var mappedId = element.ids[idStep];
322
- if (values[mappedId]) {
322
+ if (values[mappedId] !== undefined) {
323
323
  newValue[idStep] = calcValue(step.steps[idStep], values, customSteps, values[mappedId]);
324
324
  }
325
325
  }
@@ -30,7 +30,9 @@ function MapperElementComponent(_a) {
30
30
  return _jsx("div", {});
31
31
  }
32
32
  return (_jsx(PillElementContainer, __assign({ handleDelete: handleDelete }, others, { step: step, size: form.size }, { children: step.rootSteps.map(function (idSubStep, index) {
33
- var subStep = form.steps[idSubStep];
33
+ var subStep = form.steps[element.ids[idSubStep]];
34
+ if (!subStep)
35
+ return _jsx("div", {});
34
36
  return (_createElement(StepComponent, __assign({}, others, { form: form, step: subStep, key: index, level: level + 1 })));
35
37
  }) })));
36
38
  }
@@ -10,7 +10,7 @@ var __assign = (this && this.__assign) || function () {
10
10
  return __assign.apply(this, arguments);
11
11
  };
12
12
  import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
13
- import styles from './PillElementContainer.modules.css';
13
+ import styles from './PillElementContainer.module.css';
14
14
  import DeleteRoundedIcon from '@material-ui/icons/DeleteRounded';
15
15
  function PillElementContainer(_a) {
16
16
  var step = _a.step, size = _a.size, index = _a.index, children = _a.children, editable = _a.editable, postview = _a.postview, formStyle = _a.formStyle, handleDelete = _a.handleDelete, widthStats = _a.widthStats;
@@ -42,7 +42,9 @@ function Elements(_a) {
42
42
  var step = _a.step, form = _a.form, btnRef = _a.btnRef, editable = _a.editable, postview = _a.postview, onChange = _a.onChange, elements = _a.elements, formStyle = _a.formStyle, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "btnRef", "editable", "postview", "onChange", "elements", "formStyle", "dependencyStore", "setDependencyStore"]);
43
43
  var _b = useState(false), firstRender = _b[0], setFirstRender = _b[1];
44
44
  /** Mapper Steps to pass down */
45
- var _c = useState((function () {
45
+ var _c = useState(), localSteps = _c[0], setLocalSteps = _c[1];
46
+ useEffect(function () {
47
+ setFirstRender(true);
46
48
  var steps = {};
47
49
  var deps = __assign({}, dependencyStore);
48
50
  for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
@@ -50,7 +52,7 @@ function Elements(_a) {
50
52
  var newSteps = {};
51
53
  for (var _a = 0, _b = Object.keys(step.steps); _a < _b.length; _a++) {
52
54
  var idStep = _b[_a];
53
- var baseStep = form.steps[idStep];
55
+ var baseStep = step.steps[idStep];
54
56
  var newIdStep = element.ids[idStep];
55
57
  newSteps[newIdStep] = __assign(__assign({}, baseStep), { id: newIdStep });
56
58
  steps[newIdStep] = newSteps[newIdStep];
@@ -58,10 +60,7 @@ function Elements(_a) {
58
60
  calcRecursiveData(element, newSteps, deps);
59
61
  }
60
62
  setDependencyStore(deps);
61
- return steps;
62
- })()), localSteps = _c[0], setLocalSteps = _c[1];
63
- useEffect(function () {
64
- setFirstRender(true);
63
+ setLocalSteps(steps);
65
64
  }, []);
66
65
  useEffect(function () {
67
66
  if (firstRender && elements.length === 0 && !postview && editable) {
@@ -76,10 +75,11 @@ function Elements(_a) {
76
75
  var newSteps = {};
77
76
  for (var _i = 0, _a = Object.keys(step.steps); _i < _a.length; _i++) {
78
77
  var idStep = _a[_i];
79
- var baseStep = form.steps[idStep];
78
+ var baseStep = JSON.parse(JSON.stringify(form.steps[idStep]));
80
79
  var newIdStep = step.id + '-' + idStep + '-' + idElement;
80
+ baseStep.id = newIdStep;
81
81
  newElement.ids[idStep] = newIdStep;
82
- newSteps[newIdStep] = __assign(__assign({}, baseStep), { id: newIdStep });
82
+ newSteps[newIdStep] = baseStep;
83
83
  }
84
84
  var deps = __assign({}, dependencyStore);
85
85
  calcRecursiveData(newElement, newSteps, deps);
@@ -97,11 +97,13 @@ function Elements(_a) {
97
97
  }
98
98
  };
99
99
  var container = calcStyles().container;
100
+ if (!localSteps)
101
+ return _jsx("div", {});
100
102
  return (_jsxs("div", __assign({ className: container, style: { color: formStyle.textColor } }, { children: [_jsx("div", __assign({ className: styles.titleLbl }, { children: step.label })), step.description && (_jsx("p", __assign({ className: styles.descriptionPar, style: {
101
103
  margin: step.description
102
104
  ? '10px 0px'
103
105
  : '0px 0px 5px 0px',
104
- } }, { children: step.description }))), elements.map(function (incident, index) { return (_jsx(MapperElementComponent, __assign({ index: index, element: incident, formStyle: formStyle, step: step, form: __assign(__assign({}, form), { steps: step.steps }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
106
+ } }, { children: step.description }))), elements.map(function (incident, index) { return (_jsx(MapperElementComponent, __assign({ index: index, element: incident, formStyle: formStyle, step: step, form: __assign(__assign({}, form), { steps: localSteps }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
105
107
  var tempElements = __spreadArray([], elements, true);
106
108
  tempElements[index].deleted = true;
107
109
  onChange(tempElements);
@@ -11,3 +11,32 @@
11
11
  flex-direction: column;
12
12
  padding: 5px 0px;
13
13
  }
14
+
15
+ .hiddenInput {
16
+ height: 0;
17
+ width: 0;
18
+ padding: 0;
19
+ border-width: 0;
20
+ }
21
+
22
+ .titleLbl {
23
+ font-size: 24px;
24
+ font-weight: 600;
25
+ white-space: nowrap;
26
+ overflow: hidden;
27
+ text-overflow: ellipsis;
28
+ cursor: default;
29
+ }
30
+
31
+ .descriptionPar {
32
+ font-size: 16px;
33
+ white-space: pre-wrap;
34
+ cursor: default;
35
+ }
36
+
37
+ .btnContainer {
38
+ margin-top: 15px;
39
+ margin-left: 15px;
40
+ margin-bottom: 3px;
41
+ width: fit-content;
42
+ }
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.32-test",
4
+ "version":"1.9.33-test",
5
5
  "scripts": {
6
6
  "start": "react-scripts start",
7
7
  "build": "react-scripts build",