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

Review Fixes of different PRs merged #565

Merged
merged 11 commits into from
Jan 9, 2025
Merged

Review Fixes of different PRs merged #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fe09848
Use SearchField instead of TextField in the documentation
alexasselin008 Jan 6, 2025
e7c16c3
test to remove all unecessary slot, and go from there
alexasselin008 Jan 6, 2025
da2e93f
fix icon slots in doc
alexasselin008 Jan 6, 2025
928fde8
fix doc button context
alexasselin008 Jan 6, 2025
2f6ad70
fix issue where the select documentation was crashing
alexasselin008 Jan 6, 2025
ce98ec0
fix console issue where a warning was being showed for the custom pop…
alexasselin008 Jan 7, 2025
6ce5805
fix styling issue
alexasselin008 Jan 7, 2025
65cebc2
fix input ref synthaxe
alexasselin008 Jan 8, 2025
a4921a5
fix combobox's example to allow a custom empty state
alexasselin008 Jan 8, 2025
483bd1a
add release notes
alexasselin008 Jan 8, 2025
cfa45ea
fix some synthax we don't need
alexasselin008 Jan 8, 2025
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 .changeset/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["basic"],
"ignore": ["basic", "docs"],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
}
Expand Down
9 changes: 9 additions & 0 deletions .changeset/cuddly-deers-reply.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@hopper-ui/components": patch
---

