@tamagui/button 1.26.0 → 1.27.0-1684163004699

package/dist/esm/Button.test.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Button.test.tsx"],
-  "mappings": "AAAA,QAAQ,IAAI,iBAAiB;AAE7B,SAAS,+BAA+B;AACxC,SAA0B,qBAAqB;AAE/C,SAAS,UAAU,QAAQ,YAAY;AAIvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,IAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
+  "mappings": "AAAA,QAAQ,IAAI,iBAAiB;AAE7B,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,UAAU,QAAQ,YAAY;AAEvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,IAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
   "names": []
 }

package/dist/esm/base.js

@@ -0,0 +1,5 @@
+import { Button } from "./Button";
+export {
+  Button
+};
+//# sourceMappingURL=base.js.map

package/dist/esm/base.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/base.ts"],
+  "mappings": "AACA,SAAS,cAAc;",
+  "names": []
+}

package/dist/esm/{Button.mjs → themed.js}

@@ -3,29 +3,26 @@ import { createContextScope } from "@tamagui/create-context";
 import { getFontSize } from "@tamagui/font-size";
 import { getButtonSized } from "@tamagui/get-button-sized";
 import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
-import { ThemeableStack } from "@tamagui/stacks";
-import { SizableText, wrapChildrenInText } from "@tamagui/text";
+import { wrapChildrenInText } from "@tamagui/text";
 import {
   ButtonNestingContext,
+  getConfig,
   getVariableValue,
   isRSC,
   spacedChildren,
   styled,
-  useProps,
+  useMediaPropsActive,
   withStaticProperties
 } from "@tamagui/web";
