(
- ({ children, className, color, textColor, ...rest }, ref) => {
+ ({ children, className, color, textBgColor, textColor, ...rest }, ref) => {
return (
(
{
[`bg-${color}`]: color,
[`text-${textColor}`]: textColor,
+ [`text-bg-${textBgColor}`]: textBgColor,
},
className,
)}
@@ -49,6 +57,7 @@ CCard.propTypes = {
children: PropTypes.node,
className: PropTypes.string,
color: colorPropType,
+ textBgColor: colorPropType,
textColor: PropTypes.string,
}
diff --git a/packages/coreui-react/src/components/card/__tests__/CCard.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCard.spec.tsx
index c22e6080..6b4f9b11 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCard.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCard.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCard } from '../../../index'
+import { CCard } from '../index'
test('loads and displays CCard component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardBody.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardBody.spec.tsx
index 8b79b9f5..0bf1ccd9 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardBody.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardBody.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardBody } from '../../../index'
+import { CCardBody } from '../index'
test('loads and displays CCardBody component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardFooter.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardFooter.spec.tsx
index 0b47f51f..991e3c7c 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardFooter.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardFooter.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardFooter } from '../../../index'
+import { CCardFooter } from '../index'
test('loads and displays CCardFooter component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardGroup.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardGroup.spec.tsx
index a0228126..239c1fd9 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardGroup.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardGroup.spec.tsx
@@ -12,7 +12,7 @@ import {
CCardTitle,
CCardText,
CCardGroup,
-} from '../../../index'
+} from '../index'
test('loads and displays CCardGroup component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardHeader.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardHeader.spec.tsx
index ffb43bab..0477b503 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardHeader.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardHeader.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardHeader } from '../../../index'
+import { CCardHeader } from '../index'
test('loads and displays CCardHeader component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardImage.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardImage.spec.tsx
index 88c20fd1..e1214093 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardImage.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardImage.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardImage } from '../../../index'
+import { CCardImage } from '../index'
test('loads and displays CCardImage component', async () => {
const { container } = render()
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardImageOverlay.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardImageOverlay.spec.tsx
index d161d9c2..6574856b 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardImageOverlay.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardImageOverlay.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardImageOverlay } from '../../../index'
+import { CCardImageOverlay } from '../index'
test('loads and displays CCardImageOverlay component', async () => {
const { container } = render()
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardLink.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardLink.spec.tsx
index 2251ac29..2373537f 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardLink.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardLink.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardLink } from '../../../index'
+import { CCardLink } from '../index'
test('loads and displays CCardLink component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardSubtitle.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardSubtitle.spec.tsx
index a44165f4..8a23f9c8 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardSubtitle.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardSubtitle.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardSubtitle } from '../../../index'
+import { CCardSubtitle } from '../index'
test('loads and displays CCardSubtitle component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardText.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardText.spec.tsx
index 06d2ca3a..3cbb4ab2 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardText.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardText.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardText } from '../../../index'
+import { CCardText } from '../index'
test('loads and displays CCardText component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/card/__tests__/CCardTitle.spec.tsx b/packages/coreui-react/src/components/card/__tests__/CCardTitle.spec.tsx
index ada47122..9733a7f4 100644
--- a/packages/coreui-react/src/components/card/__tests__/CCardTitle.spec.tsx
+++ b/packages/coreui-react/src/components/card/__tests__/CCardTitle.spec.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { render } from '@testing-library/react'
import '@testing-library/jest-dom'
-import { CCardTitle } from '../../../index'
+import { CCardTitle } from '../index'
test('loads and displays CCardTitle component', async () => {
const { container } = render(Test)
diff --git a/packages/coreui-react/src/components/carousel/CCarousel.tsx b/packages/coreui-react/src/components/carousel/CCarousel.tsx
index 4e7e95ca..3d3186d3 100644
--- a/packages/coreui-react/src/components/carousel/CCarousel.tsx
+++ b/packages/coreui-react/src/components/carousel/CCarousel.tsx
@@ -1,6 +1,5 @@
import React, {
Children,
- createContext,
forwardRef,
HTMLAttributes,
TouchEvent,
@@ -14,6 +13,8 @@ import classNames from 'classnames'
import { isInViewport } from '../../utils'
import { useForkedRef } from '../../hooks'
+import { CCarouselContext } from './CCarouselContext'
+
export interface CCarouselProps extends HTMLAttributes {
/**
* index of the active item.
@@ -71,13 +72,6 @@ interface DataType {
timeout?: null | ReturnType
}
-export interface ContextProps {
- setAnimating: (a: boolean) => void
- setCustomInterval: (a: boolean | number) => void
-}
-
-export const CCarouselContext = createContext({} as ContextProps)
-
export const CCarousel = forwardRef(
(
{
@@ -96,7 +90,7 @@ export const CCarousel = forwardRef(
wrap = true,
...rest
},
- ref,
+ ref
) => {
const carouselRef = useRef(null)
const forkedRef = useForkedRef(ref, carouselRef)
@@ -141,7 +135,7 @@ export const CCarousel = forwardRef(
if (typeof interval === 'number') {
data.timeout = setTimeout(
() => nextItemWhenVisible(),
- typeof customInterval === 'number' ? customInterval : interval,
+ typeof customInterval === 'number' ? customInterval : interval
)
}
}
@@ -228,7 +222,7 @@ export const CCarousel = forwardRef(
{
'carousel-fade': transition === 'crossfade',
},
- className,
+ className
)}
{...(dark && { 'data-coreui-theme': 'dark' })}
onMouseEnter={_pause}
@@ -288,7 +282,7 @@ export const CCarousel = forwardRef(
)
- },
+ }
)
CCarousel.propTypes = {
diff --git a/packages/coreui-react/src/components/carousel/CCarouselCaption.tsx b/packages/coreui-react/src/components/carousel/CCarouselCaption.tsx
index 6e1cd5d1..353a6b1b 100644
--- a/packages/coreui-react/src/components/carousel/CCarouselCaption.tsx
+++ b/packages/coreui-react/src/components/carousel/CCarouselCaption.tsx
@@ -12,7 +12,7 @@ export interface CCarouselCaptionProps extends HTMLAttributes {
export const CCarouselCaption = forwardRef(
({ className, ...rest }, ref) => {
return
- },
+ }
)
CCarouselCaption.propTypes = {
diff --git a/packages/coreui-react/src/components/carousel/CCarouselContext.ts b/packages/coreui-react/src/components/carousel/CCarouselContext.ts
new file mode 100644
index 00000000..6e21932b
--- /dev/null
+++ b/packages/coreui-react/src/components/carousel/CCarouselContext.ts
@@ -0,0 +1,8 @@
+import { createContext } from 'react'
+
+export interface CCarouselContextProps {
+ setAnimating: (a: boolean) => void
+ setCustomInterval: (a: boolean | number) => void
+}
+
+export const CCarouselContext = createContext({} as CCarouselContextProps)
\ No newline at end of file
diff --git a/packages/coreui-react/src/components/carousel/CCarouselItem.tsx b/packages/coreui-react/src/components/carousel/CCarouselItem.tsx
index 3b8744cc..90f4f6ca 100644
--- a/packages/coreui-react/src/components/carousel/CCarouselItem.tsx
+++ b/packages/coreui-react/src/components/carousel/CCarouselItem.tsx
@@ -3,7 +3,9 @@ import PropTypes from 'prop-types'
import classNames from 'classnames'
import { useForkedRef } from '../../hooks'
-import { CCarouselContext } from './CCarousel'
+
+import { CCarouselContext } from './CCarouselContext'
+
export interface CCarouselItemProps extends HTMLAttributes {
/**
* @ignore
@@ -29,7 +31,7 @@ export const CCarouselItem = forwardRef(
const carouselItemRef = useRef(null)
const forkedRef = useForkedRef(ref, carouselItemRef)
- const prevActive = useRef()
+ const prevActive = useRef(undefined)
const [directionClassName, setDirectionClassName] = useState()
const [orderClassName, setOrderClassName] = useState()
const [activeClassName, setActiveClassName] = useState(active && 'active')
@@ -101,7 +103,7 @@ export const CCarouselItem = forwardRef(
activeClassName,
directionClassName,
orderClassName,
- className,
+ className
)}
ref={forkedRef}
{...rest}
@@ -109,7 +111,7 @@ export const CCarouselItem = forwardRef(
{children}