Исправил баг UI: PWA и просмотр аватаров

This commit is contained in:
AidarKC
2026-11-10 14:09:54 +03:00
parent 9c30b33b39
commit 003cc942d8
14 changed files with 252 additions and 28 deletions
+4 -2
View File
@@ -1,4 +1,6 @@
import { initI18n, onLanguageChange, t } from './i18n/index.js';
import { preventPagePinchZoom } from './services/pwa-viewport-gestures.js';
preventPagePinchZoom();
import {
navigate,
getRoute,
@@ -81,7 +83,7 @@ import * as loginOtherDeviceView from './pages/login-other-device-view.js?v=2026
import * as loginPasswordView from './pages/login-password-view.js?v=202606201650';
import * as publicSupportQueueView from './pages/public-support-queue-view.js';
import * as profileView from './pages/profile-view.js?v=202610130400';
import * as profileView from './pages/profile-view.js?v=20261110-pwa-avatar';
import * as profileEditView from './pages/profile-edit-view.js';
import * as profilesView from './pages/profiles-view.js';
import * as walletView from './pages/wallet-view.js?v=202609260900';
@@ -122,7 +124,7 @@ import { isDmChatMuted } from './services/dm-chat-prefs.js';
import { getDevicePref } from './services/device-prefs.js';
import { isDeveloperToolsEnabled } from './services/feature-settings.js';
import { confirmDialog } from './components/confirm-dialog.js';
import * as userProfileView from './pages/user-profile-view.js';
import * as userProfileView from './pages/user-profile-view.js?v=20261110-pwa-avatar';
import * as userProfileListView from './pages/user-profile-list-view.js';
import * as userRelationManageView from './pages/user-relation-manage-view.js';
import * as channelsList from './pages/channels-list.js?v=20261011-search';
@@ -0,0 +1,76 @@
import { t } from '../i18n/index.js';
import { renderUserAvatar } from './avatar-image.js';
let activeClose = null;
/**
* Тот же экземпляр Avatar переносится во всплывающее окно, а затем обратно.
* Так сохраняются уже загруженная фотография и blob URL, который может быть
* отозван загрузчиком после onload; клонировать img/src здесь нельзя.
*/
export function attachProfileAvatarPreview(slot, card) {
if (!slot || !card) return { cleanup() {} };
const trigger = document.createElement('button');
trigger.type = 'button';
trigger.className = 'user-profile-avatar-trigger';
trigger.setAttribute('aria-label', t('screens.profile_avatar_preview.open'));
const avatar = renderUserAvatar({
login: card.login,
firstName: card.firstName,
lastName: card.lastName,
avatar: card.avatar,
size: 'xl',
className: 'user-profile-hero-avatar',
official: card.accountRole === 'primary',
});
trigger.append(avatar);
slot.append(trigger);
let closePreview = null;
trigger.addEventListener('click', () => {
if (closePreview) return;
activeClose?.({ restoreFocus: false });
const overlay = document.createElement('div');
overlay.className = 'profile-avatar-preview';
overlay.setAttribute('role', 'dialog');
overlay.setAttribute('aria-modal', 'true');
overlay.setAttribute('aria-label', t('screens.profile_avatar_preview.dialog'));
const largeButton = document.createElement('button');
largeButton.type = 'button';
largeButton.className = 'profile-avatar-preview__image';
largeButton.setAttribute('aria-label', t('screens.profile_avatar_preview.close'));
largeButton.append(avatar);
overlay.append(largeButton);
const onKey = (event) => {
if (event.key === 'Escape') close();
};
const onPopState = () => close({ restoreFocus: false });
const close = ({ restoreFocus = true } = {}) => {
if (closePreview !== close) return;
closePreview = null;
if (activeClose === close) activeClose = null;
document.removeEventListener('keydown', onKey);
window.removeEventListener('popstate', onPopState);
// При обновлении карточки или уходе со страницы прежний trigger уже может быть удалён.
if (trigger.isConnected) trigger.append(avatar);
overlay.remove();
if (restoreFocus && trigger.isConnected) trigger.focus({ preventScroll: true });
};
closePreview = close;
activeClose = close;
overlay.addEventListener('click', (event) => {
if (event.target === overlay || event.target.closest('.profile-avatar-preview__image')) close();
});
document.addEventListener('keydown', onKey);
window.addEventListener('popstate', onPopState);
(document.getElementById('modal-root') || document.body).append(overlay);
largeButton.focus({ preventScroll: true });
});
return {
cleanup() { closePreview?.({ restoreFocus: false }); },
};
}
+5
View File
@@ -4191,6 +4191,11 @@
},
"message_menu": {
"text_001": "Action of the communication"
},
"profile_avatar_preview": {
"open": "Enlarge avatar",
"dialog": "Avatar preview",
"close": "Close avatar preview"
}
},
"errors": {
+5
View File
@@ -4191,6 +4191,11 @@
},
"message_menu": {
"text_001": "Действия сообщения"
},
"profile_avatar_preview": {
"open": "Увеличить аватар",
"dialog": "Просмотр аватара",
"close": "Закрыть просмотр аватара"
}
},
"errors": {
+13 -13
View File
@@ -1,7 +1,7 @@
import { t, th } from '../i18n/index.js';
import { profile } from '../mock-data.js';
import { state } from '../state.js';
import { renderUserAvatar } from '../components/avatar-image.js';
import { attachProfileAvatarPreview } from '../components/profile-avatar-preview.js';
import { createTopBar } from '../components/topbar.js';
import { loadUserProfileCard } from '../services/user-connections.js';
import { profileCardHtml, profileTileHtml } from '../components/profile-card.js';
@@ -47,8 +47,12 @@ export function render({ navigate, chrome }) {
body.className = 'user-profile-body';
screen.append(status, body);
let avatarPreview = null;
let disposed = false;
function renderProfile() {
if (!card) return;
if (!card || disposed) return;
avatarPreview?.cleanup();
avatarPreview = null;
body.innerHTML = profileCardHtml({
card,
login,
@@ -62,16 +66,7 @@ export function render({ navigate, chrome }) {
<button class="nav-row" type="button" data-self-profile-action="profiles"><span class="nav-row__label">${th('screens.profile_view.text_015')}</span><span class="nav-row__hint">${th('screens.profile_view.text_016')}</span></button>
</div>`;
const avatarSlot = body.querySelector('.user-profile-avatar-slot');
avatarSlot?.append(renderUserAvatar({
login: card.login,
firstName: card.firstName,
lastName: card.lastName,
avatar: card.avatar,
size: 'xl',
className: 'user-profile-hero-avatar',
official: card.accountRole === 'primary',
}));
avatarPreview = attachProfileAvatarPreview(body.querySelector('.user-profile-avatar-slot'), card);
status.replaceChildren();
}
@@ -104,7 +99,7 @@ export function render({ navigate, chrome }) {
return;
}
const fresh = await loadUserProfileCard(login);
if (!screen.isConnected && card) return;
if (disposed || (!screen.isConnected && card)) return;
// Та же карточка – не перерисовываем, иначе аватар и счётчики мигают.
if (card && JSON.stringify(card) === JSON.stringify(fresh)) return;
card = fresh;
@@ -127,5 +122,10 @@ export function render({ navigate, chrome }) {
};
refresh().catch(showLoadError);
screen.cleanup = () => {
disposed = true;
avatarPreview?.cleanup();
avatarPreview = null;
};
return screen;
}
+8 -11
View File
@@ -1,7 +1,7 @@
import { t } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { SHINE_CONNECTIONS_LOGO_SRC } from '../components/shine-logo.js';
import { renderUserAvatar } from '../components/avatar-image.js';
import { attachProfileAvatarPreview } from '../components/profile-avatar-preview.js';
import { state } from '../state.js';
import { loadRelationsForPair, loadUserProfileCard } from '../services/user-connections.js';
import { createErrorState, createLoadingState } from '../components/feedback.js';
@@ -44,9 +44,13 @@ export function render({ navigate, route, chrome }) {
screen.append(status, body);
let card = null;
let relation = null;
let avatarPreview = null;
let disposed = false;
function renderProfile() {
if (!card || disposed) return;
avatarPreview?.cleanup();
avatarPreview = null;
const isSelf = card.login.toLowerCase() === selfLogin.toLowerCase();
body.innerHTML = profileCardHtml({
@@ -62,16 +66,7 @@ export function render({ navigate, route, chrome }) {
syncRelationTile();
const avatarSlot = body.querySelector('.user-profile-avatar-slot');
avatarSlot?.append(renderUserAvatar({
login: card.login,
firstName: card.firstName,
lastName: card.lastName,
avatar: card.avatar,
size: 'xl',
className: 'user-profile-hero-avatar',
official: card.accountRole === 'primary',
}));
avatarPreview = attachProfileAvatarPreview(body.querySelector('.user-profile-avatar-slot'), card);
status.replaceChildren();
}
@@ -134,6 +129,8 @@ export function render({ navigate, route, chrome }) {
screen.cleanup = () => {
if (disposed) return;
disposed = true;
avatarPreview?.cleanup();
avatarPreview = null;
};
async function refresh() {
@@ -0,0 +1,11 @@
// Safari (iOS) может игнорировать user-scalable=no из-за настроек доступности.
// Блокируем только попытки pinch-zoom, сохраняя одиночную прокрутку, свайпы и ввод.
export function preventPagePinchZoom(target = document) {
const preventGesture = (event) => event.preventDefault();
const preventMultiTouch = (event) => {
if (event.touches?.length > 1 && event.cancelable) event.preventDefault();
};
target.addEventListener('gesturestart', preventGesture, { passive: false });
target.addEventListener('gesturechange', preventGesture, { passive: false });
target.addEventListener('touchmove', preventMultiTouch, { passive: false });
}