@charcoal-ui/react 3.1.2-beta.6 → 3.3.0-beta.0

package/dist/index.esm.js

@@ -39,10 +39,11 @@ function CharcoalProvider({
   defaultTheme = themeMap[":root"],
   components = {},
   injectTokens = true,
-  children
+  children,
+  background
 }) {
   return /* @__PURE__ */ jsx2(SSRProvider, { children: /* @__PURE__ */ jsxs(ThemeProvider, { theme: defaultTheme, children: [
-    injectTokens && /* @__PURE__ */ jsx2(TokenInjector, { theme: themeMap }),
+    injectTokens && /* @__PURE__ */ jsx2(TokenInjector, { theme: themeMap, background }),
     /* @__PURE__ */ jsx2(ComponentAbstraction, { components, children: /* @__PURE__ */ jsx2(OverlayProvider, { children }) })
   ] }) });
 }
@@ -178,21 +179,17 @@ var Button2 = forwardRef3(function Button3({
     {
       ...rest,
       disabled,
-      variant,
-      size,
-      fullWidth: fixed,
+      $variant: variant,
+      $size: size,
+      $fullWidth: fixed,
       ref,
       children
     }
   );
 });
 var Button_default = Button2;
-var StyledButton = styled3(Clickable_default).withConfig({
-  shouldForwardProp(prop) {
-    return prop !== "fullWidth";
-  }
-}).attrs(styledProps)`
-  width: ${(p) => p.fullWidth ? "stretch" : "min-content"};
+var StyledButton = styled3(Clickable_default)`
+  width: ${(p) => p.$fullWidth ? "stretch" : "min-content"};
   display: inline-grid;
   align-items: center;
   justify-content: center;
@@ -201,53 +198,48 @@ var StyledButton = styled3(Clickable_default).withConfig({
   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[variantToBackground(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 variantToBackground(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);
   }
 }
 
@@ -262,7 +254,7 @@ var IconButton = forwardRef4(
   }
 );
 var IconButton_default = IconButton;
-var StyledIconButton = styled4(Clickable_default).attrs(styledProps2)`
+var StyledIconButton = styled4(Clickable_default).attrs(styledProps)`
   user-select: none;
 
   width: ${(p) => p.width}px;
@@ -279,14 +271,14 @@ var StyledIconButton = styled4(Clickable_default).attrs(styledProps2)`
   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" };
@@ -294,7 +286,7 @@ function variantToProps2(variant) {
       return { font: "text5", background: "surface4" };
   }
 }
-function sizeToProps2(size) {
+function sizeToProps(size) {
   switch (size) {
     case "XS":
       return {
@@ -1541,7 +1533,7 @@ var LoadingSpinnerRoot = styled13.div.attrs({ role: "progressbar" })`
   transparent ? o.bg.transparent : o.bg.background1
 ])}
 `;
-var scaleout = keyframes`
+var scaleOut = keyframes`
   from {
     transform: scale(0);
     opacity: 1;
@@ -1557,7 +1549,7 @@ var Icon2 = styled13.div.attrs({ role: "presentation" })`
   height: 1em;
   border-radius: 1em;
   background-color: currentColor;
-  animation: ${scaleout} 1s both ease-out;
+  animation: ${scaleOut} 1s both ease-out;
   animation-iteration-count: ${(p) => p.once ? 1 : "infinite"};
 
   &[data-reset-animation] {