Skip to content

[pull] main from coreui:main #10

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Sep 21, 2024
Merged

[pull] main from coreui:main #10

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b25a39
fix special key prop in CToast
jasperfirecai2 Aug 16, 2024
785ecc8
FIx crow not passing props
jasperfirecai2 Sep 2, 2024
b2831a2
Update CRow.tsx
mrholek Sep 18, 2024
fe44645
Merge pull request #407 from jasperfirecai2/patch-1
mrholek Sep 18, 2024
57cfe9e
fix(CTabs): add missing `disabled` prop
mrholek Sep 18, 2024
b89585b
Merge branch 'main' of https://github.com/coreui/coreui-react
mrholek Sep 18, 2024
8fefa69
Merge branch 'coreui:main' into main
jasperfirecai2 Sep 18, 2024
786399c
Update key to innerkey in toaster
jasperfirecai2 Sep 18, 2024
67106fb
fix(CTabs): add missing `disabled` prop
mrholek Sep 18, 2024
b578251
feat(CBreadcrumb): allow to pass custom components as breadcrumb item
mrholek Sep 18, 2024
57dcda2
Merge pull request #405 from jasperfirecai2/main
mrholek Sep 18, 2024
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
Next Next commit
fix special key prop in CToast
  • Loading branch information
@jasperfirecai2
jasperfirecai2 committed Aug 16, 2024
commit 8b25a39b2618ca088cb84d7c176a94e32a614084
11 changes: 7 additions & 4 deletions packages/coreui-react/src/components/toast/CToast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export interface CToastProps extends Omit<HTMLAttributes<HTMLDivElement>, 'title
/**
* @ignore
*/
key?: number
innerKey?: number | string
/**
* Callback fired when the component requests to be closed.
*/
Expand Down Expand Up @@ -76,7 +76,7 @@ export const CToast = forwardRef<HTMLDivElement, CToastProps>(
color,
delay = 5000,
index,
key,
innerKey,
visible = false,
onClose,
onShow,
Expand Down Expand Up @@ -143,7 +143,7 @@ export const CToast = forwardRef<HTMLDivElement, CToastProps>(
onMouseEnter={() => clearTimeout(timeout.current)}
onMouseLeave={() => _autohide()}
{...rest}
key={key}
key={innerKey}
ref={forkedRef}
>
{children}
Expand All @@ -163,7 +163,10 @@ CToast.propTypes = {
color: colorPropType,
delay: PropTypes.number,
index: PropTypes.number,
key: PropTypes.number,
innerKey: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string
]),
onClose: PropTypes.func,
onShow: PropTypes.func,
visible: PropTypes.bool,
Expand Down