@tripian/react 5.0.1 → 5.0.2

package/index.js

@@ -7450,7 +7450,7 @@ module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
 
 var GetIntrinsic = __webpack_require__(7);
 
-var callBind = __webpack_require__(41);
+var callBind = __webpack_require__(42);
 
 var $indexOf = callBind(GetIntrinsic('String.prototype.indexOf'));
 
@@ -16042,7 +16042,7 @@ Autocomplete.contextType = MapContext;
 /* 34 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var api = __webpack_require__(52);
+var api = __webpack_require__(53);
             var content = __webpack_require__(370);
 
             content = content.__esModule ? content.default : content;
@@ -16066,7 +16066,7 @@ module.exports = content.locals || {};
 /* 35 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var api = __webpack_require__(52);
+var api = __webpack_require__(53);
             var content = __webpack_require__(371);
 
             content = content.__esModule ? content.default : content;
@@ -16242,6 +16242,80 @@ module.exports = g;
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// eslint-disable-next-line import/no-extraneous-dependencies
+var react_1 = __importStar(__webpack_require__(0));
+var react_dates_1 = __webpack_require__(237);
+__webpack_require__(294);
+var moment_1 = __importDefault(__webpack_require__(1));
+__webpack_require__(525);
+var DatePicker = function (_a) {
+    var currentDate = _a.currentDate, onchanged = _a.onchanged, startDate = _a.startDate, endDate = _a.endDate, _b = _a.openDirection, openDirection = _b === void 0 ? 'down' : _b, _c = _a.showMonthSelection, showMonthSelection = _c === void 0 ? false : _c;
+    var _d = (0, react_1.useState)(currentDate), date = _d[0], setDate = _d[1];
+    var _e = (0, react_1.useState)(false), focus = _e[0], setFocus = _e[1];
+    var smallDevice = window.matchMedia('(max-width: 768px)').matches;
+    var renderMonthElement = function (_a) {
+        var month = _a.month, onMonthSelect = _a.onMonthSelect, onYearSelect = _a.onYearSelect;
+        var i;
+        var years = [];
+        for (i = (0, moment_1.default)().year(); i >= (0, moment_1.default)().year() - 100; i -= 1) {
+            years.push(react_1.default.createElement("option", { value: i, key: "year-".concat(i) }, i));
+        }
+        return (react_1.default.createElement("div", { className: "date-picker-extra" },
+            react_1.default.createElement("div", { className: "date-picker-month" },
+                react_1.default.createElement("select", { className: "date-picker-select", value: month.month(), onChange: function (e) { return onMonthSelect(month, e.target.value); } }, moment_1.default.months().map(function (label, value) { return (react_1.default.createElement("option", { value: value }, label)); }))),
+            react_1.default.createElement("div", { className: "date-picker-year" },
+                react_1.default.createElement("select", { className: "date-picker-select", value: month.year(), onChange: function (e) { return onYearSelect(month, e.target.value); } }, years))));
+    };
+    return (react_1.default.createElement(react_dates_1.SingleDatePicker, { id: "datepicker", date: date, displayFormat: "YYYY-MM-DD", hideKeyboardShortcutsPanel: true, focused: focus, orientation: smallDevice ? 'vertical' : 'horizontal', withFullScreenPortal: smallDevice, onDateChange: function (selectedDate) {
+            setDate(selectedDate);
+            onchanged(selectedDate);
+        }, renderMonthElement: showMonthSelection ? renderMonthElement : undefined, openDirection: openDirection, block: true, numberOfMonths: smallDevice ? 2 : 1, onFocusChange: function (_a) {
+            var focused = _a.focused;
+            return setFocus(focused);
+        }, isOutsideRange: function (day) {
+            if (startDate && endDate) {
+                if (day.isBefore(startDate) || day.isAfter(endDate))
+                    return true;
+            }
+            return false;
+        } }));
+};
+exports.default = DatePicker;
+
+
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
 
 var bind = __webpack_require__(78);
 var GetIntrinsic = __webpack_require__(7);
@@ -16291,7 +16365,7 @@ if ($defineProperty) {
 
 
 /***/ }),
-/* 42 */
+/* 43 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16315,7 +16389,7 @@ function toMomentObject(dateString, customFormat) {
 }
 
 /***/ }),
-/* 43 */
+/* 44 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16337,7 +16411,7 @@ var _default = _propTypes["default"].oneOf([_constants.HORIZONTAL_ORIENTATION, _
 exports["default"] = _default;
 
 /***/ }),
-/* 44 */
+/* 45 */
 /***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", {
@@ -16350,7 +16424,7 @@ function isTouchDevice() {
 module.exports = exports['default'];
 
 /***/ }),
-/* 45 */
+/* 46 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16372,7 +16446,7 @@ var _default = _propTypes["default"].oneOf([_constants.ICON_BEFORE_POSITION, _co
 exports["default"] = _default;
 
 /***/ }),
-/* 46 */
+/* 47 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16394,7 +16468,7 @@ var _default = _propTypes["default"].oneOf([_constants.NAV_POSITION_BOTTOM, _con
 exports["default"] = _default;
 
 /***/ }),
-/* 47 */
+/* 48 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16417,7 +16491,7 @@ function isInclusivelyAfterDay(a, b) {
 }
 
 /***/ }),
-/* 48 */
+/* 49 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16431,7 +16505,7 @@ module.exports = function IsPropertyKey(argument) {
 
 
 /***/ }),
-/* 49 */
+/* 50 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16498,7 +16572,7 @@ exports.default = NumberCounter;
 
 
 /***/ }),
-/* 50 */
+/* 51 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16525,7 +16599,7 @@ exports.default = QuestionTemplate;
 
 
 /***/ }),
-/* 51 */
+/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16544,7 +16618,7 @@ var _default = _slider["default"];
 exports["default"] = _default;
 
 /***/ }),
