From 72dd63108918634acf7e34f0ab413235424ffc1d Mon Sep 17 00:00:00 2001 From: Marissa Huysentruyt Date: Tue, 21 Jan 2025 16:59:48 -0500 Subject: [PATCH 1/3] docs(tooltip): add missing args to template - Tooltip was missing the `variant = "neutral"` arg, so adding that back in renders the component --- components/tooltip/stories/template.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/tooltip/stories/template.js b/components/tooltip/stories/template.js index 1457ae2b95f..61cf2ce81b2 100644 --- a/components/tooltip/stories/template.js +++ b/components/tooltip/stories/template.js @@ -12,6 +12,7 @@ export const Template = ({ rootClass = "spectrum-Tooltip", label, placement, + variant = "neutral", isOpen = true, isFocused = false, showOnHover = false, From fee9e00cd0fce15a3da34472aeb1e68054707bb1 Mon Sep 17 00:00:00 2001 From: Marissa Huysentruyt Date: Tue, 21 Jan 2025 17:03:52 -0500 Subject: [PATCH 2/3] chore(picker): add/correct arg naming - adds missing placeholder arg to template - corrects content arg to popoverContent --- components/picker/stories/picker.stories.js | 2 +- components/picker/stories/template.js | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/picker/stories/picker.stories.js b/components/picker/stories/picker.stories.js index 9c65f215c39..45c32f3872a 100644 --- a/components/picker/stories/picker.stories.js +++ b/components/picker/stories/picker.stories.js @@ -97,7 +97,7 @@ export default { }, isHovered, isActive, - content: { table: { disable: true } }, + popoverContent: { table: { disable: true } }, }, args: { rootClass: "spectrum-Picker", diff --git a/components/picker/stories/template.js b/components/picker/stories/template.js index 806c2782834..df7086b35ac 100644 --- a/components/picker/stories/template.js +++ b/components/picker/stories/template.js @@ -109,6 +109,7 @@ export const Template = ({ size = "m", label, labelPosition = "top", + placeholder, helpText, isQuiet = false, isOpen = false, @@ -125,7 +126,7 @@ export const Template = ({ // Helps ensure that Popover appears below the Picker, with side labels layout. display: "block", }, - content = [], + popoverContent = [], } = {}, context = {}) => { const pickerMarkup = Picker({ size, @@ -134,17 +135,18 @@ export const Template = ({ isInvalid, isDisabled, isLoading, - content, + placeholder, + popoverContent, labelPosition, ariaLabeledBy: fieldLabelId, }, context); - const popoverMarkup = content.length !== 0 ? Popover({ + const popoverMarkup = popoverContent.length !== 0 ? Popover({ isOpen: isOpen && !isDisabled && !isLoading, withTip: false, position: "bottom", isQuiet, - content, + content: popoverContent, size, customStyles: customPopoverStyles, }, context) : ""; From 392cb5212685eb99f5af91553a4bf7eafd52f510 Mon Sep 17 00:00:00 2001 From: Marissa Huysentruyt Date: Tue, 21 Jan 2025 17:17:12 -0500 Subject: [PATCH 3/3] chore(picker): remove window.isChromatic calls and click event --- components/picker/stories/template.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/components/picker/stories/template.js b/components/picker/stories/template.js index df7086b35ac..a9c06a3f817 100644 --- a/components/picker/stories/template.js +++ b/components/picker/stories/template.js @@ -64,8 +64,7 @@ export const Picker = ({ id=${id} style=${styleMap(customStyles)} type="button" - @click=${() => { - if (window.isChromatic()) return; + @click=${function() { updateArgs({ isOpen: !isOpen }); }} aria-labelledby=${ifDefined(ariaLabeledBy)} @@ -195,12 +194,6 @@ export const Template = ({ }, context) )} `; - - // Make sure there is a wrapper around sibling components when using the Chromatic - // template, so their layout is not affected by the flex and grid layouts used. - if (window.isChromatic()) { - return html`
${markup}
`; - } return markup; };