Commit e364c7f
1 parent 862e8c7 commit e364c7f
File tree
8 files changed
+204
-40
lines changed- packages/react-native
- ReactAndroid/src/main/java/com/facebook/react
- fabric
- views/text
- internal/span
- ReactCommon/react
- renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager
- utils
8 files changed
+204
-40
lines changedLines changed: 12 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
675 | 675 |
| |
676 | 676 |
| |
677 | 677 |
| |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
678 | 690 |
| |
679 | 691 |
| |
680 | 692 |
| |
|
Lines changed: 2 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 |
| - | |
| 21 | + | |
| 22 | + | |
22 | 23 |
|
Lines changed: 4 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 |
| - | |
| 30 | + | |
31 | 31 |
| |
32 | 32 |
| |
33 | 33 |
| |
| |||
310 | 310 |
| |
311 | 311 |
| |
312 | 312 |
| |
313 |
| - | |
314 |
| - | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
315 | 316 |
| |
316 | 317 |
| |
317 | 318 |
| |
|
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt
Lines changed: 48 additions & 16 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
42 | 42 |
| |
43 | 43 |
| |
44 | 44 |
| |
| 45 | + | |
| 46 | + | |
45 | 47 |
| |
46 | 48 |
| |
47 | 49 |
| |
| |||
218 | 220 |
| |
219 | 221 |
| |
220 | 222 |
| |
221 |
| - | |
| 223 | + | |
| 224 | + | |
222 | 225 |
| |
223 | 226 |
| |
224 | 227 |
| |
| |||
249 | 252 |
| |
250 | 253 |
| |
251 | 254 |
| |
252 |
| - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
253 | 260 |
| |
254 | 261 |
| |
255 | 262 |
| |
| |||
307 | 314 |
| |
308 | 315 |
| |
309 | 316 |
| |
310 |
| - | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
311 | 325 |
| |
312 | 326 |
| |
313 | 327 |
| |
| |||
323 | 337 |
| |
324 | 338 |
| |
325 | 339 |
| |
326 |
| - | |
| 340 | + | |
| 341 | + | |
327 | 342 |
| |
328 | 343 |
| |
329 | 344 |
| |
| |||
363 | 378 |
| |
364 | 379 |
| |
365 | 380 |
| |
366 |
| - | |
| 381 | + | |
367 | 382 |
| |
368 | 383 |
| |
369 | 384 |
| |
| |||
386 | 401 |
| |
387 | 402 |
| |
388 | 403 |
| |
389 |
| - | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
390 | 409 |
| |
391 | 410 |
| |
392 | 411 |
| |
| |||
453 | 472 |
| |
454 | 473 |
| |
455 | 474 |
| |
456 |
| - | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
457 | 483 |
| |
458 | 484 |
| |
459 | 485 |
| |
| |||
474 | 500 |
| |
475 | 501 |
| |
476 | 502 |
| |
477 |
| - | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
478 | 507 |
| |
479 | 508 |
| |
480 | 509 |
| |
481 | 510 |
| |
482 | 511 |
| |
483 | 512 |
| |
484 | 513 |
| |
485 |
| - | |
486 |
| - | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
487 | 517 |
| |
488 | 518 |
| |
489 |
| - | |
490 |
| - | |
491 |
| - | |
| 519 | + | |
492 | 520 |
| |
493 | 521 |
| |
494 | 522 |
| |
| |||
500 | 528 |
| |
501 | 529 |
| |
502 | 530 |
| |
503 |
| - | |
| 531 | + | |
504 | 532 |
| |
505 | 533 |
| |
506 | 534 |
| |
| |||
756 | 784 |
| |
757 | 785 |
| |
758 | 786 |
| |
759 |
| - | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
760 | 792 |
| |
761 | 793 |
| |
762 | 794 |
| |
| |||
779 | 811 |
| |
780 | 812 |
| |
781 | 813 |
| |
782 |
| - | |
| 814 | + | |
783 | 815 |
| |
784 | 816 |
| |
785 | 817 |
| |
|
Lines changed: 14 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + |
Lines changed: 47 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + |
Lines changed: 41 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
310 | 310 |
| |
311 | 311 |
| |
312 | 312 |
| |
313 |
| - | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
314 | 320 |
| |
315 | 321 |
| |
316 | 322 |
| |
317 |
| - | |
| 323 | + | |
318 | 324 |
| |
319 | 325 |
| |
320 |
| - | |
321 | 326 |
| |
322 | 327 |
| |
323 | 328 |
| |
| |||
336 | 341 |
| |
337 | 342 |
| |
338 | 343 |
| |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
339 | 377 |
| |
340 | 378 |
| |
341 | 379 |
| |
|
Lines changed: 36 additions & 17 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
38 | 38 |
| |
39 | 39 |
| |
40 | 40 |
| |
41 |
| - | |
42 |
| - | |
43 |
| - | |
44 |
| - | |
45 |
| - | |
46 |
| - | |
47 |
| - | |
| 41 | + | |
| 42 | + | |
48 | 43 |
| |
49 |
| - | |
50 |
| - | |
51 |
| - | |
52 |
| - | |
53 |
| - | |
54 |
| - | |
55 |
| - | |
56 |
| - | |
57 |
| - | |
58 |
| - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
59 | 55 |
| |
60 | 56 |
| |
61 | 57 |
| |
| |||
79 | 75 |
| |
80 | 76 |
| |
81 | 77 |
| |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
82 | 101 |
| |
83 | 102 |
| |
84 | 103 |
| |
|
0 commit comments