-/* 52 */
+/* 53 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -16818,63 +16892,6 @@ module.exports = function (list, options) {
   };
 };
 
-/***/ }),
-/* 53 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// eslint-disable-next-line import/no-extraneous-dependencies
-var react_1 = __importStar(__webpack_require__(0));
-var react_dates_1 = __webpack_require__(237);
-__webpack_require__(294);
-__webpack_require__(525);
-var DatePicker = function (_a) {
-    var currentDate = _a.currentDate, onchanged = _a.onchanged, startDate = _a.startDate, endDate = _a.endDate;
-    var _b = (0, react_1.useState)(currentDate), date = _b[0], setDate = _b[1];
-    var _c = (0, react_1.useState)(false), focus = _c[0], setFocus = _c[1];
-    var smallDevice = window.matchMedia('(max-width: 768px)').matches;
-    return (react_1.default.createElement(react_dates_1.SingleDatePicker, { id: "datepicker", date: date, displayFormat: "YYYY-MM-DD", hideKeyboardShortcutsPanel: true, focused: focus, orientation: smallDevice ? 'vertical' : 'horizontal', withFullScreenPortal: smallDevice, onDateChange: function (selectedDate) {
-            setDate(selectedDate);
-            onchanged(selectedDate);
-        }, block: true, numberOfMonths: smallDevice ? 2 : 1, onFocusChange: function (_a) {
-            var focused = _a.focused;
-            return setFocus(focused);
-        }, isOutsideRange: function (day) {
-            if (startDate && endDate) {
-                if (day.isBefore(startDate) || day.isAfter(endDate))
-                    return true;
-            }
-            return false;
-        } }));
-};
-exports.default = DatePicker;
-
-
 /***/ }),
 /* 54 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -16891,7 +16908,7 @@ exports["default"] = toISODateString;
 
 var _moment = _interopRequireDefault(__webpack_require__(1));
 
-var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
+var _toMomentObject = _interopRequireDefault(__webpack_require__(43));
 
 function toISODateString(date, currentFormat) {
   var dateObj = _moment["default"].isMoment(date) ? date : (0, _toMomentObject["default"])(date, currentFormat);
@@ -18058,7 +18075,7 @@ exports.Uber = Uber_1.default;
 
 
 var define = __webpack_require__(21);
-var callBind = __webpack_require__(41);
+var callBind = __webpack_require__(42);
 
 var implementation = __webpack_require__(258);
 var getPolyfill = __webpack_require__(260);
@@ -18365,7 +18382,7 @@ exports["default"] = toISOMonthString;
 
 var _moment = _interopRequireDefault(__webpack_require__(1));
 
-var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
+var _toMomentObject = _interopRequireDefault(__webpack_require__(43));
 
 function toISOMonthString(date, currentFormat) {
   var dateObj = _moment["default"].isMoment(date) ? date : (0, _toMomentObject["default"])(date, currentFormat);
@@ -18415,7 +18432,7 @@ var $TypeError = GetIntrinsic('%TypeError%');
 
 var inspect = __webpack_require__(488);
 
-var IsPropertyKey = __webpack_require__(48);
+var IsPropertyKey = __webpack_require__(49);
 var Type = __webpack_require__(23);
 
 // https://ecma-international.org/ecma-262/6.0/#sec-get-o-p
@@ -19037,7 +19054,7 @@ exports["default"] = toLocalizedDateString;
 
 var _moment = _interopRequireDefault(__webpack_require__(1));
 
-var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
+var _toMomentObject = _interopRequireDefault(__webpack_require__(43));
 
 var _constants = __webpack_require__(6);
 
@@ -19167,7 +19184,7 @@ var _moment = _interopRequireDefault(__webpack_require__(1));
 
 var _throttle = _interopRequireDefault(__webpack_require__(280));
 
-var _isTouchDevice = _interopRequireDefault(__webpack_require__(44));
+var _isTouchDevice = _interopRequireDefault(__webpack_require__(45));
 
 var _reactOutsideClickHandler = _interopRequireDefault(__webpack_require__(80));
 
@@ -19197,9 +19214,9 @@ var _isSameMonth = _interopRequireDefault(__webpack_require__(79));
 
 var _ModifiersShape = _interopRequireDefault(__webpack_require__(63));
 
-var _NavPositionShape = _interopRequireDefault(__webpack_require__(46));
+var _NavPositionShape = _interopRequireDefault(__webpack_require__(47));
 
-var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(43));
+var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(44));
 
 var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
@@ -37439,7 +37456,7 @@ var _toISODateString = _interopRequireDefault(__webpack_require__(54));
 
 var _ModifiersShape = _interopRequireDefault(__webpack_require__(63));
 
-var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(43));
+var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(44));
 
 var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
@@ -37752,7 +37769,7 @@ var _isNextMonth = _interopRequireDefault(__webpack_require__(448));
 
 var _ModifiersShape = _interopRequireDefault(__webpack_require__(63));
 
-var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(43));
+var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(44));
 
 var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
@@ -38190,7 +38207,7 @@ var _getPhrasePropTypes = _interopRequireDefault(__webpack_require__(18));
 
 var _FocusedInputShape = _interopRequireDefault(__webpack_require__(271));
 
-var _IconPositionShape = _interopRequireDefault(__webpack_require__(45));
+var _IconPositionShape = _interopRequireDefault(__webpack_require__(46));
 
 var _OrientationShape = _interopRequireDefault(__webpack_require__(272));
 
@@ -38204,7 +38221,7 @@ var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
 var _CalendarInfoPositionShape = _interopRequireDefault(__webpack_require__(56));
 
-var _NavPositionShape = _interopRequireDefault(__webpack_require__(46));
+var _NavPositionShape = _interopRequireDefault(__webpack_require__(47));
 
 var _default = {
   // required props for a functional interactive DateRangePicker
@@ -38564,15 +38581,15 @@ var _getPhrasePropTypes = _interopRequireDefault(__webpack_require__(18));
 
 var _DateRangePickerInput = _interopRequireDefault(__webpack_require__(278));
 
-var _IconPositionShape = _interopRequireDefault(__webpack_require__(45));
+var _IconPositionShape = _interopRequireDefault(__webpack_require__(46));
 
 var _DisabledShape = _interopRequireDefault(__webpack_require__(55));
 
-var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
+var _toMomentObject = _interopRequireDefault(__webpack_require__(43));
 
 var _toLocalizedDateString = _interopRequireDefault(__webpack_require__(83));
 
-var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(47));
+var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(48));
 
 var _isBeforeDay = _interopRequireDefault(__webpack_require__(57));
 
@@ -38899,7 +38916,7 @@ var _OpenDirectionShape = _interopRequireDefault(__webpack_require__(38));
 
 var _DateInput = _interopRequireDefault(__webpack_require__(279));
 
-var _IconPositionShape = _interopRequireDefault(__webpack_require__(45));
+var _IconPositionShape = _interopRequireDefault(__webpack_require__(46));
 
 var _DisabledShape = _interopRequireDefault(__webpack_require__(55));
 
@@ -39227,7 +39244,7 @@ var _reactWithStyles = __webpack_require__(24);
 
 var _throttle = _interopRequireDefault(__webpack_require__(280));
 
-var _isTouchDevice = _interopRequireDefault(__webpack_require__(44));
+var _isTouchDevice = _interopRequireDefault(__webpack_require__(45));
 
 var _noflip = _interopRequireDefault(__webpack_require__(32));
 
@@ -39776,13 +39793,13 @@ var _moment = _interopRequireDefault(__webpack_require__(1));
 
 var _object = _interopRequireDefault(__webpack_require__(62));
 
-var _isTouchDevice = _interopRequireDefault(__webpack_require__(44));
+var _isTouchDevice = _interopRequireDefault(__webpack_require__(45));
 
 var _defaultPhrases = __webpack_require__(13);
 
 var _getPhrasePropTypes = _interopRequireDefault(__webpack_require__(18));
 
-var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(47));
+var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(48));
 
 var _isNextDay = _interopRequireDefault(__webpack_require__(287));
 
@@ -39808,13 +39825,13 @@ var _DisabledShape = _interopRequireDefault(__webpack_require__(55));
 
 var _FocusedInputShape = _interopRequireDefault(__webpack_require__(271));
 
-var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(43));
+var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(44));
 
 var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
 var _CalendarInfoPositionShape = _interopRequireDefault(__webpack_require__(56));
 
-var _NavPositionShape = _interopRequireDefault(__webpack_require__(46));
+var _NavPositionShape = _interopRequireDefault(__webpack_require__(47));
 
 var _constants = __webpack_require__(6);
 
@@ -41371,7 +41388,7 @@ var _moment = _interopRequireDefault(__webpack_require__(1));
 
 var _object = _interopRequireDefault(__webpack_require__(62));
 
-var _isTouchDevice = _interopRequireDefault(__webpack_require__(44));
+var _isTouchDevice = _interopRequireDefault(__webpack_require__(45));
 
 var _defaultPhrases = __webpack_require__(13);
 
@@ -41387,13 +41404,13 @@ var _toISODateString = _interopRequireDefault(__webpack_require__(54));
 
 var _modifiers = __webpack_require__(289);
 
-var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(43));
+var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(44));
 
 var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
 var _CalendarInfoPositionShape = _interopRequireDefault(__webpack_require__(56));
 
-var _NavPositionShape = _interopRequireDefault(__webpack_require__(46));
+var _NavPositionShape = _interopRequireDefault(__webpack_require__(47));
 
 var _constants = __webpack_require__(6);
 
@@ -42066,7 +42083,7 @@ var _defaultPhrases = __webpack_require__(13);
 
 var _getPhrasePropTypes = _interopRequireDefault(__webpack_require__(18));
 
-var _IconPositionShape = _interopRequireDefault(__webpack_require__(45));
+var _IconPositionShape = _interopRequireDefault(__webpack_require__(46));
 
 var _OrientationShape = _interopRequireDefault(__webpack_require__(272));
 
@@ -42078,7 +42095,7 @@ var _DayOfWeekShape = _interopRequireDefault(__webpack_require__(37));
 
 var _CalendarInfoPositionShape = _interopRequireDefault(__webpack_require__(56));
 
-var _NavPositionShape = _interopRequireDefault(__webpack_require__(46));
+var _NavPositionShape = _interopRequireDefault(__webpack_require__(47));
 
 var _default = {
   // required props for a functional interactive SingleDatePicker
@@ -42190,7 +42207,7 @@ var _noflip = _interopRequireDefault(__webpack_require__(32));
 
 var _DateInput = _interopRequireDefault(__webpack_require__(279));
 
-var _IconPositionShape = _interopRequireDefault(__webpack_require__(45));
+var _IconPositionShape = _interopRequireDefault(__webpack_require__(46));
 
 var _CloseButton = _interopRequireDefault(__webpack_require__(58));
 
@@ -44040,7 +44057,7 @@ var model_1 = __webpack_require__(4);
 var NumberInput_1 = __importDefault(__webpack_require__(93));
 var TextField_1 = __importDefault(__webpack_require__(14));
 var Dropdown_1 = __importDefault(__webpack_require__(28));
-var QuestionTemplate_1 = __importDefault(__webpack_require__(50));
+var QuestionTemplate_1 = __importDefault(__webpack_require__(51));
 var FormTemplateCompanion = function (_a) {
     var questions = _a.questions, userCompanion = _a.userCompanion, callbackFormTemplateCompanion = _a.callbackFormTemplateCompanion;
     var callbackName = function (event) {
@@ -44840,7 +44857,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importDefault(__webpack_require__(0));
 var model_1 = __webpack_require__(4);
-var react_slick_1 = __importDefault(__webpack_require__(51));
+var react_slick_1 = __importDefault(__webpack_require__(52));
 __webpack_require__(34);
 __webpack_require__(35);
 var PoiInfoImage_scss_1 = __importDefault(__webpack_require__(667));
@@ -45017,7 +45034,7 @@ var PoiInfoText = function (_a) {
                         react_1.default.createElement("div", { className: PoiInfoText_scss_1.default.description },
                             react_1.default.createElement("input", { type: "checkbox", id: "description", className: PoiInfoText_scss_1.default.descToggle }),
                             react_1.default.createElement("label", { htmlFor: "description", className: PoiInfoText_scss_1.default.descContent }, poi.description ? poi.description : 'empty')))) : null,
-                    poi.safety ? (react_1.default.createElement("li", null,
+                    poi.safety && poi.safety.length > 0 ? (react_1.default.createElement("li", null,
                         react_1.default.createElement("div", { className: PoiInfoText_scss_1.default.safetyIcon }),
                         react_1.default.createElement("div", { className: PoiInfoText_scss_1.default.header }, "Safety: "),
                         react_1.default.createElement("div", { className: PoiInfoText_scss_1.default.content }, poiSafetyContent))) : null,
@@ -46152,7 +46169,7 @@ var CloseIconButton_1 = __importDefault(__webpack_require__(25));
 exports.CloseIconButton = CloseIconButton_1.default;
 var ConfirmModalPopup_1 = __importDefault(__webpack_require__(563));
 exports.ConfirmModalPopup = ConfirmModalPopup_1.default;
-var DatePicker_1 = __importDefault(__webpack_require__(53));
+var DatePicker_1 = __importDefault(__webpack_require__(41));
 exports.DatePicker = DatePicker_1.default;
 var DateRangePicker_1 = __importDefault(__webpack_require__(71));
 exports.DateRangePicker = DateRangePicker_1.default;
@@ -46204,7 +46221,7 @@ var ModalFull_1 = __importDefault(__webpack_require__(654));
 exports.ModalFull = ModalFull_1.default;
 var MustTryCard_1 = __importDefault(__webpack_require__(656));
 exports.MustTryCard = MustTryCard_1.default;
-var NumberCounter_1 = __importDefault(__webpack_require__(49));
+var NumberCounter_1 = __importDefault(__webpack_require__(50));
 exports.NumberCounter = NumberCounter_1.default;
 var NumberInput_1 = __importDefault(__webpack_require__(93));
 exports.NumberInput = NumberInput_1.default;
@@ -46293,7 +46310,7 @@ var TripCard_1 = __importDefault(__webpack_require__(729));
 exports.TripCard = TripCard_1.default;
 var UserCompanions_1 = __importDefault(__webpack_require__(731));
 exports.UserCompanions = UserCompanions_1.default;
-var QuestionTemplate_1 = __importDefault(__webpack_require__(50));
+var QuestionTemplate_1 = __importDefault(__webpack_require__(51));
 exports.QuestionTemplate = QuestionTemplate_1.default;
 var BookingDetails_1 = __importDefault(__webpack_require__(733));
 exports.BookingDetails = BookingDetails_1.default;
@@ -46496,7 +46513,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable react/no-danger */
 var react_1 = __importDefault(__webpack_require__(0));