+import { useCallback, useContext, useEffect, useState } from "react";
 import {
-  forwardRef,
-  useCallback,
-  useContext,
-  useEffect,
-  useState
-} from "react";
-const BUTTON_NAME = "Button";
-const ButtonFrame = styled(ThemeableStack, {
+  BUTTON_ICON_NAME,
+  BUTTON_NAME,
+  BUTTON_TEXT_NAME,
+  Button as BaseButton
+} from "./Button";
+const ButtonFrame = styled(BaseButton, {
   name: BUTTON_NAME,
-  tag: "button",
-  focusable: true,
   variants: {
     unstyled: {
       false: {
@@ -39,15 +36,11 @@ const ButtonFrame = styled(ThemeableStack, {
         pressTheme: true,
         backgrounded: true,
         borderWidth: 1,
-        borderColor: "transparent",
+        borderColor: "$borderColor",
         pressStyle: {
-          borderColor: "transparent"
-        },
-        hoverStyle: {
-          borderColor: "transparent"
+          borderColor: "$borderColorPress"
         },
         focusStyle: {
-          borderColor: "$borderColorFocus",
           outlineColor: "$borderColorFocus",
           outlineStyle: "solid",
           outlineWidth: 2
@@ -74,8 +67,9 @@ const ButtonFrame = styled(ThemeableStack, {
     unstyled: false
   }
 });
-const BUTTON_TEXT_NAME = "ButtonText";
-const ButtonTextFrame = styled(SizableText, {
+const [createButtonContext, createButtonScope] = createContextScope(BUTTON_NAME);
+const [ButtonProvider, useButtonContext] = createButtonContext("Button");
+const ButtonTextFrame = styled(BaseButton.Text, {
   name: BUTTON_TEXT_NAME,
   variants: {
     unstyled: {
@@ -94,21 +88,16 @@ const ButtonTextFrame = styled(SizableText, {
     unstyled: false
   }
 });
-const [createButtonContext, createButtonScope] = createContextScope("Button");
-const [ButtonProvider, useButtonContext] = createButtonContext("Button");
-const ButtonTextComponent = ButtonTextFrame.extractable(
-  forwardRef(
-    (props, ref) => {
-      const context = useButtonContext(BUTTON_TEXT_NAME, props.__scopeButton);
-      useEffect(() => {
-        const unregister = context.registerButtonText();
-        return () => unregister();
-      }, [context.registerButtonText]);
-      return /* @__PURE__ */ jsx(ButtonTextFrame, { size: props.size ?? context.size, ...props, ref });
-    }
-  )
+const ButtonText = ButtonTextFrame.styleable(
+  (props, ref) => {
+    const context = useButtonContext(BUTTON_TEXT_NAME, props.__scopeButton);
+    useEffect(() => {
+      const unregister = context.registerButtonText();
+      return () => unregister();
+    }, [context.registerButtonText]);
+    return /* @__PURE__ */ jsx(ButtonTextFrame, { ref, color: context.color, size: context.size, ...props, children: props.children });
+  }
 );
-const BUTTON_ICON_NAME = "ButtonIcon";
 const ButtonIcon = (props) => {
   const { children, scaleIcon = 1 } = props;
   const context = useButtonContext(BUTTON_ICON_NAME, props.__scopeButton);
@@ -118,42 +107,39 @@ const ButtonIcon = (props) => {
   const getThemedIcon = useGetThemedIcon({ size: iconSize, color });
   return getThemedIcon(children);
 };
-const ButtonComponent = ButtonFrame.styleable(function Button(props, ref) {
-  const { props: buttonProps } = useButton(props);
-  const [buttonTextCount, setButtonTextCount] = useState(0);
-  const registerButtonText = useCallback(() => {
-    setButtonTextCount((prev) => prev + 1);
-    return () => setButtonTextCount((prev) => prev - 1);
-  }, [setButtonTextCount]);
-  const hasTextComponent = buttonTextCount > 0;
-  return /* @__PURE__ */ jsx(
-    ButtonProvider,
-    {
-      scope: props.__scopeButton,
-      color: props.color,
-      hasTextComponent,
-      size: props.size ?? "$true",
-      registerButtonText,
-      children: /* @__PURE__ */ jsx(ButtonFrame, { ...hasTextComponent ? props : buttonProps, ref })
-    }
-  );
-});
-const buttonStaticConfig = {
-  inlineProps: /* @__PURE__ */ new Set([
-    // text props go here (can't really optimize them, but we never fully extract button anyway)
-    // may be able to remove this entirely, as the compiler / runtime have gotten better
-    "color",
-    "fontWeight",
-    "fontSize",
-    "fontFamily",
-    "fontStyle",
-    "letterSpacing",
-    "textAlign",
-    "unstyled"
-  ])
-};
-const Button2 = withStaticProperties(ButtonComponent, {
-  Text: ButtonTextComponent,
+const ButtonComponent = ButtonFrame.styleable(
+  (props, ref) => {
+    const buttonApi = props.forceButtonApi ?? getConfig().buttonApi ?? "mixed";
+    const { props: buttonProps } = useButton(props);
+    const [buttonTextCount, setButtonTextCount] = useState(0);
+    const registerButtonText = useCallback(() => {
+      if (buttonApi === "simple") {
+        console.warn(
+          "You are using Button.Text with simple button API. Either remove Button.Text or use either `buttonApi: composable` or `mixed` in your tamagui config."
+        );
+      }
+      if (buttonApi === "composable")
+        return () => {
+        };
+      setButtonTextCount((prev) => prev + 1);
+      return () => setButtonTextCount((prev) => prev - 1);
+    }, [setButtonTextCount]);
+    const usesComposableApi = buttonApi === "composable" || buttonApi === "mixed" && buttonTextCount > 0;
+    return /* @__PURE__ */ jsx(
+      ButtonProvider,
+      {
+        scope: props.__scopeButton,
+        size: props.size ?? "$true",
+        color: props.color,
+        usesComposableApi,
+        registerButtonText,
+        children: /* @__PURE__ */ jsx(ButtonFrame, { unstyled: props.unstyled ?? false, ref, ...buttonProps })
+      }
+    );
+  }
+);
+const Button = withStaticProperties(ButtonComponent, {
+  Text: ButtonText,
   Icon: ButtonIcon
 });
 function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame }) {
@@ -176,12 +162,12 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
     fontFamily,
     fontStyle,
     textAlign,
+    unstyled = false,
     textProps,
     ...rest
   } = propsIn;
-  const hasUnstyled = typeof propsIn.unstyled !== "undefined";
   const isNested = isRSC ? false : useContext(ButtonNestingContext);
-  const propsActive = useProps(propsIn);
+  const propsActive = useMediaPropsActive(propsIn);
   const size = propsActive.size || "$true";
   const iconSize = (typeof size === "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
   const getThemedIcon = useGetThemedIcon({ size: iconSize, color });
@@ -190,8 +176,8 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
   const contents = wrapChildrenInText(
     Text,
     propsActive,
-    Text === ButtonTextFrame && hasUnstyled ? {
-      unstyled: propsIn.unstyled
+    Text === ButtonTextFrame ? {
+      unstyled
     } : void 0
   );
   const inner = spacedChildren({
@@ -226,12 +212,26 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
     props
   };
 }
+const buttonStaticConfig = {
+  inlineProps: /* @__PURE__ */ new Set([
+    // text props go here (can't really optimize them, but we never fully extract button anyway)
+    // may be able to remove this entirely, as the compiler / runtime have gotten better
+    "color",
+    "fontWeight",
+    "fontSize",
+    "fontFamily",
+    "fontStyle",
+    "letterSpacing",
+    "textAlign",
+    "unstyled"
+  ])
+};
 export {
-  Button2 as Button,
+  Button,
   ButtonFrame,
   ButtonTextFrame as ButtonText,
   buttonStaticConfig,
   createButtonScope,
   useButton
 };
-//# sourceMappingURL=Button.mjs.map
+//# sourceMappingURL=themed.js.map

package/dist/esm/themed.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/themed.tsx"],
+  "mappings": "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",
+  "names": []
+}

package/dist/jsx/Button.js

@@ -1,4 +1,3 @@
-import { createContextScope } from "@tamagui/create-context";
 import { getFontSize } from "@tamagui/font-size";
 import { getButtonSized } from "@tamagui/get-button-sized";
 import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
@@ -6,6 +5,7 @@ import { ThemeableStack } from "@tamagui/stacks";
 import { SizableText, wrapChildrenInText } from "@tamagui/text";
 import {
   ButtonNestingContext,
+  createStyledContext,
   getVariableValue,
   isRSC,
   spacedChildren,
@@ -13,17 +13,15 @@ import {
   useProps,
   withStaticProperties
 } from "@tamagui/web";
-import {
-  forwardRef,
-  useCallback,
-  useContext,
-  useEffect,
-  useState
-} from "react";
+import { useContext } from "react";
+const ButtonContext = createStyledContext({
+  size: "$true"
+});
 const BUTTON_NAME = "Button";
 const ButtonFrame = styled(ThemeableStack, {
   name: BUTTON_NAME,
   tag: "button",
+  context: ButtonContext,
   focusable: true,
   variants: {
     unstyled: {
@@ -38,15 +36,11 @@ const ButtonFrame = styled(ThemeableStack, {
         pressTheme: true,
         backgrounded: true,
         borderWidth: 1,
-        borderColor: "transparent",
+        borderColor: "$borderColor",
         pressStyle: {
-          borderColor: "transparent"
-        },
-        hoverStyle: {
-          borderColor: "transparent"
+          borderColor: "$borderColorPress"
         },
         focusStyle: {
-          borderColor: "$borderColorFocus",
           outlineColor: "$borderColorFocus",
           outlineStyle: "solid",
           outlineWidth: 2
@@ -73,9 +67,9 @@ const ButtonFrame = styled(ThemeableStack, {
     unstyled: false
   }
 });
-const BUTTON_TEXT_NAME = "ButtonText";
-const ButtonTextFrame = styled(SizableText, {
-  name: BUTTON_TEXT_NAME,
+const ButtonText = styled(SizableText, {
+  name: "ButtonText",
+  context: ButtonContext,
   variants: {
     unstyled: {
       false: {
@@ -93,45 +87,16 @@ const ButtonTextFrame = styled(SizableText, {
     unstyled: false
   }
 });
-const [createButtonContext, createButtonScope] = createContextScope("Button");
-const [ButtonProvider, useButtonContext] = createButtonContext("Button");
-const ButtonTextComponent = ButtonTextFrame.extractable(
-  forwardRef(
-    (props, ref) => {
-      const context = useButtonContext(BUTTON_TEXT_NAME, props.__scopeButton);
-      useEffect(() => {
-        const unregister = context.registerButtonText();
-        return () => unregister();
-      }, [context.registerButtonText]);
-      return <ButtonTextFrame size={props.size ?? context.size} {...props} ref={ref} />;
-    }
-  )
-);
-const BUTTON_ICON_NAME = "ButtonIcon";
 const ButtonIcon = (props) => {
   const { children, scaleIcon = 1 } = props;
-  const context = useButtonContext(BUTTON_ICON_NAME, props.__scopeButton);
-  const size = context.size;
-  const color = context.color;
+  const { size, color } = useContext(ButtonContext);
   const iconSize = (typeof size === "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
   const getThemedIcon = useGetThemedIcon({ size: iconSize, color });
   return getThemedIcon(children);
 };
 const ButtonComponent = ButtonFrame.styleable(function Button(props, ref) {
   const { props: buttonProps } = useButton(props);
-  const [buttonTextCount, setButtonTextCount] = useState(0);
-  const registerButtonText = useCallback(() => {
-    setButtonTextCount((prev) => prev + 1);
-    return () => setButtonTextCount((prev) => prev - 1);
-  }, [setButtonTextCount]);
-  const hasTextComponent = buttonTextCount > 0;
-  return <ButtonProvider
-    scope={props.__scopeButton}
-    color={props.color}
-    hasTextComponent={hasTextComponent}
-    size={props.size ?? "$true"}
-    registerButtonText={registerButtonText}
-  ><ButtonFrame {...hasTextComponent ? props : buttonProps} ref={ref} /></ButtonProvider>;
+  return <ButtonFrame {...buttonProps} ref={ref} />;
 });
 const buttonStaticConfig = {
   inlineProps: /* @__PURE__ */ new Set([
@@ -148,10 +113,10 @@ const buttonStaticConfig = {
   ])
 };
 const Button2 = withStaticProperties(ButtonComponent, {
-  Text: ButtonTextComponent,
+  Text: ButtonText,
   Icon: ButtonIcon
 });
-function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame }) {
+function useButton(propsIn, { Text = ButtonText } = { Text: ButtonText }) {
   const {
     children,
     icon,
@@ -185,7 +150,7 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
   const contents = wrapChildrenInText(
     Text,
     propsActive,
-    Text === ButtonTextFrame && hasUnstyled ? {
+    Text === ButtonText && hasUnstyled ? {
       unstyled: propsIn.unstyled
     } : void 0
   );
@@ -223,10 +188,11 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
 }
 export {
   Button2 as Button,
+  ButtonContext,
   ButtonFrame,
-  ButtonTextFrame as ButtonText,
+  ButtonIcon,
+  ButtonText,
   buttonStaticConfig,
-  createButtonScope,
   useButton
 };
 //# sourceMappingURL=Button.js.map

package/dist/jsx/Button.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Button.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["Button"]
 }

package/dist/jsx/Button.mjs

@@ -1,4 +1,3 @@
-import { createContextScope } from "@tamagui/create-context";
 import { getFontSize } from "@tamagui/font-size";
 import { getButtonSized } from "@tamagui/get-button-sized";
 import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
@@ -6,6 +5,7 @@ import { ThemeableStack } from "@tamagui/stacks";
 import { SizableText, wrapChildrenInText } from "@tamagui/text";
 import {
   ButtonNestingContext,
+  createStyledContext,
   getVariableValue,
   isRSC,
   spacedChildren,
@@ -13,17 +13,15 @@ import {
   useProps,
   withStaticProperties
 } from "@tamagui/web";
-import {
-  forwardRef,
-  useCallback,
-  useContext,
-  useEffect,
-  useState
-} from "react";
+import { useContext } from "react";
+const ButtonContext = createStyledContext({
+  size: "$true"
+});
 const BUTTON_NAME = "Button";
 const ButtonFrame = styled(ThemeableStack, {
   name: BUTTON_NAME,
   tag: "button",
+  context: ButtonContext,
   focusable: true,
   variants: {
     unstyled: {
@@ -38,15 +36,11 @@ const ButtonFrame = styled(ThemeableStack, {
         pressTheme: true,
         backgrounded: true,
         borderWidth: 1,
-        borderColor: "transparent",
+        borderColor: "$borderColor",
         pressStyle: {
-          borderColor: "transparent"
-        },
-        hoverStyle: {
-          borderColor: "transparent"
+          borderColor: "$borderColorPress"
         },
         focusStyle: {
-          borderColor: "$borderColorFocus",
           outlineColor: "$borderColorFocus",
           outlineStyle: "solid",
           outlineWidth: 2
@@ -73,9 +67,9 @@ const ButtonFrame = styled(ThemeableStack, {
     unstyled: false
   }
 });
-const BUTTON_TEXT_NAME = "ButtonText";
-const ButtonTextFrame = styled(SizableText, {
-  name: BUTTON_TEXT_NAME,
+const ButtonText = styled(SizableText, {
+  name: "ButtonText",
+  context: ButtonContext,
   variants: {
     unstyled: {
       false: {
@@ -93,45 +87,16 @@ const ButtonTextFrame = styled(SizableText, {
     unstyled: false
   }
 });
-const [createButtonContext, createButtonScope] = createContextScope("Button");
-const [ButtonProvider, useButtonContext] = createButtonContext("Button");
-const ButtonTextComponent = ButtonTextFrame.extractable(
-  forwardRef(
-    (props, ref) => {
-      const context = useButtonContext(BUTTON_TEXT_NAME, props.__scopeButton);
-      useEffect(() => {
-        const unregister = context.registerButtonText();
-        return () => unregister();
-      }, [context.registerButtonText]);
-      return <ButtonTextFrame size={props.size ?? context.size} {...props} ref={ref} />;
-    }
-  )
-);
-const BUTTON_ICON_NAME = "ButtonIcon";
 const ButtonIcon = (props) => {
   const { children, scaleIcon = 1 } = props;
-  const context = useButtonContext(BUTTON_ICON_NAME, props.__scopeButton);
-  const size = context.size;
-  const color = context.color;
+  const { size, color } = useContext(ButtonContext);
   const iconSize = (typeof size === "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
   const getThemedIcon = useGetThemedIcon({ size: iconSize, color });
   return getThemedIcon(children);
 };
 const ButtonComponent = ButtonFrame.styleable(function Button(props, ref) {
   const { props: buttonProps } = useButton(props);
-  const [buttonTextCount, setButtonTextCount] = useState(0);
-  const registerButtonText = useCallback(() => {
-    setButtonTextCount((prev) => prev + 1);
-    return () => setButtonTextCount((prev) => prev - 1);
-  }, [setButtonTextCount]);
-  const hasTextComponent = buttonTextCount > 0;
-  return <ButtonProvider
-    scope={props.__scopeButton}
-    color={props.color}
-    hasTextComponent={hasTextComponent}
-    size={props.size ?? "$true"}
-    registerButtonText={registerButtonText}
-  ><ButtonFrame {...hasTextComponent ? props : buttonProps} ref={ref} /></ButtonProvider>;
+  return <ButtonFrame {...buttonProps} ref={ref} />;
 });
 const buttonStaticConfig = {
   inlineProps: /* @__PURE__ */ new Set([
@@ -148,10 +113,10 @@ const buttonStaticConfig = {
   ])
 };
 const Button2 = withStaticProperties(ButtonComponent, {
-  Text: ButtonTextComponent,
+  Text: ButtonText,
   Icon: ButtonIcon
 });
-function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame }) {
+function useButton(propsIn, { Text = ButtonText } = { Text: ButtonText }) {
   const {
     children,
     icon,
@@ -185,7 +150,7 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
   const contents = wrapChildrenInText(
     Text,
     propsActive,
-    Text === ButtonTextFrame && hasUnstyled ? {
+    Text === ButtonText && hasUnstyled ? {
       unstyled: propsIn.unstyled
     } : void 0
   );
@@ -223,10 +188,11 @@ function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame
 }
 export {
   Button2 as Button,
+  ButtonContext,
   ButtonFrame,
-  ButtonTextFrame as ButtonText,
+  ButtonIcon,
+  ButtonText,
   buttonStaticConfig,
-  createButtonScope,
   useButton
 };
 //# sourceMappingURL=Button.mjs.map

package/dist/jsx/Button.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Button.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["Button"]
 }

package/dist/jsx/Button.test.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Button.test.tsx"],
-  "mappings": "AAAA,QAAQ,IAAI,iBAAiB;AAE7B,SAAS,+BAA+B;AACxC,SAA0B,qBAAqB;AAE/C,SAAS,UAAU,QAAQ,YAAY;AAIvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,IAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
+  "mappings": "AAAA,QAAQ,IAAI,iBAAiB;AAE7B,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,UAAU,QAAQ,YAAY;AAEvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,IAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
   "names": []
 }

package/dist/jsx/Button.test.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Button.test.tsx"],
-  "mappings": "AAAA,QAAQ,IAAI,iBAAiB;AAE7B,SAAS,+BAA+B;AACxC,SAA0B,qBAAqB;AAE/C,SAAS,UAAU,QAAQ,YAAY;AAIvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,IAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
+  "mappings": "AAAA,QAAQ,IAAI,iBAAiB;AAE7B,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,UAAU,QAAQ,YAAY;AAEvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,IAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
   "names": []
 }

package/dist/jsx/base.js

@@ -0,0 +1,5 @@
+import { Button } from "./Button";
+export {
+  Button
+};
+//# sourceMappingURL=base.js.map

package/dist/jsx/base.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/base.ts"],
+  "mappings": "AACA,SAAS,cAAc;",
+  "names": []
+}

package/dist/jsx/base.mjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/base.ts"],
+  "mappings": "AACA,SAAS,cAAc;",
+  "names": []
+}