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

feat(documentation, styles): Update textarea styles and add floating label small variant #2857

Merged
merged 29 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
11fd926
feat(documentation, styles): some small changes
davidritter-dotcom Nov 29, 2023
512a869
feat(styles): padding ajustment
davidritter-dotcom Nov 29, 2023
a8472eb
Revert "feat(styles): padding ajustment"
davidritter-dotcom Feb 13, 2024
3f0d8aa
Revert "feat(documentation, styles): some small changes"
davidritter-dotcom Feb 13, 2024
996f8e7
Merge branch 'main' into 1834-update-textarea-styles
davidritter-dotcom Feb 13, 2024
1928f9d
feat(docs): docs and story
davidritter-dotcom Feb 14, 2024
40bb3ef
feat(styles): floating label large
davidritter-dotcom Feb 15, 2024
42185c2
feat(styles, documentation): floating label styles for small variant
davidritter-dotcom Feb 20, 2024
c610877
feat(styles): validation states and label size
davidritter-dotcom Mar 8, 2024
1d56366
feat(styles): disabled styles
davidritter-dotcom Mar 19, 2024
8568e9b
Merge branch 'main' into 1834-update-textarea-styles
davidritter-dotcom Mar 19, 2024
05723e7
feat(styles): textarea and input disabled state and focus
davidritter-dotcom Mar 19, 2024
74bbcde
feat(styles): validated styles and accessibility test
davidritter-dotcom Mar 20, 2024
6120bee
feat(styles): small change
davidritter-dotcom Mar 26, 2024
45a15ef
Merge branch 'main' into 1834-update-textarea-styles
davidritter-dotcom Mar 26, 2024
7b0dd3e
feat(styles): textarea styles update
davidritter-dotcom Mar 26, 2024
771d6f0
feat(styles): min height fix
davidritter-dotcom Mar 27, 2024
6d412de
Merge branch 'main' into 1834-update-textarea-styles
davidritter-dotcom Apr 3, 2024
5ce4074
fix(styles): lint and codesmell fix
davidritter-dotcom Apr 4, 2024
2116d9e
fix(styles): disable and valid, invalid style fix
davidritter-dotcom Apr 4, 2024
594a769
chore: add update
oliverschuerch Apr 16, 2024
be0bd1b
Merge branch 'main' into 1834-update-textarea-styles
oliverschuerch Apr 16, 2024
c1dfb97
fix(styles): boarder color on focused valid textarea
davidritter-dotcom Apr 17, 2024
0f7558b
Merge branch 'main' into 1834-update-textarea-styles
davidritter-dotcom Jun 4, 2024
ef32169
chore(documentation, styles): add changeset
davidritter-dotcom Jun 4, 2024
3354737
fix(documentation): code smell fix
davidritter-dotcom Jun 4, 2024
80719c7
Merge branch 'main' into 1834-update-textarea-styles
davidritter-dotcom Jun 11, 2024
7a25574
fix(documentation): missing import in the textarea story
davidritter-dotcom Jun 12, 2024
a075373
fix(documentation): code smell and small change on mapClasses function
davidritter-dotcom Jun 12, 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
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@ describe('Textarea', () => {
});

