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

Chore: move PaletteStyleTag #28086

Merged
merged 2 commits into from Feb 17, 2023
Merged

Chore: move PaletteStyleTag #28086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
901378a
move
ggazzo Feb 17, 2023
309e36e
Merge branch 'develop' into chore/move-dark-theme
ggazzo Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions apps/meteor/client/views/root/AppLayout.tsx
View file
Open in desktop
@@ -1,5 +1,3 @@
import { PaletteStyleTag } from '@rocket.chat/ui-theming/src/PaletteStyleTag';
import { SidebarPaletteStyleTag } from '@rocket.chat/ui-theming/src/SidebarPaletteStyleTag';
import type { ReactElement } from 'react';
import React, { useEffect, Suspense } from 'react';
import { useSyncExternalStore } from 'use-sync-external-store/shim';
Expand Down Expand Up @@ -30,8 +28,6 @@ const AppLayout = (): ReactElement => {

return (
<>
<PaletteStyleTag />
<SidebarPaletteStyleTag />
<Suspense fallback={<PageLoading />}>{layout}</Suspense>
{portals}
</>
Expand Down
4 changes: 4 additions & 0 deletions apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
View file
Open in desktop
@@ -1,5 +1,7 @@
import { Box } from '@rocket.chat/fuselage';
import { useLayout, useCurrentRoute, useRoutePath, useSetting, useCurrentModal, useRoute } from '@rocket.chat/ui-contexts';
import { PaletteStyleTag } from '@rocket.chat/ui-theming/src/PaletteStyleTag';
import { SidebarPaletteStyleTag } from '@rocket.chat/ui-theming/src/SidebarPaletteStyleTag';
import type { ReactElement, ReactNode } from 'react';
import React, { useEffect, useRef } from 'react';

Expand Down Expand Up @@ -45,6 +47,8 @@ const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement
className={[embeddedLayout ? 'embedded-view' : undefined, 'menu-nav'].filter(Boolean).join(' ')}
aria-hidden={Boolean(modal)}
>
<PaletteStyleTag />
<SidebarPaletteStyleTag />
{!removeSidenav ? <Sidebar /> : null}
<div className={['rc-old', 'main-content', readReceiptsEnabled ? 'read-receipts-enabled' : undefined].filter(Boolean).join(' ')}>
{children}
Expand Down