Skip to content

Commit

Permalink
Merge branch 'main' into fix-text-input-aria-invalid
Browse files Browse the repository at this point in the history
  • Loading branch information
pksjce authored Mar 7, 2024
2 parents fda2402 + 7cb3464 commit 27dacd3
Show file tree
Hide file tree
Showing 10 changed files with 311 additions and 24 deletions.
5 changes: 5 additions & 0 deletions .changeset/fair-sloths-kick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": minor
---

experimental/SelectPanel: Add back button
5 changes: 5 additions & 0 deletions .changeset/neat-toes-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

experimental/SelectPanel: Move focus to first item if there is no filter input
5 changes: 5 additions & 0 deletions .changeset/wicked-rings-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Tooltip2: Render tooltip element as `span` instead of `div`
6 changes: 4 additions & 2 deletions packages/react/src/ActionList/Selection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export const Selection: React.FC<React.PropsWithChildren<SelectionProps>> = ({se
}

if (selectionVariant === 'single' || listRole === 'menu') {
return <LeadingVisualContainer>{selected && <CheckIcon />}</LeadingVisualContainer>
return (
<LeadingVisualContainer data-component="ActionList.Selection">{selected && <CheckIcon />}</LeadingVisualContainer>
)
}

/**
Expand Down Expand Up @@ -59,7 +61,7 @@ export const Selection: React.FC<React.PropsWithChildren<SelectionProps>> = ({se
}

return (
<LeadingVisualContainer>
<LeadingVisualContainer data-component="ActionList.Selection">
<Box
sx={{
borderColor: selected ? 'accent.fg' : 'neutral.emphasis',
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/TooltipV2/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const animationStyles = `
animation-delay: 0s;
`

const StyledTooltip = styled.div`
const StyledTooltip = styled.span`
/* Overriding the default popover styles */
display: none;
&[popover] {
Expand Down
Loading

0 comments on commit 27dacd3

Please sign in to comment.