it('Has no detectable a11y violations on load for all variants', () => {
cy.checkA11y('#root-inner', {
rules: {
'color-contrast': {
enabled: false,
},
},
});
cy.checkA11y('#root-inner');
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ But note that the `<textarea>` element must come first, so we can ensure the cor

<div className="alert alert-warning">
<h4 className="alert-heading">We're deprecating the regular and medium sizes for text input, textarea and select.</h4>
<p className="mt-0">This will make it easier to select the appropriate size variant: small for internal applications, large for external applications.<br />`.form-control-rg` and `.form-control-md` are deprecated and will be removed in the next major version.</p>
<p className="mt-0">This will make it easier to select the appropriate size variant: small for internal applications, large for external applications.<br />
`.form-control-rg` and `.form-control-md` are deprecated and will be removed in the next major version.</p>
</div>

The size can be changed by simply adding one of four classes:
Expand All @@ -51,14 +52,13 @@ The size can be changed by simply adding one of four classes:
- Large: `.form-control-lg`

<div className="alert alert-info">
<h4 className="alert-heading">Do not apply size classes on floating-label elements</h4>
<div className="mt-0">
It is not intended to apply the size classes to `textarea` elements that are nested in a
`.form-floating` container.
</div>
Regular and medium size classes are not available on floating-label elements
</div>

<Canvas of={TextareaStories.Size} />
<div className="hide-col-default">
<Controls of={TextareaStories.Size} />
</div>

### Validation

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
import { html, nothing } from 'lit';
import { mapClasses } from '../../../../utils';
import { MetaComponent } from '../../../../../types';

const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
Expand All @@ -26,8 +25,8 @@ const meta: MetaComponent = {
floatingLabel: false,
hiddenLabel: false,
value: undefined,
size: 'null',
rows: 4,
size: 'form-control-lg',
sizeFloatingLabel: 'form-control-lg',
hint: 'Hintus textus elare volare cantare hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.',
disabled: false,
validation: 'null',
Expand Down Expand Up @@ -99,13 +98,32 @@ const meta: MetaComponent = {
category: 'General',
},
},
sizeFloatingLabel: {
name: 'Size',
description: "Sets the size of the component's appearance.",
if: {
arg: 'floatingLabel',
truthy: true,
},
control: {
type: 'select',
labels: {
'form-control-sm': 'Small',
'form-control-lg': 'Large',
},
},
options: ['form-control-sm', 'form-control-lg'],
table: {
category: 'General',
},
},
rows: {
name: 'Rows',
description:
'Attribute to set the initial height, in lines of text, of the `textarea` element.',
control: {
type: 'number',
min: 3,
min: 2,
max: 10,
step: 1,
},
Expand Down Expand Up @@ -160,11 +178,14 @@ type Story = StoryObj;
function renderTextarea(args: Args, context: StoryContext) {
const id =
context.id ?? `${context.viewMode}_${context.story.replace(/\s/g, '-')}_ExampleTextarea`;
const classes = mapClasses({
'form-control': true,
[args.size]: args.size && args.size !== 'null',
[args.validation]: args.validation && args.validation !== 'null',
});
const classes = [
'form-control',
args.floatingLabel ? args.sizeFloatingLabel : args.size,
args.validation,
]
.filter(c => c && c !== 'null')
.join(' ');

const useAriaLabel = !args.floatingLabel && args.hiddenLabel;
const label = !useAriaLabel
? html` <label for=${id} class="form-label">${args.label}</label> `
Expand Down
83 changes: 73 additions & 10 deletions packages/styles/src/components/floating-label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
@use './../mixins/forms' as forms-mx;
@use './../mixins/utilities' as utilities-mx;

@use './../functions/sizing';

@use './../variables/type';
@use './../variables/spacing';
@use './../variables/components/forms';
Expand Down Expand Up @@ -215,24 +217,28 @@
}

> textarea.form-control {
padding-top: forms.$input-padding-y-lg * 2;
padding-bottom: forms.$input-padding-y-lg;
padding-top: forms.$form-floating-textarea-padding-t !important;
padding-bottom: spacing.$size-mini;
padding-right: spacing.$size-large;
min-height: (forms.$form-floating-label-font-size * forms.$input-line-height-lg) +
forms.$form-floating-textarea-padding-t + spacing.$size-mini +
sizing.px-to-rem(forms.$input-border-width * 2);
height: auto;

~ label {
padding-bottom: 0;
width: calc(100% - (#{forms.$input-border-width * 2}));
max-width: none;
height: unset;
padding-top: spacing.$size-regular;
}

&:focus,
&:not(:placeholder-shown) {
padding-top: forms.$input-padding-y-lg * 2;
padding-bottom: forms.$input-padding-y-lg;
padding-bottom: spacing.$size-mini;

~ label {
padding-top: forms.$input-padding-y-lg * forms.$form-floating-label-scale;
padding-top: spacing.$size-mini;
width: calc(
(100% * #{forms.$form-floating-label-upscale}) - #{forms.$form-floating-label-translate-x *
forms.$form-floating-label-upscale * 2} - #{forms.$input-border-width * forms.$form-floating-label-upscale *
Expand All @@ -243,11 +249,46 @@
}
}

&.form-control-sm {
padding-top: forms.$form-floating-textarea-padding-t-sm !important;
padding-right: spacing.$size-large;
font-size: forms.$form-floating-label-font-size-placeholder-sm;
min-height: (
forms.$form-floating-label-font-size-placeholder-sm * forms.$input-line-height-sm
) + forms.$form-floating-textarea-padding-t-sm + spacing.$size-mini +
sizing.px-to-rem(forms.$input-border-width * 2);
height: auto;

~ label {
font-size: forms.$form-floating-label-font-size-placeholder-sm;
padding-left: spacing.$size-regular;
padding-top: spacing.$size-regular;
padding-right: spacing.$size-large;
}

&:focus,
&:not(:placeholder-shown) {
padding-bottom: spacing.$size-mini;

~ label {
transform: scale(forms.$form-floating-label-scale-sm);
padding-top: spacing.$size-mini;
width: calc(
(100% * #{forms.$form-floating-label-upscale-sm}) - #{forms.$form-floating-label-translate-x-sm *
forms.$form-floating-label-upscale-sm * 2} - #{forms.$input-border-width * forms.$form-floating-label-upscale-sm *
2} - #{forms.$form-floating-padding-x-sm * forms.$form-floating-label-upscale-sm}
);
max-width: none;
background: forms.$input-bg;
}
}
}

&:is(.is-valid, .is-invalid) {
~ label {
width: calc(
100% - (#{forms.$input-border-width * 2}) - #{forms.$form-floating-padding-x} - #{form-validation.$form-feedback-icon-offset} -
#{form-validation.$form-feedback-icon-size}
100% - (#{forms.$input-border-width * 2}) - #{form-validation.$form-feedback-icon-offset} -
#{forms.$form-bg-size}
);
}

Expand All @@ -257,11 +298,33 @@
width: calc(
(100% * #{forms.$form-floating-label-upscale}) - #{forms.$form-floating-label-translate-x *
forms.$form-floating-label-upscale * 2} - #{forms.$input-border-width * forms.$form-floating-label-upscale *
2} - #{forms.$form-floating-padding-x * forms.$form-floating-label-upscale} - #{form-validation.$form-feedback-icon-offset *
forms.$form-floating-label-upscale} - #{form-validation.$form-feedback-icon-size *
forms.$form-floating-label-upscale}
2} - #{form-validation.$form-feedback-icon-offset * forms.$form-floating-label-upscale} -
#{form-validation.$form-feedback-icon-size * forms.$form-floating-label-upscale}
);
}
}

&.form-control-sm {
~ label {
width: calc(
100% - (#{forms.$input-border-width * 2}) - #{form-validation.$form-feedback-icon-offset} -
#{forms.$form-bg-size-sm}
);
}

&:focus,
&:not(:placeholder-shown) {
padding-right: spacing.$size-bigger-big;

~ label {
width: calc(
(100% * #{forms.$form-floating-label-upscale-sm}) - #{forms.$form-floating-label-translate-x *
forms.$form-floating-label-upscale-sm * 2} - #{forms.$input-border-width * forms.$form-floating-label-upscale-sm *
2} - #{form-validation.$form-feedback-icon-offset *
forms.$form-floating-label-upscale-sm} - #{forms.$form-bg-size-sm * forms.$form-floating-label-upscale-sm}
);
}
}
}
}
}
Expand Down
15 changes: 10 additions & 5 deletions packages/styles/src/components/form-textarea.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
@use './../variables/spacing';
@use './../variables/components/forms';
@use './../functions/sizing';

