Update

Isaac · Isaac · commit bdca60c3d00a · 2025-09-30T20:54:54.000+08:00
diff --git a/submodules/Components/PagerComponent/Sources/PagerComponent.swift b/submodules/Components/PagerComponent/Sources/PagerComponent.swift
@@ -17,6 +17,10 @@ public protocol PagerContentViewWithBackground: UIView {
     func pagerUpdateBackground(backgroundFrame: CGRect, topPanelHeight: CGFloat, externalTintMaskContainer: UIView?, transition: ComponentTransition)
 }
 
+public protocol PagerTopPanelView: UIView {
+    var tintContentMask: UIView { get }
+}
+
 public final class PagerComponentChildEnvironment: Equatable {
     public struct ContentScrollingUpdate {
         public var relativeOffset: CGFloat
@@ -671,19 +675,33 @@ public final class PagerComponent<ChildEnvironmentType: Equatable, TopPanelEnvir
                     topPanelOffset = topPanelSize.height
                 }
                 
+                if let topPanelView = topPanelView.componentView as? PagerTopPanelView {
+                    if let externalTintMaskContainer = component.externalTintMaskContainer, topPanelView.tintContentMask.superview == nil {
+                        externalTintMaskContainer.addSubview(topPanelView.tintContentMask)
+                    }
+                }
+                
                 if component.externalTopPanelContainer != nil {
                     var visibleTopPanelHeight = max(0.0, topPanelSize.height - topPanelOffset)
                     if case .hide = component.panelHideBehavior {
                         visibleTopPanelHeight = 0.0
                     } else if case .disable = component.panelHideBehavior {
                         visibleTopPanelHeight = 0.0
                     }
-                    panelStateTransition.setFrame(view: topPanelView, frame: CGRect(origin: CGPoint(), size: CGSize(width: topPanelSize.width, height: visibleTopPanelHeight)))
+                    let topPanelFrame = CGRect(origin: CGPoint(), size: CGSize(width: topPanelSize.width, height: visibleTopPanelHeight))
+                    panelStateTransition.setFrame(view: topPanelView, frame: topPanelFrame)
+                    if let topPanelView = topPanelView.componentView as? PagerTopPanelView {
+                        panelStateTransition.setFrame(view: topPanelView.tintContentMask, frame: topPanelFrame)
+                    }
                     
                     panelStateTransition.setFrame(view: self.contentClippingView, frame: CGRect(origin: .zero, size: contentSize))
                     panelStateTransition.setBounds(view: self.contentClippingView, bounds: CGRect(origin: .zero, size: contentSize))
                 } else {
-                    panelStateTransition.setFrame(view: topPanelView, frame: CGRect(origin: CGPoint(x: 0.0, y: -topPanelOffset), size: topPanelSize))
+                    let topPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: -topPanelOffset), size: topPanelSize)
+                    panelStateTransition.setFrame(view: topPanelView, frame: topPanelFrame)
+                    if let topPanelView = topPanelView.componentView as? PagerTopPanelView {
+                        panelStateTransition.setFrame(view: topPanelView.tintContentMask, frame: topPanelFrame)
+                    }
                     
                     let clippingOffset: CGFloat = component.clipContentToTopPanel ? topPanelSize.height - topPanelOffset : 0.0
                     panelStateTransition.setFrame(view: self.contentClippingView, frame: CGRect(origin: CGPoint(x: 0.0, y: clippingOffset), size: contentSize))
diff --git a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/AccessoryItemIconButton.swift b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/AccessoryItemIconButton.swift
@@ -88,13 +88,9 @@ final class AccessoryItemIconButton: HighlightTrackingButton, GlassBackgroundVie
         }
         
         self.iconImageView.image = image
-        if #available(iOS 26.0, *) {
-            self.iconImageView.tintColor = theme.chat.inputPanel.inputControlColor.withAlphaComponent(1.0)
-            self.iconImageView.alpha = alpha * theme.chat.inputPanel.inputControlColor.alpha
-        } else {
-            self.iconImageView.tintColor = theme.chat.inputPanel.inputControlColor
-            self.iconImageView.alpha = alpha
-        }
+        self.iconImageView.tintColor = theme.chat.inputPanel.inputControlColor.withAlphaComponent(1.0)
+        self.iconImageView.alpha = alpha * theme.chat.inputPanel.inputControlColor.alpha
+        self.iconImageView.tintMask.alpha = alpha * theme.chat.inputPanel.inputControlColor.alpha
         
         self.accessibilityLabel = accessibilityLabel
         
