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.

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

chore: remove react types #212

Merged
merged 11 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
"@react-stately/tooltip": "^3.2.2",
"@react-stately/utils": "^3.5.1",
"@react-stately/virtualizer": "^3.3.1",
"@react-types/shared": "^3.15.0",
"clsx": "^1.1.1",
"eslint-config-prettier": "^8.8.0",
"react-transition-group": "^4.4.5"
Expand Down
2 changes: 1 addition & 1 deletion src/breadcrumbs/BreadcrumbItem.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { BreadcrumbItemProps } from '@react-types/breadcrumbs';
import { FocusRing } from '@react-aria/focus';
import { mergeProps } from '@react-aria/utils';
import React, { Fragment, useRef } from 'react';
import { useBreadcrumbItem } from '@react-aria/breadcrumbs';
import { useHover } from '@react-aria/interactions';
import { classNames, getWrappedElement } from '../utils';
import { ChevronRightOutline, Icon } from '../icon';
import { BreadcrumbItemProps } from '../types';

export function BreadcrumbItem(props: BreadcrumbItemProps) {
const { children, isCurrent, isDisabled } = props;
Expand Down
38 changes: 2 additions & 36 deletions src/breadcrumbs/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { DOMRef } from '@react-types/shared';
import React, { Key, ReactElement, useCallback, useRef } from 'react';
import { useBreadcrumbs } from '@react-aria/breadcrumbs';
import { useLayoutEffect, useValueEffect } from '@react-aria/utils';
Expand All @@ -11,45 +10,12 @@ import { FolderOutline } from '../icon/Icons';
import { classNames, useDOMRef } from '../utils';
import { ActionButton } from '../button';
import theme from '../theme';
import { AriaLabelingProps, DOMProps, ItemProps, StyleProps } from '../types';
import { ACBreadcrumbsProps, DOMRef } from '../types';
import { BreadcrumbItem } from './BreadcrumbItem';

const MIN_VISIBLE_ITEMS = 1;
const MAX_VISIBLE_ITEMS = 4;

// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface BreadcrumbsProps {}
export interface AriaBreadcrumbsProps
extends BreadcrumbsProps,
DOMProps,
AriaLabelingProps {}

export interface ArizeBreadcrumbsProps<T>
extends AriaBreadcrumbsProps,
StyleProps {
/** The breadcrumb items. */
children: ReactElement<ItemProps<T>> | ReactElement<ItemProps<T>>[];
/** Whether the Breadcrumbs are disabled. */
isDisabled?: boolean;
/** Called when an item is acted upon (usually selection via press). */
onAction?: (key: Key) => void;
/**
* Size of the Breadcrumbs including spacing and layout.
* @default 'L'
*/
size?: 'S' | 'M' | 'L';
/** Whether to always show the root item if the items are collapsed. */
showRoot?: boolean;
/**
* Whether to place the last Breadcrumb item onto a new line.
*/
isMultiline?: boolean;
/**
* Whether to autoFocus the last Breadcrumb item when the Breadcrumbs render.
*/
autoFocusCurrent?: boolean;
}

const ulCSS = css`
flex-wrap: nowrap;
flex: 1 0;
Expand Down Expand Up @@ -88,7 +54,7 @@ const liCSS = css`
}
`;

function Breadcrumbs<T>(props: ArizeBreadcrumbsProps<T>, ref: DOMRef) {
function Breadcrumbs<T>(props: ACBreadcrumbsProps<T>, ref: DOMRef) {
props = useProviderProps(props);
const {
size = 'L',
Expand Down
2 changes: 1 addition & 1 deletion src/dialog/Dialog.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { DOMRef } from '@react-types/shared';
import { FocusScope } from '@react-aria/focus';
import { mergeProps } from '@react-aria/utils';
import React, { useContext } from 'react';
Expand All @@ -9,6 +8,7 @@ import { Heading } from '../content';
import { CloseOutline, Icon } from '../icon';
import { classNames, useDOMRef } from '../utils';
import { Button } from '../button';
import { DOMRef } from '../types';
import { DialogContext, DialogContextValue } from './context';

const dialogCSS = css`
Expand Down
3 changes: 1 addition & 2 deletions src/field/Field.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { css, keyframes } from '@emotion/react';
import { LabelPosition } from '@react-types/shared';
import { mergeProps } from '@react-aria/utils';
import React, {
RefObject,
HTMLAttributes,
ReactNode,
ReactElement,
} from 'react';
import { Validation } from '../types';
import { LabelPosition, Validation } from '../types';
import { classNames } from '../utils';
import { useFormProps } from '../form';
import { FieldLabel, FieldLabelProps } from './FieldLabel';
Expand Down
8 changes: 6 additions & 2 deletions src/field/FieldLabel.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { DOMRef } from '@react-types/shared';
import { css } from '@emotion/react';
import { filterDOMProps } from '@react-aria/utils';
import React, { ReactNode, ElementType, HTMLAttributes } from 'react';
import { classNames, useDOMRef } from '../utils';
import { DOMProps, LabelableProps, ExtendableLabelProps } from '../types';
import {
DOMProps,
LabelableProps,
ExtendableLabelProps,
DOMRef,
} from '../types';
import theme from '../theme';

