ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-04-17 15:01:36 +04:00
parent 69fda4b94e
commit ff2dad403c
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
submodules/WebUI/Sources/WebAppController.swift
View File

@@ -30,6 +30,7 @@ public struct WebAppParameters {
let buttonText: String?
let keepAliveSignal: Signal<Never, KeepWebViewError>?
let fromMenu: Bool
let isSimple: Bool
public init(
peerId: PeerId,
@@ -40,7 +41,8 @@ public struct WebAppParameters {
payload: String?,
buttonText: String?,
keepAliveSignal: Signal<Never, KeepWebViewError>?,
fromMenu: Bool
fromMenu: Bool,
isSimple: Bool
) {
self.peerId = peerId
self.botId = botId
@@ -51,6 +53,7 @@ public struct WebAppParameters {
self.buttonText = buttonText
self.keepAliveSignal = keepAliveSignal
self.fromMenu = fromMenu
self.isSimple = isSimple
}
}
@@ -96,6 +99,11 @@ public final class WebAppController: ViewController, AttachmentContainable {
private var iconDisposable: Disposable?
private var keepAliveDisposable: Disposable?
private var didTransitionIn = false
private var dismissed = false
private var validLayout: (ContainerViewLayout, CGFloat)?
init(context: AccountContext, controller: WebAppController, present: @escaping (ViewController, Any?) -> Void) {
self.context = context
self.controller = controller
@@ -306,8 +314,6 @@ public final class WebAppController: ViewController, AttachmentContainable {
return nil
}
var didTransitionIn = false
private func animateTransitionIn() {
guard !self.didTransitionIn, let webView = self.webView else {
return
@@ -355,7 +361,6 @@ public final class WebAppController: ViewController, AttachmentContainable {
}
}
private var validLayout: (ContainerViewLayout, CGFloat)?
func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
let previousLayout = self.validLayout?.0
self.validLayout = (layout, navigationBarHeight)
@@ -420,10 +425,12 @@ public final class WebAppController: ViewController, AttachmentContainable {
private var delayedScriptMessage: WKScriptMessage?
private func handleScriptMessage(_ message: WKScriptMessage) {
guard let controller = self.controller else {
return
}
guard let body = message.body as? [String: Any] else {
return
}
guard let eventName = body["eventName"] as? String else {
return
}
@@ -432,7 +439,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
case "web_app_ready":
self.animateTransitionIn()
case "web_app_data_send":
if let eventData = body["eventData"] as? String {
if controller.isSimple, let eventData = body["eventData"] as? String {
self.handleSendData(data: eventData)
}
case "web_app_setup_main_button":
@@ -471,7 +478,6 @@ public final class WebAppController: ViewController, AttachmentContainable {
}
}
private var dismissed = false
private func handleSendData(data string: String) {
guard let controller = self.controller, let buttonText = controller.buttonText, !self.dismissed else {
return
@@ -536,6 +542,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
private let payload: String?
private let buttonText: String?
private let fromMenu: Bool
private let isSimple: Bool
private let keepAliveSignal: Signal<Never, KeepWebViewError>?
private let replyToMessageId: MessageId?
@@ -556,6 +563,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
self.payload = params.payload
self.buttonText = params.buttonText
self.fromMenu = params.fromMenu
self.isSimple = params.isSimple
self.keepAliveSignal = params.keepAliveSignal
self.replyToMessageId = replyToMessageId