also looking at this
fix(native): retain keyed controls and correct map and tab chrome
#368
32 files
+449
-100
Review threads live on the whole diff, not on one commit, so none are shown here - a thread's line means something in the branch's final form, and painting it into an intermediate step would put it on code it is not about.
| @@ -783,10 +783,6 @@ final class CraftChrome: ObservableObject { | ||
| 783 | 783 | } else { |
| 784 | 784 | next = nil |
| 785 | 785 | } |
| 786 | #if DEBUG | |
| 787 | NSLog("[craft chrome trace] accessory present=%d owner=%@", next != nil ? 1 : 0, | |
| 788 | owner.map { String(describing: ObjectIdentifier($0)) } ?? "none") | |
| 789 | #endif | |
| 790 | 786 | tabAccessoryOwner = owner |
| 791 | 787 | guard tabAccessory != next else { return } |
| 792 | 788 | tabAccessory = next |
| @@ -4693,12 +4693,6 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate, | ||
| 4693 | 4693 | |
| 4694 | 4694 | private func restoreShellChrome() { |
| 4695 | 4695 | guard !isAppScript else { return } |
| 4696 | #if DEBUG | |
| 4697 | NSLog("[craft chrome trace] restore route=%@ controller=%@ top=%d hidden=%d accessory=%d", | |
| 4698 | routeName ?? "none", String(describing: ObjectIdentifier(self)), | |
| 4699 | navigationController?.topViewController === self ? 1 : 0, | |
| 4700 | navigationController?.view.isHidden == true ? 1 : 0, tabAccessory != nil ? 1 : 0) | |
| 4701 | #endif | |
| 4702 | 4696 | CraftChrome.shared.setHiddenByScreen(tabBarHidden) |
| 4703 | 4697 | CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self) |
| 4704 | 4698 | } |
| @@ -5370,11 +5364,6 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate, | ||
| 5370 | 5364 | guard !isAppScript else { return } |
| 5371 | 5365 | if options.keys.contains("tabAccessory") { |
| 5372 | 5366 | tabAccessory = options["tabAccessory"] as? [String: Any] |
| 5373 | #if DEBUG | |
| 5374 | NSLog("[craft chrome trace] options route=%@ controller=%@ accessory=%d top=%d window=%d", | |
| 5375 | routeName ?? "none", String(describing: ObjectIdentifier(self)), tabAccessory != nil ? 1 : 0, | |
| 5376 | navigationController?.topViewController === self ? 1 : 0, view.window != nil ? 1 : 0) | |
| 5377 | #endif | |
| 5378 | 5367 | if navigationController?.topViewController === self, view.window != nil { |
| 5379 | 5368 | CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self) |
| 5380 | 5369 | } |