Skip to content

Commit 3d86d63

Browse files
authored
Merge branch 'main' into shiprag/fix-touch-submenu-interactions
2 parents d9a1f48 + 6c97dd7 commit 3d86d63

File tree

29 files changed

+1484
-183
lines changed

29 files changed

+1484
-183
lines changed

.changeset/short-pans-know.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@spectrum-web-components/status-light': patch
3+
---
4+
5+
**Fixed**: Added missing `accent` and `cyan` variant to status light.

.changeset/weak-streets-raise.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@spectrum-web-components/overlay': patch
3+
---
4+
5+
- **Fixed**: Expanded `<overlay-trigger>` `type` property to accept all overlay types ('auto', 'hint', 'manual', 'modal', 'page') instead of the incorrect, previous restricted subset.

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222
# 3. Commit this change to the PR branch where the changes exist.
2323
current_golden_images_hash:
2424
type: string
25-
default: 1bd7e9973de8f318233aa41b5b8a97a2956cd44d
25+
default: 94764405d1674838a93d6c6a39e793df39fc301e
2626
wireit_cache_name:
2727
type: string
2828
default: wireit

.cursor/rules/github-description.mdc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Use the following labels to categorize pull requests. Only use labels that exist
9393
- `Browser: Edge (Legacy)`: Issue with pre-chromium Edge
9494
- `Browser: FireFox`: Firefox browser issues
9595
- `Browser: Safari`: Safari browser issues
96+
- `iOS`: iOS-specific issues and bugs
9697

9798
### Development and process labels
9899

@@ -107,11 +108,9 @@ Common additional labels include:
107108

108109
- `chore`: Routine tasks, maintenance, or non-feature changes
109110
- `dependencies`: Updates or changes to project dependencies
110-
- `docs`: Documentation updates or improvements
111-
- `enhancement`: Improvements to existing features
112-
- `feature`: New feature implementations
111+
- `Documentation`: Documentation updates or improvements
112+
- `feature`: New feature implementations or improvements to existing features
113113
- `i18n`: Internationalization and localization work
114-
- `iOS`: iOS-specific issues and bugs
115114
- `mobile`: Mobile platform issues and responsive design
116115
- `performance`: Performance-related improvements or regressions
117116
- `refactor`: Code restructuring and refactoring work

.cursor/rules/jira-ticket.mdc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Use the following labels to categorize tickets appropriately:
185185
- `s2foundations`: Spectrum 2 Foundations related work
186186
- `spectrum2`: Spectrum 2 platform specific tasks
187187
- `team-processes`: Internal team workflow improvements
188-
- `testing`: Test implementation or testing infrastructure work
188+
- `test`: Test implementation or testing infrastructure work
189189
- `triage`: New tickets requiring team assessment and prioritization
190190
- `VoiceOver`: VoiceOver screen reader specific issues
191191

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Feature request
22
description: Describe the feature you would like added
33
title: '[Feat]: '
4-
labels: [enhancement, triage, needs jira ticket]
4+
labels: [feature, triage, needs jira ticket]
55
# assignees:
66
body:
77
- type: markdown

.github/ISSUE_TEMPLATE/new_component.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: New component
22
description: Outline the requirements for a new component
33
title: '[NEW]: '
4-
labels: [missing components, triage, needs jira ticket]
4+
labels: [new component, triage, needs jira ticket]
55
# assignees:
66
body:
77
- type: markdown

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ projects/**/*.css.ts
7777
tools/**/*.css.ts
7878
styles/**/*.css.ts
7979

80+
# barebones assets
81+
first-gen/*
82+
second-gen/*
83+
8084
# test assets
8185
TESTS.xml
8286
test-results.xml

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"tools/**/*.js": { "when": "$(basename).ts" },
1010
"tools/**/*.dev.js": { "when": "$(basename).js" },
1111
"tools/**/*.d.ts": { "when": "$(basename).ts" },
12-
"**/*.test-vrt.ts": true
12+
"**/*.test-vrt.ts": true,
13+
"first-gen/**": true,
14+
"second-gen/**": true
1315
},
1416
"typescript.tsdk": "node_modules/typescript/lib",
1517
"lit-plugin.strict": true,

packages/action-menu/stories/action-menu.stories.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,9 @@ selects.args = {
281281
open: true,
282282
};
283283
selects.decorators = [isOverlayOpen];
284+
selects.swc_vrt = {
285+
skip: true,
286+
};
284287

285288
export const iconOnly = (args: StoryArgs = {}): TemplateResult =>
286289
Template(args);

0 commit comments

Comments
 (0)