Fix saved tag click in separate window messages.

Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp

@@ -3000,7 +3000,7 @@ void InnerWidget::searchInChat(
 				reactions->myTagsValue(sublist),
 				tags);
 
-			_searchTags->selectedValue(
+			_searchTags->selectedChanges(
 			) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
 				_searchTagsSelected = std::move(list);
 			}, _searchTags->lifetime());
@@ -3055,11 +3055,11 @@ void InnerWidget::searchInChat(
 		_searchInChat || !_filter.isEmpty());
 }
 
-auto InnerWidget::searchTagsValue() const
+auto InnerWidget::searchTagsChanges() const
 -> rpl::producer<std::vector<Data::ReactionId>> {
 	return _searchTags
-		? _searchTags->selectedValue()
+		? _searchTags->selectedChanges()
-		: rpl::single(std::vector<Data::ReactionId>());
+		: rpl::never<std::vector<Data::ReactionId>>();
 }
 
 void InnerWidget::refreshSearchInChatLabel() {

Telegram/SourceFiles/dialogs/dialogs_inner_widget.h

@@ -143,7 +143,7 @@ public:
 		Key key,
 		PeerData *from,
 		std::vector<Data::ReactionId> tags);
-	[[nodiscard]] auto searchTagsValue() const
+	[[nodiscard]] auto searchTagsChanges() const
 		-> rpl::producer<std::vector<Data::ReactionId>>;
 
 	void applyFilterUpdate(QString newFilter, bool force = false);

Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp

@@ -271,7 +271,7 @@ ClickHandlerPtr SearchTags::lookupHandler(QPoint point) const {
 	return nullptr;
 }
 