-var react_slick_1 = __importDefault(__webpack_require__(51));
+var react_slick_1 = __importDefault(__webpack_require__(52));
 __webpack_require__(34);
 __webpack_require__(35);
 var BbCarRentInfo_scss_1 = __importDefault(__webpack_require__(372));
@@ -51031,7 +51048,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importDefault(__webpack_require__(0));
-var react_slick_1 = __importDefault(__webpack_require__(51));
+var react_slick_1 = __importDefault(__webpack_require__(52));
 __webpack_require__(34);
 __webpack_require__(35);
 var BbTourInfoImage_scss_1 = __importDefault(__webpack_require__(402));
@@ -51065,8 +51082,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importDefault(__webpack_require__(0));
 var moment_1 = __importDefault(__webpack_require__(1));
-var DatePicker_1 = __importDefault(__webpack_require__(53));
-var NumberCounter_1 = __importDefault(__webpack_require__(49));
+var DatePicker_1 = __importDefault(__webpack_require__(41));
+var NumberCounter_1 = __importDefault(__webpack_require__(50));
 var Button_1 = __importDefault(__webpack_require__(5));
 var BbTourInfoForm_scss_1 = __importDefault(__webpack_require__(527));
 var BbTourInfoForm = function (_a) {
@@ -51261,7 +51278,7 @@ var _SingleDatePickerInput = _interopRequireDefault(__webpack_require__(293));
 
 var _SingleDatePickerShape = _interopRequireDefault(__webpack_require__(292));
 
-var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(47));
+var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(48));
 
 var _isInclusivelyBeforeDay = _interopRequireDefault(__webpack_require__(479));
 
