Skip to content

Commit fe06860

Browse files
authored
style(experience): update the devTenantNotification style (#6745)
update the devTenantNotification style
1 parent 6698679 commit fe06860

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

packages/experience-legacy/src/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import LoadingLayerProvider from './Providers/LoadingLayerProvider';
77
import PageContextProvider from './Providers/PageContextProvider';
88
import SettingsProvider from './Providers/SettingsProvider';
99
import UserInteractionContextProvider from './Providers/UserInteractionContextProvider';
10+
import DevelopmentTenantNotification from './containers/DevelopmentTenantNotification';
1011
import Callback from './pages/Callback';
1112
import Consent from './pages/Consent';
1213
import Continue from './pages/Continue';
@@ -50,6 +51,7 @@ const App = () => {
5051
<PageContextProvider>
5152
<SettingsProvider>
5253
<UserInteractionContextProvider>
54+
<DevelopmentTenantNotification />
5355
<AppBoundary>
5456
<Routes>
5557
<Route element={<LoadingLayerProvider />}>

packages/experience-legacy/src/Layout/AppLayout/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import classNames from 'classnames';
22
import { Outlet } from 'react-router-dom';
33

44
import LogtoSignature from '@/components/LogtoSignature';
5-
import DevelopmentTenantNotification from '@/containers/DevelopmentTenantNotification';
65
import usePlatform from '@/hooks/use-platform';
76
import { layoutClassNames } from '@/utils/consts';
87

@@ -17,7 +16,6 @@ const AppLayout = () => {
1716
<div className={classNames(styles.container, layoutClassNames.pageContainer)}>
1817
{!isMobile && <CustomContent className={layoutClassNames.customContent} />}
1918
<main className={classNames(styles.main, layoutClassNames.mainContent)}>
20-
<DevelopmentTenantNotification />
2119
<Outlet />
2220
<LogtoSignature className={classNames(styles.signature, layoutClassNames.signature)} />
2321
</main>

packages/experience-legacy/src/containers/DevelopmentTenantNotification/index.tsx

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { useContext, useEffect, useRef } from 'react';
2+
import { createPortal } from 'react-dom';
23
import { useTranslation } from 'react-i18next';
34

45
import PageContext from '@/Providers/PageContextProvider/PageContext';
56
import DevIcon from '@/assets/icons/dev-icon.svg?react';
6-
import usePlatform from '@/hooks/use-platform';
77

88
/**
99
* Styles that may effect the visibility of a DOM element.
@@ -50,27 +50,29 @@ const DevelopmentTenantNotification = () => {
5050
const iconRef = useRef<HTMLSpanElement>(null);
5151
const { experienceSettings, isPreview } = useContext(PageContext);
5252
const { isDevelopmentTenant } = experienceSettings ?? {};
53-
const { isMobile } = usePlatform();
5453

5554
const styles: Record<string, string> = Object.freeze({
5655
display: 'flex',
5756
'align-items': 'center',
5857
'justify-content': 'center',
5958
'align-self': 'stretch',
6059
gap: '8px',
61-
margin: isMobile ? '-16px -20px 16px' : '-24px -24px 0',
62-
padding: '12px 16px',
63-
'border-radius': isMobile ? 'unset' : '8px 8px 0 0',
64-
background: 'var(--color-container-alert)',
60+
padding: '6px 16px',
61+
'border-radius': 'unset',
62+
background: 'var(--color-container-on-alert)',
6563
font: 'var(--font-label-2)',
66-
color: 'var(--color-type-primary)',
64+
color: 'var(--color-static-white)',
65+
position: 'fixed',
66+
left: '0',
67+
right: '0',
68+
'z-index': '9999',
6769
});
6870

6971
const iconStyles: Record<string, string> = Object.freeze({
7072
// Use 'display: inline-flex' and 'align-items: center' to vertically center the icon
7173
display: 'inline-flex',
7274
'align-items': 'center',
73-
color: 'var(--color-container-on-alert)',
75+
color: 'var(--color-container-alert)',
7476
});
7577

7678
useEffect(() => {
@@ -86,13 +88,14 @@ const DevelopmentTenantNotification = () => {
8688
return null;
8789
}
8890

89-
return (
91+
return createPortal(
9092
<div ref={ref}>
9193
<span ref={iconRef}>
9294
<DevIcon />
9395
</span>
9496
{t('development_tenant.notification')}
95-
</div>
97+
</div>,
98+
document.body
9699
);
97100
};
98101

packages/experience/src/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import LoadingLayerProvider from './Providers/LoadingLayerProvider';
77
import PageContextProvider from './Providers/PageContextProvider';
88
import SettingsProvider from './Providers/SettingsProvider';
99
import UserInteractionContextProvider from './Providers/UserInteractionContextProvider';
10+
import DevelopmentTenantNotification from './containers/DevelopmentTenantNotification';
1011
import Callback from './pages/Callback';
1112
import Consent from './pages/Consent';
1213
import Continue from './pages/Continue';
@@ -49,6 +50,7 @@ const App = () => {
4950
<PageContextProvider>
5051
<SettingsProvider>
5152
<UserInteractionContextProvider>
53+
<DevelopmentTenantNotification />
5254
<AppBoundary>
5355
<Routes>
5456
<Route element={<LoadingLayerProvider />}>

packages/experience/src/Layout/AppLayout/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import classNames from 'classnames';
22
import { Outlet } from 'react-router-dom';
33

44
import LogtoSignature from '@/components/LogtoSignature';
5-
import DevelopmentTenantNotification from '@/containers/DevelopmentTenantNotification';
65
import usePlatform from '@/hooks/use-platform';
76
import { layoutClassNames } from '@/utils/consts';
87

@@ -17,7 +16,6 @@ const AppLayout = () => {
1716
<div className={classNames(styles.container, layoutClassNames.pageContainer)}>
1817
{!isMobile && <CustomContent className={layoutClassNames.customContent} />}
1918
<main className={classNames(styles.main, layoutClassNames.mainContent)}>
20-
<DevelopmentTenantNotification />
2119
<Outlet />
2220
<LogtoSignature className={classNames(styles.signature, layoutClassNames.signature)} />
2321
</main>

packages/experience/src/containers/DevelopmentTenantNotification/index.tsx

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { useContext, useEffect, useRef } from 'react';
2+
import { createPortal } from 'react-dom';
23
import { useTranslation } from 'react-i18next';
34

45
import PageContext from '@/Providers/PageContextProvider/PageContext';
56
import DevIcon from '@/assets/icons/dev-icon.svg?react';
6-
import usePlatform from '@/hooks/use-platform';
77

88
/**
99
* Styles that may effect the visibility of a DOM element.
@@ -50,27 +50,29 @@ const DevelopmentTenantNotification = () => {
5050
const iconRef = useRef<HTMLSpanElement>(null);
5151
const { experienceSettings, isPreview } = useContext(PageContext);
5252
const { isDevelopmentTenant } = experienceSettings ?? {};
53-
const { isMobile } = usePlatform();
5453

5554
const styles: Record<string, string> = Object.freeze({
5655
display: 'flex',
5756
'align-items': 'center',
5857
'justify-content': 'center',
5958
'align-self': 'stretch',
6059
gap: '8px',
61-
margin: isMobile ? '-16px -20px 16px' : '-24px -24px 0',
62-
padding: '12px 16px',
63-
'border-radius': isMobile ? 'unset' : '8px 8px 0 0',
64-
background: 'var(--color-container-alert)',
60+
padding: '6px 16px',
61+
'border-radius': 'unset',
62+
background: 'var(--color-container-on-alert)',
6563
font: 'var(--font-label-2)',
66-
color: 'var(--color-type-primary)',
64+
color: 'var(--color-static-white)',
65+
position: 'fixed',
66+
left: '0',
67+
right: '0',
68+
'z-index': '9999',
6769
});
6870

6971
const iconStyles: Record<string, string> = Object.freeze({
7072
// Use 'display: inline-flex' and 'align-items: center' to vertically center the icon
7173
display: 'inline-flex',
7274
'align-items': 'center',
73-
color: 'var(--color-container-on-alert)',
75+
color: 'var(--color-container-alert)',
7476
});
7577

7678
useEffect(() => {
@@ -86,13 +88,14 @@ const DevelopmentTenantNotification = () => {
8688
return null;
8789
}
8890

89-
return (
91+
return createPortal(
9092
<div ref={ref}>
9193
<span ref={iconRef}>
9294
<DevIcon />
9395
</span>
9496
{t('development_tenant.notification')}
95-
</div>
97+
</div>,
98+
document.body
9699
);
97100
};
98101

0 commit comments

Comments
 (0)