Skip to content

Commit

Permalink
Merge pull request #1608 from okta/kg/OKTA-539022
Browse files Browse the repository at this point in the history
fix: flattened odyssey-react-mui for better DX
  • Loading branch information
KevinGhadyani-Okta committed Oct 14, 2022
2 parents 3674979 + 59ecdbf commit 79ef1cf
Show file tree
Hide file tree
Showing 73 changed files with 17 additions and 108 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*/

import { forwardRef } from "react";
import type { SvgIconNoChildrenProps } from "./types";
import { iconDictionary } from "./";
import type { SvgIconNoChildrenProps } from "./iconDictionary/types";
import { iconDictionary } from "./iconDictionary";

export interface IconProps extends SvgIconNoChildrenProps {
/**
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*/

import { render, screen } from "@testing-library/react";
import { a11yCheck } from "../../../test";
import { PasswordInput } from ".";

import { a11yCheck } from "./a11yCheck";
import { PasswordInput } from "./PasswordInput";

const label = "Password";
const tooltipOnLabel = "Show password";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
InputAdornment,
} from "@mui/material";
import { Visibility, VisibilityOff } from "@mui/icons-material";
import { useUniqueId } from "../../utils";
import { useUniqueId } from "./useUniqueId";

interface State {
password: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import { ThemeProvider as MuiThemeProvider } from "@mui/material/styles";
import { ReactElement } from "react";

import { odysseyTheme } from "../../themes";
import { odysseyTheme } from "./theme";

export const ThemeProvider = ({ children }: { children: ReactElement }) => (
<MuiThemeProvider theme={odysseyTheme}>{children}</MuiThemeProvider>
Expand Down
File renamed without changes.
13 changes: 0 additions & 13 deletions packages/odyssey-react-mui/src/components/Link/index.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions packages/odyssey-react-mui/src/components/PasswordInput/index.ts

This file was deleted.

13 changes: 0 additions & 13 deletions packages/odyssey-react-mui/src/components/ThemeProvider/index.ts

This file was deleted.

16 changes: 0 additions & 16 deletions packages/odyssey-react-mui/src/components/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

// Code automatically generated by svgr; DO NOT EDIT.

export * from "./Icon";

import { AddCircleIcon } from "./AddCircle";
export * from "./AddCircle";

Expand Down
13 changes: 9 additions & 4 deletions packages/odyssey-react-mui/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
* See the License for the specific language governing permissions and limitations under the License.
*/

export * from "./createUniqueId";
export * from "./Icon";
export * from "./iconDictionary";
export * from "./Link";
export * from "./PasswordInput";
export * from "./theme";
export * from "./ThemeProvider";
export * from "./useUniqueId";

export {
Alert,
AlertTitle,
Expand Down Expand Up @@ -88,7 +97,3 @@ export type { TabContextProps, TabListProps, TabPanelProps } from "@mui/lab";
export { Favorite as FavoriteIcon } from "@mui/icons-material";

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

export * from "./components";
export * from "./themes";
export * from "./utils";
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
ArrowDownIcon,
CheckCircleFilledIcon,
InformationCircleFilledIcon,
} from "../../components/Icon";
} from "../iconDictionary";

export const components: ThemeOptions["components"] = {
MuiAlert: {
Expand Down
13 changes: 0 additions & 13 deletions packages/odyssey-react-mui/src/themes/index.ts

This file was deleted.

14 changes: 0 additions & 14 deletions packages/odyssey-react-mui/src/utils/index.ts

This file was deleted.

13 changes: 0 additions & 13 deletions packages/odyssey-react-mui/test/index.ts

This file was deleted.

0 comments on commit 79ef1cf

Please sign in to comment.