Skip to content

Commit

Permalink
Merge pull request #91 from vector-im/menu-item
Browse files Browse the repository at this point in the history
Create menu item component
  • Loading branch information
robintown authored Sep 28, 2023
2 parents d9caaa6 + c5dd4c8 commit 0d980d5
Show file tree
Hide file tree
Showing 6 changed files with 483 additions and 0 deletions.
115 changes: 115 additions & 0 deletions src/components/MenuItem/MenuItem.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
/*
Copyright 2023 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.item {
display: grid;
grid-template: "icon label ." auto "empty1 label empty2" auto / auto auto 1fr;
align-items: center;
justify-items: end;
padding-block: var(--cpd-space-2x);
padding-inline: var(--cpd-space-4x);
box-sizing: border-box;
inline-size: 100%;
color: var(--cpd-color-text-secondary);
background: var(--cpd-color-bg-action-secondary-rest);
}

.item.interactive {
cursor: pointer;
}

.item.no-label {
grid-template: "icon ." auto / auto 1fr;
}

.icon {
grid-area: icon;
margin-inline-end: var(--cpd-space-3x);
}

.item.no-label .icon {
margin-inline-end: var(--cpd-space-4x);
}

.label {
grid-area: label;
margin-inline-end: var(--cpd-space-4x);
text-align: start;
}

.nav-hint {
/* Hidden until the item is hovered over */
display: none;
flex-shrink: 0;
margin-inline-end: calc(-1 * var(--cpd-space-2x));
}

button.item {
appearance: none;
border: none;
}

.item.with-chevron {
padding-inline-end: var(--cpd-space-2x);
}

.item[data-kind="primary"] > .label {
color: var(--cpd-color-text-primary);
}

.item[data-kind="primary"] > .icon {
color: var(--cpd-color-icon-primary);
}

.item[data-kind="primary"] > .nav-hint {
color: var(--cpd-color-icon-tertiary);
}

.item[data-kind="critical"] > .label {
color: var(--cpd-color-text-critical-primary);
}

.item[data-kind="critical"] > .icon,
.item[data-kind="critical"] > .nav-hint {
color: var(--cpd-color-icon-critical-primary);
}

@media (hover) {
.item.interactive[data-kind="primary"]:hover {
background: var(--cpd-color-bg-action-secondary-hovered);
}

.item.interactive[data-kind="critical"]:hover {
background: var(--cpd-color-bg-critical-subtle);
}

/* Replace the children with the navigation hint on hover */
.item.interactive:hover > .nav-hint {
display: initial;
}

.item.interactive:hover > .nav-hint ~ * {
display: none;
}
}

.item.interactive[data-kind="primary"]:active {
background: var(--cpd-color-bg-action-secondary-pressed);
}

.item.interactive[data-kind="critical"]:active {
background: var(--cpd-color-bg-critical-subtle);
}
57 changes: 57 additions & 0 deletions src/components/MenuItem/MenuItem.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
Copyright 2023 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import React from "react";
import { Meta, StoryFn } from "@storybook/react";
import ExtensionsIcon from "@vector-im/compound-design-tokens/icons/extensions.svg";
import ChatIcon from "@vector-im/compound-design-tokens/icons/chat.svg";
import SettingsLabel from "@vector-im/compound-design-tokens/icons/settings.svg";

import { MenuItem as MenuItemComponent } from "./MenuItem";
import { Text } from "../Typography/Text";

export default {
title: "MenuItem",
component: MenuItemComponent,
argTypes: {},
args: {},
} as Meta<typeof MenuItemComponent>;

const Template: StoryFn<typeof MenuItemComponent> = (args) => (
<div style={{ width: 300 }}>
<MenuItemComponent {...args} Icon={ChatIcon} label="First item">
<Text as="span" size="sm">
99
</Text>
</MenuItemComponent>
<MenuItemComponent
{...args}
Icon={ExtensionsIcon}
label="Second item with a name that's quite long"
/>
<MenuItemComponent {...args} Icon={SettingsLabel} label={undefined}>
<Text as="span" size="sm">
Third item without a label
</Text>
</MenuItemComponent>
</div>
);

