Skip to content

Commit 1449c41

Browse files
committed
Merge branch 'main' into jawinn/css-384-search-field-core-tokens
2 parents e6909ad + afb1b23 commit 1449c41

File tree

5 files changed

+81
-10
lines changed

5 files changed

+81
-10
lines changed

components/popover/index.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ governing permissions and limitations under the License.
4949
}
5050

5151
.spectrum-Popover {
52+
--spectrum-popover-filter: drop-shadow(var(--mod-popover-shadow-horizontal, var(--spectrum-popover-shadow-horizontal)) var(--mod-popover-shadow-vertical, var(--spectrum-popover-shadow-vertical)) var(--mod-popover-shadow-blur, var(--spectrum-popover-shadow-blur)) var(--mod-popover-shadow-color, var(--spectrum-popover-shadow-color)));
5253
@inherit: %spectrum-overlay;
5354

5455
box-sizing: border-box;
@@ -67,7 +68,7 @@ governing permissions and limitations under the License.
6768
border-width: var(--mod-popover-border-width, var(--spectrum-popover-border-width));
6869

6970
background-color: var(--mod-popover-background-color, var(--spectrum-popover-background-color));
70-
filter: drop-shadow(var(--mod-popover-shadow-horizontal, var(--spectrum-popover-shadow-horizontal)) var(--mod-popover-shadow-vertical, var(--spectrum-popover-shadow-vertical)) var(--mod-popover-shadow-blur, var(--spectrum-popover-shadow-blur)) var(--mod-popover-shadow-color, var(--spectrum-popover-shadow-color)));
71+
filter: var(--mod-popover-filter, var(--spectrum-popover-filter));
7172

7273
/* default opens and animates upward */
7374
&.is-open {
@@ -89,6 +90,11 @@ governing permissions and limitations under the License.
8990
}
9091
}
9192

93+
/* prevent nested popovers from affecting each others drop shadow filters */
94+
.spectrum-Popover * {
95+
--mod-popover-filter: none;
96+
}
97+
9298
/* position naming - first position term is popover position, second term is source position */
9399
/* example: --top-left = popover is to top and source is to left */
94100

components/popover/stories/popover.stories.js

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,68 @@ Default.args = {
8585
}),
8686
],
8787
};
88+
89+
export const WithTip = Template.bind({});
90+
WithTip.args = {
91+
withTip: true,
92+
content: [
93+
Menu({
94+
items: [
95+
{
96+
iconName: "Edit",
97+
label: "Edit",
98+
},
99+
{
100+
iconName: "Copy",
101+
label: "Copy",
102+
},
103+
{
104+
iconName: "Move",
105+
label: "Move",
106+
},
107+
{
108+
iconName: "Delete",
109+
label: "Delete",
110+
},
111+
],
112+
}),
113+
],
114+
};
115+
116+
export const Nested = Template.bind({});
117+
Nested.args = {
118+
content: [
119+
Menu({
120+
items: [
121+
{
122+
iconName: "Edit",
123+
label: "Edit",
124+
},
125+
],
126+
}),
127+
Default({
128+
content: [
129+
Menu({
130+
items: [
131+
{
132+
iconName: "Edit",
133+
label: "Edit",
134+
},
135+
{
136+
iconName: "Copy",
137+
label: "Copy",
138+
},
139+
{
140+
iconName: "Move",
141+
label: "Move",
142+
},
143+
{
144+
iconName: "Delete",
145+
label: "Delete",
146+
},
147+
],
148+
}),
149+
],
150+
})
151+
],
152+
};

tools/bundle-builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"gulp-pug": "^4.0.1",
2727
"gulp-rename": "^1.4.0",
2828
"gulplog": "^1.0.0",
29-
"inquirer": "^9.2.3",
29+
"inquirer": "^9.2.6",
3030
"js-yaml": "^4.1.0",
3131
"loadicons": "^1.0.0",
3232
"replace-ext": "^1.0.0",

tools/generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"devDependencies": {
2424
"cheerio": "^1.0.0-rc.12",
2525
"fuzzy": "^0.1.3",
26-
"inquirer": "^9.2.2",
26+
"inquirer": "^9.2.6",
2727
"inquirer-autocomplete-prompt": "^3.0.0",
2828
"js-yaml": "^4.1.0",
2929
"plop": "^3.1.1"

yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9650,10 +9650,10 @@ inquirer@^8.2.2, inquirer@^8.2.4:
96509650
through "^2.3.6"
96519651
wrap-ansi "^7.0.0"
96529652

9653-
inquirer@^9.2.2, inquirer@^9.2.3:
9654-
version "9.2.3"
9655-
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.3.tgz#48993a6cf832b581a0df0ba0445c435e3d76a69c"
9656-
integrity sha512-/Et0+d28D7hnTYaqeCQkp3FYuD/X5cc2qbM6BzFdC5zs30oByoU5W/pmLc493FVVMwYmAILKjPBEmwRKTtknSQ==
9653+
inquirer@^9.2.6:
9654+
version "9.2.6"
9655+
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.6.tgz#802a61ee3eefbf1cb82a7fb6c2ae95a106050e01"
9656+
integrity sha512-y71l237eJJKS4rl7sQcEUiMhrR0pB/ZnRMMTxLpjJhWL4hdWCT03a6jJnC1w6qIPSRZWEozuieGt3v7XaEJYFw==
96579657
dependencies:
96589658
ansi-escapes "^4.3.2"
96599659
chalk "^5.2.0"
@@ -15840,9 +15840,9 @@ socket.io-client@^4.4.1:
1584015840
socket.io-parser "~4.2.1"
1584115841

1584215842
socket.io-parser@~4.2.1:
15843-
version "4.2.2"
15844-
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
15845-
integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
15843+
version "4.2.3"
15844+
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.3.tgz#926bcc6658e2ae0883dc9dee69acbdc76e4e3667"
15845+
integrity sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==
1584615846
dependencies:
1584715847
"@socket.io/component-emitter" "~3.1.0"
1584815848
debug "~4.3.1"

0 commit comments

Comments
 (0)