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

chore(TextArea): rows logic #1714

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore(TextArea): rows logic #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
350e3b5
chore: textAreaControl rows logic
GermanVor Jul 18, 2024
9086c1b
chore: calculate rows number depend on lineHeight
GermanVor Aug 12, 2024
f887139
chore: replace input-control by input-control-min-height
GermanVor Aug 12, 2024
d4f3c04
Merge branch 'main' into text-area-heigh
GermanVor Aug 14, 2024
56171dc
Merge branch 'main' into text-area-heigh
GermanVor Aug 16, 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
8 changes: 4 additions & 4 deletions src/components/controls/TextArea/TextArea.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ $block: '.#{variables.$ns}text-area';
&_size {
&_s {
#{$block}__control {
@include control-mixins.input-control(s);
@include control-mixins.input-control-min-height(s);
}

&#{$block}_has-clear #{$block}__control {
Expand All @@ -107,7 +107,7 @@ $block: '.#{variables.$ns}text-area';

&_m {
#{$block}__control {
@include control-mixins.input-control(m);
@include control-mixins.input-control-min-height(m);
}

&#{$block}_has-clear #{$block}__control {
Expand All @@ -119,7 +119,7 @@ $block: '.#{variables.$ns}text-area';

&_l {
#{$block}__control {
@include control-mixins.input-control(l);
@include control-mixins.input-control-min-height(l);
}

&#{$block}_has-clear #{$block}__control {
Expand All @@ -131,7 +131,7 @@ $block: '.#{variables.$ns}text-area';

&_xl {
#{$block}__control {
@include control-mixins.input-control(xl);
@include control-mixins.input-control-min-height(xl);
}

&#{$block}_has-clear #{$block}__control {
Expand Down
57 changes: 17 additions & 40 deletions src/components/controls/TextArea/TextAreaControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@ type Props = Omit<TextAreaProps, 'autoComplete' | 'onChange' | 'controlProps'> &

const b = block('text-area');

const calculateLinesByScrollHeight = (args: {
height: number;
paddingTop: number;
paddingBottom: number;
lineHeight: number;
}) => {
const {height, lineHeight} = args;
const paddingTop = Number.isNaN(args.paddingTop) ? 0 : args.paddingTop;
const paddingBottom = Number.isNaN(args.paddingBottom) ? 0 : args.paddingBottom;
const getRowsNumber = (textArea: HTMLTextAreaElement) => {
const lineHeight = parseInt(getComputedStyle(textArea, null).lineHeight, 10);

return (height - paddingTop - paddingBottom) / lineHeight;
return Math.floor(textArea.scrollHeight / lineHeight);
};

// by default this number is 2, but in our component is 1
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea#rows
const DEFAULT_TEXT_AREA_ROWS_NUMBER = 1;

export function TextAreaControl(props: Props) {
const {
name,
Expand All @@ -39,7 +36,6 @@ export function TextAreaControl(props: Props) {
defaultValue,
controlRef,
controlProps,
size,
rows,
minRows = 1,
maxRows,
Expand All @@ -54,55 +50,36 @@ export function TextAreaControl(props: Props) {
} = props;
const innerControlRef = React.useRef<HTMLTextAreaElement>(null);
const handleRef = useForkRef(controlRef, innerControlRef);
const textareaRows = rows || minRows;
const innerValue = value || innerControlRef?.current?.value;

const resizeHeight = React.useCallback(() => {
const control = innerControlRef?.current;
const innerValue = value || innerControlRef?.current?.value;

if (control && !rows) {
const controlStyles = getComputedStyle(control);
const lineHeight = parseInt(controlStyles.getPropertyValue('line-height'), 10);
const paddingTop = parseInt(controlStyles.getPropertyValue('padding-top'), 10);
const paddingBottom = parseInt(controlStyles.getPropertyValue('padding-bottom'), 10);
const linesWithCarriageReturn = (innerValue?.match(/\n/g) || []).length + 1;
const linesByScrollHeight = calculateLinesByScrollHeight({
height: control.scrollHeight,
paddingTop,
paddingBottom,
lineHeight,
});
React.useEffect(() => {
if (rows || !innerControlRef.current) return;

control.style.height = 'auto';
innerControlRef.current.setAttribute('rows', DEFAULT_TEXT_AREA_ROWS_NUMBER.toString());
let currentRowsNumber = getRowsNumber(innerControlRef.current);

if (maxRows && maxRows < Math.max(linesByScrollHeight, linesWithCarriageReturn)) {
control.style.height = `${maxRows * lineHeight + 2 * paddingTop}px`;
} else if (linesWithCarriageReturn > 1 || linesByScrollHeight > 1) {
control.style.height = `${control.scrollHeight}px`;
}
}
}, [rows, maxRows, innerValue]);
if (minRows !== undefined && currentRowsNumber < minRows) currentRowsNumber = minRows;
if (maxRows !== undefined && currentRowsNumber > maxRows) currentRowsNumber = maxRows;

React.useEffect(() => {
resizeHeight();
}, [resizeHeight, size, value]);
innerControlRef.current.setAttribute('rows', currentRowsNumber.toString());
}, [rows, minRows, maxRows, innerValue]);

return (
<textarea
{...controlProps}
ref={handleRef}
style={{
...controlProps.style,
height: rows ? 'auto' : undefined,
}}
className={b('control', controlProps.className)}
name={name}
id={id}
tabIndex={tabIndex}
placeholder={placeholder}
value={value}
rows={rows || DEFAULT_TEXT_AREA_ROWS_NUMBER}
defaultValue={defaultValue}
rows={textareaRows}
autoFocus={autoFocus}
autoComplete={autoComplete}
onChange={onChange}
Expand Down
8 changes: 4 additions & 4 deletions src/components/controls/TextInput/TextInput.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ $block: '.#{variables.$ns}text-input';
&_size {
&_s {
#{$block}__control {
@include control-mixins.input-control(s);
@include control-mixins.input-control-min-height(s);
}

#{$block}__label {
Expand Down Expand Up @@ -178,7 +178,7 @@ $block: '.#{variables.$ns}text-input';

&_m {
#{$block}__control {
@include control-mixins.input-control(m);
@include control-mixins.input-control-min-height(m);
}

#{$block}__label {
Expand Down Expand Up @@ -209,7 +209,7 @@ $block: '.#{variables.$ns}text-input';

&_l {
#{$block}__control {
@include control-mixins.input-control(l);
@include control-mixins.input-control-min-height(l);
}

#{$block}__label {
Expand Down Expand Up @@ -240,7 +240,7 @@ $block: '.#{variables.$ns}text-input';

&_xl {
#{$block}__control {
@include control-mixins.input-control(xl);
@include control-mixins.input-control-min-height(xl);
}

#{$block}__label {
Expand Down
10 changes: 5 additions & 5 deletions src/components/controls/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@
@use '../variables.scss';
@use './variables.scss' as control-variables;

@mixin input-control($size) {
@mixin input-control-min-height($size) {
--_--input-control-border-width: var(
--g-text-input-border-width,
var(--g-text-area-border-width, #{control-variables.$border-width})
);
@if $size == 's' {
@include mixins.text-body-short;

height: calc(#{variables.$s-height} - var(--_--input-control-border-width) * 2);
min-height: calc(#{variables.$s-height} - var(--_--input-control-border-width) * 2);
padding: 3px 8px;
}
@if $size == 'm' {
@include mixins.text-body-short;

height: calc(#{variables.$m-height} - var(--_--input-control-border-width) * 2);
min-height: calc(#{variables.$m-height} - var(--_--input-control-border-width) * 2);
padding: 5px 8px;
}
@if $size == 'l' {
@include mixins.text-body-short;

height: calc(#{variables.$l-height} - var(--_--input-control-border-width) * 2);
min-height: calc(#{variables.$l-height} - var(--_--input-control-border-width) * 2);
padding: 9px 12px;
}
@if $size == 'xl' {
@include mixins.text-body-2;

height: calc(#{variables.$xl-height} - var(--_--input-control-border-width) * 2);
min-height: calc(#{variables.$xl-height} - var(--_--input-control-border-width) * 2);
padding: 11px 12px;
}
}
Loading