@charcoal-ui/react 3.8.0 → 3.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/react",
-  "version": "3.8.0",
+  "version": "3.9.1",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -18,6 +18,7 @@
     "clean": "rimraf dist .tsbuildinfo"
   },
   "devDependencies": {
+    "@charcoal-ui/esbuild-plugin-styled-components": "^3.9.1",
     "@react-types/switch": "^3.1.2",
     "@storybook/addon-actions": "^7.4.1",
     "@storybook/addon-knobs": "^7.0.2",
@@ -51,10 +52,10 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@charcoal-ui/icons": "^3.8.0",
-    "@charcoal-ui/styled": "^3.8.0",
-    "@charcoal-ui/theme": "^3.8.0",
-    "@charcoal-ui/utils": "^3.8.0",
+    "@charcoal-ui/icons": "^3.9.1",
+    "@charcoal-ui/styled": "^3.9.1",
+    "@charcoal-ui/theme": "^3.9.1",
+    "@charcoal-ui/utils": "^3.9.1",
     "@react-aria/button": "^3.9.1",
     "@react-aria/checkbox": "^3.13.0",
     "@react-aria/dialog": "^3.5.10",
@@ -87,5 +88,5 @@
     "url": "https://github.com/pixiv/charcoal.git",
     "directory": "packages/react"
   },
-  "gitHead": "939ab20e11455ff9cba840c38c7dfd33cd739b59"
+  "gitHead": "baffe25b0a15aae2833ff35c07220a431076c954"
 }

package/src/components/Checkbox/__snapshots__/index.story.storyshot

@@ -11,13 +11,9 @@ exports[`Storybook Tests Checkbox Invalid 1`] = `
   gap: 4px;
 }
 
-.c0:disabled,
-.c0[aria-disabled]:not([aria-disabled=false]) {
-  cursor: default;
-}
-
 .c0:disabled,
 .c0[aria-disabled]:not([aria-disabled='false']) {
+  cursor: default;
   opacity: 0.32;
 }
 
@@ -39,6 +35,18 @@ exports[`Storybook Tests Checkbox Invalid 1`] = `
   transition: 0.2s box-shadow,0.2s background-color;
 }
 
+.c2[type='checkbox']:disabled {
+  cursor: default;
+}
+
+.c2[type='checkbox']:-moz-read-only {
+  cursor: default;
+}
+
+.c2[type='checkbox']:read-only {
+  cursor: default;
+}
+
 .c2[type='checkbox']:checked {
   background-color: var(--charcoal-brand);
 }
@@ -140,6 +148,7 @@ exports[`Storybook Tests Checkbox Invalid 1`] = `
         onTouchEnd={[Function]}
         onTouchMove={[Function]}
         onTouchStart={[Function]}
+        readOnly={false}
         type="checkbox"
       />
       <div
@@ -173,13 +182,9 @@ exports[`Storybook Tests Checkbox Labelled 1`] = `
   gap: 4px;
 }
 
-.c0:disabled,
-.c0[aria-disabled]:not([aria-disabled=false]) {
-  cursor: default;
-}
-
 .c0:disabled,
 .c0[aria-disabled]:not([aria-disabled='false']) {
+  cursor: default;
   opacity: 0.32;
 }
 
@@ -201,6 +206,18 @@ exports[`Storybook Tests Checkbox Labelled 1`] = `
   transition: 0.2s box-shadow,0.2s background-color;
 }
 
+.c2[type='checkbox']:disabled {
+  cursor: default;
+}
+
+.c2[type='checkbox']:-moz-read-only {
+  cursor: default;
+}
+
+.c2[type='checkbox']:read-only {
+  cursor: default;
+}
+
 .c2[type='checkbox']:checked {
   background-color: var(--charcoal-brand);
 }
@@ -309,6 +326,7 @@ exports[`Storybook Tests Checkbox Labelled 1`] = `
             onTouchEnd={[Function]}
             onTouchMove={[Function]}
             onTouchStart={[Function]}
+            readOnly={false}
             type="checkbox"
           />
           <div
@@ -357,6 +375,7 @@ exports[`Storybook Tests Checkbox Labelled 1`] = `
             onTouchEnd={[Function]}
             onTouchMove={[Function]}
             onTouchStart={[Function]}
+            readOnly={false}
             type="checkbox"
           />
           <div
@@ -401,13 +420,9 @@ exports[`Storybook Tests Checkbox Unlabelled 1`] = `
   gap: 4px;
 }
 
-.c0:disabled,
-.c0[aria-disabled]:not([aria-disabled=false]) {
-  cursor: default;
-}
-
 .c0:disabled,
 .c0[aria-disabled]:not([aria-disabled='false']) {
+  cursor: default;
   opacity: 0.32;
 }
 
@@ -429,6 +444,18 @@ exports[`Storybook Tests Checkbox Unlabelled 1`] = `
   transition: 0.2s box-shadow,0.2s background-color;
 }
 
+.c2[type='checkbox']:disabled {
+  cursor: default;
+}
+
+.c2[type='checkbox']:-moz-read-only {
+  cursor: default;
+}
+
+.c2[type='checkbox']:read-only {
+  cursor: default;
+}
+
 .c2[type='checkbox']:checked {
   background-color: var(--charcoal-brand);
 }
@@ -525,6 +552,7 @@ exports[`Storybook Tests Checkbox Unlabelled 1`] = `
           onTouchEnd={[Function]}
           onTouchMove={[Function]}
           onTouchStart={[Function]}