- **Improvement:** Simplified the `inputRef` type to enhance usability across multiple components.
- **Bug Fixes:**
- Resolved an issue preventing the addition of a custom `renderEmptyState` on a `Listbox` within a `ComboBox`.
- Fixed a console error that occurred when using custom values inside the `Select` component.
- Addressed a console error that appeared with custom popovers.
2 changes: 1 addition & 1 deletion apps/docs/app/ui/components/linkList/LinkList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function LinkList({ links, className }: LinkListProps) {
target="_blank"
key={`link-list-${key.toString()}`}
>{link.label}
<Icon slot="icon"
<Icon
src={icon as IconProps["src"]}
/>
</LinkButton>
Expand Down
7 changes: 3 additions & 4 deletions apps/docs/app/ui/icons/switcher/Switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
"use client";

import { IconTable } from "@/app/ui/icons/iconTable/IconTable.tsx";
import { ThemeContext } from "@/context/theme/ThemeProvider";
import { HopperProvider, SearchField } from "@hopper-ui/components";
import { SparklesIcon, SparklesRichIcon, iconNames, richIconNames } from "@hopper-ui/icons";
import { memo, useContext, useState, type ReactNode } from "react";
import { Radio, RadioGroup, type RadioProps } from "react-aria-components";

import { ThemeContext } from "@/context/theme/ThemeProvider";
import { HopperProvider, TextField } from "@hopper-ui/components";
import "./switcher.css";

interface SwitcherProps {
Expand Down Expand Up @@ -37,7 +36,7 @@ const Switcher = memo(({ type, iconType = "icon" }: SwitcherProps) => {
{iconType === "richIcon" && <SwitcherChoice value="xl" preview={<SparklesRichIcon size="xl" />} />}
</RadioGroup>
<HopperProvider colorScheme={colorMode}>
<TextField placeholder="Search" value={filter} onChange={onTextFieldChange} />
<SearchField aria-label="Filter icons" placeholder="Search" value={filter} onChange={onTextFieldChange} />
</HopperProvider>
<IconTable type={type} size={selectedSize} filter={filter} items={iconList} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/app/ui/layout/header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ProductMenuAndBrand = () => {
<ToggleTrigger>
<PopoverTrigger>
<ToggleButton aria-label="Open other libraries menu">
<Icon slot="icon" src={ProductMenuIcon} />
<Icon src={ProductMenuIcon} />
</ToggleButton>
<Popover
className="hd-product__menu"
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/app/ui/layout/sectionPopover/sectionLinkArrow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { UseArrowContext } from "./sectionLinkArrowContext";
import "./sectionLinkArrow.css";

interface SectionLinkArrowProps {
slot: string;
slot?: string;
className?: string;
src: ElementType<Omit<SVGProps<SVGSVGElement>, "ref"> & RefAttributes<SVGSVGElement>>;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/app/ui/layout/sectionPopover/sectionPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const SectionPopover = ({ links }: PropsWithoutRef<SectionPopoverProps>) => {
<PopoverTrigger>
<Button className="hd-section-popover__button">
On this page
<SectionLinkArrow slot="icon" src={ChevronIcon} />
<SectionLinkArrow src={ChevronIcon} />
</Button>
<Popover
aria-label="On this page"
Expand Down
16 changes: 6 additions & 10 deletions apps/docs/app/ui/layout/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
"use client";

import type { Section } from "@/app/lib/getPageLinks";
import Overlay from "@/components/overlay/Overlay";
import { FeatureFlagContext } from "@/context/feature/FeatureFlagProvider.tsx";
import { useSidebar } from "@/context/sidebar/SidebarProvider";
import { ThemeContext } from "@/context/theme/ThemeProvider";
import { HopperProvider, SearchField } from "@hopper-ui/components";
import clsx from "clsx";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useContext, useEffect, useRef, useState } from "react";

import { useSidebar } from "@/context/sidebar/SidebarProvider";

import Overlay from "@/components/overlay/Overlay";

import type { Section } from "@/app/lib/getPageLinks";

import { ThemeContext } from "@/context/theme/ThemeProvider";
import { HopperProvider, TextField } from "@hopper-ui/components";
import "./sidebar.css";

export interface SidebarProps {
Expand Down Expand Up @@ -122,7 +118,7 @@ const Sidebar = ({ links }: SidebarProps) => {
<div className="hd-sidebar__wrapper">
<div className="hd-sidebar__container">
<HopperProvider colorScheme={colorMode}>
<TextField placeholder="Search" value={filter} onChange={onTextFieldChange} />
<SearchField aria-label="Filter sections" placeholder="Search" value={filter} onChange={onTextFieldChange} />
</HopperProvider>
{linkItems}
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/components/button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { IconContext } from "@/components/icon/IconContext.ts";
import clsx from "clsx";
import { Provider, Button as RACButton, type ButtonProps as RACButtonProps } from "react-aria-components";
import { DEFAULT_SLOT, Provider, Button as RACButton, type ButtonProps as RACButtonProps } from "react-aria-components";
import "./button.css";

export interface ButtonProps extends RACButtonProps {
Expand Down Expand Up @@ -31,7 +31,7 @@ const Button = ({
<Provider values={[
[IconContext, {
slots: {
icon: {
[DEFAULT_SLOT]: {
className: "hd-btn__icon"
},
"end-icon": {
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/components/button/LinkButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ export const AsLink: Story = {
</LinkButton>
<LinkButton variant="ghost" size="sm" {...args} >
View source
<Icon src={GithubIcon} slot="icon" />
<Icon src={GithubIcon} />
</LinkButton>
<LinkButton variant="ghost" size="sm" {...args} >
View on npm
<Icon src={NpmIcon} slot="icon" />
<Icon src={NpmIcon} />
</LinkButton>
<LinkButton variant="ghost" size="sm" {...args} >
Report an issue
<Icon src={ExternalLinkIcon} slot="icon" />
<Icon src={ExternalLinkIcon} />
</LinkButton>
</div>
)
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/components/button/LinkButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";
import { IconContext } from "@/components/icon/IconContext.ts";
import clsx from "clsx";
import { Provider, Link as RACLink, type LinkProps as RACLinkProps } from "react-aria-components";
import { DEFAULT_SLOT, Provider, Link as RACLink, type LinkProps as RACLinkProps } from "react-aria-components";
import "./button.css";

export interface LinkButtonProps extends RACLinkProps {
Expand Down Expand Up @@ -30,7 +30,7 @@ const LinkButton = ({
<Provider values={[
[IconContext, {
slots: {
icon: {
[DEFAULT_SLOT]: {
className: "hd-btn__icon"
},
"end-icon": {
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/components/icon/Icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface IconProps extends SlotProps {
}

const Icon = (props: IconProps) => {
[props] = useContextProps({ ...props, slot: props.slot || "hd-icon" }, null, IconContext);
[props] = useContextProps(props, null, IconContext);
const { src, ...otherProps } = props;

const Component = src;
Expand Down
7 changes: 4 additions & 3 deletions apps/docs/components/link/Link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { IconContext as HopperIconContext } from "@hopper-ui/icons";
import clsx from "clsx";
import {
DEFAULT_SLOT,
Provider,
Link as RACLink,
type LinkProps as RACLinkProps
} from "react-aria-components";
import clsx from "clsx";
import { IconContext as HopperIconContext } from "@hopper-ui/icons";
import "./link.css";

export interface LinkProps extends RACLinkProps {
Expand All @@ -20,7 +21,7 @@ const Link = ({ href, children, underline = false, ...rest }: LinkProps) => {
<Provider values={[
[HopperIconContext, {
slots: {
icon: {
[DEFAULT_SLOT]: {
className: "hd-link__icon",
size: "sm"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/content/components/pickers/ComboBox.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ A combo box can overridde the default [useFilter](https://react-spectrum.adobe.c

### Allow Empty Collection

A combo box can be rendered with an empty collection.
A combo box can be rendered with an empty collection. If you want the popover to open with a custom message, you can use the `renderEmptyState` prop within the `listBoxProps` prop.

<Example src="ComboBox/docs/allowEmptyCollection" />

Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/ComboBox/docs/allowEmptyCollection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ export default function Example() {
<ComboBox
allowsEmptyCollection
label="Roles"
listBoxProps={{
renderEmptyState: () => "No roles found"
}}
>
{[]}
</ComboBox>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/ComboBox/src/ComboBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export interface ComboBoxProps<T extends object> extends StyledComponentProps<Om
/**
* A ref for the HTML input element.
*/
inputRef?: MutableRefObject<HTMLInputElement>;
inputRef?: MutableRefObject<HTMLInputElement | null>;
/**
* If `true`, the select will take all available width.
* @default false
Expand Down
44 changes: 22 additions & 22 deletions packages/components/src/ComboBox/tests/chromatic/ComboBox.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@ export const SelectedItemWithIcon = {
<ComboBox {...args} defaultSelectedKey="raccoon">
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -279,11 +279,11 @@ export const SelectedItemWithIcon = {
<ComboBox {...args} selectedKey="raccoon">
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -293,23 +293,23 @@ export const SelectedItemWithIcon = {
<ComboBox {...args} defaultSelectedKey="raccoon" isDisabled>
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
<h1>Fluid</h1>
<ComboBox {...args} defaultSelectedKey="raccoon" isFluid>
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -318,11 +318,11 @@ export const SelectedItemWithIcon = {
<ComboBox {...args} defaultSelectedKey="raccoon" isFluid>
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -340,11 +340,11 @@ export const SelectedItemWithEndIcon = {
<ComboBox {...args} defaultSelectedKey="raccoon">
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon slot="end-icon" />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon slot="end-icon" />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -354,11 +354,11 @@ export const SelectedItemWithEndIcon = {
<ComboBox {...args} selectedKey="raccoon">
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon slot="end-icon" />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon slot="end-icon" />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -368,23 +368,23 @@ export const SelectedItemWithEndIcon = {
<ComboBox {...args} defaultSelectedKey="raccoon" isDisabled>
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon slot="end-icon" />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon slot="end-icon" />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
<h1>Fluid</h1>
<ComboBox {...args} defaultSelectedKey="raccoon" isFluid>
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon slot="end-icon" />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon slot="end-icon" />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -393,11 +393,11 @@ export const SelectedItemWithEndIcon = {
<ComboBox {...args} defaultSelectedKey="raccoon" isFluid>
<ComboBoxItem id="dog" textValue="Dog">
<SparklesIcon slot="end-icon" />
<Text slot="label">Dog</Text>
<Text>Dog</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<SparklesIcon slot="end-icon" />
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
</ComboBox>
Expand All @@ -410,11 +410,11 @@ export const ComboBoxItemWithDescription = {
render: args => (
<ComboBox {...args}>
<ComboBoxItem id="dog" textValue="Dog">
<Text slot="label">Dog</Text>
<Text>Dog</Text>
<Text slot="description">I come in many different breeds</Text>
</ComboBoxItem>
<ComboBoxItem id="raccoon" textValue="Raccoon">
<Text slot="label">Raccoon</Text>
<Text>Raccoon</Text>
<Text slot="description">I am nocturnal</Text>
</ComboBoxItem>
<ComboBoxItem id="frog">Frog</ComboBoxItem>
Expand Down
Loading
Loading