Version 1.4.4

webim · webim · commit b99696e58ac6 · 2025-09-04T16:53:12.000+03:00
diff --git a/Sources/WebimMobileWidget/Assets/XibFiles/ChatViewController/ChatViewController/Cells/WMNilTableViewCell/Base.lproj/WMNilTableViewCell.xib b/Sources/WebimMobileWidget/Assets/XibFiles/ChatViewController/ChatViewController/Cells/WMNilTableViewCell/Base.lproj/WMNilTableViewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,15 +15,11 @@
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="kCB-bj-UQ1" id="2ri-Qc-O3O">
                 <rect key="frame" x="0.0" y="0.0" width="414" height="1.1920928955078125e-07"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                <constraints>
-                    <constraint firstAttribute="height" constant="1" id="dED-Me-tIA"/>
-                </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="2ri-Qc-O3O" secondAttribute="trailing" id="48X-3g-kZa"/>
                 <constraint firstItem="2ri-Qc-O3O" firstAttribute="top" secondItem="kCB-bj-UQ1" secondAttribute="top" id="4eM-8t-gcY"/>
-                <constraint firstAttribute="bottom" secondItem="2ri-Qc-O3O" secondAttribute="bottom" constant="-0.99999988079071045" id="Lc3-6d-CJ8"/>
                 <constraint firstItem="2ri-Qc-O3O" firstAttribute="leading" secondItem="kCB-bj-UQ1" secondAttribute="leading" id="t9O-Ba-Z3e"/>
             </constraints>
             <point key="canvasLocation" x="52.173913043478265" y="-18.415178571428569"/>
