Исправить мелкие баги дизайна UI

This commit is contained in:
AidarKC
2026-11-09 09:57:47 +03:00
parent 4068465ee6
commit 34f7faf0a8
7 changed files with 128 additions and 118 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
client.version=1.20.23 client.version=1.20.24
server.version=1.16.19 server.version=1.16.19
@@ -0,0 +1,41 @@
import { createDropdownMenu } from './dropdown-menu.js';
import { iconHtml } from './ui-icon.js';
/** Заголовок-переключатель для списков; не создаёт собственный TopBar или меню. */
export function createTopBarFilterTitle({ section, choices, value, onSelect, minWidth = 210 } = {}) {
const button = document.createElement('button');
button.type = 'button';
button.className = 'topbar-filter-title';
button.title = `Выбрать раздел «${section}»`;
const caption = document.createElement('span');
caption.className = 'topbar-filter-title__caption';
const chevron = document.createElement('span');
chevron.className = 'topbar-filter-title__chevron';
chevron.setAttribute('aria-hidden', 'true');
chevron.innerHTML = iconHtml('chevron-down');
button.append(caption, chevron);
let selected = value;
const setValue = (nextValue) => {
selected = nextValue;
const label = choices.find(([key]) => key === selected)?.[1] || '';
caption.textContent = `${section}: ${label}`;
button.setAttribute('aria-label', `${section}: ${label}. Выбрать раздел`);
};
setValue(value);
const menu = createDropdownMenu({
anchorEl: button,
placement: 'bottom-start',
minWidth,
transparent: true,
items: () => choices.map(([key, label]) => ({
label,
selected: key === selected,
action: () => onSelect?.(key),
})),
});
return { element: button, setValue, close: () => menu.close(), destroy: () => menu.destroy() };
}
+14 -3
View File
@@ -40,10 +40,20 @@ function normalizeMetaText(value, max, label) {
function renderAvatarPreview(slot, avatar, title) { function renderAvatarPreview(slot, avatar, title) {
if (!slot) return; if (!slot) return;
slot.innerHTML = '';
const label = String(title || 'К').trim() || 'К'; 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({ const wrap = renderAvatar({
initials: label.slice(0, 1).toUpperCase() || 'К', initials,
avatar, avatar,
authorLogin: state.session.login, authorLogin: state.session.login,
size: 'xl', size: 'xl',
@@ -51,8 +61,9 @@ function renderAvatarPreview(slot, avatar, title) {
title: label, title: label,
alt: 'Аватар канала', alt: 'Аватар канала',
}); });
wrap.dataset.avatarPreviewKey = avatarKey;
wrap.style.setProperty('--channel-avatar-size', '96px'); wrap.style.setProperty('--channel-avatar-size', '96px');
slot.append(wrap); slot.replaceChildren(wrap);
} }
function buildAbsoluteChannelUrl({ ownerBlockchainName = '', channelName = '' } = {}) { function buildAbsoluteChannelUrl({ ownerBlockchainName = '', channelName = '' } = {}) {
+22 -46
View File
@@ -16,9 +16,8 @@ import {
} from '../services/channels-ux.js'; } from '../services/channels-ux.js';
import { formatChannelAddress, makeShineChannelRoute, makeShineChannelShortRoute } from '../services/shine-routes.js'; import { formatChannelAddress, makeShineChannelRoute, makeShineChannelShortRoute } from '../services/shine-routes.js';
import { renderAvatar } from '../components/avatar-image.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 { createTopBar } from '../components/topbar.js';
import { createTopBarFilterTitle } from '../components/topbar-filter-title.js';
import { parseDmTechBlocks } from '../services/dm-tech-blocks.js'; import { parseDmTechBlocks } from '../services/dm-tech-blocks.js';
import { rememberChannelPosition, readChannelPosition, restoreChannelPosition } from '../services/channel-view-state.js'; import { rememberChannelPosition, readChannelPosition, restoreChannelPosition } from '../services/channel-view-state.js';
import { pageDataAge } from '../services/page-data-cache.js'; import { pageDataAge } from '../services/page-data-cache.js';
@@ -295,12 +294,12 @@ function buildChannelsViewRoute(mode) {
return 'channels'; return 'channels';
} }
function channelsViewTitle(mode) { const CHANNEL_FILTERS = [
if (mode === CHANNELS_VIEW_OWNED) return 'Мои каналы'; [CHANNELS_VIEW_ALL, 'Все'],
if (mode === CHANNELS_VIEW_FOLLOWING) return 'Подписки'; [CHANNELS_VIEW_FOLLOWING, 'Подписки'],
if (mode === CHANNELS_VIEW_DELETED) return 'Удалённые каналы'; [CHANNELS_VIEW_OWNED, 'Мои'],
return 'Каналы'; [CHANNELS_VIEW_DELETED, 'Мои удалённые'],
} ];
function isFollowedUserVisible(targetLogin) { function isFollowedUserVisible(targetLogin) {
const expected = normalizeComparableLogin(targetLogin); const expected = normalizeComparableLogin(targetLogin);
@@ -1072,29 +1071,34 @@ export function render({ navigate, route, chrome }) {
const contentEl = document.createElement('div'); const contentEl = document.createElement('div');
contentEl.className = 'channels-list-content'; 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({ const topBarEl = createTopBar({
title: channelsViewTitle(listState.viewMode), center: filterTitle.element,
className: 'topbar--root', className: 'topbar--root topbar--section-filter',
actions: [ actions: [
{ {
iconNode: createOverflowDots(), icon: 'moreVertical',
title: 'Меню каналов', title: 'Меню каналов',
ariaLabel: 'Открыть меню каналов', ariaLabel: 'Открыть меню каналов',
className: 'channels-menu-btn', className: 'channels-menu-btn',
menu: { menu: {
minWidth: 240, minWidth: 210,
items: () => [ items: () => [
{ label: 'Создать канал', iconHtml: channelMenuIcon('add'), action: () => navigate('add-channel-view') }, { 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'); const controls = document.createElement('div');
controls.className = 'channels-list-controls'; controls.className = 'channels-list-controls';
@@ -1113,35 +1117,7 @@ export function render({ navigate, route, chrome }) {
serverSearchButton.addEventListener('click', () => navigate('search-view')); serverSearchButton.addEventListener('click', () => navigate('search-view'));
searchWrap.append(searchInput, serverSearchButton); searchWrap.append(searchInput, serverSearchButton);
const tabs = document.createElement('div'); controls.append(searchWrap);
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);
const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate }); const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate });
+39 -49
View File
@@ -11,6 +11,7 @@ import {
import { renderUserAvatar } from '../components/avatar-image.js'; import { renderUserAvatar } from '../components/avatar-image.js';
import { createSearchTopBar, createTopBar } from '../components/topbar.js'; import { createSearchTopBar, createTopBar } from '../components/topbar.js';
import { createDropdownMenu } from '../components/dropdown-menu.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 { createDmMuteMenuItem } from '../components/dm-mute-menu.js';
import { iconHtml } from '../components/ui-icon.js'; import { iconHtml } from '../components/ui-icon.js';
import { import {
@@ -234,59 +235,48 @@ export function render({ navigate, chrome }) {
['none', 'Новые'], ['none', 'Новые'],
]; ];
let reloadForFilter = () => {}; let reloadForFilter = () => {};
const filterRow = document.createElement('div'); let chatHeader = null;
filterRow.className = 'tabs tabs--auto tabs--dense dm-filter-row';
filterRow.setAttribute('role', 'radiogroup');
filterRow.setAttribute('aria-label', 'Фильтр чатов');
const selectFilter = (value) => { const selectFilter = (value) => {
if (currentChatFilter === value) return; if (currentChatFilter === value) return;
currentChatFilter = value; currentChatFilter = value;
filterRow.querySelectorAll('.tab-btn').forEach((el) => el.setAttribute('aria-checked', String(el.dataset.filter === value))); chatHeader?.filter.setValue(value);
reloadForFilter(); 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 chatQuery = '';
let chatSearch = null; let chatSearch = null;
const head = createTopBar({ const createChatsHeader = () => {
title: 'Чаты', const filter = createTopBarFilterTitle({
className: 'topbar--root', section: 'Чаты',
actions: [ choices: CHAT_FILTERS,
{ value: currentChatFilter,
icon: 'search', onSelect: selectFilter,
title: 'Поиск по чатам', });
ariaLabel: 'Поиск по чатам', const head = createTopBar({
className: 'messages-search-btn', center: filter.element,
onClick: () => openChatsSearch(), className: 'topbar--root topbar--section-filter',
}, actions: [
{ {
icon: 'compose', icon: 'search',
title: 'Новый чат', title: 'Поиск по чатам',
ariaLabel: 'Новый чат', ariaLabel: 'Поиск по чатам',
className: 'messages-compose-btn', className: 'messages-search-btn',
onClick: () => navigate('contact-search-view'), 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() { function openChatsSearch() {
if (chatSearch) return; if (chatSearch) return;
@@ -302,7 +292,6 @@ export function render({ navigate, chrome }) {
chatSearch = { bar, layer: openHistoryLayer(() => closeChatsSearch({ fromHistory: true })) }; chatSearch = { bar, layer: openHistoryLayer(() => closeChatsSearch({ fromHistory: true })) };
chrome?.setTopbar(bar); chrome?.setTopbar(bar);
bar.searchInput?.focus(); bar.searchInput?.focus();
filterRow.hidden = true;
} }
function closeChatsSearch({ fromHistory = false } = {}) { function closeChatsSearch({ fromHistory = false } = {}) {
@@ -311,9 +300,10 @@ export function render({ navigate, chrome }) {
chatSearch = null; chatSearch = null;
chatQuery = ''; chatQuery = '';
if (!fromHistory) layer?.close(); if (!fromHistory) layer?.close();
filterRow.hidden = false;
if (!disposed) { if (!disposed) {
chrome?.setTopbar(head); // Старый TopBar был корректно уничтожен при открытии поиска.
chatHeader = createChatsHeader();
chrome?.setTopbar(chatHeader.head);
renderList(); renderList();
} }
} }
@@ -694,8 +684,8 @@ function renderRow(item) {
void loadList(); void loadList();
}; };
chrome?.setTopbar(head); chrome?.setTopbar(chatHeader.head);
screen.append(filterRow, list, rowMenuAnchor); screen.append(list, rowMenuAnchor);
if (lastItems) renderList(); if (lastItems) renderList();
loadList(); loadList();
+11
View File
@@ -19,6 +19,17 @@
/* Корневые разделы (Чаты, Каналы, Связи, Уведомления, Профиль) – заголовок по центру, как на всех экранах, но крупнее. */ /* Корневые разделы (Чаты, Каналы, Связи, Уведомления, Профиль) – заголовок по центру, как на всех экранах, но крупнее. */
.topbar--root .topbar__title { font-size: 1.375rem; line-height: 1.75rem; font-weight: 700; letter-spacing: -0.01em; } .topbar--root .topbar__title { font-size: 1.375rem; line-height: 1.75rem; font-weight: 700; letter-spacing: -0.01em; }
/* В списках чатов и каналов фильтр встроен в заголовок слева.
* Остальные разделы сохраняют центрированный TopBar. */
.topbar--section-filter { grid-template-columns: minmax(0, 1fr) auto; }
.topbar--section-filter .topbar__left { display: none; }
.topbar--section-filter .topbar__center { justify-content: flex-start; }
.topbar-filter-title { display: inline-flex; align-items: center; gap: 5px; min-width: 0; max-width: 100%; min-height: 44px; padding: 0 6px; border: 0; border-radius: 12px; background: transparent; color: var(--text-primary); font: inherit; font-size: 1.125rem; font-weight: 700; line-height: 1.4; letter-spacing: -0.01em; text-align: left; cursor: pointer; }
.topbar-filter-title__caption { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.topbar-filter-title__chevron { display: inline-flex; flex: 0 0 16px; width: 16px; color: var(--text-secondary); }
.topbar-filter-title__chevron svg { display: block; width: 16px; height: 16px; }
/* Шапка-визитка: аватар и две строки слева (канал, собеседник) */ /* Шапка-визитка: аватар и две строки слева (канал, собеседник) */
.topbar--identity { grid-template-columns: auto minmax(0, 1fr) auto; } .topbar--identity { grid-template-columns: auto minmax(0, 1fr) auto; }
.topbar--identity .topbar__center { justify-content: flex-start; } .topbar--identity .topbar__center { justify-content: flex-start; }
-19
View File
@@ -684,24 +684,6 @@ button.dm-via-node:active { border-color: color-mix(in srgb, var(--rel-link) 50%
} }
.dm-head-filter-title {
display: inline-flex;
align-items: center;
justify-content: center;
gap: 6px;
cursor: pointer;
}
.dm-head-filter-title::after {
content: "⌄";
font-size: 13px;
line-height: 1;
opacity: 0.72;
transform: translateY(-1px);
}
/* ===== Personal chat row layout: time top-right, unread bottom-right ===== */ /* ===== Personal chat row layout: time top-right, unread bottom-right ===== */
.dm-list-screen .dm-row-time { .dm-list-screen .dm-row-time {
grid-row: 1; grid-row: 1;
@@ -739,7 +721,6 @@ button.dm-via-node:active { border-color: color-mix(in srgb, var(--rel-link) 50%
.dm-row-time { font-size: var(--text-xs); font-weight: 400; color: var(--text-secondary); } .dm-row-time { font-size: var(--text-xs); font-weight: 400; color: var(--text-secondary); }
.dm-contact-note { flex-shrink: 0; padding: 0; border: 0; border-radius: 0; background: none; color: var(--rel-contact); font-size: var(--text-xs); font-weight: var(--weight-medium); } .dm-contact-note { flex-shrink: 0; padding: 0; border: 0; border-radius: 0; background: none; color: var(--rel-contact); font-size: var(--text-xs); font-weight: var(--weight-medium); }
.dm-contact-note--close_friend { color: var(--rel-family); } .dm-contact-note--close_friend { color: var(--rel-family); }
.dm-filter-row { margin: 0 0 var(--space-1); }
.dm-row-meta-col { align-self: stretch; display: flex; flex-direction: column; align-items: flex-end; justify-content: center; gap: 6px; } .dm-row-meta-col { align-self: stretch; display: flex; flex-direction: column; align-items: flex-end; justify-content: center; gap: 6px; }
.dm-row-meta-line { display: flex; align-items: center; gap: 0; } .dm-row-meta-line { display: flex; align-items: center; gap: 0; }
.dm-unread-badge { min-width: 20px; height: 20px; padding: 0 6px; display: grid; place-items: center; border-radius: var(--radius-pill); color: var(--on-accent); background: var(--accent); border: 0; font-size: var(--text-xs); font-weight: var(--weight-bold); } .dm-unread-badge { min-width: 20px; height: 20px; padding: 0 6px; display: grid; place-items: center; border-radius: var(--radius-pill); color: var(--on-accent); background: var(--accent); border: 0; font-size: var(--text-xs); font-weight: var(--weight-bold); }