Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feat/Select
Browse files Browse the repository at this point in the history
  • Loading branch information
atomiks committed Oct 14, 2024
2 parents 022163d + 0b5da67 commit 865fc54
Show file tree
Hide file tree
Showing 31 changed files with 244 additions and 192 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function Styles() {
outline-offset: 2px;
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[800]};
background: ${grey[800]};
}
Expand All @@ -112,7 +112,7 @@ function Styles() {
color: ${grey[100]};
}
.Checkbox-indicator[data-state="checked"] {
.Checkbox-indicator[data-checked] {
visibility: visible;
}
Expand All @@ -131,7 +131,7 @@ function Styles() {
outline-offset: 2px;
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[300]};
background: ${grey[300]};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function Styles() {
outline-offset: 2px;
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[800]};
background: ${grey[800]};
}
Expand All @@ -112,7 +112,7 @@ function Styles() {
color: ${grey[100]};
}
.Checkbox-indicator[data-state="checked"] {
.Checkbox-indicator[data-checked] {
visibility: visible;
}
Expand All @@ -131,7 +131,7 @@ function Styles() {
outline-offset: 2px;
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[300]};
background: ${grey[300]};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -132,8 +132,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
visibility: hidden;
color: ${grey[100]};
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -132,8 +132,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
visibility: hidden;
color: ${grey[100]};
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const Indicator = React.forwardRef(function Indicator(props, ref) {
ref={ref}
className={(state) =>
classNames(
'h-full inline-block invisible data-[state=checked]:visible text-gray-100',
'h-full inline-block invisible data-[checked]:visible text-gray-100',
typeof props.className === 'function'
? props.className(state)
: props.className,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const Indicator = React.forwardRef<HTMLSpanElement, BaseCheckbox.Indicator.Props
ref={ref}
className={(state) =>
classNames(
'h-full inline-block invisible data-[state=checked]:visible text-gray-100',
'h-full inline-block invisible data-[checked]:visible text-gray-100',
typeof props.className === 'function'
? props.className(state)
: props.className,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -141,8 +141,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
visibility: hidden;
color: ${grey[100]};
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -143,8 +143,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
visibility: hidden;
color: ${grey[100]};
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -84,8 +84,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
display: inline-block;
visibility: hidden;
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -86,8 +86,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
display: inline-block;
visibility: hidden;
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -153,8 +153,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
visibility: hidden;
color: ${grey[100]};
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -155,8 +155,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
visibility: hidden;
color: ${grey[100]};
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function Styles() {
outline-offset: 2px;
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[800]};
background: ${grey[800]};
}
Expand All @@ -104,7 +104,7 @@ function Styles() {
color: ${isDarkMode ? grey[900] : grey[100]};
}
.Checkbox-indicator[data-state="checked"] {
.Checkbox-indicator[data-checked] {
visibility: visible;
}
Expand All @@ -118,7 +118,7 @@ function Styles() {
border-color: ${grey[500]};
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[300]};
background: ${grey[300]};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function Styles() {
outline-offset: 2px;
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[800]};
background: ${grey[800]};
}
Expand All @@ -104,7 +104,7 @@ function Styles() {
color: ${isDarkMode ? grey[900] : grey[100]};
}
.Checkbox-indicator[data-state="checked"] {
.Checkbox-indicator[data-checked] {
visibility: visible;
}
Expand All @@ -118,7 +118,7 @@ function Styles() {
border-color: ${grey[500]};
}
.Checkbox[data-state="checked"] {
.Checkbox[data-checked] {
border-color: ${grey[300]};
background: ${grey[300]};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -100,8 +100,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
display: inline-block;
visibility: hidden;
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const Checkbox = styled(BaseCheckbox.Root)(
outline-offset: 2px;
}
&[data-state="checked"], &[data-state="mixed"] {
&[data-checked], &[data-indeterminate] {
border-color: transparent;
background: ${blue[600]};
}
Expand Down Expand Up @@ -100,8 +100,8 @@ const Indicator = styled(BaseCheckbox.Indicator)`
display: inline-block;
visibility: hidden;
&[data-state='checked'],
&[data-state='mixed'] {
&[data-checked],
&[data-indeterminate] {
visibility: visible;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const Indicator = React.forwardRef(function Indicator(props, ref) {
ref={ref}
className={(state) =>
classNames(
'h-full inline-block invisible data-[state=checked]:visible text-gray-100',
'h-full inline-block invisible data-[checked]:visible text-gray-100',
typeof props.className === 'function'
? props.className(state)
: props.className,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const Indicator = React.forwardRef<HTMLSpanElement, BaseCheckbox.Indicator.Props
ref={ref}
className={(state) =>
classNames(
'h-full inline-block invisible data-[state=checked]:visible text-gray-100',
'h-full inline-block invisible data-[checked]:visible text-gray-100',
typeof props.className === 'function'
? props.className(state)
: props.className,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
}
}

&[data-state='checked'] {
&[data-checked] {
border: none;
background: var(--cyan-500);
}

&[data-state='checked']:not([data-disabled]):hover {
&[data-checked]:not([data-disabled]):hover {
background: var(--cyan-700);
}
}
Expand All @@ -73,7 +73,7 @@
}
}

.thumb[data-state='checked'] {
.thumb[data-checked] {
left: 18px;
background-color: #fff;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ const Switch = styled(BaseSwitch.Root)(
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[700] : blue[200]};
}
&[data-state="checked"] {
&[data-checked] {
border: none;
background: ${blue[500]};
}
&[data-state="checked"]:not([data-disabled]):hover {
&[data-checked]:not([data-disabled]):hover {
background: ${blue[700]};
}
`,
Expand All @@ -101,7 +101,7 @@ const Thumb = styled(BaseSwitch.Thumb)(
theme.palette.mode === 'dark' ? 'rgba(0, 0, 0, 0.25)' : 'rgba(0, 0, 0, 0.1)'
};
&[data-state="checked"] {
&[data-checked] {
left: 18px;
background-color: #fff;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
Expand Down
Loading

0 comments on commit 865fc54

Please sign in to comment.