diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js index b57e14262b14019c2609554b8cbedb0c8d0bc372..856e1b405a9a00cde282b813f5d433a2b0c26c02 100644 --- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js +++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js @@ -84,7 +84,6 @@ class SignupEventInvitationRightPanel extends React.Component { return ( - {title} Start : {moment(startDate + " " + startTime).format("DD-MMM-YYYY hh:mm A")}
End : {moment(endDate + " " + endTime).format("DD-MMM-YYYY hh:mm A")} diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js index 0d238b33c357ad61643372c1bc9d318c43cf08f7..e2c0dd85f442195680dd17d512beaaba3bfb38ba 100644 --- a/src/containers/EventInvitation/InvitationScreen.js +++ b/src/containers/EventInvitation/InvitationScreen.js @@ -83,9 +83,9 @@ class InvitationScreen extends PureComponent { UNSAFE_componentWillReceiveProps(nextProps) { - console.log("nextProps"); - console.log(nextProps); - console.log(""); + // console.log("nextProps"); + // console.log(nextProps); + // console.log(""); this.setState({ eventProfileDetail: nextProps.eventProfileDetail @@ -122,6 +122,29 @@ class InvitationScreen extends PureComponent { }); } + if (nextProps.eventProfileDetailError !== null) { + + if (nextProps.eventProfileDetailError.data && nextProps.eventProfileDetailError.data.error) { + + this.setState({ + responseText: nextProps.eventProfileDetailError.data.error.message, + isEventSubmited: true + }); + + } else { + // this.props.actions.showToast({ + // text: this.props.t("eventSignup.updateInvitationErrorMsg"), + // duration: 2000, + // position: "bottom" + // }); + + this.setState({ + responseText: this.props.t("eventSignup.updateInvitationErrorMsg"), + isEventSubmited: true + }); + } + } + if (nextProps.updateInvitationResError !== null) { if (nextProps.updateInvitationResError.data && nextProps.updateInvitationResError.data.error) { @@ -443,6 +466,7 @@ const mapStateToProps = (state) => { return ({ eventProfileDetail: signupEventSelectors.getEventProfileDetail(state), + eventProfileDetailError: signupEventSelectors.getEventProfileDetailError(state), // isEventProfilePending: signupEventSelectors.getIsEventProfilePending(state), updateInvitationRes: signupEventSelectors.getUpdateInvitationRes(state), isUpdateEventInvitationPending: signupEventSelectors.getIsUpdateEventInvitationPending(state), diff --git a/src/containers/EventInvitation/InvitationScreenStyle.js b/src/containers/EventInvitation/InvitationScreenStyle.js index e7bd96fbdf3ec8395ab89c15d9659ecc8b7be0bb..a2586c55a40dadfb57795d091077f365f153df53 100644 --- a/src/containers/EventInvitation/InvitationScreenStyle.js +++ b/src/containers/EventInvitation/InvitationScreenStyle.js @@ -265,10 +265,11 @@ export default ( color: theme.palette.themeColors.table.color, border: "1px solid #454d55", overflowX: 'auto', - display:'block', + // display:'block', width:' fit-content', maxWidth: '100%', borderBottom:'none', + margin:"20px auto 0", '& tr': { display: "table-row", '& td': { diff --git a/src/containers/MembersList/MembersList.js b/src/containers/MembersList/MembersList.js index 58a3542ae2d7dfb03a2928c5d286b719928a70f5..c7e8c294eee4ecc5d782220a63012f8703f46dfc 100644 --- a/src/containers/MembersList/MembersList.js +++ b/src/containers/MembersList/MembersList.js @@ -1,5 +1,4 @@ import React, { Component } from 'react'; -import CustomScroll from 'react-custom-scrollbars'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/styles'; import stylesFunc from './MembersList.styles'; @@ -7,10 +6,10 @@ import { MemberItem } from '../../componets'; import { profileSelectors } from 'Resource/profile'; import { contactsSelectors } from 'Resource/contacts/index'; import { userListSelectors } from '../../core/resource/userlist/index'; +import { List, AutoSizer } from 'react-virtualized'; import 'react-contexify/dist/ReactContexify.min.css'; const styles = theme => stylesFunc(theme); - const mapStateToProps = state => { return { profile: profileSelectors.getUserProfile(state), @@ -23,7 +22,33 @@ class MembersList extends Component { constructor(props) { super(props); - this.state = { toLoopOver: [] }; + this.state = {}; + this.listRef = React.createRef(); + } + + componentDidUpdate(prevProps, prevState) { + if (prevProps.members && this.props.members) { + const prevCount = Object.keys(prevProps.members).length; + const currentCount = Object.keys(this.props.members).length; + if (prevCount !== currentCount) { + this.updateGrid(); + return; + } + } + + if (prevProps.selectedMembers && this.props.selectedMembers) { + const prevCount = Object.keys(prevProps.selectedMembers).length; + const currentCount = Object.keys(this.props.selectedMembers).length; + if (prevCount !== currentCount) { + this.updateGrid(); + } + } + } + + updateGrid = () => { + if (this.listRef && this.listRef.current) { + this.listRef.current.forceUpdateGrid(); + } } sortList = (contactsObj, isRoom) => { @@ -39,22 +64,16 @@ class MembersList extends Component { }); return list; - }; + } - getLetterToShow = (member, letters, isRoom) => { + getLetterToShow = (member, isRoom) => { let letter = this.getNameToShow(member, isRoom) .trim() .substring(0, 1) .toUpperCase(); - if (!letters[letter]) { - letters[letter] = letter; - } else { - letter = null; - } - return letter; - }; + } getNameToShow = (member, isRoom) => { const { name, alias, names, surnames } = member; @@ -68,43 +87,71 @@ class MembersList extends Component { } return `${names} ${surnames}`; - }; + } - render() { + renderMemberItem = ({ index, style }) => { const { - classes, contacts, members, selectMember, t, selectedMembers, showMemberDetails, isAddMembers, getUser, isFullWidth, - isRoom, fromDialog, fromContactDialog, fromCreateGroup, fromGroupCallEdit, adminLabel, profile, getStatus, filter, + members, selectMember, t, selectedMembers, showMemberDetails, isAddMembers, isFullWidth, + isRoom, fromContactDialog, adminLabel, profile, getStatus, filter, getUser, contacts, } = this.props; - const letters = {}; - let toLoopOver = contacts ? contacts : members; - - if (toLoopOver) { - toLoopOver = this.sortList(toLoopOver, isRoom); + const sortedLit = this.sortList(contacts ? contacts : members, isRoom); + const member = sortedLit[index]; + const prevMember = sortedLit[index - 1]; + const currentLetter = this.getLetterToShow(member, isRoom); + let letterToShow = null; + + if (prevMember) { + const prevLetter = this.getLetterToShow(prevMember, isRoom); + if (prevLetter !== currentLetter) { + letterToShow = currentLetter; + } + } else { + letterToShow = currentLetter; } + return ( +
+ +
+ ); + } + + render() { + const { classes, contacts, members, t, fromDialog, fromContactDialog, fromCreateGroup, fromGroupCallEdit } = this.props; + let list = contacts ? contacts : members; + const listLen = Object.keys(list).length; + + const isClass = isCheckboxElem !== undefined ? false : true; return (
- - - +
+ {listLen > 0 && +
+ + {({ width, height }) => ( + + )} + +
+ } + {listLen === 0 && t && +
+

{t('createGroup.noSearchResult')}

+
+ } +
); } } export default connect( - mapStateToProps + mapStateToProps, + null, )(withStyles(styles)(MembersList)); diff --git a/src/containers/MembersList/MembersList.styles.js b/src/containers/MembersList/MembersList.styles.js index 05c20ddff53a3f6bd977ffa3da7570e68b79fc7d..f4ba371b4ecea396d322147280ee509def81bd34 100644 --- a/src/containers/MembersList/MembersList.styles.js +++ b/src/containers/MembersList/MembersList.styles.js @@ -1,33 +1,55 @@ export default theme => ({ wrapper: { - minWidth: '100%', borderTop: '1px solid ' + theme.palette.themeColors.colors.text11, marginTop: 17, + scrollbarColor: `${theme.palette.themeColors.colors.scrollColor} transparent !important`, + '& .box': { + overflowX: 'hidden !important', + overflowY: 'auto !important' + }, + '& *::-webkit-scrollbar': { + WebkitAppearance: 'none', + width: 12, + }, + '& *::-webkit-scrollbar-thumb': { + borderRadius: 10, + backgroundColor: theme.palette.themeColors.colors.scrollColor, + width: 12, + minHeight: 200, + boxShadow: 'none', + }, '& > div': { - position: 'absolute !important', - width: '95% !important', - height: '83% !important', - } + position: 'absolute', + width: '100%', + height: 'calc(100% - 130px)', + }, + }, + listWrap: { + height: '100%', + display: 'flex', + flexDirection: 'column', }, list: { + maxWidth: 293, + }, + ulList: { maxHeight: 'calc(100vh - 250px)', - maxWidth: 274 + paddingRight: '16px', }, dialogList: { - maxHeight: 'calc(100vh - 310px)', - maxWidth: '330px' - }, - marginList: { - marginRight: 20 + maxWidth: 360, }, callEditList: { - maxWidth: 260 + maxWidth: 275, + }, + marginList: { + marginRight: 20, }, noSearchResult: { textAlign: 'center', marginTop: 15, '& p': { - color: '#494949' - } - } + color: '#494949', + }, + }, }); \ No newline at end of file diff --git a/src/core/resource/signupevent/SignupEventReducer.js b/src/core/resource/signupevent/SignupEventReducer.js index e839fc9fcb8e34e57095295a2397d9c6e5bb6445..30f7f90d520ac049d331d6050b555d20dd260260 100644 --- a/src/core/resource/signupevent/SignupEventReducer.js +++ b/src/core/resource/signupevent/SignupEventReducer.js @@ -13,6 +13,7 @@ const initialState = { isEventProfilePending: false, // eventProfileRes: null, eventProfileDetail: null, + eventProfileDetailError: null, // participantsList: [], isEventHistoryPending: false, eventProfileData: null, @@ -107,6 +108,7 @@ const handleGetEventProfileRequest = state => { ...{ isEventProfilePending: true, eventProfileDetail: null, + eventProfileDetailError: null, updateInvitationRes: null, updateInvitationResError: null } @@ -124,14 +126,18 @@ const handleGetEventProfileSuccess = (state, payload) => { ...{ isEventProfilePending: false, eventProfileDetail: payload.eventProfileDetail, - // participantsList: payload.participantsList + eventProfileDetailError: null } }); } -const handleGetEventProfileError = state => ({ +const handleGetEventProfileError = (state, payload) => ({ ...state, - ...{ isEventProfilePending: false, eventProfileDetail: null } + ...{ + isEventProfilePending: false, + eventProfileDetail: null, + eventProfileDetailError: payload + } }); //getEventHistory diff --git a/src/core/resource/signupevent/SignupEventSagas.js b/src/core/resource/signupevent/SignupEventSagas.js index 58e67a9cfb2881a540a2fc820e428a501f15cbcf..64a7637893ad2c300bdbc65bc4879b061b18d555 100644 --- a/src/core/resource/signupevent/SignupEventSagas.js +++ b/src/core/resource/signupevent/SignupEventSagas.js @@ -193,34 +193,42 @@ function* handleGetEventProfileRequest(payload) { console.log(accessToken); console.log(""); - const res = yield call(SignupEventService.getEventProfile, eventSignupManager, accountId, eventId, isParticipants, accessToken); - console.log('eventProfileRes', res); + try { + const res = yield call(SignupEventService.getEventProfile, eventSignupManager, accountId, eventId, isParticipants, accessToken); + + console.log('eventProfileRes', res); - if (res && res.error) { + if (res && res.error) { - const isExp = yield call(checkExpError, res, handleGetEventProfileRequest, action.payload); + const isExp = yield call(checkExpError, res, handleGetEventProfileRequest, action.payload); - if (res.data && res.data.error) { - console.log('[ERROR] -> getEventProfile', res.data.error.message); - } + if (res.data && res.data.error) { + console.log('[ERROR] -> getEventProfile', res.data.error.message); + } + + if (isExp) { + console.log('[ERROR] -> getEventProfile - Token expired'); + } + + yield put(actions.getEventProfileError(res)); - if (isExp) { - console.log('[ERROR] -> getEventProfile - Token expired'); } - return; - } else if (res && res.data && res.data.eventProfileData) { + if (res && res.data && res.data.eventProfileData) { - console.log('[RESULT] -> getEventProfile', res.data); + console.log('[RESULT] -> getEventProfile', res.data); - const { eventProfile, participantList } = res.data.eventProfileData; - eventProfileDetail = eventProfile; - participantsList = participantList; + const { eventProfile, participantList } = res.data.eventProfileData; + eventProfileDetail = eventProfile; + participantsList = participantList; - } + yield put(actions.getEventProfileSuccess({ eventProfileDetail, participantsList })); + } - yield put(actions.getEventProfileSuccess({ eventProfileDetail, participantsList })); + } catch(error){ + yield put(actions.getEventProfileError(error)); + } } } diff --git a/src/core/resource/signupevent/SignupEventSelectors.js b/src/core/resource/signupevent/SignupEventSelectors.js index 4600c7ebe51a5dbf1b9ddb18f1328b78fb90df7f..0fc7cf65044a022edf518f7650cafe705cfbad04 100644 --- a/src/core/resource/signupevent/SignupEventSelectors.js +++ b/src/core/resource/signupevent/SignupEventSelectors.js @@ -14,6 +14,7 @@ const getCreateEventSignupRes3 = state => state.signupEvent.createEventSignupRes const getEventProfileRes = state => state.signupEvent; const getEventProfileData = state => state.signupEvent.eventProfileData; const getEventProfileDetail = state => state.signupEvent.eventProfileDetail; +const getEventProfileDetailError = state => state.signupEvent.eventProfileDetailError; const getEventInvitationRes = state => state.signupEvent.eventInvitationDetatil; const getUpdateInvitationRes = state => state.signupEvent.updateInvitationRes; const getUpdateInvitationResError = state => state.signupEvent.updateInvitationResError; @@ -39,6 +40,7 @@ export default { getEventInvitationRes, getUpdateInvitationRes, getEventProfileDetail, + getEventProfileDetailError, getIsGetEventInvitationPending, getAccountsRes, getIsUpdateEventInvitationPending, diff --git a/src/layouts/EventSignupHistory/EventSignupHistory.js b/src/layouts/EventSignupHistory/EventSignupHistory.js index eaa3e0bef2a4cd9695aaec80b4382f68b33f0dd0..b96552f9abfdaa7a3d119862e19799045836cdb9 100644 --- a/src/layouts/EventSignupHistory/EventSignupHistory.js +++ b/src/layouts/EventSignupHistory/EventSignupHistory.js @@ -160,9 +160,9 @@ class EventSignupHistory extends Component { UNSAFE_componentWillReceiveProps(nextProps) { - console.log(""); - console.log("nextProps ", nextProps); - console.log(""); + // console.log(""); + // console.log("nextProps ", nextProps); + // console.log(""); this.setState({ eventHistoryRes: nextProps.eventHistoryRes, diff --git a/src/layouts/EventSignupInvitation/EventSignupInvitation.js b/src/layouts/EventSignupInvitation/EventSignupInvitation.js index 53400d06f162ae8339661816c33d057bf538be88..ee7cd5c6d35f04f7e050868c3a91bc68dc600312 100644 --- a/src/layouts/EventSignupInvitation/EventSignupInvitation.js +++ b/src/layouts/EventSignupInvitation/EventSignupInvitation.js @@ -160,9 +160,9 @@ class EventSignupInvitation extends React.Component { UNSAFE_componentWillReceiveProps(nextProps) { - console.log("nextProps"); - console.log(nextProps); - console.log(""); + // console.log("nextProps"); + // console.log(nextProps); + // console.log(""); this.setState({ invitationDetails: nextProps.eventInvitationDetatil diff --git a/src/layouts/EventSignupNew/EventSignupNew.js b/src/layouts/EventSignupNew/EventSignupNew.js index e7a9c87f0703fbd0b09ea2a7832d422d389beda9..69ffe5bc385b2739de77a0def156a30a9e1cbbbd 100644 --- a/src/layouts/EventSignupNew/EventSignupNew.js +++ b/src/layouts/EventSignupNew/EventSignupNew.js @@ -128,7 +128,7 @@ class EventSignupNew extends Component { } async componentDidMount() { - this.setDefaultState(); + this.setDefaulTimezone(); this.setDefaultStartTime(); this.setDefaultEndTime(); const { clearStore } = this.props.actions; @@ -154,6 +154,7 @@ class EventSignupNew extends Component { } ); } else { + //await this.props.navigateToSignupEvent( "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" ); } } @@ -216,23 +217,22 @@ class EventSignupNew extends Component { displayCancelModal: true, pathToRedirect: redirectPath }); - return false; } - return null; }; toggleModal = () => { const { displayCancelModal } = this.state; this.setState({ displayCancelModal: !displayCancelModal }); }; - discardChanges = () => { + discardChanges = async () => { const { router } = this.props; const { pathToRedirect } = this.state; this.toggleModal(); - this.setState({ shouldLeave: true }, () => { + this.setState({ shouldLeave: true }, async () => { if (pathToRedirect) { + await this.setDefaultState(); router.push(pathToRedirect); } else { router.goBack(); @@ -240,6 +240,55 @@ class EventSignupNew extends Component { }); }; setDefaultState = () => { + this.setState({ + displayCancelModal: false, + historyPage: true, + calendar: "", + isTitleEmptyErr: false, + //add by Bheem + isLoader: false, + editMode: false, + editModeInternalUse: false, + isCreateEventPending: false, + isDisabledTimes: false, + eventTitle: "", + eventId: "", + eventTitle: "", + eventDesc: "", + eventAddFormStep: 1, + backBtnStep: 0, + isPublishTs: 0, + saveAndNxtBtn: false, + isSelectedParticipents: false, + isSchedule: false, + isReminder: false, + isMultiTimeSlot: false, + notifyOnUpdate: false, + showEventSaveModal: false, + showPublishModal: false, + showScheduleLaterModal: false, + showLocationModal: false, + displayCancelModal: false, + isNotifyAdmin: false, + historyPage: false, + timeslotTitle: "", + reminder: { value: "", label: "", ms: 0 }, + timezone: { value: "", label: "" }, + scheduleTimezone: { value: "", label: "" }, + location: { lat: "", lng: "", latitude: "", longitude: "", address: "" }, + inviteBy: "by_contacts", + inviteNumbers: [], + inviteEmails: [], + inviteUsers: [], + inviteUsersTmp: [], + timeSlotArr: [], + accountsDetails: this.props.accountsDetails + }); + this.setDefaulTimezone(); + this.setDefaultStartTime(); + this.setDefaultEndTime(); + }; + setDefaulTimezone = () => { const tz = this.getTimeZone(null); this.setState({ timezone: tz, @@ -1317,6 +1366,9 @@ class EventSignupNew extends Component { } }; nextStep = () => { + if(this.state.shouldLeave){ + return; + } let step = this.state.eventAddFormStep; step = step >= 3 ? step : step + 1; this.setState({ eventAddFormStep: step, isLoader: false }); @@ -1391,47 +1443,12 @@ class EventSignupNew extends Component { }; goToNewSignup = async () => { await this.setDefaultState(); - this.setDefaultStartTime(); - this.setDefaultEndTime(); this.setState({ displayCancelModal: false, historyPage: true, - calendar: "", - isLoader: false, editMode: false, editModeInternalUse: false, - isCreateEventPending: false, - eventTitle: "", - eventId: "", - eventTitle: "", - eventDesc: "", - eventAddFormStep: 1, - backBtnStep: 0, - saveAndNxtBtn: false, - publishedTs: 0, - isSelectedParticipents: false, - isSchedule: false, - isReminder: false, - isMultiTimeSlot: false, - notifyOnUpdate: false, - showEventSaveModal: false, - showPublishModal: false, - showScheduleLaterModal: false, - showLocationModal: false, - displayCancelModal: false, - isNotifyAdmin: false, - timeslotTitle: "", - reminder: { value: "", label: "", ms: 0 }, - timezone: { value: "", label: "" }, - scheduleTimezone: { value: "", label: "" }, - location: { lat: "", lng: "", latitude: "", longitude: "", address: "" }, - inviteBy: "by_contacts", - inviteNumbers: [], - inviteEmails: [], - inviteUsers: [], - inviteUsersTmp: [], - timeSlotArr: [], - accountsDetails: this.props.accountsDetails }, () => { + }, () => { browserHistory.push("/event/newsignup"); }); @@ -1848,6 +1865,7 @@ class EventSignupNew extends Component { locale={locale} isEdit={isEdit} isDisabled={isDisabledTimes} + className={'endDateTime'} /> ({ } }, '& .react-datepicker-popper': { - width: '88%', + width: '78%', zIndex: 3, }, '& .react-datepicker__header': { @@ -223,7 +223,7 @@ export default (theme,backArrow, forwardArrow) => ({ textTransform: 'none', color: theme.palette.themeColors.scheduleMessage.textColor, transition: 'all 0.2s ease-out', - zIndex:'9', + zIndex:'0', }, // '&:before': { // top: 0, @@ -268,7 +268,8 @@ export default (theme,backArrow, forwardArrow) => ({ '&:after': {color:"#ffffffa3 !important"}, '& > .Select-control ': { backgroundColor:theme.palette.themeColors.disable.background, - cursor: 'not-allowed' + cursor: 'not-allowed', + zIndex:'-2', }, '& .Select-value':{ '& > .Select-value-label':{ @@ -375,7 +376,7 @@ export default (theme,backArrow, forwardArrow) => ({ textTransform: 'none', color: theme.palette.themeColors.scheduleMessage.textColor, transition: 'all 0.2s ease-out', - zIndex:'9', + zIndex:'-1', }, '&:before': { top: 0, @@ -400,7 +401,8 @@ export default (theme,backArrow, forwardArrow) => ({ '&:before, &:after': {color:"#ffffffa3 !important"}, '& > .Select-control ': { backgroundColor:theme.palette.themeColors.disable.background, - cursor: 'not-allowed' + cursor: 'not-allowed', + zIndex:'-2', }, '& .Select-value':{ '& > .Select-value-label':{ @@ -505,9 +507,9 @@ export default (theme,backArrow, forwardArrow) => ({ input: { width: '100%', '& textarea': { - maxHeight:'74px !important', - overflow: 'auto !important', - height:"auto !important", + // maxHeight:'74px !important', + // overflow: 'auto !important', + // height:"auto !important", scrollbarColor: theme.palette.themeColors.colors.scrolBarColor + ' rgb(0,0,0,0) !important', scrollbarWidth: 'thin !important', width: '100%', @@ -533,7 +535,7 @@ export default (theme,backArrow, forwardArrow) => ({ }, datePikerIcons: { position: 'relative', - zIndex: 1, + zIndex: -1, '& .left-icon': { position: 'absolute', top: -22, @@ -557,8 +559,14 @@ export default (theme,backArrow, forwardArrow) => ({ background: theme.palette.themeColors.exportCsvPanel.datePickerBackground, border: 'none', width: '100%', + '&.endDateTime':{ + position:'absolute', + overflow:'hidden', + top:'0', + }, '& .react-datepicker__month-container': { - width: '100%' + width: '100%', + boxShadow:"0px 6px 20px 2px rgba(0,0,0,0.60)", } }, customDatePicker: { @@ -586,9 +594,13 @@ export default (theme,backArrow, forwardArrow) => ({ backgroundColor:theme.palette.themeColors.disable.background, color: "#ffffffa3", border:'none', - cursor: 'not-allowed' + cursor: 'not-allowed', + '&.datePikerIcons':{ + zIndex:'2' + } } }, + loadingSpinner:{position:'relative', zIndex:"999"}, eventSidebarWrap: { position: 'fixed', top: 129, @@ -1022,6 +1034,6 @@ export default (theme,backArrow, forwardArrow) => ({ color: theme.palette.themeColors.colors.text16, }, }, - + }); diff --git a/src/layouts/EventSignupNew/subcomponents/DatePicker.js b/src/layouts/EventSignupNew/subcomponents/DatePicker.js index 5f8a41a42f5c73e47c5080557b61e8cc2573334e..c302ccd131d3afa3f93dfbb4fd74e3ef370f0269 100644 --- a/src/layouts/EventSignupNew/subcomponents/DatePicker.js +++ b/src/layouts/EventSignupNew/subcomponents/DatePicker.js @@ -28,7 +28,8 @@ class DatePicker extends Component { className={`${this.props.classes.customDatePicker} ${this.props.isDisabled ? 'disableField' : 'show'}`} forceShowMonthNavigation={true} - calendarClassName={this.props.classes.customDatePickerCalendar} + // calendarClassName={this.props.classes.customDatePickerCalendar} + calendarClassName={`${this.props.classes.customDatePickerCalendar} ${this.props.className ? this.props.className : ''}`} popperPlacement={this.props.isEdit ? 'top-start' : 'bottom-start'} disabled={this.props.isDisabled} />