Skip to content

Commit 98cb4de

Browse files
snowystingersnowystinger
committed
Merge main into react_18
1 parent d75f1ad commit 98cb4de

File tree

65 files changed

+3528
-1085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3528
-1085
lines changed

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
"@parcel/transformer-typescript-types": "^2.2.1",
7272
"@spectrum-css/component-builder": "^1.0.0",
7373
"@spectrum-css/vars": "^2.3.0",
74-
"@storybook/addon-a11y": "^6.5.0-beta.6",
75-
"@storybook/addon-actions": "^6.5.0-beta.6",
74+
"@storybook/addon-a11y": "^6.5.3",
75+
"@storybook/addon-actions": "^6.5.3",
7676
"@storybook/addon-knobs": "^6.4.0",
77-
"@storybook/addon-links": "^6.5.0-beta.6",
78-
"@storybook/addons": "^6.5.0-beta.6",
79-
"@storybook/api": "^6.5.0-beta.6",
80-
"@storybook/components": "^6.5.0-beta.6",
81-
"@storybook/react": "^6.5.0-beta.6",
77+
"@storybook/addon-links": "^6.5.3",
78+
"@storybook/addons": "^6.5.3",
79+
"@storybook/api": "^6.5.3",
80+
"@storybook/components": "^6.5.3",
81+
"@storybook/react": "^6.5.3",
8282
"@testing-library/dom": "^8.0.0",
8383
"@testing-library/jest-dom": "^5.14.1",
8484
"@testing-library/react": "^13.2.0",

‎packages/@adobe/react-spectrum/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export {Image} from '@react-spectrum/image';
2626
export {Flex, Grid, fitContent, minmax, repeat} from '@react-spectrum/layout';
2727
export {Link} from '@react-spectrum/link';
2828
export {ListBox} from '@react-spectrum/listbox';
29-
export {Menu, MenuTrigger} from '@react-spectrum/menu';
29+
export {ActionMenu, Menu, MenuTrigger} from '@react-spectrum/menu';
3030
export {Meter} from '@react-spectrum/meter';
3131
export {NumberField} from '@react-spectrum/numberfield';
3232
export {Picker} from '@react-spectrum/picker';

‎packages/@adobe/spectrum-css-temp/components/table/index.css‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ svg.spectrum-Table-sortedIcon {
196196
line-height: calc(calc(var(--spectrum-table-cell-text-size) * var(--spectrum-table-cell-text-line-height)) - 1px);
197197
padding: var(--spectrum-table-cell-regular-padding-y) var(--spectrum-table-cell-padding-x);
198198
}
199+
.spectrum-Table--regular {}
199200

200201
.spectrum-Table--compact .spectrum-Table-cell {
201202
padding-top: var(--spectrum-table-cell-compact-padding-y);
@@ -337,6 +338,32 @@ svg.spectrum-Table-sortedIcon {
337338
}
338339
}
339340
}
341+
&.spectrum-Table--isVerticalScrollbarVisible {
342+
.spectrum-Table-row {
343+
&.spectrum-Table-row--firstRow.is-selected {
344+
&:after {
345+
border-start-end-radius: 0;
346+
}
347+
}
348+
/* beat specificity of isFlushBottom */
349+
&.spectrum-Table-row--lastRow.is-selected.is-selected {
350+
&:after {
351+
border-end-end-radius: 0;
352+
}
353+
}
354+
}
355+
}
356+
&.spectrum-Table--isHorizontalScrollbarVisible {
357+
.spectrum-Table-row {
358+
/* beat specificity of isFlushBottom */
359+
&.spectrum-Table-row--lastRow.is-selected.is-selected {
360+
&:after {
361+
border-end-start-radius: 0;
362+
border-end-end-radius: 0;
363+
}
364+
}
365+
}
366+
}
340367
}
341368

342369
/* the CSS logical properties postcss plugin doesn't seem to work with :focus-ring. */

‎packages/@adobe/spectrum-css-temp/components/tabs/skin.css‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@ OF ANY KIND, either express or implied. See the License for the specific languag
1010
governing permissions and limitations under the License.
1111
*/
1212

