The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
fix: make dashboard header use container queries to respond to metabot (#67376)
Nicolò Prettod4486c9dffa6
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.cssindex c0252e37f62..90d776ad063 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css@@ -8,18 +8,23 @@align-items: center;border-left: 1px solid transparent;- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {flex-direction: column;align-items: baseline;}}+.DashboardHeader {+ container-type: inline-size;+ container-name: dashboard-header;+}+.HeaderContainer {&.isFixedWidth.offsetSidebar {margin-right: var(--sidebar-width);}- @media screen and (max-width: 60em) {+ @container dashboard-header (max-width: 40rem) {margin-right: 0;}}@@ -28,18 +33,11 @@align-items: center;color: var(--mb-color-text-primary);- @media screen and (min-width: 40em) {+ @container dashboard-header (min-width: 40rem) {margin-left: auto;}- @media screen and (max-width: 60em) {- &.isNavBarOpen {- width: 100%;- margin-bottom: 6px;- }- }-- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {width: 100%;margin-bottom: 6px;padding-top: 0.375rem;@@ -53,14 +51,7 @@align-items: center;gap: 0.5rem;- @media screen and (max-width: 60em) {- &.isNavBarOpen {- width: 100%;- justify-content: space-between;- }- }-- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {width: 100%;justify-content: space-between;}@@ -69,7 +60,7 @@.HeaderLastEditInfoLabel {transition: opacity 400ms ease;- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {margin-top: 4px;}}@@ -107,7 +98,7 @@}}- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {padding-top: 0;padding-left: 1rem;padding-right: 1rem;@@ -131,7 +122,7 @@}.HeaderRow {- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {padding-left: 0;padding-right: 0;}@@ -142,14 +133,7 @@align-items: center;justify-items: apart;- @media screen and (max-width: 60em) {- &.isNavBarOpen {- flex-direction: column;- align-items: baseline;- }- }-- @media screen and (max-width: 40em) {+ @container dashboard-header (max-width: 40rem) {flex-direction: column;align-items: baseline;}diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsxindex c1e8cc07c05..deffa9c6618 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx@@ -25,7 +25,6 @@ import {PLUGIN_COLLECTION_COMPONENTS,PLUGIN_MODERATION,} from "metabase/plugins";-import { getIsNavbarOpen } from "metabase/selectors/app";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Box, Flex } from "metabase/ui";import type { Collection, Dashboard as IDashboard } from "metabase-types/api";@@ -58,7 +57,6 @@ export function DashboardHeaderView({}: DashboardHeaderViewProps) {const { titled } = useDashboardContext();- const isNavBarOpen = useSelector(getIsNavbarOpen);const isEditing = useSelector(getIsEditing);const [showSubHeader, setShowSubHeader] = useState(true);@@ -81,11 +79,7 @@ export function DashboardHeaderView({const _headerButtons = useMemo(() => (- <Flex- className={cx("Header-buttonSection", S.HeaderButtonSection, {- [S.isNavBarOpen]: isNavBarOpen,- })}- >+ <Flex className={cx("Header-buttonSection", S.HeaderButtonSection)}><DashboardHeaderButtonRowcanResetFilters={canResetFilters}onResetFilters={handleResetFilters}@@ -93,7 +87,7 @@ export function DashboardHeaderView({/></Flex>),- [canResetFilters, handleResetFilters, isAnalyticsDashboard, isNavBarOpen],+ [canResetFilters, handleResetFilters, isAnalyticsDashboard],);useEffect(() => {@@ -106,7 +100,7 @@ export function DashboardHeaderView({}, [isLastEditInfoVisible]);return (- <div>+ <div className={S.DashboardHeader}>{isEditing && <EditBar title={editingTitle} buttons={editingButtons} />}{editWarning && (<Flex className={cx(CS.wrapper, S.EditWarning)}>@@ -132,9 +126,7 @@ export function DashboardHeaderView({ref={header}><FixedWidthContainer- className={cx(S.HeaderFixedWidthContainer, {- [S.isNavBarOpen]: isNavBarOpen,- })}+ className={S.HeaderFixedWidthContainer}data-testid="fixed-width-dashboard-header"isFixedWidth={dashboard?.width === "fixed"}>@@ -180,21 +172,13 @@ export function DashboardHeaderView({</Box>)}- <Flex- className={cx(S.HeaderButtonsContainer, {- [S.isNavBarOpen]: isNavBarOpen,- })}- >- {_headerButtons}- </Flex>+ <Flex className={S.HeaderButtonsContainer}>{_headerButtons}</Flex></FixedWidthContainer></FullWidthContainer>)}<FullWidthContainer className={S.HeaderRow}><FixedWidthContainer- className={cx(S.HeaderFixedWidthContainer, {- [S.isNavBarOpen]: isNavBarOpen,- })}+ className={S.HeaderFixedWidthContainer}data-testid="fixed-width-dashboard-tabs"isFixedWidth={dashboard?.width === "fixed"}>