@@ -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}
0 commit comments