SHA256
Исправить мелкие баги дизайна UI
This commit is contained in:
@@ -40,10 +40,20 @@ function normalizeMetaText(value, max, label) {
|
||||
|
||||
function renderAvatarPreview(slot, avatar, title) {
|
||||
if (!slot) return;
|
||||
slot.innerHTML = '';
|
||||
const label = String(title || 'К').trim() || 'К';
|
||||
const initials = Array.from(label)[0]?.toUpperCase() || 'К';
|
||||
// При вводе названия обновляем только текст fallback. Иначе асинхронно
|
||||
// загруженная картинка каждый раз удаляется, и на мгновение виден кружок.
|
||||
const avatarKey = `${String(avatar?.ar || '').trim()}|${String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase()}`;
|
||||
const current = slot.firstElementChild;
|
||||
if (current?.dataset.avatarPreviewKey === avatarKey) {
|
||||
current.title = label;
|
||||
const fallback = current.querySelector('.avatar-fallback');
|
||||
if (fallback) fallback.textContent = initials;
|
||||
return;
|
||||
}
|
||||
const wrap = renderAvatar({
|
||||
initials: label.slice(0, 1).toUpperCase() || 'К',
|
||||
initials,
|
||||
avatar,
|
||||
authorLogin: state.session.login,
|
||||
size: 'xl',
|
||||
@@ -51,8 +61,9 @@ function renderAvatarPreview(slot, avatar, title) {
|
||||
title: label,
|
||||
alt: 'Аватар канала',
|
||||
});
|
||||
wrap.dataset.avatarPreviewKey = avatarKey;
|
||||
wrap.style.setProperty('--channel-avatar-size', '96px');
|
||||
slot.append(wrap);
|
||||
slot.replaceChildren(wrap);
|
||||
}
|
||||
|
||||
function buildAbsoluteChannelUrl({ ownerBlockchainName = '', channelName = '' } = {}) {
|
||||
|
||||
@@ -16,9 +16,8 @@ import {
|
||||
} from '../services/channels-ux.js';
|
||||
import { formatChannelAddress, makeShineChannelRoute, makeShineChannelShortRoute } from '../services/shine-routes.js';
|
||||
import { renderAvatar } from '../components/avatar-image.js';
|
||||
import { createOverflowDots } from '../components/overflow-dots.js';
|
||||
import { createDropdownMenu } from '../components/dropdown-menu.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { createTopBarFilterTitle } from '../components/topbar-filter-title.js';
|
||||
import { parseDmTechBlocks } from '../services/dm-tech-blocks.js';
|
||||
import { rememberChannelPosition, readChannelPosition, restoreChannelPosition } from '../services/channel-view-state.js';
|
||||
import { pageDataAge } from '../services/page-data-cache.js';
|
||||
@@ -295,12 +294,12 @@ function buildChannelsViewRoute(mode) {
|
||||
return 'channels';
|
||||
}
|
||||
|
||||
function channelsViewTitle(mode) {
|
||||
if (mode === CHANNELS_VIEW_OWNED) return 'Мои каналы';
|
||||
if (mode === CHANNELS_VIEW_FOLLOWING) return 'Подписки';
|
||||
if (mode === CHANNELS_VIEW_DELETED) return 'Удалённые каналы';
|
||||
return 'Каналы';
|
||||
}
|
||||
const CHANNEL_FILTERS = [
|
||||
[CHANNELS_VIEW_ALL, 'Все'],
|
||||
[CHANNELS_VIEW_FOLLOWING, 'Подписки'],
|
||||
[CHANNELS_VIEW_OWNED, 'Мои'],
|
||||
[CHANNELS_VIEW_DELETED, 'Мои удалённые'],
|
||||
];
|
||||
|
||||
function isFollowedUserVisible(targetLogin) {
|
||||
const expected = normalizeComparableLogin(targetLogin);
|
||||
@@ -1072,29 +1071,34 @@ export function render({ navigate, route, chrome }) {
|
||||
const contentEl = document.createElement('div');
|
||||
contentEl.className = 'channels-list-content';
|
||||
|
||||
const filterTitle = createTopBarFilterTitle({
|
||||
section: 'Каналы',
|
||||
choices: CHANNEL_FILTERS,
|
||||
value: listState.viewMode,
|
||||
minWidth: 240,
|
||||
onSelect: (mode) => {
|
||||
if (mode !== listState.viewMode) navigate(buildChannelsViewRoute(mode));
|
||||
},
|
||||
});
|
||||
const topBarEl = createTopBar({
|
||||
title: channelsViewTitle(listState.viewMode),
|
||||
className: 'topbar--root',
|
||||
center: filterTitle.element,
|
||||
className: 'topbar--root topbar--section-filter',
|
||||
actions: [
|
||||
{
|
||||
iconNode: createOverflowDots(),
|
||||
icon: 'moreVertical',
|
||||
title: 'Меню каналов',
|
||||
ariaLabel: 'Открыть меню каналов',
|
||||
className: 'channels-menu-btn',
|
||||
menu: {
|
||||
minWidth: 240,
|
||||
minWidth: 210,
|
||||
items: () => [
|
||||
{ label: 'Создать канал', iconHtml: channelMenuIcon('add'), action: () => navigate('add-channel-view') },
|
||||
{ divider: true },
|
||||
{ label: 'Показать все каналы', iconHtml: channelMenuIcon('all'), selected: listState.viewMode === CHANNELS_VIEW_ALL, action: () => navigate(buildChannelsViewRoute(CHANNELS_VIEW_ALL)) },
|
||||
{ label: 'Показать подписки', iconHtml: channelMenuIcon('following'), selected: listState.viewMode === CHANNELS_VIEW_FOLLOWING, action: () => navigate(buildChannelsViewRoute(CHANNELS_VIEW_FOLLOWING)) },
|
||||
{ label: 'Показать мои', iconHtml: channelMenuIcon('mine'), selected: listState.viewMode === CHANNELS_VIEW_OWNED, action: () => navigate(buildChannelsViewRoute(CHANNELS_VIEW_OWNED)) },
|
||||
{ label: 'Показать мои удалённые каналы', iconHtml: iconHtml('trash'), selected: listState.viewMode === CHANNELS_VIEW_DELETED, action: () => navigate(buildChannelsViewRoute(CHANNELS_VIEW_DELETED)) },
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
topBarEl.addCleanup(() => filterTitle.destroy());
|
||||
|
||||
const controls = document.createElement('div');
|
||||
controls.className = 'channels-list-controls';
|
||||
@@ -1113,35 +1117,7 @@ export function render({ navigate, route, chrome }) {
|
||||
serverSearchButton.addEventListener('click', () => navigate('search-view'));
|
||||
searchWrap.append(searchInput, serverSearchButton);
|
||||
|
||||
const tabs = document.createElement('div');
|
||||
tabs.className = 'tabs tabs--three';
|
||||
tabs.setAttribute('role', 'tablist');
|
||||
tabs.setAttribute('aria-label', 'Фильтр каналов');
|
||||
tabs.addEventListener('keydown', (event) => {
|
||||
const buttons = [...tabs.querySelectorAll('button')];
|
||||
const index = buttons.indexOf(document.activeElement);
|
||||
if (index < 0 || !['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return;
|
||||
event.preventDefault();
|
||||
const next = event.key === 'Home' ? 0 : event.key === 'End' ? buttons.length - 1 : (index + (event.key === 'ArrowRight' ? 1 : -1) + buttons.length) % buttons.length;
|
||||
buttons[next].focus();
|
||||
});
|
||||
[
|
||||
[CHANNELS_VIEW_ALL, 'Все'],
|
||||
[CHANNELS_VIEW_FOLLOWING, 'Подписки'],
|
||||
[CHANNELS_VIEW_OWNED, 'Мои'],
|
||||
].forEach(([mode, label]) => {
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'tab-btn';
|
||||
button.textContent = label;
|
||||
button.setAttribute('role', 'tab');
|
||||
const selected = listState.viewMode === mode;
|
||||
button.classList.toggle('active', selected);
|
||||
button.setAttribute('aria-selected', String(selected));
|
||||
button.addEventListener('click', () => navigate(buildChannelsViewRoute(mode)));
|
||||
tabs.append(button);
|
||||
});
|
||||
controls.append(searchWrap, tabs);
|
||||
controls.append(searchWrap);
|
||||
|
||||
const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate });
|
||||
|
||||
|
||||
@@ -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