diff --git a/client/account/sidebarItems.js b/client/account/sidebarItems.js index 1c4d0b386e5..13a74fbbcba 100644 --- a/client/account/sidebarItems.js +++ b/client/account/sidebarItems.js @@ -1,9 +1,13 @@ +import { HTML } from 'meteor/htmljs'; + import { hasPermission } from '../../app/authorization/client'; import { createTemplateForComponent } from '../reactAdapters'; import { settings } from '../../app/settings'; import { createSidebarItems } from '../helpers/createSidebarItems'; -createTemplateForComponent('accountFlex', () => import('./AccountSidebar')); +createTemplateForComponent('accountFlex', () => import('./AccountSidebar'), { + renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap +}); export const { registerSidebarItem: registerAccountSidebarItem, diff --git a/client/admin/sidebarItems.js b/client/admin/sidebarItems.js index ec3f2fa381e..b6ddc658015 100644 --- a/client/admin/sidebarItems.js +++ b/client/admin/sidebarItems.js @@ -1,10 +1,13 @@ +import { HTML } from 'meteor/htmljs'; import { Meteor } from 'meteor/meteor'; import { hasPermission, hasRole } from '../../app/authorization/client'; import { createTemplateForComponent } from '../reactAdapters'; import { createSidebarItems } from '../helpers/createSidebarItems'; -createTemplateForComponent('adminFlex', () => import('./sidebar/AdminSidebar')); +createTemplateForComponent('adminFlex', () => import('./sidebar/AdminSidebar'), { + renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap +}); export const { registerSidebarItem: registerAdminSidebarItem, diff --git a/client/components/basic/Sidebar.js b/client/components/basic/Sidebar.js index c0eb249aacc..fa963cd50db 100644 --- a/client/components/basic/Sidebar.js +++ b/client/components/basic/Sidebar.js @@ -6,7 +6,7 @@ import { useTranslation } from '../../contexts/TranslationContext'; import { useRoutePath } from '../../contexts/RouterContext'; import { ActionButton } from './Buttons/ActionButton'; -const Sidebar = ({ children, ...props }) => +const Sidebar = ({ children, ...props }) => {children} ; diff --git a/client/omnichannel/routes.js b/client/omnichannel/routes.js index 3f6769ae579..ce1de888c52 100644 --- a/client/omnichannel/routes.js +++ b/client/omnichannel/routes.js @@ -1,7 +1,11 @@ +import { HTML } from 'meteor/htmljs'; + import { createTemplateForComponent } from '../reactAdapters'; import { createRouteGroup } from '../helpers/createRouteGroup'; -createTemplateForComponent('omnichannelFlex', () => import('./sidebar/OmnichannelSidebar')); +createTemplateForComponent('omnichannelFlex', () => import('./sidebar/OmnichannelSidebar'), { + renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap +}); export const registerOmnichannelRoute = createRouteGroup('omnichannel', '/omnichannel', () => import('./OmnichannelRouter'));