@@ -134,13 +130,8 @@ final class AccessoryItemIconButton: HighlightTrackingButton, GlassBackgroundVie
         }
         
         self.iconImageView.image = image
-        if #available(iOS 26.0, *) {
-            self.iconImageView.tintColor = theme.chat.inputPanel.inputControlColor.withAlphaComponent(1.0)
-            self.iconImageView.alpha = alpha * theme.chat.inputPanel.inputControlColor.alpha
-        } else {
-            self.iconImageView.tintColor = theme.chat.inputPanel.inputControlColor
-            self.iconImageView.alpha = alpha
-        }
+        self.iconImageView.tintColor = theme.chat.inputPanel.inputControlColor.withAlphaComponent(1.0)
+        self.iconImageView.alpha = alpha * theme.chat.inputPanel.inputControlColor.alpha
         
         self.accessibilityLabel = accessibilityLabel
     }
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/BUILD b/submodules/TelegramUI/Components/EntityKeyboard/BUILD
@@ -52,6 +52,7 @@ swift_library(
         "//submodules/TelegramCore/FlatSerialization",
         "//submodules/TelegramUI/Components/BatchVideoRendering",
         "//submodules/TelegramUI/Components/GifVideoLayer",
+        "//submodules/TelegramUI/Components/GlassBackgroundComponent",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardTopContainerPanelComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardTopContainerPanelComponent.swift
@@ -72,11 +72,12 @@ final class EntityKeyboardTopContainerPanelComponent: Component {
     
     private final class PanelView {
         let view = ComponentHostView<EntityKeyboardTopContainerPanelEnvironment>()
+        let tintContentView = UIView()
         let visibilityFractionUpdated = ActionSlot<(CGFloat, ComponentTransition)>()
         var isExpanded: Bool = false
     }
     
-    final class View: UIView {
+    final class View: UIView, PagerTopPanelView {
         private var backgroundView: BlurredBackgroundView?
         private var backgroundSeparatorView: UIView?
         
@@ -88,7 +89,11 @@ final class EntityKeyboardTopContainerPanelComponent: Component {
         
         private var visibilityFraction: CGFloat = 1.0
         
+        public let tintContentMask: UIView
+        
         override init(frame: CGRect) {
+            self.tintContentMask = UIView()
+            
             super.init(frame: frame)
             
             self.disablesInteractiveKeyboardGestureRecognizer = true
@@ -150,6 +155,7 @@ final class EntityKeyboardTopContainerPanelComponent: Component {
                             panelView = PanelView()
                             self.panelViews[panel.id] = panelView
                             self.addSubview(panelView.view)
+                            self.tintContentMask.addSubview(panelView.tintContentView)
                         }
                         
                         let panelId = panel.id
@@ -172,12 +178,20 @@ final class EntityKeyboardTopContainerPanelComponent: Component {
                         )
                         if isInBounds {
                             transition.animatePosition(view: panelView.view, from: CGPoint(x: transitionOffsetFraction * availableSize.width, y: 0.0), to: CGPoint(), additive: true, completion: nil)
+                            transition.animatePosition(view: panelView.tintContentView, from: CGPoint(x: transitionOffsetFraction * availableSize.width, y: 0.0), to: CGPoint(), additive: true, completion: nil)
                         }
                         panelTransition.setFrame(view: panelView.view, frame: panelFrame, completion: { [weak self] completed in
                             if isPartOfTransition && completed {
                                 self?.state?.updated(transition: .immediate)
                             }
                         })
+                        panelTransition.setFrame(view: panelView.tintContentView, frame: panelFrame)
+                        if let panelViewImpl = panelView.view.componentView as? PagerTopPanelView {
+                            if panelViewImpl.tintContentMask.superview == nil {
+                                panelView.tintContentView.addSubview(panelViewImpl.tintContentMask)
+                            }
+                            panelTransition.setFrame(view: panelViewImpl.tintContentMask, frame: CGRect(origin: CGPoint(), size: panelFrame.size))
+                        }
                     }
                 }
             }
@@ -186,6 +200,7 @@ final class EntityKeyboardTopContainerPanelComponent: Component {
                 if !validPanelIds.contains(id) {
                     removedPanelIds.append(id)
                     panelView.view.removeFromSuperview()
+                    panelView.tintContentView.removeFromSuperview()
                 }
             }
             for id in removedPanelIds {
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardTopPanelComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardTopPanelComponent.swift
diff --git a/submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift b/submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,12 @@ final class EntityKeyboardTopContainerPanelComponent: Component {`
`72`	`72`
`73`	`73`	`private final class PanelView {`
`74`	`74`	`let view = ComponentHostView<EntityKeyboardTopContainerPanelEnvironment>()`
	`75`	`+ let tintContentView = UIView()`
`75`	`76`	`let visibilityFractionUpdated = ActionSlot<(CGFloat, ComponentTransition)>()`
`76`	`77`	`var isExpanded: Bool = false`
`77`	`78`	`}`
`78`	`79`
`79`		`- final class View: UIView {`
	`80`	`+ final class View: UIView, PagerTopPanelView {`
`80`	`81`	`private var backgroundView: BlurredBackgroundView?`
`81`	`82`	`private var backgroundSeparatorView: UIView?`
`82`	`83`
`@@ -88,7 +89,11 @@ final class EntityKeyboardTopContainerPanelComponent: Component {`
`88`	`89`
`89`	`90`	`private var visibilityFraction: CGFloat = 1.0`
`90`	`91`
	`92`	`+ public let tintContentMask: UIView`
	`93`	`+`
`91`	`94`	`override init(frame: CGRect) {`
	`95`	`+ self.tintContentMask = UIView()`
	`96`	`+`
`92`	`97`	`super.init(frame: frame)`
`93`	`98`
`94`	`99`	`self.disablesInteractiveKeyboardGestureRecognizer = true`
`@@ -150,6 +155,7 @@ final class EntityKeyboardTopContainerPanelComponent: Component {`
`150`	`155`	`panelView = PanelView()`
`151`	`156`	`self.panelViews[panel.id] = panelView`
`152`	`157`	`self.addSubview(panelView.view)`
	`158`	`+ self.tintContentMask.addSubview(panelView.tintContentView)`
`153`	`159`	`}`
`154`	`160`
`155`	`161`	`let panelId = panel.id`
`@@ -172,12 +178,20 @@ final class EntityKeyboardTopContainerPanelComponent: Component {`
`172`	`178`	`)`
`173`	`179`	`if isInBounds {`
`174`	`180`	`transition.animatePosition(view: panelView.view, from: CGPoint(x: transitionOffsetFraction * availableSize.width, y: 0.0), to: CGPoint(), additive: true, completion: nil)`
	`181`	`+ transition.animatePosition(view: panelView.tintContentView, from: CGPoint(x: transitionOffsetFraction * availableSize.width, y: 0.0), to: CGPoint(), additive: true, completion: nil)`
`175`	`182`	`}`
`176`	`183`	`panelTransition.setFrame(view: panelView.view, frame: panelFrame, completion: { [weak self] completed in`
`177`	`184`	`if isPartOfTransition && completed {`
`178`	`185`	`self?.state?.updated(transition: .immediate)`
`179`	`186`	`}`
`180`	`187`	`})`
	`188`	`+ panelTransition.setFrame(view: panelView.tintContentView, frame: panelFrame)`
	`189`	`+ if let panelViewImpl = panelView.view.componentView as? PagerTopPanelView {`
	`190`	`+ if panelViewImpl.tintContentMask.superview == nil {`
	`191`	`+ panelView.tintContentView.addSubview(panelViewImpl.tintContentMask)`
	`192`	`+ }`
	`193`	`+ panelTransition.setFrame(view: panelViewImpl.tintContentMask, frame: CGRect(origin: CGPoint(), size: panelFrame.size))`
	`194`	`+ }`
`181`	`195`	`}`
`182`	`196`	`}`
`183`	`197`	`}`
`@@ -186,6 +200,7 @@ final class EntityKeyboardTopContainerPanelComponent: Component {`
`186`	`200`	`if !validPanelIds.contains(id) {`
`187`	`201`	`removedPanelIds.append(id)`
`188`	`202`	`panelView.view.removeFromSuperview()`
	`203`	`+ panelView.tintContentView.removeFromSuperview()`
`189`	`204`	`}`
`190`	`205`	`}`
`191`	`206`	`for id in removedPanelIds {`