Commit 676ed17
committed
fix(android,ios): rebase onto CanvasEffectSpan rename + iOS Wavy stub
Three CI breakages were introduced by changes that landed on `main`
between the original PR push and now:
1. PR #56705 renamed `DrawCommandSpan` to `CanvasEffectSpan` and dropped
the `ReactSpan` / `UpdateAppearance` interfaces from the base class.
`ReactUnderlineSpan` and `ReactStrikethroughSpan` were extending the
old name; rename them and re-declare `ReactSpan` so they remain
valid `SetSpanOperation` arguments. `ReactTextView.onDraw` updated
to import the new name.
2. Adding `Wavy` to `facebook::react::TextDecorationStyle` (this PR)
left `RCTNSUnderlineStyleFromTextDecorationStyle` non-exhaustive,
tripping `-Werror,-Wreturn-type` on iOS builds. Add a `Wavy` case
that falls back to a solid underline (the actual wavy rendering
ships in companion PR #56769).
3. `validate_cxx_api_snapshots` flagged the missing `Wavy` entry in
all six snapshots under `scripts/cxx-api/api-snapshots/`.
Regenerate.
No behavior change beyond what was already in the feature commit; this
is purely "rebase the implementation onto current `main`."1 parent 9d4f0af commit 676ed17
10 files changed
Lines changed: 14 additions & 6 deletions
File tree
- packages/react-native
- ReactAndroid/src/main/java/com/facebook/react/views/text
- internal/span
- ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager
- scripts/cxx-api/api-snapshots
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
221 | | - | |
222 | | - | |
| 221 | + | |
| 222 | + | |
223 | 223 | | |
224 | 224 | | |
225 | 225 | | |
226 | | - | |
| 226 | + | |
227 | 227 | | |
228 | 228 | | |
229 | 229 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
113 | 115 | | |
114 | 116 | | |
115 | 117 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6505 | 6505 | | |
6506 | 6506 | | |
6507 | 6507 | | |
| 6508 | + | |
6508 | 6509 | | |
6509 | 6510 | | |
6510 | 6511 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6496 | 6496 | | |
6497 | 6497 | | |
6498 | 6498 | | |
| 6499 | + | |
6499 | 6500 | | |
6500 | 6501 | | |
6501 | 6502 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9073 | 9073 | | |
9074 | 9074 | | |
9075 | 9075 | | |
| 9076 | + | |
9076 | 9077 | | |
9077 | 9078 | | |
9078 | 9079 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9064 | 9064 | | |
9065 | 9065 | | |
9066 | 9066 | | |
| 9067 | + | |
9067 | 9068 | | |
9068 | 9069 | | |
9069 | 9070 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4856 | 4856 | | |
4857 | 4857 | | |
4858 | 4858 | | |
| 4859 | + | |
4859 | 4860 | | |
4860 | 4861 | | |
4861 | 4862 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4847 | 4847 | | |
4848 | 4848 | | |
4849 | 4849 | | |
| 4850 | + | |
4850 | 4851 | | |
4851 | 4852 | | |
4852 | 4853 | | |
| |||
0 commit comments