diff --git a/packages/odyssey-react-mui/src/index.ts b/packages/odyssey-react-mui/src/index.ts index 33124a11c3..d5669ce7d0 100644 --- a/packages/odyssey-react-mui/src/index.ts +++ b/packages/odyssey-react-mui/src/index.ts @@ -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. */ @@ -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"; @@ -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"; diff --git a/packages/odyssey-react-mui/src/PaginatedTable.tsx b/packages/odyssey-react-mui/src/labs/PaginatedTable.tsx similarity index 100% rename from packages/odyssey-react-mui/src/PaginatedTable.tsx rename to packages/odyssey-react-mui/src/labs/PaginatedTable.tsx diff --git a/packages/odyssey-react-mui/src/StaticTable.tsx b/packages/odyssey-react-mui/src/labs/StaticTable.tsx similarity index 100% rename from packages/odyssey-react-mui/src/StaticTable.tsx rename to packages/odyssey-react-mui/src/labs/StaticTable.tsx diff --git a/packages/odyssey-react-mui/src/labs/index.ts b/packages/odyssey-react-mui/src/labs/index.ts index 79841fb101..e48a8f1f35 100644 --- a/packages/odyssey-react-mui/src/labs/index.ts +++ b/packages/odyssey-react-mui/src/labs/index.ts @@ -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"; diff --git a/packages/odyssey-react-mui/src/materialReactTableTypes.ts b/packages/odyssey-react-mui/src/labs/materialReactTableTypes.ts similarity index 100% rename from packages/odyssey-react-mui/src/materialReactTableTypes.ts rename to packages/odyssey-react-mui/src/labs/materialReactTableTypes.ts diff --git a/packages/odyssey-storybook/.storybook/components/TokenTables.tsx b/packages/odyssey-storybook/.storybook/components/TokenTables.tsx index 17ad34efe8..420f432585 100644 --- a/packages/odyssey-storybook/.storybook/components/TokenTables.tsx +++ b/packages/odyssey-storybook/.storybook/components/TokenTables.tsx @@ -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; diff --git a/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/PaginatedTable.stories.tsx b/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/PaginatedTable.stories.tsx index 11324da798..19ff8d5a72 100644 --- a/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/PaginatedTable.stories.tsx +++ b/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/PaginatedTable.stories.tsx @@ -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"; diff --git a/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/StaticTable.stories.tsx b/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/StaticTable.stories.tsx index bd49a84b9e..f072853e7e 100644 --- a/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/StaticTable.stories.tsx +++ b/packages/odyssey-storybook/src/components/odyssey-mui/DataTable/StaticTable.stories.tsx @@ -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"; diff --git a/packages/odyssey-storybook/src/components/odyssey-mui/Icon/Icon.stories.tsx b/packages/odyssey-storybook/src/components/odyssey-mui/Icon/Icon.stories.tsx index 6ad349fc7c..a7a275b7e9 100644 --- a/packages/odyssey-storybook/src/components/odyssey-mui/Icon/Icon.stories.tsx +++ b/packages/odyssey-storybook/src/components/odyssey-mui/Icon/Icon.stories.tsx @@ -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 = {