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

chore: update form group to 1030 #1173

Merged
merged 2 commits into from
Apr 18, 2021
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
18 changes: 17 additions & 1 deletion packages/core/src/components/cv-form/cv-form-group.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<template>
<fieldset :class="`cv-form-group ${carbonPrefix}--fieldset`">
<fieldset
:class="[
`cv-form-group ${carbonPrefix}--fieldset`,
{
[`${carbonPrefix}--fieldset--no-margin`]: noMargin,
},
]"
:data-invalid="invalid"
>
<legend :class="`${carbonPrefix}--label`">
<slot name="label"></slot>
</legend>
<slot name="content"></slot>
<div v-if="message" :class="`${carbonPrefix}--form__requirements`">
{{ message }}
</div>
</fieldset>
</template>

Expand All @@ -12,5 +23,10 @@ import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvFormGroup',
mixins: [carbonPrefixMixin],
props: {
noMargin: Boolean,
invalid: Boolean,
message: String,
},
};
</script>
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-form/cv-form-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CvForm has no properties and a single default slot
Used inside a form to group components such as checkboxes and radio buttons.

```html
<cv-form-group>
<cv-form-group noMargin invalid message="Optional text message">
<template slot="label">Form group legend</template>
<template slot="content">
<label> Small <input type="radio" name="size" id="size_1" value="small" /> </label>
Expand Down
2 changes: 1 addition & 1 deletion storybook/.storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ addDecorator(withNotes);
addParameters({
options: {
name: 'Carbon Components in Vue.js',
url: 'https://github.com/carbon-design-system/carbon-components-vue/blob/master/packages/core/README.md',
url: 'https://github.com/carbon-design-system/carbon-components-vue/blob/main/packages/core/README.md',
theme: themes.dark,
isToolshown: true,
showPanel: true,
Expand Down
77 changes: 77 additions & 0 deletions storybook/stories/cv-form-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ import knobsHelper from '../_storybook/utils/knobs-helper';
import CvFormNotesMD from '../../packages/core/src/components/cv-form/cv-form-notes.md';
import {
CvForm,
CvFormGroup,
CvTextArea,
CvTextInput,
CvSelect,
CvButton,
CvRadioButton,
CvRadioGroup,
CvSelectOptgroup,
CvSelectOption,
} from '../../packages/core/src/';
Expand Down Expand Up @@ -102,3 +105,77 @@ for (const story of storySet) {
}
);
}

for (const story of storySet) {
storiesDefault.add(
`form-group-${story.name}`,
() => {
const settings = story.knobs();

// ----------------------------------------------------------------

const templateString = `
<cv-form @submit.prevent="actionSubmit">
<cv-form-group style="style" noMargin invalid message="An optional message">
<template slot="label">
FormGroup label-legend
</template>
<template slot="content">
<cv-text-input label="First Name" />
<cv-text-input label="Last Name" />
<cv-radio-group>
<cv-radio-button label="Option 1" value="radio-1" id="radio-1" />
<cv-radio-button label="Option 2" value="radio-2" id="radio-2" />
<cv-radio-button label="Option 3" value="radio-3" id="radio-3" />
</cv-radio-group>
</template>
</cv-form-group>
<cv-button>Submit</cv-button>
</cv-form>`;

// ----------------------------------------------------------------

const templateViewString = `
<sv-template-view
sv-margin
sv-source='${templateString.trim()}'>
<template slot="component">${templateString}</template>
</sv-template-view>
`;

return {
components: {
CvForm,
CvFormGroup,
CvButton,
CvRadioButton,
CvRadioGroup,
CvTextInput,
SvTemplateView,
},

template: templateViewString,
props: settings.props,
computed: {
style() {
return { maxWidth: '400px' };
},
},
mounted() {
this.doSubmit = action('cv-form-group -submit event');
},
methods: {
actionSubmit(ev) {
// eslint-disable-next-line
console.dir([].slice.call(ev.target, [0, ev.target.length]));

this.doSubmit();
},
},
};
},
{
notes: { markdown: CvFormNotesMD },
}
);
}
2 changes: 1 addition & 1 deletion storybook/stories/cv-tile-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ let preKnobs = {
type: text,
config: [
'where to go when clicked',
'https://github.com/carbon-design-system/carbon-components-vue/blob/master/README.md',
'https://github.com/carbon-design-system/carbon-components-vue/blob/main/README.md',
],
prop: 'href',
},
Expand Down