Skip to content

Commit b4305df

Browse files
CommanderRedYTCommanderRedYT
authored
Merge pull request #283 from OpenDTU-App/101-implement-better-error-visualization-for-enduser
Implement better error visualization for errors
2 parents 41bd637 + 76a6350 commit b4305df

File tree

4 files changed

+337
-12
lines changed

4 files changed

+337
-12
lines changed

‎patches/patch-package+8.0.0.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/node_modules/patch-package/dist/makePatch.js b/node_modules/patch-package/dist/makePatch.js
2+
index d8d0925..9b25269 100644
3+
--- a/node_modules/patch-package/dist/makePatch.js
4+
+++ b/node_modules/patch-package/dist/makePatch.js
5+
@@ -109,7 +109,7 @@ function makePatch({ packagePathSpecifier, appPath, packageManager, includePaths
6+
resolutions: resolveRelativeFileDependencies_1.resolveRelativeFileDependencies(appPath, appPackageJson.resolutions || {}),
7+
}));
8+
const packageVersion = getPackageVersion_1.getPackageVersion(path_1.join(path_1.resolve(packageDetails.path), "package.json"));
9+
- [".npmrc", ".yarnrc", ".yarn"].forEach((rcFile) => {
10+
+ [".npmrc", ".yarnrc", ".yarnrc.yml", ".yarn"].forEach((rcFile) => {
11+
const rcPath = path_1.join(appPath, rcFile);
12+
if (fs_extra_1.existsSync(rcPath)) {
13+
fs_extra_1.copySync(rcPath, path_1.join(tmpRepo.name, rcFile), { dereference: true });
14+
@@ -120,7 +120,7 @@ function makePatch({ packagePathSpecifier, appPath, packageManager, includePaths
15+
try {
16+
// try first without ignoring scripts in case they are required
17+
// this works in 99.99% of cases
18+
- spawnSafe_1.spawnSafeSync(`yarn`, ["install", "--ignore-engines"], {
19+
+ spawnSafe_1.spawnSafeSync(`yarn`, ["install"], {
20+
cwd: tmpRepoNpmRoot,
21+
logStdErrOnError: false,
22+
});
23+
@@ -128,7 +128,7 @@ function makePatch({ packagePathSpecifier, appPath, packageManager, includePaths
24+
catch (e) {
25+
// try again while ignoring scripts in case the script depends on
26+
// an implicit context which we haven't reproduced
27+
- spawnSafe_1.spawnSafeSync(`yarn`, ["install", "--ignore-engines", "--ignore-scripts"], {
28+
+ spawnSafe_1.spawnSafeSync(`yarn`, ["install", "--mode=skip-build"], {
29+
cwd: tmpRepoNpmRoot,
30+
});
31+
}

‎patches/react-native+0.74.2.patch‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎patches/react-native+0.76.5.patch‎

Lines changed: 257 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,257 @@
1+
diff --git a/node_modules/react-native/Libraries/Lists/FlatList.js b/node_modules/react-native/Libraries/Lists/FlatList.js
2+
index 6075f68..d2e94db 100644
3+
--- a/node_modules/react-native/Libraries/Lists/FlatList.js
4+
+++ b/node_modules/react-native/Libraries/Lists/FlatList.js
5+
@@ -424,6 +424,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
6+
7+
constructor(props: Props<ItemT>) {
8+
super(props);
9+
+ this.props = props;
10+
this._checkProps(this.props);
11+
if (this.props.viewabilityConfigCallbackPairs) {
12+
this._virtualizedListPairs =
13+
diff --git a/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.h b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.h
14+
new file mode 100644
15+
index 0000000..8b3607f
16+
--- /dev/null
17+
+++ b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.h
18+
@@ -0,0 +1,95 @@
19+
+
20+
+/*
21+
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
22+
+ *
23+
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
24+
+ * once the code is regenerated.
25+
+ *
26+
+ * @generated by GenerateRCTThirdPartyFabricComponentsProviderH
27+
+ */
28+
+
29+
+#pragma GCC diagnostic push
30+
+#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
31+
+
32+
+#import <React/RCTComponentViewProtocol.h>
33+
+
34+
+#ifdef __cplusplus
35+
+extern "C" {
36+
+#endif
37+
+
38+
+Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name);
39+
+#if RCT_NEW_ARCH_ENABLED
40+
+#ifndef RCT_DYNAMIC_FRAMEWORKS
41+
+
42+
+
43+
+
44+
+#if !TARGET_OS_OSX && !TARGET_OS_VISION
45+
+Class<RCTComponentViewProtocol> AutoLayoutViewCls(void) __attribute__((used)); // 2
46+
+Class<RCTComponentViewProtocol> CellContainerCls(void) __attribute__((used)); // 2
47+
+#endif
48+
+
49+
+
50+
+#if !TARGET_OS_VISION
51+
+
52+
+#endif
53+
+
54+
+
55+
+Class<RCTComponentViewProtocol> RNCSafeAreaProviderCls(void) __attribute__((used)); // 6
56+
+Class<RCTComponentViewProtocol> RNCSafeAreaViewCls(void) __attribute__((used)); // 6
57+
+#if !TARGET_OS_OSX
58+
+Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void) __attribute__((used)); // 7
59+
+Class<RCTComponentViewProtocol> RNSModalScreenCls(void) __attribute__((used)); // 7
60+
+Class<RCTComponentViewProtocol> RNSScreenContainerCls(void) __attribute__((used)); // 7
61+
+Class<RCTComponentViewProtocol> RNSScreenContentWrapperCls(void) __attribute__((used)); // 7
62+
+Class<RCTComponentViewProtocol> RNSScreenFooterCls(void) __attribute__((used)); // 7
63+
+Class<RCTComponentViewProtocol> RNSScreenCls(void) __attribute__((used)); // 7
64+
+Class<RCTComponentViewProtocol> RNSScreenNavigationContainerCls(void) __attribute__((used)); // 7
65+
+Class<RCTComponentViewProtocol> RNSScreenStackHeaderConfigCls(void) __attribute__((used)); // 7
66+
+Class<RCTComponentViewProtocol> RNSScreenStackHeaderSubviewCls(void) __attribute__((used)); // 7
67+
+Class<RCTComponentViewProtocol> RNSScreenStackCls(void) __attribute__((used)); // 7
68+
+Class<RCTComponentViewProtocol> RNSSearchBarCls(void) __attribute__((used)); // 7
69+
+#endif
70+
+
71+
+#if !TARGET_OS_OSX && !TARGET_OS_TV && !TARGET_OS_VISION
72+
+
73+
+#endif
74+
+
75+
+Class<RCTComponentViewProtocol> RNSVGCircleCls(void) __attribute__((used)); // 9
76+
+Class<RCTComponentViewProtocol> RNSVGClipPathCls(void) __attribute__((used)); // 9
77+
+Class<RCTComponentViewProtocol> RNSVGDefsCls(void) __attribute__((used)); // 9
78+
+Class<RCTComponentViewProtocol> RNSVGEllipseCls(void) __attribute__((used)); // 9
79+
+Class<RCTComponentViewProtocol> RNSVGFeBlendCls(void) __attribute__((used)); // 9
80+
+Class<RCTComponentViewProtocol> RNSVGFeColorMatrixCls(void) __attribute__((used)); // 9
81+
+Class<RCTComponentViewProtocol> RNSVGFeCompositeCls(void) __attribute__((used)); // 9
82+
+Class<RCTComponentViewProtocol> RNSVGFeFloodCls(void) __attribute__((used)); // 9
83+
+Class<RCTComponentViewProtocol> RNSVGFeGaussianBlurCls(void) __attribute__((used)); // 9
84+
+Class<RCTComponentViewProtocol> RNSVGFeMergeCls(void) __attribute__((used)); // 9
85+
+Class<RCTComponentViewProtocol> RNSVGFeOffsetCls(void) __attribute__((used)); // 9
86+
+Class<RCTComponentViewProtocol> RNSVGFilterCls(void) __attribute__((used)); // 9
87+
+Class<RCTComponentViewProtocol> RNSVGForeignObjectCls(void) __attribute__((used)); // 9
88+
+Class<RCTComponentViewProtocol> RNSVGGroupCls(void) __attribute__((used)); // 9
89+
+Class<RCTComponentViewProtocol> RNSVGImageCls(void) __attribute__((used)); // 9
90+
+Class<RCTComponentViewProtocol> RNSVGSvgViewCls(void) __attribute__((used)); // 9
91+
+Class<RCTComponentViewProtocol> RNSVGLinearGradientCls(void) __attribute__((used)); // 9
92+
+Class<RCTComponentViewProtocol> RNSVGLineCls(void) __attribute__((used)); // 9
93+
+Class<RCTComponentViewProtocol> RNSVGMarkerCls(void) __attribute__((used)); // 9
94+
+Class<RCTComponentViewProtocol> RNSVGMaskCls(void) __attribute__((used)); // 9
95+
+Class<RCTComponentViewProtocol> RNSVGPathCls(void) __attribute__((used)); // 9
96+
+Class<RCTComponentViewProtocol> RNSVGPatternCls(void) __attribute__((used)); // 9
97+
+Class<RCTComponentViewProtocol> RNSVGRadialGradientCls(void) __attribute__((used)); // 9
98+
+Class<RCTComponentViewProtocol> RNSVGRectCls(void) __attribute__((used)); // 9
99+
+Class<RCTComponentViewProtocol> RNSVGSymbolCls(void) __attribute__((used)); // 9
100+
+Class<RCTComponentViewProtocol> RNSVGTextCls(void) __attribute__((used)); // 9
101+
+Class<RCTComponentViewProtocol> RNSVGTextPathCls(void) __attribute__((used)); // 9
102+
+Class<RCTComponentViewProtocol> RNSVGTSpanCls(void) __attribute__((used)); // 9
103+
+Class<RCTComponentViewProtocol> RNSVGUseCls(void) __attribute__((used)); // 9
104+
+
105+
+#endif
106+
+#endif
107+
+
108+
+#ifdef __cplusplus
109+
+}
110+
+#endif
111+
+
112+
+#pragma GCC diagnostic pop
113+
+
114+
diff --git a/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm
115+
new file mode 100644
116+
index 0000000..1efe754
117+
--- /dev/null
118+
+++ b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm
119+
@@ -0,0 +1,138 @@
120+
+
121+
+/**
122+
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
123+
+ *
124+
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
125+
+ * once the code is regenerated.
126+
+ *
127+
+ * @generated by GenerateRCTThirdPartyFabricComponentsProviderCpp
128+
+ */
129+
+
130+
+// OSS-compatibility layer
131+
+
132+
+#import "RCTThirdPartyFabricComponentsProvider.h"
133+
+
134+
+#import <string>
135+
+#import <unordered_map>
136+
+
137+
+Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name) {
138+
+ static std::unordered_map<std::string, Class (*)(void)> sFabricComponentsClassMap = {
139+
+ #if RCT_NEW_ARCH_ENABLED
140+
+ #ifndef RCT_DYNAMIC_FRAMEWORKS
141+
+
142+
+
143+
+#if !TARGET_OS_OSX && !TARGET_OS_VISION
144+
+
145+
+ {"AutoLayoutView", AutoLayoutViewCls}, // 2
146+
+
147+
+ {"CellContainer", CellContainerCls}, // 2
148+
+#endif
149+
+
150+
+
151+
+#if !TARGET_OS_VISION
152+
+
153+
+#endif
154+
+
155+
+
156+
+
157+
+ {"RNCSafeAreaProvider", RNCSafeAreaProviderCls}, // 6
158+
+
159+
+ {"RNCSafeAreaView", RNCSafeAreaViewCls}, // 6
160+
+#if !TARGET_OS_OSX
161+
+
162+
+ {"RNSFullWindowOverlay", RNSFullWindowOverlayCls}, // 7
163+
+
164+
+ {"RNSModalScreen", RNSModalScreenCls}, // 7
165+
+
166+
+ {"RNSScreenContainer", RNSScreenContainerCls}, // 7
167+
+
168+
+ {"RNSScreenContentWrapper", RNSScreenContentWrapperCls}, // 7
169+
+
170+
+ {"RNSScreenFooter", RNSScreenFooterCls}, // 7
171+
+
172+
+ {"RNSScreen", RNSScreenCls}, // 7
173+
+
174+
+ {"RNSScreenNavigationContainer", RNSScreenNavigationContainerCls}, // 7
175+
+
176+
+ {"RNSScreenStackHeaderConfig", RNSScreenStackHeaderConfigCls}, // 7
177+
+
178+
+ {"RNSScreenStackHeaderSubview", RNSScreenStackHeaderSubviewCls}, // 7
179+
+
180+
+ {"RNSScreenStack", RNSScreenStackCls}, // 7
181+
+
182+
+ {"RNSSearchBar", RNSSearchBarCls}, // 7
183+
+#endif
184+
+
185+
+#if !TARGET_OS_OSX && !TARGET_OS_TV && !TARGET_OS_VISION
186+
+
187+
+#endif
188+
+
189+
+
190+
+ {"RNSVGCircle", RNSVGCircleCls}, // 9
191+
+
192+
+ {"RNSVGClipPath", RNSVGClipPathCls}, // 9
193+
+
194+
+ {"RNSVGDefs", RNSVGDefsCls}, // 9
195+
+
196+
+ {"RNSVGEllipse", RNSVGEllipseCls}, // 9
197+
+
198+
+ {"RNSVGFeBlend", RNSVGFeBlendCls}, // 9
199+
+
200+
+ {"RNSVGFeColorMatrix", RNSVGFeColorMatrixCls}, // 9
201+
+
202+
+ {"RNSVGFeComposite", RNSVGFeCompositeCls}, // 9
203+
+
204+
+ {"RNSVGFeFlood", RNSVGFeFloodCls}, // 9
205+
+
206+
+ {"RNSVGFeGaussianBlur", RNSVGFeGaussianBlurCls}, // 9
207+
+
208+
+ {"RNSVGFeMerge", RNSVGFeMergeCls}, // 9
209+
+
210+
+ {"RNSVGFeOffset", RNSVGFeOffsetCls}, // 9
211+
+
212+
+ {"RNSVGFilter", RNSVGFilterCls}, // 9
213+
+
214+
+ {"RNSVGForeignObject", RNSVGForeignObjectCls}, // 9
215+
+
216+
+ {"RNSVGGroup", RNSVGGroupCls}, // 9
217+
+
218+
+ {"RNSVGImage", RNSVGImageCls}, // 9
219+
+
220+
+ {"RNSVGSvgView", RNSVGSvgViewCls}, // 9
221+
+
222+
+ {"RNSVGLinearGradient", RNSVGLinearGradientCls}, // 9
223+
+
224+
+ {"RNSVGLine", RNSVGLineCls}, // 9
225+
+
226+
+ {"RNSVGMarker", RNSVGMarkerCls}, // 9
227+
+
228+
+ {"RNSVGMask", RNSVGMaskCls}, // 9
229+
+
230+
+ {"RNSVGPath", RNSVGPathCls}, // 9
231+
+
232+
+ {"RNSVGPattern", RNSVGPatternCls}, // 9
233+
+
234+
+ {"RNSVGRadialGradient", RNSVGRadialGradientCls}, // 9
235+
+
236+
+ {"RNSVGRect", RNSVGRectCls}, // 9
237+
+
238+
+ {"RNSVGSymbol", RNSVGSymbolCls}, // 9
239+
+
240+
+ {"RNSVGText", RNSVGTextCls}, // 9
241+
+
242+
+ {"RNSVGTextPath", RNSVGTextPathCls}, // 9
243+
+
244+
+ {"RNSVGTSpan", RNSVGTSpanCls}, // 9
245+
+
246+
+ {"RNSVGUse", RNSVGUseCls}, // 9
247+
+ #endif
248+
+ #endif
249+
+ };
250+
+
251+
+ auto p = sFabricComponentsClassMap.find(name);
252+
+ if (p != sFabricComponentsClassMap.end()) {
253+
+ auto classFunc = p->second;
254+
+ return classFunc();
255+
+ }
256+
+ return nil;
257+
+}

‎patches/react-native-paper+5.12.5.patch‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
diff --git a/node_modules/react-native-paper/lib/typescript/types.d.ts b/node_modules/react-native-paper/lib/typescript/types.d.ts
2+
index cc0320a..e6e6488 100644
3+
--- a/node_modules/react-native-paper/lib/typescript/types.d.ts
4+
+++ b/node_modules/react-native-paper/lib/typescript/types.d.ts
5+
@@ -1,5 +1,6 @@
6+
import type * as React from 'react';
7+
import type { $DeepPartial } from '@callstack/react-theme-provider';
8+
+import type { Theme as NativeNavigationTheme } from '@react-navigation/native';
9+
export declare type Font = {
10+
fontFamily: string;
11+
fontWeight?: 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
12+
@@ -161,16 +162,6 @@ export declare type MD3ElevationColors = {
13+
export declare type $Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
14+
export declare type $RemoveChildren<T extends React.ComponentType<any>> = $Omit<React.ComponentPropsWithoutRef<T>, 'children'>;
15+
export declare type EllipsizeProp = 'head' | 'middle' | 'tail' | 'clip';
16+
-export declare type NavigationTheme = {
17+
- dark: boolean;
18+
- colors: {
19+
- primary: string;
20+
- background: string;
21+
- card: string;
22+
- text: string;
23+
- border: string;
24+
- notification: string;
25+
- };
26+
-};
27+
+export declare type NavigationTheme = NativeNavigationTheme;
28+
export {};
29+
//# sourceMappingURL=types.d.ts.map
130
diff --git a/node_modules/react-native-paper/src/components/BottomNavigation/BottomNavigationBar.tsx b/node_modules/react-native-paper/src/components/BottomNavigation/BottomNavigationBar.tsx
231
index 0bfe303..a59ae06 100644
332
--- a/node_modules/react-native-paper/src/components/BottomNavigation/BottomNavigationBar.tsx
@@ -11,3 +40,23 @@ index 0bfe303..a59ae06 100644
1140
getLabelText = ({ route }: { route: Route }) => route.title,
1241
getBadge = ({ route }: { route: Route }) => route.badge,
1342
getColor = ({ route }: { route: Route }) => route.color,
43+
diff --git a/node_modules/react-native-paper/src/types.tsx b/node_modules/react-native-paper/src/types.tsx
44+
index 175131c..c7961b8 100644
45+
--- a/node_modules/react-native-paper/src/types.tsx
46+
+++ b/node_modules/react-native-paper/src/types.tsx
47+
@@ -203,14 +203,4 @@ export type $RemoveChildren<T extends React.ComponentType<any>> = $Omit<
48+
49+
export type EllipsizeProp = 'head' | 'middle' | 'tail' | 'clip';
50+
51+
-export type NavigationTheme = {
52+
- dark: boolean;
53+
- colors: {
54+
- primary: string;
55+
- background: string;
56+
- card: string;
57+
- text: string;
58+
- border: string;
59+
- notification: string;
60+
- };
61+
-};
62+
+export type { Theme as NavigationTheme } from '@react-navigation/native';

0 commit comments

Comments
 (0)