Skip to content

Fix markdown cursor restore crash on IOU description focus #96638

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
mountiny merged 14 commits into from
Jul 30, 2026
+12 −10
Merged

Fix markdown cursor restore crash on IOU description focus #96638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ce6e406
Fix markdown cursor restore Range offset crash
x-dev90 Jul 21, 2026
c0ab506
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 22, 2026
9d382fe
Add patch to clamp Range offsets for live-markdown cursor restoration…
x-dev90 Jul 22, 2026
b0d5922
fix version mismatch of patch with package
x-dev90 Jul 22, 2026
5fa3b8c
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 24, 2026
5c03b55
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 25, 2026
40a46fe
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 27, 2026
ad698c6
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 29, 2026
5b70267
Update live markdown cursor fix from upstream
x-dev90 Jul 29, 2026
a2e7598
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 29, 2026
03515bf
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 30, 2026
523bac9
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 30, 2026
ebae450
install pods: bump RNLiveMarkdown to version 0.1.334
x-dev90 Jul 30, 2026
1b53be9
Merge branch 'main' into fix/95347-markdown-cursor-range-offset
x-dev90 Jul 30, 2026
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
6 changes: 3 additions & 3 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3741,7 +3741,7 @@ PODS:
- RNGoogleSignin (10.0.1):
- GoogleSignIn (~> 7.0)
- React-Core
- RNLiveMarkdown (0.1.333):
- RNLiveMarkdown (0.1.334):
- boost
- DoubleConversion
- fast_float
Expand Down Expand Up @@ -4887,7 +4887,7 @@ SPEC CHECKSUMS:
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
hermes-engine: a042a38ee8fd790f69526e722127b3d187cfbc52
hermes-engine: b9fce68308a7c2ec975e1717cb7fabe2dc9dd83e
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
Expand Down Expand Up @@ -5006,7 +5006,7 @@ SPEC CHECKSUMS:
RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
RNGestureHandler: e580deecf0c372b61e073437ac37f62511265777
RNGoogleSignin: 89877c73f0fbf6af2038fbdb7b73b5a25b8330cc
RNLiveMarkdown: b6923a4b941161f6b8832c413f035564a6f4c46e
RNLiveMarkdown: 014c79e3eb3384ad574e4697460c41d997530478
RNLocalize: 05e367a873223683f0e268d0af9a8a8e6aed3b26
rnmapbox-maps: 8b7629ef3ae59dd96340470e568cbc7c08c54ff9
RNNitroSQLite: a9b5965d511ed6e99ce903380e64934d043a0d2c
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@expensify/nitro-utils": "file:./modules/ExpensifyNitroUtils",
"@expensify/react-native-background-task": "file:./modules/background-task",
"@expensify/react-native-hybrid-app": "file:./modules/hybrid-app",
"@expensify/react-native-live-markdown": "0.1.333",
"@expensify/react-native-live-markdown": "0.1.334",
"@expensify/react-native-wallet": "0.1.22",
"@expo/metro-config": "56.0.14",
"@expo/metro-runtime": "56.0.13",
Expand Down
3 changes: 2 additions & 1 deletion src/pages/iou/request/step/IOURequestStepDescription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
import useThemeStyles from '@hooks/useThemeStyles';

import {addErrorMessage} from '@libs/ErrorUtils';
import focusComposerWithDelay from '@libs/focusComposerWithDelay';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import {shouldUseTransactionDraft} from '@libs/IOUUtils';
import Parser from '@libs/Parser';
Expand Down Expand Up @@ -175,7 +176,7 @@ function IOURequestStepDescription({

useDiscardChangesConfirmation({
onCancel: () => {
inputRef.current?.focus();
focusComposerWithDelay(inputRef.current)(true);
},
getHasUnsavedChanges: () => {
if (isSaved) {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/iou/request/step/IOURequestStepMerchant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
import useThemeStyles from '@hooks/useThemeStyles';

import focusComposerWithDelay from '@libs/focusComposerWithDelay';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import {getTransactionDetails, isExpenseRequest, isPolicyExpenseChat} from '@libs/ReportUtils';
import {hasReceipt} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -168,7 +169,7 @@ function IOURequestStepMerchant({

useDiscardChangesConfirmation({
onCancel: () => {
inputRef.current?.focus();
focusComposerWithDelay(inputRef.current)(true);
},
getHasUnsavedChanges: () => {
if (isSaved) {
Expand Down
Loading