13+
:root {
14+
--spectrum-tabs-emphasized-text-color: var(--spectrum-global-color-blue-600);
15+
--spectrum-tabs-emphasized-icon-color: var(--spectrum-global-color-blue-600);
16+
--spectrum-tabs-emphasized-selection-indicator-color: var(--spectrum-global-color-blue-600);
17+
--spectrum-tabs-emphasized-text-color-hover: var(--spectrum-global-color-blue-700);
18+
--spectrum-tabs-emphasized-icon-color-hover: var(--spectrum-global-color-blue-700);
19+
--spectrum-tabs-emphasized-text-color-key-focus: var(--spectrum-global-color-blue-600);
20+
--spectrum-tabs-emphasized-icon-color-key-focus: var(--spectrum-global-color-blue-600);
21+
--spectrum-tabs-emphasized-focus-ring-color: var(--spectrum-global-color-blue-600);
22+
}
23+
1324
.spectrum-Tabs {
1425
border-block-end-color: var(--spectrum-tabs-rule-color);
1526

@@ -29,6 +40,12 @@ governing permissions and limitations under the License.
2940
border-inline-start-color: var(--spectrum-tabs-vertical-rule-color);
3041
}
3142

43+
.spectrum-Tabs--emphasized {
44+
.spectrum-Tabs-selectionIndicator {
45+
background-color: var(--spectrum-tabs-emphasized-selection-indicator-color);
46+
}
47+
}
48+
3249
.spectrum-Tabs-selectionIndicator {
3350
background-color: var(--spectrum-tabs-selection-indicator-color);
3451
}
@@ -77,12 +94,50 @@ governing permissions and limitations under the License.
7794
}
7895
}
7996

97+
.spectrum-Tabs--emphasized {
98+
.spectrum-Tabs-item {
99+
&.is-selected {
100+
color: var(--spectrum-tabs-emphasized-text-color);
101+
102+
.spectrum-Icon {
103+
fill: var(--spectrum-tabs-emphasized-icon-color);
104+
}
105+
106+
&:focus-ring {
107+
color: var(--spectrum-tabs-emphasized-text-color-key-focus);
108+
109+
&::before {
110+
border-color: var(--spectrum-tabs-emphasized-focus-ring-color);
111+
}
112+
113+
.spectrum-Icon {
114+
fill: var(--spectrum-tabs-emphasized-icon-color-key-focus);
115+
}
116+
}
117+
118+
&:hover {
119+
color: var(--spectrum-tabs-emphasized-text-color-hover);
120+
121+
.spectrum-Icon {
122+
fill: var(--spectrum-tabs-emphasized-icon-color-hover);
123+
}
124+
}
125+
}
126+
}
127+
}
128+
80129
.spectrum-Tabs--quiet {
81130
border-block-end-color: var(--spectrum-tabs-quiet-rule-color);
82131

83132
.spectrum-Tabs-selectionIndicator {
84133
background-color: var(--spectrum-tabs-quiet-selection-indicator-color);
85134
}
135+
136+
&.spectrum-Tabs--emphasized {
137+
.spectrum-Tabs-selectionIndicator {
138+
background-color: var(--spectrum-tabs-emphasized-selection-indicator-color);
139+
}
140+
}
86141
}
87142

88143
.spectrum-Tabs--vertical {
@@ -94,6 +149,12 @@ governing permissions and limitations under the License.
94149
background-color: var(--spectrum-tabs-quiet-selection-indicator-color);
95150
}
96151
}
152+
153+
&.spectrum-Tabs--emphasized {
154+
.spectrum-Tabs-selectionIndicator {
155+
background-color: var(--spectrum-tabs-emphasized-selection-indicator-color);
156+
}
157+
}
97158
}
98159

