@portnet/ui 5.0.1 → 5.0.3

package/dist/components/inputs/PuiDateTimeField.js

@@ -1,5 +1,6 @@
 "use strict";
 
+require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -8,164 +9,45 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
-var _react = _interopRequireDefault(require("react"));
 var _styles = require("@mui/material/styles");
 var _DateTimePicker = require("@mui/x-date-pickers/DateTimePicker");
 var _formik = require("formik");
 var _moment = _interopRequireDefault(require("moment"));
-var _AdapterDayjs = require("@mui/x-date-pickers/AdapterDayjs");
-var _xDatePickers = require("@mui/x-date-pickers");
-var _apperance = require("../../config/apperance");
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var React = _interopRequireWildcard(require("react"));
+var _apperance = require("../../config/apperance");
+var _StyledMuiTextField = _interopRequireDefault(require("../common/StyledMuiTextField"));
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["id", "className", "sx", "label", "name", "required", "value", "minDate", "maxDate", "inputFormat", "format", "disablePast", "disableFuture", "error", "readOnly", "fullWidth", "disabled", "helperText", "onChange", "onBlur"],
   _excluded2 = ["id", "className", "sx", "label", "name", "required", "value", "minDate", "maxDate", "inputFormat", "format", "disablePast", "disableFuture", "error", "readOnly", "fullWidth", "disabled", "helperText", "onChange", "onBlur"],
