add onClose and onReplacementAction

bluesky-social · May 18, 2024 · 9be4231 · 9be4231
1 parent 7263777
commit 9be4231
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/modules/expo-bluesky-translate/ios/ExpoBlueskyTranslateModule.swift b/modules/expo-bluesky-translate/ios/ExpoBlueskyTranslateModule.swift
@@ -6,7 +6,8 @@ public class ExpoBlueskyTranslateModule: Module {
   public func definition() -> ModuleDefinition {
     Name("ExpoBlueskyTranslate")
     View(ExpoBlueskyTranslateView.self) {
-      Events("onEvent")
+      Events("onClose")
+      Events("onReplacementAction")
       Prop("text") { (view: ExpoBlueskyTranslateView, text: String) in
         view.props.text = text
       }

diff --git a/modules/expo-bluesky-translate/ios/ExpoBlueskyTranslateView.swift b/modules/expo-bluesky-translate/ios/ExpoBlueskyTranslateView.swift
@@ -3,26 +3,35 @@ import Foundation
 import SwiftUI
 
 class TranslateViewProps: ObservableObject {
-  @Published var text: String = ""
-  @Published var isPresented: Bool = false
-  @Published var children: [UIView]?
-  @Published var onEvent: EventDispatcher
-  init(onEvent: EventDispatcher) {
-    self.onEvent = onEvent
+  var text: String = ""
+  @Published var isPresented: Bool = false {
+    didSet {
+      if !isPresented {
+        self.onClose()
+      }
+    }
+  }
+  var children: [UIView]?
+  var onClose: EventDispatcher
+  var onReplacementAction: EventDispatcher
+  init(onClose: EventDispatcher, onReplacementAction: EventDispatcher) {
+    self.onClose = onClose
+    self.onReplacementAction = onReplacementAction
   }
 }
 
 class ExpoBlueskyTranslateView: ExpoView {
   let props: TranslateViewProps
-  let onEvent = EventDispatcher()
+  let onClose = EventDispatcher()
+  let onReplacementAction = EventDispatcher()
 
   override func didUpdateReactSubviews() {
     let subChildren = self.reactSubviews()
     props.children = subChildren
   }
 
   required init(appContext: AppContext? = nil) {
-    props = TranslateViewProps(onEvent: onEvent)
+    props = TranslateViewProps(onClose: onClose, onReplacementAction: onReplacementAction)
     let hostingController = UIHostingController(rootView: TranslateView(props: props))
     super.init(appContext: appContext)
     setupHostingController(hostingController)

diff --git a/modules/expo-bluesky-translate/ios/TranslateView.swift b/modules/expo-bluesky-translate/ios/TranslateView.swift
@@ -17,7 +17,9 @@ struct TranslateView: View {
       .translationPresentation(
         isPresented: $props.isPresented,
         text: props.text
-      )
+      ) { translation in
+        props.onReplacementAction(["text": translation])
+      }
     }
   }
 }

diff --git a/modules/expo-bluesky-translate/src/ExpoBlueskyTranslate.types.ts b/modules/expo-bluesky-translate/src/ExpoBlueskyTranslate.types.ts
@@ -4,4 +4,6 @@ export type ExpoBlueskyTranslateProps = {
   text: string
   isPresented?: boolean
   children: React.ReactNode
+  onClose?: () => void
+  onReplacementAction?: (event: {nativeEvent: {text: string}}) => void
 }
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
@@ -645,13 +645,17 @@ function ExpandedPostDetails({
       openLink(translatorUrl)
     }
   }, [openLink, translatorUrl])
+
   return (
     <View style={[s.flexRow, s.mt2, s.mb10]}>
       <Text style={pal.textLight}>{niceDate(post.indexedAt)}</Text>
       {needsTranslation && (
         <>
           <Text style={pal.textLight}> &middot; </Text>
-          <ExpoBlueskyTranslateView text={text} isPresented={presented}>
+          <ExpoBlueskyTranslateView
+            text={text}
+            isPresented={presented}
+            onClose={() => setPresented(false)}>
             <Text
               style={pal.link}
               title={_(msg`Translate`)}