Skip to content

Commit

Permalink
feat(data table manager): update data table import
Browse files Browse the repository at this point in the history
  • Loading branch information
Ddouglasz committed May 9, 2024
1 parent 2d5b0d2 commit e02436f
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 74 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"main": "dist/commercetools-uikit-data-table-manager-data-table-manager-context.cjs.js",
"module": "dist/commercetools-uikit-data-table-manager-data-table-manager-context.esm.js"
}
5 changes: 4 additions & 1 deletion packages/components/data-table-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"sideEffects": false,
"main": "dist/commercetools-uikit-data-table-manager.cjs.js",
"module": "dist/commercetools-uikit-data-table-manager.esm.js",
"files": ["dist"],
"preconstruct": {
"entrypoints": ["./index.ts", "data-table-manager-context/index.ts"]
},
"files": ["dist", "data-table-manager-context"],
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
Expand Down

This file was deleted.

8 changes: 0 additions & 8 deletions packages/components/data-table-manager/src/context/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { createContext, MouseEventHandler, ReactNode } from 'react';

export type TDataColumns = {
isTruncated?: boolean;
key: string;
label: ReactNode;
width?: string;
align?: 'left' | 'center' | 'right';
onClick?: (event: MouseEventHandler) => void;
headerIcon?: ReactNode;
isSortable?: boolean;
disableResizing?: boolean;
shouldIgnoreRowClick?: boolean;
}[];

export type TDataTableManagerContext = {
columns: TDataColumns;
updateColumns: (columns: TDataColumns) => void;
};

const DataTableManagerContext = createContext<TDataTableManagerContext>({
columns: [],
updateColumns: (columns: TDataColumns) => [columns],
});

export default DataTableManagerContext;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export { default } from './data-table-manager-context';
export type {
TDataTableManagerContext,
TDataColumns,
} from './data-table-manager-context';
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useState, useContext } from 'react';
import { screen, render, fireEvent, within } from '../../../../test/test-utils';
import DataTableManager, {
DataTableManagerProvider,
DataTableManagerContext,
} from './data-table-manager';
import DataTableManagerContext from './data-table-manager-context';
import { UPDATE_ACTIONS } from './constants';

const useDataTableManagerContext = () => useContext(DataTableManagerContext);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
type ReactNode,
type MouseEventHandler,
useContext,
createContext,
useState,
useEffect,
cloneElement,
Expand All @@ -13,6 +12,7 @@ import Spacings from '@commercetools-uikit/spacings';
import DataTableSettings, {
type TDataTableSettingsProps,
} from './data-table-settings';
import { DataTableManagerContext } from './';

export interface TRow {
id: string;
Expand Down Expand Up @@ -162,16 +162,6 @@ type TDataTableManagerProps<Row extends TRow = TRow> = {
managerTheme?: 'light' | 'dark';
};

type TDataTableManagerContext = {
columns: TDataColumns;
updateColumns: (columns: TDataColumns) => void;
};

export const DataTableManagerContext = createContext<TDataTableManagerContext>({
columns: [],
updateColumns: (columns: TDataColumns) => [columns],
});

export const DataTableManagerProvider = ({
children,
}: {
Expand Down Expand Up @@ -239,7 +229,5 @@ const DataTableManager = <Row extends TRow = TRow>(
};

DataTableManager.displayName = 'DataTableManager';
DataTableManagerProvider.displayName = 'DataTableManagerProvider';
DataTableManagerContext.displayName = 'DataTableManagerContext';

export default DataTableManager;
7 changes: 2 additions & 5 deletions packages/components/data-table-manager/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
export {
default,
DataTableManagerContext,
DataTableManagerProvider,
} from './data-table-manager';
export { default } from './data-table-manager';
export { default as DataTableManagerContext } from './data-table-manager-context/data-table-manager-context';
export { UPDATE_ACTIONS } from './constants';
export { default as version } from './version';
export * from './export-types';
Expand Down
2 changes: 1 addition & 1 deletion packages/components/data-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/accessible-button": "19.2.0",
"@commercetools-uikit/data-table-manager": "19.2.0",
"@commercetools-uikit/data-table-manager": "workspace:^",
"@commercetools-uikit/design-system": "19.2.0",
"@commercetools-uikit/hooks": "19.2.0",
"@commercetools-uikit/icons": "19.2.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/components/data-table/src/data-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import HeaderCell from './header-cell';
import DataRow from './data-row';
import useManualColumnResizing from './use-manual-column-resizing-reducer';
import ColumnResizingContext from './column-resizing-context';
import { DataTableManagerContext } from '@commercetools-uikit/data-table-manager/src/data-table-manager';
import DataTableManagerContext from '@commercetools-uikit/data-table-manager/data-table-manager-context';

export interface TRow {
id: string;
Expand Down Expand Up @@ -245,7 +245,6 @@ const DataTable = <Row extends TRow = TRow>(props: TDataTableProps<Row>) => {

const { columns } = useDataTableManagerContext();
const columnsData = columns && columns.length !== 0 ? columns : props.columns;

warning(
columnsData.length > 0,
`ui-kit/DataTable: empty table "columns", expected at least one column. If you are using DataTableManager you need to pass the "columns" there and they will be injected into DataTable.`
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2565,7 +2565,7 @@ __metadata:
languageName: unknown
linkType: soft

"@commercetools-uikit/data-table-manager@19.2.0, @commercetools-uikit/data-table-manager@workspace:packages/components/data-table-manager":
"@commercetools-uikit/data-table-manager@19.2.0, @commercetools-uikit/data-table-manager@workspace:^, @commercetools-uikit/data-table-manager@workspace:packages/components/data-table-manager":
version: 0.0.0-use.local
resolution: "@commercetools-uikit/data-table-manager@workspace:packages/components/data-table-manager"
dependencies:
Expand Down Expand Up @@ -2616,7 +2616,7 @@ __metadata:
"@babel/runtime": ^7.20.13
"@babel/runtime-corejs3": ^7.20.13
"@commercetools-uikit/accessible-button": 19.2.0
"@commercetools-uikit/data-table-manager": 19.2.0
"@commercetools-uikit/data-table-manager": "workspace:^"
"@commercetools-uikit/design-system": 19.2.0
"@commercetools-uikit/hooks": 19.2.0
"@commercetools-uikit/icons": 19.2.0
Expand Down

0 comments on commit e02436f

Please sign in to comment.