@axelor/aos-mobile-core 8.5.15 → 8.5.17
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/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +8 -5
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/features/scannerSlice.d.ts +2 -0
- package/lib/features/scannerSlice.js +8 -2
- package/lib/features/scannerSlice.js.map +1 -1
- package/lib/hooks/use-mass-scanner.js +6 -4
- package/lib/hooks/use-mass-scanner.js.map +1 -1
- package/lib/hooks/use-scan-activator.d.ts +1 -1
- package/lib/hooks/use-scan-activator.js +4 -4
- package/lib/hooks/use-scan-activator.js.map +1 -1
- package/lib/navigator/components/DrawerContent.d.ts +1 -1
- package/lib/navigator/components/DrawerContent.js +16 -7
- package/lib/navigator/components/DrawerContent.js.map +1 -1
- package/lib/navigator/components/menu/Menu.d.ts +4 -2
- package/lib/navigator/components/menu/Menu.js +8 -2
- package/lib/navigator/components/menu/Menu.js.map +1 -1
- package/lib/navigator/helpers/index.d.ts +1 -1
- package/lib/navigator/helpers/index.js +1 -1
- package/lib/navigator/helpers/index.js.map +1 -1
- package/lib/navigator/helpers/menu.helper.d.ts +5 -4
- package/lib/navigator/helpers/menu.helper.js +17 -6
- package/lib/navigator/helpers/menu.helper.js.map +1 -1
- package/lib/utils/object.d.ts +1 -1
- package/lib/utils/string.d.ts +3 -3
- package/lib/utils/string.js +5 -7
- package/lib/utils/string.js.map +1 -1
- package/package.json +3 -3
|
@@ -15,7 +15,7 @@
|
|
|
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, useCallback } from 'react';
|
|
18
|
+
import React, { useState, useEffect, useCallback, useMemo } from 'react';
|
|
19
19
|
import { AutoCompleteSearch, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
20
20
|
import { clearScan, useScannedValueByKey, useScannerSelector, } from '../../../features/scannerSlice';
|
|
21
21
|
import { clearBarcode, useCameraScannerValueByKey, } from '../../../features/cameraScannerSlice';
|
|
@@ -28,7 +28,7 @@ const ScannerAutocompleteSearch = ({ title, objectList, value, required = false,
|
|
|
28
28
|
const isFocused = useIsFocused();
|
|
29
29
|
const dispatch = useDispatch();
|
|
30
30
|
const [searchValue, setSearchValue] = useState(value);
|
|
31
|
-
const { isEnabled, scanKey } = useScannerSelector();
|
|
31
|
+
const { isEnabled, scanKey, isMassScan } = useScannerSelector();
|
|
32
32
|
const scannedValue = useScannedValueByKey(scanKeySearch);
|
|
33
33
|
const scanData = useCameraScannerValueByKey(scanKeySearch);
|
|
34
34
|
const { enable: onScanPress } = useScanActivator(scanKeySearch);
|
|
@@ -44,15 +44,18 @@ const ScannerAutocompleteSearch = ({ title, objectList, value, required = false,
|
|
|
44
44
|
}
|
|
45
45
|
}, [dispatch, scanData, scannedValue]);
|
|
46
46
|
const Colors = useThemeColor();
|
|
47
|
+
const massScannerHoldsAnotherKey = useMemo(() => isEnabled && isMassScan && scanKey !== scanKeySearch, [isEnabled, isMassScan, scanKey, scanKeySearch]);
|
|
47
48
|
useEffect(() => {
|
|
48
|
-
|
|
49
|
+
// Auto-activate the search scanner on focus, but never steal the scan key
|
|
50
|
+
// from an active mass scanner. Stealing from another search bar is kept.
|
|
51
|
+
if (isFocus && isFocused && !massScannerHoldsAnotherKey) {
|
|
49
52
|
enableScanner();
|
|
50
53
|
}
|
|
51
|
-
}, [enableScanner, isFocus, isFocused]);
|
|
54
|
+
}, [enableScanner, isFocus, isFocused, massScannerHoldsAnotherKey]);
|
|
52
55
|
useEffect(() => {
|
|
53
56
|
setSearchValue(value);
|
|
54
57
|
}, [value]);
|
|
55
|
-
const handleChangeValue = useCallback(_value => {
|
|
58
|
+
const handleChangeValue = useCallback((_value) => {
|
|
56
59
|
setSearchValue(_value);
|
|
57
60
|
onChangeValue?.(_value);
|
|
58
61
|
}, [onChangeValue]);
|
|
@@ -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,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;
|
|
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,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACxE,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,0BAA0B,GAC3B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAgCjD,MAAM,yBAAyB,GAAG,CAAC,EACjC,KAAK,EACL,UAAU,EACV,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,EAChB,aAAa,EACb,SAAS,EACT,YAAY,EACZ,WAAW,EACX,aAAa,EACb,OAAO,GAAG,KAAK,EACf,iBAAiB,GAAG,KAAK,EACzB,QAAQ,GAAG,KAAK,EAChB,SAAS,GAAG,KAAK,EACjB,cAAc,GAAG,IAAI,EACrB,KAAK,EACL,gBAAgB,GAAG,KAAK,EACxB,WAAW,EACX,WAAW,EACX,SAAS,EACT,qBAAqB,GAAG,KAAK,GACL,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,UAAU,EAAC,GAAG,kBAAkB,EAAE,CAAC;IAC9D,MAAM,YAAY,GAAG,oBAAoB,CAAC,aAAc,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,0BAA0B,CAAC,aAAc,CAAC,CAAC;IAC5D,MAAM,EAAC,MAAM,EAAE,WAAW,EAAC,GAAG,gBAAgB,CAAC,aAAc,CAAC,CAAC;IAC/D,MAAM,EAAC,MAAM,EAAE,aAAa,EAAC,GAAG,yBAAyB,CAAC,aAAc,CAAC,CAAC;IAE1E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,EAAE;YAChB,cAAc,CAAC,YAAY,CAAC,CAAC;YAC7B,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;SACvB;aAAM,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,EAAE;YAClC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/B,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;SAC1B;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,0BAA0B,GAAG,OAAO,CACxC,GAAG,EAAE,CAAC,SAAS,IAAI,UAAU,IAAI,OAAO,KAAK,aAAa,EAC1D,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,CAAC,CAChD,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,0EAA0E;QAC1E,yEAAyE;QAEzE,IAAI,OAAO,IAAI,SAAS,IAAI,CAAC,0BAA0B,EAAE;YACvD,aAAa,EAAE,CAAC;SACjB;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC,CAAC;IAEpE,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,MAAM,iBAAiB,GAAG,WAAW,CACnC,CAAC,MAAW,EAAE,EAAE;QACd,cAAc,CAAC,MAAM,CAAC,CAAC;QACvB,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,CACL,CAAC,kBAAkB,CACjB,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,cAAc,CAAC,CAAC,cAAc,CAAC,CAC/B,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,KAAK,CAAC,CAAC,WAAW,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,aAAa,CAAC,CAAC,iBAAiB,CAAC,CACjC,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,iBAAiB,CAAC,CAAC,iBAAiB,CAAC,CACrC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,WAAW,CAAC,CAAC,aAAa,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,aAAa,CAAC,CACZ,SAAS,IAAI,OAAO,KAAK,aAAa;YACpC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;YAChC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAC1C,CACD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACnC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACnB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,qBAAqB,CAAC,CAAC,qBAAqB,CAAC,CAC7C,gBAAgB,EAChB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
|
|
@@ -2,6 +2,7 @@ interface ScannerSliceState {
|
|
|
2
2
|
isEnabled: boolean;
|
|
3
3
|
scanKey: string | null;
|
|
4
4
|
scannedValue: string | null;
|
|
5
|
+
isMassScan: boolean;
|
|
5
6
|
}
|
|
6
7
|
export declare const enableScan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scanner/enableScan">, scanValue: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scanner/scanValue">, disableScan: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"scanner/disableScan">, clearScan: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"scanner/clearScan">;
|
|
7
8
|
export declare const useScannerSelector: () => ScannerSliceState;
|
|
@@ -10,5 +11,6 @@ declare const _default: import("redux").Reducer<{
|
|
|
10
11
|
isEnabled: boolean;
|
|
11
12
|
scanKey: any;
|
|
12
13
|
scannedValue: any;
|
|
14
|
+
isMassScan: boolean;
|
|
13
15
|
}>;
|
|
14
16
|
export default _default;
|
|
@@ -24,12 +24,17 @@ const scannerSlice = createSlice({
|
|
|
24
24
|
isEnabled: false,
|
|
25
25
|
scanKey: null,
|
|
26
26
|
scannedValue: null,
|
|
27
|
+
isMassScan: false,
|
|
27
28
|
},
|
|
28
29
|
reducers: {
|
|
29
30
|
enableScan(state, action) {
|
|
31
|
+
const { scanKey, isMassScan } = typeof action.payload === 'string'
|
|
32
|
+
? { scanKey: action.payload, isMassScan: false }
|
|
33
|
+
: action.payload;
|
|
30
34
|
state.isEnabled = true;
|
|
31
|
-
state.scanKey =
|
|
35
|
+
state.scanKey = scanKey;
|
|
32
36
|
state.scannedValue = null;
|
|
37
|
+
state.isMassScan = isMassScan ?? false;
|
|
33
38
|
},
|
|
34
39
|
scanValue(state, action) {
|
|
35
40
|
state.scannedValue = action.payload;
|
|
@@ -38,6 +43,7 @@ const scannerSlice = createSlice({
|
|
|
38
43
|
state.isEnabled = false;
|
|
39
44
|
state.scanKey = null;
|
|
40
45
|
state.scannedValue = null;
|
|
46
|
+
state.isMassScan = false;
|
|
41
47
|
},
|
|
42
48
|
clearScan(state) {
|
|
43
49
|
state.scannedValue = null;
|
|
@@ -45,7 +51,7 @@ const scannerSlice = createSlice({
|
|
|
45
51
|
},
|
|
46
52
|
});
|
|
47
53
|
export const { enableScan, scanValue, disableScan, clearScan } = scannerSlice.actions;
|
|
48
|
-
const selectScanner = state => state.scanner;
|
|
54
|
+
const selectScanner = (state) => state.scanner;
|
|
49
55
|
export const useScannerSelector = () => useSelector(selectScanner);
|
|
50
56
|
export const useScannedValueByKey = key => {
|
|
51
57
|
const { scanKey, scannedValue } = useScannerSelector();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scannerSlice.js","sourceRoot":"","sources":["../../src/features/scannerSlice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"scannerSlice.js","sourceRoot":"","sources":["../../src/features/scannerSlice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAS7C,MAAM,YAAY,GAAG,WAAW,CAAC;IAC/B,IAAI,EAAE,SAAS;IACf,YAAY,EAAE;QACZ,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,KAAK;KAClB;IACD,QAAQ,EAAE;QACR,UAAU,CAAC,KAAK,EAAE,MAAM;YACtB,MAAM,EAAC,OAAO,EAAE,UAAU,EAAC,GACzB,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gBAChC,CAAC,CAAC,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAC;gBAC9C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;YAErB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YACxB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;YAC1B,KAAK,CAAC,UAAU,GAAG,UAAU,IAAI,KAAK,CAAC;QACzC,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,MAAM;YACrB,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC;QACtC,CAAC;QACD,WAAW,CAAC,KAAK;YACf,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YACrB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;YAC1B,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC;QAC3B,CAAC;QACD,SAAS,CAAC,KAAK;YACb,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,CAAC;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAC,GAC1D,YAAY,CAAC,OAAO,CAAC;AAEvB,MAAM,aAAa,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;AAEpD,MAAM,CAAC,MAAM,kBAAkB,GAA4B,GAAG,EAAE,CAC9D,WAAW,CAAC,aAAa,CAAC,CAAC;AAE7B,MAAM,CAAC,MAAM,oBAAoB,GAAmC,GAAG,CAAC,EAAE;IACxE,MAAM,EAAC,OAAO,EAAE,YAAY,EAAC,GAAG,kBAAkB,EAAE,CAAC;IACrD,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAC7C,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAC7B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC,OAAO,CAAC"}
|
|
@@ -20,10 +20,12 @@ import { useDispatch } from '../redux/hooks';
|
|
|
20
20
|
import { useCameraScannerValueByKey, clearBarcode, } from '../features/cameraScannerSlice';
|
|
21
21
|
import { clearScan, useScannedValueByKey, useScannerSelector, } from '../features/scannerSlice';
|
|
22
22
|
import { useScanActivator } from './use-scan-activator';
|
|
23
|
+
import { useIsFocused } from './use-navigation';
|
|
23
24
|
export const useMassScanner = ({ scanKey, backgroundAction, fallbackAction, scanInterval = 1000, disableOnError = true, }) => {
|
|
24
25
|
const isProcessingRef = useRef(false);
|
|
25
26
|
const timerRef = useRef(null);
|
|
26
27
|
const dispatch = useDispatch();
|
|
28
|
+
const isFocused = useIsFocused();
|
|
27
29
|
const { isEnabled: isScanEnabled, scanKey: activeScanKey } = useScannerSelector();
|
|
28
30
|
const { enable: enableScan, disable: disableScan, isZebraDevice, } = useScanActivator(scanKey, true);
|
|
29
31
|
const scannedBarcode = useCameraScannerValueByKey(scanKey);
|
|
@@ -58,15 +60,15 @@ export const useMassScanner = ({ scanKey, backgroundAction, fallbackAction, scan
|
|
|
58
60
|
const processScanRef = useRef(processScan);
|
|
59
61
|
processScanRef.current = processScan;
|
|
60
62
|
useEffect(() => {
|
|
61
|
-
if (scannedValue) {
|
|
63
|
+
if (isFocused && scannedValue) {
|
|
62
64
|
processScanRef.current(scannedValue, () => dispatch(clearScan()));
|
|
63
65
|
}
|
|
64
|
-
}, [dispatch, scannedValue]);
|
|
66
|
+
}, [dispatch, isFocused, scannedValue]);
|
|
65
67
|
useEffect(() => {
|
|
66
|
-
if (scannedBarcode?.value) {
|
|
68
|
+
if (isFocused && scannedBarcode?.value) {
|
|
67
69
|
processScanRef.current(scannedBarcode.value, () => dispatch(clearBarcode()));
|
|
68
70
|
}
|
|
69
|
-
}, [dispatch, scannedBarcode?.value]);
|
|
71
|
+
}, [dispatch, isFocused, scannedBarcode?.value]);
|
|
70
72
|
return useMemo(() => ({ disableScan, enableScan, isEnabled }), [disableScan, enableScan, isEnabled]);
|
|
71
73
|
};
|
|
72
74
|
//# sourceMappingURL=use-mass-scanner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,0BAA0B,EAC1B,YAAY,GACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export declare const useScanActivator: (scanKeySearch: string, isMassScan?: bool
|
|
|
3
3
|
enable: () => void;
|
|
4
4
|
isZebraDevice: boolean;
|
|
5
5
|
};
|
|
6
|
-
export declare const useScannerDeviceActivator: (scanKeySearch: string) => {
|
|
6
|
+
export declare const useScannerDeviceActivator: (scanKeySearch: string, isMassScan?: boolean) => {
|
|
7
7
|
enable: () => void;
|
|
8
8
|
disable: () => void;
|
|
9
9
|
};
|
|
@@ -21,7 +21,7 @@ import { disableCameraScanner, enableCameraScanner, enableMassCameraScanner, } f
|
|
|
21
21
|
import { enableScan, disableScan } from '../features/scannerSlice';
|
|
22
22
|
import { useDispatch } from '../redux/hooks';
|
|
23
23
|
export const useScanActivator = (scanKeySearch, isMassScan = false) => {
|
|
24
|
-
const { enable: enableScanner, disable: disableScanner } = useScannerDeviceActivator(scanKeySearch);
|
|
24
|
+
const { enable: enableScanner, disable: disableScanner } = useScannerDeviceActivator(scanKeySearch, isMassScan);
|
|
25
25
|
const { enable: enableCamera, enableMassCamera, disable: disableCamera, } = useCameraScannerActivator(scanKeySearch);
|
|
26
26
|
const [isZebraDevice, setIsZebraDevice] = useState(false);
|
|
27
27
|
useEffect(() => {
|
|
@@ -54,11 +54,11 @@ export const useScanActivator = (scanKeySearch, isMassScan = false) => {
|
|
|
54
54
|
}, [isZebraDevice, disableScanner, disableCamera]);
|
|
55
55
|
return useMemo(() => ({ disable, enable, isZebraDevice }), [disable, enable, isZebraDevice]);
|
|
56
56
|
};
|
|
57
|
-
export const useScannerDeviceActivator = (scanKeySearch) => {
|
|
57
|
+
export const useScannerDeviceActivator = (scanKeySearch, isMassScan = false) => {
|
|
58
58
|
const dispatch = useDispatch();
|
|
59
59
|
const enable = useCallback(() => {
|
|
60
|
-
dispatch(enableScan(scanKeySearch));
|
|
61
|
-
}, [dispatch, scanKeySearch]);
|
|
60
|
+
dispatch(enableScan({ scanKey: scanKeySearch, isMassScan }));
|
|
61
|
+
}, [dispatch, scanKeySearch, isMassScan]);
|
|
62
62
|
const disable = useCallback(() => {
|
|
63
63
|
dispatch(disableScan());
|
|
64
64
|
}, [dispatch]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-scan-activator.js","sourceRoot":"","sources":["../../src/hooks/use-scan-activator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAChE,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,GACxB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,aAAqB,EACrB,aAAsB,KAAK,EAC3B,EAAE;IACF,MAAM,EAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAC,GACpD,yBAAyB,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"use-scan-activator.js","sourceRoot":"","sources":["../../src/hooks/use-scan-activator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
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, { useRef, useMemo, useEffect, useCallback } from 'react';
|
|
18
|
+
import React, { useRef, useMemo, useEffect, useCallback, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View, Animated, ScrollView } from 'react-native';
|
|
20
20
|
import { SafeAreaView } from 'react-native-safe-area-context';
|
|
21
21
|
import { CommonActions, DrawerActions } from '@react-navigation/native';
|
|
@@ -24,7 +24,7 @@ import { authModule } from '../../auth';
|
|
|
24
24
|
import { PopupApplicationInformation, PopupMinimalRequiredVersion, } from '../../components';
|
|
25
25
|
import { useOutdatedVersion } from '../../hooks';
|
|
26
26
|
import { useActiveModule } from '../providers';
|
|
27
|
-
import { moduleHasMenus, numberOfModules, getDefaultMenuKey, hasSubMenus, } from '../helpers';
|
|
27
|
+
import { getModuleOfMenu, moduleHasMenus, numberOfModules, getDefaultMenuKey, hasSubMenus, } from '../helpers';
|
|
28
28
|
import { AuthMenu, Menu, MenuIconButton, MenuTitle } from './menu';
|
|
29
29
|
const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, versionCheckConfig, }) => {
|
|
30
30
|
const Colors = useThemeColor();
|
|
@@ -36,7 +36,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
36
36
|
?.filter(_module => _module.menus)
|
|
37
37
|
?.flatMap(_module => {
|
|
38
38
|
const result = [];
|
|
39
|
-
for (const [key, menu] of Object.entries(_module.menus)) {
|
|
39
|
+
for (const [key, menu] of Object.entries(_module.menus ?? {})) {
|
|
40
40
|
result.push(key);
|
|
41
41
|
if (hasSubMenus(menu)) {
|
|
42
42
|
result.push(...Object.keys(menu.subMenus));
|
|
@@ -50,11 +50,14 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
50
50
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
51
51
|
const secondaryMenusLeft = useRef(new Animated.Value(0)).current;
|
|
52
52
|
const { activeModule } = useActiveModule();
|
|
53
|
-
const
|
|
53
|
+
const [innerMenuDisabled, setInnerMenuDisabled] = useState(false);
|
|
54
|
+
const innerMenuIsVisible = useMemo(() => !innerMenuDisabled && activeModule.name !== authModule.name, [activeModule.name, innerMenuDisabled]);
|
|
54
55
|
const drawerModules = useMemo(() => modules
|
|
55
56
|
.filter(moduleHasMenus)
|
|
56
57
|
.filter(_module => _module.name !== authModule.name), [modules]);
|
|
57
58
|
const externalMenuIsVisible = useMemo(() => numberOfModules(drawerModules) > 1, [drawerModules]);
|
|
59
|
+
const navigatedModule = useMemo(() => getModuleOfMenu(modules, state.routes?.[state.index]?.name), [modules, state.routes, state.index]);
|
|
60
|
+
const showRestoreNavigatedModule = useMemo(() => externalMenuIsVisible && navigatedModule != null, [externalMenuIsVisible, navigatedModule]);
|
|
58
61
|
const toggleSecondaryMenu = useCallback(() => {
|
|
59
62
|
const openConfig = { toValue: 0, duration: 300 };
|
|
60
63
|
const closeConfig = { toValue: 100, duration: 0 };
|
|
@@ -73,6 +76,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
73
76
|
})
|
|
74
77
|
: 0, [externalMenuIsVisible, secondaryMenusLeft]);
|
|
75
78
|
const handleModuleClick = (_module) => {
|
|
79
|
+
setInnerMenuDisabled(false);
|
|
76
80
|
onModuleClick(_module.name);
|
|
77
81
|
const defaultMenuKey = getDefaultMenuKey(_module);
|
|
78
82
|
if (defaultMenuKey) {
|
|
@@ -85,7 +89,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
85
89
|
return;
|
|
86
90
|
}
|
|
87
91
|
const focused = state.routes.indexOf(route) === state.index &&
|
|
88
|
-
Object.keys(activeModule.menus).includes(route.name);
|
|
92
|
+
Object.keys(activeModule.menus ?? {}).includes(route.name);
|
|
89
93
|
const event = navigation.emit({
|
|
90
94
|
type: 'drawerItemPress',
|
|
91
95
|
target: route.key,
|
|
@@ -111,7 +115,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
111
115
|
{externalMenuIsVisible && (<View style={styles.iconsContainer}>
|
|
112
116
|
<ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={styles.scrollView}>
|
|
113
117
|
{drawerModules.map(_module => (<View style={styles.globalContainer} key={_module.name}>
|
|
114
|
-
<MenuIconButton style={styles.menuItemContainer} icon={_module.icon} subtitle={_module.subtitle} disabled={_module.disabled} isActive={_module.name === activeModule?.name} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
|
|
118
|
+
<MenuIconButton style={styles.menuItemContainer} icon={_module.icon ?? ''} subtitle={_module.subtitle} disabled={_module.disabled} isActive={_module.name === activeModule?.name} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
|
|
115
119
|
{!innerMenuIsVisible && (<MenuTitle module={_module} onPress={() => handleModuleClick(_module)}/>)}
|
|
116
120
|
</View>))}
|
|
117
121
|
</ScrollView>
|
|
@@ -123,7 +127,12 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
123
127
|
<Animated.View style={[styles.secondaryMenusContainer, { left: innerMenuPosition }]}>
|
|
124
128
|
<Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={<AuthMenu onPress={handleModuleClick} isVisible={!externalMenuIsVisible}/>} onItemClick={externalMenuIsVisible
|
|
125
129
|
? () => { }
|
|
126
|
-
: () => onModuleClick(drawerModules[0]?.name)} compatibility={externalMenuIsVisible
|
|
130
|
+
: () => onModuleClick(drawerModules[0]?.name)} compatibility={externalMenuIsVisible
|
|
131
|
+
? undefined
|
|
132
|
+
: drawerModules[0].compatibilityAOS} showClose={showRestoreNavigatedModule} onClose={() => {
|
|
133
|
+
setInnerMenuDisabled(true);
|
|
134
|
+
onModuleClick(navigatedModule?.name);
|
|
135
|
+
}}/>
|
|
127
136
|
</Animated.View>
|
|
128
137
|
</View>
|
|
129
138
|
</SafeAreaView>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/components/DrawerContent.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/components/DrawerContent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@ interface MenuProps {
|
|
|
7
7
|
authMenu?: React.ReactNode;
|
|
8
8
|
activeModule: Module;
|
|
9
9
|
onItemClick: () => void;
|
|
10
|
-
compatibility
|
|
10
|
+
compatibility?: Compatibility;
|
|
11
|
+
showClose?: boolean;
|
|
12
|
+
onClose?: () => void;
|
|
11
13
|
}
|
|
12
|
-
declare const Menu: ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }: MenuProps) => React.JSX.Element;
|
|
14
|
+
declare const Menu: ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, showClose, onClose, }: MenuProps) => React.JSX.Element;
|
|
13
15
|
export default Menu;
|
|
@@ -17,18 +17,20 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
19
|
import { View, StyleSheet, ScrollView } from 'react-native';
|
|
20
|
-
import { Text, WarningCard } from '@axelor/aos-mobile-ui';
|
|
20
|
+
import { Icon, Text, useThemeColor, WarningCard } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useTranslator } from '../../../i18n';
|
|
22
22
|
import { getCompatibilityError, getMenuTitle, isMenuIncompatible, } from '../../helpers';
|
|
23
23
|
import MenuItemList from './MenuItemList';
|
|
24
|
-
const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }) => {
|
|
24
|
+
const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, showClose = false, onClose, }) => {
|
|
25
25
|
const I18n = useTranslator();
|
|
26
|
+
const Colors = useThemeColor();
|
|
26
27
|
const title = useMemo(() => getMenuTitle(activeModule, I18n), [I18n, activeModule]);
|
|
27
28
|
const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
|
|
28
29
|
return (<View style={styles.menuContainer}>
|
|
29
30
|
<ScrollView contentContainerStyle={styles.moduleMenuContainer} showsVerticalScrollIndicator={false}>
|
|
30
31
|
<View style={styles.menuTitleContainer}>
|
|
31
32
|
<Text style={styles.menuTitle}>{title}</Text>
|
|
33
|
+
{showClose && (<Icon name="x-lg" size={20} color={Colors.secondaryColor_dark.background} touchable onPress={onClose}/>)}
|
|
32
34
|
</View>
|
|
33
35
|
{compatibilityError && (<WarningCard errorMessage={getCompatibilityError(compatibility, I18n)}/>)}
|
|
34
36
|
<MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick} disabled={compatibilityError}/>
|
|
@@ -47,10 +49,14 @@ const styles = StyleSheet.create({
|
|
|
47
49
|
paddingVertical: 8,
|
|
48
50
|
},
|
|
49
51
|
menuTitleContainer: {
|
|
52
|
+
flexDirection: 'row',
|
|
53
|
+
justifyContent: 'space-between',
|
|
54
|
+
alignItems: 'center',
|
|
50
55
|
paddingHorizontal: 16,
|
|
51
56
|
marginBottom: 8,
|
|
52
57
|
},
|
|
53
58
|
menuTitle: {
|
|
59
|
+
flexShrink: 1,
|
|
54
60
|
fontSize: 21,
|
|
55
61
|
fontWeight: 'bold',
|
|
56
62
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/Menu.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,IAAI,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/navigator/components/menu/Menu.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,EAEL,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,GACnB,MAAM,eAAe,CAAC;AACvB,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAa1C,MAAM,IAAI,GAAG,CAAC,EACZ,KAAK,EACL,UAAU,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,SAAS,GAAG,KAAK,EACjB,OAAO,GACG,EAAE,EAAE;IACd,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,KAAK,GAAG,OAAO,CACnB,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,EACtC,CAAC,IAAI,EAAE,YAAY,CAAC,CACrB,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,EACvC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;MAAA,CAAC,UAAU,CACT,qBAAqB,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAClD,4BAA4B,CAAC,CAAC,KAAK,CAAC,CACpC;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CACrC;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,CAC5C;UAAA,CAAC,SAAS,IAAI,CACZ,CAAC,IAAI,CACH,IAAI,CAAC,MAAM,CACX,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAC7C,SAAS,CACT,OAAO,CAAC,CAAC,OAAO,CAAC,EACjB,CACH,CACH;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,kBAAkB,IAAI,CACrB,CAAC,WAAW,CACV,YAAY,CAAC,CAAC,qBAAqB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,EACzD,CACH,CACD;QAAA,CAAC,YAAY,CACX,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,QAAQ,CAAC,CAAC,kBAAkB,CAAC,EAEjC;MAAA,EAAE,UAAU,CACZ;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CACpD;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,aAAa,EAAE;QACb,aAAa,EAAE,QAAQ;QACvB,cAAc,EAAE,eAAe;QAC/B,MAAM,EAAE,MAAM;KACf;IACD,mBAAmB,EAAE;QACnB,aAAa,EAAE,QAAQ;QACvB,eAAe,EAAE,CAAC;KACnB;IACD,kBAAkB,EAAE;QAClB,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,QAAQ;QACpB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,CAAC;KAChB;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC;QACb,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;KACnB;IACD,YAAY,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAC;AAEH,eAAe,IAAI,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { checkModulesMenusAccessibility, manageOverridingMenus, manageWebConfig, } from './access.helper';
|
|
2
2
|
export { formatCompatibilityToDisplay, manageWebCompatibility, } from './compatibility.helper';
|
|
3
|
-
export { findIndexAndRouteOfMenu, formatMenus, getCompatibilityError, getDefaultMenuKey, getMenuTitle, hasSubMenus, isMenuIncompatible, manageSubMenusOverriding, resolveSubMenus, } from './menu.helper';
|
|
3
|
+
export { findIndexAndRouteOfMenu, formatMenus, getCompatibilityError, getDefaultMenuKey, getMenuTitle, getModuleOfMenu, hasSubMenus, isMenuIncompatible, manageSubMenusOverriding, resolveSubMenus, } from './menu.helper';
|
|
4
4
|
export { findIndexAndObjectOfModule, getDefaultModule, moduleHasMenus, numberOfModules, } from './module.helper';
|
|
5
5
|
export { addModuleTools, addToolDefaultValues } from './tool.helper';
|
|
6
6
|
export * from './navigation-type';
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
export { checkModulesMenusAccessibility, manageOverridingMenus, manageWebConfig, } from './access.helper';
|
|
19
19
|
export { formatCompatibilityToDisplay, manageWebCompatibility, } from './compatibility.helper';
|
|
20
|
-
export { findIndexAndRouteOfMenu, formatMenus, getCompatibilityError, getDefaultMenuKey, getMenuTitle, hasSubMenus, isMenuIncompatible, manageSubMenusOverriding, resolveSubMenus, } from './menu.helper';
|
|
20
|
+
export { findIndexAndRouteOfMenu, formatMenus, getCompatibilityError, getDefaultMenuKey, getMenuTitle, getModuleOfMenu, hasSubMenus, isMenuIncompatible, manageSubMenusOverriding, resolveSubMenus, } from './menu.helper';
|
|
21
21
|
export { findIndexAndObjectOfModule, getDefaultModule, moduleHasMenus, numberOfModules, } from './module.helper';
|
|
22
22
|
export { addModuleTools, addToolDefaultValues } from './tool.helper';
|
|
23
23
|
export * from './navigation-type';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/navigator/helpers/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,8BAA8B,EAC9B,qBAAqB,EACrB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,uBAAuB,EACvB,WAAW,EACX,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,EAChB,cAAc,EACd,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,cAAc,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AACnE,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/navigator/helpers/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,8BAA8B,EAC9B,qBAAqB,EACrB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,uBAAuB,EACvB,WAAW,EACX,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,WAAW,EACX,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,EAChB,cAAc,EACd,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,cAAc,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AACnE,cAAc,mBAAmB,CAAC"}
|
|
@@ -2,12 +2,12 @@ import { Compatibility, Menu, Module, SubMenu } from '../../app';
|
|
|
2
2
|
import { TranslatorProps } from '../../i18n';
|
|
3
3
|
import { Route } from './navigation-type';
|
|
4
4
|
export declare function findIndexAndRouteOfMenu(routes: Route[], menuName: string): {
|
|
5
|
-
route
|
|
6
|
-
index
|
|
5
|
+
route?: Route;
|
|
6
|
+
index?: number;
|
|
7
7
|
};
|
|
8
8
|
export declare function getMenuTitle(menu: Menu | Module, I18n: TranslatorProps): string;
|
|
9
|
-
export declare function isMenuIncompatible(compatibility
|
|
10
|
-
export declare function getCompatibilityError(compatibility: Compatibility, I18n: TranslatorProps, showDetails?: boolean): string;
|
|
9
|
+
export declare function isMenuIncompatible(compatibility?: Compatibility): boolean;
|
|
10
|
+
export declare function getCompatibilityError(compatibility: Compatibility | undefined, I18n: TranslatorProps, showDetails?: boolean): string;
|
|
11
11
|
export declare function formatMenus(module: Module): {
|
|
12
12
|
[k: string]: {
|
|
13
13
|
order: number;
|
|
@@ -53,4 +53,5 @@ export declare function resolveSubMenus(subMenus: {
|
|
|
53
53
|
order?: number;
|
|
54
54
|
}[];
|
|
55
55
|
export declare function manageSubMenusOverriding(modules: Module[]): Module[];
|
|
56
|
+
export declare function getModuleOfMenu(modules: Module[], menuKey: string): Module | undefined;
|
|
56
57
|
export declare function getDefaultMenuKey(module: Module): string;
|
|
@@ -22,7 +22,7 @@ import { moduleHasMenus } from './module.helper';
|
|
|
22
22
|
export function findIndexAndRouteOfMenu(routes, menuName) {
|
|
23
23
|
const index = routes.findIndex(_route => _route.name === menuName);
|
|
24
24
|
if (index === -1) {
|
|
25
|
-
return {
|
|
25
|
+
return {};
|
|
26
26
|
}
|
|
27
27
|
return { route: routes[index], index: index };
|
|
28
28
|
}
|
|
@@ -76,7 +76,7 @@ export function getCompatibilityError(compatibility, I18n, showDetails = true) {
|
|
|
76
76
|
return undefined;
|
|
77
77
|
}
|
|
78
78
|
export function formatMenus(module) {
|
|
79
|
-
return Object.fromEntries(Object.entries(module.menus).map(([key, menu], idx) => {
|
|
79
|
+
return Object.fromEntries(Object.entries(module.menus ?? {}).map(([key, menu], idx) => {
|
|
80
80
|
return [
|
|
81
81
|
key,
|
|
82
82
|
{ ...menu, order: menu.order ?? idx * 10, parent: module.name },
|
|
@@ -93,9 +93,8 @@ export function resolveSubMenus(subMenus) {
|
|
|
93
93
|
return Object.entries(subMenus)
|
|
94
94
|
.map(([key, content]) => ({ ...content, key }))
|
|
95
95
|
.map((item, index) => {
|
|
96
|
-
if (item?.order != null)
|
|
96
|
+
if (item?.order != null)
|
|
97
97
|
return item;
|
|
98
|
-
}
|
|
99
98
|
return { ...item, order: index * 10 };
|
|
100
99
|
})
|
|
101
100
|
.sort((a, b) => a.order - b.order);
|
|
@@ -145,7 +144,7 @@ function cleanEmptyMenusAndSubMenus(modules) {
|
|
|
145
144
|
const cleanedModules = modules.map(module => {
|
|
146
145
|
const { menus } = module;
|
|
147
146
|
if (moduleHasMenus(module)) {
|
|
148
|
-
const cleanedMenus = Object.entries(menus).map(([key, menu]) => {
|
|
147
|
+
const cleanedMenus = Object.entries(menus ?? {}).map(([key, menu]) => {
|
|
149
148
|
const { subMenus, ...restMenusAttrs } = menu;
|
|
150
149
|
if (hasSubMenus(menu) && Object.keys(subMenus).length === 0) {
|
|
151
150
|
return [key, { ...restMenusAttrs }];
|
|
@@ -158,11 +157,23 @@ function cleanEmptyMenusAndSubMenus(modules) {
|
|
|
158
157
|
});
|
|
159
158
|
return cleanedModules;
|
|
160
159
|
}
|
|
160
|
+
export function getModuleOfMenu(modules, menuKey) {
|
|
161
|
+
if (menuKey == null || !Array.isArray(modules)) {
|
|
162
|
+
return undefined;
|
|
163
|
+
}
|
|
164
|
+
return modules.filter(moduleHasMenus).find(_module => Object.entries(_module.menus ?? {}).some(([key, menu]) => {
|
|
165
|
+
if (key === menuKey) {
|
|
166
|
+
return true;
|
|
167
|
+
}
|
|
168
|
+
return (hasSubMenus(menu) &&
|
|
169
|
+
Object.keys(menu.subMenus).includes(menuKey));
|
|
170
|
+
}));
|
|
171
|
+
}
|
|
161
172
|
export function getDefaultMenuKey(module) {
|
|
162
173
|
if (!moduleHasMenus(module)) {
|
|
163
174
|
return null;
|
|
164
175
|
}
|
|
165
|
-
const defaultMenuEntry = Object.entries(module.menus)
|
|
176
|
+
const defaultMenuEntry = Object.entries(module.menus ?? {})
|
|
166
177
|
.map(([key, menu]) => ({ ...menu, key }))
|
|
167
178
|
.filter((menu) => !isMenuIncompatible(menu.compatibilityAOS))
|
|
168
179
|
.find((menu) => menu.isDefault === true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../../src/navigator/helpers/menu.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAStD,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAChD,OAAO,EAAC,4BAA4B,EAAC,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAE/C,MAAM,UAAU,uBAAuB,CACrC,MAAe,EACf,QAAgB;IAEhB,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAEnE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;QAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../../src/navigator/helpers/menu.helper.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/object.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare function areObjectsEquals(object1: any, object2: any):
|
|
1
|
+
export declare function areObjectsEquals(object1: any, object2: any): boolean;
|
|
2
2
|
export declare const isEmpty: (obj: any) => boolean;
|
|
3
3
|
export declare function fetchJsonField(object: any, fieldName: string): any;
|
|
4
4
|
export declare function pickFieldsOfObject(object: any, fields: any): any;
|
package/lib/utils/string.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export declare function splitInTwo(value: String, spacer?: string): Array<String
|
|
1
|
+
export declare function splitInTwo(value: String, spacer?: string): Array<String> | undefined;
|
|
2
2
|
export declare function isHtml(value: string): boolean;
|
|
3
|
-
export declare function stringNoAccent(message
|
|
3
|
+
export declare function stringNoAccent(message?: string): string;
|
|
4
4
|
export declare function checkNullString(message: any): boolean;
|
|
5
|
-
export declare function formatVersionString(version
|
|
5
|
+
export declare function formatVersionString(version?: string): number | undefined;
|
package/lib/utils/string.js
CHANGED
|
@@ -16,16 +16,14 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
export function splitInTwo(value, spacer = '.') {
|
|
19
|
-
if (value == null)
|
|
20
|
-
return
|
|
21
|
-
}
|
|
19
|
+
if (value == null)
|
|
20
|
+
return undefined;
|
|
22
21
|
return value.toString().split(spacer);
|
|
23
22
|
}
|
|
24
23
|
export function isHtml(value) {
|
|
25
24
|
const regex = /<\/?[a-z][\s\S]*>/i;
|
|
26
|
-
if (value == null)
|
|
27
|
-
return
|
|
28
|
-
}
|
|
25
|
+
if (value == null)
|
|
26
|
+
return false;
|
|
29
27
|
return regex.test(value);
|
|
30
28
|
}
|
|
31
29
|
export function stringNoAccent(message) {
|
|
@@ -53,7 +51,7 @@ export function checkNullString(message) {
|
|
|
53
51
|
}
|
|
54
52
|
export function formatVersionString(version) {
|
|
55
53
|
if (typeof version !== 'string') {
|
|
56
|
-
return
|
|
54
|
+
return undefined;
|
|
57
55
|
}
|
|
58
56
|
const vparts = version.split('.');
|
|
59
57
|
let result = '';
|
package/lib/utils/string.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,UAAU,UAAU,
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,UAAU,UAAU,CACxB,KAAa,EACb,MAAM,GAAG,GAAG;IAEZ,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IACpC,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAClC,MAAM,KAAK,GAAG,oBAAoB,CAAC;IACnC,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;SAAM;QACL,MAAM,CAAC,GAAG,sDAAsD,CAAC;QACjE,MAAM,CAAC,GAAG,sDAAsD,CAAC;QACjE,IAAI,UAAU,GAAG,OAAO,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;QACD,OAAO,UAAU,CAAC;KACnB;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAY;IAC1C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;SAAM;QACL,IAAI,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,UAAU,IAAI,IAAI,IAAI,UAAU,KAAK,EAAE,CAAC;KAChD;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM,GAAW,EAAE,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;QACtB,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;YACxB,MAAM;SACP;QAED,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;KACnE;IAED,MAAM,oBAAoB,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAE/C,IAAI,oBAAoB,GAAG,CAAC,EAAE;QAC5B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,oBAAoB,EAAE,KAAK,EAAE,EAAE;YACzD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;KACF;IAED,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.5.
|
|
3
|
+
"version": "8.5.17",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"license:add": "npx add-copyright-header --generate --dir 'src'"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@axelor/aos-mobile-error": "8.5.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.5.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.5.17",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.5.17",
|
|
29
29
|
"@react-navigation/drawer": "7.5.9",
|
|
30
30
|
"@react-navigation/native": "7.1.18",
|
|
31
31
|
"@react-navigation/native-stack": "7.3.27",
|