@fto-consult/expo-ui 5.11.23 → 5.11.25

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.
Files changed (63) hide show
  1. package/babel.config.alias.js +4 -1
  2. package/babel.config.js +64 -34
  3. package/package.json +122 -123
  4. package/readMe.md +1 -1
  5. package/src/auth/avatarProps/index.js +1 -1
  6. package/src/components/AppBar/Content.js +4 -4
  7. package/src/components/AppBar/index.js +39 -18
  8. package/src/components/BackHandler/index.android.js +3 -0
  9. package/src/components/BackHandler/index.js +23 -0
  10. package/src/components/BottomSheet/Sheet.js +1 -2
  11. package/src/components/Button/index.js +3 -3
  12. package/src/components/Checkbox/index.js +2 -3
  13. package/src/components/Chip/index.js +6 -6
  14. package/src/components/Color/ColorPicker.js +7 -7
  15. package/src/components/Color/index.js +5 -5
  16. package/src/components/Countries/Flag.js +1 -1
  17. package/src/components/Countries/SelectCountry.js +1 -1
  18. package/src/components/Datagrid/Common/Common.js +0 -1
  19. package/src/components/Datagrid/Common/utils.js +1 -2
  20. package/src/components/Date/DatePickerInput/index.js +4 -4
  21. package/src/components/Date/Time.js +3 -3
  22. package/src/components/Dialog/confirm/showConfirmOrAlertOrPrompt.js +1 -1
  23. package/src/components/DragResize/DragResizeBlock.js +3 -3
  24. package/src/components/Drawer/DrawerItems/_DrawerItem.js +1 -1
  25. package/src/components/Drawer/DrawerLayout/index.js +3 -3
  26. package/src/components/Dropdown/index.js +9 -17
  27. package/src/components/Expandable/index.js +4 -4
  28. package/src/components/Fab/GroupComponent.js +6 -7
  29. package/src/components/Filter/BetweenComponent.js +1 -1
  30. package/src/components/Filter/index.js +1 -1
  31. package/src/components/Form/Fields/Field.js +7 -16
  32. package/src/components/Form/Fields/{IDField.js → IdField.js} +1 -1
  33. package/src/components/Form/Fields/SelectTableData/Component.js +1 -1
  34. package/src/components/Form/FormData/FormData.js +1 -1
  35. package/src/components/Form/List/List.js +15 -15
  36. package/src/components/Grid/Cell.js +1 -1
  37. package/src/components/HeavyScreen/index.js +5 -8
  38. package/src/components/Icon/Icon.js +13 -5
  39. package/src/components/Icon/IconButton.js +1 -1
  40. package/src/components/Image/index.js +6 -7
  41. package/src/components/Label/index.js +4 -4
  42. package/src/components/Menu/Item.js +1 -1
  43. package/src/components/Menu/Menu.js +5 -5
  44. package/src/components/Modal/index.js +6 -6
  45. package/src/components/PhoneInput/index.js +3 -3
  46. package/src/components/Radio/index.js +2 -3
  47. package/src/components/SelectCurrency/Format.js +3 -4
  48. package/src/components/SelectCurrency/index.js +3 -3
  49. package/src/components/SimpleSelect/index.js +6 -9
  50. package/src/components/Slider/index.js +2 -3
  51. package/src/components/Snackbar/index.js +1 -1
  52. package/src/components/SplashScreen/index.js +1 -1
  53. package/src/components/Switch/index.js +3 -4
  54. package/src/components/Tab/TabItem.js +1 -1
  55. package/src/components/TextField/index.js +18 -21
  56. package/src/components/Tooltip/Popover/index.web.js +1 -1
  57. package/src/components/Tooltip/index.js +1 -1
  58. package/src/index.js +2 -1
  59. package/src/layouts/ProfilAvatar/index.js +2 -2
  60. package/src/layouts/Screen/ScreenWithOrWithoutAuthContainer.js +1 -1
  61. package/src/layouts/Screen/TableData.js +1 -1
  62. package/src/screens/ScreenWrapper.js +1 -1
  63. package/src/components/Chart/appexChart/index.html +0 -30
@@ -111,10 +111,13 @@ module.exports = (opts)=>{
111
111
  }
112
112
  ///on génère les librairies open sources utilisées par l'application
