From 92186d32e2ab50a1c2e850a4b1a308bb601c2266 Mon Sep 17 00:00:00 2001 From: mrholek Date: Thu, 7 Mar 2024 00:06:05 +0100 Subject: [PATCH 01/92] refactor(CBadge): update badge colors --- packages/coreui-vue/src/components/badge/CBadge.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/coreui-vue/src/components/badge/CBadge.ts b/packages/coreui-vue/src/components/badge/CBadge.ts index 6fdfd798..18480ba4 100644 --- a/packages/coreui-vue/src/components/badge/CBadge.ts +++ b/packages/coreui-vue/src/components/badge/CBadge.ts @@ -61,7 +61,7 @@ const CBadge = defineComponent({ class: [ 'badge', { - [`bg-${props.color}`]: props.color, + [`text-bg-${props.color}`]: props.color, 'position-absolute translate-middle': props.position, 'top-0': props.position && props.position.includes('top'), 'top-100': props.position && props.position.includes('bottom'), From 60899f7f499954c6116de86f69ed39dbeb80ee20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Sun, 10 Mar 2024 11:18:27 +0100 Subject: [PATCH 02/92] Merge pull request #282 from gfoidl/accordion-active-item-key Accordion watches for activeItemKey changes --- packages/coreui-vue/src/components/accordion/CAccordion.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/coreui-vue/src/components/accordion/CAccordion.ts b/packages/coreui-vue/src/components/accordion/CAccordion.ts index 1422d40b..eee9a535 100644 --- a/packages/coreui-vue/src/components/accordion/CAccordion.ts +++ b/packages/coreui-vue/src/components/accordion/CAccordion.ts @@ -1,4 +1,4 @@ -import { defineComponent, h, provide, ref } from 'vue' +import { defineComponent, h, provide, ref, watch } from 'vue' const CAccordion = defineComponent({ name: 'CAccordion', @@ -21,6 +21,9 @@ const CAccordion = defineComponent({ const setActiveItemKey = (key: string | number) => { activeItemKey.value = key } + + watch(() => props.activeItemKey, value => activeItemKey.value = value) + provide('activeItemKey', activeItemKey) provide('alwaysOpen', props.alwaysOpen) provide('setActiveItemKey', setActiveItemKey) From 26ff1351ad0ffb74e9631a33087579bfad55a3ce Mon Sep 17 00:00:00 2001 From: mrholek Date: Sun, 10 Mar 2024 11:40:15 +0100 Subject: [PATCH 03/92] style: format syntax --- packages/coreui-vue/src/components/accordion/CAccordion.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/coreui-vue/src/components/accordion/CAccordion.ts b/packages/coreui-vue/src/components/accordion/CAccordion.ts index eee9a535..639b5af2 100644 --- a/packages/coreui-vue/src/components/accordion/CAccordion.ts +++ b/packages/coreui-vue/src/components/accordion/CAccordion.ts @@ -21,8 +21,11 @@ const CAccordion = defineComponent({ const setActiveItemKey = (key: string | number) => { activeItemKey.value = key } - - watch(() => props.activeItemKey, value => activeItemKey.value = value) + + watch( + () => props.activeItemKey, + (value) => (activeItemKey.value = value), + ) provide('activeItemKey', activeItemKey) provide('alwaysOpen', props.alwaysOpen) From 54373f14ba439244c14d67f0b77fe6233cdb0001 Mon Sep 17 00:00:00 2001 From: mrholek Date: Sun, 10 Mar 2024 11:53:41 +0100 Subject: [PATCH 04/92] fix(CFormSwitch, CFormTextarea): class attribute values are not combining --- packages/coreui-vue/src/components/form/CFormSwitch.ts | 1 + packages/coreui-vue/src/components/form/CFormTextarea.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/coreui-vue/src/components/form/CFormSwitch.ts b/packages/coreui-vue/src/components/form/CFormSwitch.ts index a1c54a1e..6b75cd36 100644 --- a/packages/coreui-vue/src/components/form/CFormSwitch.ts +++ b/packages/coreui-vue/src/components/form/CFormSwitch.ts @@ -94,6 +94,7 @@ const CFormSwitch = defineComponent({ 'is-invalid': props.invalid, 'is-valid': props.valid, }, + attrs.class, ], id: props.id, onChange: (event: InputEvent) => handleChange(event), diff --git a/packages/coreui-vue/src/components/form/CFormTextarea.ts b/packages/coreui-vue/src/components/form/CFormTextarea.ts index 21fb3596..a953991d 100644 --- a/packages/coreui-vue/src/components/form/CFormTextarea.ts +++ b/packages/coreui-vue/src/components/form/CFormTextarea.ts @@ -133,6 +133,7 @@ const CFormTextarea = defineComponent({ 'is-invalid': props.invalid, 'is-valid': props.valid, }, + attrs.class, ], onChange: (event: InputEvent) => handleChange(event), onInput: (event: InputEvent) => handleInput(event), From 6dd629d4ddc40f4994bee63c42ed9699f5a18c87 Mon Sep 17 00:00:00 2001 From: mrholek Date: Sun, 10 Mar 2024 11:56:01 +0100 Subject: [PATCH 05/92] docs: update content --- packages/docs/forms/textarea.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/docs/forms/textarea.md b/packages/docs/forms/textarea.md index 558c1b20..b1361c63 100644 --- a/packages/docs/forms/textarea.md +++ b/packages/docs/forms/textarea.md @@ -15,13 +15,12 @@ other_frameworks: textarea text="Must be 8-20 words long."> ::: ```vue - - + ``` From 5d337d61155270f95bb8a425d939ede0d4e9dddd Mon Sep 17 00:00:00 2001 From: mrholek Date: Sun, 10 Mar 2024 12:19:46 +0100 Subject: [PATCH 06/92] fix(CFormCheck): the `checked` attribute is not working when `value` is set --- .../src/components/form/CFormCheck.ts | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/coreui-vue/src/components/form/CFormCheck.ts b/packages/coreui-vue/src/components/form/CFormCheck.ts index ea044fba..fbdd26fd 100644 --- a/packages/coreui-vue/src/components/form/CFormCheck.ts +++ b/packages/coreui-vue/src/components/form/CFormCheck.ts @@ -189,7 +189,7 @@ const CFormCheck = defineComponent({ const formControl = () => { return h('input', { ...attrs, - ...((props.modelValue || props.value) && { checked: isChecked.value }), + ...(props.modelValue && { checked: isChecked.value }), class: inputClassName, id: props.id, indeterminate: props.indeterminate, @@ -236,26 +236,26 @@ const CFormCheck = defineComponent({ props.button ? [formControl(), (slots.label || props.label) && formLabel(), formValidation()] : props.label - ? props.hitArea - ? [ - h( - CFormLabel, + ? props.hitArea + ? [ + h( + CFormLabel, + { + customClassName: className, + ...(props.id && { for: props.id }), + }, + [formControl(), props.label], + ), + formValidation(), + ] + : h( + 'div', { - customClassName: className, - ...(props.id && { for: props.id }), + class: className, }, - [formControl(), props.label], - ), - formValidation(), - ] - : h( - 'div', - { - class: className, - }, - [formControl(), props.label && formLabel(), formValidation()], - ) - : formControl() + [formControl(), props.label && formLabel(), formValidation()], + ) + : formControl() }, }) From 5f75e9e793459596ef9210d19730c91d924d9070 Mon Sep 17 00:00:00 2001 From: mrholek Date: Sun, 10 Mar 2024 12:43:59 +0100 Subject: [PATCH 07/92] docs: update content --- packages/docs/forms/radio.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/docs/forms/radio.md b/packages/docs/forms/radio.md index 90d93af2..938663c7 100644 --- a/packages/docs/forms/radio.md +++ b/packages/docs/forms/radio.md @@ -27,18 +27,18 @@ Add the `disabled` attribute and the associated `