@formio/js 5.1.0-dev.6080.9f2079e → 5.1.0-dev.6082.6dd4100

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

@@ -102,8 +102,8 @@ class TextFieldComponent extends Input_1.default {
         if (((_c = this.component.widget) === null || _c === void 0 ? void 0 : _c.type) === 'calendar') {
             this.component.widget = Object.assign(Object.assign({}, this.component.widget), { readOnly: this.options.readOnly, timezone,
                 displayInTimezone, 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 
+            // 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);
         }
     }

package/lib/cjs/providers/storage/uploadAdapter.js

@@ -49,9 +49,11 @@ class FormioUploadAdapter {
         }
     }
 }
-const getFormioUploadAdapterPlugin = (fileService, component) => (editor) => {
-    editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
-        return new FormioUploadAdapter(loader, fileService, component);
+const getFormioUploadAdapterPlugin = (fileService, component) => {
+    return function (editor) {
+        editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
+            return new FormioUploadAdapter(loader, fileService, component);
+        };
     };
 };
 exports.getFormioUploadAdapterPlugin = getFormioUploadAdapterPlugin;

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

@@ -490,6 +490,15 @@ export function getFocusableElements(element: HTMLElement): NodeList<HTMLElement
  * @returns {Array<string>|null} - The saved types for the component
  */
 export function getComponentSavedTypes(fullSchema: import('@formio/core').Component): Array<string> | null;
+/**
+ * Checks if a string has timezone information encoded in it
+ * Example: 2024-01-01T00:00:00Z -> true
+ * Example: 2024-01-01T00:00:00+03:00 -> true
+ * Example: 2011-05-03T00:00:00 -> false
+ * @param {string} value the string value to check
+ * @returns {boolean} if value has encoded timezone
+ */
+export function hasEncodedTimezone(value: string): boolean;
 export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.

package/lib/cjs/utils/utils.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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.removeHTML = 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.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = 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 = exports.withSwitch = void 0;
+exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = 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 = exports.withSwitch = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
 const json_logic_js_1 = __importDefault(require("json-logic-js"));
@@ -1646,3 +1646,18 @@ const interpolateErrors = (component, errors, interpolateFn) => {
     });
 };
 exports.interpolateErrors = interpolateErrors;
+/**
+ * Checks if a string has timezone information encoded in it
+ * Example: 2024-01-01T00:00:00Z -> true
+ * Example: 2024-01-01T00:00:00+03:00 -> true
+ * Example: 2011-05-03T00:00:00 -> false
+ * @param {string} value the string value to check
+ * @returns {boolean} if value has encoded timezone
+ */
+function hasEncodedTimezone(value) {
+    if (typeof value !== 'string') {
+        return false;
+    }
+    return (value.substring(value.length - 1) === 'z' || value.substring(value.length - 1) === 'Z' || value.match(/[+|-][0-9]+:[0-9]+/));
+}
+exports.hasEncodedTimezone = hasEncodedTimezone;

package/lib/cjs/widgets/CalendarWidget.js

@@ -286,6 +286,11 @@ class CalendarWidget extends InputWidget_1.default {
             value = value ? (0, utils_1.formatDate)(this.timezonesUrl, value, (0, utils_1.convertFormatToMoment)(this.settings.format), this.timezone, (0, utils_1.convertFormatToMoment)(this.valueMomentFormat)) : value;
             return super.setValue(value);
         }
