Skip to content
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

Jump to bottom

Move Table to Labs #1900

Merged
merged 4 commits into from
Jul 21, 2023
Merged

Move Table to Labs #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d968791
refactor: move Table to Labs
jordankoschei-okta Jul 21, 2023
1612c78
fix: update broken types
jordankoschei-okta Jul 21, 2023
dc96678
Merge branch 'develop' into jk/table-to-labs
jordankoschei-okta Jul 21, 2023
b6c83ec
refactor: remove Button prop changes
jordankoschei-okta Jul 21, 2023
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
5 changes: 0 additions & 5 deletions packages/odyssey-react-mui/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

export { deepmerge, visuallyHidden } from "@mui/utils";

export type { MRT_ColumnDef as TableColumn } from "material-react-table";

export {
createTheme,
/** @deprecated Will be removed in a future Odyssey version in lieu of a wrapped version. */
Expand Down Expand Up @@ -74,7 +72,6 @@ export * from "./Icon";
export * from "./iconDictionary";
export * from "./Infobox";
export * from "./Link";
export * from "./materialReactTableTypes";
export * from "./MenuButton";
export * from "./MenuItem";
export * from "./NativeSelect";
Expand All @@ -83,14 +80,12 @@ export * from "./OdysseyCacheProvider";
export * from "./OdysseyProvider";
export * from "./OdysseyThemeProvider";
export * from "./OdysseyTranslationProvider";
export * from "./PaginatedTable";
export * from "./PasswordField";
export * from "./Radio";
export * from "./RadioGroup";
export * from "./ScreenReaderText";
export * from "./SearchField";
export * from "./Select";
export * from "./StaticTable";
export * from "./Status";
export * from "./Tabs";
export * from "./Tag";
Expand Down
0 .../odyssey-react-mui/src/PaginatedTable.tsx → ...sey-react-mui/src/labs/PaginatedTable.tsx
View file
Open in desktop
File renamed without changes.
0 ...ges/odyssey-react-mui/src/StaticTable.tsx → ...dyssey-react-mui/src/labs/StaticTable.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions packages/odyssey-react-mui/src/labs/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,11 @@ export { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns";
export { LocalizationProvider } from "@mui/x-date-pickers";
export type { LocalizationProviderProps } from "@mui/x-date-pickers";

export type { MRT_ColumnDef as TableColumn } from "material-react-table";

export * from "./DatePicker";
export * from "./datePickerTheme";

export * from "./materialReactTableTypes";
export * from "./PaginatedTable";
export * from "./StaticTable";
0 ...-react-mui/src/materialReactTableTypes.ts → ...t-mui/src/labs/materialReactTableTypes.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/odyssey-storybook/.storybook/components/TokenTables.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
useState,
} from "react";
import * as Tokens from "@okta/odyssey-design-tokens";
import { StaticTable, type TableColumn } from "@okta/odyssey-react-mui";
import { StaticTable, type TableColumn } from "@okta/odyssey-react-mui/labs";
import { Typography } from "@mui/material";

type TokenName = keyof typeof Tokens;
Expand Down
4 changes: 2 additions & 2 deletions packages/odyssey-storybook/src/components/odyssey-mui/DataTable/PaginatedTable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
*/

import { Meta, StoryObj } from "@storybook/react";
import { Button } from "@okta/odyssey-react-mui";
import {
Button,
TableColumn,
PaginatedTable,
PaginatedTableProps,
} from "@okta/odyssey-react-mui";
} from "@okta/odyssey-react-mui/labs";

import { MuiThemeDecorator } from "../../../../.storybook/components";
import { useCallback, useRef, useState } from "react";
Expand Down
4 changes: 2 additions & 2 deletions packages/odyssey-storybook/src/components/odyssey-mui/DataTable/StaticTable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
*/

import { Meta, StoryObj } from "@storybook/react";
import { Button } from "@okta/odyssey-react-mui";
import {
Button,
TableColumn,
StaticTable,
StaticTableProps,
} from "@okta/odyssey-react-mui";
} from "@okta/odyssey-react-mui/labs";

import { MuiThemeDecorator } from "../../../../.storybook/components";

Expand Down
3 changes: 1 addition & 2 deletions packages/odyssey-storybook/src/components/odyssey-mui/Icon/Icon.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ import {
type IconProps,
iconDictionary,
iconSizeValues,
StaticTable,
type TableColumn,
} from "@okta/odyssey-react-mui";
import { StaticTable, type TableColumn } from "@okta/odyssey-react-mui/labs";
import { MuiThemeDecorator } from "../../../../.storybook/components";

const storybookMeta: Meta<IconProps> = {
Expand Down
Loading