Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas iaculis vulputate arcu, quis vulputate mauris aliquet in. Praesent sollicitudin erat at augue cursus, a scelerisque odio tristique. Aenean quis dui in nisi condimentum viverra eleifend sed odio. Vestibulum a lacinia leo. Proin congue purus vulputate metus vestibulum eleifend. Suspendisse sit amet orci magna. Suspendisse eu odio ut purus ultrices ornare id eu dolor. Cras porttitor semper feugiat. Sed vel ultricies risus, vel dignissim arcu. Vestibulum quis interdum sem. Morbi bibendum tortor ligula, non pellentesque ante ullamcorper sed. Duis ornare felis eget justo faucibus, id tristique felis dignissim. Nullam sapien metus, feugiat egestas convallis eu, vehicula et turpis. Phasellus interdum, justo sit amet maximus pellentesque, eros orci dictum diam, id bibendum risus neque non risus.
@@ -113,256 +113,34 @@ Array [
]
`;
-exports[`Component: DropdownToolbarExample DropdownToolbarExample renders examples correctly 1`] = `
-Array [
-
,
-
,
+exports[`Component: ScoreCardExample ScoreCardExample renders examples correctly 1`] = `
+[
-
-
-
- w/ Multiple Menu Groups
-
-
-
-
-
,
-
,
-]
-`;
-
-exports[`Component: ScoreCardExample ScoreCardExample renders examples correctly 1`] = `
-Array [
-
-
-
-
-
Basic Usage
@@ -370,25 +148,25 @@ Array [
,
Custom Header
Subtitle
4 Devices
@@ -444,25 +225,25 @@ Array [
,
w/ Actions
High Humidity Alarm
4 Devices
,
Substation 3
High Humidity Alarm
4 Devices
,
Substation 3
Normal
4 Devices
98
/100
Grade
@@ -1164,37 +946,32 @@ Array [
w/ Flex Layout
,
,
,
w/ Static Layout
,
,
Vertical
1
2
3
diff --git a/src/__tests__/mui-tests/MuiAccordion.test.tsx b/src/__tests__/mui-tests/MuiAccordion.test.tsx
index c736d78..ff3eafd 100644
--- a/src/__tests__/mui-tests/MuiAccordion.test.tsx
+++ b/src/__tests__/mui-tests/MuiAccordion.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiAppBar.test.tsx b/src/__tests__/mui-tests/MuiAppBar.test.tsx
index 8c9f5a2..abd9017 100644
--- a/src/__tests__/mui-tests/MuiAppBar.test.tsx
+++ b/src/__tests__/mui-tests/MuiAppBar.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiBottomNav.test.tsx b/src/__tests__/mui-tests/MuiBottomNav.test.tsx
index adf292c..5cb4181 100644
--- a/src/__tests__/mui-tests/MuiBottomNav.test.tsx
+++ b/src/__tests__/mui-tests/MuiBottomNav.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiBreadcrumbs.test.tsx b/src/__tests__/mui-tests/MuiBreadcrumbs.test.tsx
index a1db28a..3181db5 100644
--- a/src/__tests__/mui-tests/MuiBreadcrumbs.test.tsx
+++ b/src/__tests__/mui-tests/MuiBreadcrumbs.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiCard.test.tsx b/src/__tests__/mui-tests/MuiCard.test.tsx
index 8f3be2e..29181c6 100644
--- a/src/__tests__/mui-tests/MuiCard.test.tsx
+++ b/src/__tests__/mui-tests/MuiCard.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiLink.test.tsx b/src/__tests__/mui-tests/MuiLink.test.tsx
index 4c0d02b..a89c624 100644
--- a/src/__tests__/mui-tests/MuiLink.test.tsx
+++ b/src/__tests__/mui-tests/MuiLink.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiMenu.test.tsx b/src/__tests__/mui-tests/MuiMenu.test.tsx
index 5aae68e..532b634 100644
--- a/src/__tests__/mui-tests/MuiMenu.test.tsx
+++ b/src/__tests__/mui-tests/MuiMenu.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiMobileStepper.test.tsx b/src/__tests__/mui-tests/MuiMobileStepper.test.tsx
index cf9d1c4..971292f 100644
--- a/src/__tests__/mui-tests/MuiMobileStepper.test.tsx
+++ b/src/__tests__/mui-tests/MuiMobileStepper.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiPaper.test.tsx b/src/__tests__/mui-tests/MuiPaper.test.tsx
index 75998d3..a1693a8 100644
--- a/src/__tests__/mui-tests/MuiPaper.test.tsx
+++ b/src/__tests__/mui-tests/MuiPaper.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiStepper.test.tsx b/src/__tests__/mui-tests/MuiStepper.test.tsx
index 3b0bebe..cf4a4d7 100644
--- a/src/__tests__/mui-tests/MuiStepper.test.tsx
+++ b/src/__tests__/mui-tests/MuiStepper.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/__tests__/mui-tests/MuiTabs.test.tsx b/src/__tests__/mui-tests/MuiTabs.test.tsx
index 5256a0e..6487005 100644
--- a/src/__tests__/mui-tests/MuiTabs.test.tsx
+++ b/src/__tests__/mui-tests/MuiTabs.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import '@testing-library/jest-dom';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import { store } from '../../redux/store';
diff --git a/src/components/RTLProvider.tsx b/src/components/RTLProvider.tsx
index 6b549b6..8963cb4 100644
--- a/src/components/RTLProvider.tsx
+++ b/src/components/RTLProvider.tsx
@@ -1,8 +1,7 @@
import React, { useEffect } from 'react';
-import { ThemeProvider, createTheme } from '@mui/material/styles';
+import { ThemeProvider } from '@mui/material/styles';
import jssPreset from '@mui/styles/jssPreset';
import StylesProvider from '@mui/styles/StylesProvider';
-import * as BLUIThemes from '@brightlayer-ui/react-themes';
import { useSelector } from 'react-redux';
import { AppStore } from '../__types__';
import rtl from 'jss-rtl';
@@ -10,7 +9,8 @@ import { create } from 'jss';
import rtlPlugin from 'stylis-plugin-rtl';
import { CacheProvider } from '@emotion/react';
import createCache from '@emotion/cache';
-
+import type {} from '@mui/material/themeCssVarsAugmentation';
+import { blueThemes } from '@brightlayer-ui/react-themes';
document.body.setAttribute('dir', 'rtl');
const jss = create({
@@ -19,7 +19,6 @@ const jss = create({
export const RTLThemeProvider = (props: any): JSX.Element => {
const dir = useSelector((store: AppStore) => store.app.direction);
- const theme = useSelector((store: AppStore) => store.app.theme);
const cacheRtl = createCache({
key: dir === 'rtl' ? 'cssrtl' : 'cssltr',
@@ -38,13 +37,7 @@ export const RTLThemeProvider = (props: any): JSX.Element => {
}, [dir]);
return (
-
+
{props.children}
diff --git a/src/components/SharedAppBar.tsx b/src/components/SharedAppBar.tsx
index ac853c9..d2b922e 100644
--- a/src/components/SharedAppBar.tsx
+++ b/src/components/SharedAppBar.tsx
@@ -4,7 +4,7 @@ import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import Toolbar from '@mui/material/Toolbar';
import Typography from '@mui/material/Typography';
-import { useTheme } from '@mui/material/styles';
+import { useColorScheme, useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import Email from '@mui/icons-material/Email';
import Menu from '@mui/icons-material/Menu';
@@ -13,7 +13,7 @@ import InvertColors from '@mui/icons-material/InvertColors';
import SwapHoriz from '@mui/icons-material/SwapHoriz';
import SendIcon from '@mui/icons-material/Send';
import React, { useCallback } from 'react';
-import { TOGGLE_DIR, TOGGLE_THEME, TOGGLE_DRAWER } from '../redux/actions';
+import { TOGGLE_DIR, TOGGLE_DRAWER } from '../redux/actions';
import { useDispatch } from 'react-redux';
import { Spacer, UserMenu } from '@brightlayer-ui/react-components';
@@ -47,6 +47,14 @@ export const SharedAppBar = (props: SharedAppBarProps): JSX.Element => {
);
}, [smUp, dispatch]);
+ const { mode, setMode } = useColorScheme();
+
+ const toggleThemeMode = (): void => {
+ if (setMode) {
+ setMode(mode === 'light' ? 'dark' : 'light');
+ }
+ };
+
return (
@@ -56,13 +64,7 @@ export const SharedAppBar = (props: SharedAppBarProps): JSX.Element => {
- {
- dispatch({ type: TOGGLE_THEME });
- }}
- size="large"
- >
+ toggleThemeMode()} size="large">
diff --git a/src/components/brightlayer-ui/surfaces/ScoreCard.tsx b/src/components/brightlayer-ui/surfaces/ScoreCard.tsx
index 029cd6a..8d84b4d 100644
--- a/src/components/brightlayer-ui/surfaces/ScoreCard.tsx
+++ b/src/components/brightlayer-ui/surfaces/ScoreCard.tsx
@@ -15,6 +15,7 @@ import { GradeA, Moisture as Humidity, Temp } from '@brightlayer-ui/icons-mui';
import { useSelector } from 'react-redux';
import { AppStore } from '../../../__types__';
import Box from '@mui/material/Box';
+import { useColorScheme } from '@mui/material';
const ExampleContainerStyles = {
mb: 2,
@@ -30,7 +31,8 @@ const InfoListItemStyles = {
};
export const ScoreCardExample: React.FC = () => {
- const isDarkMode = useSelector((store: AppStore) => store.app.theme) === 'light' ? false : true;
+ const { mode } = useColorScheme();
+ const isDarkMode = mode === 'light' ? false : true;
const direction = useSelector((store: AppStore) => store.app.direction);
const rtl = direction === 'rtl';
diff --git a/src/components/material-ui/data-display/Divider.tsx b/src/components/material-ui/data-display/Divider.tsx
index 04639b1..71ddf44 100644
--- a/src/components/material-ui/data-display/Divider.tsx
+++ b/src/components/material-ui/data-display/Divider.tsx
@@ -4,7 +4,6 @@ import Typography from '@mui/material/Typography';
import Avatar from '@mui/material/Avatar';
import Divider from '@mui/material/Divider';
import List from '@mui/material/List';
-import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
import ListItemAvatar from '@mui/material/ListItemAvatar';
import Grid from '@mui/material/Grid';
@@ -16,6 +15,7 @@ import FormatBoldIcon from '@mui/icons-material/FormatBold';
import FormatItalicIcon from '@mui/icons-material/FormatItalic';
import FormatUnderlinedIcon from '@mui/icons-material/FormatUnderlined';
import Box from '@mui/material/Box';
+import ListItemButton from '@mui/material/ListItemButton';
const ContainerStyles = {
mb: 4,
@@ -40,64 +40,64 @@ export const DividerExample: React.FC = () => {
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
@@ -111,10 +111,10 @@ export const DividerExample: React.FC = () => {
alignItems="center"
sx={{
width: 'fit-content',
- border: `1px solid ${theme.palette.divider}`,
- borderRadius: `${theme.shape.borderRadius}px`,
- backgroundColor: theme.palette.background.paper,
- color: theme.palette.text.secondary,
+ border: `1px solid ${(theme.vars || theme).palette.divider}`,
+ borderRadius: `${(theme.vars || theme).shape.borderRadius}px`,
+ backgroundColor: (theme.vars || theme).palette.background.paper,
+ color: (theme.vars || theme).palette.text.secondary,
'& svg': {
m: 1.5,
},
diff --git a/src/components/material-ui/data-display/Table.tsx b/src/components/material-ui/data-display/Table.tsx
index cefc60b..2c2e49d 100644
--- a/src/components/material-ui/data-display/Table.tsx
+++ b/src/components/material-ui/data-display/Table.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useTheme, lighten } from '@mui/material/styles';
+import { useTheme } from '@mui/material/styles';
import Table from '@mui/material/Table';
import TableBody from '@mui/material/TableBody';
import TableCell from '@mui/material/TableCell';
@@ -130,7 +130,7 @@ const EnhancedTableHead = (props: EnhancedTableProps): JSX.Element => {
{headCell.label}
{orderBy === headCell.id ? (
sx={{
pl: 2,
pr: 1,
- color:
- numSelected > 0
- ? theme.palette.mode === 'light'
- ? theme.palette.secondary.main
- : theme.palette.text.primary
- : undefined,
+ color: numSelected > 0 ? (theme.vars || theme).palette.secondary.main : undefined,
backgroundColor:
- numSelected > 0
- ? theme.palette.mode === 'light'
- ? lighten(theme.palette.secondary.light, 0.85)
- : theme.palette.secondary.dark
- : undefined,
+ numSelected > 0 ? `rgba(${(theme.vars || theme).palette.secondary.light} / 0.85)` : undefined,
+ ...(numSelected > 0
+ ? theme.applyStyles('dark', {
+ color: (theme.vars || theme).palette.text.primary,
+ backgroundColor: (theme.vars || theme).palette.secondary.dark,
+ })
+ : {}),
}}
>
{numSelected > 0 ? (
diff --git a/src/components/material-ui/feedback/Dialog.tsx b/src/components/material-ui/feedback/Dialog.tsx
index f6352ff..584f08d 100644
--- a/src/components/material-ui/feedback/Dialog.tsx
+++ b/src/components/material-ui/feedback/Dialog.tsx
@@ -2,7 +2,6 @@ import React from 'react';
import Button from '@mui/material/Button';
import Typography from '@mui/material/Typography';
import List from '@mui/material/List';
-import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
@@ -17,6 +16,7 @@ import IconButton from '@mui/material/IconButton';
import { TransitionProps } from '@mui/material/transitions/transition';
import Close from '@mui/icons-material/Close';
import Box from '@mui/material/Box';
+import ListItemButton from '@mui/material/ListItemButton';
const buttonStyles = {
mb: 2,
@@ -106,26 +106,26 @@ export const DialogExample: React.FC = () => {
-
+
+
+
+
+
+
diff --git a/src/components/material-ui/feedback/Snackbar.tsx b/src/components/material-ui/feedback/Snackbar.tsx
index edabdfa..f54b016 100644
--- a/src/components/material-ui/feedback/Snackbar.tsx
+++ b/src/components/material-ui/feedback/Snackbar.tsx
@@ -11,9 +11,9 @@ const buttonStyles = {
width: 300,
};
-const Alert: React.FC = forwardRef((props, ref) => (
+const Alert = forwardRef((props, ref) => (
>;
export const SnackbarExample: React.FC = () => {
const [open, setOpen] = React.useState(false);
diff --git a/src/components/material-ui/inputs/DateTime.tsx b/src/components/material-ui/inputs/DateTime.tsx
index 8c1cd5a..eb5486a 100644
--- a/src/components/material-ui/inputs/DateTime.tsx
+++ b/src/components/material-ui/inputs/DateTime.tsx
@@ -1,5 +1,4 @@
-import React, { ReactElement } from 'react';
-import TextField, { TextFieldProps } from '@mui/material/TextField';
+import React from 'react';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { LocalizationProvider, DatePicker, MobileDatePicker, MobileTimePicker } from '@mui/x-date-pickers';
import Box from '@mui/material/Box';
@@ -22,7 +21,7 @@ export const DateTimeExample: React.FC = () => {
label="Date picker inline"
value={selectedDate}
onChange={handleDateChange}
- renderInput={(params: TextFieldProps): ReactElement =>
@@ -30,7 +29,7 @@ export const DateTimeExample: React.FC = () => {
label="Date picker dialog"
value={selectedDate}
onChange={handleDateChange}
- renderInput={(params: TextFieldProps): ReactElement =>
@@ -38,7 +37,7 @@ export const DateTimeExample: React.FC = () => {
label="Time picker"
value={selectedDate}
onChange={handleDateChange}
- renderInput={(params: TextFieldProps): ReactElement =>
diff --git a/src/index.tsx b/src/index.tsx
index e84a196..765e716 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -5,9 +5,10 @@
This code is licensed under the BSD-3 license found in the LICENSE file in the root directory of this source tree and at https://opensource.org/licenses/BSD-3-Clause.
**/
+/* eslint-disable */
import React from 'react';
import { createRoot } from 'react-dom/client';
-import * as serviceWorker from './serviceWorker';
+// import * as {serviceWorker} from './serviceWorker';
import CssBaseline from '@mui/material/CssBaseline';
import { Provider } from 'react-redux';
import './index.css';
@@ -17,19 +18,36 @@ import { RTLThemeProvider } from './components/RTLProvider';
import '@brightlayer-ui/react-themes/open-sans';
const container = document.getElementById('root');
+
/* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */
const root = createRoot(container!);
+/* eslint-disable */
+declare global {
+ namespace React {
+ interface DOMAttributes {
+ component?: string | undefined;
+ disabled?: string | undefined;
+ selected?: string | undefined;
+ placeholder?: string | undefined;
+ onPointerEnterCapture?: string | undefined;
+ onPointerLeaveCapture?: string | undefined;
+ }
+ }
+}
+/* eslint-disable */
root.render(
-
-
-
-
+
+
+
+
+
+
);
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
+// serviceWorker.unregister();
diff --git a/src/pages/contextual-page-templates/Alarms.tsx b/src/pages/contextual-page-templates/Alarms.tsx
index 8e61100..d15f476 100644
--- a/src/pages/contextual-page-templates/Alarms.tsx
+++ b/src/pages/contextual-page-templates/Alarms.tsx
@@ -143,7 +143,7 @@ export const Alarms: React.FC = () => {
const getBadgeColor = (badge: string): string => {
switch (badge) {
case 'active':
- return theme.palette.error.main;
+ return theme.palette.error.main; // @TODO: Change it to (theme.vars || theme).palette.error.main
case 'new':
default:
return theme.palette.primary.main;
@@ -163,7 +163,7 @@ export const Alarms: React.FC = () => {
{
{alarmData.map((data, index) => (
- {getDisplayTime(data.date)}
-
- }
+ leftComponent={{getDisplayTime(data.date)} }
title={`${data.type} ${data.deviceName}`}
subtitle={[data.subLocation, data.location]}
divider={index === alarmData.length - 1 ? undefined : 'partial'}
diff --git a/src/pages/contextual-page-templates/Dashboard.tsx b/src/pages/contextual-page-templates/Dashboard.tsx
index 107de12..e9dcec3 100644
--- a/src/pages/contextual-page-templates/Dashboard.tsx
+++ b/src/pages/contextual-page-templates/Dashboard.tsx
@@ -124,7 +124,7 @@ export const Dashboard: React.FC = () => {
{
{
{
{timelineData.map((data, index) => (
- {getDisplayTime(data.date)}
-
- }
+ leftComponent={{getDisplayTime(data.date)} }
title={`${data.type} ${data.deviceName}`}
subtitle={[data.subLocation, data.location]}
divider={index === timelineData.length - 1 ? undefined : 'partial'}
diff --git a/src/router/NavigationDrawer.tsx b/src/router/NavigationDrawer.tsx
index 3db73b4..165f77b 100644
--- a/src/router/NavigationDrawer.tsx
+++ b/src/router/NavigationDrawer.tsx
@@ -1,7 +1,7 @@
import React, { useState, useCallback, useEffect } from 'react';
import Typography from '@mui/material/Typography';
import useMediaQuery from '@mui/material/useMediaQuery';
-import { useTheme } from '@mui/material/styles';
+import { useColorScheme, useTheme } from '@mui/material/styles';
import Menu from '@mui/icons-material/Menu';
import EatonFooterLogoLight from '../EatonLogoLight.png';
import EatonFooterLogoDark from '../EatonLogoDark.png';
@@ -21,14 +21,15 @@ import { CLOSE_DRAWER, TOGGLE_DRAWER } from '../redux/actions';
import { SimpleNavItem, pageDefinitions } from './navigation';
import Box from '@mui/material/Box';
-const top = require('../assets/topology_40.png');
+import top from '../assets/topology_40.png';
export const NavigationDrawer: React.FC = () => {
+ const { mode } = useColorScheme();
+ const isDarkMode = mode === 'light' ? false : true;
const open = useSelector((store: AppStore) => store.app.drawerOpen);
const direction = useSelector((store: AppStore) => store.app.direction);
const dispatch = useDispatch();
const theme = useTheme();
- const isDarkMode = useSelector((store: AppStore) => store.app.theme) === 'light' ? false : true;
const history = useHistory();
const location = useLocation();
const [activeRoute, setActiveRoute] = useState(location.pathname);
diff --git a/src/router/index.tsx b/src/router/index.tsx
index 7b07d4f..c62d3d1 100644
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -6,6 +6,7 @@ import { SharedAppBar } from '../components/SharedAppBar';
import { SimpleNavItem, pageDefinitions } from './navigation';
import { useSelector } from 'react-redux';
import { AppStore } from '../__types__';
+import { useColorScheme } from '@mui/material';
const buildRoutes = (routes: SimpleNavItem[], url: string): JSX.Element[] => {
let ret: any[] = [];
@@ -36,6 +37,11 @@ const ScrollToTop = (): null => {
export const MainRouter: React.FC = () => {
const title = useSelector((state: AppStore) => state.app.pageTitle);
+ const { setMode } = useColorScheme();
+
+ useEffect(() => {
+ setMode('light');
+ }, []);
return (
diff --git a/src/utils/utils.tsx b/src/utils/utils.tsx
index 0ef2ecf..2da34a5 100644
--- a/src/utils/utils.tsx
+++ b/src/utils/utils.tsx
@@ -1,5 +1,4 @@
import Box from '@mui/material/Box';
-import React from 'react';
export const getBodyFiller = (): JSX.Element => (
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
new file mode 100644
index 0000000..11f02fe
--- /dev/null
+++ b/src/vite-env.d.ts
@@ -0,0 +1 @@
+///