Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui): Textarea maxLength 초과시 error 뜨도록 변경 #204

Merged
merged 2 commits into from
Nov 8, 2024
Merged

fix(ui): Textarea maxLength 초과시 error 뜨도록 변경 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bc10f7
fix: textarea maxLength 초과일 경우 error
sohee-K Nov 8, 2024
6a2b9b1
update changeset
sohee-K Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shiny-dogs-hope.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sopt-makers/ui': patch
---

[UI] Textarea maxLength 초과시 error 뜨도록 변경
41 changes: 28 additions & 13 deletions packages/ui/Input/TextArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import SendIcon from './icons/SendIcon';

interface TextAreaProps extends Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, 'value'> {
className?: string;
topAddon?: React.ReactNode | { labelText?: string; descriptionText?: string; };
rightAddon?: React.ReactNode | { buttonContent?: React.ReactNode; onClick: () => void; }; // ReactNode로 버튼을 전달하면 disabled 및 onKeyDown 직접처리 필요
topAddon?: React.ReactNode | { labelText?: string; descriptionText?: string };
rightAddon?: React.ReactNode | { buttonContent?: React.ReactNode; onClick: () => void }; // ReactNode로 버튼을 전달하면 disabled 및 onKeyDown 직접처리 필요

isError?: boolean;
validationFn?: (input: string) => boolean; // isError가 없을 때만 적용
Expand Down Expand Up @@ -63,7 +63,7 @@ function TextArea(props: TextAreaProps) {
e.target.style.height = '1px';
e.target.style.height = `${e.target.scrollHeight}px`;
}
}
};

const handleKeyPress = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
if (!disableEnterSubmit && event.key === 'Enter' && !event.shiftKey) {
Expand All @@ -88,27 +88,38 @@ function TextArea(props: TextAreaProps) {
const submitButton = useMemo(() => {
if (rightAddon && typeof rightAddon === 'object' && 'onClick' in rightAddon) {
return (
<button className={S.textareaSubmitButton} disabled={isSubmitDisabled} onClick={rightAddon.onClick} ref={submitButtonRef} type="button">
<button
className={S.textareaSubmitButton}
disabled={isSubmitDisabled}
onClick={rightAddon.onClick}
ref={submitButtonRef}
type='button'
>
{/* buttonContent 가 없을 경우 default로 SendIcon 표시 */}
{rightAddon.buttonContent ?? <SendIcon disabled={isSubmitDisabled} />}
</button>
);
}
}, [rightAddon, isSubmitDisabled]);

const handleFocus = () => {
const handleFocus = (e: React.FocusEvent<HTMLTextAreaElement, Element>) => {
setIsFocused(true);
}
inputProps.onFocus && inputProps.onFocus(e);
};

const handleBlur = () => {
const handleBlur = (e: React.FocusEvent<HTMLTextAreaElement, Element>) => {
setIsFocused(false);
}
inputProps.onBlur && inputProps.onBlur(e);
};

const requiredEl = required ? <span className={S.required}>*</span> : null;
const descriptionEl = descriptionText ? <p className={S.description}>{descriptionText}</p> : null;
const labelEl = labelText ? (
<label className={S.label} htmlFor={labelText}>
<span>{labelText}{requiredEl}</span>
<span>
{labelText}
{requiredEl}
</span>
{descriptionEl}
</label>
) : (
Expand All @@ -129,13 +140,17 @@ function TextArea(props: TextAreaProps) {
onFocus={handleFocus}
onKeyDown={inputProps.onKeyDown ?? handleKeyPress}
rows={1}
style={{ ...inputProps.style, height: fixedHeight ? `${fixedHeight}px` : 'auto', maxHeight: `${maxHeight}px` }}
style={{
...inputProps.style,
height: fixedHeight ? `${fixedHeight}px` : 'auto',
maxHeight: `${maxHeight}px`,
}}
value={value}
/>
{isValidElement(rightAddon) ? rightAddon : submitButton}
</div>

{(hasError || maxLength) ? (
{hasError || maxLength ? (
<div className={S.inputBottom}>
{hasError ? (
<div className={S.errorMessage}>
Expand All @@ -147,7 +162,7 @@ function TextArea(props: TextAreaProps) {
)}

{maxLength ? (
<p className={`${S.count} ${value.length === maxLength ? S.maxCount : ''}`}>
<p className={`${S.count} ${value.length > maxLength ? S.maxCount : ''}`}>
{value.length}/{maxLength}
</p>
) : null}
Expand All @@ -157,4 +172,4 @@ function TextArea(props: TextAreaProps) {
);
}

export default TextArea;
export default TextArea;
Loading