@arquimedes.co/eureka-forms 1.9.43 → 1.9.44

package/dist/App.js

@@ -69,6 +69,8 @@ import InternalFormStyle from './constants/InternalFormStyle';
 import { calcCbrForm } from './utils/CbrFunctions';
 import CBRStepTypes from './constants/CBRFormStepTypes';
 import { nanoid } from 'nanoid';
+import { EditorState, convertFromRaw } from 'draft-js';
+import { stringToDraft, getRawText, } from './FormComponents/Step/TextAreaStep/MaterialTextAreaStep/MaterialTextAreaStep';
 function App(_a) {
     var _this = this;
     var _b, _c, _d, _e;
@@ -374,7 +376,7 @@ var mapOriginalValues = function (originalValues, form) {
                         var newIdStep = step.id + '-' + idStep + '-' + idElement;
                         mappedElement.ids[idStep] = newIdStep;
                         if (element[idStep] !== undefined) {
-                            var value = mapOriginalValue(step.steps[idStep], element[idStep]);
+                            var value = mapOriginalValue(step.steps[idStep], element[idStep], form);
                             if (value !== undefined) {
                                 newValues[newIdStep] = value;
                             }
@@ -391,7 +393,7 @@ var mapOriginalValues = function (originalValues, form) {
                 newValues[step.id] = mappedElements;
             }
             else {
-                var value = mapOriginalValue(step, originalValues[step.id]);
+                var value = mapOriginalValue(step, originalValues[step.id], form);
                 if (value !== undefined) {
                     newValues[step.id] = value;
                 }
@@ -400,11 +402,12 @@ var mapOriginalValues = function (originalValues, form) {
     }
     return newValues;
 };
-var mapOriginalValue = function (step, value) {
+var mapOriginalValue = function (step, value, form) {
+    var _a;
     switch (step === null || step === void 0 ? void 0 : step.type) {
         case StepTypes.TEXTAREA: {
             if (step.hasTextEditor) {
-                return;
+                return calcDefaultDraftValue(value);
             }
             return value.value;
         }
@@ -414,7 +417,24 @@ var mapOriginalValue = function (step, value) {
                 return option;
             return value;
         }
+        case StepTypes.CLASSIFIER_SELECTOR: {
+            var classifier = form.classifiers[(_a = step.idClassifier) !== null && _a !== void 0 ? _a : ''];
+            if (classifier) {
+                var option = classifier.children.find(function (child) { return child._id == value; });
+                if (!(value === null || value === void 0 ? void 0 : value.value))
+                    return { value: value, label: option === null || option === void 0 ? void 0 : option.name };
+            }
+            break;
+        }
         default:
             return value;
     }
 };
+var calcDefaultDraftValue = function (defaultValue) {
+    if (typeof defaultValue === 'string') {
+        return EditorState.createWithContent(convertFromRaw(stringToDraft(defaultValue)));
+    }
+    else {
+        return EditorState.createWithContent(convertFromRaw(getRawText(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.draft, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.text)));
+    }
+};

package/dist/FormComponents/Step/TextAreaStep/MaterialTextAreaStep/MaterialTextAreaStep.d.ts

@@ -3,6 +3,10 @@ import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css';
 import './DraftEditor.css';
 import { RawDraftContentState } from 'draft-js';
 import { TextAreaStepProps } from '../TextAreaStep';
+export interface Payload {
+    text: string;
+    draft: any;
+}
 declare function TextAreaStep({ step, errors, partial, control, editable, postview, formStyle, maxLength, originalValues, backgroundColor, }: TextAreaStepProps): JSX.Element;
 export default TextAreaStep;
 export declare function stringToDraft(text: string): RawDraftContentState;

package/dist/FormComponents/Step/TextAreaStep/MaterialTextAreaStep/MaterialTextAreaStep.js

@@ -27,7 +27,7 @@ import { Controller } from 'react-hook-form';
 import { Editor } from 'react-draft-wysiwyg'; //Load programatically only if step has editor
 import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css';
 import './DraftEditor.css';
-import { convertFromRaw, EditorState } from 'draft-js';
+import { EditorState } from 'draft-js';
 import React, { useState } from 'react';
 import { ClickAwayListener } from '@material-ui/core';
 function TextAreaStep(_a) {
@@ -67,14 +67,6 @@ function TextAreaStep(_a) {
             return (_a = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.text) !== null && _a !== void 0 ? _a : '';
         }
     };
-    var calcDefaultDraftValue = function (defaultValue) {
-        if (typeof defaultValue === 'string') {
-            return EditorState.createWithContent(convertFromRaw(stringToDraft(defaultValue)));
-        }
-        else {
-            return EditorState.createWithContent(convertFromRaw(getRawText(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.draft, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.text)));
-        }
-    };
     var canEdit = editable && !postview;
     if (step.hasTextEditor) {
         return (_jsxs("div", __assign({ className: styles.textEditorContainer, style: {
@@ -103,9 +95,7 @@ function TextAreaStep(_a) {
                             if (canEdit) {
                                 setFocus(true);
                             }
-                        } }, { children: _jsx(Controller, { name: step.id, control: control, defaultValue: originalValues[step.id]
-                                ? calcDefaultDraftValue(originalValues[step.id])
-                                : EditorState.createEmpty(), rules: step.required
+                        } }, { children: _jsx(Controller, { name: step.id, control: control, defaultValue: EditorState.createEmpty(), rules: step.required
                                 ? {
                                     validate: function (editorState) {
                                         return editorState

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version": "1.9.43",
+    "version": "1.9.44",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",