Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coreui/coreui-react
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 90d8100
Choose a base ref
...
head repository: classicvalues/coreui-react
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6745092
Choose a head ref
  • 7 commits
  • 30 files changed
  • 2 contributors

Commits on May 25, 2023

  1. CTable put 0 data in but not add

    CTable put 0 data in but not add
    birariro authored May 25, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4a6b733 View commit details

Commits on Jun 8, 2023

  1. Update CTable.tsx

    It allows to pass empty empty column using null
    mrholek authored Jun 8, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d6ecc74 View commit details
  2. Merge pull request #362 from birariro/patch-1

    fix: CTable put 0 data in but not add
    mrholek authored Jun 8, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2b36377 View commit details

Commits on Jun 28, 2023

  1. Copy the full SHA
    79d0f2a View commit details
  2. Copy the full SHA
    616a60d View commit details

Commits on Jun 29, 2023

  1. chore: clean-up

    mrholek committed Jun 29, 2023
    Copy the full SHA
    7996d2b View commit details
  2. release: v4.9.0-rc.0

    mrholek committed Jun 29, 2023
    Copy the full SHA
    6745092 View commit details
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@

Several quick start options are available:

- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.9.0-beta.2.zip)
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.9.0-rc.0.zip)
- Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"npmClient": "yarn",
"packages": ["packages/*"],
"version": "4.9.0-beta.2",
"version": "4.9.0-rc.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -33,5 +33,13 @@
"lerna": "^7.1.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8"
},
"overrides": {
"gatsby-remark-external-links": {
"unist-util-find": "1.0.2"
}
},
"resolutions": {
"**/gatsby-remark-external-links/unist-util-find": "1.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/coreui-icons-react
2 changes: 1 addition & 1 deletion packages/coreui-react-chartjs
2 changes: 1 addition & 1 deletion packages/coreui-react/README.md
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@

Several quick start options are available:

- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.9.0-beta.2.zip)
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.9.0-rc.0.zip)
- Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`
4 changes: 2 additions & 2 deletions packages/coreui-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/react",
"version": "4.9.0-beta.2",
"version": "4.9.0-rc.0",
"description": "UI Components Library for React.js",
"keywords": [
"react",
@@ -60,7 +60,7 @@
"typescript": "^4.9.5"
},
"peerDependencies": {
"@coreui/coreui": "4.3.0-beta.0",
"@coreui/coreui": "4.2.6",
"react": ">=17",
"react-dom": ">=17"
}
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ export interface CDropdownProps extends HTMLAttributes<HTMLDivElement | HTMLLIEl
/**
* Callback fired when the component requests to be hidden.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
onHide?: () => void
/**
6 changes: 3 additions & 3 deletions packages/coreui-react/src/components/popover/CPopover.tsx
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ export interface CPopoverProps extends Omit<HTMLAttributes<HTMLDivElement>, 'tit
/**
* Apply a CSS fade transition to the popover.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
animation?: boolean
/**
@@ -31,13 +31,13 @@ export interface CPopoverProps extends Omit<HTMLAttributes<HTMLDivElement>, 'tit
/**
* The delay for displaying and hiding the popover (in milliseconds). When a numerical value is provided, the delay applies to both the hide and show actions. The object structure for specifying the delay is as follows: delay: `{ 'show': 500, 'hide': 100 }`.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
delay?: number | { show: number; hide: number }
/**
* Specify the desired order of fallback placements by providing a list of placements as an array. The placements should be prioritized based on preference.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
fallbackPlacements?: Placements | Placements[]
/**
6 changes: 3 additions & 3 deletions packages/coreui-react/src/components/tooltip/CTooltip.tsx
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ export interface CTooltipProps extends Omit<HTMLAttributes<HTMLDivElement>, 'con
/**
* Apply a CSS fade transition to the tooltip.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
animation?: boolean
/**
@@ -27,13 +27,13 @@ export interface CTooltipProps extends Omit<HTMLAttributes<HTMLDivElement>, 'con
/**
* The delay for displaying and hiding the tooltip (in milliseconds). When a numerical value is provided, the delay applies to both the hide and show actions. The object structure for specifying the delay is as follows: delay: `{ 'show': 500, 'hide': 100 }`.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
delay?: number | { show: number; hide: number }
/**
* Specify the desired order of fallback placements by providing a list of placements as an array. The placements should be prioritized based on preference.
*
* @since 4.9.0-beta.2
* @since 4.9.0-rc.0
*/
fallbackPlacements?: Placements | Placements[]
/**
3 changes: 1 addition & 2 deletions packages/coreui-react/src/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useColorModes } from './useColorModes'
import { useForkedRef } from './useForkedRef'
import { usePopper } from './usePopper'

export { useColorModes, useForkedRef, usePopper }
export { useForkedRef, usePopper }
3 changes: 2 additions & 1 deletion packages/docs/content/api/CDropdown.api.mdx
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ import CDropdown from '@coreui/react/src/components/dropdown/CDropdown'
| **component** | Component used for the root node. Either a string to use a HTML element or a component. | `string` \| `ComponentClass<any, any>` \| `FunctionComponent<any>` | div |
| **dark** | Sets a darker color scheme to match a dark navbar. | `boolean` | - |
| **direction** | Sets a specified direction and location of the dropdown menu. | `'center'` \| `'dropup'` \| `'dropup-center'` \| `'dropend'` \| `'dropstart'` | - |
| **onHide** | Callback fired when the component requests to be hidden. | `() => void` | - |
| **offset** | Offset of the dropdown menu relative to its target. | `[number, number]` | [0, 2] |
| **onHide** **_4.9.0-rc.0+_** | Callback fired when the component requests to be hidden. | `() => void` | - |
| **onShow** | Callback fired when the component requests to be shown. | `() => void` | - |
| **placement** | Describes the placement of your component after Popper.js has applied all the modifiers that may have flipped or altered the originally provided placement property. | `'auto'` \| `'top-end'` \| `'top'` \| `'top-start'` \| `'bottom-end'` \| `'bottom'` \| `'bottom-start'` \| `'right-start'` \| `'right'` \| `'right-end'` \| `'left-start'` \| `'left'` \| `'left-end'` | bottom-start |
| **popper** | If you want to disable dynamic positioning set this property to `true`. | `boolean` | true |
5 changes: 4 additions & 1 deletion packages/docs/content/api/CPopover.api.mdx
Original file line number Diff line number Diff line change
@@ -7,12 +7,15 @@ import CPopover from '@coreui/react/src/components/popover/CPopover'

| Property | Description | Type | Default |
| --- | --- | --- | --- |
| **animation** **_4.9.0-rc.0+_** | Apply a CSS fade transition to the popover. | `boolean` | true |
| **className** | A string of all className you want applied to the component. | `string` | - |
| **content** | Content node for your component. | `ReactNode` | - |
| **delay** **_4.9.0-rc.0+_** | The delay for displaying and hiding the popover (in milliseconds). When a numerical value is provided, the delay applies to both the hide and show actions. The object structure for specifying the delay is as follows: delay: `{ 'show': 500, 'hide': 100 }`. | `number` \| `{ show: number; hide: number; }` | 0 |
| **fallbackPlacements** **_4.9.0-rc.0+_** | Specify the desired order of fallback placements by providing a list of placements as an array. The placements should be prioritized based on preference. | `Placements` \| `Placements[]` | ['top', 'right', 'bottom', 'left'] |
| **offset** | Offset of the popover relative to its target. | `[number, number]` | [0, 8] |
| **onHide** | Callback fired when the component requests to be hidden. | `() => void` | - |
| **onShow** | Callback fired when the component requests to be shown. | `() => void` | - |
| **placement** | Describes the placement of your component after Popper.js has applied all the modifiers that may have flipped or altered the originally provided placement property. | `'auto'` \| `'top'` \| `'right'` \| `'bottom'` \| `'left'` | top |
| **placement** | Describes the placement of your component after Popper.js has applied all the modifiers that may have flipped or altered the originally provided placement property. | `'auto'` \| `'top'` \| `'bottom'` \| `'right'` \| `'left'` | top |
| **title** | Title node for your component. | `ReactNode` | - |
| **trigger** | Sets which event handlers you’d like provided to your toggle prop. You can specify one trigger or an array of them. | `'hover'` \| `'focus'` \| `'click'` | click |
| **visible** | Toggle the visibility of popover component. | `boolean` | - |
3 changes: 2 additions & 1 deletion packages/docs/content/api/CProgress.api.mdx
Original file line number Diff line number Diff line change
@@ -11,7 +11,8 @@ import CProgress from '@coreui/react/src/components/progress/CProgress'
| **className** | A string of all className you want applied to the component. | `string` | - |
| **color** | Sets the color context of the component to one of CoreUI’s themed colors. | `'primary'` \| `'secondary'` \| `'success'` \| `'danger'` \| `'warning'` \| `'info'` \| `'dark'` \| `'light'` \| `string` | - |
| **height** | Sets the height of the component. If you set that value the inner `<CProgressBar>` will automatically resize accordingly. | `number` | - |
| **progressBarClassName** **_4.9.0+_** | A string of all className you want applied to the `<CProgressBar/>` component. | `string` | - |
| **thin** | Makes progress bar thinner. | `boolean` | - |
| **value** | The percent to progress the ProgressBar (out of 100). | `number` | 0 |
| **value** | The percent to progress the ProgressBar (out of 100). | `number` | - |
| **variant** | Set the progress bar variant to optional striped. | `'striped'` | - |
| **white** | Change the default color to white. | `boolean` | - |
10 changes: 10 additions & 0 deletions packages/docs/content/api/CProgressStacked.api.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

```jsx
import { CProgressStacked } from '@coreui/react'
// or
import CProgressStacked from '@coreui/react/src/components/progress/CProgressStacked'
```

| Property | Description | Type | Default |
| --- | --- | --- | --- |
| **className** | A string of all className you want applied to the component. | `string` | - |
11 changes: 7 additions & 4 deletions packages/docs/content/api/CTooltip.api.mdx
Original file line number Diff line number Diff line change
@@ -7,11 +7,14 @@ import CTooltip from '@coreui/react/src/components/tooltip/CTooltip'

| Property | Description | Type | Default |
| --- | --- | --- | --- |
| **animation** **_4.9.0-rc.0+_** | Apply a CSS fade transition to the tooltip. | `boolean` | true |
| **className** | A string of all className you want applied to the component. | `string` | - |
| **content** | Content node for your component. | `ReactNode` | - |
| **offset** | Offset of the popover relative to its target. | `[number, number]` | [0, 0] |
| **delay** **_4.9.0-rc.0+_** | The delay for displaying and hiding the tooltip (in milliseconds). When a numerical value is provided, the delay applies to both the hide and show actions. The object structure for specifying the delay is as follows: delay: `{ 'show': 500, 'hide': 100 }`. | `number` \| `{ show: number; hide: number; }` | 0 |
| **fallbackPlacements** **_4.9.0-rc.0+_** | Specify the desired order of fallback placements by providing a list of placements as an array. The placements should be prioritized based on preference. | `Placements` \| `Placements[]` | ['top', 'right', 'bottom', 'left'] |
| **offset** | Offset of the tooltip relative to its target. | `[number, number]` | [0, 6] |
| **onHide** | Callback fired when the component requests to be hidden. | `() => void` | - |
| **onShow** | Callback fired when the component requests to be shown. | `() => void` | - |
| **placement** | Describes the placement of your component after Popper.js has applied all the modifiers that may have flipped or altered the originally provided placement property. | `'auto'` \| `'top'` \| `'right'` \| `'bottom'` \| `'left'` | top |
| **trigger** | Sets which event handlers you’d like provided to your toggle prop. You can specify one trigger or an array of them. | `'hover'` \| `'focus'` \| `'click'` | hover |
| **visible** | Toggle the visibility of popover component. | `boolean` | - |
| **placement** | Describes the placement of your component after Popper.js has applied all the modifiers that may have flipped or altered the originally provided placement property. | `'auto'` \| `'top'` \| `'bottom'` \| `'right'` \| `'left'` | top |
| **trigger** | Sets which event handlers you’d like provided to your toggle prop. You can specify one trigger or an array of them. | `'hover'` \| `'focus'` \| `'click'` | ['hover', 'focus'] |
| **visible** | Toggle the visibility of tooltip component. | `boolean` | - |
2 changes: 1 addition & 1 deletion packages/docs/content/components/button-group.mdx
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ These classes can also be added to groups of links, as an alternative to the `<C
<CButtonGroup>
<CButton href="#" color="primary" active>Active link</CButton>
<CButton href="#" color="primary">Link</CButton>
<CButton href="#" color="primary"> Link</CButton>
<CButton href="#" color="primary">yarLink</CButton>
</CButtonGroup>
```

103 changes: 0 additions & 103 deletions packages/docs/content/components/chart.mdx
Original file line number Diff line number Diff line change
@@ -44,24 +44,8 @@ A line chart is a way of plotting data points on a line. Often, it is used to sh
[Line Chart properties](https://www.chartjs.org/docs/latest/charts/line.html#dataset-properties)

export const LineChartExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.options.scales.x.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.x.ticks.color = getStyle('--cui-body-color')
chartRef.current.options.scales.y.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.y.ticks.color = getStyle('--cui-body-color')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="line"
data={{
labels: ["January", "February", "March", "April", "May", "June", "July"],
@@ -179,24 +163,8 @@ export const LineChartExample = () => {
A bar chart provides a way of showing data values represented as vertical bars. It is sometimes used to show trend data, and the comparison of multiple data sets side by side. [Bar Chart properties](https://www.chartjs.org/docs/latest/charts/bar.html#dataset-properties)

export const BarChartExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.options.scales.x.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.x.ticks.color = getStyle('--cui-body-color')
chartRef.current.options.scales.y.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.y.ticks.color = getStyle('--cui-body-color')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="bar"
data={{
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
@@ -293,22 +261,8 @@ export const BarChartExample = () => {
A radar chart is a way of showing multiple data points and the variation between them. They are often useful for comparing the points of two or more different data sets. [Radar Chart properties](https://www.chartjs.org/docs/latest/charts/radar.html#dataset-properties)

export const RadarChartExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.options.scales.r.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.r.ticks.color = getStyle('--cui-body-color')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="radar"
data={{
labels: [
@@ -433,20 +387,8 @@ export const RadarChartExample = () => {
Pie and doughnut charts are probably the most commonly used charts. They are divided into segments, the arc of each segment shows the proportional value of each piece of data. [Doughnut and Pie Charts properties](https://www.chartjs.org/docs/latest/charts/doughnut.html#dataset-properties)

export const DoughnutAndPieExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="doughnut"
data={{
labels: ['VueJs', 'EmberJs', 'ReactJs', 'AngularJs'],
@@ -503,21 +445,8 @@ export const DoughnutAndPieExample = () => {
Polar area charts are similar to pie charts, but each segment has the same angle - the radius of the segment differs depending on the value. [Polar Area Chart properties](https://www.chartjs.org/docs/latest/charts/polar.html#dataset-properties)

export const PolarAreaExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.options.scales.r.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="polarArea"
data={{
labels: ['Red', 'Green', 'Yellow', 'Grey', 'Blue'],
@@ -588,24 +517,8 @@ export const PolarAreaExample = () => {
A bubble chart is used to display three dimensions of data at the same time. The location of the bubble is determined by the first two dimensions and the corresponding horizontal and vertical axes. The third dimension is represented by the size of the individual bubbles. [Bubble Chart properties](https://www.chartjs.org/docs/latest/charts/bubble.html#dataset-properties)

export const BubbleChartExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.options.scales.x.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.x.ticks.color = getStyle('--cui-body-color')
chartRef.current.options.scales.y.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.y.ticks.color = getStyle('--cui-body-color')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="bubble"
data={{
datasets: [{
@@ -710,24 +623,8 @@ export const BubbleChartExample = () => {
A bubble chart is used to display three dimensions of data at the same time. The location of the bubble is determined by the first two dimensions and the corresponding horizontal and vertical axes. The third dimension is represented by the size of the individual bubbles. [Scatter Chart properties](https://www.chartjs.org/docs/latest/charts/scatter.html#dataset-properties)

export const ScatterChartExample = () => {
const chartRef = useRef()

useEffect(() => {
document.documentElement.addEventListener('ColorSchemeChange', () => {
if (chartRef.current) {
chartRef.current.options.plugins.legend.labels.color = getStyle('--cui-body-color')
chartRef.current.options.scales.x.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.x.ticks.color = getStyle('--cui-body-color')
chartRef.current.options.scales.y.grid.color = getStyle('--cui-border-color-translucent')
chartRef.current.options.scales.y.ticks.color = getStyle('--cui-body-color')
chartRef.current.update()
}
})
}, [chartRef])

return (
<CChart
ref={chartRef}
type="scatter"
data={{
datasets: [{
Loading