@os-design/core 1.0.271 → 1.0.272
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/DatePicker/index.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/DatePicker/index.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAOlD,OAAO,KAON,MAAM,OAAO,CAAC;AAiBf,KAAK,WAAW,GAAG,IAAI,CACrB,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAC5B,OAAO,GAAG,cAAc,GAAG,UAAU,GAAG,KAAK,CAC9C,CAAC;AACF,UAAU,mBAAmB,CAAC,CAAC,CAAE,SAAQ,WAAW,EAAE,QAAQ;IAC5D;;;OAGG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACxB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC;IAC9B;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IAClD;;;OAGG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IACrC;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACjB;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACxB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AACD,MAAM,WAAW,uBAAwB,SAAQ,mBAAmB,CAAC,IAAI,CAAC;IACxE;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AACD,MAAM,WAAW,oBACf,SAAQ,mBAAmB,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC;;;OAGG;IACH,KAAK,EAAE,IAAI,CAAC;CACb;AACD,MAAM,MAAM,eAAe,GAAG,uBAAuB,GAAG,oBAAoB,CAAC;AAsC7E;;GAEG;AACH,QAAA,MAAM,UAAU,wFA4Xf,CAAC;AAIF,eAAe,UAAU,CAAC"}
|
package/dist/DatePicker/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import styled from '@emotion/styled';
|
|
2
|
-
import { defaultLocale, getAccessibilityDateLabel, useFormattedValue } from '@os-design/date-picker-utils';
|
|
2
|
+
import { defaultLocale, getAccessibilityDateLabel, useFormattedValue, isSameDay } from '@os-design/date-picker-utils';
|
|
3
3
|
import { Down, Up } from '@os-design/icons';
|
|
4
4
|
import { useIsMinWidth } from '@os-design/media';
|
|
5
5
|
import { ThemeOverrider } from '@os-design/theming';
|
|
@@ -175,9 +175,15 @@ const DatePicker = /*#__PURE__*/forwardRef(({
|
|
|
175
175
|
const tabOnInputComplete = useCallback(e => {
|
|
176
176
|
if (e.target.selectionStart < 5) return;
|
|
177
177
|
secondTimePickerRef.current?.focus();
|
|
178
|
-
setForwardedValue(([from]) => {
|
|
179
|
-
const nextTo = new Date(
|
|
180
|
-
|
|
178
|
+
setForwardedValue(([from, to]) => {
|
|
179
|
+
const nextTo = new Date(to.getTime());
|
|
180
|
+
if (isSameDay(from, to)) {
|
|
181
|
+
nextTo.setHours(from.getHours() + 1);
|
|
182
|
+
nextTo.setMinutes(from.getMinutes());
|
|
183
|
+
} else {
|
|
184
|
+
nextTo.setHours(from.getHours());
|
|
185
|
+
nextTo.setMinutes(from.getMinutes());
|
|
186
|
+
}
|
|
181
187
|
return [from, nextTo];
|
|
182
188
|
});
|
|
183
189
|
}, [setForwardedValue]);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@os-design/core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.272",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"repository": "git@gitlab.com:os-team/libs/os-design.git",
|
|
6
6
|
"type": "module",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"access": "public"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@os-design/date-picker-utils": "^1.0.
|
|
32
|
+
"@os-design/date-picker-utils": "^1.0.33",
|
|
33
33
|
"@os-design/icons": "^1.0.68",
|
|
34
34
|
"@os-design/input-number-utils": "^1.0.38",
|
|
35
35
|
"@os-design/input-password-utils": "^1.0.3",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"react": "18",
|
|
59
59
|
"react-dom": "18"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "76fcd7ad4defc5b75f17760fefd87d5cd2ba9799"
|
|
62
62
|
}
|
package/src/DatePicker/index.tsx
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
defaultLocale,
|
|
5
5
|
getAccessibilityDateLabel,
|
|
6
6
|
useFormattedValue,
|
|
7
|
+
isSameDay,
|
|
7
8
|
} from '@os-design/date-picker-utils';
|
|
8
9
|
import { Down, Up } from '@os-design/icons';
|
|
9
10
|
import { useIsMinWidth } from '@os-design/media';
|
|
@@ -379,9 +380,15 @@ const DatePicker = forwardRef<HTMLDivElement, DatePickerProps>(
|
|
|
379
380
|
(e) => {
|
|
380
381
|
if (e.target.selectionStart < 5) return;
|
|
381
382
|
secondTimePickerRef.current?.focus();
|
|
382
|
-
setForwardedValue(([from]) => {
|
|
383
|
-
const nextTo = new Date(
|
|
384
|
-
|
|
383
|
+
setForwardedValue(([from, to]) => {
|
|
384
|
+
const nextTo = new Date(to.getTime());
|
|
385
|
+
if (isSameDay(from, to)) {
|
|
386
|
+
nextTo.setHours(from.getHours() + 1);
|
|
387
|
+
nextTo.setMinutes(from.getMinutes());
|
|
388
|
+
} else {
|
|
389
|
+
nextTo.setHours(from.getHours());
|
|
390
|
+
nextTo.setMinutes(from.getMinutes());
|
|
391
|
+
}
|
|
385
392
|
return [from, nextTo];
|
|
386
393
|
});
|
|
387
394
|
},
|