+          readOnly={false}
           type="checkbox"
         />
         <div

package/src/components/Checkbox/index.tsx

@@ -4,7 +4,6 @@ import styled, { css } from 'styled-components'
 import { useCheckbox } from '@react-aria/checkbox'
 import { useObjectRef } from '@react-aria/utils'
 import { useToggleState } from 'react-stately'
-import { disabledSelector } from '@charcoal-ui/utils'
 
 import type { AriaCheckboxProps } from '@react-types/checkbox'
 import Icon from '../Icon'
@@ -59,7 +58,11 @@ const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
     return (
       <InputRoot aria-disabled={isDisabled} className={props.className}>
         <CheckboxRoot>
-          <CheckboxInput type="checkbox" {...inputProps} />
+          <CheckboxInput
+            type="checkbox"
+            {...inputProps}
+            readOnly={props.readonly}
+          />
           <CheckboxInputOverlay aria-hidden={true} checked={inputProps.checked}>
             <Icon name="24/Check" unsafeNonGuidelineScale={2 / 3} />
           </CheckboxInputOverlay>
@@ -82,13 +85,11 @@ const InputRoot = styled.label`
   display: flex;
 
   cursor: pointer;
-  ${disabledSelector} {
-    cursor: default;
-  }
 
   gap: 4px;
   &:disabled,
   &[aria-disabled]:not([aria-disabled='false']) {
+    cursor: default;
     opacity: 0.32;
   }
 `
@@ -108,6 +109,13 @@ const CheckboxInput = styled.input`
     border-radius: 4px;
     transition: 0.2s box-shadow, 0.2s background-color;
 
+    &:disabled {
+      cursor: default;
+    }
+    &:read-only {
+      cursor: default;
+    }
+
     &:checked {
       background-color: var(--charcoal-brand);
 

package/src/components/DropdownSelector/__snapshots__/index.story.storyshot

@@ -512,11 +512,13 @@ exports[`Storybook Tests DropdownSelector InModal 1`] = `
 
 .c12:not(:disabled):not([aria-disabled]):hover,
 .c12[aria-disabled='false']:hover {
+  color: var(--charcoal-text3-hover);
   background-color: var(--charcoal-transparent-hover);
 }
 
 .c12:not(:disabled):not([aria-disabled]):active,
 .c12[aria-disabled='false']:active {
+  color: var(--charcoal-text3-press);
   background-color: var(--charcoal-transparent-press);
 }
 
@@ -701,6 +703,7 @@ exports[`Storybook Tests DropdownSelector InModal 1`] = `
     </button>
     <div
       className="c0"
+      onClick={[Function]}
       onPointerDown={[Function]}
       style={
         Object {

package/src/components/IconButton/__snapshots__/index.story.storyshot

@@ -67,11 +67,13 @@ exports[`Storybook Tests IconButton DefaultM 1`] = `
 
 .c1:not(:disabled):not([aria-disabled]):hover,
 .c1[aria-disabled='false']:hover {
+  color: var(--charcoal-text3-hover);
   background-color: var(--charcoal-transparent-hover);
 }
 
 .c1:not(:disabled):not([aria-disabled]):active,
 .c1[aria-disabled='false']:active {
+  color: var(--charcoal-text3-press);
   background-color: var(--charcoal-transparent-press);
 }
 
@@ -177,6 +179,7 @@ exports[`Storybook Tests IconButton IsActive 1`] = `
 
 .c1:not(:disabled):not([aria-disabled]),
 .c1[aria-disabled='false'] {
+  color: var(--charcoal-text3-press);
   background-color: var(--charcoal-transparent-press);
 }
 
@@ -282,11 +285,13 @@ exports[`Storybook Tests IconButton OverlayM 1`] = `
 
 .c1:not(:disabled):not([aria-disabled]):hover,
 .c1[aria-disabled='false']:hover {
+  color: var(--charcoal-text5-hover);
   background-color: var(--charcoal-surface4-hover);
 }
 
 .c1:not(:disabled):not([aria-disabled]):active,
 .c1[aria-disabled='false']:active {
+  color: var(--charcoal-text5-press);
   background-color: var(--charcoal-surface4-press);
 }
 

package/src/components/IconButton/index.tsx

@@ -69,16 +69,19 @@ const StyledIconButton = styled(Clickable).attrs<
 
   &:not(:disabled):not([aria-disabled]),
   &[aria-disabled='false'] {
-    ${({ $isActive, $background }) =>
+    ${({ $isActive, $background, $font }) =>
       $isActive
         ? css`
+            color: var(--charcoal-${$font}-press);
             background-color: var(--charcoal-${$background}-press);
           `
         : css`
             &:hover {
+              color: var(--charcoal-${$font}-hover);
               background-color: var(--charcoal-${$background}-hover);
             }
             &:active {
+              color: var(--charcoal-${$font}-press);
               background-color: var(--charcoal-${$background}-press);
             }
           `}