Fix category titles

This commit is contained in:
2025-10-02 23:53:30 +03:00
Unverified
parent ace9fdd5df
commit 014da1702b
3 changed files with 202 additions and 70 deletions
+85 -20
View File
@@ -77,6 +77,7 @@
display: flex; display: flex;
width: 100%; width: 100%;
flex-direction: column; flex-direction: column;
overflow: hidden;
.chat-main { .chat-main {
flex-grow: 1; flex-grow: 1;
@@ -84,6 +85,7 @@
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
position: relative; position: relative;
overflow: hidden;
.chat-header { .chat-header {
padding: 16px; padding: 16px;
@@ -538,21 +540,29 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
.buttons, .left-buttons {
display: flex;
flex-direction: row;
align-items: center;
}
.left-buttons {
.emoji-btn { .emoji-btn {
margin-left: 10px; margin: 10px;
color: $color-dark-on-surface-variant; color: $color-dark-on-surface-variant;
transition: color 0.2s ease; transition: color 0.2s ease;
flex-shrink: 0; flex-shrink: 0;
align-self: flex-end;
&:hover { &:hover {
color: $color-dark-primary; color: $color-dark-primary;
} }
} }
}
.message-input { .message-input {
flex: 1; flex: 1;
padding: 20px 20px; padding: 20px 0;
padding-right: 0;
border: none; border: none;
border-radius: 25px; border-radius: 25px;
font-size: 1rem; font-size: 1rem;
@@ -573,11 +583,6 @@
} }
.buttons { .buttons {
align-self: flex-end;
display: flex;
flex-direction: row;
align-items: center;
.send-btn { .send-btn {
margin: 10px; margin: 10px;
width: 50px; width: 50px;
@@ -784,7 +789,7 @@
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3); box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
backdrop-filter: blur(20px); backdrop-filter: blur(20px);
width: 320px; width: 320px;
max-height: 400px; height: 400px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -792,6 +797,7 @@
opacity: 0; opacity: 0;
transform: translateY(30px); transform: translateY(30px);
transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1); transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
user-select: none;
&.open { &.open {
opacity: 1; opacity: 1;
@@ -801,7 +807,6 @@
.emoji-menu-header { .emoji-menu-header {
background: $color-dark-surface-container-high; background: $color-dark-surface-container-high;
border-bottom: 1px solid rgba($color-dark-outline-variant, 0.2); border-bottom: 1px solid rgba($color-dark-outline-variant, 0.2);
padding: 8px;
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 1; z-index: 1;
@@ -810,6 +815,9 @@
display: flex; display: flex;
gap: 4px; gap: 4px;
overflow-x: auto; overflow-x: auto;
overflow-y: hidden;
scroll-behavior: smooth;
padding: 8px;
&::-webkit-scrollbar { &::-webkit-scrollbar {
height: 4px; height: 4px;
@@ -824,19 +832,25 @@
border-radius: 2px; border-radius: 2px;
} }
&::-webkit-scrollbar-thumb:hover {
background-color: $color-dark-surface-container-high;
}
.emoji-category-tab { .emoji-category-tab {
background: transparent; background: transparent;
border: none; border: none;
border-radius: 8px; border-radius: 10px;
padding: 8px; padding: 8px;
cursor: pointer; cursor: pointer;
transition: all 0.2s ease; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
font-size: 1.2rem; font-size: 1.2rem;
min-width: 40px; min-width: 40px;
height: 40px; height: 40px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: relative;
overflow: hidden;
&:hover { &:hover {
background: $color-dark-surface-container; background: $color-dark-surface-container;
@@ -845,18 +859,40 @@
&.active { &.active {
background: $color-dark-primary-container; background: $color-dark-primary-container;
color: $color-dark-on-primary-container; color: $color-dark-on-primary-container;
transform: scale(1.05);
}
&::before {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: $color-dark-primary-container;
opacity: 0;
transition: opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1);
border-radius: 8px;
}
&.active::before {
opacity: 1;
}
span {
position: relative;
z-index: 1;
} }
} }
} }
} }
.emoji-grid { .emoji-grid {
display: grid; display: flex;
grid-template-columns: repeat(8, 1fr); flex-direction: column;
gap: 2px; flex: 1;
padding: 8px;
max-height: 300px;
overflow-y: auto; overflow-y: auto;
scroll-behavior: smooth;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 6px; width: 6px;
@@ -871,18 +907,47 @@
border-radius: 3px; border-radius: 3px;
} }
.emoji-category-section {
.emoji-category-title {
position: sticky;
top: 0;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 12px;
padding-right: 12px;
font-size: 0.85rem;
font-weight: 600;
color: $color-dark-on-surface-variant;
z-index: 2;
margin: 0;
backdrop-filter: blur(10px);
}
.emoji-category-grid {
display: flex;
flex-direction: row;
flex-wrap: wrap;
gap: 2px;
padding: 8px;
}
}
.emoji-item { .emoji-item {
$size: 30px;
background: transparent; background: transparent;
border: none; border: none;
border-radius: 6px; border-radius: 6px;
padding: 8px; padding: 5px;
cursor: pointer; cursor: pointer;
transition: all 0.15s ease; transition: all 0.15s ease;
font-size: 1.4rem; font-size: $size;
width: $size;
height: $size;
box-sizing: content-box;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
min-height: 40px;
&:hover { &:hover {
background: $color-dark-surface-container-high; background: $color-dark-surface-container-high;
@@ -44,7 +44,6 @@ export function ChatInputWrapper(
const [errorOpen, setErrorOpen] = useState(false); const [errorOpen, setErrorOpen] = useState(false);
const [emojiMenuOpen, setEmojiMenuOpen] = useState(false); const [emojiMenuOpen, setEmojiMenuOpen] = useState(false);
const [emojiMenuPosition, setEmojiMenuPosition] = useState({ x: 0, y: 0 }); const [emojiMenuPosition, setEmojiMenuPosition] = useState({ x: 0, y: 0 });
const emojiButtonRef = useRef<HTMLButtonElement>(null);
const chatInputWrapperRef = useRef<HTMLDivElement>(null); const chatInputWrapperRef = useRef<HTMLDivElement>(null);
// Expose a way for parent to programmatically add files // Expose a way for parent to programmatically add files
@@ -176,12 +175,9 @@ export function ChatInputWrapper(
)} )}
</AnimatedHeight> </AnimatedHeight>
<div className="chat-input"> <div className="chat-input">
<mdui-button-icon <div className="left-buttons">
ref={emojiButtonRef} <mdui-button-icon icon="mood" onClick={handleEmojiButtonClick} className="emoji-btn"></mdui-button-icon>
icon="mood" </div>
onClick={handleEmojiButtonClick}
className="emoji-btn"
></mdui-button-icon>
<RichTextArea <RichTextArea
className="message-input" className="message-input"
id="message-input" id="message-input"
@@ -1,4 +1,4 @@
import { useState, useEffect, useRef } from "react"; import { useState, useEffect, useRef, useCallback } from "react";
import { EMOJI_CATEGORIES, getRecentEmojis, addRecentEmoji } from "./emojiData"; import { EMOJI_CATEGORIES, getRecentEmojis, addRecentEmoji } from "./emojiData";
import type { Size2D } from "../../../core/types"; import type { Size2D } from "../../../core/types";
@@ -13,6 +13,10 @@ export function EmojiMenu({ isOpen, onClose, onEmojiSelect, position }: EmojiMen
const [activeCategory, setActiveCategory] = useState("recent"); const [activeCategory, setActiveCategory] = useState("recent");
const [recentEmojis, setRecentEmojis] = useState<string[]>([]); const [recentEmojis, setRecentEmojis] = useState<string[]>([]);
const menuRef = useRef<HTMLDivElement>(null); const menuRef = useRef<HTMLDivElement>(null);
const scrollRef = useRef<HTMLDivElement>(null);
const categoryRefs = useRef<Map<string, HTMLDivElement>>(new Map());
const tabsRef = useRef<HTMLDivElement>(null);
const tabRefs = useRef<Map<string, HTMLButtonElement>>(new Map());
useEffect(() => { useEffect(() => {
if (isOpen) { if (isOpen) {
@@ -20,6 +24,54 @@ export function EmojiMenu({ isOpen, onClose, onEmojiSelect, position }: EmojiMen
} }
}, [isOpen]); }, [isOpen]);
const handleScroll = useCallback(() => {
if (!scrollRef.current) return;
// Find which category is currently visible
for (const [categoryName, element] of categoryRefs.current) {
if (element) {
const rect = element.getBoundingClientRect();
const containerRect = scrollRef.current.getBoundingClientRect();
// Check if category header is in view
if (rect.top <= containerRect.top + 50 && rect.bottom > containerRect.top + 50) {
if (activeCategory !== categoryName) {
setActiveCategory(categoryName);
scrollTabIntoView(categoryName);
}
break;
}
}
}
}, [activeCategory]);
function scrollToCategory(categoryName: string) {
const element = categoryRefs.current.get(categoryName);
if (element && scrollRef.current) {
element.scrollIntoView({
behavior: 'smooth',
block: 'start'
});
}
}
function scrollTabIntoView(categoryName: string) {
const tabElement = tabRefs.current.get(categoryName);
if (tabElement && tabsRef.current) {
const tabsRect = tabsRef.current.getBoundingClientRect();
const tabRect = tabElement.getBoundingClientRect();
// Check if tab is outside the visible area
if (tabRect.left < tabsRect.left || tabRect.right > tabsRect.right) {
tabElement.scrollIntoView({
behavior: 'smooth',
block: 'nearest',
inline: 'center'
});
}
}
}
useEffect(() => { useEffect(() => {
function handleClickOutside(event: MouseEvent) { function handleClickOutside(event: MouseEvent) {
if (menuRef.current && !menuRef.current.contains(event.target as Node)) { if (menuRef.current && !menuRef.current.contains(event.target as Node)) {
@@ -50,13 +102,6 @@ export function EmojiMenu({ isOpen, onClose, onEmojiSelect, position }: EmojiMen
onClose(); onClose();
}; };
function getCurrentEmojis(): string[] {
if (activeCategory === "recent") {
return recentEmojis;
}
const category = EMOJI_CATEGORIES.find(cat => cat.name === activeCategory);
return category?.emojis || [];
};
return ( return (
<div <div
@@ -71,24 +116,47 @@ export function EmojiMenu({ isOpen, onClose, onEmojiSelect, position }: EmojiMen
}} }}
> >
<div className="emoji-menu-header"> <div className="emoji-menu-header">
<div className="emoji-category-tabs"> <div ref={tabsRef} className="emoji-category-tabs">
{EMOJI_CATEGORIES.map((category) => ( {EMOJI_CATEGORIES.map((category) => (
<button <button
key={category.name} key={category.name}
ref={(el) => {
if (el) tabRefs.current.set(category.name, el);
}}
className={`emoji-category-tab ${activeCategory === category.name ? "active" : ""}`} className={`emoji-category-tab ${activeCategory === category.name ? "active" : ""}`}
onClick={() => setActiveCategory(category.name)} onClick={() => scrollToCategory(category.name)}
title={category.name} title={category.name}
> >
{category.icon} <span>{category.icon}</span>
</button> </button>
))} ))}
</div> </div>
</div> </div>
<div className="emoji-grid"> <div
{getCurrentEmojis().map((emoji, index) => ( ref={scrollRef}
className="emoji-grid"
onScroll={handleScroll}
>
{EMOJI_CATEGORIES.map((category) => {
const emojis = category.name === "recent" ? recentEmojis : category.emojis;
return (
<div
key={category.name}
ref={(el) => {
if (el) categoryRefs.current.set(category.name, el);
}}
className="emoji-category-section"
>
<h3 className="emoji-category-title">
{category.name.charAt(0).toUpperCase() + category.name.slice(1)}
</h3>
{emojis.length > 0 ? (
<div className="emoji-category-grid">
{emojis.map((emoji, index) => (
<button <button
key={`${activeCategory}-${index}`} key={`${category.name}-${index}`}
className="emoji-item" className="emoji-item"
onClick={() => handleEmojiClick(emoji)} onClick={() => handleEmojiClick(emoji)}
title={emoji} title={emoji}
@@ -97,12 +165,15 @@ export function EmojiMenu({ isOpen, onClose, onEmojiSelect, position }: EmojiMen
</button> </button>
))} ))}
</div> </div>
) : (
{getCurrentEmojis().length === 0 && activeCategory === "recent" && (
<div className="emoji-empty-state"> <div className="emoji-empty-state">
<span>No recent emojis</span> <span>No {category.name} emojis</span>
</div> </div>
)} )}
</div> </div>
); );
})}
</div>
</div>
);
} }