@@ -23,7 +23,7 @@ const ToastItemFc: FC
= ({ status, toast, onClose, ...other }) =
level={0}
hasCloser={true}
type={type}
- variant={alertVariant || variant || 'card'}
+ variant={variant || 'card'}
onCloserClick={onClose}
>
{description}
diff --git a/packages/components/src/schema/components/modal.ts b/packages/components/src/schema/components/modal.ts
index b048f1d5d4..5129757356 100644
--- a/packages/components/src/schema/components/modal.ts
+++ b/packages/components/src/schema/components/modal.ts
@@ -5,12 +5,10 @@ import type { KoliBriModalEventCallbacks } from '../types';
type RequiredProps = PropLabel;
type OptionalProps = {
- activeElement: HTMLElement | null;
on: KoliBriModalEventCallbacks;
width: string;
};
type RequiredStates = {
- activeElement: HTMLElement | null;
width: string;
} & PropLabel;
type OptionalStates = {
diff --git a/packages/components/src/schema/components/table.ts b/packages/components/src/schema/components/table.ts
index 6d5cbc57d2..ff6dc07def 100644
--- a/packages/components/src/schema/components/table.ts
+++ b/packages/components/src/schema/components/table.ts
@@ -5,19 +5,10 @@ import type { KoliBriTableDataType, KoliBriTableHeaderCell, Stringified, KoliBri
import type { KoliBriPaginationProps } from './pagination';
import type { PropPaginationPosition } from '../props/pagination-position';
-export type KoliBriTableSelectedHead = { key: string; label: string; sortDirection: KoliBriSortDirection };
-
-type KoliBriTableSort = (data: T[]) => T[];
-
-export type KoliBriSortFunction = (data: KoliBriTableDataType[]) => KoliBriTableDataType[];
export type KoliBriDataCompareFn = (a: KoliBriTableDataType, b: KoliBriTableDataType) => number;
export type KoliBriTableHeaderCellWithLogic = KoliBriTableHeaderCell & {
compareFn?: KoliBriDataCompareFn;
- /**
- * @deprecated use `compareFn` instead
- */
- sort?: KoliBriTableSort;
sortDirection?: KoliBriSortDirection;
};
diff --git a/packages/components/src/schema/components/toaster.ts b/packages/components/src/schema/components/toaster.ts
index 35f23c464d..1667c6e0eb 100644
--- a/packages/components/src/schema/components/toaster.ts
+++ b/packages/components/src/schema/components/toaster.ts
@@ -13,10 +13,6 @@ export type Toast = {
render?: ToastRenderFunction;
label: LabelPropType;
type: AlertType;
- /**
- * @deprecated Use variant instead
- */
- alertVariant?: AlertVariant;
variant?: AlertVariant;
};
@@ -27,10 +23,6 @@ export type ToastState = {
};
export type ToasterOptions = {
- /**
- * @deprecated Use defaultVariant instead
- */
- defaultAlertVariant: AlertVariant;
defaultVariant: AlertVariant;
};
diff --git a/packages/samples/react/src/components/handout/basic.tsx b/packages/samples/react/src/components/handout/basic.tsx
index 3699d4e8f8..3a939583b1 100644
--- a/packages/samples/react/src/components/handout/basic.tsx
+++ b/packages/samples/react/src/components/handout/basic.tsx
@@ -73,16 +73,14 @@ const TABLE_HEADERS: KoliBriTableHeaders = {
el.appendChild(renderElement);
getRoot(renderElement).render();
},
- sort: (data) => {
- return data.sort((first, second) => {
- if ((first as TableDataType).monday < (second as TableDataType).monday) {
- return -1;
- }
- if ((first as TableDataType).monday > (second as TableDataType).monday) {
- return 1;
- }
- return 0;
- });
+ compareFn: (first, second) => {
+ if ((first as TableDataType).monday < (second as TableDataType).monday) {
+ return -1;
+ }
+ if ((first as TableDataType).monday > (second as TableDataType).monday) {
+ return 1;
+ }
+ return 0;
},
sortDirection: 'ASC',
textAlign: 'right',
@@ -97,16 +95,14 @@ const TABLE_HEADERS: KoliBriTableHeaders = {
el.appendChild(renderElement);
getRoot(renderElement).render();
},
- sort: (data) => {
- return data.sort((first, second) => {
- if ((first as TableDataType).tuesday < (second as TableDataType).tuesday) {
- return -1;
- }
- if ((first as TableDataType).tuesday > (second as TableDataType).tuesday) {
- return 1;
- }
- return 0;
- });
+ compareFn: (first, second) => {
+ if ((first as TableDataType).tuesday < (second as TableDataType).tuesday) {
+ return -1;
+ }
+ if ((first as TableDataType).tuesday > (second as TableDataType).tuesday) {
+ return 1;
+ }
+ return 0;
},
sortDirection: 'DESC',
},
diff --git a/packages/samples/react/src/components/table/column-alignment.tsx b/packages/samples/react/src/components/table/column-alignment.tsx
index 1b8cb70117..ac8367ba39 100644
--- a/packages/samples/react/src/components/table/column-alignment.tsx
+++ b/packages/samples/react/src/components/table/column-alignment.tsx
@@ -6,7 +6,7 @@ import { KolHeading, KolTableStateful } from '@public-ui/react';
import { SampleDescription } from '../SampleDescription';
const DATA = [{ left: 'Left Example', center: 'Center Example', right: 'Right Example' }];
-const genericNonSorter = (data: T): T => data;
+const genericNonSorter = () => 0;
export const TableColumnAlignment: FC = () => (
<>
@@ -38,9 +38,9 @@ export const TableColumnAlignment: FC = () => (
_headers={{
horizontal: [
[
- { label: 'left', key: 'left', textAlign: 'left', sort: genericNonSorter },
- { label: 'center', key: 'center', textAlign: 'center', sort: genericNonSorter },
- { label: 'right', key: 'right', textAlign: 'right', sort: genericNonSorter },
+ { label: 'left', key: 'left', textAlign: 'left', compareFn: genericNonSorter },
+ { label: 'center', key: 'center', textAlign: 'center', compareFn: genericNonSorter },
+ { label: 'right', key: 'right', textAlign: 'right', compareFn: genericNonSorter },
],
],
}}
@@ -55,8 +55,8 @@ export const TableColumnAlignment: FC = () => (
_headers={{
horizontal: [
[
- { label: 'left', key: 'left', textAlign: 'left', sort: genericNonSorter },
- { label: 'center', key: 'center', textAlign: 'center', sort: genericNonSorter },
+ { label: 'left', key: 'left', textAlign: 'left', compareFn: genericNonSorter },
+ { label: 'center', key: 'center', textAlign: 'center', compareFn: genericNonSorter },
{ label: 'right', key: 'right', textAlign: 'right' },
],
],
diff --git a/packages/samples/react/src/components/table/render-cell.tsx b/packages/samples/react/src/components/table/render-cell.tsx
index ed6d2b9573..f570a61f26 100644
--- a/packages/samples/react/src/components/table/render-cell.tsx
+++ b/packages/samples/react/src/components/table/render-cell.tsx
@@ -80,7 +80,7 @@ const HEADERS: KoliBriTableHeaders = {
render: (el, cell) => {
el.innerHTML = `${DATE_FORMATTER.format(cell.label as unknown as Date)}`;
},
- sort: (data) => data.sort((data0, data1) => (data0 as Data).date.getTime() - (data1 as Data).date.getTime()),
+ compareFn: (data0, data1) => (data0 as Data).date.getTime() - (data1 as Data).date.getTime(),
},
{
label: 'Action (react)',
diff --git a/packages/samples/react/src/components/table/sort-data.tsx b/packages/samples/react/src/components/table/sort-data.tsx
index 648cff1259..8ddf37ff07 100644
--- a/packages/samples/react/src/components/table/sort-data.tsx
+++ b/packages/samples/react/src/components/table/sort-data.tsx
@@ -22,12 +22,11 @@ const HEADERS_HORIZONTAL: KoliBriTableHeaders = {
key: 'date',
textAlign: 'center',
render: (_el, _cell, tupel) => DATE_FORMATTER.format((tupel as Data).date),
- sort: (data) =>
- data.sort((data0, data1) => {
- if ((data0 as Data).date < (data1 as Data).date) return -1;
- else if ((data1 as Data).date < (data0 as Data).date) return 1;
- else return 0;
- }),
+ compareFn: (data0, data1) => {
+ if ((data0 as Data).date < (data1 as Data).date) return -1;
+ else if ((data1 as Data).date < (data0 as Data).date) return 1;
+ else return 0;
+ },
},
],
],
@@ -42,12 +41,11 @@ const HEADERS_VERTICAL: KoliBriTableHeaders = {
key: 'date',
textAlign: 'center',
render: (_el, _cell, tupel) => DATE_FORMATTER.format((tupel as Data).date),
- sort: (data) =>
- data.sort((data0, data1) => {
- if ((data0 as Data).date < (data1 as Data).date) return -1;
- else if ((data1 as Data).date < (data0 as Data).date) return 1;
- else return 0;
- }),
+ compareFn: (data0, data1) => {
+ if ((data0 as Data).date < (data1 as Data).date) return -1;
+ else if ((data1 as Data).date < (data0 as Data).date) return 1;
+ else return 0;
+ },
},
],
],