+        // If the component is a textfield that does not have timezone information included in the string value then skip
+        // the timezone offset
+        if (this.component.type === 'textfield' && !(utils_1.hasEncodedTimezone)(value)) {
+            this.settings.skipOffset = true;
+        }
         const zonesLoading = this.loadZones();
         if (value) {
             if (!saveAsText && this.settings.readOnly && !zonesLoading) {
@@ -453,7 +458,7 @@ class CalendarWidget extends InputWidget_1.default {
         return (date, format) => {
             // Only format this if this is the altFormat and the form is readOnly.
             if (this.settings.readOnly && (format === this.settings.altFormat)) {
-                if (!this.settings.enableTime || this.loadZones()) {
+                if (!this.settings.enableTime || this.loadZones() || this.settings.skipOffset) {
                     return Flatpickr.formatDate(date, format);
                 }
                 const currentValue = new Date(this.getValue());

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

@@ -86,8 +86,8 @@ 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 
+            // 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);
         }
     }

package/lib/mjs/providers/storage/uploadAdapter.js

@@ -46,9 +46,11 @@ class FormioUploadAdapter {
         }
     }
 }
-const getFormioUploadAdapterPlugin = (fileService, component) => (editor) => {
-    editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
-        return new FormioUploadAdapter(loader, fileService, component);
+const getFormioUploadAdapterPlugin = (fileService, component) => {
+    return function (editor) {
+        editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
+            return new FormioUploadAdapter(loader, fileService, component);
+        };
     };
 };
 export { getFormioUploadAdapterPlugin };

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

@@ -490,6 +490,15 @@ export function getFocusableElements(element: HTMLElement): NodeList<HTMLElement
  * @returns {Array<string>|null} - The saved types for the component
  */
 export function getComponentSavedTypes(fullSchema: import('@formio/core').Component): Array<string> | null;
+/**
+ * Checks if a string has timezone information encoded in it
+ * Example: 2024-01-01T00:00:00Z -> true
+ * Example: 2024-01-01T00:00:00+03:00 -> true
+ * Example: 2011-05-03T00:00:00 -> false
+ * @param {string} value the string value to check
+ * @returns {boolean} if value has encoded timezone
+ */
+export function hasEncodedTimezone(value: string): boolean;
 export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.

package/lib/mjs/utils/utils.js

@@ -1554,3 +1554,17 @@ export const interpolateErrors = (component, errors, interpolateFn) => {
         return { ...error, message: unescapeHTML(interpolateFn(toInterpolate, context)), context: { ...context } };
     });
 };
+/**
+ * Checks if a string has timezone information encoded in it
+ * Example: 2024-01-01T00:00:00Z -> true
+ * Example: 2024-01-01T00:00:00+03:00 -> true
+ * Example: 2011-05-03T00:00:00 -> false
+ * @param {string} value the string value to check
+ * @returns {boolean} if value has encoded timezone
+ */
+export function hasEncodedTimezone(value) {
+    if (typeof value !== 'string') {
+        return false;
+    }
+    return (value.substring(value.length - 1) === 'z' || value.substring(value.length - 1) === 'Z' || value.match(/[+|-][0-9]+:[0-9]+/));
+}

package/lib/mjs/widgets/CalendarWidget.js

@@ -1,6 +1,6 @@
 import { Formio } from '../Formio';
 import InputWidget from './InputWidget';
-import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToMoment, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, momentDate, zonesLoaded, shouldLoadZones, loadZones, } from '../utils/utils';
+import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToMoment, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, momentDate, zonesLoaded, shouldLoadZones, loadZones, hasEncodedTimezone, } from '../utils/utils';
 import moment from 'moment';
 import _ from 'lodash';
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';
@@ -278,6 +278,11 @@ export default class CalendarWidget extends InputWidget {
             value = value ? formatDate(this.timezonesUrl, value, convertFormatToMoment(this.settings.format), this.timezone, convertFormatToMoment(this.valueMomentFormat)) : value;
             return super.setValue(value);
         }
+        // If the component is a textfield that does not have timezone information included in the string value then skip
+        // the timezone offset
+        if (this.component.type === 'textfield' && !(hasEncodedTimezone)(value)) {
+            this.settings.skipOffset = true;
+        }
         const zonesLoading = this.loadZones();
         if (value) {
             if (!saveAsText && this.settings.readOnly && !zonesLoading) {
@@ -443,7 +448,7 @@ export default class CalendarWidget extends InputWidget {
         return (date, format) => {
             // Only format this if this is the altFormat and the form is readOnly.
             if (this.settings.readOnly && (format === this.settings.altFormat)) {
-                if (!this.settings.enableTime || this.loadZones()) {
+                if (!this.settings.enableTime || this.loadZones() || this.settings.skipOffset) {
                     return Flatpickr.formatDate(date, format);
                 }
                 const currentValue = new Date(this.getValue());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6080.9f2079e",
+  "version": "5.1.0-dev.6082.6dd4100",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {