Rename TargetElementInfo to TargetElement

Author: grighakobian

Sources/Navigator/EPUB/Assets/Static/scripts/readium-fixed.js

@@ -1129,13 +1129,8 @@ extension EPUBNavigatorViewController: EPUBSpreadViewDelegate {
         Task {
             var event = event
             event.location = view.convert(event.location, from: spreadView)
-            if let info = event.targetElementInfo {
-                event.targetElementInfo = PointerEvent.TargetElementInfo(
-                    tag: info.tag,
-                    src: info.src,
-                    alt: info.alt,
-                    frame: view.convert(info.frame, from: spreadView)
-                )
+            if let frame = event.targetElement?.frame {
+                event.targetElement?.frame = view.convert(frame, from: spreadView)
             }
             _ = await inputObservers.didReceive(event)
         }

Sources/Navigator/EPUB/Assets/Static/scripts/readium-reflowable.js

@@ -241,21 +241,16 @@ class EPUBSpreadView: UIView, Loggable, PageView {
 
         event.location = convertPointToNavigatorSpace(event.location)
 
-        if var info = PointerEvent.TargetElementInfo(json: json["targetElementInfo"]) {
+        if var targetElement = PointerEvent.TargetElement(json: json["targetElement"]) {
             // The src from JS is a fully-resolved readium:// URL.
             // Relativize it against the publication base URL to get a
             // publication-relative href usable with Publication.get().
-            let relativeSrc: String? = info.src.flatMap { src in
+            targetElement.src = targetElement.src.flatMap { src in
                 guard let srcURL = URL(string: src) else { return src }
                 return viewModel.publicationBaseURL.relativize(srcURL)?.string ?? src
             }
-            info = PointerEvent.TargetElementInfo(
-                tag: info.tag,
-                src: relativeSrc,
-                alt: info.alt,
-                frame: convertRectToNavigatorSpace(info.frame)
-            )
-            event.targetElementInfo = info
+            targetElement.frame = convertRectToNavigatorSpace(targetElement.frame)
+            event.targetElement = targetElement
         }
 
         delegate?.spreadView(self, didReceive: event)
@@ -726,8 +721,8 @@ private extension PointerEvent {
     }
 }
 
-/// Produced by gestures.js `extractTargetElementInfo`
-extension PointerEvent.TargetElementInfo {
+/// Produced by gestures.js `extractTargetElement`
+extension PointerEvent.TargetElement {
     init?(json: Any?) {
         guard
             let dict = json as? [String: Any],

Sources/Navigator/EPUB/EPUBNavigatorViewController.swift

@@ -82,9 +82,8 @@ function onPointerEvent(phase, event) {
     x: point.x,
     y: point.y,
     buttons: event.buttons,
-    targetElement: event.target.outerHTML,
     interactiveElement: findNearestInteractiveElement(event.target),
-    targetElementInfo: extractTargetElementInfo(event.target),
+    targetElement: extractTargetElement(event.target),
     option: event.altKey,
     control: event.ctrlKey,
     shift: event.shiftKey,
@@ -109,8 +108,8 @@ function onPointerEvent(phase, event) {
 ///
 /// Returns an object with the element's bounding rectangle, tag name, and
 /// media source URL if available. This information is used on the Swift side
-/// to build a `TargetElementInfo`.
-function extractTargetElementInfo(element) {
+/// to build a `TargetElement`.
+function extractTargetElement(element) {
   if (!element || !element.getBoundingClientRect) {
     return null;
   }

Sources/Navigator/EPUB/EPUBSpreadView.swift

@@ -24,22 +24,22 @@ public struct PointerEvent: Equatable {
     ///
     /// This is typically provided by the EPUB navigator's JavaScript bridge
     /// when the pointer is over a media element (img, svg, video, etc.).
-    public var targetElementInfo: TargetElementInfo?
+    public var targetElement: TargetElement?
 
     /// Metadata about the DOM element under a pointer event, extracted from
     /// the JavaScript layer.
-    public struct TargetElementInfo: Equatable {
+    public struct TargetElement: Equatable {
         /// Tag name of the element (e.g. "img", "svg").
-        public let tag: String
+        public var tag: String
 
         /// Source URL of the media element, if available.
-        public let src: String?
+        public var src: String?
 
         /// Alt text of the element, if available.
-        public let alt: String?
+        public var alt: String?
 
         /// Frame of the element relative to the navigator's view.
-        public let frame: CGRect
+        public var frame: CGRect
 
         public init(tag: String, src: String?, alt: String? = nil, frame: CGRect) {
             self.tag = tag

Sources/Navigator/EPUB/Scripts/src/gestures.js

@@ -27,7 +27,6 @@ final class ImagePreviewNavigationController: UINavigationController {
 // MARK: - ImagePreviewTransitioning
 
 extension ImagePreviewNavigationController: ImagePreviewTransitioning {
-
     func prepareForTransition(isPresenting: Bool) {
         (topViewController as? ImagePreviewTransitioning)?
             .prepareForTransition(isPresenting: isPresenting)

Sources/Navigator/Input/Pointer/PointerEvent.swift

@@ -89,7 +89,7 @@ class VisualReaderViewController<N: UIViewController & Navigator>: ReaderViewCon
         navigator.addObserver(.tap { [weak self] event in
             guard
                 let self,
-                let info = event.targetElementInfo,
+                let info = event.targetElement,
                 info.src != nil
             else {
                 return false
@@ -215,7 +215,7 @@ class VisualReaderViewController<N: UIViewController & Navigator>: ReaderViewCon
 
     // MARK: - VisualNavigatorDelegate
 
-    private func presentImagePreview(elementInfo info: PointerEvent.TargetElementInfo) {
+    private func presentImagePreview(elementInfo info: PointerEvent.TargetElement) {
         guard let src = info.src else { return }
         let link = Link(href: src)
         // Convert the element frame from the navigator's coordinate space to