Skip to content

Commit 72f21e6

Browse files
committed
chore: merge remote-tracking branch 'origin/main' into spectrum-two
2 parents 48d7187 + d0e19a1 commit 72f21e6

File tree

56 files changed

+166
-143
lines changed

Some content is hidden

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

56 files changed

+166
-143
lines changed

.github/renovate.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"baseBranches": ["main", "spectrum-two"],
3+
"baseBranchPatterns": ["main", "spectrum-two"],
44
"extends": [
55
"config:recommended",
66
":widenPeerDependencies",
@@ -9,6 +9,11 @@
99
],
1010
"labels": ["dependencies", "skip_vrt", "ready-for-review"],
1111
"packageRules": [
12+
{
13+
"matchUpdateTypes": ["major"],
14+
"matchBaseBranches": ["main"],
15+
"enabled": false
16+
},
1217
{
1318
"groupName": "storybook ecosystem",
1419
"matchPackageNames": ["storybook", "@storybook/*", "@types/storybook*"],

.yarnrc.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cacheFolder: ./.yarn/cache
2-
32
nodeLinker: node-modules
4-
53
yarnPath: .yarn/releases/yarn-4.9.2.cjs
4+
packageExtensions:
5+
# deasync didn't add node-gyp as a direct dependency so it fails to build in
6+
# Yarn (https://github.com/yarnpkg/berry/issues/5804), so extend its pkg.json config here.
7+
deasync@*:
8+
dependencies:
9+
node-gyp: 'latest'

components/accordion/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ New modifiers:
8181
- Updated dependencies [[`a25e0a9`](https://github.com/adobe/spectrum-css/commit/a25e0a99e5a4736ab4e607e00739343101a2633b)]:
8282
- @spectrum-css/icon@10.0.0-next.0
8383

84+
## 7.1.1
85+
86+
### Patch Changes
87+
88+
📝 [#4088](https://github.com/adobe/spectrum-css/pull/4088) [`24d75bf`](https://github.com/adobe/spectrum-css/commit/24d75bfe4d8e627f9d8e019ae379bdd4787712dd) Thanks [@castastrophe](https://github.com/castastrophe)!
89+
90+
Minor linting fix of replacing `rgba` to the `rgb` shorthand syntax.
91+
8492
## 7.1.0
8593

8694
### Minor Changes

components/actionbar/CHANGELOG.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ To render a component that can be easily swapped between the S2 Foundations, S1,
159159
📝 [#3502](https://github.com/adobe/spectrum-css/pull/3502) [`562396e`](https://github.com/adobe/spectrum-css/commit/562396eaf21769341f78ea3761393b65f00e751b) Thanks [@castastrophe](https://github.com/castastrophe)!
160160

161161
- Remove empty theme references to reduce complexity for components that don't need to define any mappings. This involves removing the source `themes` directories with the empty `spectrum.css` and `express.com` files as well as removing the following empty or unnecessary exports:
162-
163162
- `index-base.css`
164163
- `index-theme.css`
165164
- `themes/spectrum.css`
@@ -394,7 +393,6 @@ Create custom properties with tokens from the default "Table" and
394393
"Selection" sections of the design.
395394

396395
- feat(table): use new tokens in styles
397-
398396
- Use new tokens in styles, first pass with regular/default
399397
- Set custom properties for variants + sizes to simplify styles
400398
- Remove repeated %drop-target placeholder selector style rule
@@ -491,7 +489,6 @@ Add control to Table storybook to use the div element markup instead of
491489
table element markup, to match the example in the docs.
492490

493491
- feat(table): new collapsible variant and minor adjustments
494-
495492
- Adds new Collapsible variant.
496493
- Puts heading row text into span and adds note to docs.
497494
- Allows optional array of strings for cellContent in Storybook.
@@ -513,14 +510,12 @@ Add variant that includes the thumbnail component within the table. Adds
513510
to storybook and examples.
514511

515512
- feat(table): thumbnail variant and storybook refactor
516-
517513
- Add new thumbnails variant.
518514
- Avoid duplication of divs and table markup in Storybook by including
519515
a conditional dynamic tag.
520516
- Remove inline flex styles from div example markup.
521517

522518
- refactor(table)!: change div to table display and refactor dropzone
523-
524519
- Changes div-based table to use table display properties, to ensure
525520
that it displays the same as the table-based markup. The flex based
526521
styles incorporated from the example markup have issues with handling
@@ -535,7 +530,6 @@ to storybook and examples.
535530
Using CSS grid is currently a no-go because of the lingering
536531
accessibility bugs associated with 'display: contents' (and subgrid
537532
still farther out from browser support).
538-
539533
- Refactors out unnecessary CSS after the previously noted change. No
540534
longer necessary to handle 'tbody' differently when it is a div.
541535

@@ -548,12 +542,10 @@ to storybook and examples.
548542
This also fixes the existing bug where table dropzone will not show
549543
the blue color across the entire table (scrolling down on existing
550544
example).
551-
552545
- Adds dropzone to Storybook. Control for table dropzone and row data +
553546
a new story for row dropzone.
554547

555548
- fix(table): update mods and dropzone outline offset
556-
557549
- Update generated moddable custom properties.
558550
- Remove negative outline offset for dropzone to avoid child cell
559551
borders showing 1px on top of it.
@@ -604,7 +596,6 @@ Fixes
604596
- Move header colors out of sortable (dark theme fix)
605597
- Typo fix for one of the borders
606598
- Change one of the lingering margin properties to its logical property
607-
608599
- feat(table): unique mods for all variants
609600

610601
Technique to include unique custom property mods for the different
@@ -624,7 +615,6 @@ Add custom property mods for the value of the 'cursor' property. Regular
624615
rows may not always need to show a pointer.
625616

626617
- feat(table): new hover and active bg colors prototype
627-
628618
- Active color on rows
629619
- Hover color on selected rows
630620

@@ -645,15 +635,13 @@ some of these states.
645635
## Also updates generated mods
646636

647637
- fix(table): additional high contrast colors update
648-
649638
- Adds hover and focus high contrast color styles.
650639
- Changes high contrast colors on section header.
651640
- Addresses high contrast icon colors for various states. Gives them the
652641
proper foreground given their background, and highlights the header
653642
icon on hover and focus.
654643

655644
- fix(table): checkboxCell spacing adjustment and freshen up branch
656-
657645
- Fixes spacing with checkboxCells, by switching to margin instead of
658646
padding. Spacing token is right from the edge of the checkbox, and
659647
otherwise there is too much extra space from the row's line-height
@@ -687,7 +675,6 @@ Use newly released tokens to:
687675

688676
- Replace hardcoded values for hover and active background colors.
689677
- Set thumbnail variant spacing, now with both density + size values.
690-
691678
- feat(table): finalize vertical alignment spacing with new tokens
692679

693680
Adjustments to make sure that cells maintain the same padding-block and
@@ -702,7 +689,6 @@ density + sizing.
702689
New snapshot tokens version with one more missing token.
703690

704691
- fix(table): fix sizing token names with densities and whcm supports
705-
706692
- Fix name of tokens for large and extra large with densities
707693
- Include @supports with fallback for usage of SelectedItem and
708694
SelectedItemText system colors, because they are fairly new.
@@ -768,7 +754,6 @@ tabindex from rows in multi-select variants with the checkbox cells.
768754
- style(checkbox): fix tabs indentation on additions for indeterminate
769755

770756
- fix(table): cleanup for scrollable and swc
771-
772757
- General cleanup for scrollable.
773758
- Simplify some checkbox box styles.
774759
- Avoid use of 'div' in selector to improve conversion to SWC.
@@ -780,12 +765,10 @@ requested "Column title". Following the Adobe Grammar & Mechanics UX
780765
writing style.
781766

782767
- docs(table): minor example docs updates
783-
784768
- Clarify some language.
785769
- Make sure all (second) columns marked as sortable are focusable.
786770

787771
- fix(table): adjustments to quiet scrollable
788-
789772
- Finalize quiet scrollable.
790773
- Use sentence case in Storybook as well.
791774

components/actionbutton/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ Action button now uses Spectrum 2 tokens and design specifications. A few notabl
5252
- Updated dependencies [[`a25e0a9`](https://github.com/adobe/spectrum-css/commit/a25e0a99e5a4736ab4e607e00739343101a2633b)]:
5353
- @spectrum-css/icon@10.0.0-next.0
5454

55+
## 7.1.4
56+
57+
### Patch Changes
58+
59+
📝 [#4088](https://github.com/adobe/spectrum-css/pull/4088) [`24d75bf`](https://github.com/adobe/spectrum-css/commit/24d75bfe4d8e627f9d8e019ae379bdd4787712dd) Thanks [@castastrophe](https://github.com/castastrophe)!
60+
61+
Minor linting fix of replacing `rgba` to the `rgb` shorthand syntax.
62+
5563
## 7.1.3
5664

5765
### Patch Changes

components/alertbanner/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
- @spectrum-css/button@15.0.0-next.0
2424
- @spectrum-css/closebutton@7.0.0-next.0
2525

26+
## 3.1.2
27+
28+
### Patch Changes
29+
30+
📝 [#4088](https://github.com/adobe/spectrum-css/pull/4088) [`24d75bf`](https://github.com/adobe/spectrum-css/commit/24d75bfe4d8e627f9d8e019ae379bdd4787712dd) Thanks [@castastrophe](https://github.com/castastrophe)!
31+
32+
Minor linting fix of replacing `rgba` to the `rgb` shorthand syntax.
33+
2634
## 3.1.1
2735

2836
### Patch Changes

components/alertdialog/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ To render a component that can be easily swapped between the S2 Foundations, S1,
208208
📝 [#3502](https://github.com/adobe/spectrum-css/pull/3502) [`562396e`](https://github.com/adobe/spectrum-css/commit/562396eaf21769341f78ea3761393b65f00e751b) Thanks [@castastrophe](https://github.com/castastrophe)!
209209

210210
- Remove empty theme references to reduce complexity for components that don't need to define any mappings. This involves removing the source `themes` directories with the empty `spectrum.css` and `express.com` files as well as removing the following empty or unnecessary exports:
211-
212211
- `index-base.css`
213212
- `index-theme.css`
214213
- `themes/spectrum.css`

components/asset/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ To render a component that can be easily swapped between the S2 Foundations, S1,
9797
📝 [#3502](https://github.com/adobe/spectrum-css/pull/3502) [`562396e`](https://github.com/adobe/spectrum-css/commit/562396eaf21769341f78ea3761393b65f00e751b) Thanks [@castastrophe](https://github.com/castastrophe)!
9898

9999
- Remove empty theme references to reduce complexity for components that don't need to define any mappings. This involves removing the source `themes` directories with the empty `spectrum.css` and `express.com` files as well as removing the following empty or unnecessary exports:
100-
101100
- `index-base.css`
102101
- `index-theme.css`
103102
- `themes/spectrum.css`

components/assetcard/CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
- Updated dependencies []:
1515
- @spectrum-css/checkbox@11.0.0-next.0
1616

17+
## 5.1.1
18+
19+
### Patch Changes
20+
21+
📝 [#4088](https://github.com/adobe/spectrum-css/pull/4088) [`24d75bf`](https://github.com/adobe/spectrum-css/commit/24d75bfe4d8e627f9d8e019ae379bdd4787712dd) Thanks [@castastrophe](https://github.com/castastrophe)!
22+
23+
Minor linting fix of replacing `rgba` to the `rgb` shorthand syntax.
24+
1725
## 5.1.0
1826

1927
### Minor Changes
@@ -110,7 +118,6 @@ To render a component that can be easily swapped between the S2 Foundations, S1,
110118
📝 [#3359](https://github.com/adobe/spectrum-css/pull/3359) [`c8194b0`](https://github.com/adobe/spectrum-css/commit/c8194b0a5b6e115d7db680f287eb8a2a9709906b) Thanks [@cdransf](https://github.com/cdransf)!
111119

112120
- This resolves our remaining stylelint issues around undefined tokens, rule order, unused values and color syntax.
113-
114121
- Updates invalid color syntax from `rgba(N, N, N, N)` to `rgba(N N N / N)`.
115122
- In cases of duplicate properties, preserves the property that would be applied given current code structure.
116123
- Updates misnamed tokens to use valid tokens (`table/index.css`).

components/avatar/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ To render a component that can be easily swapped between the S2 Foundations, S1,
9797
📝 [#3502](https://github.com/adobe/spectrum-css/pull/3502) [`562396e`](https://github.com/adobe/spectrum-css/commit/562396eaf21769341f78ea3761393b65f00e751b) Thanks [@castastrophe](https://github.com/castastrophe)!
9898

9999
- Remove empty theme references to reduce complexity for components that don't need to define any mappings. This involves removing the source `themes` directories with the empty `spectrum.css` and `express.com` files as well as removing the following empty or unnecessary exports:
100-
101100
- `index-base.css`
102101
- `index-theme.css`
103102
- `themes/spectrum.css`

0 commit comments

Comments
 (0)