99160
.spectrum-TabsPanel-tabpanel {

‎packages/@internationalized/number/src/NumberParser.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ function getSymbols(formatter: Intl.NumberFormat, intlOptions: Intl.ResolvedNumb
215215
let pluralLiterals = allParts.filter(p => !nonLiteralParts.has(p.type)).map(p => escapeRegex(p.value));
216216
let singularLiterals = singularParts.filter(p => !nonLiteralParts.has(p.type)).map(p => escapeRegex(p.value));
217217
let sortedLiterals = [...new Set([...singularLiterals, ...pluralLiterals])].sort((a, b) => b.length - a.length);
218-
let literals = new RegExp(`${sortedLiterals.join('|')}|[\\p{White_Space}]`, 'gu');
218+
let literals = sortedLiterals.length === 0 ?
219+
new RegExp('[\\p{White_Space}]', 'gu') :
220+
new RegExp(`${sortedLiterals.join('|')}|[\\p{White_Space}]`, 'gu');
219221

220222
// These are for replacing non-latn characters with the latn equivalent
221223
let numerals = [...new Intl.NumberFormat(intlOptions.locale, {useGrouping: false}).format(9876543210)].reverse();

‎packages/@internationalized/number/test/NumberParser.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ describe('NumberParser', function () {
263263

264264
describe('getNumberingSystem', function () {
265265
it('should return the default numbering system for a locale', function () {
266+
expect(new NumberParser('en-US', {style: 'decimal'}).getNumberingSystem(' ')).toBe('latn');
266267
expect(new NumberParser('en-US', {style: 'decimal'}).getNumberingSystem('12')).toBe('latn');
267268
expect(new NumberParser('en-US', {style: 'decimal'}).getNumberingSystem('.')).toBe('latn');
268269
expect(new NumberParser('en-US', {style: 'decimal'}).getNumberingSystem('12.5')).toBe('latn');

‎packages/@react-aria/dnd/src/useDrag.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ export function useDrag(options: DragOptions): DragResult {
6464
let {addGlobalListener, removeAllGlobalListeners} = useGlobalListeners();
6565

6666
let onDragStart = (e: DragEvent) => {
67+
if (e.defaultPrevented) {
68+
return;
69+
}
70+
6771
if (typeof options.onDragStart === 'function') {
6872
options.onDragStart({
6973
type: 'dragstart',

‎packages/@react-aria/dnd/src/useDropIndicator.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import {useDroppableItem} from './useDroppableItem';
2121
import {useId} from '@react-aria/utils';
2222
import {useMessageFormatter} from '@react-aria/i18n';
2323

24-
interface DropIndicatorProps {
24+
export interface DropIndicatorProps {
2525
target: DropTarget
2626
}
2727

28-
interface DropIndicatorAria {
28+
export interface DropIndicatorAria {
2929
dropIndicatorProps: HTMLAttributes<HTMLElement>
3030
}
3131

‎packages/@react-aria/dnd/src/useDroppableCollection.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import {useAutoScroll} from './useAutoScroll';
2121
import {useDrop} from './useDrop';
2222
import {useDroppableCollectionId} from './utils';
2323

24-
interface DroppableCollectionOptions extends DroppableCollectionProps {
24+
export interface DroppableCollectionOptions extends DroppableCollectionProps {
2525
keyboardDelegate: KeyboardDelegate,
2626
getDropTargetFromPoint: (x: number, y: number) => DropTarget | null
2727
}
2828

29-
interface DroppableCollectionResult {
29+
export interface DroppableCollectionResult {
3030
collectionProps: HTMLAttributes<HTMLElement>
3131
}
3232

@@ -68,11 +68,6 @@ export function useDroppableCollection(props: DroppableCollectionOptions, state:
6868
return 'cancel';
6969
}
7070

71-
if (state.isDropTarget(target)) {
72-
localState.nextTarget = target;
73-
return localState.dropOperation;
74-
}
75-
7671
localState.dropOperation = state.getDropOperation(target, types, allowedOperations);
7772

7873
// If the target doesn't accept the drop, see if the root accepts it instead.

‎packages/@react-aria/dnd/src/useDroppableItem.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import {getTypes} from './utils';
1717
import {HTMLAttributes, RefObject, useEffect} from 'react';
1818
import {useVirtualDrop} from './useVirtualDrop';
1919

20-
interface DroppableItemOptions {
20+
export interface DroppableItemOptions {
2121
target: DropTarget
2222
}
2323

24-
interface DroppableItemResult {
24+
export interface DroppableItemResult {
2525
dropProps: HTMLAttributes<HTMLElement>
2626
}
2727

0 commit comments

Comments
 (0)