diff --git a/src/components/LetterGrid.tsx b/src/components/LetterGrid.tsx index a080be3..eda21b4 100644 --- a/src/components/LetterGrid.tsx +++ b/src/components/LetterGrid.tsx @@ -1,5 +1,6 @@ import { useState, useRef, useCallback, useEffect, memo, useMemo } from 'react'; import { colors, radius, cellShadows } from '../styles/theme'; +import { haptic } from '../haptic'; interface CellProps { letter: string; @@ -167,9 +168,8 @@ const LetterGrid: React.FC = ({ setIsSelecting(true); setSelectedCells([cell]); - if (window.Telegram?.WebApp?.HapticFeedback) { - window.Telegram.WebApp.HapticFeedback.impactOccurred('light'); - } + // 🔧 ФИКС (01.10.2026): haptic.selection — точечная вибрация выбора клетки + haptic.selection(); } } }, [foundCells, getCellFromTouch]); @@ -203,6 +203,9 @@ const LetterGrid: React.FC = ({ return prev; } + // 🔧 ФИКС (01.10.2026): лёгкая вибрация при каждом новом шаге + haptic.selection(); + return [...prev, [row, col]]; }); }, [isSelecting, foundCells, getCellFromTouch]); diff --git a/src/pages/BubbleWordsPage.tsx b/src/pages/BubbleWordsPage.tsx index f532a40..4e47bb7 100644 --- a/src/pages/BubbleWordsPage.tsx +++ b/src/pages/BubbleWordsPage.tsx @@ -2,6 +2,7 @@ import { useState, useEffect, useCallback, useRef } from 'react'; import { useNavigate } from 'react-router-dom'; import { useLanguage } from '../i18n/LanguageContext'; import { fonts, radius } from '../styles/theme'; +import { haptic } from '../haptic'; import { getBubbleLevel, completeBubbleLevel, getBubbleProgress, fetchProgress } from '../api'; import RulesModal from '../components/RulesModal'; import { useAchievements } from '../hooks/useAchievements'; @@ -191,9 +192,8 @@ const BubbleWordsPage: React.FC = () => { return [...prev, bubble]; }); - if (window.Telegram?.WebApp?.HapticFeedback) { - window.Telegram.WebApp.HapticFeedback.impactOccurred('light'); - } + // 🔧 ФИКС (01.10.2026): haptic.selection — вибрация выбора пузыря + haptic.selection(); }, [completed, isTransitioning, foundWords]); useEffect(() => { @@ -214,9 +214,8 @@ const BubbleWordsPage: React.FC = () => { showMessage(`✅ ${word.word_pl}`); - if (window.Telegram?.WebApp?.HapticFeedback) { - window.Telegram.WebApp.HapticFeedback.impactOccurred('medium'); - } + // 🔧 ФИКС (01.10.2026): haptic.success — собрано слово + haptic.success(); if (newFoundWords.length === words.length && !isTransitioning) { setIsTransitioning(true); @@ -224,9 +223,8 @@ const BubbleWordsPage: React.FC = () => { const completionTime = Math.floor((Date.now() - startTimeRef.current) / 1000); - if (window.Telegram?.WebApp?.HapticFeedback) { - window.Telegram.WebApp.HapticFeedback.impactOccurred('heavy'); - } + // 🔧 ФИКС (01.10.2026): haptic.heavy — завершение уровня + haptic.heavy(); completeBubbleLevel(hintsUsed, words.length, completionTime) .then((data: any) => { @@ -446,7 +444,10 @@ const BubbleWordsPage: React.FC = () => { cursor: 'pointer', transition: 'transform 0.2s ease', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.95)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > ← {t('back')} @@ -469,7 +470,10 @@ const BubbleWordsPage: React.FC = () => { transition: 'transform 0.2s ease', flexShrink: 0, }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.95)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > ? @@ -704,7 +708,12 @@ const BubbleWordsPage: React.FC = () => { fontWeight: 600, color: textColor, }} - onTouchStart={(e) => { if (firstLetterHintsUsed < maxFirstLetterHints) e.currentTarget.style.transform = 'scale(0.95)'; }} + onTouchStart={(e) => { + if (firstLetterHintsUsed < maxFirstLetterHints) { + e.currentTarget.style.transform = 'scale(0.95)'; + haptic.light(); + } + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > 💡 {t('firstLetter')} @@ -739,7 +748,10 @@ const BubbleWordsPage: React.FC = () => { color: textColor, cursor: 'pointer', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.95)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > 📖 {t('showWords')} {showWordModal ? '▲' : '▼'} diff --git a/src/pages/LeaderboardPage.tsx b/src/pages/LeaderboardPage.tsx index 69e5075..674ce30 100644 --- a/src/pages/LeaderboardPage.tsx +++ b/src/pages/LeaderboardPage.tsx @@ -2,6 +2,7 @@ import { useState, useEffect, useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; import { useLanguage } from '../i18n/LanguageContext'; import { fonts, radius } from '../styles/theme'; +import { haptic } from '../haptic'; import { getLeaderboard, getUserAchievements } from '../api'; import { getUserId } from '../telegram'; @@ -451,7 +452,10 @@ const LeaderboardPage: React.FC = () => { transition: 'transform 0.2s ease', width: '100%', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.95)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }}> {labels.close} @@ -474,7 +478,10 @@ const LeaderboardPage: React.FC = () => { cursor: 'pointer', transition: 'transform 0.2s ease', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.95)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > ← {t('back')} @@ -495,7 +502,10 @@ const LeaderboardPage: React.FC = () => { cursor: 'pointer', transition: 'transform 0.2s ease', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.9) rotate(90deg)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.9) rotate(90deg)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1) rotate(0deg)'; }} > 🔄 @@ -686,7 +696,10 @@ const LeaderboardPage: React.FC = () => { cursor: 'pointer', transition: 'all 0.2s ease', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.98)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.98)'; + haptic.selection(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > @@ -775,7 +788,10 @@ const LeaderboardPage: React.FC = () => { transition: 'all 0.2s ease', cursor: 'pointer', }} - onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.96)'; }} + onTouchStart={(e) => { + e.currentTarget.style.transform = 'scale(0.96)'; + haptic.light(); + }} onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }} > diff --git a/src/pages/MenuPage.tsx b/src/pages/MenuPage.tsx index 4fb1dc2..50123c6 100644 --- a/src/pages/MenuPage.tsx +++ b/src/pages/MenuPage.tsx @@ -2,6 +2,7 @@ import { useState, useEffect, useRef, useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; import { useLanguage } from '../i18n/LanguageContext'; import { fonts, radius } from '../styles/theme'; +import { haptic } from '../haptic'; import { fetchProgress, getLeaderboard, setUserLevel, getUnreadCount, getUserUnreadCount, registerUser } from '../api'; import { getUserId } from '../telegram'; import SupportChatModal from '../components/SupportChatModal'; @@ -266,17 +267,15 @@ const MenuPage: React.FC = () => { // 🔧 Обработчик клика по слайду карусели — открывает FeedModal с нужной секцией const handleSlideClick = (slideId: SlideId) => { - if (window.Telegram?.WebApp?.HapticFeedback) { - window.Telegram.WebApp.HapticFeedback.impactOccurred('light'); - } + // 🔧 ФИКС (01.10.2026): haptic.light — вибрация клика + haptic.light(); setActiveSlideModal(slideId); }; // 🔧 Обработчик клика по кнопке "очки + рейтинг" const handleScoreClick = () => { - if (window.Telegram?.WebApp?.HapticFeedback) { - window.Telegram.WebApp.HapticFeedback.impactOccurred('light'); - } + // 🔧 ФИКС (01.10.2026): haptic.light — вибрация клика + haptic.light(); navigate('/leaderboard'); }; @@ -893,7 +892,11 @@ const MenuPage: React.FC = () => { {/* 🔧 НОВОЕ (01.10.2026): Кнопка Настройки — между Поддержкой и Дашбордом */}