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

Feat/remove charcoal styled from icon button #416

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Feat/remove charcoal styled from icon button #416

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e13151
chore(react): remove styled from IconButton component
naporin0624 Nov 28, 2023
bf05eb3
refactor(react): refactor css
naporin0624 Nov 28, 2023
eabd890
Merge branch 'main' of github.com:pixiv/charcoal into feat/remove-cha…
toshusai Dec 5, 2023
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
37 changes: 13 additions & 24 deletions packages/react/src/components/DropdownSelector/__snapshots__/index.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,40 +560,29 @@ exports[`Storyshots DropdownSelector In Modal 1`] = `
transition: 0.2s background-color,0.2s box-shadow;
}

.c12:hover:not(:disabled):not([aria-disabled]),
.c12:hover[aria-disabled=false] {
background-color: var(--charcoal-transparent-hover);
.c12:not(:disabled):not([aria-disabled]):hover,
.c12[aria-disabled='false']:hover {
background-color: var( --charcoal-transparent-hover );
}

.c12:active:not(:disabled):not([aria-disabled]),
.c12:active[aria-disabled=false] {
background-color: var(--charcoal-transparent-press);
}

.c12:disabled,
.c12[aria-disabled]:not([aria-disabled=false]) {
opacity: 0.32;
.c12:not(:disabled):not([aria-disabled]):active,
.c12[aria-disabled='false']:active {
background-color: var( --charcoal-transparent-press );
}

.c12:not(:disabled):not([aria-disabled]):focus,
.c12[aria-disabled=false]:focus,
.c12[aria-disabled='false']:focus,
.c12:not(:disabled):not([aria-disabled]):active,
.c12[aria-disabled=false]:active {
.c12[aria-disabled='false']:active,
.c12:not(:disabled):not([aria-disabled]):focus-visible,
.c12[aria-disabled='false']:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
}

.c12:not(:disabled):not([aria-disabled]):focus:not(:focus-visible),
.c12[aria-disabled=false]:focus:not(:focus-visible),
.c12:not(:disabled):not([aria-disabled]):active:not(:focus-visible),
.c12[aria-disabled=false]:active:not(:focus-visible) {
outline: none;
}

.c12:not(:disabled):not([aria-disabled]):focus-visible,
.c12[aria-disabled=false]:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
.c12:disabled,
.c12[aria-disabled]:not([aria-disabled='false']) {
opacity: 0.32;
}

.c1 {
Expand Down
74 changes: 26 additions & 48 deletions packages/react/src/components/IconButton/__snapshots__/index.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,40 +63,29 @@ exports[`Storyshots IconButton Default M 1`] = `
transition: 0.2s background-color,0.2s box-shadow;
}

