@charcoal-ui/react 3.1.2-beta.6 → 3.2.0

package/dist/components/Button/index.d.ts

@@ -1,21 +1,11 @@
 import { ClickableElement, ClickableProps } from '../Clickable';
 type Variant = 'Primary' | 'Default' | 'Overlay' | 'Danger' | 'Navigation';
 type Size = 'S' | 'M';
-interface StyledProps {
-    /**
-     * ボタンのスタイル
-     */
+export type ButtonProps = Partial<{
     variant: Variant;
-    /**
-     * ボタンのサイズ
-     */
     size: Size;
-    /**
-     * 幅を最大まで広げて描画
-     */
     fullWidth: boolean;
-}
-export type ButtonProps = Partial<StyledProps> & ClickableProps;
+}> & ClickableProps;
 declare const Button: import("react").ForwardRefExoticComponent<ButtonProps & import("react").RefAttributes<ClickableElement>>;
 export default Button;
 //# sourceMappingURL=index.d.ts.map

package/dist/components/Button/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"AAIA,OAAkB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE1E,KAAK,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,YAAY,CAAA;AAC1E,KAAK,IAAI,GAAG,GAAG,GAAG,GAAG,CAAA;AAErB,UAAU,WAAW;IACnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAA;IAChB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAA;IACV;;OAEG;IACH,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;AAE/D,QAAA,MAAM,MAAM,0GAuBV,CAAA;AACF,eAAe,MAAM,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"AAIA,OAAkB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE1E,KAAK,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,YAAY,CAAA;AAC1E,KAAK,IAAI,GAAG,GAAG,GAAG,GAAG,CAAA;AAQrB,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,IAAI,CAAA;IACV,SAAS,EAAE,OAAO,CAAA;CACnB,CAAC,GACA,cAAc,CAAA;AAEhB,QAAA,MAAM,MAAM,0GAuBV,CAAA;AACF,eAAe,MAAM,CAAA"}

package/dist/components/Checkbox/performance.test.d.ts

@@ -0,0 +1,4 @@
+import 'jest-styled-components';
+import renderder from 'react-test-renderer';
+export declare function render(children: JSX.Element): renderder.ReactTestRendererJSON | renderder.ReactTestRendererJSON[] | null;
+//# sourceMappingURL=performance.test.d.ts.map

package/dist/components/Checkbox/performance.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"performance.test.d.ts","sourceRoot":"","sources":["../../../src/components/Checkbox/performance.test.tsx"],"names":[],"mappings":"AACA,OAAO,wBAAwB,CAAA;AAG/B,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAI3C,wBAAgB,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,8EAI3C"}

package/dist/components/Checkbox/snapshot.test.d.ts

@@ -0,0 +1,2 @@
+import 'jest-styled-components';
+//# sourceMappingURL=snapshot.test.d.ts.map

package/dist/components/Checkbox/snapshot.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot.test.d.ts","sourceRoot":"","sources":["../../../src/components/Checkbox/snapshot.test.tsx"],"names":[],"mappings":"AAOA,OAAO,wBAAwB,CAAA"}

package/dist/index.cjs.js

@@ -238,21 +238,17 @@ var Button2 = (0, import_react2.forwardRef)(function Button3({
     {
       ...rest,
       disabled,
-      variant,
-      size,
-      fullWidth: fixed,
+      $variant: variant,
+      $size: size,
+      $fullWidth: fixed,
       ref,
       children
     }
   );
 });
 var Button_default = Button2;
-var StyledButton = (0, import_styled_components4.default)(Clickable_default).withConfig({
-  shouldForwardProp(prop) {
-    return prop !== "fullWidth";
-  }
-}).attrs(styledProps)`
-  width: ${(p) => p.fullWidth ? "stretch" : "min-content"};
+var StyledButton = (0, import_styled_components4.default)(Clickable_default)`
+  width: ${(p) => p.$fullWidth ? "stretch" : "min-content"};
   display: inline-grid;
   align-items: center;
   justify-content: center;
@@ -261,53 +257,48 @@ var StyledButton = (0, import_styled_components4.default)(Clickable_default).wit
   white-space: nowrap;
 
   ${(p) => theme((o) => [
-  o.font[p.font].hover.press,
-  o.bg[p.background].hover.press,
+  o.font[variantToFont(p.$variant)].hover.press,
+  o.bg[variantToBackgraund(p.$variant)].hover.press,
   o.typography(14).bold.preserveHalfLeading,
-  o.padding.horizontal(p.padding),
+  o.padding.horizontal(p.$size === "M" ? 24 : 16),
   o.disabled,
   o.borderRadius("oval"),
   o.outline.default.focus
 ])}
 
   /* よく考えたらheight=32って定義が存在しないな... */
-  height: ${(p) => p.height}px;
+  height: ${(p) => p.$size === "M" ? 40 : 32}px;
 `;
-function styledProps(props) {
-  return {
-    ...props,
-    ...variantToProps(props.variant),
-    ...sizeToProps(props.size)
-  };
-}
-function variantToProps(variant) {
+function variantToBackgraund(variant) {
   switch (variant) {
     case "Overlay":
-      return { font: "text5", background: "surface4" };
+      return "surface4";
     case "Default":
-      return { font: "text2", background: "surface3" };
+      return "surface3";
     case "Primary":
-      return { font: "text5", background: "brand" };
+      return "brand";
     case "Navigation":
-      return { font: "text5", background: "surface6" };
+      return "surface6";
     case "Danger":
-      return { font: "text5", background: "assertive" };
+      return "assertive";
     default:
       return unreachable(variant);
   }
 }
-function sizeToProps(size) {
-  switch (size) {
-    case "S":
-      return {
-        height: 32,
-        padding: 16
-      };
-    case "M":
-      return {
-        height: 40,
-        padding: 24
-      };
+function variantToFont(variant) {
+  switch (variant) {
+    case "Overlay":
+      return "text5";
+    case "Default":
+      return "text2";
+    case "Primary":
+      return "text5";
+    case "Navigation":
+      return "text5";
+    case "Danger":
+      return "text5";
+    default:
+      return unreachable(variant);
   }
 }
 
@@ -322,7 +313,7 @@ var IconButton = (0, import_react3.forwardRef)(
   }
 );
 var IconButton_default = IconButton;
-var StyledIconButton = (0, import_styled_components5.default)(Clickable_default).attrs(styledProps2)`
+var StyledIconButton = (0, import_styled_components5.default)(Clickable_default).attrs(styledProps)`
   user-select: none;
 
   width: ${(p) => p.width}px;
@@ -339,14 +330,14 @@ var StyledIconButton = (0, import_styled_components5.default)(Clickable_default)
   o.outline.default.focus
 ])}
 `;
-function styledProps2(props) {
+function styledProps(props) {
   return {
     ...props,
-    ...variantToProps2(props.variant),
-    ...sizeToProps2(props.size)
+    ...variantToProps(props.variant),
+    ...sizeToProps(props.size)
   };
 }
-function variantToProps2(variant) {
+function variantToProps(variant) {
   switch (variant) {
     case "Default":
       return { font: "text3", background: "transparent" };
@@ -354,7 +345,7 @@ function variantToProps2(variant) {
       return { font: "text5", background: "surface4" };
   }
 }
-function sizeToProps2(size) {
+function sizeToProps(size) {
   switch (size) {
     case "XS":
       return {