Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(menu): update to latest css #5115

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore(menu): update to latest css #5115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6459875
chore(menu): update to latest css
TarunAdobe Feb 24, 2025
44ed13b
Merge branch 'main' into ttomar/menu-border
TarunAdobe Feb 25, 2025
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
2 changes: 1 addition & 1 deletion packages/menu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@spectrum-web-components/shared": "1.1.2"
},
"devDependencies": {
"@spectrum-css/menu": "8.0.0-s2-foundations.17"
"@spectrum-css/menu": "9.1.0"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
13 changes: 13 additions & 0 deletions packages/menu/src/menu-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,17 @@ governing permissions and limitations under the License.
--spectrum-menu-item-background-color-key-focus: var(
--system-menu-item-background-color-key-focus
);
--spectrum-menu-item-corner-radius: var(--system-menu-item-corner-radius);
--spectrum-menu-item-focus-indicator-shadow: var(
--system-menu-item-focus-indicator-shadow
);
--spectrum-menu-item-focus-indicator-offset: var(
--system-menu-item-focus-indicator-offset
);
--spectrum-menu-item-spacing-multiplier: var(
--system-menu-item-spacing-multiplier
);
--spectrum-menu-item-focus-indicator-outline-style: var(
--system-menu-item-focus-indicator-outline-style
);
}
39 changes: 8 additions & 31 deletions packages/menu/src/spectrum-checkmark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,37 +58,14 @@ governing permissions and limitations under the License.
}

.spectrum-Menu-back:focus-visible {
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) * 1
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) *
var(--spectrum-menu-item-focus-indicator-direction-scalar, 1)
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: var(--spectrum-menu-item-focus-indicator-shadow)
var(--spectrum-menu-item-focus-indicator-border-width) 0 0 0
var(--spectrum-menu-item-focus-indicator-color-default);
outline: var(--spectrum-menu-item-focus-indicator-border-width)
var(--spectrum-menu-item-focus-indicator-outline-style)
var(--spectrum-menu-item-focus-indicator-color-default);
outline-offset: var(--spectrum-menu-item-focus-indicator-offset);
border-radius: var(--spectrum-menu-item-corner-radius);
}

.spectrum-Menu-back {
Expand Down
39 changes: 8 additions & 31 deletions packages/menu/src/spectrum-chevron.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,14 @@ governing permissions and limitations under the License.
}

.spectrum-Menu-back:focus-visible {
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) * 1
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) *
var(--spectrum-menu-item-focus-indicator-direction-scalar, 1)
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: var(--spectrum-menu-item-focus-indicator-shadow)
var(--spectrum-menu-item-focus-indicator-border-width) 0 0 0
var(--spectrum-menu-item-focus-indicator-color-default);
outline: var(--spectrum-menu-item-focus-indicator-border-width)
var(--spectrum-menu-item-focus-indicator-outline-style)
var(--spectrum-menu-item-focus-indicator-color-default);
outline-offset: var(--spectrum-menu-item-focus-indicator-offset);
border-radius: var(--spectrum-menu-item-corner-radius);
}

.spectrum-Menu-back {
Expand Down
39 changes: 8 additions & 31 deletions packages/menu/src/spectrum-menu-divider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,37 +32,14 @@ governing permissions and limitations under the License.
}

.spectrum-Menu-back:focus-visible {
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) * 1
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) *
var(--spectrum-menu-item-focus-indicator-direction-scalar, 1)
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: var(--spectrum-menu-item-focus-indicator-shadow)
var(--spectrum-menu-item-focus-indicator-border-width) 0 0 0
var(--spectrum-menu-item-focus-indicator-color-default);
outline: var(--spectrum-menu-item-focus-indicator-border-width)
var(--spectrum-menu-item-focus-indicator-outline-style)
var(--spectrum-menu-item-focus-indicator-color-default);
outline-offset: var(--spectrum-menu-item-focus-indicator-offset);
border-radius: var(--spectrum-menu-item-corner-radius);
}

.spectrum-Menu-back {
Expand Down
55 changes: 15 additions & 40 deletions packages/menu/src/spectrum-menu-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ governing permissions and limitations under the License.

:host {
cursor: pointer;
border-radius: var(--spectrum-menu-item-corner-radius);
box-sizing: border-box;
background-color: var(
--highcontrast-menu-item-background-color-default,
Expand Down Expand Up @@ -67,14 +68,19 @@ governing permissions and limitations under the License.
--mod-menu-item-label-inline-edge-to-content,
var(--spectrum-menu-item-label-inline-edge-to-content)
);
margin: calc(
(
var(--spectrum-menu-item-focus-indicator-offset) +
var(--spectrum-menu-item-focus-indicator-border-width)
) * var(--spectrum-menu-item-spacing-multiplier)
);
grid-template:
'. chevronAreaCollapsible . headingIconArea sectionHeadingArea . . .' 1fr
'selectedArea chevronAreaCollapsible checkmarkArea iconArea labelArea valueArea actionsArea chevronAreaDrillIn'
'. . . . descriptionArea . . .'
'. . . . submenuArea . . .'
/ auto auto auto auto 1fr auto auto auto;
align-items: center;
margin: 0;
-webkit-text-decoration: none;
text-decoration: none;
display: grid;
Expand Down Expand Up @@ -363,45 +369,14 @@ governing permissions and limitations under the License.

:host([focused]) .spectrum-Menu-back,
:host([focused]) {
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) * 1
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) *
var(--spectrum-menu-item-focus-indicator-direction-scalar, 1)
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
}

:host .is-selectableMultiple {
align-items: start;
}

.is-selectableMultiple .spectrum-Menu-itemCheckbox {
grid-area: checkmarkArea;
box-shadow: var(--spectrum-menu-item-focus-indicator-shadow)
var(--spectrum-menu-item-focus-indicator-border-width) 0 0 0
var(--spectrum-menu-item-focus-indicator-color-default);
outline: var(--spectrum-menu-item-focus-indicator-border-width)
var(--spectrum-menu-item-focus-indicator-outline-style)
var(--spectrum-menu-item-focus-indicator-color-default);
outline-offset: var(--spectrum-menu-item-focus-indicator-offset);
border-radius: var(--spectrum-menu-item-corner-radius);
}

.spectrum-Menu-itemSelection {
Expand Down
39 changes: 8 additions & 31 deletions packages/menu/src/spectrum-menu-sectionHeading.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,14 @@ governing permissions and limitations under the License.

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
.spectrum-Menu-back:focus-visible {
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) * 1
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: inset
calc(
var(
--mod-menu-item-focus-indicator-width,
var(--spectrum-menu-item-focus-indicator-width)
) *
var(--spectrum-menu-item-focus-indicator-direction-scalar, 1)
)
0 0 0
var(
--highcontrast-menu-item-focus-indicator-color,
var(
--mod-menu-item-focus-indicator-color,
var(--spectrum-menu-item-focus-indicator-color)
)
);
box-shadow: var(--spectrum-menu-item-focus-indicator-shadow)
var(--spectrum-menu-item-focus-indicator-border-width) 0 0 0
var(--spectrum-menu-item-focus-indicator-color-default);
outline: var(--spectrum-menu-item-focus-indicator-border-width)
var(--spectrum-menu-item-focus-indicator-outline-style)
var(--spectrum-menu-item-focus-indicator-color-default);
outline-offset: var(--spectrum-menu-item-focus-indicator-offset);
border-radius: var(--spectrum-menu-item-corner-radius);
}

.header {
Expand Down
Loading
Loading