export const Primary = Template.bind({});
Primary.args = { kind: "primary" };

export const Critical = Template.bind({});
Critical.args = { kind: "critical" };
54 changes: 54 additions & 0 deletions src/components/MenuItem/MenuItem.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
Copyright 2023 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { describe, it, expect } from "vitest";
import { render } from "@testing-library/react";
import React from "react";
import LeaveIcon from "@vector-im/compound-design-tokens/icons/leave.svg";
import UserProfileIcon from "@vector-im/compound-design-tokens/icons/user-profile.svg";
import MicOnOutlineIcon from "@vector-im/compound-design-tokens/icons/mic-on-outline.svg";

import { MenuItem } from "./MenuItem";
import { Text } from "../Typography/Text";

describe("MenuItem", () => {
it("renders", () => {
const { asFragment } = render(
<MenuItem kind="critical" Icon={LeaveIcon} label="Leave room" />,
);
expect(asFragment()).toMatchSnapshot();
});

it("renders with a child", () => {
const { asFragment } = render(
<MenuItem Icon={UserProfileIcon} label="People">
<Text as="span" size="sm">
10
</Text>
</MenuItem>,
);
expect(asFragment()).toMatchSnapshot();
});

it("renders without a label", () => {
const { asFragment } = render(
<MenuItem Icon={MicOnOutlineIcon} label={undefined}>
Imagine that there might be a volume slider here in place of the label
</MenuItem>,
);
expect(asFragment()).toMatchSnapshot();
});
});
100 changes: 100 additions & 0 deletions src/components/MenuItem/MenuItem.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
Copyright 2023 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import classnames from "classnames";
import React, {
ComponentPropsWithoutRef,
ComponentType,
ElementType,
SVGAttributes,
} from "react";
import styles from "./MenuItem.module.css";
import { Text } from "../Typography/Text";
import ChevronRightIcon from "@vector-im/compound-design-tokens/icons/chevron-right.svg";

type MenuItemElement = "button" | "label" | "a" | "div";

type Props<C extends MenuItemElement> = {
/**
* The element type of this menu item.
* @default button
*/
as?: C;
/**
* The CSS class name.
*/
className?: string;
/**
* The icon to show on this menu item.
*/
Icon: ComponentType<SVGAttributes<SVGElement>>;
/**
* The label to show on this menu item.
*/
// This prop is required because it's rare to not want a label
label: string | undefined;
/**
* The color variant of the menu item.
* @default primary
*/
kind?: "primary" | "critical";
} & ComponentPropsWithoutRef<C>;

/**
* An item within a menu, acting either as a navigation button, or simply a
* container for other interactive elements.
*/
export const MenuItem = <C extends MenuItemElement = "button">({
as,
className,
Icon,
label,
kind = "primary",
children,
...props
}: Props<C>) => {
const Component = as ?? ("button" as ElementType);

return (
<Component
role="menuitem"
{...props}
className={classnames(className, styles.item, {
[styles.interactive]: as !== "div",
[styles["no-label"]]: label === undefined,
})}
data-kind={kind}
>
<Icon width={24} height={24} className={styles.icon} aria-hidden={true} />
{label !== undefined && (
<Text className={styles.label} size="md" weight="medium" as="span">
{label}
</Text>
)}
{/* We use CSS to swap between this navigation hint and the provided
children on hover - see the styles module. */}
{(Component === "button" || Component === "a") && (
<ChevronRightIcon
width={24}
height={24}
className={styles["nav-hint"]}
aria-hidden={true}
/>
)}
{children}
</Component>
);
};
Loading

0 comments on commit 0d980d5

Please sign in to comment.