@@ -51273,7 +51290,7 @@ var _toISODateString = _interopRequireDefault(__webpack_require__(54));
 
 var _toLocalizedDateString = _interopRequireDefault(__webpack_require__(83));
 
-var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
+var _toMomentObject = _interopRequireDefault(__webpack_require__(43));
 
 /***/ }),
 /* 405 */
@@ -51283,7 +51300,7 @@ var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
 
 
 var define = __webpack_require__(21);
-var callBind = __webpack_require__(41);
+var callBind = __webpack_require__(42);
 
 var implementation = __webpack_require__(243);
 var getPolyfill = __webpack_require__(244);
@@ -51873,7 +51890,7 @@ exports.isValidElementType=function(a){return"string"===typeof a||"function"===t
 
 
 var define = __webpack_require__(21);
-var callBind = __webpack_require__(41);
+var callBind = __webpack_require__(42);
 
 var implementation = __webpack_require__(250);
 var getPolyfill = __webpack_require__(254);
@@ -52075,7 +52092,7 @@ function wrapValidator(validator, typeName) {
 
 
 var defineProperties = __webpack_require__(21);
-var callBind = __webpack_require__(41);
+var callBind = __webpack_require__(42);
 
 var implementation = __webpack_require__(255);
 var getPolyfill = __webpack_require__(256);
@@ -53258,7 +53275,7 @@ var _airbnbPropTypes = __webpack_require__(9);
 
 var _consolidatedEvents = __webpack_require__(65);
 
-var _isTouchDevice = _interopRequireDefault(__webpack_require__(44));
+var _isTouchDevice = _interopRequireDefault(__webpack_require__(45));
 
 var _reactOutsideClickHandler = _interopRequireDefault(__webpack_require__(80));
 
@@ -53272,7 +53289,7 @@ var _getDetachedContainerStyles = _interopRequireDefault(__webpack_require__(275
 
 var _getInputHeight = _interopRequireDefault(__webpack_require__(81));
 
-var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(47));
+var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(48));
 
 var _disableScroll2 = _interopRequireDefault(__webpack_require__(276));
 
@@ -54950,9 +54967,9 @@ var _ChevronUp = _interopRequireDefault(__webpack_require__(471));
 
 var _ChevronDown = _interopRequireDefault(__webpack_require__(472));
 
-var _NavPositionShape = _interopRequireDefault(__webpack_require__(46));
+var _NavPositionShape = _interopRequireDefault(__webpack_require__(47));
 
-var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(43));
+var _ScrollableOrientationShape = _interopRequireDefault(__webpack_require__(44));
 
 var _constants = __webpack_require__(6);
 
@@ -55899,7 +55916,7 @@ var _airbnbPropTypes = __webpack_require__(9);
 
 var _consolidatedEvents = __webpack_require__(65);
 
-var _isTouchDevice = _interopRequireDefault(__webpack_require__(44));
+var _isTouchDevice = _interopRequireDefault(__webpack_require__(45));
 
 var _reactOutsideClickHandler = _interopRequireDefault(__webpack_require__(80));
 
@@ -55913,7 +55930,7 @@ var _getDetachedContainerStyles = _interopRequireDefault(__webpack_require__(275
 
 var _getInputHeight = _interopRequireDefault(__webpack_require__(81));
 
-var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(47));
+var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(48));
 
 var _disableScroll2 = _interopRequireDefault(__webpack_require__(276));
 
@@ -56578,15 +56595,15 @@ var _getPhrasePropTypes = _interopRequireDefault(__webpack_require__(18));
 
 var _SingleDatePickerInput = _interopRequireDefault(__webpack_require__(293));
 
-var _IconPositionShape = _interopRequireDefault(__webpack_require__(45));
+var _IconPositionShape = _interopRequireDefault(__webpack_require__(46));
 
 var _DisabledShape = _interopRequireDefault(__webpack_require__(55));
 
-var _toMomentObject = _interopRequireDefault(__webpack_require__(42));
+var _toMomentObject = _interopRequireDefault(__webpack_require__(43));
 
 var _toLocalizedDateString = _interopRequireDefault(__webpack_require__(83));
 
-var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(47));
+var _isInclusivelyAfterDay = _interopRequireDefault(__webpack_require__(48));
 
 var _constants = __webpack_require__(6);
 