-  _excluded3 = ["formik", "id", "className", "sx", "label", "name", "required", "value", "minDate", "maxDate", "inputFormat", "format", "disablePast", "disableFuture", "error", "readOnly", "fullWidth", "disabled", "helperText", "onChange", "onBlur"]; // Helper function to get palette from theme or fallback to appearance
+  _excluded3 = ["formik", "id", "className", "sx", "label", "name", "required", "value", "minDate", "maxDate", "inputFormat", "format", "disablePast", "disableFuture", "error", "readOnly", "fullWidth", "disabled", "helperText", "onChange", "onBlur"];
+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 (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 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) { _defineProperty(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; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-const getPalette = theme => {
-  // Check if theme has our custom palette properties
-  if (theme && theme.palette && theme.palette.gray && theme.palette.gray.darker) {
-    // Theme has our custom structure, now normalize it
-    return {
-      primary: theme.palette.primary.main || theme.palette.primary,
-      secondary: theme.palette.secondary.main || theme.palette.secondary,
-      error: theme.palette.error ? theme.palette.error.main || theme.palette.error : _apperance.palette.error,
-      warning: theme.palette.warning ? theme.palette.warning.main || theme.palette.warning : _apperance.palette.warning,
-      success: theme.palette.success ? theme.palette.success.main || theme.palette.success : _apperance.palette.success,
-      info: theme.palette.info ? theme.palette.info.main || theme.palette.info : _apperance.palette.info,
-      white: theme.palette.white || _apperance.palette.white,
-      dark: theme.palette.dark || _apperance.palette.dark,
-      gray: theme.palette.gray,
-      blue: theme.palette.blue || _apperance.palette.blue,
-      background: theme.palette.background || _apperance.palette.background,
-      border: theme.palette.border || _apperance.palette.border,
-      shadow: theme.palette.shadow || _apperance.palette.shadow
-    };
-  }
-  // Check if theme object itself has gray (root level)
-  if (theme && theme.gray && theme.gray.darker) {
-    return {
-      primary: theme.primary,
-      secondary: theme.secondary,
-      error: theme.error || _apperance.palette.error,
-      warning: theme.warning || _apperance.palette.warning,
-      success: theme.success || _apperance.palette.success,
-      info: theme.info || _apperance.palette.info,
-      white: theme.white || _apperance.palette.white,
-      dark: theme.dark || _apperance.palette.dark,
-      gray: theme.gray,
-      blue: theme.blue || _apperance.palette.blue,
-      background: theme.background || _apperance.palette.background,
-      border: theme.border || _apperance.palette.border,
-      shadow: theme.shadow || _apperance.palette.shadow
-    };
-  }
-  return _apperance.palette;
-};
-
-// Helper function to get DateTimeField styles from theme
-const getDateTimeFieldStyles = theme => {
-  if (theme && theme.components && theme.components.PuiDateTimeField) {
-    return theme.components.PuiDateTimeField;
-  }
-  return {
-    inputRoot: {
-      backgroundColor: _apperance.palette.white,
-      border: "2px solid ".concat(_apperance.palette.gray.dark),
-      borderRadius: "5px",
-      height: "auto",
-      lineHeight: "1"
-    },
-    label: {
-      color: _apperance.palette.gray.darker,
-      marginBottom: "4px",
-      fontSize: "0.8rem"
-    },
-    disabled: {
-      backgroundColor: "#f5f5f5",
-      border: "1px solid #cecdd3",
-      labelColor: "#97969b"
-    }
-  };
-};
-const getTextFieldStyles = (theme, required) => {
-  var _themePalette$backgro, _palette$background, _dateTimeFieldStyles$, _themePalette$backgro2, _palette$background2, _dateTimeFieldStyles$2, _dateTimeFieldStyles$3;
-  const themePalette = getPalette(theme);
-  const dateTimeFieldStyles = getDateTimeFieldStyles(theme);
+const StyledDateMuiTextField = (0, _styles.styled)(/*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_StyledMuiTextField.default, _objectSpread({
+  ref: ref
+}, props))))(() => {
   return {
     "&.MuiFormControl-root": {
-      "&.required .MuiInputBase-root": {
-        backgroundColor: required ? ((_themePalette$backgro = themePalette.background) === null || _themePalette$backgro === void 0 ? void 0 : _themePalette$backgro.required) || ((_palette$background = _apperance.palette.background) === null || _palette$background === void 0 ? void 0 : _palette$background.required) : dateTimeFieldStyles.inputRoot.backgroundColor
-      },
-      "& .MuiFormLabel-root": {
-        zIndex: 0,
-        lineSpacing: "-0.03em",
-        position: "initial",
-        transform: "none",
-        fontSize: "".concat(dateTimeFieldStyles.label.fontSize, " !important"),
-        fontWeight: "600",
-        marginBottom: "".concat(dateTimeFieldStyles.label.marginBottom, " !important"),
-        color: "".concat(dateTimeFieldStyles.label.color, " !important"),
-        "&.Mui-focused ": {
-          color: "".concat(themePalette.primary, " !important")
-        },
-        "&.Mui-disabled": {
-          color: "".concat(((_dateTimeFieldStyles$ = dateTimeFieldStyles.disabled) === null || _dateTimeFieldStyles$ === void 0 ? void 0 : _dateTimeFieldStyles$.labelColor) || "#97969b", " !important")
-        },
-        "&.Mui-error": {
-          color: "".concat(themePalette.error, " !important")
+      display: "block",
+      "& .MuiInputAdornment-root .MuiButtonBase-root": {
+        padding: "6px",
+        marginRight: "-8px",
+        "& .MuiSvgIcon-root": {
+          width: "16px",
+          height: "16px"
         }
-      },
-      "& .MuiInputBase-root": {
-        backgroundColor: "".concat(dateTimeFieldStyles.inputRoot.backgroundColor, " !important"),
-        border: "".concat(dateTimeFieldStyles.inputRoot.border, " !important"),
-        borderRadius: "".concat(dateTimeFieldStyles.inputRoot.borderRadius, " !important"),
-        height: "".concat(dateTimeFieldStyles.inputRoot.height, " !important"),
-        "&.MuiInputBase-multiline": {
-          padding: "8px 0",
-          height: "auto !important"
-        },
-        "&.Mui-focused ": {
-          border: "2px solid ".concat(themePalette.primary, " !important")
-        },
-        "&.Mui-error ": {
-          border: "2px solid ".concat(themePalette.error, " !important"),
-          backgroundColor: "".concat(((_themePalette$backgro2 = themePalette.background) === null || _themePalette$backgro2 === void 0 ? void 0 : _themePalette$backgro2.error) || ((_palette$background2 = _apperance.palette.background) === null || _palette$background2 === void 0 ? void 0 : _palette$background2.error), " !important")
-        },
-        "&.Mui-disabled ": {
-          backgroundColor: "".concat(((_dateTimeFieldStyles$2 = dateTimeFieldStyles.disabled) === null || _dateTimeFieldStyles$2 === void 0 ? void 0 : _dateTimeFieldStyles$2.backgroundColor) || "#f5f5f5", " !important"),
-          border: "".concat(((_dateTimeFieldStyles$3 = dateTimeFieldStyles.disabled) === null || _dateTimeFieldStyles$3 === void 0 ? void 0 : _dateTimeFieldStyles$3.border) || "1px solid #cecdd3", " !important"),
-          borderRadius: "".concat(dateTimeFieldStyles.inputRoot.borderRadius, " !important"),
-          "& input": {
-            color: "".concat(themePalette.gray.darker),
-            WebkitTextFillColor: "".concat(themePalette.gray.darker)
-          }
-        },
-        "& .MuiInputBase-input": {
-          lineHeight: "".concat(dateTimeFieldStyles.inputRoot.lineHeight, " !important"),
-          padding: "1px 6px",
-          fontSize: "0.7rem"
-        }
-      },
-      "& .MuiFormHelperText-root": {
-        fontWeight: "bold",
-        fontSize: ".7rem",
-        color: "red"
-      },
-      "& fieldset": {
-        display: "none"
       }
     }
   };
-};
-const PuiStandardDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref, ref) => {
+});
+const PuiStandardDateTimeField = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       id,
       className,
@@ -190,64 +72,52 @@ const PuiStandardDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref, r
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const handleChange = value => {
-    if (value) {
-      const formattedValue = format ? value.format(format) : value.toISOString();
-      onChange(formattedValue);
-    } else {
-      onChange(null);
-    }
+    const formattedValue = format ? value.format(format) : value.toISOString();
+    onChange(formattedValue);
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_xDatePickers.LocalizationProvider, {
-    dateAdapter: _AdapterDayjs.AdapterDayjs,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DateTimePicker.DateTimePicker, _objectSpread({
-      ref: ref,
-      sx: sx,
-      label: label,
-      inputFormat: inputFormat,
-      value: value,
-      onChange: handleChange,
-      disablePast: disablePast,
-      disableFuture: disableFuture,
-      disabled: disabled,
-      maxDate: maxDate,
-      minDate: minDate,
-      readOnly: readOnly,
-      slotProps: {
-        textField: {
-          name,
-          sx: theme => getTextFieldStyles(theme, required),
-          fullWidth,
-          required,
-          error,
-          helperText,
-          className: required ? "required" : ""
-        },
-        popper: {
-          sx: theme => {
-            const themePalette = getPalette(theme);
-            return {
-              "& .MuiPaper-root": {
-                boxShadow: "none !important",
-                border: "1px solid #e0e0e0",
-                backgroundColor: "white"
-              },
-              "& .MuiPickersDay-root.Mui-selected": {
-                backgroundColor: "".concat(themePalette.primary, " !important")
-              },
-              "& .Mui-selected": {
-                backgroundColor: "".concat(themePalette.primary, " !important")
-              },
-              "& .MuiClockNumber-root.Mui-selected": {
-                backgroundColor: "".concat(themePalette.primary, " !important")
-              }
-            };
-          }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_DateTimePicker.DateTimePicker, _objectSpread({
+    ref: ref,
+    sx: sx,
+    ampm: false,
+    label: label,
+    inputFormat: inputFormat,
+    value: value,
+    onChange: handleChange,
+    disablePast: disablePast,
+    disableFuture: disableFuture,
+    disabled: disabled,
+    maxDate: maxDate,
+    minDate: minDate,
+    readOnly: readOnly,
+    viewRenderers: {
+      hours: null,
+      minutes: null,
+      seconds: null
+    },
+    PopperProps: {
+      sx: {
+        "& .MuiButtonBase-root.Mui-selected, & .MuiButtonBase-root.Mui-selected:focus, & .MuiButtonBase-root.Mui-selected:hover": {
+          backgroundColor: _apperance.palette.primary
         }
       }
-    }, rest))
-  });
+    },
+    renderInput: params => /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledDateMuiTextField, _objectSpread(_objectSpread({
+      id: id,
+      className: className,
+      name: name,
+      required: required,
+      fullWidth: fullWidth,
+      onBlur: onBlur,
+      helperText: helperText
+    }, params), {}, {
+      error: params.error || error,
+      inputProps: {
+        name
+      }
+    }))
+  }, rest));
 });
-const PuiFormikDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref2, ref) => {
+const PuiFormikDateTimeField = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
   let {
       id,
       className,
@@ -273,7 +143,7 @@ const PuiFormikDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref2, re
     rest = _objectWithoutProperties(_ref2, _excluded2);
   const [field, meta] = (0, _formik.useField)(name);
   const formikContext = (0, _formik.useFormikContext)();
-  const [hasError, setHasError] = _react.default.useState(false);
+  const [hasError, setHasError] = React.useState(false);
   const handleChange = value => {
     if (value) {
       formikContext.setFieldValue(name, value);
@@ -287,10 +157,10 @@ const PuiFormikDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref2, re
     onBlur(event);
     field.onBlur(event);
   };
-  _react.default.useEffect(() => {
+  React.useEffect(() => {
     setHasError(Boolean(meta) && Boolean(meta.touched) && Boolean(meta.error));
   }, [meta]);
-  _react.default.useEffect(() => {
+  React.useEffect(() => {
     if (Boolean(value)) {
       formikContext.setFieldValue(name, value);
     }
@@ -304,7 +174,7 @@ const PuiFormikDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref2, re
     label: label,
     name: name,
     required: required,
-    value: Boolean(field.value) ? format ? (0, _moment.default)(field.value, format) : (0, _moment.default)(field.value) : null,
+    value: Boolean(field.value) ? format ? _moment.default.utc(field.value, format) : _moment.default.utc(field.value) : null,
     format: format,
     minDate: minDate,
     inputFormat: inputFormat,
@@ -319,7 +189,7 @@ const PuiFormikDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref2, re
     onBlur: handleBlur
   }, rest));
 });
-const PuiDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref3, ref) => {
+const PuiDateTimeField = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
   let {
       formik,
       id,
@@ -344,7 +214,7 @@ const PuiDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref3, ref) =>
       onBlur
     } = _ref3,
     rest = _objectWithoutProperties(_ref3, _excluded3);
-  return /*#__PURE__*/_react.default.createElement(formik ? PuiFormikDateTimeField : PuiStandardDateTimeField, _objectSpread({
+  return /*#__PURE__*/React.createElement(formik ? PuiFormikDateTimeField : PuiStandardDateTimeField, _objectSpread({
     ref,
     id,
     className,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portnet/ui",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "Portnet UI",
   "keywords": [
     "react",
@@ -26,7 +26,6 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "axios": "^1.2.2",
-    "dayjs": "^1.11.19",
     "formik": "^2.2.9",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
@@ -89,6 +88,8 @@
     "@storybook/react": "^7.6.4",
     "@storybook/react-webpack5": "^7.6.4",
     "@storybook/testing-library": "^0.2.2",
+    "ajv": "^8.17.1",
+    "ajv-keywords": "^5.1.0",
     "cross-env": "^7.0.3",
     "husky": "^4.3.8",
     "prop-types": "^15.8.1",