Commit c49aa90
Remove setViewZIndex and associated state from BaseViewManager (#56717)
Summary:
Pull Request resolved: #56717
This is a follow-up to D91121582 which deprecated ReactZIndexedViewGroup and removed custom draw order logic from ReactViewGroup. That diff kept `setZIndex()` in BaseViewManager and BaseViewManagerDelegate for backward compatibility, to be removed in a follow-up.
This diff completes that cleanup by removing:
- The `setZIndex` method from `BaseViewManager` (which called `ViewGroupManager.setViewZIndex` and triggered `updateDrawingOrder()` on the parent)
- The `Z_INDEX` case from `BaseViewManagerDelegate`
- The `zIndexHash` WeakHashMap, `setViewZIndex`, and `getViewZIndex` static methods from `ViewGroupManager`'s companion object
- The `ViewGroupDrawingOrderHelper` class, which was dead code (marked `LegacyArchitecture`, no longer imported anywhere) and depended on the removed `getViewZIndex`
Z-index is now fully managed at the C++ Fabric layer, and these Android-side mechanisms are no longer needed.
Changelog: [Android][Removed] Removed `ViewGroupManager.setViewZIndex`/`getViewZIndex` and `ViewGroupDrawingOrderHelper` — z-index is now fully managed by the Fabric C++ layer
Reviewed By: sammy-SC
Differential Revision: D104101783
fbshipit-source-id: 7c69afc307cef9ebe3a939cf559050372f093c971 parent 91702e5 commit c49aa90
6 files changed
Lines changed: 2 additions & 206 deletions
File tree
- packages/react-native/ReactAndroid
- api
- src/main/java/com/facebook/react
- uimanager
- views/view
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4090 | 4090 | | |
4091 | 4091 | | |
4092 | 4092 | | |
4093 | | - | |
4094 | | - | |
4095 | | - | |
4096 | | - | |
4097 | | - | |
4098 | 4093 | | |
4099 | 4094 | | |
4100 | 4095 | | |
| |||
4400 | 4395 | | |
4401 | 4396 | | |
4402 | 4397 | | |
4403 | | - | |
4404 | | - | |
4405 | | - | |
4406 | | - | |
4407 | | - | |
4408 | | - | |
4409 | | - | |
4410 | | - | |
4411 | | - | |
4412 | 4398 | | |
4413 | | - | |
4414 | 4399 | | |
4415 | 4400 | | |
4416 | 4401 | | |
| |||
4424 | 4409 | | |
4425 | 4410 | | |
4426 | 4411 | | |
4427 | | - | |
4428 | 4412 | | |
4429 | 4413 | | |
4430 | 4414 | | |
4431 | 4415 | | |
4432 | | - | |
4433 | 4416 | | |
4434 | 4417 | | |
4435 | 4418 | | |
4436 | 4419 | | |
4437 | | - | |
4438 | | - | |
4439 | | - | |
4440 | | - | |
4441 | | - | |
4442 | 4420 | | |
4443 | 4421 | | |
4444 | 4422 | | |
| |||
6445 | 6423 | | |
6446 | 6424 | | |
6447 | 6425 | | |
6448 | | - | |
| 6426 | + | |
6449 | 6427 | | |
6450 | 6428 | | |
6451 | 6429 | | |
| |||
6465 | 6443 | | |
6466 | 6444 | | |
6467 | 6445 | | |
6468 | | - | |
6469 | 6446 | | |
6470 | 6447 | | |
6471 | 6448 | | |
| |||
6498 | 6475 | | |
6499 | 6476 | | |
6500 | 6477 | | |
6501 | | - | |
6502 | 6478 | | |
6503 | 6479 | | |
6504 | 6480 | | |
| |||
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
Lines changed: 1 addition & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
285 | 284 | | |
286 | 285 | | |
287 | 286 | | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | | - | |
293 | | - | |
| 287 | + | |
294 | 288 | | |
295 | 289 | | |
296 | 290 | | |
| |||
Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 0 additions & 113 deletions
This file was deleted.
Lines changed: 0 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| |||
76 | 75 | | |
77 | 76 | | |
78 | 77 | | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | 78 | | |
Lines changed: 0 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | 61 | | |
63 | 62 | | |
64 | 63 | | |
| |||
81 | 80 | | |
82 | 81 | | |
83 | 82 | | |
84 | | - | |
85 | 83 | | |
86 | 84 | | |
87 | 85 | | |
| |||
622 | 620 | | |
623 | 621 | | |
624 | 622 | | |
625 | | - | |
626 | | - | |
627 | | - | |
628 | | - | |
629 | | - | |
630 | | - | |
631 | | - | |
632 | | - | |
633 | | - | |
634 | | - | |
635 | | - | |
636 | | - | |
637 | | - | |
638 | | - | |
639 | 623 | | |
640 | 624 | | |
641 | 625 | | |
| |||
0 commit comments