SHA256
Исправить мелкие баги дизайна UI
This commit is contained in:
@@ -11,6 +11,7 @@ import {
|
||||
import { renderUserAvatar } from '../components/avatar-image.js';
|
||||
import { createSearchTopBar, createTopBar } from '../components/topbar.js';
|
||||
import { createDropdownMenu } from '../components/dropdown-menu.js';
|
||||
import { createTopBarFilterTitle } from '../components/topbar-filter-title.js';
|
||||
import { createDmMuteMenuItem } from '../components/dm-mute-menu.js';
|
||||
import { iconHtml } from '../components/ui-icon.js';
|
||||
import {
|
||||
@@ -234,59 +235,48 @@ export function render({ navigate, chrome }) {
|
||||
['none', 'Новые'],
|
||||
];
|
||||
let reloadForFilter = () => {};
|
||||
const filterRow = document.createElement('div');
|
||||
filterRow.className = 'tabs tabs--auto tabs--dense dm-filter-row';
|
||||
filterRow.setAttribute('role', 'radiogroup');
|
||||
filterRow.setAttribute('aria-label', 'Фильтр чатов');
|
||||
let chatHeader = null;
|
||||
const selectFilter = (value) => {
|
||||
if (currentChatFilter === value) return;
|
||||
currentChatFilter = value;
|
||||
filterRow.querySelectorAll('.tab-btn').forEach((el) => el.setAttribute('aria-checked', String(el.dataset.filter === value)));
|
||||
chatHeader?.filter.setValue(value);
|
||||
reloadForFilter();
|
||||
};
|
||||
CHAT_FILTERS.forEach(([value, label]) => {
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'tab-btn';
|
||||
button.dataset.filter = value;
|
||||
button.textContent = label;
|
||||
button.setAttribute('role', 'radio');
|
||||
button.setAttribute('aria-checked', String(value === currentChatFilter));
|
||||
button.addEventListener('click', () => selectFilter(value));
|
||||
filterRow.append(button);
|
||||
});
|
||||
filterRow.addEventListener('keydown', (event) => {
|
||||
if (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight') return;
|
||||
const index = CHAT_FILTERS.findIndex(([value]) => value === currentChatFilter);
|
||||
const next = CHAT_FILTERS[(index + (event.key === 'ArrowRight' ? 1 : -1) + CHAT_FILTERS.length) % CHAT_FILTERS.length][0];
|
||||
selectFilter(next);
|
||||
filterRow.querySelector(`[data-filter="${next}"]`)?.focus();
|
||||
event.preventDefault();
|
||||
});
|
||||
|
||||
// Шапка: поиск по своим чатам и контактам (мгновенно, на устройстве) и «Новый чат».
|
||||
let chatQuery = '';
|
||||
let chatSearch = null;
|
||||
const head = createTopBar({
|
||||
title: 'Чаты',
|
||||
className: 'topbar--root',
|
||||
actions: [
|
||||
{
|
||||
icon: 'search',
|
||||
title: 'Поиск по чатам',
|
||||
ariaLabel: 'Поиск по чатам',
|
||||
className: 'messages-search-btn',
|
||||
onClick: () => openChatsSearch(),
|
||||
},
|
||||
{
|
||||
icon: 'compose',
|
||||
title: 'Новый чат',
|
||||
ariaLabel: 'Новый чат',
|
||||
className: 'messages-compose-btn',
|
||||
onClick: () => navigate('contact-search-view'),
|
||||
},
|
||||
],
|
||||
});
|
||||
const createChatsHeader = () => {
|
||||
const filter = createTopBarFilterTitle({
|
||||
section: 'Чаты',
|
||||
choices: CHAT_FILTERS,
|
||||
value: currentChatFilter,
|
||||
onSelect: selectFilter,
|
||||
});
|
||||
const head = createTopBar({
|
||||
center: filter.element,
|
||||
className: 'topbar--root topbar--section-filter',
|
||||
actions: [
|
||||
{
|
||||
icon: 'search',
|
||||
title: 'Поиск по чатам',
|
||||
ariaLabel: 'Поиск по чатам',
|
||||
className: 'messages-search-btn',
|
||||
onClick: () => openChatsSearch(),
|
||||
},
|
||||
{
|
||||
icon: 'compose',
|
||||
title: 'Новый чат',
|
||||
ariaLabel: 'Новый чат',
|
||||
className: 'messages-compose-btn',
|
||||
onClick: () => navigate('contact-search-view'),
|
||||
},
|
||||
],
|
||||
});
|
||||
head.addCleanup(() => filter.destroy());
|
||||
return { head, filter };
|
||||
};
|
||||
chatHeader = createChatsHeader();
|
||||
|
||||
function openChatsSearch() {
|
||||
if (chatSearch) return;
|
||||
@@ -302,7 +292,6 @@ export function render({ navigate, chrome }) {
|
||||
chatSearch = { bar, layer: openHistoryLayer(() => closeChatsSearch({ fromHistory: true })) };
|
||||
chrome?.setTopbar(bar);
|
||||
bar.searchInput?.focus();
|
||||
filterRow.hidden = true;
|
||||
}
|
||||
|
||||
function closeChatsSearch({ fromHistory = false } = {}) {
|
||||
@@ -311,9 +300,10 @@ export function render({ navigate, chrome }) {
|
||||
chatSearch = null;
|
||||
chatQuery = '';
|
||||
if (!fromHistory) layer?.close();
|
||||
filterRow.hidden = false;
|
||||
if (!disposed) {
|
||||
chrome?.setTopbar(head);
|
||||
// Старый TopBar был корректно уничтожен при открытии поиска.
|
||||
chatHeader = createChatsHeader();
|
||||
chrome?.setTopbar(chatHeader.head);
|
||||
renderList();
|
||||
}
|
||||
}
|
||||
@@ -694,8 +684,8 @@ function renderRow(item) {
|
||||
void loadList();
|
||||
};
|
||||
|
||||
chrome?.setTopbar(head);
|
||||
screen.append(filterRow, list, rowMenuAnchor);
|
||||
chrome?.setTopbar(chatHeader.head);
|
||||
screen.append(list, rowMenuAnchor);
|
||||
if (lastItems) renderList();
|
||||
loadList();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user