@portnet/ui 1.1.3 → 1.1.5

package/dist/components/inputs/PuiDateTimeField.js

@@ -2,7 +2,6 @@
 
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
-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");
@@ -11,239 +10,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
-var _material = require("@mui/material");
-var _styles = require("@mui/material/styles");
-var _DatePicker = require("@mui/x-date-pickers/DatePicker");
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _formik = require("formik");
 var _moment = _interopRequireDefault(require("moment"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var React = _interopRequireWildcard(require("react"));
-var _apperance = require("../../config/apperance");
-var _PuiButton = _interopRequireDefault(require("../buttons/PuiButton"));
-var _StyledMuiTextField = _interopRequireDefault(require("../common/StyledMuiTextField"));
-var _PuiDialog = _interopRequireDefault(require("../others/PuiDialog"));
-var _PuiTextField = _interopRequireDefault(require("./PuiTextField"));
 var _DateTimePickerField = _interopRequireDefault(require("../others/DateTimePickerField"));
 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"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const _excluded = ["id", "className", "sx", "label", "name", "required", "value", "minDate", "maxDate", "inputFormat", "format", "disablePast", "disableFuture", "error", "readOnly", "fullWidth", "disabled", "helperText", "onChange", "onBlur"];
 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 s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(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 (e.includes(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); }
-const StyledDateMuiTextField = (0, _styles.styled)(/*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_StyledMuiTextField.default, _objectSpread({
-  ref: ref
-}, props))))(() => ({
-  "&.MuiFormControl-root": {
-    display: "block",
-    "& .MuiInputAdornment-root .MuiButtonBase-root": {
-      padding: "6px",
-      marginRight: "-8px",
-      "& .MuiSvgIcon-root": {
-        width: "16px",
-        height: "16px"
-      }
-    }
-  }
-}));
-const TimePickerDialog = _ref => {
-  var _ref2, _ref3;
-  let {
-    open,
-    selectedDate,
-    onTimeSelected,
-    onClose,
-    position
-  } = _ref;
-  const defaultTime = (0, _moment.default)(selectedDate).isValid() ? (0, _moment.default)(selectedDate).format("HH:mm") : (0, _moment.default)().format("HH:mm");
-  const [selectedTime, setSelectedTime] = React.useState(defaultTime);
-  const handleTimeChange = event => {
-    setSelectedTime(event.target.value);
-  };
-  const handleOk = () => {
-    onTimeSelected(selectedTime);
-    onClose();
-  };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_PuiDialog.default, {
-    open: open,
-    onClose: onClose,
-    slotProps: {
-      backdrop: {
-        style: {
-          backgroundColor: "transparent",
-          boxShadow: "none"
-        }
-      }
-    },
-    hideBackdrop: true,
-    PaperProps: {
-      elevation: 5,
-      sx: {
-        position: "fixed",
-        alignContent: "center",
-        justifyContent: "center",
-        alignItems: "center",
-        backgroundColor: "white",
-        height: 58,
-        width: 340,
-        maxWidth: "720px!important",
-        left: (_ref2 = (position === null || position === void 0 ? void 0 : position.left) - 420 / 2) !== null && _ref2 !== void 0 ? _ref2 : 0,
-        top: (_ref3 = (position === null || position === void 0 ? void 0 : position.top) + 36) !== null && _ref3 !== void 0 ? _ref3 : 36
-      }
-    },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-      sx: {
-        display: "flex",
-        gap: 1
-      },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_PuiTextField.default, {
-        id: "time",
-        type: "time",
-        value: selectedTime,
-        onChange: handleTimeChange,
-        InputLabelProps: {
-          shrink: true
-        },
-        inputProps: {
-          step: 60
-        },
-        formik: false,
-        sx: {
-          width: 150
-        }
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_PuiButton.default, {
-        onClick: onClose,
-        sx: {
-          color: _apperance.palette.primary
-        },
-        children: "Cancel"
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_PuiButton.default, {
-        onClick: handleOk,
-        sx: {
-          color: _apperance.palette.primary
-        },
-        children: "OK"
-      })]
-    })
-  });
-};
-const PuiStandardDateTimeField = /*#__PURE__*/React.forwardRef((_ref4, ref) => {
-  let {
-      id,
-      className,
-      sx,
-      label,
-      name,
-      required,
-      value,
-      minDate,
-      maxDate,
-      inputFormat = "YYYY-MM-DDTHH:mm:ss.SSSZ",
-      format = "YYYY-MM-DDTHH:mm:ss.SSSZ",
-      disablePast,
-      disableFuture,
-      error,
-      readOnly,
-      fullWidth,
-      disabled,
-      helperText,
-      onChange,
-      onBlur
-    } = _ref4,
-    rest = _objectWithoutProperties(_ref4, _excluded);
-  const textFieldRef = React.useRef(null);
-  const [dateTime, setDateTime] = React.useState(value || null);
-  const minDateObj = minDate ? (0, _moment.default)(minDate, format).toDate() : undefined;
-  const maxDateObj = maxDate ? (0, _moment.default)(maxDate, format).toDate() : undefined;
-  const [displayedDateTime, setDisplayedDateTime] = React.useState(value || null);
-  const [openTimePicker, setOpenTimePicker] = React.useState(false);
-  const [dialogPosition, setDialogPosition] = React.useState();
-  const handleDateChange = date => {
-    if (date) {
-      setDateTime((0, _moment.default)(date).format(format));
-      setOpenTimePicker(true);
-    }
-  };
-  const handleTimeSelected = time => {
-    const newDateTime = (0, _moment.default)(dateTime).format("YYYY-MM-DD") + "T" + time;
-    const updatedDateTime = (0, _moment.default)(newDateTime, "YYYY-MM-DDTHH:mm").format(format);
-    setDateTime(updatedDateTime);
-    setDisplayedDateTime(updatedDateTime);
-    onChange(updatedDateTime);
-  };
-  React.useEffect(() => {
-    const updatePosition = () => {
-      if (textFieldRef !== null && textFieldRef !== void 0 && textFieldRef.current) {
-        const rect = textFieldRef.current.getBoundingClientRect();
-        console.log("rect : ", rect);
-        setDialogPosition({
-          left: rect.left + rect.width / 2 + window.scrollX,
-          top: rect.top > 310 ? rect.top - 80 : rect.top + 80
-        });
-      }
-    };
-    updatePosition();
-    window.addEventListener("resize", updatePosition);
-    window.addEventListener("scroll", updatePosition);
-    return () => {
-      window.removeEventListener("resize", updatePosition);
-      window.removeEventListener("scroll", updatePosition);
-    };
-  }, []);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_DatePicker.DatePicker, _objectSpread({
-      ref: textFieldRef,
-      sx: sx,
-      ampm: false,
-      label: label,
-      inputFormat: "DD/MM/yyyy HH:mm",
-      value: displayedDateTime,
-      onChange: handleDateChange,
-      disablePast: disablePast,
-      disableFuture: disableFuture,
-      disabled: disabled,
-      maxDate: maxDateObj,
-      minDate: minDateObj,
-      readOnly: readOnly,
-      PopperProps: {
-        sx: {
-          "& .MuiButtonBase-root.Mui-selected, & .MuiButtonBase-root.Mui-selected:focus, & .MuiButtonBase-root.Mui-selected:hover": {
-            backgroundColor: _apperance.palette.primary
-          }
-        }
-      },
-      renderInput: params => /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledDateMuiTextField, _objectSpread(_objectSpread({}, params), {}, {
-        ref: textFieldRef,
-        id: id,
-        className: className,
-        label: label,
-        name: name,
-        required: required,
-        fullWidth: fullWidth,
-        onBlur: onBlur,
-        helperText: helperText,
-        error: error,
-        inputProps: _objectSpread(_objectSpread({}, params.inputProps), {}, {
-          readOnly: readOnly
-        })
-      }))
-    }, rest)), /*#__PURE__*/(0, _jsxRuntime.jsx)(TimePickerDialog, {
-      open: openTimePicker,
-      selectedDate: dateTime,
-      onTimeSelected: handleTimeSelected,
-      onClose: () => setOpenTimePicker(false),
-      position: dialogPosition
-    })]
-  });
-});
-const PuiFormikDateTimeField = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(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 (e.includes(n)) continue; t[n] = r[n]; } return t; }
+const PuiDateTimeField = /*#__PURE__*/_react.default.forwardRef((_ref, ref) => {
   let {
       id,
       className,
@@ -265,11 +47,11 @@ const PuiFormikDateTimeField = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
       helperText,
       onChange,
       onBlur
-    } = _ref5,
-    rest = _objectWithoutProperties(_ref5, _excluded2);
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
   const [field, meta] = (0, _formik.useField)(name);
   const formikContext = (0, _formik.useFormikContext)();
-  const [hasError, setHasError] = React.useState(false);
+  const [hasError, setHasError] = _react.default.useState(false);
   const minDateObj = minDate ? (0, _moment.default)(minDate, format).toDate() : undefined;
   const maxDateObj = maxDate ? (0, _moment.default)(maxDate, format).toDate() : undefined;
   const handleChange = value => {
@@ -280,15 +62,14 @@ const PuiFormikDateTimeField = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
     onBlur(event);
     field.onBlur(event);
   };
-  React.useEffect(() => {
-    setHasError(Boolean(meta) && Boolean(meta.touched) && Boolean(meta.error));
+  _react.default.useEffect(() => {
+    setHasError(meta.touched && meta.error);
   }, [meta]);
-  React.useEffect(() => {
-    if (Boolean(value)) {
+  _react.default.useEffect(() => {
+    if (value) {
       formikContext.setFieldValue(name, value);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [value]);
+  }, [value, formikContext, name]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_DateTimePickerField.default, _objectSpread({
     ref: ref,
     id: id,
@@ -297,83 +78,33 @@ const PuiFormikDateTimeField = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
     label: label,
     name: name,
     required: required,
-    value: Boolean(field.value) ? format ? _moment.default.utc(field.value, format) : _moment.default.utc(field.value) : null,
+    value: value,
     format: format,
     minDate: minDateObj,
     maxDate: maxDateObj,
     inputFormat: inputFormat,
     disableFuture: disableFuture,
     disablePast: disablePast,
-    error: error || hasError,
+    error: hasError || error,
     readOnly: readOnly,
     fullWidth: fullWidth,
     disabled: disabled,
-    helperText: hasError && Boolean(meta.error) ? meta.error : helperText !== null && helperText !== void 0 ? helperText : "",
+    helperText: helperText || meta.error,
     onChange: handleChange,
     onBlur: handleBlur
   }, rest));
 });
-const PuiDateTimeField = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
-  let {
-      formik,
-      id,
-      className,
-      sx,
-      label,
-      name,
-      required,
-      value,
-      minDate,
-      maxDate,
-      inputFormat,
-      format,
-      disablePast,
-      disableFuture,
-      error,
-      readOnly,
-      fullWidth,
-      disabled,
-      helperText,
-      onChange,
-      onBlur
-    } = _ref6,
-    rest = _objectWithoutProperties(_ref6, _excluded3);
-  return /*#__PURE__*/React.createElement(formik ? PuiFormikDateTimeField : PuiStandardDateTimeField, _objectSpread({
-    ref,
-    id,
-    className,
-    sx,
-    label,
-    name,
-    required,
-    value,
-    minDate,
-    maxDate,
-    inputFormat,
-    format,
-    disablePast,
-    disableFuture,
-    error,
-    readOnly,
-    fullWidth,
-    disabled,
-    helperText,
-    onChange,
-    onBlur
-  }, rest));
-});
 PuiDateTimeField.propTypes = {
   id: _propTypes.default.string,
   className: _propTypes.default.string,
   sx: _propTypes.default.object,
   label: _propTypes.default.string,
-  name: _propTypes.default.string,
+  name: _propTypes.default.string.isRequired,
   helperText: _propTypes.default.string,
   inputFormat: _propTypes.default.string,
   format: _propTypes.default.string,
   minDate: _propTypes.default.string,
   maxDate: _propTypes.default.string,
-  formik: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
   required: _propTypes.default.bool,
   error: _propTypes.default.bool,
@@ -382,18 +113,16 @@ PuiDateTimeField.propTypes = {
   readOnly: _propTypes.default.bool,
   fullWidth: _propTypes.default.bool,
   onChange: _propTypes.default.func,
-  onBlur: _propTypes.default.func
+  onBlur: _propTypes.default.func,
+  value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.instanceOf(Date)])
 };
 PuiDateTimeField.defaultProps = {
-  inputFormat: "DD/MM/YYYY HH:mm",
-  formik: true,
-  disabled: false,
-  required: false,
-  error: false,
-  fullWidth: true,
-  readOnly: false,
+  inputFormat: "YYYY-MM-DDTHH:mm:ss.SSSZ",
+  format: "YYYY-MM-DDTHH:mm:ss.SSSZ",
   disablePast: false,
   disableFuture: false,
+  readOnly: false,
+  fullWidth: true,
   onChange: () => {},
   onBlur: () => {}
 };

package/dist/components/others/DateTimePickerField.js

@@ -11,16 +11,21 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _formik = require("formik");
 var _react = _interopRequireWildcard(require("react"));
 var _StyledMuiTextField = _interopRequireDefault(require("../common/StyledMuiTextField"));
+var _utc = _interopRequireDefault(require("dayjs/plugin/utc"));
+var _timezone = _interopRequireDefault(require("dayjs/plugin/timezone"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+_dayjs.default.extend(_utc.default);
+_dayjs.default.extend(_timezone.default);
 const DateTimePickerField = _ref => {
   let {
     label,
     name,
     value: propValue,
     onChange,
+    timezoneOffset = "Africa/Casablanca",
     required = true,
     error = false,
     helperText = null,
@@ -31,21 +36,29 @@ const DateTimePickerField = _ref => {
   (0, _react.useEffect)(() => {
     const formatValue = value => {
       if (!value) return "";
-      const parsedDate = (0, _dayjs.default)(value);
+      const parsedDate = (0, _dayjs.default)(value).tz(timezoneOffset);
       if (!parsedDate.isValid()) return "";
       return parsedDate.format("YYYY-MM-DDTHH:mm");
     };
     const formattedValue = formatValue(propValue || (field === null || field === void 0 ? void 0 : field.value));
     setSelectedDateTime(formattedValue);
-  }, [propValue, field === null || field === void 0 ? void 0 : field.value]);
+  }, [propValue, field === null || field === void 0 ? void 0 : field.value, timezoneOffset]);
   const handleDateTimeChange = event => {
     const newValue = event.target.value;
+    if (!newValue) {
+      setSelectedDateTime("");
+      helpers.setValue("");
+      if (onChange) onChange("");
+      return;
+    }
+    const parsedDate = (0, _dayjs.default)(newValue).tz(timezoneOffset);
+    const formattedValue = parsedDate.format("YYYY-MM-DDTHH:mm:ss.SSSZ");
     setSelectedDateTime(newValue);
-    const isoValue = newValue ? (0, _dayjs.default)(newValue).toISOString() : "";
-    helpers.setValue(isoValue);
-    console.log("🚀 ~ handleDateTimeChange ~ isoValue:", isoValue);
-    if (onChange) onChange(isoValue);
+    helpers.setValue(formattedValue);
+    if (onChange) onChange(formattedValue);
   };
+  console.log("error : ", error);
+  console.log("helperText : ", helperText);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Stack.default, {
     component: "form",
     noValidate: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portnet/ui",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Portnet UI",
   "keywords": [
     "react",