.c1:hover:not(:disabled):not([aria-disabled]),
.c1:hover[aria-disabled=false] {
background-color: var(--charcoal-transparent-hover);
.c1:not(:disabled):not([aria-disabled]):hover,
.c1[aria-disabled='false']:hover {
background-color: var( --charcoal-transparent-hover );
}

.c1:active:not(:disabled):not([aria-disabled]),
.c1:active[aria-disabled=false] {
background-color: var(--charcoal-transparent-press);
}

.c1:disabled,
.c1[aria-disabled]:not([aria-disabled=false]) {
opacity: 0.32;
.c1:not(:disabled):not([aria-disabled]):active,
.c1[aria-disabled='false']:active {
background-color: var( --charcoal-transparent-press );
}

.c1:not(:disabled):not([aria-disabled]):focus,
.c1[aria-disabled=false]:focus,
.c1[aria-disabled='false']:focus,
.c1:not(:disabled):not([aria-disabled]):active,
.c1[aria-disabled=false]:active {
.c1[aria-disabled='false']:active,
.c1:not(:disabled):not([aria-disabled]):focus-visible,
.c1[aria-disabled='false']:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
}

.c1:not(:disabled):not([aria-disabled]):focus:not(:focus-visible),
.c1[aria-disabled=false]:focus:not(:focus-visible),
.c1:not(:disabled):not([aria-disabled]):active:not(:focus-visible),
.c1[aria-disabled=false]:active:not(:focus-visible) {
outline: none;
}

.c1:not(:disabled):not([aria-disabled]):focus-visible,
.c1[aria-disabled=false]:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
.c1:disabled,
.c1[aria-disabled]:not([aria-disabled='false']) {
opacity: 0.32;
}

<div
Expand Down Expand Up @@ -179,40 +168,29 @@ exports[`Storyshots IconButton Overlay M 1`] = `
transition: 0.2s background-color,0.2s box-shadow;
}

.c1:hover:not(:disabled):not([aria-disabled]),
.c1:hover[aria-disabled=false] {
background-color: var(--charcoal-surface4-hover);
.c1:not(:disabled):not([aria-disabled]):hover,
.c1[aria-disabled='false']:hover {
background-color: var( --charcoal-surface4-hover );
}

.c1:active:not(:disabled):not([aria-disabled]),
.c1:active[aria-disabled=false] {
background-color: var(--charcoal-surface4-press);
}

.c1:disabled,
.c1[aria-disabled]:not([aria-disabled=false]) {
opacity: 0.32;
.c1:not(:disabled):not([aria-disabled]):active,
.c1[aria-disabled='false']:active {
background-color: var( --charcoal-surface4-press );
}

.c1:not(:disabled):not([aria-disabled]):focus,
.c1[aria-disabled=false]:focus,
.c1[aria-disabled='false']:focus,
.c1:not(:disabled):not([aria-disabled]):active,
.c1[aria-disabled=false]:active {
.c1[aria-disabled='false']:active,
.c1:not(:disabled):not([aria-disabled]):focus-visible,
.c1[aria-disabled='false']:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
}

.c1:not(:disabled):not([aria-disabled]):focus:not(:focus-visible),
.c1[aria-disabled=false]:focus:not(:focus-visible),
.c1:not(:disabled):not([aria-disabled]):active:not(:focus-visible),
.c1[aria-disabled=false]:active:not(:focus-visible) {
outline: none;
}

.c1:not(:disabled):not([aria-disabled]):focus-visible,
.c1[aria-disabled=false]:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
.c1:disabled,
.c1[aria-disabled]:not([aria-disabled='false']) {
opacity: 0.32;
}

<div
Expand Down
37 changes: 28 additions & 9 deletions packages/react/src/components/IconButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { forwardRef } from 'react'
import styled from 'styled-components'
import { theme } from '../../styled'
import Clickable, { ClickableElement, ClickableProps } from '../Clickable'
import type { KnownIconType } from '@charcoal-ui/icons'

Expand Down Expand Up @@ -42,15 +41,35 @@ const StyledIconButton = styled(Clickable).attrs<
display: flex;
align-items: center;
justify-content: center;
color: var(${({ font }) => `--charcoal-${font}`});
background-color: var(${({ background }) => `--charcoal-${background}`});
border-radius: 999999px;
transition: 0.2s background-color, 0.2s box-shadow;

${({ font, background }) =>
theme((o) => [
o.font[font],
o.bg[background].hover.press,
o.disabled,
o.borderRadius('oval'),
o.outline.default.focus,
])}
&:not(:disabled):not([aria-disabled]),
&[aria-disabled='false'] {
&:hover {
background-color: var(
${({ background }) => `--charcoal-${background}-hover`}
);
}
&:active {
background-color: var(
${({ background }) => `--charcoal-${background}-press`}
);
}
&:focus,
&:active,
&:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0, 150, 250, 0.32);
}
}

&:disabled,
&[aria-disabled]:not([aria-disabled='false']) {
opacity: 0.32;
}
`

function styledProps(props: Required<StyledProps>) {
Expand Down
37 changes: 13 additions & 24 deletions packages/react/src/components/TextField/__snapshots__/TextField.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,40 +1370,29 @@ exports[`Storyshots TextField Prefix Icon 1`] = `
transition: 0.2s background-color,0.2s box-shadow;
}

.c12:hover:not(:disabled):not([aria-disabled]),
.c12:hover[aria-disabled=false] {
background-color: var(--charcoal-surface4-hover);
.c12:not(:disabled):not([aria-disabled]):hover,
.c12[aria-disabled='false']:hover {
background-color: var( --charcoal-surface4-hover );
}

.c12:active:not(:disabled):not([aria-disabled]),
.c12:active[aria-disabled=false] {
background-color: var(--charcoal-surface4-press);
}

.c12:disabled,
.c12[aria-disabled]:not([aria-disabled=false]) {
opacity: 0.32;
.c12:not(:disabled):not([aria-disabled]):active,
.c12[aria-disabled='false']:active {
background-color: var( --charcoal-surface4-press );
}

.c12:not(:disabled):not([aria-disabled]):focus,
.c12[aria-disabled=false]:focus,
.c12[aria-disabled='false']:focus,
.c12:not(:disabled):not([aria-disabled]):active,
.c12[aria-disabled=false]:active {
.c12[aria-disabled='false']:active,
.c12:not(:disabled):not([aria-disabled]):focus-visible,
.c12[aria-disabled='false']:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
}

.c12:not(:disabled):not([aria-disabled]):focus:not(:focus-visible),
.c12[aria-disabled=false]:focus:not(:focus-visible),
.c12:not(:disabled):not([aria-disabled]):active:not(:focus-visible),
.c12[aria-disabled=false]:active:not(:focus-visible) {
outline: none;
}

.c12:not(:disabled):not([aria-disabled]):focus-visible,
.c12[aria-disabled=false]:focus-visible {
outline: none;
box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
.c12:disabled,
.c12[aria-disabled]:not([aria-disabled='false']) {
opacity: 0.32;
}

.c0 {
Expand Down
Loading