interface LabelProps {
Expand Down
2 changes: 1 addition & 1 deletion src/listbox/ListBox.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { DOMRef } from '@react-types/shared';
import React, { ReactElement, CSSProperties, ReactNode, Key } from 'react';
import { useListState } from '@react-stately/list';
import { useDOMRef } from '../utils';
import {
AriaLabelingProps,
CollectionBase,
DOMProps,
DOMRef,
MultipleSelection,
SelectionBehavior,
} from '../types';
Expand Down
14 changes: 7 additions & 7 deletions src/listbox/ListBoxBase.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
import {
AriaLabelingProps,
DOMProps,
FocusStrategy,
Node,
StyleProps,
} from '@react-types/shared';
import { AriaListBoxOptions, useListBox } from '@react-aria/listbox';

import { ListLayout } from '@react-stately/layout';
Expand All @@ -21,6 +14,13 @@
import { ReusableView } from '@react-stately/virtualizer';
import { useCollator } from '@react-aria/i18n';
import { Virtualizer, VirtualizerItem } from '@react-aria/virtualizer';
import {
AriaLabelingProps,
DOMProps,
FocusStrategy,
StyleProps,
Node,
} from '../types';
import { ListBoxSection } from './ListBoxSection';
import { ListBoxOption } from './ListBoxOption';
import { ListBoxContext } from './ListBoxContext';
Expand Down Expand Up @@ -112,7 +112,7 @@
<ListBoxSection
key={reusableView.key}
item={reusableView.content}
layoutInfo={reusableView.layoutInfo!}

Check warning on line 115 in src/listbox/ListBoxBase.tsx

View workflow job for this annotation

GitHub Actions / Build, lint, and test on Node 18.x and ubuntu-latest

Forbidden non-null assertion

Check warning on line 115 in src/listbox/ListBoxBase.tsx

View workflow job for this annotation

GitHub Actions / Build, lint, and test on Node 18.x and windows-latest

Forbidden non-null assertion

Check warning on line 115 in src/listbox/ListBoxBase.tsx

View workflow job for this annotation

GitHub Actions / Build, lint, and test on Node 18.x and macOS-latest

Forbidden non-null assertion
virtualizer={reusableView.virtualizer}
// @ts-ignore
headerLayoutInfo={
Expand Down
2 changes: 1 addition & 1 deletion src/listbox/ListBoxOption.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { FocusRing } from '@react-aria/focus';
import { isFocusVisible, useHover } from '@react-aria/interactions';
import { mergeProps } from '@react-aria/utils';
import { Node } from '@react-types/shared';
import React, { useContext } from 'react';
import { useOption } from '@react-aria/listbox';
import { useRef } from 'react';
import { Text } from '../content';
import { classNames } from '../utils';
import { Icon, CheckmarkOutline } from '../icon';
import { menuItemCSS } from '../menu/styles';
import { Node } from '../types';
import { ListBoxContext } from './ListBoxContext';

interface OptionProps<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/listbox/ListBoxSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import {
layoutInfoToStyle,
useVirtualizerItem,
} from '@react-aria/virtualizer';
import { Node } from '@react-types/shared';
import React, { Fragment, ReactNode, useContext, useRef } from 'react';
import { LayoutInfo } from '@react-stately/virtualizer';
import { useListBoxSection } from '@react-aria/listbox';
import { useLocale } from '@react-aria/i18n';
import { useSeparator } from '@react-aria/separator';
import { css } from '@emotion/react';
import theme from '../theme';
import { Node } from '../types';
import { ListBoxContext } from './ListBoxContext';

interface ListBoxSectionProps<T> extends Omit<VirtualizerItemOptions, 'ref'> {
Expand Down
3 changes: 1 addition & 2 deletions src/menu/ActionMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { filterDOMProps } from '@react-aria/utils';
import { FocusableRef } from '@react-types/shared';
import React, { forwardRef } from 'react';
import { css } from '@emotion/react';
import { ArrowIosDownwardOutline, Icon, MoreHorizontalOutline } from '../icon';
import { ActionMenuProps } from '../types';
import { ActionMenuProps, FocusableRef } from '../types';
import { Button } from '../button';
import { MenuTrigger } from './MenuTrigger';
import { Menu } from './Menu';
Expand Down
2 changes: 1 addition & 1 deletion src/menu/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export interface AriaMenuProps<T>
DOMProps,
AriaLabelingProps {}

export type MenuComponentProps<T> = AriaMenuProps<T>
export type MenuComponentProps<T> = AriaMenuProps<T>;

const menuULCSS = css`
background-color: var(--ac-global-menu-background-color);
Expand Down
2 changes: 1 addition & 1 deletion src/menu/MenuItem.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { FocusRing } from '@react-aria/focus';
import { mergeProps } from '@react-aria/utils';
import { Node } from '@react-types/shared';
import React, { Key, useRef } from 'react';
import { TreeState } from '@react-stately/tree';
import { useHover } from '@react-aria/interactions';
import { useMenuItem } from '@react-aria/menu';
import { Text } from '../content';
import { classNames } from '../utils';
import { Icon, CheckmarkOutline } from '../icon';
import { Node } from '../types';
import { useMenuContext } from './context';
import { menuItemCSS } from './styles';

Expand Down
3 changes: 1 addition & 2 deletions src/menu/MenuSection.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { Node } from '@react-types/shared';
import React, { Fragment, Key } from 'react';
import { TreeState } from '@react-stately/tree';
import { useMenuSection } from '@react-aria/menu';
import { useSeparator } from '@react-aria/separator';
import { getChildNodes } from '@react-stately/collections';
import { css } from '@emotion/react';
import theme from '../theme';
import { Node } from '../types';
import { MenuItem } from './MenuItem';

interface MenuSectionProps<T> {
item: Node<T>;
state: TreeState<T>;
Expand Down
10 changes: 7 additions & 3 deletions src/menu/MenuTrigger.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import { DismissButton, useOverlayPosition } from '@react-aria/overlays';
import { DOMRef, DOMRefValue } from '@react-types/shared';
import { FocusScope } from '@react-aria/focus';
import { Placement } from '@react-types/overlays';
import { PressResponder } from '@react-aria/interactions';
import React, { forwardRef, Fragment, ReactElement, useRef } from 'react';
import { useMenuTrigger } from '@react-aria/menu';
import { useMenuTriggerState } from '@react-stately/menu';
import { Popover } from '../popover';
import { unwrapDOMRef, useDOMRef } from '../utils';
import { Alignment, OverlayTriggerProps } from '../types';
import {
Alignment,
DOMRef,
DOMRefValue,
OverlayTriggerProps,
Placement,
} from '../types';
import { MenuContext } from './context';

type MenuTriggerType = 'press' | 'longPress';
Expand Down
3 changes: 1 addition & 2 deletions src/picker/Picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import {
useLayoutEffect,
useResizeObserver,
} from '@react-aria/utils';
import { Placement } from '@react-types/overlays';
import { PressResponder, useHover } from '@react-aria/interactions';
import React, { ReactElement, useCallback, useRef, useState } from 'react';
import { useSelectState } from '@react-stately/select';
import { PickerProps } from '../types';
import { PickerProps, Placement } from '../types';
import { DropdownMenu, DropdownButton } from '../dropdown';
import { ListBoxBase, useListBoxLayout } from '../listbox';
import {
Expand Down
8 changes: 6 additions & 2 deletions src/progress/ProgressCircle.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { clamp } from '@react-aria/utils';
import { AriaLabelingProps, DOMRef } from '@react-types/shared';
import React, { CSSProperties } from 'react';
import { useProgressBar } from '@react-aria/progress';
import { classNames, useDOMRef } from '../utils';
import { DOMProps, ProgressBaseProps } from '../types';
import {
AriaLabelingProps,
DOMProps,
DOMRef,
ProgressBaseProps,
} from '../types';
import { progressCircleCSS } from './styles';

interface AriaProgressCircleProps extends DOMProps, AriaLabelingProps {}
Expand Down
2 changes: 1 addition & 1 deletion src/slider/RangeSlider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FocusableRef } from '@react-types/shared';
import React from 'react';
import { useLocale } from '@react-aria/i18n';
import { RangeSliderProps } from '../types/slider';
import { FocusableRef } from '../types';
import {
SliderBase,
SliderBaseChildArguments,
Expand Down
2 changes: 1 addition & 1 deletion src/slider/SliderBase.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { FocusableRef } from '@react-types/shared';
import React, { CSSProperties, ReactNode, RefObject, useRef } from 'react';
import { SliderState, useSliderState } from '@react-stately/slider';
import { useNumberFormatter } from '@react-aria/i18n';
Expand All @@ -7,6 +6,7 @@ import { css } from '@emotion/react';
import { useProviderProps } from '../provider';
import { BarSliderBase } from '../types/slider';
import { classNames, useFocusableRef } from '../utils';
import { FocusableRef } from '../types';
import { labelCSS, labelContainerCSS, sliderCSS } from './styles';
export interface SliderBaseChildArguments {
inputRef: RefObject<HTMLInputElement>;
Expand Down
3 changes: 1 addition & 2 deletions src/textfield/TextFieldBase.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { css, keyframes } from '@emotion/react';
import { FocusRing } from '@react-aria/focus';
import { mergeProps } from '@react-aria/utils';
import { PressEvents } from '@react-types/shared';
import React, {
HTMLAttributes,
InputHTMLAttributes,
Expand All @@ -14,7 +13,7 @@ import React, {
useRef,
forwardRef,
} from 'react';
import { useHover } from '@react-aria/interactions';
import { PressEvents, useHover } from '@react-aria/interactions';
import { classNames, createFocusableRef } from '../utils';
import { Field } from '../field';
import { Icon, AlertCircleOutline } from '../icon';
Expand Down
60 changes: 60 additions & 0 deletions src/types/breadcrumb.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { AriaLinkProps } from '@react-types/link';
import { Key, ReactElement, ReactNode } from 'react';
import { AriaLabelingProps, DOMProps, LinkDOMProps } from './dom';
import { ItemProps } from './collection';
import { StyleProps } from './style';

export interface BreadcrumbItemProps extends AriaLinkProps, LinkDOMProps {
/** Whether the breadcrumb item represents the current page. */
isCurrent?: boolean;
/**
* The type of current location the breadcrumb item represents, if `isCurrent` is true.
* @default 'page'
*/
'aria-current'?:
| 'page'
| 'step'
| 'location'
| 'date'
| 'time'
| boolean
| 'true'
| 'false';
/** Whether the breadcrumb item is disabled. */
isDisabled?: boolean;
/** The contents of the breadcrumb item. */
children: ReactNode;
}

// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface BreadcrumbsProps {}
export interface AriaBreadcrumbsProps
extends BreadcrumbsProps,
DOMProps,
AriaLabelingProps {}

export interface ACBreadcrumbsProps<T>
extends AriaBreadcrumbsProps,
StyleProps {
/** The breadcrumb items. */
children: ReactElement<ItemProps<T>> | ReactElement<ItemProps<T>>[];
/** Whether the Breadcrumbs are disabled. */
isDisabled?: boolean;
/** Called when an item is acted upon (usually selection via press). */
onAction?: (key: Key) => void;
/**
* Size of the Breadcrumbs including spacing and layout.
* @default 'L'
*/
size?: 'S' | 'M' | 'L';
/** Whether to always show the root item if the items are collapsed. */
showRoot?: boolean;
/**
* Whether to place the last Breadcrumb item onto a new line.
*/
isMultiline?: boolean;
/**
* Whether to autoFocus the last Breadcrumb item when the Breadcrumbs render.
*/
autoFocusCurrent?: boolean;
}
Loading
Loading