orc-shared 5.10.0-dev.21 → 5.10.0-dev.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -194,6 +194,7 @@ var WrappedDatePicker = function WrappedDatePicker(_ref) {
|
|
|
194
194
|
showTimeInput: useTime != null ? useTime : false,
|
|
195
195
|
useTime: useTime != null ? useTime : false,
|
|
196
196
|
customTimeInput: useTime ? /*#__PURE__*/_react.default.createElement(_TimePicker.default, {
|
|
197
|
+
showTimeZone: showTimeZone,
|
|
197
198
|
windowsTimeZone: windowsTimeZoneName,
|
|
198
199
|
timeOption: timeOption
|
|
199
200
|
}) : null,
|
|
@@ -107,7 +107,7 @@ var ampmOptions = [{
|
|
|
107
107
|
label: "PM"
|
|
108
108
|
}];
|
|
109
109
|
var isBrowserUsingAMPM = function isBrowserUsingAMPM(locale) {
|
|
110
|
-
return !!new Date(Date.UTC(2020, 7, 30, 3, 0, 0)).toLocaleTimeString(locale).match(/am|a
|
|
110
|
+
return !!new Date(Date.UTC(2020, 7, 30, 3, 0, 0)).toLocaleTimeString(locale).match(/am|a\.m|pm|p\.m/i);
|
|
111
111
|
};
|
|
112
112
|
var parseTime = exports.parseTime = function parseTime(timeStr) {
|
|
113
113
|
var time = timeStr.match(/(\d+)(?::(\d\d))?\s*(p?)/i);
|
package/package.json
CHANGED
|
@@ -184,7 +184,9 @@ const WrappedDatePicker = ({
|
|
|
184
184
|
showTimeInput={useTime ?? false}
|
|
185
185
|
useTime={useTime ?? false}
|
|
186
186
|
customTimeInput={
|
|
187
|
-
useTime ?
|
|
187
|
+
useTime ? (
|
|
188
|
+
<TimePicker showTimeZone={showTimeZone} windowsTimeZone={windowsTimeZoneName} timeOption={timeOption} />
|
|
189
|
+
) : null
|
|
188
190
|
}
|
|
189
191
|
timeInputLabel={timeInputLabel ?? ""}
|
|
190
192
|
readOnly={readOnly}
|
|
@@ -67,7 +67,7 @@ const ampmOptions = [
|
|
|
67
67
|
];
|
|
68
68
|
|
|
69
69
|
const isBrowserUsingAMPM = locale =>
|
|
70
|
-
!!new Date(Date.UTC(2020, 7, 30, 3, 0, 0)).toLocaleTimeString(locale).match(/am|a
|
|
70
|
+
!!new Date(Date.UTC(2020, 7, 30, 3, 0, 0)).toLocaleTimeString(locale).match(/am|a\.m|pm|p\.m/i);
|
|
71
71
|
|
|
72
72
|
export const parseTime = timeStr => {
|
|
73
73
|
var time = timeStr.match(/(\d+)(?::(\d\d))?\s*(p?)/i);
|