113
113
  const root = path.resolve(r.$src,"..");
114
+ const nModulePath = fs.existsSync(path.resolve(root,"node_modules")) && path.resolve(root,"node_modules") || fs.existsSync(path.resolve(r.$src,"node_modules")) && path.resolve(r.$src,"node_modules") || path.resolve(base,"node_modules");
115
+ const nodeModulesPath = fs.existsSync(nModulePath) ? nModulePath : path.resolve(process.cwd(),"node_modules");
114
116
  const outputPath = path.resolve(HelpScreen,"openLibraries.js");
117
+ r.$nodeModulesPath = r.$enodeModulesPath= nodeModulesPath;
115
118
  require("./find-licenses")({
116
119
  paths : [root,r["$expo-ui-root-path"]],
117
- nodeModulesPath : path.resolve(root,"node_modules"),
120
+ nodeModulesPath : nodeModulesPath,
118
121
  outputPath
119
122
  });
120
123
  const $assets = r.$assets;
package/babel.config.js CHANGED
@@ -1,35 +1,65 @@
1
1
  module.exports = function(api,opts) {
2
- opts = typeof opts =='object' && opts ? opts : {};
3
- api = api && typeof api =='object'? api : {};
4
- ///les chemin vers la variable d'environnement, le chemin du fichier .env,@see : https://github.com/brysgo/babel-plugin-inline-dotenv
5
- //console.log(environmentPath," is envvv ",opts);
6
- const path = require("path");
7
- const fs = require("fs");
8
- const dir = path.resolve(__dirname);
9
- typeof api.cache =='function' && api.cache(true);
10
- const inlineDovOptions = { unsafe: true};
11
- const options = {base:dir,...opts,platform:"expo"};
12
- const environmentPath = require("./copy-env-file")();
13
- if(fs.existsSync(environmentPath)){
14
- inlineDovOptions.path ='./.env';
15
- }
16
- /*** par défaut, les variables d'environnements sont stockés dans le fichier .env situé à la racine du projet, référencée par la prop base */
17
- const alias = require("./babel.config.alias")(options);
18
- return {
19
- presets: [
20
- ['babel-preset-expo'],
21
- ["@babel/preset-react", {"runtime": "automatic"}],
22
- ],
23
- plugins : [
24
- ["inline-dotenv",inlineDovOptions],
25
- ["module-resolver", {"alias": alias}],
26
- ['@babel/plugin-proposal-export-namespace-from'],
27
- ['transform-inline-environment-variables',{
28
- "include": [
29
- "NODE_ENV"
30
- ]
31
- }],
32
- ['react-native-reanimated/plugin'],
33
- ],
34
- };
35
- };
2
+ opts = typeof opts =='object' && opts ? opts : {};
3
+ api = api && typeof api =='object'? api : {};
4
+ ///les chemin vers la variable d'environnement, le chemin du fichier .env,@see : https://github.com/brysgo/babel-plugin-inline-dotenv
5
+ //console.log(environmentPath," is envvv ",opts);
6
+ const path = require("path");
7
+ const fs = require("fs");
8
+ const dir = path.resolve(__dirname);
9
+ typeof api.cache =='function' && api.cache(true);
10
+ const inlineDovOptions = { unsafe: true};
11
+ const options = {base:dir,...opts,platform:"expo"};
12
+ const environmentPath = require("./copy-env-file")();
13
+ if(fs.existsSync(environmentPath)){
14
+ inlineDovOptions.path ='./.env';
15
+ }
16
+ /*** par défaut, les variables d'environnements sont stockés dans le fichier .env situé à la racine du projet, référencée par la prop base */
17
+ const alias = require("./babel.config.alias")(options);
18
+ const $ecomponents = alias.$ecomponents|| null;
19
+ const eAppex = $ecomponents && path.resolve($ecomponents,"Chart","appexChart");
20
+ if(eAppex && fs.existsSync(eAppex)){
21
+ const appexPathHtml = path.resolve(eAppex,"index.html");
22
+ const $eelectron = alias.$eelectron || null;
23
+ const expoRoot = alias["$expo-ui-root-path"] || null;
24
+ const expoRootModulesP = expoRoot && fs.existsSync(path.resolve(expoRoot,"node_modules")) && path.resolve(expoRoot,"node_modules") || null;
25
+ const aDistPath = path.join("apexcharts","dist","apexcharts.min.js");
26
+ const nodeModulesPath = expoRootModulesP && fs.existsSync(path.resolve(expoRootModulesP,aDistPath)) ? expoRootModulesP : alias.$enodeModulesPath;
27
+ if(nodeModulesPath && fs.existsSync(nodeModulesPath) && $eelectron && fs.existsSync($eelectron)){
28
+ const writeFilePath = path.resolve($eelectron,"utils","writeFile.js");
29
+ const appexDistPath = path.resolve(nodeModulesPath,"apexcharts","dist","apexcharts.min.js");
30
+ if(fs.existsSync(writeFilePath) && fs.existsSync(appexDistPath)){
31
+ const jsContent = fs.readFileSync(appexDistPath, 'utf8')
32
+ const writeFile = require(`${writeFilePath}`);
33
+ //overite appex chart html file
34
+ writeFile(appexPathHtml,`
35
+ <html>
36
+ <head>
37
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
38
+ <script>${jsContent}</script>
39
+ </head>
40
+ <body>
41
+ </body>
42
+ </html>
43
+ `);
44
+ }
45
+ }
46
+ }
47
+
48
+ return {
49
+ presets: [
50
+ ['babel-preset-expo'],
51
+ ["@babel/preset-react", {"runtime": "automatic"}],
52
+ ],
53
+ plugins : [
54
+ ["inline-dotenv",inlineDovOptions],
55
+ ["module-resolver", {"alias": alias}],
56
+ ['@babel/plugin-proposal-export-namespace-from'],
57
+ ['transform-inline-environment-variables',{
58
+ "include": [
59
+ "NODE_ENV"
60
+ ]
61
+ }],
62
+ ['react-native-reanimated/plugin'],
63
+ ],
64
+ };
65
+ };
package/package.json CHANGED
@@ -1,123 +1,122 @@
1
- {
2
- "name": "@fto-consult/expo-ui",
3
- "version": "5.11.23",
4
- "description": "Bibliothèque de composants UI Expo,react-native",
5
- "main": "index.js",
6
- "scripts": {
7
- "publish1": "npm publish --access=public",
8
- "unpublish": "npm -f unpublish @fto-consult/expo-ui",
9
- "build-web": "",
10
- "dev": "npx expo start -c --no-minify",
11
- "start": "npx expo start --dev --no-minify",
12
- "start-d": "npx expo start -c --no-dev --no-minify",
13
- "start-p": "npm run start-d",
14
- "expo-start-client": "npx expo start --dev --no-minify --dev-client",
15
- "start-m": "npx expo start - c--dev--no -minify",
16
- "android": "npx expo start --android -c",
17
- "ios": "npx expo start --ios",
18
- "web": "npx expo start --web",
19
- "web-c": "npx expo start --web -c",
20
- "eject": "expo eject",
21
- "emulator": "npm run android-emulator",
22
- "web-server": "npx serve web-build",
23
- "build-android": "eas build --clear-cache -p android --profile preview",
24
- "build-android-local": "eas build --platform android --local",
25
- "build-android-dist": "eas build --clear-cache -p android",
26
- "build-ios": "eas build --clear-cache -p ios --profile preview",
27
- "build-ios-dist": "eas build --clear-cache -p ios",
28
- "install-apk": "adb -s emulator-5554 install myapp.apk",
29
- "android-emulator": "emulator -avd EMULATOR",
30
- "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
31
- "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
32
- "compile-electron": "webpack --env platform=electron",
33
- "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
34
- "electron": "electron ./electron",
35
- "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",
36
- "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
37
- "electron-c": "npm run compile-electron && npm run electron",
38
- "electron-p": "npm run compile-electron-p && npm run electron",
39
- "update-app-version": "node ./update-app-version.js",
40
- "find-licenses": "node ./find-licenses.js",
41
- "fix-dependencies": "expo-cli doctor --fix-dependencies",
42
- "delete-node-modules": "rimraf ./**/node_modules",
43
- "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
44
- },
45
- "bin": "./bin/index.js",
46
- "repository": {
47
- "type": "git",
48
- "url": "git+https://github.com/borispipo/expo-ui.git"
49
- },
50
- "keywords": [
51
- "Expo",
52
- "React-Native"
53
- ],
54
- "author": "Boris Fouomene",
55
- "license": "ISC",
56
- "bugs": {
57
- "url": "https://github.com/borispipo/expo-ui/issues"
58
- },
59
- "homepage": "https://github.com/borispipo/expo-ui#readme",
60
- "dependencies": {
61
- "@emotion/native": "^11.11.0",
62
- "@expo/html-elements": "^0.2.0",
63
- "@expo/vector-icons": "^13.0.0",
64
- "@fto-consult/common": "^3.18.31",
65
- "@gorhom/portal": "^1.0.14",
66
- "@pchmn/expo-material3-theme": "^1.0.1",
67
- "@react-native-async-storage/async-storage": "^1.17.11",
68
- "@react-native-community/datetimepicker": "^6.7.3",
69
- "@react-native-community/netinfo": "^9.3.7",
70
- "@react-native/assets-registry": "^0.72.0",
71
- "@react-navigation/native": "^6.1.6",
72
- "@react-navigation/native-stack": "^6.9.12",
73
- "@shopify/flash-list": "^1.4.0",
74
- "apexcharts": "^3.40.0",
75
- "expo": "^48.0.19",
76
- "expo-camera": "^13.2.1",
77
- "expo-clipboard": "^4.1.2",
78
- "expo-font": "^11.1.1",
79
- "expo-image-picker": "^14.1.1",
80
- "expo-linking": "^4.0.1",
81
- "expo-sqlite": "^11.1.1",
82
- "expo-status-bar": "^1.4.4",
83
- "expo-system-ui": "^2.2.1",
84
- "expo-web-browser": "^12.1.1",
85
- "file-saver": "^2.0.5",
86
- "fs-extra": "^11.1.1",
87
- "google-libphonenumber": "^3.2.32",
88
- "htmlparser2-without-node-native": "^3.9.2",
89
- "process": "^0.11.10",
90
- "prop-types": "^15.8.1",
91
- "react": "^18.2.0",
92
- "react-content-loader": "^6.2.1",
93
- "react-dom": "^18.2.0",
94
- "react-native": "^0.71.3",
95
- "react-native-big-list": "^1.6.1",
96
- "react-native-blob-util": "^0.17.0",
97
- "react-native-gesture-handler": "~2.9.0",
98
- "react-native-iphone-x-helper": "^1.3.1",
99
- "react-native-mime-types": "^2.3.0",
100
- "react-native-paper": "^5.9.0",
101
- "react-native-paper-dates": "^0.18.12",
102
- "react-native-reanimated": "~2.14.4",
103
- "react-native-safe-area-context": "^4.5.3",
104
- "react-native-screens": "^3.20.0",
105
- "react-native-svg": "13.4.0",
106
- "react-native-web": "~0.18.7",
107
- "react-native-webview": "^11.26.0",
108
- "react-virtuoso": "^4.3.11",
109
- "sharp-cli": "^2.1.0",
110
- "tippy.js": "^6.3.7",
111
- "websql": "^2.0.3",
112
- "xlsx": "^0.18.5"
113
- },
114
- "devDependencies": {
115
- "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
116
- "@babel/preset-react": "^7.18.6",
117
- "@expo/metro-config": "^0.7.1",
118
- "@expo/webpack-config": "^18.0.1",
119
- "babel-plugin-inline-dotenv": "^1.7.0",
120
- "babel-plugin-module-resolver": "^4.1.0",
121
- "babel-plugin-transform-inline-environment-variables": "^0.4.4"
122
- }
123
- }
1
+ {
2
+ "name": "@fto-consult/expo-ui",
3
+ "version": "5.11.25",
4
+ "description": "Bibliothèque de composants UI Expo,react-native",
5
+ "main": "index.js",
6
+ "scripts": {
7
+ "publish1": "npm publish --access=public",
8
+ "unpublish": "npm -f unpublish @fto-consult/expo-ui",
9
+ "build-web": "",
10
+ "dev": "npx expo start -c --no-minify",
11
+ "start": "npx expo start --dev --no-minify",
12
+ "start-d": "npx expo start -c --no-dev --no-minify",
13
+ "start-p": "npm run start-d",
14
+ "expo-start-client": "npx expo start --dev --no-minify --dev-client",
15
+ "start-m": "npx expo start - c--dev--no -minify",
16
+ "android": "npx expo start --android -c",
17
+ "ios": "npx expo start --ios",
18
+ "web": "npx expo start --web",
19
+ "web-c": "npx expo start --web -c",
20
+ "eject": "expo eject",
21
+ "emulator": "npm run android-emulator",
22
+ "web-server": "npx serve web-build",
23
+ "build-android": "eas build --clear-cache -p android --profile preview",
24
+ "build-android-local": "eas build --platform android --local",
25
+ "build-android-dist": "eas build --clear-cache -p android",
26
+ "build-ios": "eas build --clear-cache -p ios --profile preview",
27
+ "build-ios-dist": "eas build --clear-cache -p ios",
28
+ "install-apk": "adb -s emulator-5554 install myapp.apk",
29
+ "android-emulator": "emulator -avd EMULATOR",
30
+ "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
31
+ "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
32
+ "compile-electron": "webpack --env platform=electron",
33
+ "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
34
+ "electron": "electron ./electron",
35
+ "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",
36
+ "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
37
+ "electron-c": "npm run compile-electron && npm run electron",
38
+ "electron-p": "npm run compile-electron-p && npm run electron",
39
+ "update-app-version": "node ./update-app-version.js",
40
+ "find-licenses": "node ./find-licenses.js",
41
+ "fix-dependencies": "expo-cli doctor --fix-dependencies",
42
+ "delete-node-modules": "rimraf ./**/node_modules",
43
+ "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
44
+ },
45
+ "bin": "./bin/index.js",
46
+ "repository": {
47
+ "type": "git",
48
+ "url": "git+https://github.com/borispipo/expo-ui.git"
49
+ },
50
+ "keywords": [
51
+ "Expo",
52
+ "React-Native"
53
+ ],
54
+ "author": "Boris Fouomene",
55
+ "license": "ISC",
56
+ "bugs": {
57
+ "url": "https://github.com/borispipo/expo-ui/issues"
58
+ },
59
+ "homepage": "https://github.com/borispipo/expo-ui#readme",
60
+ "dependencies": {
61
+ "@emotion/native": "^11.11.0",
62
+ "@expo/html-elements": "^0.5.1",
63
+ "@expo/vector-icons": "^13.0.0",
64
+ "@fto-consult/common": "^3.18.32",
65
+ "@gorhom/portal": "^1.0.14",
66
+ "@pchmn/expo-material3-theme": "^1.0.1",
67
+ "@react-native-async-storage/async-storage": "1.18.2",
68
+ "@react-native-community/datetimepicker": "7.2.0",
69
+ "@react-native-community/netinfo": "9.3.10",
70
+ "@react-native/assets-registry": "^0.72.0",
71
+ "@react-navigation/native": "^6.1.6",
72
+ "@react-navigation/native-stack": "^6.9.12",
73
+ "@shopify/flash-list": "^1.4.0",
74
+ "apexcharts": "^3.41.0",
75
+ "expo": "^48.0.19",
76
+ "expo-camera": "^13.2.1",
77
+ "expo-clipboard": "^4.1.2",
78
+ "expo-font": "^11.1.1",
79
+ "expo-image-picker": "~14.3.1",
80
+ "expo-linking": "~5.0.2",
81
+ "expo-sqlite": "~11.3.1",
82
+ "expo-status-bar": "~1.6.0",
83
+ "expo-system-ui": "~2.4.0",
84
+ "expo-web-browser": "~12.3.2",
85
+ "file-saver": "^2.0.5",
86
+ "fs-extra": "^11.1.1",
87
+ "google-libphonenumber": "^3.2.32",
88
+ "htmlparser2-without-node-native": "^3.9.2",
89
+ "process": "^0.11.10",
90
+ "prop-types": "^15.8.1",
91
+ "react": "^18.2.0",
92
+ "react-content-loader": "^6.2.1",
93
+ "react-dom": "^18.2.0",
94
+ "react-native": "0.72.1",
95
+ "react-native-big-list": "^1.6.1",
96
+ "react-native-blob-util": "^0.18.3",
97
+ "react-native-gesture-handler": "~2.12.0",
98
+ "react-native-iphone-x-helper": "^1.3.1",
99
+ "react-native-mime-types": "^2.3.0",
100
+ "react-native-paper": "^5.9.1",
101
+ "react-native-paper-dates": "^0.18.12",
102
+ "react-native-reanimated": "~3.3.0",
103
+ "react-native-safe-area-context": "4.6.3",
104
+ "react-native-screens": "^3.22.1",
105
+ "react-native-svg": "13.9.0",
106
+ "react-native-web": "~0.19.6",
107
+ "react-native-webview": "13.2.2",
108
+ "react-navigation": "^4.4.4",
109
+ "react-virtuoso": "^4.3.11",
110
+ "sharp-cli": "^4.1.1",
111
+ "tippy.js": "^6.3.7",
112
+ "websql": "^2.0.3",
113
+ "xlsx": "^0.18.5"
114
+ },
115
+ "devDependencies": {
116
+ "@expo/metro-config": "^0.7.1",
117
+ "@expo/webpack-config": "^18.0.1",
118
+ "babel-plugin-inline-dotenv": "^1.7.0",
119
+ "babel-plugin-module-resolver": "^4.1.0",
120
+ "babel-plugin-transform-inline-environment-variables": "^0.4.4"
121
+ }
122
+ }
package/readMe.md CHANGED
@@ -1,7 +1,7 @@
1
1
  ## Installation des dépendences, packages de dévéloppement