@@ -56959,7 +56976,7 @@ exports["default"] = _default;
 
 
 var define = __webpack_require__(21);
-var callBind = __webpack_require__(41);
+var callBind = __webpack_require__(42);
 
 var implementation = __webpack_require__(295);
 var getPolyfill = __webpack_require__(313);
@@ -57723,7 +57740,7 @@ var DefineOwnProperty = __webpack_require__(301);
 var FromPropertyDescriptor = __webpack_require__(302);
 var IsAccessorDescriptor = __webpack_require__(496);
 var IsDataDescriptor = __webpack_require__(303);
-var IsPropertyKey = __webpack_require__(48);
+var IsPropertyKey = __webpack_require__(49);
 var SameValue = __webpack_require__(304);
 var ToPropertyDescriptor = __webpack_require__(305);
 var Type = __webpack_require__(23);
@@ -57992,7 +58009,7 @@ var GetIntrinsic = __webpack_require__(7);
 var $TypeError = GetIntrinsic('%TypeError%');
 
 var CreateDataProperty = __webpack_require__(500);
-var IsPropertyKey = __webpack_require__(48);
+var IsPropertyKey = __webpack_require__(49);
 var Type = __webpack_require__(23);
 
 // // https://ecma-international.org/ecma-262/6.0/#sec-createdatapropertyorthrow
@@ -58029,7 +58046,7 @@ var FromPropertyDescriptor = __webpack_require__(302);
 var OrdinaryGetOwnProperty = __webpack_require__(501);
 var IsDataDescriptor = __webpack_require__(303);
 var IsExtensible = __webpack_require__(505);
-var IsPropertyKey = __webpack_require__(48);
+var IsPropertyKey = __webpack_require__(49);
 var SameValue = __webpack_require__(304);
 var Type = __webpack_require__(23);
 
@@ -58083,7 +58100,7 @@ var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
 var has = __webpack_require__(26);
 
 var IsArray = __webpack_require__(69);
-var IsPropertyKey = __webpack_require__(48);
+var IsPropertyKey = __webpack_require__(49);
 var IsRegExp = __webpack_require__(503);
 var ToPropertyDescriptor = __webpack_require__(305);
 var Type = __webpack_require__(23);
@@ -58269,7 +58286,7 @@ var GetIntrinsic = __webpack_require__(7);
 
 var $TypeError = GetIntrinsic('%TypeError%');
 
-var IsPropertyKey = __webpack_require__(48);
+var IsPropertyKey = __webpack_require__(49);
 var Type = __webpack_require__(23);
 
 // https://ecma-international.org/ecma-262/6.0/#sec-hasproperty
@@ -59338,7 +59355,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // eslint-disable-next-line import/no-extraneous-dependencies
 var react_1 = __importStar(__webpack_require__(0));
 var moment_1 = __importDefault(__webpack_require__(1));
-var DatePicker_1 = __importDefault(__webpack_require__(53));
+var DatePicker_1 = __importDefault(__webpack_require__(41));
 var Dropdown_1 = __importDefault(__webpack_require__(28));
 var Button_1 = __importDefault(__webpack_require__(5));
 var helper_1 = __webpack_require__(533);
