Skip to content

Commit d002a86

Browse files
klopez4212Terp
andcommitted
Fix gallery selection, decoding and native image lifecycle
Co-authored-by: Terp <5856f6900e8e0a4e0ea1f4f8d2ee33e4753d2119bc122f94ecafc660b46c0511@buzz.block.builderlab.xyz> Signed-off-by: kenny lopez <[email protected]>
1 parent a2104ee commit d002a86

9 files changed

Lines changed: 512 additions & 89 deletions

File tree

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
// Concatenated with the production source by test-mobile-photo-zoom.sh so this
2+
// fixture can exercise the private controller without widening its app API.
3+
@main
4+
struct NativePhotoZoomTests {
5+
@MainActor static func main() {
6+
if #available(iOS 18.0, *) {
7+
let data = UIGraphicsImageRenderer(size: CGSize(width: 2, height: 2)).pngData { context in
8+
UIColor.red.setFill(); context.fill(CGRect(x: 0, y: 0, width: 2, height: 2))
9+
}
10+
let viewer = NativePhotoZoomViewController(
11+
image: UIImage(data: data)!, labels: (0..<100).map { "Photo \($0)" },
12+
initialIndex: 0, canReply: false, canMore: false, canDelete: false
13+
)
14+
var requests: [(String, Int, FlutterResult)] = []
15+
viewer.request = { method, index, _, completion in
16+
if method == "select" { completion(nil) }
17+
else { requests.append((method, index, completion)) }
18+
}
19+
viewer.loadViewIfNeeded()
20+
viewer.view.frame = CGRect(x: 0, y: 0, width: 390, height: 844)
21+
viewer.view.layoutIfNeeded()
22+
precondition(!requests.isEmpty && requests.allSatisfy { $0.1 <= 2 }, "Initial requests must stay adjacent")
23+
let pager = viewer.children.compactMap { $0 as? UIPageViewController }.first!
24+
let indicator = descendants(viewer.view).compactMap { $0 as? UIPageControl }.first!
25+
let stale = requests
26+
requests.removeAll()
27+
indicator.currentPage = 50; sendValueChanged(indicator)
28+
precondition(!requests.isEmpty && requests.allSatisfy { (48...52).contains($0.1) }, "Scrubbing must move the request window")
29+
let page = pager.viewControllers!.first!
30+
page.loadViewIfNeeded()
31+
let photo = descendants(page.view).compactMap { $0 as? UIImageView }.first!
32+
for request in stale { request.2(FlutterStandardTypedData(bytes: data)) }
33+
precondition(photo.image == nil, "Late old-window responses cannot paint the selected photo")
34+
let current = requests
35+
requests.removeAll()
36+
for request in current { request.2(FlutterStandardTypedData(bytes: data)) }
37+
precondition(photo.image != nil, "Current-window responses must paint the actual page")
38+
indicator.currentPage = 0; sendValueChanged(indicator)
39+
precondition(requests.contains { $0.1 == 0 }, "Leaving the window evicts old decoded images")
40+
let closing = requests
41+
requests.removeAll()
42+
var closed = false
43+
viewer.onClose = { _ in closed = true }
44+
viewer.viewDidDisappear(false)
45+
for request in closing { request.2(FlutterStandardTypedData(bytes: data)) }
46+
precondition(closed && requests.isEmpty, "Teardown must ignore late loads and stop requesting")
47+
print("PASS: native photo window, stale responses, eviction and teardown")
48+
}
49+
}
50+
@MainActor static func sendValueChanged(_ control: UIControl) {
51+
// A command-line UIKit fixture has no UIApplication action dispatcher.
52+
for target in control.allTargets {
53+
for action in control.actions(forTarget: target, forControlEvent: .valueChanged) ?? [] {
54+
_ = (target as AnyObject).perform(NSSelectorFromString(action), with: control)
55+
}
56+
}
57+
}
58+
@MainActor static func descendants(_ view: UIView) -> [UIView] {
59+
[view] + view.subviews.flatMap { descendants($0) }
60+
}
61+
}

‎mobile/ios/Runner/NativePhotoZoomCoordinator.swift‎

