zkit-ui 2.0.5 → 2.0.7

package/expo-module.config.json

@@ -1,11 +1,11 @@
 {
   "platforms": ["apple", "android"],
   "apple": {
-    "modules": ["GaleriaModule"],
+    "modules": ["NativeImagePreviewModule"],
     "podspecPath": "zkit-ui.podspec",
     "swiftModuleName": "zkit_ui"
   },
   "android": {
-    "modules": ["cn.fontree.zkit.ui.preview.GaleriaModule"]
+    "modules": ["cn.fontree.zkit.ui.preview.NativeImagePreviewModule"]
   }
 }

package/ios/{GalleryViewer/GaleriaImageLoader.swift → NativeImagePreview/NativeImagePreviewImageLoader.swift}

@@ -4,7 +4,7 @@ import UIKit
 import SDWebImage
 #endif
 
-public protocol GaleriaImageLoading {
+public protocol NativeImagePreviewImageLoading {
     func loadImage(
         _ url: URL,
         placeholder: UIImage?,
@@ -13,7 +13,7 @@ public protocol GaleriaImageLoading {
     )
 }
 
-public struct GaleriaURLSessionImageLoader: GaleriaImageLoading {
+public struct NativeImagePreviewURLSessionImageLoader: NativeImagePreviewImageLoading {
     public init() {}
 
     public func loadImage(
@@ -41,7 +41,7 @@ public struct GaleriaURLSessionImageLoader: GaleriaImageLoading {
 }
 
 #if canImport(SDWebImage)
-struct GaleriaSDWebImageLoader: GaleriaImageLoading {
+struct NativeImagePreviewSDWebImageLoader: NativeImagePreviewImageLoading {
     func loadImage(
         _ url: URL,
         placeholder: UIImage?,
@@ -62,12 +62,12 @@ struct GaleriaSDWebImageLoader: GaleriaImageLoading {
 }
 #endif
 
-public enum GaleriaImageLoaderFactory {
-    public static func makeDefault() -> GaleriaImageLoading {
+public enum NativeImagePreviewImageLoaderFactory {
+    public static func makeDefault() -> NativeImagePreviewImageLoading {
         #if canImport(SDWebImage)
-        return GaleriaSDWebImageLoader()
+        return NativeImagePreviewSDWebImageLoader()
         #else
-        return GaleriaURLSessionImageLoader()
+        return NativeImagePreviewURLSessionImageLoader()
         #endif
     }
 }

package/ios/NativeImagePreview/NativeImagePreviewImageViewInteraction.swift

@@ -0,0 +1,245 @@
+import ObjectiveC
+import UIKit
+
+extension UIImageView {
+    private struct NativeImagePreviewAnchorRegistration {
+        let previewGroupId: String
+        let index: Int
+    }
+
+    private final class NativeImagePreviewTapGestureRecognizer: UITapGestureRecognizer {
+        weak var fromViewController: UIViewController?
+        var dataSource: NativeImagePreviewDataSource?
+        var imageLoader: NativeImagePreviewImageLoading?
+        var initialIndex = 0
+        var previewGroupId: String?
+        var configuration = NativeImagePreviewViewerConfiguration()
+    }
+
+    private static var anchorRegistrationKey: UInt8 = 0
+    private static var gestureRecognizerKey: UInt8 = 0
+
+    private var topMostHostViewController: UIViewController? {
+        let keyWindow: UIWindow? = {
+            if #available(iOS 13.0, *) {
+                let scenes = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }
+                let activeScene = scenes.first(where: { $0.activationState == .foregroundActive }) ?? scenes.first
+                return activeScene?.windows.first(where: { $0.isKeyWindow }) ?? activeScene?.windows.first
+            } else {
+                return UIApplication.shared.windows.first(where: { $0.isKeyWindow }) ?? UIApplication.shared.windows.first
+            }
+        }()
+        guard let rootViewController = keyWindow?.rootViewController else { return nil }
+        return rootViewController.presentedViewController ?? rootViewController
+    }
+
+    public func setupNativeImagePreviewViewer(
+        configuration: NativeImagePreviewViewerConfiguration = NativeImagePreviewViewerConfiguration(),
+        from viewController: UIViewController? = nil,
+        imageLoader: NativeImagePreviewImageLoading? = nil,
+        previewGroupId: String? = nil
+    ) {
+        configureNativeImagePreviewViewer(
+            dataSource: NativeImagePreviewArrayDataSource(items: [.image(image)]),
+            initialIndex: 0,
+            configuration: configuration,
+            from: viewController,
+            imageLoader: imageLoader,
+            previewGroupId: previewGroupId
+        )
+    }
+
+    public func setupNativeImagePreviewViewer(
+        url: URL,
+        initialIndex: Int = 0,
+        placeholder: UIImage? = nil,
+        configuration: NativeImagePreviewViewerConfiguration = NativeImagePreviewViewerConfiguration(),
+        from viewController: UIViewController? = nil,
+        imageLoader: NativeImagePreviewImageLoading? = nil,
+        previewGroupId: String? = nil
+    ) {
+        configureNativeImagePreviewViewer(
+            dataSource: NativeImagePreviewArrayDataSource(items: [.imageURL(url, placeholder: placeholder)]),
+            initialIndex: initialIndex,
+            configuration: configuration,
+            from: viewController,
+            imageLoader: imageLoader,
+            previewGroupId: previewGroupId
+        )
+    }
+
+    public func setupNativeImagePreviewViewer(
+        images: [UIImage],
+        initialIndex: Int = 0,
+        configuration: NativeImagePreviewViewerConfiguration = NativeImagePreviewViewerConfiguration(),
+        from viewController: UIViewController? = nil,
+        imageLoader: NativeImagePreviewImageLoading? = nil,
+        previewGroupId: String? = nil
+    ) {
+        let items = images.map { NativeImagePreviewMediaItem.image($0) }
+        configureNativeImagePreviewViewer(
+            dataSource: NativeImagePreviewArrayDataSource(items: items),
+            initialIndex: initialIndex,
+            configuration: configuration,
+            from: viewController,
+            imageLoader: imageLoader,
+            previewGroupId: previewGroupId
+        )
+    }
+
+    public func setupNativeImagePreviewViewer(
+        urls: [URL],
+        initialIndex: Int = 0,
+        placeholder: UIImage? = nil,
+        configuration: NativeImagePreviewViewerConfiguration = NativeImagePreviewViewerConfiguration(),
+        from viewController: UIViewController? = nil,
+        imageLoader: NativeImagePreviewImageLoading? = nil,
+        previewGroupId: String? = nil
+    ) {
+        let items = urls.map { NativeImagePreviewMediaItem.imageURL($0, placeholder: placeholder) }
+        configureNativeImagePreviewViewer(
+            dataSource: NativeImagePreviewArrayDataSource(items: items),
+            initialIndex: initialIndex,
+            configuration: configuration,
+            from: viewController,
+            imageLoader: imageLoader,
+            previewGroupId: previewGroupId
+        )
+    }
+
+    public func setupNativeImagePreviewViewer(
+        dataSource: NativeImagePreviewDataSource,
+        initialIndex: Int = 0,
+        configuration: NativeImagePreviewViewerConfiguration = NativeImagePreviewViewerConfiguration(),
+        from viewController: UIViewController? = nil,
+        imageLoader: NativeImagePreviewImageLoading? = nil,
+        previewGroupId: String? = nil
+    ) {
+        configureNativeImagePreviewViewer(
+            dataSource: dataSource,
+            initialIndex: initialIndex,
+            configuration: configuration,
+            from: viewController,
+            imageLoader: imageLoader,
+            previewGroupId: previewGroupId
+        )
+    }
+
+    func removeNativeImagePreviewViewerInteraction() {
+        if let recognizer = nativeImagePreviewTapGestureRecognizer {
+            removeGestureRecognizer(recognizer)
+        }
+        nativeImagePreviewTapGestureRecognizer = nil
+
+        if let registration = nativeImagePreviewAnchorRegistration {
+            NativeImagePreviewSourceViewRegistry.shared.unregister(
+                self,
+                previewGroupId: registration.previewGroupId,
+                index: registration.index
+            )
+        }
+        nativeImagePreviewAnchorRegistration = nil
+    }
+
+    private func configureNativeImagePreviewViewer(
+        dataSource: NativeImagePreviewDataSource?,
+        initialIndex: Int,
+        configuration: NativeImagePreviewViewerConfiguration,
+        from viewController: UIViewController?,
+        imageLoader: NativeImagePreviewImageLoading?,
+        previewGroupId: String?
+    ) {
+        let recognizer = nativeImagePreviewTapGestureRecognizer ?? {
+            let recognizer = NativeImagePreviewTapGestureRecognizer(target: self, action: #selector(showNativeImagePreviewViewer(_:)))
+            recognizer.numberOfTouchesRequired = 1
+            recognizer.numberOfTapsRequired = 1
+            nativeImagePreviewTapGestureRecognizer = recognizer
+            return recognizer
+        }()
+
+        isUserInteractionEnabled = true
+        clipsToBounds = true
+
+        recognizer.dataSource = dataSource
+        recognizer.imageLoader = imageLoader
+        recognizer.initialIndex = initialIndex
+        recognizer.previewGroupId = previewGroupId
+        recognizer.configuration = configuration
+        recognizer.fromViewController = viewController
+
+        if recognizer.view !== self {
+            addGestureRecognizer(recognizer)
+        }
+
+        updateNativeImagePreviewAnchorRegistration(previewGroupId: previewGroupId, index: initialIndex)
+    }
+
+    private var nativeImagePreviewTapGestureRecognizer: NativeImagePreviewTapGestureRecognizer? {
+        get {
+            objc_getAssociatedObject(self, &Self.gestureRecognizerKey) as? NativeImagePreviewTapGestureRecognizer
+        }
+        set {
+            objc_setAssociatedObject(
+                self,
+                &Self.gestureRecognizerKey,
+                newValue,
+                .OBJC_ASSOCIATION_RETAIN_NONATOMIC
+            )
+        }
+    }
+
+    private var nativeImagePreviewAnchorRegistration: NativeImagePreviewAnchorRegistration? {
+        get {
+            objc_getAssociatedObject(self, &Self.anchorRegistrationKey) as? NativeImagePreviewAnchorRegistration
+        }
+        set {
+            objc_setAssociatedObject(
+                self,
+                &Self.anchorRegistrationKey,
+                newValue,
+                .OBJC_ASSOCIATION_RETAIN_NONATOMIC
+            )
+        }
+    }
+
+    @objc
+    private func showNativeImagePreviewViewer(_ recognizer: NativeImagePreviewTapGestureRecognizer) {
+        guard let sourceView = recognizer.view as? UIImageView else { return }
+        let resolvedImageLoader = recognizer.imageLoader ?? NativeImagePreviewImageLoaderFactory.makeDefault()
+        let viewerController = NativeImagePreviewViewerController(
+            sourceView: sourceView,
+            dataSource: recognizer.dataSource,
+            imageLoader: resolvedImageLoader,
+            configuration: recognizer.configuration,
+            initialIndex: recognizer.initialIndex,
+            previewGroupId: recognizer.previewGroupId
+        )
+
+        let rootViewController = recognizer.fromViewController ?? topMostHostViewController
+        let presenter = rootViewController.flatMap(topMostPresentedController(from:))
+        presenter?.present(viewerController, animated: false)
+    }
+
+    private func topMostPresentedController(from rootViewController: UIViewController) -> UIViewController {
+        var controller = rootViewController
+        while let presented = controller.presentedViewController {
+            controller = presented
+        }
+        return controller
+    }
+
+    private func updateNativeImagePreviewAnchorRegistration(previewGroupId: String?, index: Int) {
+        if let existing = nativeImagePreviewAnchorRegistration {
+            NativeImagePreviewSourceViewRegistry.shared.unregister(
+                self,
+                previewGroupId: existing.previewGroupId,
+                index: existing.index
+            )
+            nativeImagePreviewAnchorRegistration = nil
+        }
+
+        guard let previewGroupId = previewGroupId, previewGroupId.isEmpty == false else { return }
+        NativeImagePreviewSourceViewRegistry.shared.register(self, previewGroupId: previewGroupId, index: index)
+        nativeImagePreviewAnchorRegistration = NativeImagePreviewAnchorRegistration(previewGroupId: previewGroupId, index: index)
+    }
+}

package/ios/{GalleryViewer/GaleriaLayoutSupport.swift → NativeImagePreview/NativeImagePreviewLayoutSupport.swift}

@@ -1,18 +1,18 @@
 import UIKit
 
-struct GaleriaSharedElementGeometry {
+struct NativeImagePreviewSharedElementGeometry {
     let visibleFrameInWindow: CGRect
     let contentFrameInVisibleBounds: CGRect
     let cornerRadius: CGFloat
 }
 
-struct GaleriaSharedElementState {
+struct NativeImagePreviewSharedElementState {
     let image: UIImage
-    let geometry: GaleriaSharedElementGeometry
+    let geometry: NativeImagePreviewSharedElementGeometry
 }
 
 extension CGRect {
-    func galeriaPixelAligned(scale: CGFloat) -> CGRect {
+    func nativeImagePreviewPixelAligned(scale: CGFloat) -> CGRect {
         guard scale > 0 else { return self }
         return CGRect(
             x: (origin.x * scale).rounded() / scale,
@@ -22,7 +22,7 @@ extension CGRect {
         )
     }
 
-    func galeriaApproximatelyEquals(_ other: CGRect, tolerance: CGFloat = 0.5) -> Bool {
+    func nativeImagePreviewApproximatelyEquals(_ other: CGRect, tolerance: CGFloat = 0.5) -> Bool {
         abs(minX - other.minX) <= tolerance
             && abs(minY - other.minY) <= tolerance
             && abs(width - other.width) <= tolerance
@@ -30,18 +30,18 @@ extension CGRect {
     }
 }
 
-extension GaleriaSharedElementGeometry {
-    func galeriaPixelAligned(scale: CGFloat) -> GaleriaSharedElementGeometry {
-        GaleriaSharedElementGeometry(
-            visibleFrameInWindow: visibleFrameInWindow.galeriaPixelAligned(scale: scale),
-            contentFrameInVisibleBounds: contentFrameInVisibleBounds.galeriaPixelAligned(scale: scale),
+extension NativeImagePreviewSharedElementGeometry {
+    func nativeImagePreviewPixelAligned(scale: CGFloat) -> NativeImagePreviewSharedElementGeometry {
+        NativeImagePreviewSharedElementGeometry(
+            visibleFrameInWindow: visibleFrameInWindow.nativeImagePreviewPixelAligned(scale: scale),
+            contentFrameInVisibleBounds: contentFrameInVisibleBounds.nativeImagePreviewPixelAligned(scale: scale),
             cornerRadius: (cornerRadius * scale).rounded() / scale
         )
     }
 
-    func approximatelyEquals(_ other: GaleriaSharedElementGeometry, tolerance: CGFloat = 0.5) -> Bool {
-        visibleFrameInWindow.galeriaApproximatelyEquals(other.visibleFrameInWindow, tolerance: tolerance)
-            && contentFrameInVisibleBounds.galeriaApproximatelyEquals(
+    func approximatelyEquals(_ other: NativeImagePreviewSharedElementGeometry, tolerance: CGFloat = 0.5) -> Bool {
+        visibleFrameInWindow.nativeImagePreviewApproximatelyEquals(other.visibleFrameInWindow, tolerance: tolerance)
+            && contentFrameInVisibleBounds.nativeImagePreviewApproximatelyEquals(
                 other.contentFrameInVisibleBounds,
                 tolerance: tolerance
             )
@@ -49,8 +49,8 @@ extension GaleriaSharedElementGeometry {
     }
 }
 
-extension GaleriaSharedElementState {
-    func approximatelyEquals(_ other: GaleriaSharedElementState, tolerance: CGFloat = 0.5) -> Bool {
+extension NativeImagePreviewSharedElementState {
+    func approximatelyEquals(_ other: NativeImagePreviewSharedElementState, tolerance: CGFloat = 0.5) -> Bool {
         geometry.approximatelyEquals(other.geometry, tolerance: tolerance)
             && abs(image.size.width - other.image.size.width) <= tolerance
             && abs(image.size.height - other.image.size.height) <= tolerance
@@ -113,7 +113,7 @@ extension UIImageView {
         return convert(contentFrame, to: nil)
     }
 
-    func galeriaSharedElementState(clippingFrameInWindow: CGRect? = nil) -> GaleriaSharedElementState? {
+    func nativeImagePreviewSharedElementState(clippingFrameInWindow: CGRect? = nil) -> NativeImagePreviewSharedElementState? {
         guard let image = image else { return nil }
         guard image.size.width > 0, image.size.height > 0 else { return nil }
 
@@ -126,7 +126,7 @@ extension UIImageView {
             visibleFrame = clippingFrame
         }
 
-        let geometry = GaleriaSharedElementGeometry(
+        let geometry = NativeImagePreviewSharedElementGeometry(
             visibleFrameInWindow: visibleFrame,
             contentFrameInVisibleBounds: contentFrame.offsetBy(
                 dx: -visibleFrame.minX,
@@ -135,9 +135,9 @@ extension UIImageView {
             cornerRadius: (clipsToBounds || layer.masksToBounds) ? layer.cornerRadius : 0
         )
         let scale = window?.screen.scale ?? UIScreen.main.scale
-        return GaleriaSharedElementState(
+        return NativeImagePreviewSharedElementState(
             image: image,
-            geometry: geometry.galeriaPixelAligned(scale: scale)
+            geometry: geometry.nativeImagePreviewPixelAligned(scale: scale)
         )
     }
 }

package/ios/NativeImagePreview/NativeImagePreviewMedia.swift

@@ -0,0 +1,28 @@
+import UIKit
+
+public enum NativeImagePreviewMediaItem {
+    case image(UIImage?)
+    case imageURL(URL, placeholder: UIImage?)
+    case video(url: URL, poster: URL?)
+}
+
+public protocol NativeImagePreviewDataSource: AnyObject {
+    func numberOfItems() -> Int
+    func item(at index: Int) -> NativeImagePreviewMediaItem
+}
+
+public final class NativeImagePreviewArrayDataSource: NativeImagePreviewDataSource {
+    private let items: [NativeImagePreviewMediaItem]
+
+    public init(items: [NativeImagePreviewMediaItem]) {
+        self.items = items
+    }
+
+    public func numberOfItems() -> Int {
+        items.count
+    }
+
+    public func item(at index: Int) -> NativeImagePreviewMediaItem {
+        items[index]
+    }
+}

package/ios/NativeImagePreview/NativeImagePreviewSourceViewRegistry.swift

@@ -0,0 +1,80 @@
+import UIKit
+
+final class NativeImagePreviewSourceViewRegistry {
+    static let shared = NativeImagePreviewSourceViewRegistry()
+
+    private final class WeakImageView {
+        weak var value: UIImageView?
+
+        init(_ value: UIImageView) {
+            self.value = value
+        }
+    }
+
+    private var anchors: [String: [Int: WeakImageView]] = [:]
+
+    private init() {}
+
+    func register(_ imageView: UIImageView, previewGroupId: String, index: Int) {
+        cleanup()
+        var previewGroupAnchors = anchors[previewGroupId] ?? [:]
+        previewGroupAnchors[index] = WeakImageView(imageView)
+        anchors[previewGroupId] = previewGroupAnchors
+    }
+
+    func unregister(_ imageView: UIImageView, previewGroupId: String?, index: Int?) {
+        cleanup()
+        if let previewGroupId = previewGroupId {
+            remove(imageView, from: previewGroupId, index: index)
+        } else {
+            for previewGroupId in Array(anchors.keys) {
+                remove(imageView, from: previewGroupId, index: nil)
+            }
+        }
+        cleanup()
+    }
+
+    func sourceView(for previewGroupId: String, index: Int) -> UIImageView? {
+        cleanup()
+        guard
+            let imageView = anchors[previewGroupId]?[index]?.value,
+            let window = imageView.window,
+            !imageView.isHidden
+        else {
+            return nil
+        }
+
+        let frameInWindow = imageView.frameInWindow()
+        guard !frameInWindow.isEmpty, frameInWindow.intersects(window.bounds) else {
+            return nil
+        }
+
+        return imageView
+    }
+
+    private func remove(_ imageView: UIImageView, from previewGroupId: String, index: Int?) {
+        guard var previewGroupAnchors = anchors[previewGroupId] else { return }
+
+        if let index = index {
+            if let registeredView = previewGroupAnchors[index]?.value, registeredView === imageView {
+                previewGroupAnchors.removeValue(forKey: index)
+            }
+        } else {
+            previewGroupAnchors = previewGroupAnchors.filter { _, weakImageView in
+                guard let registeredView = weakImageView.value else { return false }
+                return registeredView !== imageView
+            }
+        }
+
+        anchors[previewGroupId] = previewGroupAnchors.isEmpty ? nil : previewGroupAnchors
+    }
+
+    private func cleanup() {
+        anchors = anchors.compactMapValues { previewGroupAnchors in
+            let activeAnchors = previewGroupAnchors.filter { _, weakImageView in
+                weakImageView.value != nil
+            }
+            return activeAnchors.isEmpty ? nil : activeAnchors
+        }
+    }
+}

package/ios/{GalleryViewer/GaleriaVideoPlayerView.swift → NativeImagePreview/NativeImagePreviewVideoPlayerView.swift}

@@ -1,7 +1,7 @@
 import AVFoundation
 import UIKit
 
-final class GaleriaVideoPlayerView: UIView {
+final class NativeImagePreviewVideoPlayerView: UIView {
     private var player: AVPlayer?
     private var playerLayer: AVPlayerLayer?
     private var timeObserver: Any?

package/ios/{GalleryViewer/GaleriaViewerConfiguration.swift → NativeImagePreview/NativeImagePreviewViewerConfiguration.swift}

@@ -1,6 +1,6 @@
 import UIKit
 
-public enum GaleriaViewerTheme {
+public enum NativeImagePreviewViewerTheme {
     case light
     case dark
 
@@ -23,23 +23,23 @@ public enum GaleriaViewerTheme {
     }
 }
 
-public enum GaleriaViewerBarButton {
+public enum NativeImagePreviewViewerBarButton {
     case title(String, onTap: ((Int) -> Void)?)
     case icon(UIImage, onTap: ((Int) -> Void)?)
 }
 
-public struct GaleriaViewerConfiguration {
-    public var theme: GaleriaViewerTheme
+public struct NativeImagePreviewViewerConfiguration {
+    public var theme: NativeImagePreviewViewerTheme
     public var contentMode: UIView.ContentMode
     public var closeIcon: UIImage?
-    public var rightBarButton: GaleriaViewerBarButton?
+    public var rightBarButton: NativeImagePreviewViewerBarButton?
     public var onIndexChange: ((Int) -> Void)?
 
     public init(
-        theme: GaleriaViewerTheme = .light,
+        theme: NativeImagePreviewViewerTheme = .light,
         contentMode: UIView.ContentMode = .scaleAspectFit,
         closeIcon: UIImage? = nil,
-        rightBarButton: GaleriaViewerBarButton? = nil,
+        rightBarButton: NativeImagePreviewViewerBarButton? = nil,
         onIndexChange: ((Int) -> Void)? = nil
     ) {
         self.theme = theme