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.

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

[Fix/BAR-260] EditInput 초기 rows 값 수정 #86

Merged
merged 5 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/components/Card/style.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ export const header = style([
display: 'flex',
gap: '8px',
color: COLORS['Grey/400'],
wordBreak: 'keep-all',
wordBreak: 'break-all',
},
]);

export const body = style([
sprinkles({ typography: '15/Body/Regular' }),
{
whiteSpace: 'pre-wrap',
wordBreak: 'keep-all',
wordBreak: 'break-all',
},
]);

Expand Down
4 changes: 2 additions & 2 deletions src/components/Modal/modals/EditFolder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ const EditFolder = () => {
취소
</Button>
<Button
className={clsx(styles.button, !value && styles.buttonDisabled)}
disabled={!value}
className={styles.button}
disabled={!value || value === folderName}
style={assignInlineVars({
[styles.buttonColor]: COLORS['Grey/White'],
[styles.buttonBackgroundColor]: COLORS['Blue/Default'],
Expand Down
3 changes: 1 addition & 2 deletions src/components/Modal/modals/MakeFolder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const MakeFolder = () => {
const { mutate } = usePostMemoFolders();

const handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {
setErrorMessage('');
setValue(e.target.value);
};

Expand Down Expand Up @@ -85,7 +84,7 @@ const MakeFolder = () => {
취소
</Button>
<Button
className={clsx(styles.button, !value && styles.buttonDisabled)}
className={styles.button}
disabled={!value}
style={assignInlineVars({
[styles.buttonColor]: COLORS['Grey/White'],
Expand Down
9 changes: 5 additions & 4 deletions src/components/Modal/style.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,23 @@ export const button = style([
backgroundColor: buttonBackgroundColor,
padding: '16px 40px',
borderRadius: '8px',

selectors: {
'& + &': {
marginLeft: '8px',
},
},

':disabled': {
opacity: '0.5',
},
},
]);

export const buttonWrapper = style({
marginTop: '24px',
});

export const buttonDisabled = style({
opacity: '0.5',
});

export const helloImage = style({
textAlign: 'center',
});
Expand Down
11 changes: 5 additions & 6 deletions src/components/Tooltip/style.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const content = recipe({
hasArrow: {
false: {
padding: '8px 12px',
margin: '4px 0',
},
true: {
padding: '16px',
Expand All @@ -57,24 +58,22 @@ export const topArrow = style({
marginTop: '13px',

'::before': {
top: '-11.5px',
top: '-12px',
borderBottomColor: COLORS['Dim/70'],
},
});

export const bottomArrow = style({
marginBottom: '8px',

'::before': {
bottom: '-11px',
bottom: '-12px',
borderTopColor: COLORS['Dim/70'],
},
});

export const minimalTooltipMargin = style({
marginTop: '-8px',
marginTop: '-20px',
});

export const highlightTooltipMargin = style({
marginTop: '-36px',
marginTop: '-46px',
});
2 changes: 1 addition & 1 deletion src/domain/landing/style.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const rightText = style([
display: 'inline-block',
width: '270px',
color: COLORS['Grey/800'],
wordBreak: 'keep-all',
wordBreak: 'break-all',
},
]);

Expand Down
2 changes: 1 addition & 1 deletion src/domain/끄적이는/components/EditInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const EditInput = ({ inputProps }: EditInputProps) => {
row: number;
lineBreak: Record<number, boolean>;
}>({
row: 1,
row: inputProps.value.split(/\r\n|\r|\n/).length,
lineBreak: {},
});

Expand Down
2 changes: 1 addition & 1 deletion src/domain/끄적이는/components/editInput.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ export const editInput = style([
}),
{
width: '100%',
height: '100%',
marginBottom: '8px',
resize: 'none',
overflowWrap: 'break-word',
maxHeight: '217px',
},
]);

Expand Down