@axelor/aos-mobile-core 6.4.3 → 6.4.5
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/lib/app/ContextedApplication.js +2 -1
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +2 -7
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +10 -9
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/package.json +7 -7
|
@@ -20,7 +20,7 @@ import { StyleSheet } from 'react-native';
|
|
|
20
20
|
import Toast, { BaseToast, ErrorToast } from 'react-native-toast-message';
|
|
21
21
|
import { NavigationContainer } from '@react-navigation/native';
|
|
22
22
|
import axios from 'axios';
|
|
23
|
-
import { LoadingIndicator, HeaderIndicator, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
23
|
+
import { LoadingIndicator, HeaderIndicator, useThemeColor, BlockInteractionMessage, } from '@axelor/aos-mobile-ui';
|
|
24
24
|
import { ErrorBoundary } from '@axelor/aos-mobile-error';
|
|
25
25
|
import RootNavigator from './RootNavigator';
|
|
26
26
|
import Translator from '../i18n/component/Translator';
|
|
@@ -47,6 +47,7 @@ const ContextedApplication = ({ modules, mainMenu, version, showModulesSubtitle
|
|
|
47
47
|
<NavigationContainer>
|
|
48
48
|
<HeaderIndicator />
|
|
49
49
|
<LoadingIndicator />
|
|
50
|
+
<BlockInteractionMessage />
|
|
50
51
|
<RootNavigator modules={modules} mainMenu={mainMenu} version={version} showModulesSubtitle={showModulesSubtitle} onRefresh={() => setRefresh(_current => !_current)} configuration={configuration}/>
|
|
51
52
|
</NavigationContainer>
|
|
52
53
|
</ErrorBoundary>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EAEf,aAAa,
|
|
1
|
+
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,11 +29,8 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
29
29
|
const [pickerWidth, setPickerWidth] = useState();
|
|
30
30
|
const [pickerIsOpen, setPickerIsOpen] = useState(false);
|
|
31
31
|
const [selectedDate, setSelectedDate] = useState(defaultDate);
|
|
32
|
-
const [isFocused, setIsFocused] = useState(false);
|
|
33
32
|
useEffect(() => {
|
|
34
|
-
|
|
35
|
-
setSelectedDate(defaultDate);
|
|
36
|
-
}
|
|
33
|
+
setSelectedDate(defaultDate);
|
|
37
34
|
}, [defaultDate]);
|
|
38
35
|
const wrapperRef = useRef(null);
|
|
39
36
|
const clickOutside = useClickOutside({
|
|
@@ -43,13 +40,11 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
43
40
|
useEffect(() => {
|
|
44
41
|
if (clickOutside === OUTSIDE_INDICATOR && pickerIsOpen) {
|
|
45
42
|
setPickerIsOpen(false);
|
|
46
|
-
setIsFocused(false);
|
|
47
43
|
}
|
|
48
44
|
}, [clickOutside, pickerIsOpen]);
|
|
49
45
|
const togglePicker = () => {
|
|
50
46
|
if (!readonly) {
|
|
51
47
|
setPickerIsOpen(current => !current);
|
|
52
|
-
setIsFocused(current => !current);
|
|
53
48
|
}
|
|
54
49
|
};
|
|
55
50
|
const onCheckDate = useCallback(() => {
|
|
@@ -78,7 +73,7 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
78
73
|
commonStyles.filterSize,
|
|
79
74
|
commonStyles.filterAlign,
|
|
80
75
|
styles.rightIconButton,
|
|
81
|
-
|
|
76
|
+
pickerIsOpen && commonStyles.inputFocused,
|
|
82
77
|
]}/>
|
|
83
78
|
<View>
|
|
84
79
|
{pickerIsOpen ? (<Card style={styles.selectionContainer}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EACL,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,aAAa,EACb,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAYjD,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,MAAM,SAAS,GAAG,CAAC,EACjB,KAAK,EACL,WAAW,EACX,IAAI,GAAG,UAAU,EACjB,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,KAAK,EACL,QAAQ,GAAG,KAAK,GACD,EAAE,EAAE;IACnB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAU,CAAC;IACzD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EACL,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,aAAa,EACb,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAYjD,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,MAAM,SAAS,GAAG,CAAC,EACjB,KAAK,EACL,WAAW,EACX,IAAI,GAAG,UAAU,EACjB,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,KAAK,EACL,QAAQ,GAAG,KAAK,GACD,EAAE,EAAE;IACnB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAU,CAAC;IACzD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,YAAY,GAAG,eAAe,CAAC;QACnC,UAAU;QACV,OAAO,EAAE,YAAY;KACtB,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,iBAAiB,IAAI,YAAY,EAAE;YACtD,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAEjC,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,CAAC,QAAQ,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SACtC;IACH,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,CAAC,YAAY,EAAE;YACjB,eAAe,CAAC,WAAW,CAAC,CAAC;YAC7B,YAAY,CAAC,WAAW,CAAC,CAAC;YAC1B,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;aAAM;YACL,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,eAAe,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,OAAO,CACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CACtD;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,CACxC;MAAA,CAAC,eAAe,CACd,OAAO,CAAC,CAAC,YAAY,CAAC,CACtB,IAAI,CAAC,CACH,CAAC,QAAQ,IAAI,CACX,CAAC,IAAI,CACH,IAAI,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CACvC,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAC7C,CACH,CACF,CACD,KAAK,CAAC,CACJ,YAAY;YACV,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC;YACrD,CAAC,CAAC,cAAc,CAAC,uBAAuB,CAAC,IAAI,CAAC,CACjD,CACD,SAAS,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAClC,KAAK,CAAC,CAAC;YACL,YAAY,CAAC,MAAM;YACnB,YAAY,CAAC,UAAU;YACvB,YAAY,CAAC,WAAW;YACxB,MAAM,CAAC,eAAe;YACtB,YAAY,IAAI,YAAY,CAAC,YAAY;SAC1C,CAAC,EAEJ;MAAA,CAAC,IAAI,CACH;QAAA,CAAC,YAAY,CAAC,CAAC,CAAC,CACd,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CACrC;YAAA,CAAC,IAAI,CACH,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE;gBAChB,MAAM,EAAC,KAAK,EAAC,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;gBACzC,cAAc,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CAAC,CACF,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAClC;cAAA,CAAC,UAAU,CACT,WAAW,CAAC,CAAC,YAAY,IAAI,WAAW,CAAC,CACzC,YAAY,CAAC,CAAC,eAAe,CAAC,CAC9B,IAAI,CAAC,CAAC,IAAI,CAAC,CACX,WAAW,CAAC,CAAC,WAAW,CAAC,EAE7B;YAAA,EAAE,IAAI,CACN;YAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAClC;cAAA,CAAC,IAAI,CACH,IAAI,CAAC,cAAc,CACnB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CACtC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CACvB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,YAAY,CAAC,CAAC,KAAK,CAAC,CACpB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAE7B;cAAA,CAAC,QAAQ,IAAI,CACX,CAAC,IAAI,CACH,IAAI,CAAC,cAAc,CACnB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CACtC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CACvB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,YAAY,CAAC,CAAC,KAAK,CAAC,CACpB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAC3B,CACH,CACH;YAAA,EAAE,IAAI,CACR;UAAA,EAAE,IAAI,CAAC,CACR,CAAC,CAAC,CAAC,IAAI,CACV;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CACzB,UAAU,CAAC,MAAM,CAAC;IAChB,YAAY,EAAE;QACZ,UAAU,EAAE,EAAE;KACf;IACD,eAAe,EAAE;QACf,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,UAAU;QAC1B,UAAU,EAAE,UAAU;KACvB;IACD,SAAS,EAAE;QACT,KAAK,EAAE,MAAM;KACd;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,CAAC;KACR;IACD,eAAe,EAAE;QACf,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,MAAM;KACd;IACD,kBAAkB,EAAE;QAClB,iBAAiB,EAAE,CAAC;QACpB,eAAe,EAAE,EAAE;QACnB,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,GAAG;KACZ;IACD,eAAe,EAAE;QACf,IAAI,EAAE,MAAM;KACb;IACD,KAAK,EAAE;QACL,UAAU,EAAE,CAAC;KACd;CACF,CAAC,CAAC;AAEL,eAAe,SAAS,CAAC"}
|
|
@@ -15,13 +15,13 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useState, useEffect } from 'react';
|
|
18
|
+
import React, { useState, useEffect, useCallback } from 'react';
|
|
19
19
|
import { AutoCompleteSearch, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
20
20
|
import { useScannedValueByKey, useScannerSelector, } from '../../../features/scannerSlice';
|
|
21
21
|
import { useCameraScannerValueByKey } from '../../../features/cameraScannerSlice';
|
|
22
22
|
import { useScanActivator, useScannerDeviceActivator, } from '../../../hooks/use-scan-activator';
|
|
23
23
|
const ScannerAutocompleteSearch = ({ objectList, value, onChangeValue, fetchData, displayValue, placeholder, scanKeySearch, isFocus = false, changeScreenAfter = false, navigate = false, oneFilter = false, selectLastItem = true, style, }) => {
|
|
24
|
-
const [
|
|
24
|
+
const [searchValue, setSearchValue] = useState(value);
|
|
25
25
|
const { isEnabled, scanKey } = useScannerSelector();
|
|
26
26
|
const scannedValue = useScannedValueByKey(scanKeySearch);
|
|
27
27
|
const scanData = useCameraScannerValueByKey(scanKeySearch);
|
|
@@ -29,22 +29,23 @@ const ScannerAutocompleteSearch = ({ objectList, value, onChangeValue, fetchData
|
|
|
29
29
|
const { enable: enableScanner } = useScannerDeviceActivator(scanKeySearch);
|
|
30
30
|
useEffect(() => {
|
|
31
31
|
if (scannedValue) {
|
|
32
|
-
|
|
32
|
+
setSearchValue(scannedValue);
|
|
33
33
|
}
|
|
34
34
|
else if (scanData?.value != null) {
|
|
35
|
-
|
|
35
|
+
setSearchValue(scanData.value);
|
|
36
36
|
}
|
|
37
37
|
}, [scanData, scannedValue]);
|
|
38
38
|
const Colors = useThemeColor();
|
|
39
39
|
useEffect(() => {
|
|
40
40
|
if (value) {
|
|
41
|
-
|
|
41
|
+
setSearchValue(value);
|
|
42
42
|
}
|
|
43
43
|
}, [value]);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
const handleChangeValue = useCallback(_value => {
|
|
45
|
+
setSearchValue(_value);
|
|
46
|
+
onChangeValue(_value);
|
|
47
|
+
}, [onChangeValue]);
|
|
48
|
+
return (<AutoCompleteSearch selectLastItem={selectLastItem} objectList={objectList} value={searchValue} onChangeValue={handleChangeValue} fetchData={fetchData} displayValue={displayValue} placeholder={placeholder} isFocus={isFocus} changeScreenAfter={changeScreenAfter} navigate={navigate} oneFilter={oneFilter} onSelection={enableScanner} onScanPress={onScanPress} scanIconColor={isEnabled && scanKey === scanKeySearch
|
|
48
49
|
? Colors.primaryColor.background
|
|
49
50
|
: Colors.secondaryColor_dark.background} style={style}/>);
|
|
50
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScannerAutocompleteSearch.js","sourceRoot":"","sources":["../../../../src/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAE,SAAS,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ScannerAutocompleteSearch.js","sourceRoot":"","sources":["../../../../src/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "6.4.
|
|
3
|
+
"version": "6.4.5",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -82,12 +82,12 @@
|
|
|
82
82
|
"vision-camera-code-scanner": "^0.2.0"
|
|
83
83
|
},
|
|
84
84
|
"dependencies": {
|
|
85
|
-
"@axelor/aos-mobile-error": "6.4.
|
|
86
|
-
"@axelor/aos-mobile-ui": "6.4.
|
|
87
|
-
"@react-navigation/drawer": "6.
|
|
88
|
-
"@react-navigation/native": "6.
|
|
89
|
-
"@react-navigation/native-stack": "6.
|
|
90
|
-
"@react-navigation/stack": "6.
|
|
85
|
+
"@axelor/aos-mobile-error": "6.4.5",
|
|
86
|
+
"@axelor/aos-mobile-ui": "6.4.5",
|
|
87
|
+
"@react-navigation/drawer": "6.6.3",
|
|
88
|
+
"@react-navigation/native": "6.1.7",
|
|
89
|
+
"@react-navigation/native-stack": "6.9.13",
|
|
90
|
+
"@react-navigation/stack": "6.3.17",
|
|
91
91
|
"@reduxjs/toolkit": "^1.8.5",
|
|
92
92
|
"moment": "^2.29.4",
|
|
93
93
|
"react-native-calendars": "1.1284",
|