Skip to content

Add RAC submenu to homepage and tailwind starter #5919

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

Merged
reidbarber merged 3 commits into from
Feb 27, 2024
Merged

Add RAC submenu to homepage and tailwind starter #5919

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
d53ef40
add RAC submenu to homepage and tailwind example
reidbarber Feb 21, 2024
a14df83
revert auto formatting
reidbarber Feb 21, 2024
fbdeb99
Merge branch 'main' into rac-submenu-homepage
snowystinger Feb 26, 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
24 changes: 22 additions & 2 deletions packages/dev/docs/pages/react-aria/home/ExampleApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {Arrow} from './components';
import {Button} from 'tailwind-starter/Button';
import {Cell, Column, Row, TableHeader} from 'tailwind-starter/Table';
import {Checkbox} from 'tailwind-starter/Checkbox';
import {CloudSun, Dessert, Droplet, Droplets, FilterIcon, MoreHorizontal, PencilIcon, PlusIcon, RefreshCw, SlidersIcon, StarIcon, Sun, SunDim, TrashIcon} from 'lucide-react';
import {ColumnProps, Dialog, DialogTrigger, DropZone, Form, Heading, isFileDropItem, Key, MenuTrigger, ModalOverlay, ModalOverlayProps, Modal as RACModal, ResizableTableContainer, Selection, SortDescriptor, Table, TableBody, Text, ToggleButton, ToggleButtonProps, TooltipTrigger} from 'react-aria-components';
import {CloudSun, Dessert, Droplet, Droplets, FilterIcon, Mail, MoreHorizontal, PencilIcon, PlusIcon, RefreshCw, ShareIcon, SlidersIcon, StarIcon, Sun, SunDim, TrashIcon, Twitter} from 'lucide-react';
import {ColumnProps, Dialog, DialogTrigger, DropZone, Form, Heading, isFileDropItem, Key, MenuTrigger, ModalOverlay, ModalOverlayProps, Modal as RACModal, ResizableTableContainer, Selection, SortDescriptor, SubmenuTrigger, Table, TableBody, Text, ToggleButton, ToggleButtonProps, TooltipTrigger} from 'react-aria-components';
import {ComboBox, ComboBoxItem} from 'tailwind-starter/ComboBox';
import {DatePicker} from 'tailwind-starter/DatePicker';
import {focusRing} from 'tailwind-starter/utils';
Expand Down Expand Up @@ -245,6 +245,16 @@ export function ExampleApp() {
<MenuItem id="favorite"><StarIcon aria-hidden className="w-4 h-4" /> {item.isFavorite ? 'Unfavorite' : 'Favorite'}</MenuItem>
<MenuItem id="edit"><PencilIcon aria-hidden className="w-4 h-4" /> Edit…</MenuItem>
<MenuItem id="delete"><TrashIcon aria-hidden className="w-4 h-4" /> Delete…</MenuItem>
<SubmenuTrigger>
Copy link
Member

@snowystinger snowystinger Feb 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you create a followup task to add a header and section to this example some time?

<MenuItem aria-label="Share">
<ShareIcon aria-hidden className="w-4 h-4" />
Share
</MenuItem>
<Menu>
<MenuItem href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(item.common_name)}`} target="blank" rel="noopener noreferrer" aria-label="Twitter"><Twitter aria-hidden className="w-4 h-4" /> Twitter…</MenuItem>
<MenuItem href={`mailto:abc@example.com?subject=${encodeURIComponent(item.common_name)}`} target="blank" rel="noopener noreferrer" aria-label="Email"><Mail aria-hidden className="w-4 h-4" /> Email…</MenuItem>
</Menu>
</SubmenuTrigger>
</Menu>
</MenuTrigger>
</div>
Expand Down Expand Up @@ -295,6 +305,16 @@ export function ExampleApp() {
<MenuItem id="favorite"><StarIcon aria-hidden className="w-4 h-4" /> {item.isFavorite ? 'Unfavorite' : 'Favorite'}</MenuItem>
<MenuItem id="edit"><PencilIcon aria-hidden className="w-4 h-4" /> Edit…</MenuItem>
<MenuItem id="delete"><TrashIcon aria-hidden className="w-4 h-4" /> Delete…</MenuItem>
<SubmenuTrigger>
<MenuItem aria-label="Share">
<ShareIcon aria-hidden className="w-4 h-4" />
Share
</MenuItem>
<Menu>
<MenuItem href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(item.common_name)}`} target="blank" rel="noopener noreferrer" aria-label="Twitter"><Twitter aria-hidden className="w-4 h-4" /> Twitter…</MenuItem>
<MenuItem href={`mailto:abc@example.com?subject=${encodeURIComponent(item.common_name)}`} target="blank" rel="noopener noreferrer" aria-label="Email"><Mail aria-hidden className="w-4 h-4" /> Email…</MenuItem>
</Menu>
</SubmenuTrigger>
</Menu>
</MenuTrigger>
</Cell>
Expand Down
9 changes: 8 additions & 1 deletion starters/tailwind/src/ListBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ export const dropdownItemStyles = tv({
isFocused: {
true: 'bg-blue-600 text-white forced-colors:bg-[Highlight] forced-colors:text-[HighlightText]'
}
}
},
compoundVariants: [
{
isFocused: false,
isOpen: true,
className: 'bg-gray-100 dark:bg-zinc-700/60'
}
]
});

