orc-shared 1.3.0-dev.9 → 1.3.0-pre.1

package/dist/components/MaterialUI/Inputs/DatePicker.js

@@ -23,7 +23,7 @@ var _metadata = require("../../../selectors/metadata");
 
 var _reactRedux = require("react-redux");
 
-var _excluded = ["value", "useTime", "useDate", "onChange", "dateFormat", "showTimeZone", "timeInputLabel", "readOnly", "showTimeSelectOnly", "metadata", "timePickerTimeZone", "error"];
+var _excluded = ["value", "useTime", "useDate", "onChange", "useTimeZone", "dateFormat", "showTimeZone", "timeInputLabel", "readOnly", "showTimeSelectOnly", "metadata", "timePickerTimeZone", "error"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -178,6 +178,8 @@ var WrappedDatePicker = function WrappedDatePicker(_ref) {
       _ref$useDate = _ref.useDate,
       useDate = _ref$useDate === void 0 ? true : _ref$useDate,
       onChange = _ref.onChange,
+      _ref$useTimeZone = _ref.useTimeZone,
+      useTimeZone = _ref$useTimeZone === void 0 ? false : _ref$useTimeZone,
       dateFormat = _ref.dateFormat,
       showTimeZone = _ref.showTimeZone,
       timeInputLabel = _ref.timeInputLabel,
@@ -192,13 +194,13 @@ var WrappedDatePicker = function WrappedDatePicker(_ref) {
     readOnly: readOnly
   });
   var timeZoneName = (0, _timezoneHelper.getTimeZoneByName)(timePickerTimeZone);
-  var startDate = value ? timePickerTimeZone ? (0, _timezoneHelper.convertTimeToLocalTimeZone)(new Date(value), timeZoneName) : new Date(value) : null;
+  var startDate = value ? timePickerTimeZone && useTimeZone ? (0, _timezoneHelper.convertTimeToLocalTimeZone)(new Date(value), timeZoneName) : new Date(value) : null;
   var disabledCls = (0, _classnames.default)(_defineProperty({}, classes.disabled, props.disabled));
   var localizedTimeZoneName = (0, _reactRedux.useSelector)((0, _metadata.namedLookupLocalizedSelector)("customer", "TimeZone", timePickerTimeZone));
 
   var updateDate = function updateDate(date, metadata) {
     if (onChange) {
-      onChange(useTime && timePickerTimeZone ? (0, _timezoneHelper.convertTimeToOtherTimeZone)(date, timeZoneName) : date, metadata);
+      onChange(useTimeZone && timePickerTimeZone ? (0, _timezoneHelper.convertTimeToOtherTimeZone)(date, timeZoneName) : date, metadata);
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.3.0-dev.9",
+	"version": "1.3.0-pre.1",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {
@@ -49,7 +49,7 @@
 	],
 	"devDependencies": {},
 	"peerDependencies": {
-		"orc-scripts": "1.4.0-dev.1"
+		"orc-scripts": "1.4.0-pre.1"
 	},
 	"sideEffects": false,
 	"lint-staged": {
@@ -69,6 +69,6 @@
 		}
 	},
 	"dependencies": {
-		"orc-scripts": "1.4.0-dev.1"
+		"orc-scripts": "1.4.0-pre.1"
 	}
 }

package/src/components/MaterialUI/Inputs/DatePicker.js

@@ -127,6 +127,7 @@ const WrappedDatePicker = ({
 	useTime,
 	useDate = true,
 	onChange,
+	useTimeZone = false,
 	dateFormat,
 	showTimeZone,
 	timeInputLabel,
@@ -140,7 +141,7 @@ const WrappedDatePicker = ({
 	const classes = useStyles({ readOnly });
 	const timeZoneName = getTimeZoneByName(timePickerTimeZone);
 	const startDate = value
-		? timePickerTimeZone
+		? timePickerTimeZone && useTimeZone
 			? convertTimeToLocalTimeZone(new Date(value), timeZoneName)
 			: new Date(value)
 		: null;
@@ -149,7 +150,7 @@ const WrappedDatePicker = ({
 
 	const updateDate = (date, metadata) => {
 		if (onChange) {
-			onChange(useTime && timePickerTimeZone ? convertTimeToOtherTimeZone(date, timeZoneName) : date, metadata);
+			onChange(useTimeZone && timePickerTimeZone ? convertTimeToOtherTimeZone(date, timeZoneName) : date, metadata);
 		}
 	};
 

package/src/components/MaterialUI/Inputs/DatePicker.test.js

@@ -425,6 +425,34 @@ describe("DatePicker", () => {
 		const input = mountedComponent.find("input");
 		input.at(0).simulate("change", event);
 	});
+
+	it("should call onChange prop with useTimeZone", () => {
+		const onChangeMock = jest.fn();
+		const date = new Date("2020-06-30T00:00:00");
+		const event = {
+			preventDefault() {},
+			target: { value: "" },
+		};
+		const requestTimeZone = "Eastern Standard Time";
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider>
+				<DatePicker
+					onChange={onChangeMock}
+					value={date}
+					useTime={true}
+					useDate={false}
+					useTimeZone={true}
+					showTimeSelectOnly={true}
+					timePickerTimeZone={requestTimeZone}
+				/>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.at(0).simulate("change", event);
+		expect(onChangeMock.mock.calls.length, "to equal", 1);
+	});
 });
 
 describe("createFormat", () => {