-auto SearchTags::selectedValue() const
+auto SearchTags::selectedChanges() const
 -> rpl::producer<std::vector<Data::ReactionId>> {
 	return _selectedChanges.events() | rpl::map([=] {
 		return collectSelected();

Telegram/SourceFiles/dialogs/dialogs_search_tags.h

@@ -37,7 +37,7 @@ public:
 	[[nodiscard]] rpl::producer<> repaintRequests() const;
 
 	[[nodiscard]] ClickHandlerPtr lookupHandler(QPoint point) const;
-	[[nodiscard]] auto selectedValue() const
+	[[nodiscard]] auto selectedChanges() const
 		-> rpl::producer<std::vector<Data::ReactionId>>;
 
 	void paint(

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -2666,7 +2666,7 @@ bool Widget::setSearchInChat(
 	}
 	_searchTags = std::move(tags);
 	_inner->searchInChat(_searchInChat, _searchFromAuthor, _searchTags);
-	_searchTagsLifetime = _inner->searchTagsValue(
+	_searchTagsLifetime = _inner->searchTagsChanges(
 	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
 		if (_searchTags != list) {
 			clearSearchCache();

Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp

@@ -287,10 +287,8 @@ protected:
 
 private:
 	void clearItems();
-	void setupTags(
+	void refreshTags();
-		not_null<Window::SessionController*> window,
+	void updateSize();
-		not_null<History*> history,
-		PeerData *from);
 	void requestSearch(bool cache = true);
 	void requestSearchDelayed();
 
@@ -299,6 +297,8 @@ private:
 	base::unique_qptr<Ui::MultiSelect> _select;
 	std::unique_ptr<Dialogs::SearchTags> _searchTags;
 
+	const not_null<Window::SessionController*> _window;
+	const not_null<History*> _history;
 	rpl::variable<PeerData*> _from = nullptr;
 
 	base::Timer _searchTimer;
@@ -325,15 +325,16 @@ TopBar::TopBar(
 	st::searchInChatMultiSelect,
 	tr::lng_dlg_filter(),
 	_searchTagsSelected.empty() ? query : QString()))
+, _window(window)
+, _history(history)
 , _searchTimer([=] { requestSearch(); }) {
-	setupTags(window, history, from);
+	refreshTags();
 
-	rpl::combine(
-		parent->geometryValue(),
-		_searchTags ? _searchTags->heightValue() : rpl::single(0)
-	) | rpl::start_with_next([=](const QRect &r, int tagsHeight) {
 	moveToLeft(0, 0);
-		resize(r.width(), st::topBarHeight + tagsHeight);
+
+	parent->geometryValue(
+	) | rpl::start_with_next([=] {
+		updateSize();
 	}, lifetime());
 
 	sizeValue(
@@ -387,9 +388,23 @@ void TopBar::setInnerFocus() {
 	_select->setInnerFocus();
 }
 
+void TopBar::updateSize() {
+	const auto height = st::topBarHeight
+		+ (_searchTags ? _searchTags->height() : 0);
+	resize(parentWidget()->width(), height);
+}
+
 void TopBar::setQuery(const QString &query) {
+	if (auto tags = Data::SearchTagsFromQuery(query); !tags.empty()) {
+		if (_searchTagsSelected != tags) {
+			_searchTagsSelected = std::move(tags);
+			refreshTags();
+		}
+		_select->setQuery(QString());
+	} else {
 		_select->setQuery(query);
 	}
+}
 
 void TopBar::clearItems() {
 	_select->setItemRemovedCallback(nullptr);
@@ -404,32 +419,41 @@ void TopBar::clearItems() {
 	});
 }
 
-void TopBar::setupTags(
+void TopBar::refreshTags() {
-		not_null<Window::SessionController*> window,
+	if (!_history->peer->isSelf()) {
-		not_null<History*> history,
-		PeerData *from) {
-	if (!_searchTagsSelected.empty()) {
-		history = history->owner().history(history->session().user());
-	} else if (!history->peer->isSelf()) {
 		_searchTags = nullptr;
 		return;
 	}
-	const auto reactions = &history->owner().reactions();
+	const auto from = _from.current();
+	const auto reactions = &_history->owner().reactions();
 	const auto sublist = from
-		? history->owner().savedMessages().sublist(from).get()
+		? _history->owner().savedMessages().sublist(from).get()
 		: nullptr;
 	_searchTags = std::make_unique<Dialogs::SearchTags>(
-		&history->owner(),
+		&_history->owner(),
 		reactions->myTagsValue(sublist),
 		_searchTagsSelected);
+	_searchTags->heightValue(
+	) | rpl::start_with_next([=] {
+		updateSize();
+	}, _searchTags->lifetime());
 
-	_searchTags->selectedValue(
+	_searchTags->selectedChanges(
 	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
 		_searchTagsSelected = std::move(list);
 		requestSearch(false);
 	}, _searchTags->lifetime());
 
-	const auto parent = Ui::CreateChild<Ui::RpWidget>(this);
+	if (!_searchTagsSelected.empty()) {
+		crl::on_main(this, [=] {
+			requestSearch(false);
+		});
+	}
+
+	const auto parent = _searchTags->lifetime().make_state<Ui::RpWidget>(
+		this);
+	parent->show();
+
 	const auto padding = st::searchInChatTagsPadding;
 	const auto position = QPoint(padding.left(), padding.top());
 
@@ -478,7 +502,7 @@ void TopBar::setupTags(
 				ActivateClickHandler(parent, handler, ClickContext{
 					.button = mouse->button(),
 					.other = QVariant::fromValue(ClickHandlerContext{
-						.sessionWindow = window,
+						.sessionWindow = _window,
 					}),
 				});
 			}

Telegram/SourceFiles/mainwidget.cpp

@@ -727,6 +727,10 @@ void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 			_dialogs->setInnerFocus();
 		}
 	} else {
+		if (!Data::SearchTagsFromQuery(query).empty()) {
+			inChat = controller()->session().data().history(
+				controller()->session().user());
+		}
 		const auto searchIn = [&](not_null<Window::Controller*> window) {
 			if (const auto controller = window->sessionController()) {
 				controller->content()->searchMessages(query, inChat);