export function DropdownItem(props: ListBoxItemProps) {
Expand Down
5 changes: 4 additions & 1 deletion starters/tailwind/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function Menu<T extends object>(props: MenuProps<T>) {
export function MenuItem(props: MenuItemProps) {
return (
<AriaMenuItem {...props} className={dropdownItemStyles}>
{composeRenderProps(props.children, (children, {selectionMode, isSelected}) => <>
{composeRenderProps(props.children, (children, {selectionMode, isSelected, hasSubmenu}) => <>
{selectionMode !== 'none' && (
<span className="flex items-center w-4">
{isSelected && <Check aria-hidden className="w-4 h-4" />}
Expand All @@ -36,6 +36,9 @@ export function MenuItem(props: MenuItemProps) {
<span className="flex items-center flex-1 gap-2 font-normal truncate group-selected:font-semibold">
{children}
</span>
{hasSubmenu && (
<ChevronRight aria-hidden className="absolute w-4 h-4 right-2" />
)}
</>)}
</AriaMenuItem>
);
Expand Down
10 changes: 8 additions & 2 deletions starters/tailwind/src/Popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import {
OverlayArrow,
Popover as AriaPopover,
PopoverProps as AriaPopoverProps,
composeRenderProps
composeRenderProps,
PopoverContext,
useSlottedContext
} from 'react-aria-components';
import React from 'react';
import {tv} from 'tailwind-variants';
Expand All @@ -25,9 +27,13 @@ const styles = tv({
});

export function Popover({ children, showArrow, className, ...props }: PopoverProps) {
let popoverContext = useSlottedContext(PopoverContext)!;
let isSubmenu = popoverContext?.trigger === 'SubmenuTrigger';
let offset = showArrow ? 12 : 8;
offset = isSubmenu ? offset - 6 : offset;
return (
<AriaPopover
offset={showArrow ? 12 : 8}
offset={offset}
{...props}
className={composeRenderProps(className, (className, renderProps) => styles({...renderProps, className}))}>
{showArrow &&
Expand Down
42 changes: 41 additions & 1 deletion starters/tailwind/stories/Menu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Meta } from '@storybook/react';
import { MoreHorizontal } from 'lucide-react';
import React from 'react';
import { MenuTrigger } from 'react-aria-components';
import { MenuTrigger, Popover, SubmenuTrigger } from 'react-aria-components';
import { Button } from '../src/Button';
import { Menu, MenuItem, MenuSection, MenuSeparator } from '../src/Menu';

Expand Down Expand Up @@ -58,3 +58,43 @@ export const Sections = (args: any) => (
</Menu>
</MenuTrigger>
);

export const Submenu = (args: any) => (
<MenuTrigger>
<Button variant="secondary" className="px-2">
<MoreHorizontal className="w-5 h-5" />
</Button>
<Menu {...args}>
<MenuItem id="new">New…</MenuItem>
<SubmenuTrigger>
<MenuItem id="open">Open</MenuItem>
<Popover>
<Menu>
<MenuItem id="open-new">Open in New Window</MenuItem>
<MenuItem id="open-current">Open in Current Window</MenuItem>
</Menu>
</Popover>
</SubmenuTrigger>
<MenuSeparator />
<MenuItem id="print">Print…</MenuItem>
<SubmenuTrigger>
<MenuItem id="share">Share</MenuItem>
<Popover>
<Menu>
<MenuItem id="sms">SMS</MenuItem>
<MenuItem id="twitter">Twitter</MenuItem>
<SubmenuTrigger>
<MenuItem id="email">Email</MenuItem>
<Popover>
<Menu>
<MenuItem id="work">Work</MenuItem>
<MenuItem id="personal">Personal</MenuItem>
</Menu>
</Popover>
</SubmenuTrigger>
</Menu>
</Popover>
</SubmenuTrigger>
</Menu>
</MenuTrigger>
);