Skip to content

Commit 687bbef

Browse files
Merge branch 'develop' into feature/overviewItemPerformance-CMEM-6573
2 parents 7a8af20 + b021978 commit 687bbef

5 files changed

Lines changed: 16 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
2424
- `<CodeAutocompleteField />` and `<AutoSuggestion />`:
2525
- Error highlighting is always visible by underlining the respective text
2626

27+
### Changed
28+
29+
- some more interfaces are exposed:
30+
- `IntentBlueprint`: BlueprintJS intent types, also available by `DefinitionsBlueprint`
31+
- `TableDataContainerProps`, `TableSimpleContainerProps`, `TableHeadProps`, `TableBodyProps`, `TableExpandedRowProps`, `TableHeaderProps` and `DataTableRenderProps` as interfaces for diverse table components
32+
2733
## [24.1.0] - 2025-04-16
2834

2935
### Added

src/common/Intent/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { CLASSPREFIX as eccgui } from "../../configuration/constants";
2+
import { Intent as BlueprintIntent } from "@blueprintjs/core";
23

3-
export type IntentTypes = "none" | "neutral" | "primary" | "accent" | "info" | "success" | "warning" | "danger";
4+
export type IntentBlueprint = BlueprintIntent;
5+
export const DefinitionsBlueprint = BlueprintIntent;
6+
7+
export type IntentTypes = IntentBlueprint | "neutral" | "accent" | "info";
48

59
export const Definitions: { [key: string]: IntentTypes } = {
6-
PRIMARY: "primary",
10+
...DefinitionsBlueprint,
711
ACCENT: "accent",
812
NEUTRAL: "neutral",
9-
NONE: "none",
10-
SUCCESS: "success",
1113
INFO: "info",
12-
WARNING: "warning",
13-
DANGER: "danger",
1414
};
1515

1616
export const intentClassName = (intent: IntentTypes) => {

src/components/Table/TableContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CLASSPREFIX as eccgui } from "../../configuration/constants";
1111

1212
import { TableRowHeightSize, tableRowHeightSizes } from "./Table";
1313

14-
interface TableDataContainerProps
14+
export interface TableDataContainerProps
1515
extends Omit<
1616
CarbonDataTableProps<
1717
Array<Omit<CarbonDataTableRow<Array<CarbonDataTableHeader>>, "cells">>,
@@ -23,7 +23,7 @@ interface TableDataContainerProps
2323
children(signature: any): JSX.Element;
2424
size?: TableRowHeightSize;
2525
}
26-
interface TableSimpleContainerProps
26+
export interface TableSimpleContainerProps
2727
extends Omit<CarbonTableContainerProps, "description" | "stickyHeader" | "title" | "useStaticWidth">,
2828
React.HTMLAttributes<HTMLDivElement> {
2929
children?: JSX.Element;

src/components/Table/TableExpandRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { TableCell } from "./index";
1111
// workaround to get type/interface
1212
type CarbonTableExpandRowProps = React.ComponentProps<typeof CarbonTableExpandRow>;
1313
export interface TableExpandRowProps
14-
extends Omit<CarbonTableExpandRowProps, "ref" | "ariaLabel" | "expandIconDescription" | "aria-label">,
14+
extends Omit<CarbonTableExpandRowProps, "children" | "ref" | "ariaLabel" | "expandIconDescription" | "aria-label">,
1515
React.HTMLAttributes<HTMLTableRowElement> {
1616
/**
1717
* This text is displayed as tooltip for the button that toggles the expanded/collapsed state.

src/components/Table/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ export * from "./TableCell";
77

88
// TODO, we may wrap to add own classes (currently not necessary)
99
export { TableHead, TableBody, TableExpandedRow, TableHeader } from "@carbon/react";
10+
export type { TableHeadProps, TableBodyProps, TableExpandedRowProps, TableHeaderProps, DataTableRenderProps } from "@carbon/react";

0 commit comments

Comments
 (0)