|
1 | 1 | <template> |
2 | 2 | <div> |
3 | | - <label> |
4 | | - <div :class="['d-checkbox-group', { 'd-checkbox-group--disabled': internalDisabled }]"> |
5 | | - <div class="d-checkbox__input"> |
6 | | - <input |
7 | | - type="checkbox" |
8 | | - :checked="internalChecked" |
9 | | - :name="internalName" |
10 | | - :value="value" |
11 | | - :disabled="internalDisabled" |
12 | | - :class="['d-checkbox', inputValidationClass, inputClass]" |
13 | | - v-bind="$attrs" |
14 | | - :indeterminate.prop="internalIndeterminate" |
15 | | - v-on="inputListeners" |
16 | | - > |
17 | | - </div> |
18 | | - <div |
19 | | - v-if="hasLabelOrDescription" |
20 | | - class="d-checkbox__copy d-checkbox__label" |
21 | | - data-qa="checkbox-label-description-container" |
| 3 | + <label :class="['d-checkbox-group', { 'd-checkbox-group--disabled': internalDisabled }]"> |
| 4 | + <div class="d-checkbox__input"> |
| 5 | + <input |
| 6 | + type="checkbox" |
| 7 | + :checked="internalChecked" |
| 8 | + :name="internalName" |
| 9 | + :value="value" |
| 10 | + :disabled="internalDisabled" |
| 11 | + :class="['d-checkbox', inputValidationClass, inputClass]" |
| 12 | + v-bind="$attrs" |
| 13 | + :indeterminate.prop="internalIndeterminate" |
| 14 | + v-on="inputListeners" |
22 | 15 | > |
23 | | - <div |
24 | | - v-if="hasLabel" |
25 | | - :class="labelClass" |
26 | | - v-bind="labelChildProps" |
27 | | - data-qa="checkbox-label" |
28 | | - > |
29 | | - <!-- @slot slot for Checkbox Label --> |
30 | | - <slot>{{ label }}</slot> |
31 | | - </div> |
32 | | - <div |
33 | | - v-if="hasDescription" |
34 | | - :class="['d-description', descriptionClass]" |
35 | | - v-bind="descriptionChildProps" |
36 | | - data-qa="checkbox-description" |
37 | | - > |
38 | | - <!-- @slot slot for Checkbox Description --> |
39 | | - <slot name="description">{{ description }}</slot> |
40 | | - </div> |
41 | | - <dt-validation-messages |
42 | | - :validation-messages="formattedMessages" |
43 | | - :show-messages="showMessages" |
44 | | - :class="messagesClass" |
45 | | - v-bind="messagesChildProps" |
46 | | - data-qa="dt-checkbox-validation-messages" |
47 | | - /> |
48 | | - </div> |
| 16 | + </div> |
| 17 | + <div |
| 18 | + v-if="hasLabel" |
| 19 | + :class="[labelClass, 'd-checkbox__copy d-checkbox__label']" |
| 20 | + v-bind="labelChildProps" |
| 21 | + data-qa="checkbox-label" |
| 22 | + > |
| 23 | + <!-- @slot slot for Checkbox Label --> |
| 24 | + <slot>{{ label }}</slot> |
49 | 25 | </div> |
50 | 26 | </label> |
| 27 | + <div |
| 28 | + v-if="hasDescriptionOrMessages" |
| 29 | + class="d-checkbox__messages" |
| 30 | + data-qa="checkbox-description-messages" |
| 31 | + > |
| 32 | + <div |
| 33 | + v-if="hasDescription" |
| 34 | + :class="['d-description', descriptionClass]" |
| 35 | + v-bind="descriptionChildProps" |
| 36 | + data-qa="checkbox-description" |
| 37 | + > |
| 38 | + <!-- @slot slot for Checkbox Description --> |
| 39 | + <slot name="description"> |
| 40 | + {{ description }} |
| 41 | + </slot> |
| 42 | + </div> |
| 43 | + <dt-validation-messages |
| 44 | + :validation-messages="formattedMessages" |
| 45 | + :show-messages="showMessages" |
| 46 | + :class="messagesClass" |
| 47 | + v-bind="messagesChildProps" |
| 48 | + data-qa="dt-checkbox-validation-messages" |
| 49 | + /> |
| 50 | + </div> |
51 | 51 | </div> |
52 | 52 | </template> |
53 | 53 |
|
@@ -119,8 +119,12 @@ export default { |
119 | 119 | return !!(this.$slots.description || this.description); |
120 | 120 | }, |
121 | 121 |
|
122 | | - hasLabelOrDescription () { |
123 | | - return this.hasLabel || this.hasDescription; |
| 122 | + hasDescriptionOrMessages () { |
| 123 | + return this.hasDescription || this.hasMessages; |
| 124 | + }, |
| 125 | +
|
| 126 | + hasMessages () { |
| 127 | + return this.formattedMessages.length && this.showMessages; |
124 | 128 | }, |
125 | 129 |
|
126 | 130 | inputListeners () { |
|
0 commit comments