version bump

Author: shivani170

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.0.95-beta-1",
+    "version": "0.0.95-beta-5",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -32,6 +32,8 @@ import { DATE_PICKER_IDS, DATE_PICKER_PLACEHOLDER, customDayStyles } from './con
 import './datePicker.scss'
 import { ReactComponent as CalendarIcon } from '../../../Assets/Icon/ic-calendar.svg'
 import { DATE_TIME_FORMATS } from '../../../Common'
+import 'react-dates/initialize'
+import 'react-dates/lib/css/_datepicker.css'
 
 const timePickerStyles = getTimePickerStyles()
 
@@ -58,14 +60,16 @@ const DateTimePicker = ({
         setFocused(focused)
     }
     const handleDateChange = (event) => {
-        onChange(updateDate(dateObject, event.toDate()))
+        onChange(updateDate(dateObject, event?.toDate()))
     }
 
     const handleTimeChange = (option) => {
         onChange(updateTime(dateObject, option.value))
     }
 
-    const isOutsideRange = (day) => moment(startDate).diff(day, 'days') >= 0
+    // To disable dates before the end date
+    const isOutsideRange = (day) => moment(startDate).diff(day, 'days') >= 1
+
     return (
         <div>
             <label className={`form__label ${required ? 'dc__required-field' : ''}`} htmlFor={id}>

src/Shared/Components/DatePicker/DateTimePicker.tsx

@@ -130,6 +130,10 @@ export const updateTime = (currentDateObj: Date, timeString: string) => {
  * Updates the date in the given date object and returns the updated object
  */
 export const updateDate = (currentDateObj: Date, newDate: Date) => {
+    // In case of null date, it will return the same date
+    if (!newDate) {
+        return currentDateObj
+    }
     const day = newDate.getDate()
     const month = newDate.getMonth()
     const fullYear = newDate.getFullYear()