@ttoss/ui 0.8.5 → 1.2.0

package/dist/esm/index.js

@@ -1,11 +1,40 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+
 // tsup.inject.js
 import * as React from "react";
 
+// src/index.ts
+import * as color from "@theme-ui/color";
+import { Themed } from "@theme-ui/mdx";
+
 // src/theme/ThemeProvider.tsx
-import { ThemeProvider as ThemeUiProvider } from "@theme-ui/core";
+import { Global } from "@emotion/react";
+import {
+  ThemeProvider as ThemeUiProvider,
+  merge
+} from "@theme-ui/core";
+import * as React2 from "react";
 
-// src/theme/theme.ts
-var theme = {
+// src/theme/defaultTheme.ts
+var defaultTheme = {
   colors: {
     text: "#000",
     background: "#fff",
@@ -13,41 +42,86 @@ var theme = {
     secondary: "#639",
     gray: "#555"
   },
+  space: [0, 4, 8, 16, 32, 64, 128, 256, 512],
+  styles: {
+    a: {
+      color: "primary",
+      textDecoration: "underline",
+      cursor: "pointer"
+    }
+  },
   buttons: {
     primary: {
-      color: "background",
-      bg: "primary"
+      color: "white",
+      backgroundColor: "primary"
     },
     secondary: {
-      color: "background",
-      bg: "secondary"
-    },
-    gray: {
-      color: "background",
-      bg: "gray"
+      color: "white",
+      backgroundColor: "secondary"
+    }
+  },
+  cards: {
+    primary: {
+      backgroundColor: "background",
+      border: "1px solid black",
+      padding: [4, 5]
+    }
+  },
+  text: {
+    title: {
+      fontSize: [4, 5],
+      textAlign: "center"
     }
   }
 };
 
 // src/theme/ThemeProvider.tsx
-var ThemeProvider = ({ children }) => {
-  return /* @__PURE__ */ React.createElement(ThemeUiProvider, {
-    theme
-  }, children);
+var ThemeProvider = ({
+  children,
+  theme = {}
+}) => {
+  const mergedTheme = React2.useMemo(() => {
+    if (typeof theme === "function") {
+      return theme;
+    }
+    return merge(defaultTheme, theme);
+  }, [theme]);
+  return /* @__PURE__ */ React2.createElement(ThemeUiProvider, {
+    theme: mergedTheme
+  }, /* @__PURE__ */ React2.createElement(Global, {
+    styles: {
+      "*": {
+        margin: 0
+      }
+    }
+  }), children);
 };
 var ThemeProvider_default = ThemeProvider;
 
+// src/theme/useTheme.ts
+import { useThemeUI } from "@theme-ui/core";
+var useTheme = useThemeUI;
+
 // src/components/Box/Box.tsx
 import { Box } from "@theme-ui/components";
 
 // src/components/Button/Button.tsx
-import { Button } from "@theme-ui/components";
+import { Button as ButtonUi } from "@theme-ui/components";
+var Button = (props) => {
+  return /* @__PURE__ */ React.createElement(ButtonUi, __spreadProps(__spreadValues({}, props), {
+    sx: __spreadValues({ cursor: "pointer", padding: 2 }, props.sx)
+  }));
+};
+var Button_default = Button;
+
+// src/components/Card/Card.tsx
+import { Card } from "@theme-ui/components";
 
 // src/components/Flex/Flex.tsx
 import { Flex } from "@theme-ui/components";
 
 // src/components/FormField/FormField.tsx
-import * as React2 from "react";
+import * as React3 from "react";
 
 // src/components/Label/Label.tsx
 import { Label } from "@theme-ui/components";
@@ -66,11 +140,11 @@ var FormField = ({ children, label, error }) => {
     }
     return [];
   })();
-  return /* @__PURE__ */ React2.createElement(Box, null, /* @__PURE__ */ React2.createElement(Label, {
+  return /* @__PURE__ */ React3.createElement(Box, null, /* @__PURE__ */ React3.createElement(Label, {
     sx: { display: "flex", flexDirection: "column" }
-  }, label && /* @__PURE__ */ React2.createElement(Text, {
+  }, label && /* @__PURE__ */ React3.createElement(Text, {
     as: "span"
-  }, label), children), errorAsArray.map((err) => /* @__PURE__ */ React2.createElement(Text, {
+  }, label), children), errorAsArray.map((err) => /* @__PURE__ */ React3.createElement(Text, {
     key: err,
     as: "span",
     variant: "error"
@@ -83,13 +157,21 @@ import { Image } from "@theme-ui/components";
 
 // src/components/Input/Input.tsx
 import { Input } from "@theme-ui/components";
+
+// src/components/Link/Link.tsx
+import { Link } from "@theme-ui/components";
 export {
   Box,
-  Button,
+  Button_default as Button,
+  Card,
   Flex,
   FormField_default as FormField,
   Image,
   Input,
+  Link,
   Text,
-  ThemeProvider_default as ThemeProvider
+  ThemeProvider_default as ThemeProvider,
+  Themed,
+  color,
+  useTheme
 };

package/dist/index.d.ts

@@ -1,17 +1,24 @@
-import { Theme } from '@theme-ui/core';
-export { Box, BoxProps, Button, ButtonProps, Flex, FlexProps, Image, ImageProps, Input, InputProps, Text, TextProps } from '@theme-ui/components';
-import * as React$1 from 'react';
+import * as color from '@theme-ui/color';
+export { color };
+import * as _theme_ui_core from '@theme-ui/core';
+import { ThemeProviderProps } from '@theme-ui/core';
+export { Theme, ThemeProviderProps } from '@theme-ui/core';
+export { Themed } from '@theme-ui/mdx';
+import * as React from 'react';
+import { ButtonProps } from '@theme-ui/components';
+export { Box, BoxProps, ButtonProps, Card, CardProps, Flex, FlexProps, Image, ImageProps, Input, InputProps, Link, LinkProps, Text, TextProps } from '@theme-ui/components';
 
-declare type ThemeProviderProps = {
-    theme?: Theme | ((outerTheme: Theme) => Theme);
-};
-declare const ThemeProvider: React.FC<ThemeProviderProps>;
+declare const ThemeProvider: React.FC<Partial<ThemeProviderProps>>;
+
+declare const useTheme: () => _theme_ui_core.ThemeUIContextValue;
+
+declare const Button: (props: ButtonProps) => JSX.Element;
 
 declare type FormFieldProps = {
-    children?: React$1.ReactNode;
+    children?: React.ReactNode;
     label?: string;
     error?: string[] | string;
 };
 declare const FormField: ({ children, label, error }: FormFieldProps) => JSX.Element;
 
-export { FormField, FormFieldProps, ThemeProvider, ThemeProviderProps };
+export { Button, FormField, FormFieldProps, ThemeProvider, useTheme };

package/dist/index.js

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -30,23 +47,34 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
 var src_exports = {};
 __export(src_exports, {
   Box: () => import_components.Box,
-  Button: () => import_components2.Button,
-  Flex: () => import_components3.Flex,
+  Button: () => Button_default,
+  Card: () => import_components3.Card,
+  Flex: () => import_components4.Flex,
   FormField: () => FormField_default,
-  Image: () => import_components6.Image,
-  Input: () => import_components7.Input,
-  Text: () => import_components5.Text,
-  ThemeProvider: () => ThemeProvider_default
+  Image: () => import_components7.Image,
+  Input: () => import_components8.Input,
+  Link: () => import_components9.Link,
+  Text: () => import_components6.Text,
+  ThemeProvider: () => ThemeProvider_default,
+  Themed: () => import_mdx.Themed,
+  color: () => color,
+  useTheme: () => useTheme
 });
 
 // tsup.inject.js
 var React = __toESM(require("react"));
 
+// src/index.ts
+var color = __toESM(require("@theme-ui/color"));
+var import_mdx = require("@theme-ui/mdx");
+
 // src/theme/ThemeProvider.tsx
+var import_react = require("@emotion/react");
 var import_core = require("@theme-ui/core");
+var React2 = __toESM(require("react"));
 
-// src/theme/theme.ts
-var theme = {
+// src/theme/defaultTheme.ts
+var defaultTheme = {
   colors: {
     text: "#000",
     background: "#fff",
@@ -54,47 +82,92 @@ var theme = {
     secondary: "#639",
     gray: "#555"
   },
+  space: [0, 4, 8, 16, 32, 64, 128, 256, 512],
+  styles: {
+    a: {
+      color: "primary",
+      textDecoration: "underline",
+      cursor: "pointer"
+    }
+  },
   buttons: {
     primary: {
-      color: "background",
-      bg: "primary"
+      color: "white",
+      backgroundColor: "primary"
     },
     secondary: {
-      color: "background",
-      bg: "secondary"
-    },
-    gray: {
-      color: "background",
-      bg: "gray"
+      color: "white",
+      backgroundColor: "secondary"
+    }
+  },
+  cards: {
+    primary: {
+      backgroundColor: "background",
+      border: "1px solid black",
+      padding: [4, 5]
+    }
+  },
+  text: {
+    title: {
+      fontSize: [4, 5],
+      textAlign: "center"
     }
   }
 };
 
 // src/theme/ThemeProvider.tsx
-var ThemeProvider = ({ children }) => {
-  return /* @__PURE__ */ React.createElement(import_core.ThemeProvider, {
-    theme
-  }, children);
+var ThemeProvider = ({
+  children,
+  theme = {}
+}) => {
+  const mergedTheme = React2.useMemo(() => {
+    if (typeof theme === "function") {
+      return theme;
+    }
+    return (0, import_core.merge)(defaultTheme, theme);
+  }, [theme]);
+  return /* @__PURE__ */ React2.createElement(import_core.ThemeProvider, {
+    theme: mergedTheme
+  }, /* @__PURE__ */ React2.createElement(import_react.Global, {
+    styles: {
+      "*": {
+        margin: 0
+      }
+    }
+  }), children);
 };
 var ThemeProvider_default = ThemeProvider;
 
+// src/theme/useTheme.ts
+var import_core2 = require("@theme-ui/core");
+var useTheme = import_core2.useThemeUI;
+
 // src/components/Box/Box.tsx
 var import_components = require("@theme-ui/components");
 
 // src/components/Button/Button.tsx
 var import_components2 = require("@theme-ui/components");
+var Button = (props) => {
+  return /* @__PURE__ */ React.createElement(import_components2.Button, __spreadProps(__spreadValues({}, props), {
+    sx: __spreadValues({ cursor: "pointer", padding: 2 }, props.sx)
+  }));
+};
+var Button_default = Button;
 
-// src/components/Flex/Flex.tsx
+// src/components/Card/Card.tsx
 var import_components3 = require("@theme-ui/components");
 
+// src/components/Flex/Flex.tsx
+var import_components4 = require("@theme-ui/components");
+
 // src/components/FormField/FormField.tsx
-var React2 = __toESM(require("react"));
+var React3 = __toESM(require("react"));
 
 // src/components/Label/Label.tsx
-var import_components4 = require("@theme-ui/components");
+var import_components5 = require("@theme-ui/components");
 
 // src/components/Text/Text.tsx
-var import_components5 = require("@theme-ui/components");
+var import_components6 = require("@theme-ui/components");
 
 // src/components/FormField/FormField.tsx
 var FormField = ({ children, label, error }) => {
@@ -107,11 +180,11 @@ var FormField = ({ children, label, error }) => {
     }
     return [];
   })();
-  return /* @__PURE__ */ React2.createElement(import_components.Box, null, /* @__PURE__ */ React2.createElement(import_components4.Label, {
+  return /* @__PURE__ */ React3.createElement(import_components.Box, null, /* @__PURE__ */ React3.createElement(import_components5.Label, {
     sx: { display: "flex", flexDirection: "column" }
-  }, label && /* @__PURE__ */ React2.createElement(import_components5.Text, {
+  }, label && /* @__PURE__ */ React3.createElement(import_components6.Text, {
     as: "span"
-  }, label), children), errorAsArray.map((err) => /* @__PURE__ */ React2.createElement(import_components5.Text, {
+  }, label), children), errorAsArray.map((err) => /* @__PURE__ */ React3.createElement(import_components6.Text, {
     key: err,
     as: "span",
     variant: "error"
@@ -120,19 +193,27 @@ var FormField = ({ children, label, error }) => {
 var FormField_default = FormField;
 
 // src/components/Image/Image.tsx
-var import_components6 = require("@theme-ui/components");
+var import_components7 = require("@theme-ui/components");
 
 // src/components/Input/Input.tsx
-var import_components7 = require("@theme-ui/components");
+var import_components8 = require("@theme-ui/components");
+
+// src/components/Link/Link.tsx
+var import_components9 = require("@theme-ui/components");
 module.exports = __toCommonJS(src_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Box,
   Button,
+  Card,
   Flex,
   FormField,
   Image,
   Input,
+  Link,
   Text,
-  ThemeProvider
+  ThemeProvider,
+  Themed,
+  color,
+  useTheme
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/ui",
-  "version": "0.8.5",
+  "version": "1.2.0",
   "description": "Primitive layout, typographic, and other components for styling applications.",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -32,15 +32,19 @@
     "dev": "yarn workspace @ttoss/storybook run dev"
   },
   "dependencies": {
-    "@theme-ui/components": "^0.11.1",
-    "@theme-ui/core": "^0.11.1"
+    "@emotion/react": "^11",
+    "@emotion/styled": "^11",
+    "@theme-ui/color": "^0.13.1",
+    "@theme-ui/components": "^0.13.1",
+    "@theme-ui/core": "^0.13.1",
+    "@theme-ui/mdx": "^0.13.1"
   },
   "peerDependencies": {
-    "react": ">=16.8.0"
+    "react": ">=17.0.2"
   },
   "devDependencies": {
-    "@ttoss/config": "^0.8.5",
-    "@ttoss/test-utils": "^0.8.5"
+    "@ttoss/config": "^1.2.0",
+    "@ttoss/test-utils": "^1.2.0"
   },
-  "gitHead": "41243699cc8ed5eba265e6434ebefbb9d6d91d52"
+  "gitHead": "f86ec742bf1e8baec64c99ad5950835a6ff8b5c1"
 }

package/src/components/Button/Button.tsx

@@ -1,3 +1,13 @@
-export { Button as default } from '@theme-ui/components';
+import { Button as ButtonUi } from '@theme-ui/components';
 
-export type { ButtonProps } from '@theme-ui/components';
+import type { ButtonProps } from '@theme-ui/components';
+
+export type { ButtonProps };
+
+const Button = (props: ButtonProps) => {
+  return (
+    <ButtonUi {...props} sx={{ cursor: 'pointer', padding: 2, ...props.sx }} />
+  );
+};
+
+export default Button;

package/src/components/Card/Card.tsx

@@ -0,0 +1,3 @@
+export { Card as default } from '@theme-ui/components';
+
+export type { CardProps } from '@theme-ui/components';

package/src/components/Link/Link.tsx

@@ -0,0 +1,3 @@
+export { Link as default } from '@theme-ui/components';
+
+export type { LinkProps } from '@theme-ui/components';

package/src/index.ts

@@ -1,12 +1,17 @@
+export * as color from '@theme-ui/color';
+export type { Theme } from '@theme-ui/core';
+export { Themed } from '@theme-ui/mdx';
+
 export {
   default as ThemeProvider,
   ThemeProviderProps,
 } from './theme/ThemeProvider';
 
-export { default as Box } from './components/Box/Box';
-export type { BoxProps } from './components/Box/Box';
+export { useTheme } from './theme/useTheme';
 
+export { default as Box, BoxProps } from './components/Box/Box';
 export { default as Button, ButtonProps } from './components/Button/Button';
+export { default as Card, CardProps } from './components/Card/Card';
 export { default as Flex, FlexProps } from './components/Flex/Flex';
 export {
   default as FormField,
@@ -14,4 +19,5 @@ export {
 } from './components/FormField/FormField';
 export { default as Image, ImageProps } from './components/Image/Image';
 export { default as Input, InputProps } from './components/Input/Input';
+export { default as Link, LinkProps } from './components/Link/Link';
 export { default as Text, TextProps } from './components/Text/Text';

package/src/theme/ThemeProvider.spec.tsx

@@ -0,0 +1,74 @@
+import { renderHook } from '@ttoss/test-utils';
+
+import { defaultTheme } from './defaultTheme';
+import ThemeProvider from './ThemeProvider';
+import { useTheme } from './useTheme';
+
+test('should return default theme colors', () => {
+  const { result } = renderHook(() => useTheme(), {
+    wrapper: ThemeProvider,
+    initialProps: { theme: {} },
+  });
+
+  expect(result.current.theme.colors).toEqual(defaultTheme.colors);
+});
+
+test('should return new theme colors', () => {
+  const newColor = '#000';
+
+  const { result } = renderHook(() => useTheme(), {
+    wrapper: ThemeProvider,
+    initialProps: {
+      theme: {
+        colors: {
+          background: newColor,
+          text: newColor,
+          primary: newColor,
+          secondary: newColor,
+        },
+      },
+    },
+  });
+
+  expect(result.current.theme.colors?.background).toEqual(newColor);
+  expect(result.current.theme.colors?.text).toEqual(newColor);
+  expect(result.current.theme.colors?.primary).toEqual(newColor);
+  expect(result.current.theme.colors?.secondary).toEqual(newColor);
+});
+
+test('should pass variants', () => {
+  const authCard = {
+    backgroundColor: 'red',
+  };
+
+  const authLayout = {
+    backgroundColor: 'blue',
+  };
+
+  const variants = {
+    layout: {
+      auth: authLayout,
+    },
+    cards: {
+      auth: authCard,
+    },
+  };
+
+  const { result } = renderHook(() => useTheme(), {
+    wrapper: ThemeProvider,
+    initialProps: {
+      theme: {
+        colors: {},
+        ...variants,
+      },
+    },
+  });
+
+  expect(result.current.theme.cards).toEqual(
+    expect.objectContaining(variants.cards)
+  );
+
+  expect(result.current.theme.layout).toEqual(
+    expect.objectContaining(variants.layout)
+  );
+});

package/src/theme/ThemeProvider.tsx

@@ -1,15 +1,39 @@
-// import * as React from 'react';
+import { Global } from '@emotion/react';
+import {
+  ThemeProvider as ThemeUiProvider,
+  ThemeProviderProps,
+  merge,
+} from '@theme-ui/core';
+import * as React from 'react';
 
-import { ThemeProvider as ThemeUiProvider, Theme } from '@theme-ui/core';
+import { defaultTheme } from './defaultTheme';
 
-import { theme } from './theme';
+export type { ThemeProviderProps };
 
-export type ThemeProviderProps = {
-  theme?: Theme | ((outerTheme: Theme) => Theme);
-};
+const ThemeProvider: React.FC<Partial<ThemeProviderProps>> = ({
+  children,
+  theme = {},
+}) => {
+  const mergedTheme = React.useMemo(() => {
+    if (typeof theme === 'function') {
+      return theme;
+    }
+
+    return merge(defaultTheme, theme);
+  }, [theme]);
 
-const ThemeProvider: React.FC<ThemeProviderProps> = ({ children }) => {
-  return <ThemeUiProvider theme={theme}>{children}</ThemeUiProvider>;
+  return (
+    <ThemeUiProvider theme={mergedTheme}>
+      <Global
+        styles={{
+          '*': {
+            margin: 0,
+          },
+        }}
+      />
+      {children}
+    </ThemeUiProvider>
+  );
 };
 
 export default ThemeProvider;

package/src/theme/defaultTheme.ts

@@ -0,0 +1,42 @@
+import { Theme } from '@theme-ui/core';
+
+export const defaultTheme: Theme = {
+  colors: {
+    text: '#000',
+    background: '#fff',
+    primary: '#07c',
+    secondary: '#639',
+    gray: '#555',
+  },
+  space: [0, 4, 8, 16, 32, 64, 128, 256, 512],
+  styles: {
+    a: {
+      color: 'primary',
+      textDecoration: 'underline',
+      cursor: 'pointer',
+    },
+  },
+  buttons: {
+    primary: {
+      color: 'white',
+      backgroundColor: 'primary',
+    },
+    secondary: {
+      color: 'white',
+      backgroundColor: 'secondary',
+    },
+  },
+  cards: {
+    primary: {
+      backgroundColor: 'background',
+      border: '1px solid black',
+      padding: [4, 5],
+    },
+  },
+  text: {
+    title: {
+      fontSize: [4, 5],
+      textAlign: 'center',
+    },
+  },
+};

package/src/theme/useTheme.ts

@@ -0,0 +1,3 @@
+import { useThemeUI } from '@theme-ui/core';
+
+export const useTheme = useThemeUI;

package/src/theme/theme.ts

@@ -1,25 +0,0 @@
-import { Theme } from '@theme-ui/core';
-
-export const theme: Theme = {
-  colors: {
-    text: '#000',
-    background: '#fff',
-    primary: '#07c',
-    secondary: '#639',
-    gray: '#555',
-  },
-  buttons: {
-    primary: {
-      color: 'background',
-      bg: 'primary',
-    },
-    secondary: {
-      color: 'background',
-      bg: 'secondary',
-    },
-    gray: {
-      color: 'background',
-      bg: 'gray',
-    },
-  },
-};