textarea {
&.form-control {
textarea.form-control {
&::-webkit-resizer {
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 15 15' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='#{forms.$input-border-color}' d='M0 12H3V15H0V12Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M6 12H9V15H6V12Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M6 6H9V9H6V6Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M12 6H15V9H12V6Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M12 0H15V3H12V0Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M12 12H15V15H12V12Z'/%3E%3C/svg%3E");
background-repeat: no-repeat;
background-size: 75%;
}

&[disabled] {
&::-webkit-resizer {
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 15 15' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='#{forms.$input-border-color}' d='M0 12H3V15H0V12Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M6 12H9V15H6V12Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M6 6H9V9H6V6Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M12 6H15V9H12V6Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M12 0H15V3H12V0Z'/%3E%3Cpath fill='#{forms.$input-border-color}' d='M12 12H15V15H12V12Z'/%3E%3C/svg%3E");
background-repeat: no-repeat;
background-size: 75%;
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 15 15' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='#{forms.$input-disabled-border-color}' d='M0 12H3V15H0V12Z'/%3E%3Cpath fill='#{forms.$input-disabled-border-color}' d='M6 12H9V15H6V12Z'/%3E%3Cpath fill='#{forms.$input-disabled-border-color}' d='M6 6H9V9H6V6Z'/%3E%3Cpath fill='#{forms.$input-disabled-border-color}' d='M12 6H15V9H12V6Z'/%3E%3Cpath fill='#{forms.$input-disabled-border-color}' d='M12 0H15V3H12V0Z'/%3E%3Cpath fill='#{forms.$input-disabled-border-color}' d='M12 12H15V15H12V12Z'/%3E%3C/svg%3E");
}
}
}
35 changes: 29 additions & 6 deletions packages/styles/src/components/form-validation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,12 @@
.form-control,
.form-select {
&.is-invalid {
border-color: form-validation.$form-feedback-invalid-color;

&:focus {
&:not(:disabled) {
border-color: form-validation.$form-feedback-invalid-color;

&:focus {
border-color: form-validation.$form-feedback-invalid-color;
}
}

&:not(&[type='file']) {
Expand All @@ -116,13 +118,19 @@
}
}
}

&.form-control-sm ~ .invalid-feedback {
padding: form-validation.$form-feedback-padding-y-sm form-validation.$form-feedback-padding-x;
}
}

&.is-valid {
border-color: var(--post-success);
&:not(:disabled) {
border-color: var(--post-success);

&:focus {
border-color: form-validation.$form-feedback-valid-color;
&:focus {
border-color: var(--post-success);
}
}

&:not(&[type='file']) {
Expand All @@ -136,6 +144,10 @@
}
}
}

&.form-control-sm ~ .valid-feedback {
padding: form-validation.$form-feedback-padding-y-sm form-validation.$form-feedback-padding-x;
}
}

&.is-invalid,
Expand All @@ -159,6 +171,17 @@
}
}

textarea.form-control {
&.is-invalid,
&.is-valid {
background-position: right spacing.$size-micro top spacing.$size-mini;

&.form-control-sm {
background-position: right spacing.$size-micro top spacing.$size-mini;
}
}
}

.form-check-input {
@include form-validation-mx.form-validation-state-selector(invalid) {
border-color: form-validation.$form-feedback-invalid-color;
Expand Down
Loading
Loading