@formio/js 5.0.0-rc.41 → 5.0.0-rc.42

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

@@ -1,3 +1,4 @@
+/* eslint-disable max-statements */
 import _ from 'lodash';
 import Component from '../_classes/component/Component';
 import ComponentModal from '../_classes/componentModal/ComponentModal';
@@ -191,6 +192,12 @@ export default class FormComponent extends Component {
         if (this.options.inEditGrid) {
             options.inEditGrid = this.options.inEditGrid;
         }
+        if (this.options.saveDraft) {
+            options.saveDraft = this.options.saveDraft;
+        }
+        if (this.options.saveDraftThrottle) {
+            options.saveDraftThrottle = this.options.saveDraftThrottle;
+        }
         return options;
     }
     render() {
@@ -392,6 +399,10 @@ export default class FormComponent extends Component {
                 this.subForm.nosubmit = true;
                 this.subForm.root = this.root;
                 this.subForm.localRoot = this.isNestedWizard ? this.localRoot : this.subForm;
+                if (this.parent) {
+                    this.subForm.draftEnabled = this.parent.draftEnabled;
+                    this.subForm.savingDraft = this.parent.savingDraft;
+                }
                 this.restoreValue();
                 this.valueChanged = this.hasSetValue;
                 this.onChange();
@@ -427,7 +438,13 @@ export default class FormComponent extends Component {
         }
         else if (this.formSrc) {
             this.subFormLoading = true;
-            return (new Formio(this.formSrc)).loadForm({ params: { live: 1 } })
+            const options = this.root.formio?.base && this.root.formio?.projectUrl
+                ? {
+                    base: this.root.formio.base,
+                    project: this.root.formio.projectUrl,
+                }
+                : {};
+            return (new Formio(this.formSrc, options)).loadForm({ params: { live: 1 } })
                 .then((formObj) => {
                 this.formObj = formObj;
                 if (this.options.pdf && this.component.useOriginalRevision) {
@@ -599,7 +616,13 @@ export default class FormComponent extends Component {
         if (shouldLoadSubmissionById) {
             const formId = submission.form || this.formObj.form || this.component.form;
             const submissionUrl = `${this.subForm.formio.formsUrl}/${formId}/submission/${submission._id}`;
-            this.subForm.setUrl(submissionUrl, this.options);
+            const options = this.root.formio?.base && this.root.formio?.projectUrl
+                ? {
+                    base: this.root.formio.base,
+                    project: this.root.formio.projectUrl,
+                }
+                : {};
+            this.subForm.setUrl(submissionUrl, { ...this.options, ...options });
             this.subForm.loadSubmission().catch((err) => {
                 console.error(`Unable to load subform submission ${submission._id}:`, err);
             });

package/lib/mjs/components/radio/Radio.js

@@ -44,6 +44,22 @@ export default class RadioComponent extends ListComponent {
             }
         };
     }
+    static get serverConditionSettings() {
+        return {
+            ...super.serverConditionSettings,
+            valueComponent(classComp) {
+                return {
+                    type: 'select',
+                    dataSrc: 'custom',
+                    valueProperty: 'value',
+                    dataType: classComp.dataType || '',
+                    data: {
+                        custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`,
+                    },
+                };
+            },
+        };
+    }
     static savedValueTypes(schema) {
         const { boolean, string, number, object, array } = componentValueTypes;
         const { dataType } = schema;

package/lib/mjs/widgets/CalendarWidget.js

@@ -409,6 +409,14 @@ export default class CalendarWidget extends InputWidget {
                 }
             }
         });
+        // If other fields are used to calculate disabled dates, we need to redraw calendar to refresh disabled dates
+        if (this.settings.disableFunction && this.componentInstance && this.componentInstance.root) {
+            this.componentInstance.root.on('change', (e) => {
+                if (e.changed && this.calendar) {
+                    this.calendar.redraw();
+                }
+            });
+        }
         // Restore the calendar value from the component value.
         this.setValue(this.componentValue);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.41",
+  "version": "5.0.0-rc.42",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -84,9 +84,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.21",
+    "@formio/bootstrap": "^3.0.0-rc.22",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "^2.0.0-rc.18",
+    "@formio/core": "^2.0.0-tt.dev-882e7ea",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -114,17 +114,17 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.44",
-    "quill": "^2.0.0-dev.3",
+    "quill": "^2.0.0-rc.4",
     "signature_pad": "^4.2.0",
     "string-hash": "^1.1.3",
     "tippy.js": "^6.3.7",
     "uuid": "^9.0.0",
-    "vanilla-picker": "^2.12.2"
+    "vanilla-picker": "^2.12.3"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.3.0",
     "@typescript-eslint/parser": "^7.3.0",
-    "ace-builds": "1.32.7",
+    "ace-builds": "1.32.9",
     "async-limiter": "^2.0.0",
     "bootstrap-icons": "^1.10.5",
     "bootswatch": "^5.3.3",