@formio/js 5.1.0-dev.5969.9a6e3f5 → 5.1.0-dev.5972.67b2845

package/lib/mjs/components/form/Form.js

@@ -207,7 +207,7 @@ export default class FormComponent extends Component {
     /* eslint-enable max-statements */
     render() {
         if (this.builderMode) {
-            return super.render(this.component.label || 'Nested form');
+            return super.render(this.t(this.component.label || 'nestedForm'));
         }
         const subform = this.subForm ? this.subForm.render() : this.renderTemplate('loading');
         return super.render(subform);
@@ -220,13 +220,13 @@ export default class FormComponent extends Component {
      */
     getValueAsString(value, options) {
         if (!value) {
-            return 'No data provided';
+            return this.t('noDataProvided');
         }
         if (!value.data && value._id) {
             return value._id;
         }
         if (!value.data || !Object.keys(value.data).length) {
-            return 'No data provided';
+            return this.t('noDataProvided');
         }
         if (options?.email) {
             let result = (`
@@ -329,6 +329,9 @@ export default class FormComponent extends Component {
             && _.isNumber(this.formObj._vid)
             && this.formObj._vid !== this.subFormRevision;
     }
+    get subFormData() {
+        return this.dataValue?.data || {};
+    }
     destroy(all = false) {
         if (this.subForm) {
             this.subForm.destroy(all);
@@ -477,14 +480,14 @@ export default class FormComponent extends Component {
             return visible;
         }
         if (this.subForm) {
-            return this.subForm.checkConditions(data, flags, row);
+            return this.subForm.checkConditions(this.subFormData, flags);
         }
         // There are few cases when subForm is not loaded when a change is triggered,
         // so we need to perform checkConditions after it is ready, or some conditional fields might be hidden in View mode
         else if (this.subFormReady) {
             this.subFormReady.then(() => {
                 if (this.subForm) {
-                    return this.subForm.checkConditions(data, flags, row);
+                    return this.subForm.checkConditions(this.subFormData, flags);
                 }
             });
         }
@@ -492,7 +495,7 @@ export default class FormComponent extends Component {
     }
     calculateValue(data, flags, row) {
         if (this.subForm) {
-            return this.subForm.calculateValue(data, flags, row);
+            return this.subForm.calculateValue(this.subFormData, flags);
         }
         return super.calculateValue(data, flags, row);
     }
@@ -630,7 +633,7 @@ export default class FormComponent extends Component {
                 : {};
             this.subForm.setUrl(submissionUrl, { ...this.options, ...options });
             this.subForm.loadSubmission().catch((err) => {
-                console.error(`Unable to load subform submission ${submission._id}:`, err);
+                console.error(this.t('subformSubmissionLoadingError', { submissionId: submission._id }), err);
             });
         }
         else {

package/lib/mjs/components/number/Number.js

@@ -54,7 +54,7 @@ export default class NumberComponent extends Input {
         }
         else {
             if (this.component.thousandsSeparator || this.options.properties?.thousandsSeparator || this.options.thousandsSeparator) {
-                console.warn('In order for thousands separator to work properly, you must set the delimiter to true in the component json');
+                console.warn(this.t('noDelimiterSet'));
             }
             this.delimiter = '';
         }

package/lib/mjs/components/recaptcha/ReCaptcha.js

@@ -47,7 +47,7 @@ export default class ReCaptchaComponent extends Component {
                 this.recaptchaApiReady = Formio.requireLibrary('googleRecaptcha', 'grecaptcha', recaptchaApiScriptUrl, true);
             }
             else {
-                console.warn('There is no Site Key specified in settings in form JSON');
+                console.warn(this.t('noSiteKey'));
             }
         }
     }
@@ -60,7 +60,7 @@ export default class ReCaptchaComponent extends Component {
     async verify(actionName) {
         const siteKey = _get(this.root.form, 'settings.recaptcha.siteKey');
         if (!siteKey) {
-            console.warn('There is no Site Key specified in settings in form JSON');
+            console.warn(this.t('noSiteKey'));
             return;
         }
         if (!this.recaptchaApiReady) {

package/lib/mjs/components/select/Select.js

@@ -594,7 +594,7 @@ export default class SelectComponent extends ListComponent {
             component: this.component,
             message: err.toString(),
         });
-        console.warn(`Unable to load resources for ${this.key}`);
+        console.warn(this.t('loadResourcesError', { componentKey: this.key }));
     }
     /**
      * Get the request headers for this select dropdown.
@@ -728,7 +728,7 @@ export default class SelectComponent extends ListComponent {
             }
         }
         else if (this.component.dataSrc === 'url' || this.component.dataSrc === 'resource') {
-            this.addOption('', this.t('loading...'));
+            this.addOption('', `${this.t('loading')}...`);
         }
     }
     get active() {
@@ -779,9 +779,9 @@ export default class SelectComponent extends ListComponent {
             allowHTML: true,
             placeholder: !!this.component.placeholder,
             placeholderValue: placeholderValue,
-            noResultsText: this.t('No results found'),
-            noChoicesText: this.t('No choices to choose from'),
-            searchPlaceholderValue: this.t('Type to search'),
+            noResultsText: this.t('noResultsFound'),
+            noChoicesText: this.t('noChoices'),
+            searchPlaceholderValue: this.t('typeToSearch'),
             shouldSort: false,
             position: (this.component.dropdown || 'auto'),
             searchEnabled: useSearch,
@@ -1218,7 +1218,7 @@ export default class SelectComponent extends ListComponent {
             return normalize[dataType]().value;
         }
         catch (err) {
-            console.warn('Failed to normalize value', err);
+            console.warn(this.t('failedToNormalize'), err);
             return value;
         }
     }
@@ -1414,7 +1414,7 @@ export default class SelectComponent extends ListComponent {
                         return (JSON.stringify(normalizedOptionValue) === JSON.stringify(value));
                     }
                     catch (err) {
-                        console.warn.error('Error while comparing items', err);
+                        console.warn.error(this.t('failedToCompareItems'), err);
                         return false;
                     }
                 };

package/lib/mjs/components/selectboxes/SelectBoxes.js

@@ -250,14 +250,14 @@ export default class SelectBoxesComponent extends RadioComponent {
                     this.setInputsDisabled(false);
                 }
                 if (!isValid && maxCount && count > maxCount) {
-                    const message = this.t(this.component.maxSelectedCountMessage || 'You may only select up to {{maxCount}} items', { maxCount });
+                    const message = this.t(this.component.maxSelectedCountMessage || 'maxSelectItems', { maxCount });
                     this.errors.push({ message });
                     this.setCustomValidity(message, dirty);
                     return false;
                 }
                 else if (!isValid && minCount && count < minCount) {
                     this.setInputsDisabled(false);
-                    const message = this.t(this.component.minSelectedCountMessage || 'You must select at least {{minCount}} items', { minCount });
+                    const message = this.t(this.component.minSelectedCountMessage || 'minSelectItems', { minCount });
                     this.errors.push({ message });
                     this.setCustomValidity(message, dirty);
                     return false;

package/lib/mjs/components/signature/Signature.d.ts

@@ -24,7 +24,7 @@ export default class SignatureComponent extends Input {
     checkSize(force: any, scale: any): void;
     signaturePad: SignaturePad | null | undefined;
     observer: any;
-    getValueAsString(value: any): "" | "Yes" | "No";
+    getValueAsString(value: any): string;
     focus(): void;
     setDataToSigaturePad(): void;
 }

package/lib/mjs/components/signature/Signature.js

@@ -174,7 +174,7 @@ export default class SignatureComponent extends Input {
         return this.renderModalPreview({
             previewText: this.dataValue ?
                 `<img src=${this.dataValue} ${this._referenceAttributeName}='openModal' style="width: 100%;height: 100%;" />` :
-                this.t('Click to Sign')
+                this.t('clickToSign')
         });
     }
     attach(element) {
@@ -242,7 +242,7 @@ export default class SignatureComponent extends Input {
         if (_.isUndefined(value) && this.inDataTable) {
             return '';
         }
-        return value ? 'Yes' : 'No';
+        return this.t(value ? 'yes' : 'no');
     }
     focus() {
         this.refs.padBody.focus();

package/lib/mjs/components/survey/Survey.js

@@ -126,8 +126,8 @@ export default class SurveyComponent extends Field {
         <table border="1" style="width:100%">
           <thead>
             <tr>
-              <th>Question</th>
-              <th>Value</th>
+              <th>${this.t('surveyQuestion')}</th>
+              <th>${this.t('surveyQuestionValue')}</th>
             </tr>
           </thead>
           <tbody>

package/lib/mjs/components/textarea/TextArea.js

@@ -131,7 +131,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                 case 'quill':
                     // Normalize the configurations for quill.
                     if (settings.hasOwnProperty('toolbarGroups') || settings.hasOwnProperty('toolbar')) {
-                        console.warn('The WYSIWYG settings are configured for CKEditor. For this renderer, you will need to use configurations for the Quill Editor. See https://quilljs.com/docs/configuration for more information.');
+                        console.warn(this.t('needConfigurationForQuill'));
                         settings = this.wysiwygDefault.quill;
                     }
                     // Add the quill editor.
@@ -203,7 +203,7 @@ export default class TextAreaComponent extends TextFieldComponent {
     imageHandler(moduleInstance, range, files) {
         const quillInstance = moduleInstance.quill;
         if (!files || !files.length) {
-            console.warn('No files selected');
+            console.warn(this.t('noFilesSelected'));
             return;
         }
         quillInstance.enable(false);
@@ -228,7 +228,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                 alt: JSON.stringify(requestData),
             }), Quill.sources.USER);
         }).catch(error => {
-            console.warn('Quill image upload failed');
+            console.warn(this.t('quillImageUploadFailed'));
             console.warn(error);
             quillInstance.enable(true);
         });
@@ -523,7 +523,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                     }
                     this.element.scrollIntoView();
                 }).catch((err) => {
-                    console.warn('An editor did not initialize properly when trying to focus:', err);
+                    console.warn(this.t('editorFocusError'), err);
                 });
                 break;
             }
@@ -532,7 +532,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                     this.editors[0].focus();
                     this.element.scrollIntoView();
                 }).catch((err) => {
-                    console.warn('An editor did not initialize properly when trying to focus:', err);
+                    console.warn(this.t('editorFocusError'), err);
                 });
                 break;
             }
@@ -540,7 +540,7 @@ export default class TextAreaComponent extends TextFieldComponent {
                 this.editorsReady[0]?.then(() => {
                     this.editors[0].focus();
                 }).catch((err) => {
-                    console.warn('An editor did not initialize properly when trying to focus:', err);
+                    console.warn(this.t('editorFocusError'), err);
                 });
                 break;
             }

package/lib/mjs/components/textfield/TextField.js

@@ -86,6 +86,9 @@ export default class TextFieldComponent extends Input {
                 locale: this.component.widget.locale || this.options.language,
                 saveAs: 'text'
             };
+            // update originalComponent to include widget settings after component initialization 
+            // originalComponent is used to restore the component (and widget) after evaluating field logic 
+            this.originalComponent = FormioUtils.fastCloneDeep(this.component);
         }
     }
     attach(element) {

package/lib/mjs/formio.form.js

@@ -12,6 +12,7 @@ import { Evaluator } from './utils/Evaluator';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
+import { I18n } from './utils/i18n';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -84,6 +85,9 @@ export function registerModule(mod, defaultFn = null, options = {}) {
             case 'evaluator':
                 Formio.Evaluator.registerEvaluator(mod.evaluator);
                 break;
+            case 'translations':
+                I18n.setDefaultTranslations(mod.translations);
+                break;
             case 'library':
                 options.license
                     ? Formio.Licenses.addLicense(mod.library, options.license)

package/lib/mjs/translations/en.d.ts

@@ -1,82 +1,235 @@
-declare namespace _default {
-    let unsavedRowsError: string;
-    let invalidRowsError: string;
-    let invalidRowError: string;
-    let invalidOption: string;
-    let invalidDay: string;
-    let alertMessageWithLabel: string;
-    let alertMessage: string;
-    let complete: string;
-    let error: string;
-    let errorListHotkey: string;
-    let errorsListNavigationMessage: string;
-    let submitError: string;
-    let required: string;
-    let unique: string;
-    let array: string;
-    let array_nonempty: string;
-    let nonarray: string;
-    let select: string;
-    let pattern: string;
-    let minLength: string;
-    let maxLength: string;
-    let minWords: string;
-    let maxWords: string;
-    let min: string;
-    let max: string;
-    let maxDate: string;
-    let minDate: string;
-    let maxYear: string;
-    let minYear: string;
-    let minSelectedCount: string;
-    let maxSelectedCount: string;
-    let invalid_email: string;
-    let invalid_url: string;
-    let invalid_regex: string;
-    let invalid_date: string;
-    let invalid_day: string;
-    let invalidValueProperty: string;
-    let mask: string;
-    let valueIsNotAvailable: string;
-    let stripe: string;
-    let month: string;
-    let day: string;
-    let year: string;
-    let january: string;
-    let february: string;
-    let march: string;
-    let april: string;
-    let may: string;
-    let june: string;
-    let july: string;
-    let august: string;
-    let september: string;
-    let october: string;
-    let november: string;
-    let december: string;
-    let next: string;
-    let previous: string;
-    let cancel: string;
-    let submit: string;
-    let confirmCancel: string;
-    let saveDraftInstanceError: string;
-    let saveDraftAuthError: string;
-    let restoreDraftInstanceError: string;
-    let saveDraftError: string;
-    let restoreDraftError: string;
-    let time: string;
-    let cancelButtonAriaLabel: string;
-    let previousButtonAriaLabel: string;
-    let nextButtonAriaLabel: string;
-    let submitButtonAriaLabel: string;
-    let reCaptchaTokenValidationError: string;
-    let reCaptchaTokenNotSpecifiedError: string;
-    let apiKey: string;
-    let typeRemaining: string;
-    let typeCount: string;
-    let requiredDayField: string;
-    let requiredDayEmpty: string;
-    let requiredMonthField: string;
-    let requiredYearField: string;
-}
+declare const _default: {
+    unsavedRowsError: string;
+    invalidRowsError: string;
+    invalidRowError: string;
+    invalidOption: string;
+    invalidDay: string;
+    alertMessageWithLabel: string;
+    alertMessage: string;
+    complete: string;
+    error: string;
+    errorListHotkey: string;
+    errorsListNavigationMessage: string;
+    submitError: string;
+    required: string;
+    unique: string;
+    array: string;
+    array_nonempty: string;
+    nonarray: string;
+    select: string;
+    pattern: string;
+    minLength: string;
+    maxLength: string;
+    minWords: string;
+    maxWords: string;
+    min: string;
+    max: string;
+    maxDate: string;
+    minDate: string;
+    maxYear: string;
+    minYear: string;
+    minSelectedCount: string;
+    maxSelectedCount: string;
+    invalid_email: string;
+    invalid_url: string;
+    invalid_regex: string;
+    invalid_date: string;
+    invalid_day: string;
+    invalidValueProperty: string;
+    mask: string;
+    valueIsNotAvailable: string;
+    stripe: string;
+    month: string;
+    day: string;
+    year: string;
+    january: string;
+    february: string;
+    march: string;
+    april: string;
+    may: string;
+    june: string;
+    july: string;
+    august: string;
+    september: string;
+    october: string;
+    november: string;
+    december: string;
+    next: string;
+    previous: string;
+    cancel: string;
+    submit: string;
+    confirmCancel: string;
+    saveDraftInstanceError: string;
+    saveDraftAuthError: string;
+    restoreDraftInstanceError: string;
+    saveDraftError: string;
+    restoreDraftError: string;
+    time: string;
+    cancelButtonAriaLabel: string;
+    previousButtonAriaLabel: string;
+    nextButtonAriaLabel: string;
+    submitButtonAriaLabel: string;
+    reCaptchaTokenValidationError: string;
+    reCaptchaTokenNotSpecifiedError: string;
+    apiKey: string;
+    typeRemaining: string;
+    typeCount: string;
+    requiredDayField: string;
+    requiredDayEmpty: string;
+    requiredMonthField: string;
+    requiredYearField: string;
+    formNotReady: string;
+    noFormElement: string;
+    notUniqueKey: string;
+    newFormSchema: string;
+    missingUrl: string;
+    urlNotAttachedToBtn: string;
+    loadingProjectSettingsError: string;
+    sessionStorageSupportError: string;
+    builderUniqueError: string;
+    pageNotFound: string;
+    noDragInfoError: string;
+    addonSupportTypeError: string;
+    setPathError: string;
+    calculatedPathDeprecation: string;
+    unknownTemplate: string;
+    unknownComponent: string;
+    renderTemplateFunctionDeprecation: string;
+    whenReadyDeprecation: string;
+    loadResourcesError: string;
+    noSelectDataConfiguration: string;
+    indexedDBSupportError: string;
+    caretPositionSavingError: string;
+    iteratableRowsError: string;
+    checkRowDeprecation: string;
+    noOAuthBtn: string;
+    noOAuthConfiguration: string;
+    oAuthErrorsTitle: string;
+    noOAuthFormUrl: string;
+    oAuthStateError: string;
+    componentInvalidRowValidation: string;
+    videoPlayerNotFound: string;
+    synchronizationFailed: string;
+    fileWithDuplicatedNameInProgress: string;
+    fileWithDuplicatedNameLoaded: string;
+    nestedForm: string;
+    noDataProvided: string;
+    subformSubmissionLoadingError: string;
+    noDelimiterSet: string;
+    noSiteKey: string;
+    failedToNormalize: string;
+    failedToCompareItems: string;
+    editorFocusError: string;
+    quillImageUploadFailed: string;
+    noFilesSelected: string;
+    needConfigurationForQuill: string;
+    waitPdfConverting: string;
+    uploading: string;
+    pasteBelow: string;
+    copy: string;
+    move: string;
+    edit: string;
+    editJson: string;
+    remove: string;
+    clickToSetValue: string;
+    words: string;
+    characters: string;
+    addAnother: string;
+    yes: string;
+    no: string;
+    wantToClearData: string;
+    yesDelete: string;
+    waitFileProcessing: string;
+    wrongFileType: string;
+    fileTooSmall: string;
+    fileTooBig: string;
+    noFileService: string;
+    fileProcessingFailed: string;
+    readyForUpload: string;
+    readyForRemovingFromStorage: string;
+    preparingFileToRemove: string;
+    succefullyRemoved: string;
+    succefullyUploaded: string;
+    maxSelectItems: string;
+    minSelectItems: string;
+    clickToSign: string;
+    surveyQuestion: string;
+    surveyQuestionValue: string;
+    success: string;
+    noResultsFound: string;
+    noChoices: string;
+    typeToSearch: string;
+    loading: string;
+    help: string;
+    component: string;
+    save: string;
+    preview: string;
+    dragAndDropComponent: string;
+    searchFields: string;
+    noMatchesFound: string;
+    fileName: string;
+    size: string;
+    type: string;
+    gallery: string;
+    camera: string;
+    dropFilesToAttach: string;
+    useCamera: string;
+    browse: string;
+    takePicture: string;
+    switchToFileUpload: string;
+    completeStatus: string;
+    noStorageSet: string;
+    noFileApiSupport: string;
+    noFormDataSupport: string;
+    noProgressSupport: string;
+    close: string;
+    addResource: string;
+    autocomplete: string;
+    showPreview: string;
+    hidePreview: string;
+    createPage: string;
+    page: string;
+    closeBtnDescription: string;
+    cancelBtnDescription: string;
+    saveBtnDescription: string;
+    addOrRemove: string;
+    anyFileTypesAllowed: string;
+    allowedFileTypes: string;
+    syncing: string;
+    syncNow: string;
+    pressToOpen: string;
+    browseToAttachFileFor: string;
+    or: string;
+    numericOnly: string;
+    uploadPdfFile: string;
+    dropToStart: string;
+    expand: string;
+    collapse: string;
+    add: string;
+    delete: string;
+    revert: string;
+    removeBtnPressToRemove: string;
+    file: string;
+    captureVideo: string;
+    captureAudio: string;
+    captureImage: string;
+    browseFiles: string;
+    noComponentsSetInGrid: string;
+    sortAscending: string;
+    sortDescending: string;
+    filter: string;
+    clear: string;
+    showItemsWithValue: string;
+    gridItemsPerPage: string;
+    gridAllItems: string;
+    recordsSelectedOnPage: string;
+    recordsSelectedInTable: string;
+    gridSelectAll: string;
+    itemsInTable: string;
+    clearSelection: string;
+    editGridRow: string;
+    deleteGridRow: string;
+    selected: string;
+    actions: string;
+};
 export default _default;