@os-design/core 1.0.282 → 1.0.284
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/InputDateUnstyled/index.tsx"],"names":[],"mappings":"AAcA,OAAoB,EAAE,KAAK,GAAG,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAqB,EAAE,KAAK,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAIlE,eAAO,MAAM,MAAM,6DAST,CAAC;AACX,eAAO,MAAM,aAAa,UAA+C,CAAC;AAE1E,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5C,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,aAAa,GAAG,IAAI,CACvB,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAC9B,OAAO,GAAG,cAAc,GAAG,UAAU,GAAG,KAAK,CAC9C,CAAC;AAEF,MAAM,WAAW,sBAAuB,SAAQ,aAAa;IAC3D;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;IACnD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;GAEG;AACH,QAAA,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/InputDateUnstyled/index.tsx"],"names":[],"mappings":"AAcA,OAAoB,EAAE,KAAK,GAAG,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAqB,EAAE,KAAK,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAIlE,eAAO,MAAM,MAAM,6DAST,CAAC;AACX,eAAO,MAAM,aAAa,UAA+C,CAAC;AAE1E,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5C,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,aAAa,GAAG,IAAI,CACvB,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAC9B,OAAO,GAAG,cAAc,GAAG,UAAU,GAAG,KAAK,CAC9C,CAAC;AAEF,MAAM,WAAW,sBAAuB,SAAQ,aAAa;IAC3D;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;IACnD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;GAEG;AACH,QAAA,MAAM,iBAAiB,qHAqZtB,CAAC;AAIF,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAClE,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AAEjC,eAAe,iBAAiB,CAAC"}
|
|
@@ -45,12 +45,15 @@ const InputDateUnstyled = /*#__PURE__*/forwardRef(({
|
|
|
45
45
|
onChange: onSelectionChange
|
|
46
46
|
});
|
|
47
47
|
const defaultInputValue = useMemo(() => {
|
|
48
|
+
if (value) {
|
|
49
|
+
return dateToString(value, format);
|
|
50
|
+
}
|
|
48
51
|
let res = format;
|
|
49
52
|
tokens.forEach(token => {
|
|
50
53
|
res = res.replaceAll(token, '_'.repeat(token.length));
|
|
51
54
|
});
|
|
52
55
|
return res;
|
|
53
|
-
}, [format]);
|
|
56
|
+
}, [format, value]);
|
|
54
57
|
const [forwardedInputValue, setForwardedInputValue] = useForwardedState({
|
|
55
58
|
value: inputValue,
|
|
56
59
|
defaultValue: defaultInputValue,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { convertTo12hours } from './convertHours.js';
|
|
2
2
|
const dateToString = (date, format) => {
|
|
3
|
-
let str = format.replace('DD', date.getDate().toString().padStart(2, '0')).replace('MM', (date.getMonth() + 1).toString().padStart(2, '0')).replace('YYYY', date.getFullYear().toString()).replace('YY', date.getFullYear().toString().slice(-2)).replace('HH', date.getHours().toString().padStart(2, '0')).replace('mm', date.getMinutes().toString().padStart(2, '0'));
|
|
3
|
+
let str = format.replace('DD', date.getDate().toString().padStart(2, '0')).replace('MM', (date.getMonth() + 1).toString().padStart(2, '0')).replace('YYYY', date.getFullYear().toString().padStart(4, '0')).replace('YY', date.getFullYear().toString().padStart(2, '0').slice(-2)).replace('HH', date.getHours().toString().padStart(2, '0')).replace('mm', date.getMinutes().toString().padStart(2, '0'));
|
|
4
4
|
if (str.includes('hh')) {
|
|
5
5
|
const [hours, meridiem] = convertTo12hours(date.getHours());
|
|
6
6
|
str = str.replace('hh', hours.toString().padStart(2, '0')).replace('aa', meridiem);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@os-design/core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.284",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"repository": "git@gitlab.com:os-team/libs/os-design.git",
|
|
6
6
|
"type": "module",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"react": "18",
|
|
59
59
|
"react-dom": "18"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "a46f7e9f61e15352be6ec301cf0c4e40a3ea6bda"
|
|
62
62
|
}
|
|
@@ -143,12 +143,15 @@ const InputDateUnstyled = forwardRef<HTMLInputElement, InputDateUnstyledProps>(
|
|
|
143
143
|
});
|
|
144
144
|
|
|
145
145
|
const defaultInputValue = useMemo(() => {
|
|
146
|
+
if (value) {
|
|
147
|
+
return dateToString(value, format);
|
|
148
|
+
}
|
|
146
149
|
let res = format;
|
|
147
150
|
tokens.forEach((token) => {
|
|
148
151
|
res = res.replaceAll(token, '_'.repeat(token.length));
|
|
149
152
|
});
|
|
150
153
|
return res;
|
|
151
|
-
}, [format]);
|
|
154
|
+
}, [format, value]);
|
|
152
155
|
|
|
153
156
|
const [forwardedInputValue, setForwardedInputValue] = useForwardedState({
|
|
154
157
|
value: inputValue,
|
|
@@ -4,8 +4,8 @@ const dateToString = (date: Date, format: string) => {
|
|
|
4
4
|
let str = format
|
|
5
5
|
.replace('DD', date.getDate().toString().padStart(2, '0'))
|
|
6
6
|
.replace('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
|
7
|
-
.replace('YYYY', date.getFullYear().toString())
|
|
8
|
-
.replace('YY', date.getFullYear().toString().slice(-2))
|
|
7
|
+
.replace('YYYY', date.getFullYear().toString().padStart(4, '0'))
|
|
8
|
+
.replace('YY', date.getFullYear().toString().padStart(2, '0').slice(-2))
|
|
9
9
|
.replace('HH', date.getHours().toString().padStart(2, '0'))
|
|
10
10
|
.replace('mm', date.getMinutes().toString().padStart(2, '0'));
|
|
11
11
|
|