diff --git a/Sources/WebimMobileWidget/Classes/SDK Files/ViewControllers/ChatViewController/ChatViewController/Cells/WMBotButtonsTableViewCell/WMBotButtonsTableViewCell.swift b/Sources/WebimMobileWidget/Classes/SDK Files/ViewControllers/ChatViewController/ChatViewController/Cells/WMBotButtonsTableViewCell/WMBotButtonsTableViewCell.swift
@@ -122,7 +122,6 @@ class WMBotButtonsTableViewCell: WMMessageTableCell {
                 /// button text insets
                 titleLabel.snp.remakeConstraints { make in
                     make.top.equalToSuperview().inset(10)
-                    make.height.greaterThanOrEqualTo(18)
                     make.width.lessThanOrEqualToSuperview().inset(10)
                 }
                 
diff --git a/Sources/WebimMobileWidget/Classes/SDK Files/ViewControllers/ChatViewController/ChatViewController/ChatViewController+Setup.swift b/Sources/WebimMobileWidget/Classes/SDK Files/ViewControllers/ChatViewController/ChatViewController/ChatViewController+Setup.swift
@@ -219,7 +219,7 @@ extension ChatViewController {
         let attributes = [NSAttributedString.Key.foregroundColor: refreshControlTextColour]
         refreshControl.addTarget(
             self,
-            action: #selector(requestMessages),
+            action: #selector(refreshMessages),
             for: .valueChanged
         )
         refreshControl.attributedTitle = NSAttributedString(
diff --git a/Sources/WebimMobileWidget/Classes/SDK Files/ViewControllers/ChatViewController/ChatViewController/ChatViewController.swift b/Sources/WebimMobileWidget/Classes/SDK Files/ViewControllers/ChatViewController/ChatViewController/ChatViewController.swift
@@ -212,18 +212,22 @@ class ChatViewController: UIViewController {
     }
 
     @objc
-    func requestMessages() {
+    func refreshMessages() {
+        requestMessages()
+    }
+    
+    func requestMessages(_ completionHandler: (() -> Void)? = nil) {
         let chatConfig = chatConfig as? WMChatViewControllerConfig
         WebimServiceController.currentSession.getNextMessages(messagesCount: chatConfig?.requestMessagesCount) { [weak self] messages in
             self?.chatMessagesQueue.async(flags: .barrier) {
                 self?.chatMessages.insert(contentsOf: messages, at: 0)
                 self?.messageCounter.increaseLastReadMessageIndex(with: messages.count)
-                
             }
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 self?.updateThreadListAndReloadTable()
                 self?.chatTableView.refreshControl?.endRefreshing()
+                completionHandler?()
             }
         }
     }
@@ -594,16 +598,19 @@ class ChatViewController: UIViewController {
             self.chatMessagesQueue.async(flags: .barrier) {
                 self.chatMessages.insert(contentsOf: messages, at: 0)
                 DispatchQueue.main.async {
-                    if messages.count < WebimService.ChatSettings.messagesPerRequest.rawValue {
-                        self.requestMessages()
+                    self.becomeFirstResponder()
+                    if messages.count < 50 {
+                        self.requestMessages { [weak self] in
+                            self?.scrollToBottom(animated: true)
+                        }
+                    } else {
+                        self.updateThreadListAndReloadTable { [weak self] in
+                            self?.scrollToBottom(animated: true)
+                        }
                     }
                 }
             }
-            DispatchQueue.main.async {
-                self.becomeFirstResponder()
-                self.updateThreadListAndReloadTable()
-                self.scrollToBottom(animated: true)
-            }
+            
         }
     }
 
diff --git a/WebimMobileWidget.podspec b/WebimMobileWidget.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'WebimMobileWidget'
-  s.version          = '1.4.3'
+  s.version          = '1.4.4'
   s.summary          = 'Webim.ru mobile UI for client SDK iOS.'
 
   s.homepage         = 'https://webim.ru/integration/mobile-sdk/ios-sdk-howto/'

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,6 @@ class WMBotButtonsTableViewCell: WMMessageTableCell {`
`122`	`122`	`/// button text insets`
`123`	`123`	`titleLabel.snp.remakeConstraints { make in`
`124`	`124`	`make.top.equalToSuperview().inset(10)`
`125`		`- make.height.greaterThanOrEqualTo(18)`
`126`	`125`	`make.width.lessThanOrEqualToSuperview().inset(10)`
`127`	`126`	`}`
`128`	`127`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ extension ChatViewController {`
`219`	`219`	`let attributes = [NSAttributedString.Key.foregroundColor: refreshControlTextColour]`
`220`	`220`	`refreshControl.addTarget(`
`221`	`221`	`self,`
`222`		`- action: #selector(requestMessages),`
	`222`	`+ action: #selector(refreshMessages),`
`223`	`223`	`for: .valueChanged`
`224`	`224`	`)`
`225`	`225`	`refreshControl.attributedTitle = NSAttributedString(`
Original file line number	Diff line number	Diff line change
`@@ -212,18 +212,22 @@ class ChatViewController: UIViewController {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`@objc`
`215`		`- func requestMessages() {`
	`215`	`+ func refreshMessages() {`
	`216`	`+ requestMessages()`
	`217`	`+ }`
	`218`	`+`
	`219`	`+ func requestMessages(_ completionHandler: (() -> Void)? = nil) {`
`216`	`220`	`let chatConfig = chatConfig as? WMChatViewControllerConfig`
`217`	`221`	`WebimServiceController.currentSession.getNextMessages(messagesCount: chatConfig?.requestMessagesCount) { [weak self] messages in`
`218`	`222`	`self?.chatMessagesQueue.async(flags: .barrier) {`
`219`	`223`	`self?.chatMessages.insert(contentsOf: messages, at: 0)`
`220`	`224`	`self?.messageCounter.increaseLastReadMessageIndex(with: messages.count)`
`221`		`-`
`222`	`225`	`}`
`223`	`226`
`224`	`227`	`DispatchQueue.main.asyncAfter(deadline: .now() + 1) {`
`225`	`228`	`self?.updateThreadListAndReloadTable()`
`226`	`229`	`self?.chatTableView.refreshControl?.endRefreshing()`
	`230`	`+ completionHandler?()`
`227`	`231`	`}`
`228`	`232`	`}`
`229`	`233`	`}`
`@@ -594,16 +598,19 @@ class ChatViewController: UIViewController {`
`594`	`598`	`self.chatMessagesQueue.async(flags: .barrier) {`
`595`	`599`	`self.chatMessages.insert(contentsOf: messages, at: 0)`
`596`	`600`	`DispatchQueue.main.async {`
`597`		`- if messages.count < WebimService.ChatSettings.messagesPerRequest.rawValue {`
`598`		`- self.requestMessages()`
	`601`	`+ self.becomeFirstResponder()`
	`602`	`+ if messages.count < 50 {`
	`603`	`+ self.requestMessages { [weak self] in`
	`604`	`+ self?.scrollToBottom(animated: true)`
	`605`	`+ }`
	`606`	`+ } else {`
	`607`	`+ self.updateThreadListAndReloadTable { [weak self] in`
	`608`	`+ self?.scrollToBottom(animated: true)`
	`609`	`+ }`
`599`	`610`	`}`
`600`	`611`	`}`
`601`	`612`	`}`
`602`		`- DispatchQueue.main.async {`
`603`		`- self.becomeFirstResponder()`
`604`		`- self.updateThreadListAndReloadTable()`
`605`		`- self.scrollToBottom(animated: true)`
`606`		`- }`
	`613`	`+`
`607`	`614`	`}`
`608`	`615`	`}`
`609`	`616`