Various fixes

This commit is contained in:
Ilya Laktyushin 2023-08-10 23:54:37 +02:00
parent b1b908cc80
commit a06fcaf46e

View File

@ -792,6 +792,10 @@ public class StickerPickerScreen: ViewController {
func updateContent(_ content: StickerPickerInputData) { func updateContent(_ content: StickerPickerInputData) {
self.content = content self.content = content
guard let controller = self.controller else {
return
}
content.emoji.inputInteractionHolder.inputInteraction = EmojiPagerContentComponent.InputInteraction( content.emoji.inputInteractionHolder.inputInteraction = EmojiPagerContentComponent.InputInteraction(
performItemAction: { [weak self] groupId, item, _, _, _, _ in performItemAction: { [weak self] groupId, item, _, _, _, _ in
guard let strongSelf = self, let controller = strongSelf.controller else { guard let strongSelf = self, let controller = strongSelf.controller else {
@ -1209,13 +1213,13 @@ public class StickerPickerScreen: ViewController {
useOpaqueTheme: false, useOpaqueTheme: false,
hideBackground: true, hideBackground: true,
stateContext: nil, stateContext: nil,
addImage: { [weak self] in addImage: controller.hasGifs ? { [weak self] in
if let self { if let self {
self.controller?.completion(nil) self.controller?.completion(nil)
self.controller?.dismiss(animated: true) self.controller?.dismiss(animated: true)
self.controller?.presentGallery() self.controller?.presentGallery()
} }
} } : nil
) )
var stickerPeekBehavior: EmojiContentPeekBehaviorImpl? var stickerPeekBehavior: EmojiContentPeekBehaviorImpl?
@ -1473,17 +1477,17 @@ public class StickerPickerScreen: ViewController {
customLayout: nil, customLayout: nil,
externalBackground: nil, externalBackground: nil,
externalExpansionView: nil, externalExpansionView: nil,
customContentView: self.storyStickersContentView, customContentView: controller.hasGifs ? self.storyStickersContentView : nil,
useOpaqueTheme: false, useOpaqueTheme: false,
hideBackground: true, hideBackground: true,
stateContext: nil, stateContext: nil,
addImage: { [weak self] in addImage: controller.hasGifs ? { [weak self] in
if let self { if let self {
self.controller?.completion(nil) self.controller?.completion(nil)
self.controller?.dismiss(animated: true) self.controller?.dismiss(animated: true)
self.controller?.presentGallery() self.controller?.presentGallery()
} }
} } : nil
) )
if let (layout, navigationHeight) = self.currentLayout { if let (layout, navigationHeight) = self.currentLayout {