feat(haptic): точечные вибрации в пузырях, конструкторе, рейтинге, квизе

This commit is contained in:
2026-10-01 13:03:12 +03:00
parent 696967d88e
commit 10e46f6ae7
7 changed files with 114 additions and 62 deletions
+6 -3
View File
@@ -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<LetterGridProps> = ({
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<LetterGridProps> = ({
return prev;
}
// 🔧 ФИКС (01.10.2026): лёгкая вибрация при каждом новом шаге
haptic.selection();
return [...prev, [row, col]];
});
}, [isSelecting, foundCells, getCellFromTouch]);
+25 -13
View File
@@ -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)'; }}
>
<span>💡 {t('firstLetter')}</span>
@@ -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)'; }}
>
<span>📖 {t('showWords')} {showWordModal ? '▲' : '▼'}</span>
+21 -5
View File
@@ -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}
</button>
@@ -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)'; }}
>
<span style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
@@ -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)'; }}
>
<span style={{ fontSize: '22px', flexShrink: 0 }}>
+10 -7
View File
@@ -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): Кнопка Настройки — между Поддержкой и Дашбордом */}
<button
onClick={() => navigate('/settings')}
onClick={() => {
// 🔧 ФИКС (01.10.2026): haptic.light — вибрация клика
haptic.light();
navigate('/settings');
}}
style={getButtonStyle('settings')}
>
<span>⚙️</span> {t('settings')}
+24 -15
View File
@@ -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 { getNextSentence, checkSentence, getSentenceHint, fetchProgress } from '../api';
import RulesModal from '../components/RulesModal';
import { useAchievements } from '../hooks/useAchievements';
@@ -166,9 +167,8 @@ const SentenceBuilderPage: React.FC = () => {
setAvailableWords(prev => prev.filter((_, i) => i !== index));
setSelectedWords(prev => [...prev, word]);
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('light');
}
// 🔧 ФИКС (01.10.2026): haptic.selection — вибрация выбора слова
haptic.selection();
};
const handleSelectedWordClick = (index: number) => {
@@ -178,9 +178,8 @@ const SentenceBuilderPage: React.FC = () => {
setSelectedWords(prev => prev.filter((_, i) => i !== index));
setAvailableWords(prev => [...prev, word]);
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('light');
}
// 🔧 ФИКС (01.10.2026): haptic.light — вибрация возврата слова
haptic.light();
};
const handleHint = async () => {
@@ -218,9 +217,8 @@ const SentenceBuilderPage: React.FC = () => {
if (data.correct) {
setTotalScore(prev => prev + (data.score || 0));
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('heavy');
}
// 🔧 ФИКС (01.10.2026): haptic.success — правильный ответ
haptic.success();
if (data.new_achievements && data.new_achievements.length > 0) {
data.new_achievements.forEach((ach: any) => {
@@ -232,9 +230,8 @@ const SentenceBuilderPage: React.FC = () => {
});
}
} else {
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('medium');
}
// 🔧 ФИКС (01.10.2026): haptic.error — неправильный ответ
haptic.error();
setTimeout(() => {
if (isMountedRef.current) {
setAvailableWords(sentence.words);
@@ -531,7 +528,10 @@ const SentenceBuilderPage: 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)'; }}
>
← {t('back')}
@@ -554,7 +554,10 @@ const SentenceBuilderPage: 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)'; }}
>
?
@@ -838,7 +841,10 @@ const SentenceBuilderPage: React.FC = () => {
gap: '8px',
}}
onTouchStart={(e) => {
if (hintsUsed < MAX_HINTS) e.currentTarget.style.transform = 'scale(0.96)';
if (hintsUsed < MAX_HINTS) {
e.currentTarget.style.transform = 'scale(0.96)';
haptic.light();
}
}}
onTouchEnd={(e) => {
e.currentTarget.style.transform = 'scale(1)';
@@ -923,6 +929,7 @@ const SentenceBuilderPage: React.FC = () => {
}}
onTouchStart={(e) => {
e.currentTarget.style.transform = 'scale(0.95)';
haptic.light();
}}
onTouchEnd={(e) => {
e.currentTarget.style.transform = 'scale(1)';
@@ -950,6 +957,7 @@ const SentenceBuilderPage: React.FC = () => {
onTouchStart={(e) => {
if (selectedWords.length > 0) {
e.currentTarget.style.transform = 'scale(0.95)';
haptic.light();
}
}}
onTouchEnd={(e) => {
@@ -979,6 +987,7 @@ const SentenceBuilderPage: React.FC = () => {
onTouchStart={(e) => {
if (selectedWords.length > 0 && !checking) {
e.currentTarget.style.transform = 'scale(0.95)';
haptic.light();
}
}}
onTouchEnd={(e) => {
+13 -8
View File
@@ -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 { getNextQuiz, checkQuizAnswer, getQuizProgress, fetchProgress } from '../api';
import RulesModal from '../components/RulesModal';
import { useAchievements } from '../hooks/useAchievements';
@@ -151,9 +152,8 @@ const WordQuizPage: React.FC = () => {
});
}
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('heavy');
}
// 🔧 ФИКС (01.10.2026): haptic.success — вибрация успеха при правильном ответе
haptic.success();
setTimeout(() => {
if (isMountedRef.current) {
@@ -169,9 +169,8 @@ const WordQuizPage: React.FC = () => {
startTimeRef.current = Date.now();
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('medium');
}
// 🔧 ФИКС (01.10.2026): haptic.error — вибрация ошибки при неправильном ответе
haptic.error();
if (newMistakes >= maxMistakes) {
setTimeout(() => {
@@ -351,7 +350,10 @@ const WordQuizPage: React.FC = () => {
flexShrink: 0,
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')}
@@ -374,7 +376,10 @@ const WordQuizPage: 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)'; }}
>
?
+15 -11
View File
@@ -2,6 +2,7 @@ import { useState, useEffect, useCallback, useRef } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { useLanguage } from '../i18n/LanguageContext';
import { fonts, radius } from '../styles/theme';
import { haptic } from '../haptic';
import { getLevel, completeLevel, fetchProgress, getFirstLetterHint, getWordList } from '../api';
import LetterGrid from '../components/LetterGrid';
import HintPanel from '../components/HintPanel';
@@ -274,9 +275,8 @@ const WordSearchPage: React.FC = () => {
showMessage(`✅ ${foundWord}`);
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('medium');
}
// 🔧 ФИКС (01.10.2026): haptic.success — вибрация успеха при найденном слове
haptic.success();
const allWordsFound = newFoundWords.length === words.length;
@@ -287,9 +287,8 @@ const WordSearchPage: React.FC = () => {
setConfetti(generateConfetti());
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('heavy');
}
// 🔧 ФИКС (01.10.2026): haptic.heavy — сильная вибрация при завершении
haptic.heavy();
if (!alreadyCompleted) {
try {
@@ -344,9 +343,8 @@ const WordSearchPage: React.FC = () => {
} else {
showError(`❌ ${t('wordNotFound')}`);
}
if (window.Telegram?.WebApp?.HapticFeedback) {
window.Telegram.WebApp.HapticFeedback.impactOccurred('light');
}
// 🔧 ФИКС (01.10.2026): haptic.error — вибрация ошибки
haptic.error();
}
}, [level, words, completed, isTransitioning, alreadyCompleted, num, navigate, generateConfetti, t, checkWordMatch, isReverseMatch, showAchievement]);
@@ -711,7 +709,10 @@ const WordSearchPage: React.FC = () => {
transition: 'transform 0.2s ease',
boxShadow: '0 4px 14px rgba(122, 58, 255, 0.4)',
}}
onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }}
onTouchStart={(e) => {
e.currentTarget.style.transform = 'scale(0.95)';
haptic.light(); // 🔧 haptic на кнопку
}}
onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }}
>
← {t('back')}
@@ -735,7 +736,10 @@ const WordSearchPage: React.FC = () => {
justifyContent: 'center',
boxShadow: '0 4px 14px rgba(122, 58, 255, 0.4)',
}}
onTouchStart={(e) => { e.currentTarget.style.transform = 'scale(0.95)'; }}
onTouchStart={(e) => {
e.currentTarget.style.transform = 'scale(0.95)';
haptic.light(); // 🔧 haptic на кнопку
}}
onTouchEnd={(e) => { e.currentTarget.style.transform = 'scale(1)'; }}
>
?