@@ -60170,7 +60187,7 @@ exports.isModuleAvailable = function (modules, moduleName) {
 /* 558 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var api = __webpack_require__(52);
+var api = __webpack_require__(53);
             var content = __webpack_require__(559);
 
             content = content.__esModule ? content.default : content;
@@ -60269,7 +60286,7 @@ module.exports = {"modal":"components-base-Modal-Modal__modal--QOdJU"};
 /* 565 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var api = __webpack_require__(52);
+var api = __webpack_require__(53);
             var content = __webpack_require__(566);
 
             content = content.__esModule ? content.default : content;
@@ -61398,15 +61415,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importStar(__webpack_require__(0));
 var model_1 = __webpack_require__(4);
+var moment_1 = __importDefault(__webpack_require__(1));
 var TextField_1 = __importDefault(__webpack_require__(14));
 var Button_1 = __importDefault(__webpack_require__(5));
 var PreLoading_1 = __importDefault(__webpack_require__(12));
 // import NumberInput from '../../base/NumberInput/NumberInput';
-var QuestionTemplate_1 = __importDefault(__webpack_require__(50));
+var QuestionTemplate_1 = __importDefault(__webpack_require__(51));
 var FormTemplateProfile_scss_1 = __importDefault(__webpack_require__(595));
 var UserPasswordChange_1 = __importDefault(__webpack_require__(596));
 var Notification_1 = __importDefault(__webpack_require__(326));
 var Modal_1 = __importDefault(__webpack_require__(70));
+var DatePicker_1 = __importDefault(__webpack_require__(41));
 var FormTemplateProfile = function (_a) {
     var _b;
     var user = _a.user, profileQuestions = _a.profileQuestions, updateUser = _a.updateUser, updateCallback = _a.updateCallback, cancel = _a.cancel, isSocialUser = _a.isSocialUser;
@@ -61441,14 +61460,13 @@ var FormTemplateProfile = function (_a) {
                     newUserUpdateRequest.lastName = event.target.value;
                 }
                 break;
-            case 'dateOfBirth':
-                if (event.target.value === '') {
-                    newUserUpdateRequest.dateOfBirth = undefined;
-                }
-                else {
-                    newUserUpdateRequest.dateOfBirth = event.target.value;
-                }
-                break;
+            // case 'dateOfBirth':
+            //   if (event.target.value === '') {
+            //     newUserUpdateRequest.dateOfBirth = undefined;
+            //   } else {
+            //     newUserUpdateRequest.dateOfBirth = event.target.value;
+            //   }
+            //   break;
             default:
                 break;
         }
@@ -61475,6 +61493,17 @@ var FormTemplateProfile = function (_a) {
         setIsFormChanged(true);
         setUserUpdateRequest(newUserUpdateRequest);
     };
+    var dateOfBirthChange = function (date) {
+        var newUserUpdateRequest = model_1.helper.deepCopy(userUpdateRequest);
+        if (date === null) {
+            newUserUpdateRequest.dateOfBirth = undefined;
+        }
+        else {
+            newUserUpdateRequest.dateOfBirth = date.format('YYYY-MM-DD');
+        }
+        setIsFormChanged(true);
+        setUserUpdateRequest(newUserUpdateRequest);
+    };
     var handleSubmit = function (event) {
         setLoading(true);
         event.preventDefault();
@@ -61531,9 +61560,12 @@ var FormTemplateProfile = function (_a) {
                     react_1.default.createElement(TextField_1.default, { type: "text", name: "lastName", value: userUpdateRequest.lastName || '', placeholder: "Last Name", onChange: handleChange, autocomplete: "last-name" }))),
             react_1.default.createElement("div", { className: "row" },
                 react_1.default.createElement("div", { className: "col col12 my2" },
-                    react_1.default.createElement("h4", null, "Age")),
+                    react_1.default.createElement("h4", null, "Date Of Birth")),
                 react_1.default.createElement("div", { className: "col col12" },
-                    react_1.default.createElement(TextField_1.default, { type: "text", name: "dateOfBirth", value: userUpdateRequest.dateOfBirth || '', placeholder: "Date Of Birth", onChange: handleChange, autocomplete: "date-of-birth" }))),
+                    react_1.default.createElement(DatePicker_1.default, { currentDate: (0, moment_1.default)(userUpdateRequest.dateOfBirth), onchanged: function (date) {
+                            if (date)
+                                dateOfBirthChange(date);
+                        }, openDirection: "up", showMonthSelection: true }))),
             react_1.default.createElement("div", { className: "row" }, profileQuestions.map(function (question) { return (react_1.default.createElement("div", { className: "col col12" },
                 react_1.default.createElement(QuestionTemplate_1.default, { question: question, answers: userUpdateRequest.answers || [], callbackAnswers: answersChange }))); })),
             react_1.default.createElement("div", { className: "row" },
@@ -62068,9 +62100,9 @@ var moment_1 = __importDefault(__webpack_require__(1));
 var FormTemplateTrip_scss_1 = __importDefault(__webpack_require__(604));
 var Dropdown_1 = __importDefault(__webpack_require__(28));
 var DateRangePicker_1 = __importDefault(__webpack_require__(71));
-var QuestionTemplate_1 = __importDefault(__webpack_require__(50));
+var QuestionTemplate_1 = __importDefault(__webpack_require__(51));
 var RSelect_1 = __importDefault(__webpack_require__(39));
-var NumberCounter_1 = __importDefault(__webpack_require__(49));
+var NumberCounter_1 = __importDefault(__webpack_require__(50));
 // import GPlacesAutocomplete from '../../GoogleMaps/GPlacesAutocomplete/GPlacesAutocomplete';
 // eslint-disable-next-line import/no-cycle
 var GPlacesAutocomplete2_1 = __importDefault(__webpack_require__(327));
@@ -62472,9 +62504,9 @@ var moment_1 = __importDefault(__webpack_require__(1));
 var FormTemplateTrip2_scss_1 = __importDefault(__webpack_require__(611));
 var Dropdown_1 = __importDefault(__webpack_require__(28));
 var DateRangePicker_1 = __importDefault(__webpack_require__(71));
-var QuestionTemplate_1 = __importDefault(__webpack_require__(50));
+var QuestionTemplate_1 = __importDefault(__webpack_require__(51));
 var RSelect_1 = __importDefault(__webpack_require__(39));
-var NumberCounter_1 = __importDefault(__webpack_require__(49));
+var NumberCounter_1 = __importDefault(__webpack_require__(50));
 // import GPlacesAutocomplete from '../../GoogleMaps/GPlacesAutocomplete/GPlacesAutocomplete';
 // eslint-disable-next-line import/no-cycle
 var GPlacesAutocomplete2_1 = __importDefault(__webpack_require__(327));
@@ -62836,7 +62868,7 @@ exports.default = GoogleMaps;
 /* 613 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var api = __webpack_require__(52);
+var api = __webpack_require__(53);
             var content = __webpack_require__(614);
 
             content = content.__esModule ? content.default : content;
@@ -63798,7 +63830,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importDefault(__webpack_require__(0));
 var model_1 = __webpack_require__(4);
-var react_slick_1 = __importDefault(__webpack_require__(51));
+var react_slick_1 = __importDefault(__webpack_require__(52));
 __webpack_require__(34);
 __webpack_require__(35);
 var GygTourInfoImage_scss_1 = __importDefault(__webpack_require__(637));
@@ -63869,8 +63901,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importStar(__webpack_require__(0));
 var moment_1 = __importDefault(__webpack_require__(1));
-var DatePicker_1 = __importDefault(__webpack_require__(53));
-var NumberCounter_1 = __importDefault(__webpack_require__(49));
+var DatePicker_1 = __importDefault(__webpack_require__(41));
+var NumberCounter_1 = __importDefault(__webpack_require__(50));
 var Button_1 = __importDefault(__webpack_require__(5));
 var RatingStars_1 = __importDefault(__webpack_require__(31));
 var GygTourInfoForm_scss_1 = __importDefault(__webpack_require__(639));
@@ -66419,7 +66451,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/no-extraneous-dependencies */
 var react_1 = __importStar(__webpack_require__(0));
-var react_slick_1 = __importDefault(__webpack_require__(51));
+var react_slick_1 = __importDefault(__webpack_require__(52));
 __webpack_require__(34);
 __webpack_require__(35);
 var GlxTourInfoImage_scss_1 = __importDefault(__webpack_require__(722));
@@ -66533,9 +66565,9 @@ var react_1 = __importDefault(__webpack_require__(0));
 var moment_1 = __importDefault(__webpack_require__(1));
 var model_1 = __webpack_require__(4);
 var GlxTourInfoForm_scss_1 = __importDefault(__webpack_require__(726));
-var DatePicker_1 = __importDefault(__webpack_require__(53));
+var DatePicker_1 = __importDefault(__webpack_require__(41));
 var Dropdown_1 = __importDefault(__webpack_require__(28));
-var NumberCounter_1 = __importDefault(__webpack_require__(49));
+var NumberCounter_1 = __importDefault(__webpack_require__(50));
 var Button_1 = __importDefault(__webpack_require__(5));
 var RatingStars_1 = __importDefault(__webpack_require__(31));
 var GlxTourInfoForm = function (_a) {
@@ -66753,7 +66785,7 @@ var TextField_1 = __importDefault(__webpack_require__(14));
 var NumberInput_1 = __importDefault(__webpack_require__(93));
 var Dropdown_1 = __importDefault(__webpack_require__(28));
 var PreLoading_1 = __importDefault(__webpack_require__(12));
-var QuestionTemplate_1 = __importDefault(__webpack_require__(50));
+var QuestionTemplate_1 = __importDefault(__webpack_require__(51));
 var UserCompanions = function (_a) {
     var companions = _a.companions, questions = _a.questions, companionLoadingList = _a.companionLoadingList, deleteCompanion = _a.deleteCompanion, editCompanion = _a.editCompanion, showWarningMessage = _a.showWarningMessage;
     var _b = (0, react_1.useState)(), editableCompanion = _b[0], setEditableCompanion = _b[1];
@@ -66775,52 +66807,52 @@ var UserCompanions = function (_a) {
                     react_1.default.createElement("th", { className: UserCompanions_scss_1.default.delete },
                         react_1.default.createElement("h6", null,
                             react_1.default.createElement("b", null, "Edit / Delete"))))),
-            react_1.default.createElement("tbody", null,
-                companions.map(function (companion) { return (react_1.default.createElement(react_1.Fragment, { key: companion.id }, companion.id === (editableCompanion === null || editableCompanion === void 0 ? void 0 : editableCompanion.id) ? (react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement("tr", { key: companion.id },
-                        react_1.default.createElement("td", null,
-                            react_1.default.createElement(Dropdown_1.default, { options: model_1.helper.companionTitleOptions, defaultValue: editableCompanion.title, selectChange: function (value) {
-                                    var newEditableCompanion = __assign({}, editableCompanion);
-                                    newEditableCompanion.title = value;
-                                    setEditableCompanion(newEditableCompanion);
-                                    setIsCompanionChanged(true);
-                                } })),
-                        react_1.default.createElement("td", null,
-                            react_1.default.createElement(TextField_1.default, { name: "companionName", value: editableCompanion.name, onChange: function (event) {
-                                    var newEditableCompanion = __assign({}, editableCompanion);
-                                    newEditableCompanion.name = event.target.value;
-                                    setEditableCompanion(newEditableCompanion);
-                                    setIsCompanionChanged(true);
-                                } })),
-                        react_1.default.createElement("td", null,
-                            react_1.default.createElement(NumberInput_1.default, { defaultValue: editableCompanion.age || 1, minValue: 1, maxValue: 100, onchange: function (value) {
+            companions.map(function (companion) { return (react_1.default.createElement(react_1.Fragment, { key: companion.id }, companion.id === (editableCompanion === null || editableCompanion === void 0 ? void 0 : editableCompanion.id) ? (react_1.default.createElement("tbody", { key: companion.id },
+                react_1.default.createElement("tr", null,
+                    react_1.default.createElement("td", null,
+                        react_1.default.createElement(Dropdown_1.default, { options: model_1.helper.companionTitleOptions, defaultValue: editableCompanion.title, selectChange: function (value) {
+                                var newEditableCompanion = __assign({}, editableCompanion);
+                                newEditableCompanion.title = value;
+                                setEditableCompanion(newEditableCompanion);
+                                setIsCompanionChanged(true);
+                            } })),
+                    react_1.default.createElement("td", null,
+                        react_1.default.createElement(TextField_1.default, { name: "companionName", value: editableCompanion.name, onChange: function (event) {
+                                var newEditableCompanion = __assign({}, editableCompanion);
+                                newEditableCompanion.name = event.target.value;
+                                setEditableCompanion(newEditableCompanion);
+                                setIsCompanionChanged(true);
+                            } })),
+                    react_1.default.createElement("td", null,
+                        react_1.default.createElement(NumberInput_1.default, { defaultValue: editableCompanion.age || 1, minValue: 1, maxValue: 100, onchange: function (value) {
+                                var newEditableCompanion = __assign({}, editableCompanion);
+                                newEditableCompanion.age = value !== null && value !== void 0 ? value : 0;
+                                setEditableCompanion(newEditableCompanion);
+                                setIsCompanionChanged(true);
+                            } })),
+                    react_1.default.createElement("td", null,
+                        react_1.default.createElement("div", { className: UserCompanions_scss_1.default.userCompanionButtons },
+                            react_1.default.createElement(Check_1.default, { color: !editableCompanion.name.trim() || !editableCompanion.age ? 'disabled' : 'primary', disabled: !editableCompanion.name.trim() || !editableCompanion.age, onClick: function () {
+                                    if (isCompanionChanged) {
+                                        editCompanion(editableCompanion);
+                                    }
+                                    setIsCompanionChanged(false);
+                                    setEditableCompanion(undefined);
+                                } }),
+                            react_1.default.createElement(Cancel_1.default, { color: "primary", onClick: function () {
+                                    setEditableCompanion(undefined);
+                                    setIsCompanionChanged(false);
+                                } })))),
+                react_1.default.createElement("tr", null,
+                    react_1.default.createElement("td", { colSpan: 4, style: { padding: '0' } },
+                        react_1.default.createElement("div", { className: "row mb5" }, questions.map(function (question) { return (react_1.default.createElement("div", { className: "col col12" },
+                            react_1.default.createElement(QuestionTemplate_1.default, { question: question, answers: editableCompanion.answers, callbackAnswers: function (selectedAnswers) {
                                     var newEditableCompanion = __assign({}, editableCompanion);
-                                    newEditableCompanion.age = value !== null && value !== void 0 ? value : 0;
+                                    newEditableCompanion.answers = selectedAnswers;
                                     setEditableCompanion(newEditableCompanion);
                                     setIsCompanionChanged(true);
-                                } })),
-                        react_1.default.createElement("td", null,
-                            react_1.default.createElement("div", { className: UserCompanions_scss_1.default.userCompanionButtons },
-                                react_1.default.createElement(Check_1.default, { color: !editableCompanion.name.trim() || !editableCompanion.age ? 'disabled' : 'primary', disabled: !editableCompanion.name.trim() || !editableCompanion.age, onClick: function () {
-                                        if (isCompanionChanged) {
-                                            editCompanion(editableCompanion);
-                                        }
-                                        setIsCompanionChanged(false);
-                                        setEditableCompanion(undefined);
-                                    } }),
-                                react_1.default.createElement(Cancel_1.default, { color: "primary", onClick: function () {
-                                        setEditableCompanion(undefined);
-                                        setIsCompanionChanged(false);
-                                    } })))),
-                    react_1.default.createElement("tr", null,
-                        react_1.default.createElement("td", { colSpan: 4, style: { padding: '0' } },
-                            react_1.default.createElement("div", { className: "row mb5" }, questions.map(function (question) { return (react_1.default.createElement("div", { className: "col col12" },
-                                react_1.default.createElement(QuestionTemplate_1.default, { question: question, answers: editableCompanion.answers, callbackAnswers: function (selectedAnswers) {
-                                        var newEditableCompanion = __assign({}, editableCompanion);
-                                        newEditableCompanion.answers = selectedAnswers;
-                                        setEditableCompanion(newEditableCompanion);
-                                        setIsCompanionChanged(true);
-                                    } }))); })))))) : (react_1.default.createElement("tr", null, companionLoadingList.includes(companion.id) ? (react_1.default.createElement("td", { colSpan: 4 },
+                                } }))); })))))) : (react_1.default.createElement("tbody", null,
+                react_1.default.createElement("tr", null, companionLoadingList.includes(companion.id) ? (react_1.default.createElement("td", { colSpan: 4 },
                     react_1.default.createElement(PreLoading_1.default, { bgColor: "rgba(238, 238, 238, 0.8)" }))) : (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement("td", null, companion.title),
                     react_1.default.createElement("td", null, companion.name),
@@ -66829,7 +66861,7 @@ var UserCompanions = function (_a) {
                         react_1.default.createElement("div", { className: UserCompanions_scss_1.default.userCompanionButtons },
                             react_1.default.createElement("div", null,
                                 react_1.default.createElement(Edit_1.default, { color: "primary", onClick: function () {
-                                        if (companion.trips.length > 0) {
+                                        if (companion.memberOfTrip) {
                                             showWarningMessage(true);
                                         }
                                         else {
@@ -66840,7 +66872,7 @@ var UserCompanions = function (_a) {
                                     } })),
                             react_1.default.createElement("div", null,
                                 react_1.default.createElement(Delete_1.default, { color: "primary", onClick: function () {
-                                        if (companion.trips.length > 0) {
+                                        if (companion.memberOfTrip) {
                                             showWarningMessage(true);
                                         }
                                         else {
@@ -66848,9 +66880,10 @@ var UserCompanions = function (_a) {
                                             deleteCompanion(companion.id);
                                             setIsCompanionChanged(false);
                                         }
-                                    } })))))))))); }),
-                companions.length === 0 ? (react_1.default.createElement("tr", null,
-                    react_1.default.createElement("td", { className: UserCompanions_scss_1.default.emptyMessage, colSpan: 4 }, "No companions yet."))) : null))));
+                                    } }))))))))))); }),
+            companions.length === 0 ? (react_1.default.createElement("tbody", null,
+                react_1.default.createElement("tr", null,
+                    react_1.default.createElement("td", { className: UserCompanions_scss_1.default.emptyMessage, colSpan: 4 }, "No companions yet.")))) : null)));
 };
 exports.default = UserCompanions;