Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update feature dropdown to pin to current #5492

Merged
merged 3 commits into from
Aug 22, 2024
Merged

Update feature dropdown to pin to current #5492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609a48e
Update feature dropdown to pin to current
hasparus Aug 21, 2024
2d43482
Prefix to fix dekstop sizes
hasparus Aug 21, 2024
bfb306c
Use 2-column layout in community cards starting from 640px
hasparus Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web/docs/src/components/community-section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function CommunitySection({ className }: { className?: string }) {
<p className="mt-4 text-white/80 lg:text-center">
Supported by a network of early advocates, contributors, and champions.
</p>
<div className="my-6 grid grid-cols-1 gap-6 md:grid-cols-2 lg:my-24 lg:grid-cols-4">
<div className="my-6 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:my-24 lg:grid-cols-4">
<CommunityCard
title="GitHub integration"
description="Our CLI integrates smoothly with GitHub Actions / repositories."
Expand Down
33 changes: 21 additions & 12 deletions packages/web/docs/src/components/feature-tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,13 @@ export function FeatureTabs({ className }: { className?: string }) {
<Tabs.Root defaultValue={tabs[0]} {...useSmallScreenTabsHandlers()}>
<Tabs.List
className={
'bg-beige-200 mb-12 flex flex-col rounded-2xl sm:flex-row' +
'sm:bg-beige-200 mb-12 flex flex-col sm:flex-row sm:rounded-2xl' +
' group mx-4 mt-6 md:mx-0 md:mt-0' +
' max-sm:h-[58px] max-sm:focus-within:rounded-b-none'
' max-sm:h-[58px] max-sm:focus-within:rounded-b-none' +
' max-sm:focus-within:pointer-events-none' + // <- blur on click of current
' max-sm:focus-within:has-[>:nth-child(2)[data-state="active"]]:translate-y-[-100%]' +
' max-sm:focus-within:has-[>:nth-child(3)[data-state="active"]]:translate-y-[-200%]' +
' relative z-10 overflow-hidden focus-within:overflow-visible'
}
>
{tabs.map((tab, i) => {
Expand All @@ -59,11 +63,14 @@ export function FeatureTabs({ className }: { className?: string }) {
' text-base sm:text-sm lg:text-base [&>svg]:shrink-0' +
' max-sm:rdx-state-inactive:hidden group-focus-within:rdx-state-inactive:flex [&[data-state="inactive"]>:last-child]:invisible' +
' rounded-lg sm:rounded-[15px]' +
' max-sm:bg-beige-200 max-sm:rdx-state-inactive:rounded-none max-sm:rdx-state-inactive:order-1 z-10' +
' max-sm:[&[data-state="active"]~:nth-child(3)]:rounded-b-lg max-sm:[&[data-state="active"]~:nth-child(3)]:border-b' +
' max-sm:[&[data-state="inactive"]:first-child+&[data-state="inactive"]]:rounded-b-lg max-sm:[&[data-state="inactive"]:first-child+&[data-state="inactive"]]:border-b' +
' max-sm:group-focus-within:border-beige-600 max-sm:rdx-state-active:border max-sm:group-focus-within:border-x' +
' max-sm:group-focus-within:rdx-state-active:rounded-b-none max-sm:group-focus-within:rdx-state-active:border-b-0' +
' max-sm:bg-beige-200 max-sm:rdx-state-inactive:rounded-none z-10' +
' max-sm:border-beige-600 max-sm:group-focus-within:rdx-state-inactive:border-y-beige-200 max-sm:border' +
' max-sm:group-focus-within:[&:last-child]:border-t-beige-200 max-sm:group-focus-within:[&:nth-child(3)]:rounded-t-none' +
' max-sm:group-focus-within:[&[data-state="inactive"]:first-child]:border-t-beige-600 max-sm:group-focus-within:[&[data-state="inactive"]:first-child]:rounded-t-lg' +
' max-sm:group-focus-within:[&:nth-child(2)]:rdx-state-active:rounded-none max-sm:group-focus-within:[&:nth-child(2)]:rdx-state-active:border-y-beige-200' +
' max-sm:group-focus-within:[[data-state="active"]+&:last-child]:border-b-beige-600 max-sm:group-focus-within:[[data-state="active"]+&:last-child]:rounded-b-lg' +
' max-sm:group-focus-within:[[data-state="inactive"]+&:last-child[data-state="inactive"]]:border-b-beige-600 max-sm:group-focus-within:[[data-state="inactive"]+&:last-child[data-state="inactive"]]:rounded-b-lg' +
' max-sm:group-focus-within:first:rdx-state-active:border-b-beige-200 max-sm:group-focus-within:first:rdx-state-active:rounded-b-none' +
' max-sm:group-focus-within:aria-selected:z-20 max-sm:group-focus-within:aria-selected:ring-4' +
' max-sm:rdx-state-inactive:pointer-events-none max-sm:rdx-state-inactive:group-focus-within:pointer-events-auto' +
// between 640px and 721px we still want tabs, but they won't fit with big padding
Expand All @@ -72,7 +79,7 @@ export function FeatureTabs({ className }: { className?: string }) {
>
{icons[i]}
{tab}
<ChevronDownIcon className="ml-auto size-6 text-green-800 sm:hidden" />
<ChevronDownIcon className="ml-auto size-6 text-green-800 transition group-focus-within:rotate-90 sm:hidden" />
</Tabs.Trigger>
);
})}
Expand Down Expand Up @@ -296,9 +303,7 @@ function useSmallScreenTabsHandlers() {
return;
}

const items = activeElement.parentElement?.querySelectorAll(
'[role="tab"][data-state="inactive"]',
);
const items = activeElement.parentElement?.querySelectorAll('[role="tab"]');
if (!items) {
return;
}
Expand All @@ -323,7 +328,11 @@ function useSmallScreenTabsHandlers() {
case 'Enter': {
const item = items[index];
if (item instanceof HTMLElement) {
item.focus();
if (item.dataset.state === 'active') {
item.blur();
} else {
item.focus();
}
}
break;
}
Expand Down
Loading