Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Wrap buttons and title on smaller screens (#67681)

Romeo Van Snicka41303a180f8
diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css b/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css
index acf36ff4a1f..bc1113e35a9 100644
--- a/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css
+++ b/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css
@@ -10,4 +10,6 @@
background-color: var(--mb-color-background-primary);
position: relative;
z-index: 3;
+ container-name: query-builder;
+ container-type: inline-size;
}
diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.module.css b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.module.css
index eebfae83859..c07462250fb 100644
--- a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.module.css
+++ b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.module.css
@@ -25,3 +25,8 @@
}
}
}
+
+.Footer {
+ container-name: query-builder;
+ container-type: inline-size;
+}
diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx
index 1b09d2af441..00911425518 100644
--- a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx
@@ -154,7 +154,7 @@ export const ViewMainContainer = (props: ViewMainContainerProps) => {
onUpdateQuestion={updateQuestion}
/>
</DebouncedFrame>
- <Box ref={footerRef}>
+ <Box ref={footerRef} className={ViewMainContainerS.Footer}>
<TimeseriesChrome question={question} updateQuestion={updateQuestion} />
<ViewFooter className={CS.flexNoShrink} />
</Box>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css
index 5dec59ced0b..454058ccdf0 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css
@@ -25,6 +25,21 @@
}
}
+@container query-builder (max-width: 50em) {
+ .ActionButtonRoot[data-variant="default"] {
+ flex-shrink: 0;
+ padding: 11px;
+ }
+
+ .ActionButtonLabel {
+ display: none;
+ }
+
+ .ActionButtonSection[data-position="left"] {
+ margin-right: 0;
+ }
+}
+
.FilterButtonAttachment {
&[data-variant="default"] {
padding: 0.5rem;
@@ -140,6 +155,10 @@
}
}
+.Divider {
+ flex-grow: 1;
+}
+
.ViewHeaderActionPanel {
display: flex;
align-items: center;
@@ -147,13 +166,17 @@
gap: 0.5rem;
position: relative;
- @media screen and (max-width: 40em) {
+ @container query-builder (max-width: 70em) {
margin-left: 0;
width: 100%;
- justify-content: space-between;
+ justify-content: start;
border-top: 1px solid var(--mb-color-border);
margin-top: 1rem;
- padding: 0.5rem 2.5rem 0 2rem;
+ padding: 0.5rem 1.325rem 0 1.325rem;
+ }
+
+ @media screen and (max-width: 40em) {
+ padding-inline: 1.325rem;
}
/* increase specificity */
@@ -183,14 +206,23 @@
padding-top: 0.5rem;
padding-bottom: 0.5rem;
- @media screen and (max-width: 40em) {
+ @media screen and (max-width: 70em) {
+ &.isNavBarOpen {
+ gap: 0.25rem;
+
+ .ViewHeaderActionPanel {
+ margin-left: 0;
+ }
+
+ flex-direction: column;
+ align-items: start;
+ }
+ }
+
+ @container query-builder (max-width: 70em) {
flex-direction: column;
align-items: start;
padding: 0.5rem 0;
-
- &.isNavBarOpen {
- margin-top: var(--app-subheader-height);
- }
}
}
@@ -216,6 +248,18 @@
}
}
+.ViewHeaderLeftSideWrapper {
+ flex-grow: 1;
+ align-items: center;
+ width: 100%;
+ min-width: 0;
+ gap: 0.5rem;
+
+ @container query-builder (max-width: 70em) {
+ padding-left: 1.325rem;
+ }
+}
+
.SavedQuestionLeftSideRoot {
width: 100%;
min-width: 0;
@@ -252,9 +296,7 @@
}
}
- @media screen and (max-width: 40em) {
- padding: 0 1.25rem;
-
+ @container query-builder (max-width: 70em) {
.SavedQuestionHeaderButtonContainer {
top: 0;
}
@@ -269,9 +311,16 @@
display: flex;
align-items: center;
flex-wrap: wrap;
+ column-gap: 1rem;
+ row-gap: 0.25rem;
+}
+
+.FilterPanel:not([data-css-specificity-hack]) {
+ @container query-builder (max-width: 70em) {
+ padding-inline: 1.325rem;
+ }
@media screen and (max-width: 40em) {
- flex-direction: column;
- align-items: start;
+ padding-inline: 1.325rem;
}
}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
index 178a24365d4..0789de3358f 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
@@ -5,6 +5,7 @@ import { usePrevious } from "react-use";
import { useToggle } from "metabase/common/hooks/use-toggle";
import type { QueryModalType } from "metabase/query_builder/constants";
+import { Flex } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { Dataset } from "metabase-types/api";
@@ -154,25 +155,27 @@ export function ViewTitleHeader({
style={style}
data-testid="qb-header"
>
- <QueryBuilderBackButton mr="sm" />
- {isSaved ? (
- <SavedQuestionLeftSide
- question={question}
- isObjectDetail={isObjectDetail}
- isAdditionalInfoVisible={isAdditionalInfoVisible}
- onOpenQuestionInfo={onOpenQuestionInfo}
- onSave={onSave}
- />
- ) : (
- <AdHocQuestionLeftSide
- question={question}
- isObjectDetail={isObjectDetail}
- isSummarized={isSummarized}
- isNative={isNative}
- originalQuestion={originalQuestion}
- onOpenModal={onOpenModal}
- />
- )}
+ <Flex className={ViewTitleHeaderS.ViewHeaderLeftSideWrapper}>
+ <QueryBuilderBackButton mr="sm" />
+ {isSaved ? (
+ <SavedQuestionLeftSide
+ question={question}
+ isObjectDetail={isObjectDetail}
+ isAdditionalInfoVisible={isAdditionalInfoVisible}
+ onOpenQuestionInfo={onOpenQuestionInfo}
+ onSave={onSave}
+ />
+ ) : (
+ <AdHocQuestionLeftSide
+ question={question}
+ isObjectDetail={isObjectDetail}
+ isSummarized={isSummarized}
+ isNative={isNative}
+ originalQuestion={originalQuestion}
+ onOpenModal={onOpenModal}
+ />
+ )}
+ </Flex>
<ViewTitleHeaderRightSide
question={question}
result={result}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.module.css
index 79e82287c22..2031fc89830 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.module.css
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.module.css
@@ -1,5 +1,5 @@
.AdHocLeftSideRoot {
- @media screen and (max-width: 40em) {
- padding: 0 1.25rem;
+ @container query-builder (max-width: 70em) {
+ align-self: start;
}
}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
index deb835fb645..6b61459676e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
@@ -17,7 +17,6 @@ import type { QueryBuilderMode } from "metabase-types/store";
import ViewTitleHeaderS from "../ViewTitleHeader.module.css";
interface FilterHeaderButtonProps {
- className?: string;
question: Question;
isExpanded: boolean;
onExpand: () => void;
@@ -25,7 +24,6 @@ interface FilterHeaderButtonProps {
}
export function FilterHeaderButton({
- className,
question,
isExpanded,
onExpand,
@@ -57,9 +55,14 @@ export function FilterHeaderButton({
<Popover opened={isOpened} position="bottom-start" onDismiss={close}>
<Popover.Target>
<Button
- className={cx(className, ViewTitleHeaderS.FilterButton, {
+ className={cx(ViewTitleHeaderS.FilterButton, {
[ViewTitleHeaderS.FiltersActive]: hasFilters,
})}
+ classNames={{
+ root: ViewTitleHeaderS.ActionButtonRoot,
+ label: ViewTitleHeaderS.ActionButtonLabel,
+ section: ViewTitleHeaderS.ActionButtonSection,
+ }}
leftSection={<Icon name={hasFilters ? "filter_plus" : "filter"} />}
onClick={toggle}
data-testid="question-filter-header"
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.tsx
index b00eb28c600..94f9a9f5067 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.tsx
@@ -3,6 +3,8 @@ import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { QueryBuilderMode } from "metabase-types/store";
+import ViewTitleHeaderS from "../../ViewTitleHeader.module.css";
+
interface FilterHeaderProps {
question: Question;
expanded: boolean;
@@ -24,7 +26,13 @@ export function QuestionFiltersHeader({
return null;
}
- return <FilterPanel query={query} onChange={handleChange} />;
+ return (
+ <FilterPanel
+ query={query}
+ onChange={handleChange}
+ className={ViewTitleHeaderS.FilterPanel}
+ />
+ );
}
type RenderCheckOpts = {
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx
index a2f541ef11f..d5871681bb4 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionNotebookButton/QuestionNotebookButton.tsx
@@ -37,6 +37,11 @@ export function QuestionNotebookButton({
<Button
data-testid="notebook-button"
className={ViewTitleHeaderS.NotebookButton}
+ classNames={{
+ root: ViewTitleHeaderS.ActionButtonRoot,
+ label: ViewTitleHeaderS.ActionButtonLabel,
+ section: ViewTitleHeaderS.ActionButtonSection,
+ }}
leftSection={
isShowingNotebook ? (
<Icon name="lineandbar" />
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
index b8985d4eb78..87c92d879ab 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
@@ -1,4 +1,3 @@
-import cx from "classnames";
import { t } from "ttag";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
@@ -13,14 +12,12 @@ interface QuestionSummarizeWidgetProps {
isShowingSummarySidebar: boolean;
onEditSummary: () => void;
onCloseSummary: () => void;
- className?: string;
}
export function QuestionSummarizeWidget({
isShowingSummarySidebar,
onEditSummary,
onCloseSummary,
- className,
}: QuestionSummarizeWidgetProps) {
const handleClick = () => {
if (isShowingSummarySidebar) {
@@ -47,7 +44,12 @@ export function QuestionSummarizeWidget({
leftSection={<Icon name="sum" />}
onClick={handleClick}
data-active={isShowingSummarySidebar}
- className={cx(className, ViewTitleHeaderS.SummarizeButton)}
+ className={ViewTitleHeaderS.SummarizeButton}
+ classNames={{
+ root: ViewTitleHeaderS.ActionButtonRoot,
+ label: ViewTitleHeaderS.ActionButtonLabel,
+ section: ViewTitleHeaderS.ActionButtonSection,
+ }}
>
{t`Summarize`}
</Button>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css
index 69c1ab24e06..9feb64aa8f0 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css
@@ -10,14 +10,10 @@
@media screen and (max-width: 40em) {
margin-left: 0;
- margin-top: 2px;
- margin-bottom: 4px;
}
}
.StyledQuestionDataSource {
- padding-right: 1rem;
-
@media screen and (max-width: 40em) {
margin-left: 0;
padding-right: 0;
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
index 5032b05fb1c..891b3f85f53 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
@@ -3,7 +3,6 @@ import type React from "react";
import { useCallback } from "react";
import { t } from "ttag";
-import CS from "metabase/css/core/index.css";
import { QuestionSharingMenu } from "metabase/embedding/components/SharingMenu";
import { SERVER_ERROR_TYPES } from "metabase/lib/errors";
import { useSelector } from "metabase/lib/redux";
@@ -169,7 +168,6 @@ export function ViewTitleHeaderRightSide({
isActionListVisible,
}) && (
<FilterHeaderButton
- className={cx(CS.hide, CS.smShow)}
question={question}
isExpanded={areFiltersExpanded}
onExpand={onExpandFilters}
@@ -183,7 +181,6 @@ export function ViewTitleHeaderRightSide({
isActionListVisible,
}) && (
<QuestionSummarizeWidget
- className={cx(CS.hide, CS.smShow)}
isShowingSummarySidebar={isShowingSummarySidebar}
onEditSummary={onEditSummary}
onCloseSummary={onCloseSummary}
@@ -199,6 +196,7 @@ export function ViewTitleHeaderRightSide({
setQueryBuilderMode={setQueryBuilderMode}
/>
)}
+ <Box className={ViewTitleHeaderS.Divider} />
{ToggleNativeQueryPreview.shouldRender({
question,
queryBuilderMode,
diff --git a/frontend/src/metabase/query_builder/components/view/ViewSection.module.css b/frontend/src/metabase/query_builder/components/view/ViewSection.module.css
index 7f1fc59bebd..413557a669e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewSection.module.css
+++ b/frontend/src/metabase/query_builder/components/view/ViewSection.module.css
@@ -1,10 +1,9 @@
.ViewSectionRoot {
display: flex;
align-items: center;
- padding-left: 0.5rem;
- padding-right: 0.5rem;
+ padding: 0;
- @media screen and (min-width: 40em) {
+ @container query-builder (min-width: 70em) {
padding-left: 2rem;
padding-right: 1rem;
}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.module.css b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.module.css
index 795e2eee88d..3b3edbae021 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.module.css
+++ b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.module.css
@@ -1,3 +1,4 @@
.FilterPanelRoot {
border-bottom: 1px solid var(--mb-color-border);
+ padding-inline: var(--mantine-spacing-xl);
}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.tsx b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.tsx
index 82c11b2371c..def6d4a355b 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanel.tsx
@@ -1,3 +1,4 @@
+import cx from "classnames";
import { useMemo } from "react";
import { Flex } from "metabase/ui";
@@ -10,9 +11,10 @@ import { getFilterItems } from "./utils";
interface FilterPanelProps {
query: Lib.Query;
onChange: (query: Lib.Query) => void;
+ className?: string;
}
-export function FilterPanel({ query, onChange }: FilterPanelProps) {
+export function FilterPanel({ query, onChange, className }: FilterPanelProps) {
const items = useMemo(() => getFilterItems(query), [query]);
const handleChange = (query: Lib.Query) => {
@@ -25,11 +27,10 @@ export function FilterPanel({ query, onChange }: FilterPanelProps) {
return (
<Flex
- className={S.FilterPanelRoot}
+ className={cx(S.FilterPanelRoot, className)}
align="center"
wrap="wrap"
gap="sm"
- px="xl"
py="sm"
data-testid="qb-filters-panel"
>