fix: Improved mobile styling

fix: Severla context menus miss-positioned
fix: Search filters not large enough on mobile
fix: Deep black background on mobile to match native apps
fix: Sticky document header allowing horizontal scrolling on mobile
This commit is contained in:
Tom Moor
2021-04-17 10:40:39 -07:00
parent c46a032f0b
commit b2d703bee4
10 changed files with 62 additions and 18 deletions

View File

@ -134,7 +134,7 @@ export type Props = {|
"data-event-action"?: string, "data-event-action"?: string,
|}; |};
const Button = React.forwardRef<Props>( const Button = React.forwardRef<Props, HTMLButtonElement>(
( (
{ {
type = "text", type = "text",

View File

@ -97,6 +97,7 @@ const Wrapper = styled(Flex)`
`; `;
const Title = styled("div")` const Title = styled("div")`
display: none;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -105,12 +106,9 @@ const Title = styled("div")`
cursor: pointer; cursor: pointer;
min-width: 0; min-width: 0;
/* on mobile, there's always a floating menu button in the top left
add some padding here to offset
*/
padding-left: 40px;
${breakpoint("tablet")` ${breakpoint("tablet")`
padding-left: 0; padding-left: 0;
display: block;
`}; `};
svg { svg {

View File

@ -3,23 +3,31 @@ import { observer } from "mobx-react";
import * as React from "react"; import * as React from "react";
import { ThemeProvider } from "styled-components"; import { ThemeProvider } from "styled-components";
import GlobalStyles from "shared/styles/globals"; import GlobalStyles from "shared/styles/globals";
import { dark, light } from "shared/styles/theme"; import { dark, light, lightMobile, darkMobile } from "shared/styles/theme";
import useMediaQuery from "hooks/useMediaQuery";
import useStores from "hooks/useStores"; import useStores from "hooks/useStores";
const empty = {};
type Props = {| type Props = {|
children: React.Node, children: React.Node,
|}; |};
function Theme({ children }: Props) { function Theme({ children }: Props) {
const { ui } = useStores(); const { ui } = useStores();
const theme = ui.resolvedTheme === "dark" ? dark : light;
const mobileTheme = ui.resolvedTheme === "dark" ? darkMobile : lightMobile;
const isMobile = useMediaQuery(`(max-width: ${theme.breakpoints.tablet}px)`);
return ( return (
<ThemeProvider theme={ui.resolvedTheme === "dark" ? dark : light}> <ThemeProvider theme={theme}>
<ThemeProvider theme={isMobile ? mobileTheme : empty}>
<> <>
<GlobalStyles /> <GlobalStyles />
{children} {children}
</> </>
</ThemeProvider> </ThemeProvider>
</ThemeProvider>
); );
} }

View File

@ -0,0 +1,20 @@
// @flow
import { useState, useEffect } from "react";
export default function useMediaQuery(query: string): boolean {
const [matches, setMatches] = useState<boolean>(false);
useEffect(() => {
const media = window.matchMedia(query);
if (media.matches !== matches) {
setMatches(media.matches);
}
const listener = () => {
setMatches(media.matches);
};
media.addListener(listener);
return () => media.removeListener(listener);
}, [matches, query]);
return matches;
}

View File

@ -17,7 +17,7 @@ import useStores from "hooks/useStores";
import { newDocumentUrl } from "utils/routeHelpers"; import { newDocumentUrl } from "utils/routeHelpers";
function NewDocumentMenu() { function NewDocumentMenu() {
const menu = useMenuState(); const menu = useMenuState({ modal: true });
const { t } = useTranslation(); const { t } = useTranslation();
const team = useCurrentTeam(); const team = useCurrentTeam();
const { collections, policies } = useStores(); const { collections, policies } = useStores();

View File

@ -16,7 +16,7 @@ import useStores from "hooks/useStores";
import { newDocumentUrl } from "utils/routeHelpers"; import { newDocumentUrl } from "utils/routeHelpers";
function NewTemplateMenu() { function NewTemplateMenu() {
const menu = useMenuState(); const menu = useMenuState({ modal: true });
const { t } = useTranslation(); const { t } = useTranslation();
const team = useCurrentTeam(); const team = useCurrentTeam();
const { collections, policies } = useStores(); const { collections, policies } = useStores();

View File

@ -406,8 +406,11 @@ const ResultsWrapper = styled(Flex)`
position: absolute; position: absolute;
transition: all 300ms cubic-bezier(0.65, 0.05, 0.36, 1); transition: all 300ms cubic-bezier(0.65, 0.05, 0.36, 1);
top: ${(props) => (props.pinToTop ? "0%" : "50%")}; top: ${(props) => (props.pinToTop ? "0%" : "50%")};
margin-top: ${(props) => (props.pinToTop ? "40px" : "-75px")};
width: 100%; width: 100%;
${breakpoint("tablet")`
margin-top: ${(props) => (props.pinToTop ? "40px" : "-75px")};
`};
`; `;
const ResultList = styled(Flex)` const ResultList = styled(Flex)`

View File

@ -3,6 +3,7 @@ import { CheckmarkIcon } from "outline-icons";
import * as React from "react"; import * as React from "react";
import { MenuItem } from "reakit/Menu"; import { MenuItem } from "reakit/Menu";
import styled from "styled-components"; import styled from "styled-components";
import breakpoint from "styled-components-breakpoint";
import Flex from "components/Flex"; import Flex from "components/Flex";
import HelpText from "components/HelpText"; import HelpText from "components/HelpText";
@ -48,8 +49,8 @@ const Checkmark = styled(CheckmarkIcon)`
const Button = styled.button` const Button = styled.button`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-size: 15px; font-size: 16px;
padding: 4px 8px; padding: 8px;
margin: 0; margin: 0;
border: 0; border: 0;
background: none; background: none;
@ -58,7 +59,7 @@ const Button = styled.button`
font-weight: ${(props) => (props.active ? "600" : "normal")}; font-weight: ${(props) => (props.active ? "600" : "normal")};
justify-content: center; justify-content: center;
width: 100%; width: 100%;
min-height: 32px; min-height: 42px;
${HelpText} { ${HelpText} {
font-weight: normal; font-weight: normal;
@ -68,6 +69,12 @@ const Button = styled.button`
&:hover { &:hover {
background: ${(props) => props.theme.listItemHoverBackground}; background: ${(props) => props.theme.listItemHoverBackground};
} }
${breakpoint("tablet")`
padding: 4px 8px;
font-size: 15px;
min-height: 32px;
`};
`; `;
const ListItem = styled("li")` const ListItem = styled("li")`

View File

@ -30,7 +30,7 @@ const FilterOptions = ({
className, className,
onSelect, onSelect,
}: Props) => { }: Props) => {
const menu = useMenuState(); const menu = useMenuState({ modal: true });
const selected = find(options, { key: activeKey }) || options[0]; const selected = find(options, { key: activeKey }) || options[0];
const selectedLabel = selected ? `${selectedPrefix} ${selected.label}` : ""; const selectedLabel = selected ? `${selectedPrefix} ${selected.label}` : "";

View File

@ -241,4 +241,12 @@ export const dark = {
scrollbarThumb: colors.lightBlack, scrollbarThumb: colors.lightBlack,
}; };
export const lightMobile = {
background: colors.white,
};
export const darkMobile = {
background: colors.black,
};
export default light; export default light;