diff options
| author | Eric Bailey <git@esb.lol> | 2024-12-10 14:52:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-10 20:52:30 +0000 |
| commit | e052f5e198603246cb031e00d9cadc2ae4bb140d (patch) | |
| tree | aceffa2b71bfdc9c632ff8eaa84d68c807fd5655 /src/components | |
| parent | f34e8d8cdfcab16165c94d8c96084e9cd4338d91 (diff) | |
| download | voidsky-e052f5e198603246cb031e00d9cadc2ae4bb140d.tar.zst | |
Refactor sidebar (#6971)
* Refactor RightNav (cherry picked from commit 96bb02acfd2d7452df18a0e7410e6a7169a583ed) * Better gutter handling * Clean up styles * Memoize breakpoints * Format * Comment * Loosen spacing, handle overflow, smaller text to match prod * Fix circular imports on native * Return 0 instead of undefined for easier calculations * Re-assign * Fix * Port over fix from subs/base * Space out right nav feeds, widen sidebar to match prod * Fix lost padding on home header * Fix perf by not actually linking to new URL * Remove underline on focus * Foramt --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/Layout/Header/index.tsx | 6 | ||||
| -rw-r--r-- | src/components/Link.tsx | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/components/Layout/Header/index.tsx b/src/components/Layout/Header/index.tsx index a35a09537..321f7201f 100644 --- a/src/components/Layout/Header/index.tsx +++ b/src/components/Layout/Header/index.tsx @@ -13,7 +13,7 @@ import { platform, TextStyleProp, useBreakpoints, - useGutterStyles, + useGutters, useTheme, } from '#/alf' import {Button, ButtonIcon, ButtonProps} from '#/components/Button' @@ -34,7 +34,7 @@ export function Outer({ noBottomBorder?: boolean }) { const t = useTheme() - const gutter = useGutterStyles() + const gutters = useGutters([0, 'base']) const {gtMobile} = useBreakpoints() const {isWithinOffsetView} = useContext(ScrollbarOffsetContext) @@ -46,7 +46,7 @@ export function Outer({ a.flex_row, a.align_center, a.gap_sm, - gutter, + gutters, platform({ native: [a.pb_sm, a.pt_xs], web: [a.py_sm], diff --git a/src/components/Link.tsx b/src/components/Link.tsx index a5203b252..3cd593a10 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -237,7 +237,9 @@ export function Link({ } export type InlineLinkProps = React.PropsWithChildren< - BaseLinkProps & TextStyleProp & Pick<TextProps, 'selectable'> + BaseLinkProps & + TextStyleProp & + Pick<TextProps, 'selectable' | 'numberOfLines'> > & Pick<ButtonProps, 'label'> & { disableUnderline?: boolean @@ -273,7 +275,6 @@ export function InlineLinkText({ onIn: onHoverIn, onOut: onHoverOut, } = useInteractionState() - const {state: focused, onIn: onFocus, onOut: onBlur} = useInteractionState() const flattenedStyle = flatten(style) || {} return ( @@ -284,7 +285,7 @@ export function InlineLinkText({ {...rest} style={[ {color: t.palette.primary_500}, - (hovered || focused) && + hovered && !disableUnderline && { ...web({ outline: 0, @@ -298,8 +299,6 @@ export function InlineLinkText({ role="link" onPress={download ? undefined : onPress} onLongPress={onLongPress} - onFocus={onFocus} - onBlur={onBlur} onMouseEnter={onHoverIn} onMouseLeave={onHoverOut} accessibilityRole="link" |