@wavemaker/react-runtime 11.14.2-rc.6311 → 12.0.0-next.28533

package/components/input/epoch/time/utils.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TIME_PICKER_STYLES = exports.READONLY_STYLES = exports.DEFAULT_TIMEPATTERN = exports.DEFAULT_OUTPUT_FORMAT = exports.DEFAULT_CLASS = void 0;
+exports.createWidgetEvent = createWidgetEvent;
 exports.formatDisplayTimeValue = formatDisplayTimeValue;
 exports.getSupportedTimeFormats = getSupportedTimeFormats;
 exports.parseTimeFormat = parseTimeFormat;
@@ -14,6 +15,7 @@ exports.updateListener = updateListener;
 exports.validateTimeFormat = validateTimeFormat;
 exports.validateTimeRange = validateTimeRange;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -84,7 +86,24 @@ function formatDisplayTimeValue(value, pattern) {
     return "";
   }
 }
+
+// Get validator error message (similar to datetime widget)
+function getValidatorErrorMessage(validators, validatorType) {
+  if (!validators || validators.length === 0) return undefined;
+  var validator = validators.find(function (v) {
+    return (0, _typeof2["default"])(v) === "object" && v !== null && "type" in v && v.type === validatorType;
+  });
+  if (validator && (0, _typeof2["default"])(validator) === "object" && "errorMessage" in validator) {
+    var errorMessage = validator.errorMessage;
+    if (typeof errorMessage === "string") {
+      return errorMessage;
+    }
+  }
+  return undefined;
+}
 function validateTimeRange(timeValue, minTime, maxTime) {
+  var validators = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var validationmessage = arguments.length > 4 ? arguments[4] : undefined;
   if (!timeValue) return {
     isValid: true
   };
@@ -94,32 +113,34 @@ function validateTimeRange(timeValue, minTime, maxTime) {
       return {
         isValid: false,
         errorType: "format",
-        message: "Invalid time format"
+        message: validationmessage || "Invalid time format"
       };
     }
     var timeToCheckMinutes = timeToCheck.hours() * 60 + timeToCheck.minutes();
     if (minTime) {
-      var minMoment = typeof minTime === "string" ? (0, _momentTimezone["default"])(minTime, ["HH:mm", "H:mm", "hh:mm a", "h:mm a"], true) : (0, _momentTimezone["default"])(minTime);
+      var minMoment = typeof minTime === "string" ? (0, _momentTimezone["default"])(minTime, getSupportedTimeFormats(), true) : (0, _momentTimezone["default"])(minTime);
       if (minMoment.isValid()) {
         var minMinutes = minMoment.hours() * 60 + minMoment.minutes();
         if (timeToCheckMinutes < minMinutes) {
+          var errorMessage = getValidatorErrorMessage(validators, "mintime") || validationmessage || "Time must be later than ".concat(minMoment.format("HH:mm"));
           return {
             isValid: false,
             errorType: "mintime",
-            message: "Time must be later than ".concat(minMoment.format("HH:mm"))
+            message: errorMessage
           };
         }
       }
     }
     if (maxTime) {
-      var maxMoment = typeof maxTime === "string" ? (0, _momentTimezone["default"])(maxTime, ["HH:mm", "H:mm", "hh:mm a", "h:mm a"], true) : (0, _momentTimezone["default"])(maxTime);
+      var maxMoment = typeof maxTime === "string" ? (0, _momentTimezone["default"])(maxTime, getSupportedTimeFormats(), true) : (0, _momentTimezone["default"])(maxTime);
       if (maxMoment.isValid()) {
         var maxMinutes = maxMoment.hours() * 60 + maxMoment.minutes();
         if (timeToCheckMinutes > maxMinutes) {
+          var _errorMessage = getValidatorErrorMessage(validators, "maxtime") || validationmessage || "Time must be earlier than ".concat(maxMoment.format("HH:mm"));
           return {
             isValid: false,
             errorType: "maxtime",
-            message: "Time must be earlier than ".concat(maxMoment.format("HH:mm"))
+            message: _errorMessage
           };
         }
       }
@@ -132,22 +153,25 @@ function validateTimeRange(timeValue, minTime, maxTime) {
     return {
       isValid: false,
       errorType: "format",
-      message: "Validation error"
+      message: validationmessage || "Validation error"
     };
   }
 }
-function validateTimeFormat(inputValue, pattern, required) {
+function validateTimeFormat(inputValue, pattern, required, validationmessage) {
   if (!inputValue.trim()) return {
     isValid: true
   };
   try {
     var parsed = (0, _momentTimezone["default"])(inputValue, pattern, true);
-    if (!parsed.isValid() && required) {
-      return {
+    if (!parsed.isValid()) {
+      var error = {
         isValid: false,
-        errorType: "format",
-        message: "Invalid time format. Expected: ".concat(pattern)
+        errorType: "format"
       };
+      if (required) {
+        error.message = validationmessage || "Invalid time format. Expected: ".concat(pattern);
+      }
+      return error;
     }
     return {
       isValid: true
@@ -156,7 +180,7 @@ function validateTimeFormat(inputValue, pattern, required) {
     return {
       isValid: false,
       errorType: "format",
-      message: "Invalid time format"
+      message: validationmessage || "Invalid time format"
     };
   }
 }
@@ -172,7 +196,7 @@ function parseTimeObj(timeValue) {
 
 // Constants
 var DEFAULT_CLASS = exports.DEFAULT_CLASS = "input-group app-timeinput";
-var DEFAULT_TIMEPATTERN = exports.DEFAULT_TIMEPATTERN = "h:mm:ss a";
+var DEFAULT_TIMEPATTERN = exports.DEFAULT_TIMEPATTERN = "h:mm:ss A";
 var DEFAULT_OUTPUT_FORMAT = exports.DEFAULT_OUTPUT_FORMAT = "HH:mm:ss";
 
 // Styling constants
@@ -200,10 +224,34 @@ function updateListener(name, listener, props, displayValue, timestamp, datavalu
   // Update listener widget display value
 
   if (listener !== null && listener !== void 0 && listener.onChange) {
-    listener.onChange(name || "", _objectSpread(_objectSpread({}, props), {}, {
+    listener.onChange(props.fieldName || name, _objectSpread(_objectSpread({}, props), {}, {
       displayValue: displayValue,
       timestamp: timestamp,
       datavalue: datavalue
     }));
   }
+}
+function createWidgetEvent(args) {
+  var type = args.type,
+    name = args.name,
+    value = args.value,
+    anchor = args.anchor,
+    originalEvent = args.originalEvent;
+  var base = originalEvent && (0, _typeof2["default"])(originalEvent) === "object" ? _objectSpread({}, originalEvent) : {};
+  var evt = base;
+  if (!evt.type) {
+    evt.type = type;
+  }
+  if (!evt.target && anchor) {
+    evt.target = anchor;
+  }
+  if (!evt.currentTarget && anchor) {
+    evt.currentTarget = anchor;
+  }
+  if (name !== undefined) evt.name = name;
+  if (value !== undefined) evt.value = value;
+  if (originalEvent) {
+    evt.originalEvent = originalEvent;
+  }
+  return evt;
 }

package/components/input/fileupload/Utils.js

@@ -40,13 +40,16 @@ var isValidFile = exports.isValidFile = function isValidFile(filename, contentty
   if (!contenttype) {
     return true;
   }
-  var contentTypes = contenttype.toLowerCase().split(" ").map(function (type) {
+  var ext = extensionName.toLowerCase();
+
+  // Split by comma or space (handles ".doc, .docx" and ".doc .docx" formats)
+  var contentTypes = contenttype.toLowerCase().split(/[\s,]+/).map(function (type) {
     return type.trim();
-  });
+  }).filter(Boolean);
 
   // Check for direct extension match (e.g., ".csv", ".pdf")
   if (contentTypes.some(function (type) {
-    return type === ".".concat(extensionName.toLowerCase());
+    return type === ".".concat(ext) || type === ext;
   })) {
     return true;
   }
@@ -57,16 +60,18 @@ var isValidFile = exports.isValidFile = function isValidFile(filename, contentty
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var type = _step.value;
-      if (type === "image/*" || type === "image") {
+      // Normalize type for comparison (remove leading dot if present)
+      var normalizedType = type.startsWith(".") ? type.slice(1) : type;
+      if (type === "image/*" || normalizedType === "image") {
         if ((0, _constants.isImageFile)(filename)) return true;
       }
-      if (type === "audio/*" || type === "audio") {
+      if (type === "audio/*" || normalizedType === "audio") {
         if ((0, _constants.isAudioFile)(filename)) return true;
       }
-      if (type === "video/*" || type === "video") {
+      if (type === "video/*" || normalizedType === "video") {
         if ((0, _constants.isVideoFile)(filename)) return true;
       }
-      if (type === "document" || type === "pdf" || type === "doc") {
+      if (normalizedType === "document" || normalizedType === "pdf" || normalizedType === "doc") {
         if ((0, _constants.isDocumentFile)(filename)) return true;
       }
     }

package/components/input/fileupload/components/MultiUpload.js

@@ -33,9 +33,6 @@ var MultipleFileUpload = function MultipleFileUpload(_ref) {
     setHighlightDropArea = _ref.setHighlightDropArea,
     onBeforeselect = _ref.onBeforeselect,
     styles = _ref.styles;
-  var handleClick = function handleClick(e) {
-    onBeforeselect === null || onBeforeselect === void 0 || onBeforeselect(e);
-  };
   return __jsx("div", {
     className: "app-multi-file-upload"
   }, __jsx("div", {
@@ -64,7 +61,7 @@ var MultipleFileUpload = function MultipleFileUpload(_ref) {
     name: "files",
     multiple: multiple,
     accept: chooseFilter,
-    disabled: disabled || readonly,
+    disabled: disabled,
     required: required,
     "aria-label": arialabel || displayname || "File selection field",
     onChange: onFileSelect,
@@ -72,8 +69,7 @@ var MultipleFileUpload = function MultipleFileUpload(_ref) {
     tabIndex: tabindex,
     style: {
       display: "none"
-    },
-    onClick: handleClick
+    }
   }), __jsx("a", {
     className: "app-anchor upload-label",
     onClick: disabled || readonly ? undefined : triggerFileSelect

package/components/input/fileupload/components/SingleUpload.js

@@ -26,9 +26,6 @@ var SingleFileUpload = function SingleFileUpload(_ref) {
     triggerFileSelect = _ref.triggerFileSelect,
     onFileSelect = _ref.onFileSelect,
     onBeforeselect = _ref.onBeforeselect;
-  var handleClick = function handleClick(e) {
-    onBeforeselect === null || onBeforeselect === void 0 || onBeforeselect(e);
-  };
   return __jsx("div", {
     className: "app-single-file-upload"
   }, __jsx("div", {
@@ -41,7 +38,7 @@ var SingleFileUpload = function SingleFileUpload(_ref) {
     type: "file",
     name: "files",
     accept: chooseFilter,
-    disabled: disabled || readonly,
+    disabled: disabled,
     required: required,
     "aria-label": arialabel || displayname || "File selection field",
     onChange: onFileSelect,
@@ -49,14 +46,13 @@ var SingleFileUpload = function SingleFileUpload(_ref) {
     tabIndex: tabindex,
     style: {
       display: "none"
-    },
-    onClick: handleClick
+    }
   }), __jsx("button", {
     id: "dropzone",
     type: "button",
     className: "app-button btn btn-default",
     onClick: disabled || readonly ? undefined : triggerFileSelect,
-    disabled: disabled || readonly,
+    disabled: disabled,
     style: styles
   }, __jsx("i", {
     className: iconclass

package/components/input/fileupload/index.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _clsx = _interopRequireDefault(require("clsx"));
@@ -22,8 +21,6 @@ var _confirmDialog = _interopRequireDefault(require("@wavemaker/react-runtime/co
 var _excluded = ["fileInputRef", "chooseFilter", "highlightDropArea", "uploadedFiles", "selectedFolders", "setSelectedFolders", "dragOverHandler", "onFileSelect", "onFileDrop", "setHighlightDropArea", "clearSelectedFile", "triggerFileSelect", "onFileDelete", "confirmDialogOpen", "confirmDialogProps", "closeConfirmDialog"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var WmFileUpload = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _props$caption = props.caption,
     caption = _props$caption === void 0 ? _constants.fileUploadConstants.DEFAULT_CLASSES.DEFAULT_CAPTIONS.SELECT : _props$caption,
@@ -74,16 +71,15 @@ var WmFileUpload = /*#__PURE__*/(0, _react.memo)(function (props) {
     confirmDialogProps = _useFileUpload.confirmDialogProps,
     closeConfirmDialog = _useFileUpload.closeConfirmDialog,
     events = (0, _objectWithoutProperties2["default"])(_useFileUpload, _excluded);
-  var containerStyle = _objectSpread(_objectSpread({}, styles), {}, {
-    width: width !== "auto" ? width : undefined,
-    height: height || undefined
-  });
   return __jsx(_Box["default"], {
     component: "div",
     className: (0, _clsx["default"])("app-fileupload", className),
     id: id,
-    sx: containerStyle,
-    title: hint
+    title: hint,
+    hidden: props.hidden,
+    style: {
+      width: "100%"
+    }
   }, !multiple ? __jsx(_SingleUpload["default"], (0, _extends2["default"])({
     fileInputRef: fileInputRef,
     caption: caption,
@@ -155,7 +151,7 @@ var WmFileUpload = /*#__PURE__*/(0, _react.memo)(function (props) {
     listener: {}
   }));
 }, function (prevProps, nextProps) {
-  var keysToCheck = ["caption", "name", "hint", "arialabel", "tabindex", "multiple", "fileuploadmessage", "show", "disabled", "contenttype", "maxfilesize", "iconclass", "cleariconclass", "cleariconhint", "uploadpath", "datasource", "selectedFiles", "destination", "filelistheight", "width", "showprogressbar", "showprogressbarpercentage", "deleteiconhint", "extensions", "filetype", "readonly", "required", "deletedatasource", "displayname", "height", "onBeforeselect", "onSelect", "onDelete", "onBeforedelete", "onError"];
+  var keysToCheck = ["caption", "name", "hint", "arialabel", "tabindex", "multiple", "fileuploadmessage", "show", "disabled", "contenttype", "maxfilesize", "iconclass", "cleariconclass", "cleariconhint", "uploadpath", "datasource", "selectedFiles", "destination", "filelistheight", "width", "showprogressbar", "showprogressbarpercentage", "deleteiconhint", "extensions", "filetype", "readonly", "required", "deletedatasource", "displayname", "height", "onBeforeselect", "onSelect", "onDelete", "onBeforedelete", "onError", "hidden"];
 
   // Check if any props that affect rendering have changed
   var propsChanged = keysToCheck.some(function (key) {

package/components/input/fileupload/useFileUpload.js

@@ -181,7 +181,7 @@ var useFileUpload = exports.useFileUpload = function useFileUpload(props) {
     // Add event listeners for drag and drop
     if (disabled || readonly) {
       setHighlightDropArea(false);
-      window.removeEventListener("focus", disableDropZone);
+      window.removeEventListener("focus", _disableDropZone);
     } else {
       document.addEventListener("dragover", dragOverCb);
       document.addEventListener("drop", dropCb);
@@ -212,9 +212,9 @@ var useFileUpload = exports.useFileUpload = function useFileUpload(props) {
     e.stopPropagation();
     setHighlightDropArea(true);
   };
-  var disableDropZone = function disableDropZone() {
+  var _disableDropZone = function disableDropZone() {
     setHighlightDropArea(false);
-    window.removeEventListener("focus", disableDropZone);
+    window.removeEventListener("focus", _disableDropZone);
   };
   var onBeforeSelectEventCall = function onBeforeSelectEventCall($event, $files) {
     var files = (0, _Utils.getValidFiles)($files, contenttype, extensions || "", filetype || "", chooseFilter, maxfilesize || "10", onError, listener);
@@ -233,6 +233,14 @@ var useFileUpload = exports.useFileUpload = function useFileUpload(props) {
         }),
         files: files.validFiles
       });
+      if (onBeforeselect) {
+        var _listener$Widgets2;
+        var event = _objectSpread(_objectSpread({}, $event), {}, {
+          _reactName: "onBeforeselect"
+        });
+        onBeforeselect(event, listener === null || listener === void 0 || (_listener$Widgets2 = listener.Widgets) === null || _listener$Widgets2 === void 0 ? void 0 : _listener$Widgets2[name], files.validFiles);
+      }
+      // Proceed only if neither callback returns false
       if (beforeSelectVal !== false) {
         var _fileInputRef$current;
         var filesWithIds = files.validFiles.map(function (file) {
@@ -345,12 +353,15 @@ var useFileUpload = exports.useFileUpload = function useFileUpload(props) {
         onOk: function onOk() {
           try {
             if (deletedatasource) {
-              var _file$_response, _fileInputRef$current2, _listener$App3;
+              var _file$_response, _listener$Widgets3, _listener$App3;
               deletedatasource._deleteFileObservable = (0, _eventNotifier.eventObserver)();
               deleteFileProgress(file);
               var fileName = ((_file$_response = file._response) === null || _file$_response === void 0 || (_file$_response = _file$_response[0]) === null || _file$_response === void 0 ? void 0 : _file$_response.fileName) || file.name;
               deletedatasource.setInput("file", fileName);
-              onDelete === null || onDelete === void 0 || onDelete(e, (_fileInputRef$current2 = fileInputRef.current) === null || _fileInputRef$current2 === void 0 || (_fileInputRef$current2 = _fileInputRef$current2.files) === null || _fileInputRef$current2 === void 0 ? void 0 : _fileInputRef$current2[0], fileName);
+              var event = _objectSpread(_objectSpread({}, e), {}, {
+                _reactName: "onDelete"
+              });
+              onDelete === null || onDelete === void 0 || onDelete(event, listener === null || listener === void 0 || (_listener$Widgets3 = listener.Widgets) === null || _listener$Widgets3 === void 0 ? void 0 : _listener$Widgets3[name]);
               listener && (listener === null || listener === void 0 || (_listener$App3 = listener.App) === null || _listener$App3 === void 0 ? void 0 : _listener$App3.notifyApp("File deleted successfully", "Success"));
             }
           } catch (error) {