Skip to content

Fix infinite loading attachment and crash when open it #45559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tgolen merged 3 commits into from
Jul 19, 2024
Merged

Fix infinite loading attachment and crash when open it #45559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5048d07
fix image load request is cancelled because of strict mode but never …
bernhardoj Jul 17, 2024
d3964a3
fix crash when open an attachment
bernhardoj Jul 17, 2024
8a5de87
Merge branch 'main' into fix/44566-infinite-loading-attachment-and-cr…
bernhardoj Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions patches/react-native-web+0.19.12+003+image-header-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/react-native-web/dist/exports/Image/index.js b/node_modules/react-native-web/dist/exports/Image/index.js
index 9649d27..3281cc8 100644
index 9649d27..66ef95c 100644
--- a/node_modules/react-native-web/dist/exports/Image/index.js
+++ b/node_modules/react-native-web/dist/exports/Image/index.js
@@ -135,7 +135,22 @@ function resolveAssetUri(source) {
Expand Down Expand Up @@ -47,7 +47,7 @@ index 9649d27..3281cc8 100644
});
}
function abortPendingRequest() {
@@ -279,10 +288,78 @@ var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
@@ -279,10 +288,79 @@ var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
suppressHydrationWarning: true
}), hiddenImage, createTintColorSVG(tintColor, filterRef.current));
});
Expand All @@ -64,24 +64,20 @@ index 9649d27..3281cc8 100644
+ var _React$useState3 = React.useState(''),
+ blobUri = _React$useState3[0],
+ setBlobUri = _React$useState3[1];
+ var request = React.useRef({
+ cancel: () => {},
+ source: {
+ uri: '',
+ headers: {}
+ },
+ promise: Promise.resolve('')
+ });
+ var request = React.useRef(null);
+ var onError = props.onError,
+ onLoadStart = props.onLoadStart,
+ onLoadEnd = props.onLoadEnd;
+ React.useEffect(() => {
+ if (!hasSourceDiff(nextSource, request.current.source)) {
+ if (request.current !== null && !hasSourceDiff(nextSource, request.current.source)) {
+ return;
+ }
+
+ // When source changes we want to clean up any old/running requests
+ request.current.cancel();
+ if (request.current !== null) {
+ request.current.cancel();
+ }
+
+ if (onLoadStart) {
+ onLoadStart();
+ }
Expand All @@ -96,7 +92,12 @@ index 9649d27..3281cc8 100644
+ }, [nextSource, onLoadStart, onError, onLoadEnd]);
+
+ // Cancel any request on unmount
+ React.useEffect(() => request.current.cancel, []);
+ React.useEffect(() => () => {
+ if (request.current !== null) {
+ request.current.cancel();
+ request.current = null;
+ }
+ }, []);
+ var propsToPass = _objectSpread(_objectSpread({}, props), {}, {
+ // `onLoadStart` is called from the current component
+ // We skip passing it down to prevent BaseImage raising it a 2nd time
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/ReportAttachments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function ReportAttachments({route}: ReportAttachmentsProps) {
defaultOpen
report={report}
source={source}
onModalHide={() => {
onModalClose={() => {
Navigation.dismissModal();
// This enables Composer refocus when the attachments modal is closed by the browser navigation
ComposerFocusManager.setReadyToFocus();
Expand Down