Skip to content

fix(mobile): stop striking through ~$ prices and ~/ paths, match web behavior #18156

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

Closed
ahalekelly wants to merge 1 commit into from
Closed

fix(mobile): stop striking through ~$ prices and ~/ paths, match web behavior #18156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 30 additions & 3 deletions patches/react-native-nitro-markdown@0.5.8.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,34 @@
diff --git a/cpp/md4c/md4c.c b/cpp/md4c/md4c.c
--- a/cpp/md4c/md4c.c
+++ b/cpp/md4c/md4c.c
@@ -3908,10 +3908,10 @@
@@ -3308,10 +3308,22 @@ md_collect_marks(MD_CTX* ctx, const MD_LINE* lines, MD_SIZE n_lines, int table_m
if(tmp - off <= 2) {
unsigned flags = MD_MARK_POTENTIAL_OPENER | MD_MARK_POTENTIAL_CLOSER;

- if(off > line->beg && !ISUNICODEWHITESPACEBEFORE(off) && !ISUNICODEPUNCTBEFORE(off))
- flags &= ~MD_MARK_POTENTIAL_OPENER;
- if(tmp < line->end && !ISUNICODEWHITESPACE(tmp) && !ISUNICODEPUNCT(tmp))
- flags &= ~MD_MARK_POTENTIAL_CLOSER;
+ if(ch == _T('~')) {
+ /* Flank tildes like emphasis delimiters, as micromark
+ * (remark-gfm) does, so mobile strikes what web strikes. */
+ int left_level = (off == line->beg || ISUNICODEWHITESPACEBEFORE(off)) ? 0 : (ISUNICODEPUNCTBEFORE(off) ? 1 : 2);
+ int right_level = (tmp == line->end || ISUNICODEWHITESPACE(tmp)) ? 0 : (ISUNICODEPUNCT(tmp) ? 1 : 2);
+
+ if(left_level == 0 || left_level < right_level)
+ flags &= ~MD_MARK_POTENTIAL_CLOSER;
+ if(right_level == 0 || right_level < left_level)
+ flags &= ~MD_MARK_POTENTIAL_OPENER;
+ } else {
+ if(off > line->beg && !ISUNICODEWHITESPACEBEFORE(off) && !ISUNICODEPUNCTBEFORE(off))
+ flags &= ~MD_MARK_POTENTIAL_OPENER;
+ if(tmp < line->end && !ISUNICODEWHITESPACE(tmp) && !ISUNICODEPUNCT(tmp))
+ flags &= ~MD_MARK_POTENTIAL_CLOSER;
+ }
if(flags != 0)
ADD_MARK(ch, off, tmp, flags);
}
@@ -3908,10 +3920,10 @@
int min_components;
const MD_CHAR optional_end_char;
} URL_MAP[] = {
Expand All @@ -16,7 +43,7 @@ diff --git a/cpp/md4c/md4c.c b/cpp/md4c/md4c.c
};

MD_MARK* opener = &ctx->marks[mark_index];
@@ -3981,8 +3981,11 @@
@@ -3981,8 +3993,11 @@
} else if(end < line_end &&
ISANYOF(end, URL_MAP[i].allowed_nonalnum_chars) &&
md_scan_right_for_resolved_mark(ctx, right_cursor, end, &right_cursor) == NULL &&
Expand All @@ -30,7 +57,7 @@ diff --git a/cpp/md4c/md4c.c b/cpp/md4c/md4c.c
{
if(CH(end) == URL_MAP[i].delim_char)
n_components++;
@@ -4006,16 +4009,35 @@
@@ -4006,16 +4021,35 @@
CH(end) == URL_MAP[i].optional_end_char)
end++;

Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading