@formio/js 5.0.0-dev.5588.0f690c8 → 5.0.0-dev.5593.4f4b210

package/lib/cjs/Webform.js

@@ -291,12 +291,19 @@ class Webform extends NestedDataComponent_1.default {
         // Set language after everything is established.
         this.language = this.i18next.language;
         // See if we need to restore the draft from a user.
-        if (this.options.saveDraft && !this.options.skipDraftRestore) {
+        if (this.options.saveDraft) {
             this.formReady.then(() => {
-                const user = Formio_1.Formio.getUser();
-                // Only restore a draft if the submission isn't explicitly set.
-                if (user && !this.submissionSet) {
-                    this.restoreDraft(user._id);
+                if (!this.options.skipDraftRestore) {
+                    const user = Formio_1.Formio.getUser();
+                    // Only restore a draft if the submission isn't explicitly set.
+                    if (user && !this.submissionSet) {
+                        this.restoreDraft(user._id);
+                    }
+                }
+                else {
+                    // Enable drafts
+                    this.draftEnabled = true;
+                    this.savingDraft = false;
                 }
             });
         }

package/lib/cjs/components/_classes/component/Component.js

@@ -3257,7 +3257,7 @@ Component.requireLibrary = function (name, property, src, polling) {
             }.bind(Component.externalLibraries[name]);
         }
         // See if the plugin already exists.
-        const plugin = (0, utils_1.getScriptPlugin)(property);
+        const plugin = lodash_1.default.get(window, property);
         if (plugin) {
             Component.externalLibraries[name].resolve(plugin);
         }
@@ -3300,7 +3300,7 @@ Component.requireLibrary = function (name, property, src, polling) {
             // if no callback is provided, then check periodically for the script.
             if (polling) {
                 setTimeout(function checkLibrary() {
-                    const plugin = (0, utils_1.getScriptPlugin)(property);
+                    const plugin = lodash_1.default.get(window, property);
                     if (plugin) {
                         Component.externalLibraries[name].resolve(plugin);
                     }

package/lib/cjs/utils/utils.d.ts

@@ -27,12 +27,6 @@ export function getElementRect(element: any): {
     width: string;
     height: string;
 };
-/**
- * Get non HTMLElement property in the window object
- * @param {String} property
- * @return {any || undefined}
- */
-export function getScriptPlugin(property: string): any;
 /**
  * Determines the boolean value of a setting.
  *

package/lib/cjs/utils/utils.js

@@ -30,8 +30,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = void 0;
+exports.observeOverload = exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
+exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
 const fetch_ponyfill_1 = __importDefault(require("fetch-ponyfill"));
@@ -172,20 +172,6 @@ function getElementRect(element) {
     };
 }
 exports.getElementRect = getElementRect;
-/**
- * Get non HTMLElement property in the window object
- * @param {String} property
- * @return {any || undefined}
- */
-function getScriptPlugin(property) {
-    const obj = window[property];
-    if (typeof HTMLElement === 'object' ? obj instanceof HTMLElement : //DOM2
-        obj && typeof obj === 'object' && true && obj.nodeType === 1 && typeof obj.nodeName === 'string') {
-        return undefined;
-    }
-    return obj;
-}
-exports.getScriptPlugin = getScriptPlugin;
 /**
  * Determines the boolean value of a setting.
  *

package/lib/mjs/Webform.js

@@ -263,12 +263,19 @@ export default class Webform extends NestedDataComponent {
         // Set language after everything is established.
         this.language = this.i18next.language;
         // See if we need to restore the draft from a user.
-        if (this.options.saveDraft && !this.options.skipDraftRestore) {
+        if (this.options.saveDraft) {
             this.formReady.then(() => {
-                const user = Formio.getUser();
-                // Only restore a draft if the submission isn't explicitly set.
-                if (user && !this.submissionSet) {
-                    this.restoreDraft(user._id);
+                if (!this.options.skipDraftRestore) {
+                    const user = Formio.getUser();
+                    // Only restore a draft if the submission isn't explicitly set.
+                    if (user && !this.submissionSet) {
+                        this.restoreDraft(user._id);
+                    }
+                }
+                else {
+                    // Enable drafts
+                    this.draftEnabled = true;
+                    this.savingDraft = false;
                 }
             });
         }

package/lib/mjs/components/_classes/component/Component.js

@@ -6,7 +6,7 @@ import isMobile from 'ismobilejs';
 import { processOne, processOneSync, validateProcessInfo } from '@formio/core/process';
 import { Formio } from '../../../Formio';
 import * as FormioUtils from '../../../utils/utils';
-import { fastCloneDeep, boolValue, getComponentPath, isInsideScopingComponent, currentTimezone, getScriptPlugin } from '../../../utils/utils';
+import { fastCloneDeep, boolValue, getComponentPath, isInsideScopingComponent, currentTimezone } from '../../../utils/utils';
 import Element from '../../../Element';
 import ComponentModal from '../componentModal/ComponentModal';
 import Widgets from '../../../widgets';
@@ -3220,7 +3220,7 @@ Component.requireLibrary = function (name, property, src, polling) {
             }.bind(Component.externalLibraries[name]);
         }
         // See if the plugin already exists.
-        const plugin = getScriptPlugin(property);
+        const plugin = _.get(window, property);
         if (plugin) {
             Component.externalLibraries[name].resolve(plugin);
         }
@@ -3263,7 +3263,7 @@ Component.requireLibrary = function (name, property, src, polling) {
             // if no callback is provided, then check periodically for the script.
             if (polling) {
                 setTimeout(function checkLibrary() {
-                    const plugin = getScriptPlugin(property);
+                    const plugin = _.get(window, property);
                     if (plugin) {
                         Component.externalLibraries[name].resolve(plugin);
                     }

package/lib/mjs/utils/utils.d.ts

@@ -27,12 +27,6 @@ export function getElementRect(element: any): {
     width: string;
     height: string;
 };
-/**
- * Get non HTMLElement property in the window object
- * @param {String} property
- * @return {any || undefined}
- */
-export function getScriptPlugin(property: string): any;
 /**
  * Determines the boolean value of a setting.
  *

package/lib/mjs/utils/utils.js

@@ -131,19 +131,6 @@ export function getElementRect(element) {
         height: getPropertyValue(style, 'height')
     };
 }
-/**
- * Get non HTMLElement property in the window object
- * @param {String} property
- * @return {any || undefined}
- */
-export function getScriptPlugin(property) {
-    const obj = window[property];
-    if (typeof HTMLElement === 'object' ? obj instanceof HTMLElement : //DOM2
-        obj && typeof obj === 'object' && true && obj.nodeType === 1 && typeof obj.nodeName === 'string') {
-        return undefined;
-    }
-    return obj;
-}
 /**
  * Determines the boolean value of a setting.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5588.0f690c8",
+  "version": "5.0.0-dev.5593.4f4b210",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {