Skip to content

Commit fb6eebb

Browse files
committed
fix(field-group,styles): use latest CSS
1 parent 61b6c44 commit fb6eebb

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

.changeset/cruel-hotels-accept.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@spectrum-web-components/field-group': patch
3+
'@spectrum-web-components/overlay': patch
4+
'@spectrum-web-components/styles': patch
5+
---
6+
7+
Remove unnecessary system theme references to reduce complexity for components that don't need the additional mapping layer.

packages/field-group/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@spectrum-web-components/help-text": "1.6.0"
6969
},
7070
"devDependencies": {
71-
"@spectrum-css/fieldgroup": "6.0.1"
71+
"@spectrum-css/fieldgroup": "7.1.0"
7272
},
7373
"types": "./src/index.d.ts",
7474
"customElements": "custom-elements.json",

packages/field-group/src/field-group.css

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,8 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
@import url('./spectrum-field-group.css');
14-
@import url('./field-group-overrides.css');
1514

16-
:host([horizontal][dir='rtl']) slot:not([name])::slotted(*:not(:last-child)),
17-
:host([dir='rtl']:not([vertical]))
18-
slot:not([name])::slotted(*:not(:last-child)) {
15+
:host(:not([vertical])) .group {
1916
/* .spectrum-FieldGroup--horizontal .spectrum-FieldGroup-item+.spectrum-FieldGroup-item */
20-
margin: 0 0 0 var(--spectrum-fieldgroup-margin);
21-
}
22-
23-
:host([horizontal][dir='ltr']) slot:not([name])::slotted(*:not(:last-child)),
24-
:host([dir='ltr']:not([vertical]))
25-
slot:not([name])::slotted(*:not(:last-child)) {
26-
/* .spectrum-FieldGroup--horizontal .spectrum-FieldGroup-item+.spectrum-FieldGroup-item */
27-
margin: 0 var(--spectrum-fieldgroup-margin) 0 0;
17+
gap: var(--spectrum-spacing-300);
2818
}

packages/field-group/src/spectrum-field-group.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ governing permissions and limitations under the License.
1212

1313
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
1414
.group {
15-
--spectrum-fieldgroup-margin: var(--spectrum-spacing-300);
1615
flex-flow: column wrap;
1716
display: flex;
1817
}
@@ -39,7 +38,7 @@ governing permissions and limitations under the License.
3938
}
4039

4140
:host([horizontal]) .group slot:not([name])::slotted(:not(:last-child)) {
42-
margin-inline-end: var(--spectrum-fieldgroup-margin);
41+
margin-inline-end: var(--spectrum-spacing-300);
4342
}
4443

4544
:host([horizontal]) .group .spectrum-HelpText {

yarn.lock

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6794,22 +6794,24 @@ __metadata:
67946794
languageName: node
67956795
linkType: hard
67966796

6797-
"@spectrum-css/fieldgroup@npm:6.0.1":
6798-
version: 6.0.1
6799-
resolution: "@spectrum-css/fieldgroup@npm:6.0.1"
6797+
"@spectrum-css/fieldgroup@npm:7.1.0":
6798+
version: 7.1.0
6799+
resolution: "@spectrum-css/fieldgroup@npm:7.1.0"
68006800
peerDependencies:
6801-
"@spectrum-css/checkbox": ">=9"
6802-
"@spectrum-css/helptext": ">=5"
6803-
"@spectrum-css/radio": ">=9"
6804-
"@spectrum-css/tokens": ">=14 || >=15"
6801+
"@spectrum-css/checkbox": ">=10.0.0 <11.0.0"
6802+
"@spectrum-css/helptext": ">=7.0.0 <8.0.0"
6803+
"@spectrum-css/radio": ">=10.0.0 <11.0.0"
6804+
"@spectrum-css/tokens": ">=16.0.0 <17.0.0"
68056805
peerDependenciesMeta:
68066806
"@spectrum-css/checkbox":
68076807
optional: true
68086808
"@spectrum-css/helptext":
68096809
optional: true
68106810
"@spectrum-css/radio":
68116811
optional: true
6812-
checksum: 10c0/8cd88744e799383ccbe772956447962ed5d9b44f26d742ca3cb66e6f5311dc4477990f1d5b2475fe696d32c042377d80cd8b4107de74b2a74d7790511c51327c
6812+
"@spectrum-css/tokens":
6813+
optional: true
6814+
checksum: 10c0/bb3b1fef4ddb1fe7dafc101bf72367c61cc1bcf050be98f0e55013f86c3f96b167a0b281d9c55b167616a6c16dc57b3c7fa2bd2df8c0bd5524ca741cf94e2667
68136815
languageName: node
68146816
linkType: hard
68156817

@@ -7933,7 +7935,7 @@ __metadata:
79337935
version: 0.0.0-use.local
79347936
resolution: "@spectrum-web-components/field-group@workspace:packages/field-group"
79357937
dependencies:
7936-
"@spectrum-css/fieldgroup": "npm:6.0.1"
7938+
"@spectrum-css/fieldgroup": "npm:7.1.0"
79377939
"@spectrum-web-components/base": "npm:1.6.0"
79387940
"@spectrum-web-components/help-text": "npm:1.6.0"
79397941
languageName: unknown

0 commit comments

Comments
 (0)