@codeleap/mobile 5.4.1 → 5.4.2
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.
- package/dist/components/Calendar/index.js +4 -6
- package/dist/components/Calendar/index.js.map +1 -1
- package/dist/components/CalendarInput/index.js +3 -4
- package/dist/components/CalendarInput/index.js.map +1 -1
- package/package.json +17 -17
- package/package.json.bak +1 -1
- package/src/components/Calendar/index.tsx +4 -7
- package/src/components/CalendarInput/index.tsx +3 -5
|
@@ -4,13 +4,11 @@ import { MobileStyleRegistry } from '../../Registry';
|
|
|
4
4
|
import { useStylesFor } from '../../hooks';
|
|
5
5
|
import dayjs from 'dayjs';
|
|
6
6
|
import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
|
|
7
|
+
import { dateUtils } from '@codeleap/utils';
|
|
7
8
|
dayjs.extend(isSameOrBefore);
|
|
8
9
|
export * from './styles';
|
|
9
10
|
export * from './types';
|
|
10
11
|
const DATE_FORMAT = 'YYYY-MM-DD';
|
|
11
|
-
const formatDate = (date) => {
|
|
12
|
-
return dayjs(date).startOf('day').format(DATE_FORMAT);
|
|
13
|
-
};
|
|
14
12
|
export const Calendar = (props) => {
|
|
15
13
|
const { style, value, onValueChange, ...calendarProps } = props;
|
|
16
14
|
const styles = useStylesFor(Calendar.styleRegistryName, style);
|
|
@@ -19,9 +17,9 @@ export const Calendar = (props) => {
|
|
|
19
17
|
if (!value)
|
|
20
18
|
return isRange ? [] : '';
|
|
21
19
|
if (isRange) {
|
|
22
|
-
return value.map(v =>
|
|
20
|
+
return value.map((v) => dateUtils.removeTimezoneAndFormat(v));
|
|
23
21
|
}
|
|
24
|
-
return
|
|
22
|
+
return dateUtils.removeTimezoneAndFormat(value);
|
|
25
23
|
}, [value, isRange]);
|
|
26
24
|
const markedDates = useMemo(() => {
|
|
27
25
|
if (!isRange) {
|
|
@@ -39,7 +37,7 @@ export const Calendar = (props) => {
|
|
|
39
37
|
const marked = {};
|
|
40
38
|
let current = startDate;
|
|
41
39
|
while (current.isSameOrBefore(endDate)) {
|
|
42
|
-
const dateStr =
|
|
40
|
+
const dateStr = dateUtils.removeTimezoneAndFormat(current);
|
|
43
41
|
marked[dateStr] = {
|
|
44
42
|
selected: true,
|
|
45
43
|
...(current.isSame(startDate) && { startingDay: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Calendar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAY,MAAM,wBAAwB,CAAA;AAEzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,KAAgB,MAAM,OAAO,CAAA;AACpC,OAAO,cAAc,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Calendar/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ import { useStylesFor } from '../../hooks';
|
|
|
5
5
|
import { View } from '../View';
|
|
6
6
|
import { Calendar } from '../Calendar';
|
|
7
7
|
import { TextInput } from '../TextInput';
|
|
8
|
-
import dayjs from 'dayjs';
|
|
9
8
|
import Animated, { FadeOut, FadeIn } from 'react-native-reanimated';
|
|
10
9
|
import { useInputBase } from '../InputBase';
|
|
11
10
|
import { fields } from '@codeleap/form';
|
|
12
11
|
import { useInputOverlay } from '../InputBase/useInputOverlay';
|
|
12
|
+
import { dateUtils } from '@codeleap/utils';
|
|
13
13
|
export * from './styles';
|
|
14
14
|
export * from './types';
|
|
15
15
|
export const CalendarInput = (props) => {
|
|
@@ -23,16 +23,15 @@ export const CalendarInput = (props) => {
|
|
|
23
23
|
const [inputHeight, setInputHeight] = useState(0);
|
|
24
24
|
const [isOpen, toggle] = useInputOverlay(autoClosePeersCalendars);
|
|
25
25
|
const formattedValue = useMemo(() => {
|
|
26
|
-
const normalize = (d) => dayjs(d).startOf('day').format(format);
|
|
27
26
|
if (!inputValue)
|
|
28
27
|
return '';
|
|
29
28
|
if (Array.isArray(inputValue)) {
|
|
30
29
|
const filled = inputValue.filter(Boolean);
|
|
31
30
|
if (filled.length < inputValue.length)
|
|
32
31
|
return '';
|
|
33
|
-
return filled.map(
|
|
32
|
+
return filled.map((v) => dateUtils.removeTimezoneAndFormat(v)).join(' - ');
|
|
34
33
|
}
|
|
35
|
-
return
|
|
34
|
+
return dateUtils.removeTimezoneAndFormat(inputValue);
|
|
36
35
|
}, [inputValue, format]);
|
|
37
36
|
return (<View style={[styles.wrapper, { position: 'relative' }]}>
|
|
38
37
|
<TextInput placeholder='Select Date' disabled={disabled} {...textInputProps} style={compositionStyles.input} leftIcon={!leftIcon ? null : {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CalendarInput/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAyC,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CalendarInput/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codeleap/mobile",
|
|
3
|
-
"version": "5.4.
|
|
3
|
+
"version": "5.4.2",
|
|
4
4
|
"main": "src/index.ts",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"repository": {
|
|
@@ -9,28 +9,28 @@
|
|
|
9
9
|
"directory": "packages/mobile"
|
|
10
10
|
},
|
|
11
11
|
"devDependencies": {
|
|
12
|
-
"@codeleap/types": "5.4.
|
|
13
|
-
"@codeleap/utils": "5.4.
|
|
14
|
-
"@codeleap/hooks": "5.4.
|
|
15
|
-
"@codeleap/form": "5.4.
|
|
16
|
-
"@codeleap/query": "5.4.
|
|
17
|
-
"@codeleap/logger": "5.4.
|
|
18
|
-
"@codeleap/config": "5.4.
|
|
19
|
-
"@codeleap/modals": "5.4.
|
|
12
|
+
"@codeleap/types": "5.4.2",
|
|
13
|
+
"@codeleap/utils": "5.4.2",
|
|
14
|
+
"@codeleap/hooks": "5.4.2",
|
|
15
|
+
"@codeleap/form": "5.4.2",
|
|
16
|
+
"@codeleap/query": "5.4.2",
|
|
17
|
+
"@codeleap/logger": "5.4.2",
|
|
18
|
+
"@codeleap/config": "5.4.2",
|
|
19
|
+
"@codeleap/modals": "5.4.2"
|
|
20
20
|
},
|
|
21
21
|
"scripts": {
|
|
22
22
|
"build": "tsc --build",
|
|
23
23
|
"lint": "eslint -c .eslintrc.js --fix \"./src/**/*.{ts,tsx,js,jsx}\""
|
|
24
24
|
},
|
|
25
25
|
"peerDependencies": {
|
|
26
|
-
"@codeleap/types": "5.4.
|
|
27
|
-
"@codeleap/utils": "5.4.
|
|
28
|
-
"@codeleap/hooks": "5.4.
|
|
29
|
-
"@codeleap/form": "5.4.
|
|
30
|
-
"@codeleap/query": "5.4.
|
|
31
|
-
"@codeleap/logger": "5.4.
|
|
32
|
-
"@codeleap/styles": "5.4.
|
|
33
|
-
"@codeleap/modals": "5.4.
|
|
26
|
+
"@codeleap/types": "5.4.2",
|
|
27
|
+
"@codeleap/utils": "5.4.2",
|
|
28
|
+
"@codeleap/hooks": "5.4.2",
|
|
29
|
+
"@codeleap/form": "5.4.2",
|
|
30
|
+
"@codeleap/query": "5.4.2",
|
|
31
|
+
"@codeleap/logger": "5.4.2",
|
|
32
|
+
"@codeleap/styles": "5.4.2",
|
|
33
|
+
"@codeleap/modals": "5.4.2",
|
|
34
34
|
"@d11/react-native-fast-image": "8.9.2",
|
|
35
35
|
"@react-native-firebase/messaging": "21.12.0",
|
|
36
36
|
"@react-navigation/bottom-tabs": "7.3.10",
|
package/package.json.bak
CHANGED
|
@@ -6,6 +6,7 @@ import { useStylesFor } from '../../hooks'
|
|
|
6
6
|
import { CalendarProps } from './types'
|
|
7
7
|
import dayjs, { Dayjs } from 'dayjs'
|
|
8
8
|
import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
|
|
9
|
+
import { dateUtils } from '@codeleap/utils'
|
|
9
10
|
|
|
10
11
|
dayjs.extend(isSameOrBefore)
|
|
11
12
|
|
|
@@ -14,10 +15,6 @@ export * from './types'
|
|
|
14
15
|
|
|
15
16
|
const DATE_FORMAT = 'YYYY-MM-DD'
|
|
16
17
|
|
|
17
|
-
const formatDate = (date: Dayjs | Date | string): string => {
|
|
18
|
-
return dayjs(date).startOf('day').format(DATE_FORMAT)
|
|
19
|
-
}
|
|
20
|
-
|
|
21
18
|
export const Calendar = (props: CalendarProps) => {
|
|
22
19
|
const {
|
|
23
20
|
style,
|
|
@@ -34,10 +31,10 @@ export const Calendar = (props: CalendarProps) => {
|
|
|
34
31
|
if (!value) return isRange ? [] : ''
|
|
35
32
|
|
|
36
33
|
if (isRange) {
|
|
37
|
-
return (value as any).map(v =>
|
|
34
|
+
return (value as any).map((v) => dateUtils.removeTimezoneAndFormat(v))
|
|
38
35
|
}
|
|
39
36
|
|
|
40
|
-
return
|
|
37
|
+
return dateUtils.removeTimezoneAndFormat(value)
|
|
41
38
|
}, [value, isRange])
|
|
42
39
|
|
|
43
40
|
const markedDates = useMemo(() => {
|
|
@@ -59,7 +56,7 @@ export const Calendar = (props: CalendarProps) => {
|
|
|
59
56
|
let current = startDate
|
|
60
57
|
|
|
61
58
|
while (current.isSameOrBefore(endDate)) {
|
|
62
|
-
const dateStr =
|
|
59
|
+
const dateStr = dateUtils.removeTimezoneAndFormat(current)
|
|
63
60
|
marked[dateStr] = {
|
|
64
61
|
selected: true,
|
|
65
62
|
...(current.isSame(startDate) && { startingDay: true }),
|
|
@@ -6,11 +6,11 @@ import { CalendarInputProps } from './types'
|
|
|
6
6
|
import { View } from '../View'
|
|
7
7
|
import { Calendar } from '../Calendar'
|
|
8
8
|
import { TextInput } from '../TextInput'
|
|
9
|
-
import dayjs from 'dayjs'
|
|
10
9
|
import Animated, { FadeOut, FadeIn } from 'react-native-reanimated'
|
|
11
10
|
import { useInputBase } from '../InputBase'
|
|
12
11
|
import { fields } from '@codeleap/form'
|
|
13
12
|
import { useInputOverlay } from '../InputBase/useInputOverlay'
|
|
13
|
+
import { dateUtils } from '@codeleap/utils'
|
|
14
14
|
|
|
15
15
|
export * from './styles'
|
|
16
16
|
export * from './types'
|
|
@@ -50,17 +50,15 @@ export const CalendarInput = (props: CalendarInputProps) => {
|
|
|
50
50
|
const [isOpen, toggle] = useInputOverlay(autoClosePeersCalendars)
|
|
51
51
|
|
|
52
52
|
const formattedValue = useMemo(() => {
|
|
53
|
-
const normalize = (d: any) => dayjs(d).startOf('day').format(format)
|
|
54
|
-
|
|
55
53
|
if (!inputValue) return ''
|
|
56
54
|
|
|
57
55
|
if (Array.isArray(inputValue)) {
|
|
58
56
|
const filled = inputValue.filter(Boolean)
|
|
59
57
|
if (filled.length < inputValue.length) return ''
|
|
60
|
-
return filled.map(
|
|
58
|
+
return filled.map((v) => dateUtils.removeTimezoneAndFormat(v)).join(' - ')
|
|
61
59
|
}
|
|
62
60
|
|
|
63
|
-
return
|
|
61
|
+
return dateUtils.removeTimezoneAndFormat(inputValue)
|
|
64
62
|
}, [inputValue, format])
|
|
65
63
|
|
|
66
64
|
return (
|