2
2
 
3
3
  ```javascript
4
- npm i --D @babel/plugin-proposal-export-namespace-from @babel/preset-react babel-plugin-inline-dotenv babel-plugin-module-resolver babel-plugin-transform-inline-environment-variables @expo/metro-config @expo/webpack-config
4
+ npm i --D @babel/preset-react babel-plugin-inline-dotenv babel-plugin-module-resolver babel-plugin-transform-inline-environment-variables @expo/metro-config @expo/webpack-config
5
5
  ```
6
6
 
7
7
  ## **#ELECTRON**
@@ -5,7 +5,7 @@ import {isNativeMobile} from "$platform";
5
5
  import defaultSrc from "./defaultAvatar";
6
6
  export default {
7
7
  accordion:false,
8
- editable : !isNativeMobile(),
8
+ readOnly : isNativeMobile(),
9
9
  text : 'Avatar',
10
10
  type : 'image',
11
11
  defaultSrc,
@@ -1,5 +1,5 @@
1
1
  import React from '$react';
2
- import {Platform,StyleSheet,TouchableWithoutFeedback,View} from 'react-native';
2
+ import {Platform,StyleSheet,Pressable,View} from 'react-native';
3
3
  import Label from "$ecomponents/Label";
4
4
  import theme,{Colors,StyleProp} from "$theme";
5
5
  import PropTypes from "prop-types";
@@ -30,7 +30,7 @@ const AppbarContent = React.forwardRef(({
30
30
  const subtitleColor = Colors.setAlpha(titleTextColor,0.7);
31
31
 
32
32
  return (
33
- <TouchableWithoutFeedback testID={testID+"_Container"} {...defaultObj(containerProps)} onPress={onPress} disabled={!onPress}>
33
+ <Pressable testID={testID+"_Container"} {...defaultObj(containerProps)} onPress={onPress} disabled={!onPress}>
34
34
  <View
35
35
  pointerEvents="box-none"
36
36
  style={[styles.container, style]}
@@ -54,7 +54,7 @@ const AppbarContent = React.forwardRef(({
54
54
  numberOfLines={1}
55
55
  accessible
56
56
  // @ts-ignore Type '"heading"' is not assignable to type ...
57
- accessibilityRole={Platform.OS === 'web' ? 'heading' : 'header'}
57
+ role={Platform.OS === 'web' ? 'heading' : 'header'}
58
58
  >
59
59
  {title}
60
60
  </Label>
@@ -69,7 +69,7 @@ const AppbarContent = React.forwardRef(({
69
69
  </Label>
70
70
  ) : null}
71
71
  </View>
72
- </TouchableWithoutFeedback>
72
+ </Pressable>
73
73
  );
74
74
  });
75
75
 
@@ -7,7 +7,7 @@ import theme,{Colors,flattenStyle} from "$theme";
7
7
  import {StyleSheet} from "react-native";
8
8
  import {goBack as navGoBack,useNavigation,useRoute,useScreenOptions } from "$cnavigation";
9
9
  import PropTypes from "prop-types";
10
- import { Dimensions,View,TouchableWithoutFeedback} from "react-native";
10
+ import { Dimensions,View,Pressable} from "react-native";
11
11
  import Content from "./Content";
12
12
  import Icon from "$ecomponents/Icon";
13
13
  import {Elevations} from "$ecomponents/Surface";
@@ -81,9 +81,9 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
81
81
  }
82
82
  backAction = React.isValidElement(backAction)? backAction : null;
83
83
  if(!backAction && BackActionComponent){
84
- backAction = <BackActionComponent back={options.back} ref={backActionRef} {...backActionProps} onPress={onBackActionPress} />
84
+ backAction = <BackActionComponent containerColor="transparent" testID="RN_AppBarBackAction" back={options.back} ref={backActionRef} {...backActionProps} onPress={onBackActionPress} />
85
85
  } else if(backAction){
86
- backAction = <TouchableWithoutFeedback
86
+ backAction = <Pressable
87
87
  {...backActionProps}
88
88
  ref = {backActionRef}
89
89
  onPress={onBackActionPress}
@@ -114,23 +114,30 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
114
114
  titleProps = defaultObj(titleProps);
115
115
  React.setRef(ref,context);
116
116
  testID = defaultStr(testID,"RN_AppBarComponent")
117
+ const renderedActions = renderSplitedActions(splitedActions,{
118
+ ...defaultObj(menuProps,appBarProps.menuProps),
119
+ anchorProps : {
120
+ style : anchorStyle,
121
+ color : anchorStyle.color,
122
+ }
123
+ });
124
+ const renderedRight = React.isValidElement(rightContent) && rightContent || right;
125
+ const hasRight = React.isValidElement(renderedActions) || React.isValidElement(renderedRight);
117
126
  return (
118
127
  <Appbar.Header elevation={elevation} {...appBarProps} testID={testID} style={[styles.header,{backgroundColor},elevStyle,appBarProps.style]} onLayout={onPageResize}>
119
- {backAction}
120
- <Content {...defaultObj(appBarProps.contentProps)}
121
- title={title}
122
- titleProps = {{...titleProps,style:[styles.title,{color:primaryText},titleProps.style]}}
123
- subtitle = {defaultVal(subtitle,params.subtitle,options.subtitle)}
124
- subtitleProps = {subtitleProps}
125
- />
126
- {renderSplitedActions(splitedActions,{
127
- ...defaultObj(menuProps,appBarProps.menuProps),
128
- anchorProps : {
129
- style : anchorStyle,
130
- color : anchorStyle.color,
131
- }
132
- })}
133
- {React.isValidElement(rightContent) && rightContent || right}
128
+ <View style={styles.title2Back} testID={testID+"_AppBarBack2Titlte"}>
129
+ {backAction}
130
+ <Content {...defaultObj(appBarProps.contentProps)}
131
+ title={title}
132
+ titleProps = {{...titleProps,style:[styles.title,{color:primaryText},titleProps.style]}}
133
+ subtitle = {defaultVal(subtitle,params.subtitle,options.subtitle)}
134
+ subtitleProps = {subtitleProps}
135
+ />
136
+ </View>
137
+ {hasRight ? <View testID={testID+"_Actions"} style={styles.actions2right}>
138
+ {renderedActions}
139
+ {renderedRight}
140
+ </View> : null}
134
141
  </Appbar.Header>
135
142
  );
136
143
  });
@@ -144,9 +151,23 @@ const styles = StyleSheet.create({
144
151
  fontSize : TITLE_FONT_SIZE,
145
152
  fontWeight : 'bold'
146
153
  },
154
+ title2Back : {
155
+ flexDirection : "row",
156
+ justifyContent : "start",
157
+ alignItems : "center",
158
+ },
159
+ actions2right : {
160
+ flexDirection : "row",
161
+ justifyContent : "start",
162
+ alignItems : "center",
163
+ },
147
164
  header : {
148
165
  paddingHorizontal : 5,
149
166
  paddingRight : 10,
167
+ justifyContent : "space-between",
168
+ alignItems : "center",
169
+ flexDirection : "row",
170
+ w : "100%"
150
171
  },
151
172
  })
152
173
 
@@ -0,0 +1,3 @@
1
+ import { BackHandler } from "react-native";
2
+
3
+ export default BackHandler;
@@ -0,0 +1,23 @@
1
+ /**
2
+ * Copyright (c) Nicolas Gallagher.
3
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
4
+ *
5
+ * This source code is licensed under the MIT license found in the
6
+ * LICENSE file in the root directory of this source tree.
7
+ *
8
+ * @flow
9
+ */
10
+
11
+ function emptyFunction() {}
12
+
13
+ const BackHandler = {
14
+ exitApp: emptyFunction,
15
+ addEventListener() {
16
+ return {
17
+ remove: emptyFunction
18
+ };
19
+ },
20
+ removeEventListener: emptyFunction
21
+ };
22
+
23
+ export default BackHandler;
@@ -17,9 +17,8 @@ import View from "$ecomponents/View";
17
17
  import {Easing} from "react-native";
18
18
  import Portal from "$ecomponents/Portal";
19
19
  import { ScrollView } from "react-native";
20
-
20
+ import BackHandler from "$ecomponents/BackHandler";
21
21
  import {
22
- BackHandler,
23
22
  TouchableOpacity,
24
23
  Animated,
25
24
  PanResponder,
@@ -50,7 +50,7 @@ const ButtonComponent = React.forwardRef((prs,ref) => {
50
50
  accessible,
51
51
  backgroundColor,
52
52
  borderColor,
53
- accessibilityRole,
53
+ role,
54
54
  contentContainerProps,
55
55
  loadingProps,
56
56
  rounded,
@@ -243,7 +243,7 @@ const ButtonComponent = React.forwardRef((prs,ref) => {
243
243
  // @ts-expect-error We keep old a11y props for backwards compat with old RN versions
244
244
  accessibilityTraits={disabled ? ['button', 'disabled'] : 'button'}
245
245
  accessibilityComponentType="button"
246
- accessibilityRole={disabled?accessibilityRole || "button":undefined}
246
+ role={disabled?role || "button":undefined}
247
247
  accessibilityState={{ disabled }}
248
248
  accessible={accessible}
249
249
  disabled={disabled}
@@ -254,7 +254,7 @@ const ButtonComponent = React.forwardRef((prs,ref) => {
254
254
  >
255
255
  <View testID={testID+"_Content"} {...contentProps} style={[styles.content, contentStyle,noPadding && theme.styles.noPadding,noMargin && theme.styles.noMargin]}>
256
256
  {React.isValidElement(left)? left : typeof left =='function' ?left(leftRProps):null}
257
- {icon && isLoading !== true ? (
257
+ {icon && isLoading !== true && false ? (
258
258
  <View style={[iconStyle,{color:textColor},iconProps.style]} testID={testID+"_IconContainer"}>
259
259
  {React.isValidElement(icon)?icon : <Icon
260
260
  testID={testID+"_Icon"}
@@ -37,7 +37,6 @@ const CheckboxComponent = React.forwardRef((props,ref)=>{
37
37
  labelStyle,
38
38
  helperText,
39
39
  position,
40
- editable,
41
40
  disabled,
42
41
  readOnly,
43
42
  primaryOnCheck,
@@ -48,7 +47,7 @@ const CheckboxComponent = React.forwardRef((props,ref)=>{
48
47
  ...p
49
48
  } = props;
50
49
  disabled = defaultBool(disabled,false);
51
- const isEditable = !disabled && readOnly !== true && editable !== false ? true : false;
50
+ const isEditable = !disabled && readOnly !== true ? true : false;
52
51
  const pointerEvents = isEditable ? "auto" : "none";
53
52
  p = defaultObj(p);
54
53
  checkedValue = defaultVal(checkedValue,1);
@@ -124,7 +123,7 @@ const CheckboxComponent = React.forwardRef((props,ref)=>{
124
123
  {...p}
125
124
  testID = {testID}
126
125
  disabled = {disabled}
127
- editable = {isEditable}
126
+ readOnly = {!isEditable}
128
127
  pointerEvents = {pointerEvents}
129
128
  style = {[styles.checkbox,style]}
130
129
  position = {position}