Lines changed: 64 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ final class NativePhotoZoomCoordinator {
4848
}
4949
let controller = NativePhotoZoomViewController(
5050
image: image, labels: labels, initialIndex: initial,
51-
previews: (args["previews"] as? [Any] ?? []).map { ($0 as? FlutterStandardTypedData).flatMap { UIImage(data: $0.data) } },
5251
canReply: args["canReply"] as? Bool ?? false,
5352
canMore: args["canMore"] as? Bool ?? false,
5453
canDelete: args["canDelete"] as? Bool ?? false
@@ -136,10 +135,9 @@ private final class NativePhotoZoomViewController: UIViewController, UIPageViewC
136135
private let reply = UIButton(type: .system)
137136
private let more = UIButton(type: .system)
138137
private let labels: [String]
139-
private var previews: [UIImage?]
140-
private let images = NSCache<NSNumber, UIImage>()
141-
private let initialImage: UIImage
142-
private let initialIndex: Int
138+
private var previews: [Int: UIImage] = [:]
139+
private var images: [Int: UIImage] = [:]
140+
private var pending: [String: UUID] = [:]
143141
private let canReply: Bool, canMore: Bool, canDelete: Bool
144142
private var index: Int
145143
private var action = "closed"
@@ -151,12 +149,11 @@ private final class NativePhotoZoomViewController: UIViewController, UIPageViewC
151149
var request: ((String, Int, String?, @escaping FlutterResult) -> Void)?
152150
var onSelection: ((UIImage?, [String: Any]?) -> Void)?
153151

154-
init(image: UIImage, labels: [String], initialIndex: Int, previews: [UIImage?], canReply: Bool, canMore: Bool, canDelete: Bool) {
155-
self.previews = labels.indices.map { previews.indices.contains($0) ? previews[$0] : nil }
156-
initialImage = image; self.labels = labels; self.initialIndex = initialIndex; index = initialIndex
152+
init(image: UIImage, labels: [String], initialIndex: Int, canReply: Bool, canMore: Bool, canDelete: Bool) {
153+
self.previews[initialIndex] = image
154+
self.labels = labels; index = initialIndex
157155
self.canReply = canReply; self.canMore = canMore; self.canDelete = canDelete
158156
super.init(nibName: nil, bundle: nil)
159-
images.countLimit = 3
160157
}
161158
required init?(coder: NSCoder) { nil }
162159

@@ -171,16 +168,7 @@ private final class NativePhotoZoomViewController: UIViewController, UIPageViewC
171168
pager.dataSource = self; pager.delegate = self
172169
addChild(pager); view.addSubview(pager.view); pager.didMove(toParent: self)
173170
pager.setViewControllers([page(index)], direction: .forward, animated: false)
174-
for value in labels.indices where previews[value] == nil {
175-
request?("preview", value, nil) { [weak self] result in
176-
guard let self, !self.finishing,
177-
let bytes = result as? FlutterStandardTypedData,
178-
let image = UIImage(data: bytes.data) else { return }
179-
self.previews[value] = image
180-
for page in self.pager.children.compactMap({ $0 as? NativePhotoPage })
181-
where page.index == value && page.image == nil { page.setImage(image) }
182-
}
183-
}
171+
loadWindow()
184172
configure(close, symbol: "xmark", label: "Close photo", selector: #selector(closePhoto))
185173
configure(reply, symbol: "arrowshape.turn.up.left", label: "Reply in thread", selector: #selector(replyToMessage))
186174
configure(more, symbol: "ellipsis", label: "More image actions", selector: nil)
@@ -301,23 +289,51 @@ private final class NativePhotoZoomViewController: UIViewController, UIPageViewC
301289
button.configuration = config; button.accessibilityLabel = label
302290
if let selector { button.addTarget(self, action: selector, for: .touchUpInside) }
303291
}
304-
private func page(_ value: Int) -> NativePhotoPage {
305-
let cached = images.object(forKey: NSNumber(value: value))
306-
let preview = previews.indices.contains(value) ? previews[value] : nil
307-
let page = NativePhotoPage(index: value, label: labels[value], image: cached ?? preview ?? (value == initialIndex ? initialImage : nil))
308-
if cached == nil {
309-
request?("image", value, nil) { [weak self, weak page] result in
310-
guard let self, let page, !self.finishing else { return }
311-
let image = (result as? FlutterStandardTypedData).flatMap { UIImage(data: $0.data) }
312-
if let image {
313-
self.images.setObject(image, forKey: NSNumber(value: value))
314-
page.setImage(image)
315-
} else if page.image == nil {
316-
page.setImage(nil)
317-
}
318-
if self.index == value { self.syncSelection() }
292+
private func isNearby(_ value: Int) -> Bool { abs(value - index) <= 2 }
293+
private func trimWindow() {
294+
previews = previews.filter { isNearby($0.key) }
295+
images = images.filter { isNearby($0.key) }
296+
pending = pending.filter { key, _ in
297+
key.split(separator: ":").last.flatMap { Int($0) }.map(isNearby) ?? false
298+
}
299+
for page in pager.children.compactMap({ $0 as? NativePhotoPage }) where !isNearby(page.index) {
300+
page.setImage(nil)
301+
}
302+
}
303+
private func loadWindow() {
304+
trimWindow()
305+
for value in max(0, index - 2)...min(labels.count - 1, index + 2) {
306+
load("preview", value)
307+
}
308+
for page in pager.children.compactMap({ $0 as? NativePhotoPage }) where isNearby(page.index) {
309+
load("image", page.index)
310+
}
311+
}
312+
private func load(_ method: String, _ value: Int) {
313+
guard !finishing, isNearby(value),
314+
(method == "preview" ? previews[value] : images[value]) == nil else { return }
315+
let key = "\(method):\(value)"
316+
guard pending[key] == nil else { return }
317+
let token = UUID()
318+
pending[key] = token
319+
request?(method, value, nil) { [weak self] result in
320+
guard let self, !self.finishing, self.isNearby(value), self.pending[key] == token else { return }
321+
self.pending.removeValue(forKey: key)
322+
let image = (result as? FlutterStandardTypedData).flatMap { UIImage(data: $0.data) }
323+
if let image {
324+
if method == "preview" { self.previews[value] = image }
325+
else { self.images[value] = image }
319326
}
327+
for page in self.pager.children.compactMap({ $0 as? NativePhotoPage }) where page.index == value {
328+
if let image = self.images[value] ?? self.previews[value] { page.setImage(image) }
329+
else if method == "image" { page.setImage(nil) }
330+
}
331+
if self.index == value, method == "image" { self.syncSelection() }
320332
}
333+
}
334+
private func page(_ value: Int) -> NativePhotoPage {
335+
let page = NativePhotoPage(index: value, label: labels[value], image: images[value] ?? previews[value])
336+
load("image", value)
321337
return page
322338
}
323339
func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
@@ -331,14 +347,20 @@ private final class NativePhotoZoomViewController: UIViewController, UIPageViewC
331347
paging = false; indicator.isEnabled = true
332348
if completed, let page = pager.viewControllers?.first as? NativePhotoPage { selected(page.index) }
333349
}
334-
private func selected(_ value: Int) { index = value; indicator.currentPage = value; syncSelection() }
350+
private func selected(_ value: Int) {
351+
index = value; indicator.currentPage = value
352+
trimWindow()
353+
// Move Dart's request window before asking for newly adjacent images.
354+
syncSelection { [weak self] in self?.loadWindow() }
355+
}
335356
@objc private func selectPage() {
336357
guard !paging, !finishing else { return }
337358
let target = indicator.currentPage
338359
guard target != index else { return }
339360
// Scrubbing must not disable its own control or wait for a page animation.
340-
pager.setViewControllers([page(target)], direction: target >= index ? .forward : .reverse, animated: false)
361+
let direction: UIPageViewController.NavigationDirection = target >= index ? .forward : .reverse
341362
selected(target)
363+
pager.setViewControllers([page(target)], direction: direction, animated: false)
342364
}
343365
private func syncSelection(completion: (() -> Void)? = nil) {
344366
let selected = index
@@ -381,7 +403,12 @@ private final class NativePhotoZoomViewController: UIViewController, UIPageViewC
381403
}
382404
override func viewDidDisappear(_ animated: Bool) {
383405
super.viewDidDisappear(animated)
384-
if isBeingDismissed || presentingViewController == nil { onClose?(action); onClose = nil }
406+
if isBeingDismissed || presentingViewController == nil {
407+
finishing = true
408+
pending.removeAll(); previews.removeAll(); images.removeAll()
409+
request = nil
410+
onClose?(action); onClose = nil
411+
}
385412
}
386413
override func accessibilityPerformEscape() -> Bool { closePhoto(); return true }
387414
}

‎mobile/lib/features/channels/media_viewer_page.dart‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ PageRoute<void> buildImageViewerRoute({
8484
double? aspectRatio,
8585
List<MediaViewerImage>? galleryItems,
8686
int initialIndex = 0,
87+
ValueChanged<int>? onSelectionChanged,
8788
VoidCallback? onReply,
8889
MediaViewerMoreAction? onMore,
8990
bool disableAnimations = false,
@@ -114,6 +115,7 @@ PageRoute<void> buildImageViewerRoute({
114115
semanticLabel: semanticLabel,
115116
galleryItems: images,
116117
initialIndex: safeInitialIndex,
118+
onSelectionChanged: onSelectionChanged,
117119
onReply: onReply,
118120
onMore: onMore,
119121
),
@@ -131,6 +133,7 @@ void openImageViewer(
131133
double? aspectRatio,
132134
List<MediaViewerImage>? galleryItems,
133135
int initialIndex = 0,
136+
ValueChanged<int>? onSelectionChanged,
134137
VoidCallback? onReply,
135138
MediaViewerMoreAction? onMore,
136139
}) {
@@ -143,6 +146,7 @@ void openImageViewer(
143146
aspectRatio: aspectRatio,
144147
galleryItems: galleryItems,
145148
initialIndex: initialIndex,
149+
onSelectionChanged: onSelectionChanged,
146150
onReply: onReply,
147151
onMore: onMore,
148152
disableAnimations: MediaQuery.disableAnimationsOf(context),
@@ -182,6 +186,9 @@ class MediaImageViewerPage extends HookConsumerWidget {
182186
final String? semanticLabel;
183187
final List<MediaViewerImage>? galleryItems;
184188
final int initialIndex;
189+
190+
/// Reports the visible photo immediately, including before any exit path.
191+
final ValueChanged<int>? onSelectionChanged;
185192
final VoidCallback? onReply;
186193
final MediaViewerMoreAction? onMore;
187194

@@ -192,6 +199,7 @@ class MediaImageViewerPage extends HookConsumerWidget {
192199
this.semanticLabel,
193200
this.galleryItems,
194201
this.initialIndex = 0,
202+
this.onSelectionChanged,
195203
this.onReply,
196204
this.onMore,
197205
});
@@ -295,6 +303,7 @@ class MediaImageViewerPage extends HookConsumerWidget {
295303
}
296304
_precacheViewerImages(context, images, index);
297305
currentIndex.value = index;
306+
onSelectionChanged?.call(index);
298307
isTransformed.value = _hasImageTransform(
299308
transformationControllers[index].value,
300309
);

‎mobile/lib/features/channels/message_content/media_stack.dart‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ class _MessageImageStack extends HookConsumerWidget {
6969
final cardWidth = math.min(210.0, width * .62);
7070
final cardHeight = cardWidth;
7171
final height = cardHeight + Grid.xs * 2 + (mirrored ? 16 : 24);
72-
final decodeWidth =
72+
final decodeWidth = cardWidth;
73+
final physicalDecodeWidth =
7374
(cardWidth * MediaQuery.devicePixelRatioOf(context))
7475
.ceilToDouble();
7576
final providers = [
7677
for (final item in items)
7778
ResizeImage.resizeIfNeeded(
78-
decodeWidth.toInt(),
79+
physicalDecodeWidth.toInt(),
7980
null,
8081
MediaImageProvider(
8182
url: item.url,
@@ -123,6 +124,7 @@ class _MessageImageStack extends HookConsumerWidget {
123124
),
124125
],
125126
urls: [for (final item in items) item.url],
127+
mimeTypes: [for (final item in items) item.mimeType],
126128
labels: [for (final item in items) item.semanticLabel],
127129
initialIndex: selected,
128130
onSelect: (index) async {
@@ -147,6 +149,13 @@ class _MessageImageStack extends HookConsumerWidget {
147149
aspectRatio: items[selected].aspectRatio,
148150
galleryItems: viewerItems,
149151
initialIndex: selected,
152+
onSelectionChanged: (index) {
153+
if (!context.mounted) return;
154+
dragging.value = false;
155+
start.value = index.toDouble();
156+
distance.value = 0;
157+
settle(index.toDouble(), instant: true);
158+
},
150159
onReply: onReply,
151160
onMore: onMore,
152161
);

‎mobile/lib/features/channels/message_gallery.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ class MessageGalleryItem {
1111
final String semanticLabel;
1212
final double? aspectRatio;
1313

14+
/// Declared media type, used to keep potentially animated images in Flutter.
15+
final String? mimeType;
16+
1417
const MessageGalleryItem({
1518
required this.url,
1619
required this.semanticLabel,
1720
required this.aspectRatio,
21+
this.mimeType,
1822
});
1923
}
2024

@@ -60,6 +64,7 @@ TrailingImageGallery? extractTrailingImageGallery(
6064
imeta?.alt ??
6165
(markdownLabel.isNotEmpty ? markdownLabel : 'Message image'),
6266
aspectRatio: imeta?.aspectRatio,
67+
mimeType: imeta?.mimeType,
6368
),
6469
);
6570
cursor -= 1;

0 commit comments

Comments
 (0)