mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
feat: Enhance Course Learning Items with Emoji and Flexible Parsing
This commit is contained in:
parent
6878fec2e8
commit
05efdcb642
5 changed files with 479 additions and 21 deletions
|
|
@ -11,6 +11,7 @@ import React, { useEffect, useState } from 'react';
|
|||
import ThumbnailUpdate from './ThumbnailUpdate';
|
||||
import { useCourse, useCourseDispatch } from '@components/Contexts/CourseContext';
|
||||
import FormTagInput from '@components/Objects/StyledElements/Form/TagInput';
|
||||
import LearningItemsList from './LearningItemsList';
|
||||
|
||||
type EditCourseStructureProps = {
|
||||
orgslug: string
|
||||
|
|
@ -34,6 +35,23 @@ const validate = (values: any) => {
|
|||
|
||||
if (!values.learnings) {
|
||||
errors.learnings = 'Required';
|
||||
} else {
|
||||
try {
|
||||
const learningItems = JSON.parse(values.learnings);
|
||||
if (!Array.isArray(learningItems)) {
|
||||
errors.learnings = 'Invalid format';
|
||||
} else if (learningItems.length === 0) {
|
||||
errors.learnings = 'At least one learning item is required';
|
||||
} else {
|
||||
// Check if any item has empty text
|
||||
const hasEmptyText = learningItems.some(item => !item.text || item.text.trim() === '');
|
||||
if (hasEmptyText) {
|
||||
errors.learnings = 'All learning items must have text';
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
errors.learnings = 'Invalid JSON format';
|
||||
}
|
||||
}
|
||||
|
||||
return errors;
|
||||
|
|
@ -45,12 +63,51 @@ function EditCourseGeneral(props: EditCourseStructureProps) {
|
|||
const dispatchCourse = useCourseDispatch() as any;
|
||||
const { isLoading, courseStructure } = course as any;
|
||||
|
||||
// Initialize learnings as a JSON array if it's not already
|
||||
const initializeLearnings = (learnings: any) => {
|
||||
if (!learnings) {
|
||||
return JSON.stringify([{ id: Date.now().toString(), text: '', emoji: '📝' }]);
|
||||
}
|
||||
|
||||
try {
|
||||
// Check if it's already a valid JSON array
|
||||
const parsed = JSON.parse(learnings);
|
||||
if (Array.isArray(parsed)) {
|
||||
return learnings;
|
||||
}
|
||||
|
||||
// If it's a string but not a JSON array, convert it to a learning item
|
||||
if (typeof learnings === 'string') {
|
||||
return JSON.stringify([{
|
||||
id: Date.now().toString(),
|
||||
text: learnings,
|
||||
emoji: '📝'
|
||||
}]);
|
||||
}
|
||||
|
||||
// Default empty array
|
||||
return JSON.stringify([{ id: Date.now().toString(), text: '', emoji: '📝' }]);
|
||||
} catch (e) {
|
||||
// If it's not valid JSON, convert the string to a learning item
|
||||
if (typeof learnings === 'string') {
|
||||
return JSON.stringify([{
|
||||
id: Date.now().toString(),
|
||||
text: learnings,
|
||||
emoji: '📝'
|
||||
}]);
|
||||
}
|
||||
|
||||
// Default empty array
|
||||
return JSON.stringify([{ id: Date.now().toString(), text: '', emoji: '📝' }]);
|
||||
}
|
||||
};
|
||||
|
||||
const formik = useFormik({
|
||||
initialValues: {
|
||||
name: courseStructure?.name || '',
|
||||
description: courseStructure?.description || '',
|
||||
about: courseStructure?.about || '',
|
||||
learnings: courseStructure?.learnings || '',
|
||||
learnings: initializeLearnings(courseStructure?.learnings || ''),
|
||||
tags: courseStructure?.tags || '',
|
||||
public: courseStructure?.public || false,
|
||||
},
|
||||
|
|
@ -139,11 +196,11 @@ function EditCourseGeneral(props: EditCourseStructureProps) {
|
|||
<FormField name="learnings">
|
||||
<FormLabelAndMessage label="Learnings" message={formik.errors.learnings} />
|
||||
<Form.Control asChild>
|
||||
<FormTagInput
|
||||
placeholder="Enter to add..."
|
||||
onChange={(value) => formik.setFieldValue('learnings', value)}
|
||||
value={formik.values.learnings}
|
||||
/>
|
||||
<LearningItemsList
|
||||
value={formik.values.learnings}
|
||||
onChange={(value) => formik.setFieldValue('learnings', value)}
|
||||
error={formik.errors.learnings}
|
||||
/>
|
||||
</Form.Control>
|
||||
</FormField>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,350 @@
|
|||
import React, { useState, useEffect, useRef } from 'react';
|
||||
import { Plus, X, Link as LinkIcon, Smile } from 'lucide-react';
|
||||
import Picker from '@emoji-mart/react';
|
||||
import data from '@emoji-mart/data';
|
||||
import { Input } from '@components/ui/input';
|
||||
|
||||
interface LearningItem {
|
||||
id: string;
|
||||
text: string;
|
||||
emoji: string;
|
||||
link?: string;
|
||||
}
|
||||
|
||||
interface LearningItemsListProps {
|
||||
value: string;
|
||||
onChange: (value: string) => void;
|
||||
error?: string;
|
||||
}
|
||||
|
||||
const LearningItemsList = ({ value, onChange, error }: LearningItemsListProps) => {
|
||||
const [items, setItems] = useState<LearningItem[]>([]);
|
||||
const [showEmojiPicker, setShowEmojiPicker] = useState<string | null>(null);
|
||||
const [showLinkInput, setShowLinkInput] = useState<string | null>(null);
|
||||
const [focusedItemId, setFocusedItemId] = useState<string | null>(null);
|
||||
const pickerRef = useRef<HTMLDivElement>(null);
|
||||
const linkInputRef = useRef<HTMLDivElement>(null);
|
||||
const initializedRef = useRef(false);
|
||||
const inputRefs = useRef<Record<string, HTMLInputElement | null>>({});
|
||||
const linkInputFieldRefs = useRef<Record<string, HTMLInputElement | null>>({});
|
||||
const scrollContainerRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
// Add a new empty item
|
||||
const addItem = () => {
|
||||
const newItem: LearningItem = {
|
||||
id: Date.now().toString(),
|
||||
text: '',
|
||||
emoji: '📝',
|
||||
};
|
||||
const newItems = [...items, newItem];
|
||||
setItems(newItems);
|
||||
onChange(JSON.stringify(newItems));
|
||||
|
||||
// Focus the newly added item after render
|
||||
setTimeout(() => {
|
||||
if (inputRefs.current[newItem.id]) {
|
||||
inputRefs.current[newItem.id]?.focus();
|
||||
setFocusedItemId(newItem.id);
|
||||
}
|
||||
|
||||
// Scroll to the bottom when a new item is added
|
||||
if (scrollContainerRef.current && newItems.length > 5) {
|
||||
scrollContainerRef.current.scrollTop = scrollContainerRef.current.scrollHeight;
|
||||
}
|
||||
}, 0);
|
||||
};
|
||||
|
||||
// Parse the JSON string to items array when the component mounts or value changes
|
||||
useEffect(() => {
|
||||
try {
|
||||
if (value) {
|
||||
const parsedItems = JSON.parse(value);
|
||||
if (Array.isArray(parsedItems)) {
|
||||
setItems(parsedItems);
|
||||
initializedRef.current = true;
|
||||
} else if (!initializedRef.current) {
|
||||
// Initialize with one empty item if no valid array and not already initialized
|
||||
const newItem: LearningItem = {
|
||||
id: Date.now().toString(),
|
||||
text: '',
|
||||
emoji: '📝',
|
||||
};
|
||||
setItems([newItem]);
|
||||
onChange(JSON.stringify([newItem]));
|
||||
initializedRef.current = true;
|
||||
}
|
||||
} else if (!initializedRef.current) {
|
||||
// Initialize with one empty item if no value and not already initialized
|
||||
const newItem: LearningItem = {
|
||||
id: Date.now().toString(),
|
||||
text: '',
|
||||
emoji: '📝',
|
||||
};
|
||||
setItems([newItem]);
|
||||
onChange(JSON.stringify([newItem]));
|
||||
initializedRef.current = true;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing learning items:', e);
|
||||
// Initialize with one empty item on error if not already initialized
|
||||
if (!initializedRef.current) {
|
||||
const newItem: LearningItem = {
|
||||
id: Date.now().toString(),
|
||||
text: '',
|
||||
emoji: '📝',
|
||||
};
|
||||
setItems([newItem]);
|
||||
onChange(JSON.stringify([newItem]));
|
||||
initializedRef.current = true;
|
||||
}
|
||||
}
|
||||
}, [value]);
|
||||
|
||||
// Restore focus after re-render if an item was focused
|
||||
useEffect(() => {
|
||||
if (focusedItemId) {
|
||||
if (showLinkInput === focusedItemId) {
|
||||
// Focus the link input if it's open for the focused item
|
||||
if (linkInputFieldRefs.current[focusedItemId]) {
|
||||
linkInputFieldRefs.current[focusedItemId]?.focus();
|
||||
}
|
||||
} else {
|
||||
// Focus the text input
|
||||
if (inputRefs.current[focusedItemId]) {
|
||||
inputRefs.current[focusedItemId]?.focus();
|
||||
}
|
||||
}
|
||||
|
||||
// Scroll the focused item into view if needed
|
||||
if (items.length > 5 && scrollContainerRef.current) {
|
||||
const focusedElement = document.getElementById(`learning-item-${focusedItemId}`);
|
||||
if (focusedElement) {
|
||||
const containerRect = scrollContainerRef.current.getBoundingClientRect();
|
||||
const elementRect = focusedElement.getBoundingClientRect();
|
||||
|
||||
// Check if the element is outside the visible area
|
||||
if (elementRect.top < containerRect.top || elementRect.bottom > containerRect.bottom) {
|
||||
focusedElement.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}, [items, focusedItemId, showLinkInput]);
|
||||
|
||||
// Handle clicks outside of emoji picker and link input
|
||||
useEffect(() => {
|
||||
const handleClickOutside = (event: MouseEvent) => {
|
||||
if (pickerRef.current && !pickerRef.current.contains(event.target as Node)) {
|
||||
setShowEmojiPicker(null);
|
||||
}
|
||||
if (linkInputRef.current && !linkInputRef.current.contains(event.target as Node)) {
|
||||
setShowLinkInput(null);
|
||||
}
|
||||
};
|
||||
|
||||
document.addEventListener('mousedown', handleClickOutside);
|
||||
return () => {
|
||||
document.removeEventListener('mousedown', handleClickOutside);
|
||||
};
|
||||
}, []);
|
||||
|
||||
// Update the parent component with the new JSON string when items change
|
||||
const updateItems = (newItems: LearningItem[]) => {
|
||||
setItems(newItems);
|
||||
onChange(JSON.stringify(newItems));
|
||||
};
|
||||
|
||||
// Remove an item
|
||||
const removeItem = (id: string) => {
|
||||
if (focusedItemId === id) {
|
||||
setFocusedItemId(null);
|
||||
}
|
||||
updateItems(items.filter(item => item.id !== id));
|
||||
};
|
||||
|
||||
// Update item text
|
||||
const updateItemText = (id: string, text: string) => {
|
||||
updateItems(
|
||||
items.map(item => (item.id === id ? { ...item, text } : item))
|
||||
);
|
||||
};
|
||||
|
||||
// Update item emoji
|
||||
const updateItemEmoji = (id: string, emoji: string) => {
|
||||
updateItems(
|
||||
items.map(item => (item.id === id ? { ...item, emoji } : item))
|
||||
);
|
||||
setShowEmojiPicker(null);
|
||||
|
||||
// Restore focus to the text input after emoji selection
|
||||
setTimeout(() => {
|
||||
if (inputRefs.current[id]) {
|
||||
inputRefs.current[id]?.focus();
|
||||
setFocusedItemId(id);
|
||||
}
|
||||
}, 0);
|
||||
};
|
||||
|
||||
// Update item link
|
||||
const updateItemLink = (id: string, link: string) => {
|
||||
updateItems(
|
||||
items.map(item => (item.id === id ? { ...item, link } : item))
|
||||
);
|
||||
};
|
||||
|
||||
// Handle emoji selection
|
||||
const handleEmojiSelect = (id: string, emojiData: any) => {
|
||||
updateItemEmoji(id, emojiData.native);
|
||||
};
|
||||
|
||||
// Handle focus on input
|
||||
const handleInputFocus = (id: string) => {
|
||||
setFocusedItemId(id);
|
||||
};
|
||||
|
||||
// Handle blur on input
|
||||
const handleInputBlur = () => {
|
||||
// Don't clear focusedItemId immediately as it might be needed for refocusing
|
||||
// We'll use a small delay to allow other focus events to occur first
|
||||
setTimeout(() => {
|
||||
// Only clear if we're not focusing another input in this component
|
||||
if (!document.activeElement ||
|
||||
!document.activeElement.classList.contains('learning-item-input')) {
|
||||
setFocusedItemId(null);
|
||||
}
|
||||
}, 100);
|
||||
};
|
||||
|
||||
// Ref callback for text inputs
|
||||
const setInputRef = (id: string) => (el: HTMLInputElement | null) => {
|
||||
inputRefs.current[id] = el;
|
||||
};
|
||||
|
||||
// Ref callback for link inputs
|
||||
const setLinkInputRef = (id: string) => (el: HTMLInputElement | null) => {
|
||||
linkInputFieldRefs.current[id] = el;
|
||||
};
|
||||
|
||||
// Determine if we need to make the list scrollable
|
||||
const isScrollable = items.length > 5;
|
||||
|
||||
return (
|
||||
<div className="space-y-2">
|
||||
{items.length === 0 && (
|
||||
<div className="text-center py-3 text-gray-500 bg-gray-50/50 rounded-lg text-sm">
|
||||
No learning items added yet. Click the button below to add one.
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div
|
||||
ref={scrollContainerRef}
|
||||
className={`space-y-2 ${isScrollable ? 'max-h-[350px] overflow-y-auto pr-1 scrollbar-thin scrollbar-thumb-gray-200 scrollbar-track-transparent' : ''}`}
|
||||
>
|
||||
{items.map((item) => (
|
||||
<div key={item.id} id={`learning-item-${item.id}`} className="group relative">
|
||||
<div className="flex items-center gap-2 py-2 px-3 bg-gray-50/70 hover:bg-gray-50 border border-gray-100 rounded-lg transition-colors">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setShowEmojiPicker(showEmojiPicker === item.id ? null : item.id);
|
||||
setShowLinkInput(null);
|
||||
}}
|
||||
className="text-lg flex-shrink-0"
|
||||
>
|
||||
<span>{item.emoji}</span>
|
||||
</button>
|
||||
|
||||
<Input
|
||||
ref={setInputRef(item.id)}
|
||||
value={item.text}
|
||||
onChange={(e) => updateItemText(item.id, e.target.value)}
|
||||
onFocus={() => handleInputFocus(item.id)}
|
||||
onBlur={handleInputBlur}
|
||||
placeholder="Enter learning item..."
|
||||
className="flex-grow border-0 bg-transparent focus-visible:ring-0 px-0 h-8 text-sm learning-item-input"
|
||||
/>
|
||||
|
||||
{item.link && (
|
||||
<div className="text-xs text-blue-500 flex items-center gap-1 bg-blue-50 px-2 py-0.5 rounded">
|
||||
<LinkIcon size={12} />
|
||||
<span className="truncate max-w-[100px]">{item.link}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-1">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setShowLinkInput(showLinkInput === item.id ? null : item.id);
|
||||
setShowEmojiPicker(null);
|
||||
setFocusedItemId(item.id);
|
||||
// Focus the link input after render
|
||||
setTimeout(() => {
|
||||
if (linkInputFieldRefs.current[item.id]) {
|
||||
linkInputFieldRefs.current[item.id]?.focus();
|
||||
}
|
||||
}, 0);
|
||||
}}
|
||||
className="text-gray-400 hover:text-blue-500 transition-colors"
|
||||
title={item.link ? "Edit link" : "Add link"}
|
||||
>
|
||||
<LinkIcon size={15} />
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => removeItem(item.id)}
|
||||
className="text-gray-300 hover:text-gray-500 transition-colors"
|
||||
aria-label="Remove item"
|
||||
title="Remove item"
|
||||
>
|
||||
<X size={15} />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{showEmojiPicker === item.id && (
|
||||
<div ref={pickerRef} className="absolute z-10 mt-1 left-0">
|
||||
<Picker
|
||||
data={data}
|
||||
onEmojiSelect={(emoji: any) => handleEmojiSelect(item.id, emoji)}
|
||||
theme="light"
|
||||
previewPosition="none"
|
||||
searchPosition="top"
|
||||
maxFrequentRows={0}
|
||||
autoFocus={false}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showLinkInput === item.id && (
|
||||
<div ref={linkInputRef} className="mt-1 p-2 bg-white border border-gray-200 rounded-lg shadow-sm">
|
||||
<Input
|
||||
ref={setLinkInputRef(item.id)}
|
||||
value={items.find(i => i.id === item.id)?.link || ''}
|
||||
onChange={(e) => updateItemLink(item.id, e.target.value)}
|
||||
onFocus={() => handleInputFocus(item.id)}
|
||||
onBlur={handleInputBlur}
|
||||
placeholder="Enter URL..."
|
||||
className="w-full text-sm learning-item-input"
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={addItem}
|
||||
className="flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-700 transition-colors mt-2"
|
||||
>
|
||||
<Plus size={16} className="text-blue-500" />
|
||||
<span>Add learning item</span>
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default LearningItemsList;
|
||||
Loading…
Add table
Add a link
Reference in a new issue