Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e20738e
[WIP] S2 Taggroup collapse behavior
snowystinger Jul 30, 2024
255ac34
fix rendering of always hidden tags
snowystinger Aug 1, 2024
7e36219
Get styles working and differentiate when to render the remove button
snowystinger Aug 1, 2024
ced16b3
otters review to make extra sure the subtree is hidden
snowystinger Aug 1, 2024
55b9db5
include button in measurements
snowystinger Aug 2, 2024
b2dd050
Start fixing TS
snowystinger Aug 3, 2024
0fe2ca1
finish fixing eslint and ts
snowystinger Aug 5, 2024
2eb0225
Merge branch 'main' into s2-taggroup-collapse
snowystinger Aug 5, 2024
745e134
TagGroup Actions (#6834)
snowystinger Aug 6, 2024
11352a3
use same size prop everywhere
snowystinger Aug 6, 2024
f5b8734
Merge branch 'main' into s2-taggroup-collapse
snowystinger Aug 12, 2024
96cad79
testing session feedback
snowystinger Aug 13, 2024
ef74856
Inline CollectionBuilder
devongovett Aug 14, 2024
07fe7ee
Merge branch 'main' of github.com:adobe/react-spectrum into s2-taggro…
devongovett Aug 14, 2024
a83ee8c
Review comments
snowystinger Aug 14, 2024
f59a0c8
undo change to useResizeObserver
snowystinger Aug 14, 2024
176888b
Fix labelling
snowystinger Aug 15, 2024
a78d91d
fix linters
snowystinger Aug 15, 2024
2ce83e2
Revert accidental api additions
snowystinger Aug 15, 2024
ef6db4c
Move up use of TagGroupContext so it matches other components
snowystinger Aug 15, 2024
7d50eb4
Merge branch 'main' of github.com:adobe/react-spectrum into s2-taggro…
devongovett Aug 15, 2024
4cb966a
Update onAction to onGroupAction and actionLabel to groupActionLabel
devongovett Aug 15, 2024
617f116
prevent group action button from disappearing
LFDanLu Aug 15, 2024
5d29864
Always set a visibleTag count so we dont accidentally render a empty …
LFDanLu Aug 15, 2024
616da26
Prevent Badge text wrapping
ktabors Aug 15, 2024
9057530
Merge branch 'main' of github.com:adobe/react-spectrum into s2-taggro…
LFDanLu Aug 15, 2024
86636ea
Merge branch 's2-taggroup-collapse' of github.com:adobe/react-spectru…
LFDanLu Aug 15, 2024
2629d47
Merge branch 'main' into s2-taggroup-collapse
snowystinger Aug 15, 2024
ca26057
Prevent Tag text wrapping
ktabors Aug 15, 2024
00cfaea
Merge branch 's2-taggroup-collapse' of github.com:adobe/react-spectru…
ktabors Aug 15, 2024
e27bfed
fixing children wrapping
snowystinger Aug 15, 2024
3d2229d
Merge branch 's2-taggroup-collapse' of github.com:adobe/react-spectru…
snowystinger Aug 15, 2024
f57082f
fixes
devongovett Aug 15, 2024
813abab
Merge branch 'main' of github.com:adobe/react-spectrum into s2-taggro…
devongovett Aug 15, 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
1 change: 0 additions & 1 deletion .storybook-s2/custom-addons/provider/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ addons.register('ProviderSwitcher', (api) => {
title: 'viewport',
type: types.TOOL,
match: ({ viewMode }) => {
console.log('viewMode', viewMode);
return viewMode === 'story' || viewMode === 'docs'
},
render: () => <ProviderFieldSetter api={api} />,
Expand Down
1 change: 1 addition & 0 deletions packages/@react-spectrum/s2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
"@parcel/macros": "2.12.1-canary.3165"
},
"dependencies": {
"@react-aria/collections": "3.0.0-alpha.3",
"@react-aria/i18n": "^3.11.0",
"@react-aria/interactions": "^3.22.0",
"@react-aria/utils": "^3.23.0",
Expand Down
9 changes: 5 additions & 4 deletions packages/@react-spectrum/s2/src/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import {Breadcrumb as AriaBreadcrumb, BreadcrumbsProps as AriaBreadcrumbsProps,
import {AriaBreadcrumbItemProps, useLocale} from 'react-aria';
import ChevronIcon from '../ui-icons/Chevron';
import {createContext, forwardRef, ReactNode, useRef} from 'react';
import {DOMRefValue, LinkDOMProps} from '@react-types/shared';
import {DOMRef, DOMRefValue, LinkDOMProps} from '@react-types/shared';
import {focusRing, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
import {forwardRefType} from './types';
import {size, style} from '../style/spectrum-theme' with { type: 'macro' };
import {useDOMRef} from '@react-spectrum/utils';

interface BreadcrumbsStyleProps {
/**
Expand Down Expand Up @@ -69,7 +70,7 @@ const wrapper = style<BreadcrumbsStyleProps>({
}
}, getAllowedOverrides());

function Breadcrumbs<T extends object>(props: BreadcrumbsProps<T>) {
function Breadcrumbs<T extends object>(props: BreadcrumbsProps<T>, ref: DOMRef<HTMLOListElement>) {
let {
UNSAFE_className = '',
UNSAFE_style,
Expand All @@ -78,11 +79,11 @@ function Breadcrumbs<T extends object>(props: BreadcrumbsProps<T>) {
children,
...otherProps
} = props;
let ref = useRef(null);
let domRef = useDOMRef(ref);
return (
<RACBreadcrumbs
{...otherProps}
ref={ref}
ref={domRef}
style={UNSAFE_style}
className={UNSAFE_className + wrapper({
size
Expand Down
Loading