@marigold/system 4.2.2 → 5.1.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Simplify, PolymorphicPropsWithRef, PolymorphicComponentWithRef, ComponentProps, KebabCase } from '@marigold/types';
+import { Simplify, PropsOf, PolymorphicComponent, HtmlProps, KebabCase } from '@marigold/types';
 import * as _theme_ui_css from '@theme-ui/css';
 import { ResponsiveStyleValue as ResponsiveStyleValue$1, ThemeUIStyleObject, ThemeUICSSObject, ThemeUICSSProperties, NestedScaleDict } from '@theme-ui/css';
 import * as react from 'react';
@@ -205,9 +205,7 @@ interface Theme {
     transitions?: Scale<CSS.Property.Transition>;
 }
 
-interface StyleProps extends Pick<CSSObject, 'display' | 'height' | 'width' | 'minWidth' | 'maxWidth' | 'position' | 'top' | 'bottom' | 'right' | 'left' | 'zIndex' | 'p' | 'px' | 'py' | 'pt' | 'pb' | 'pl' | 'pr' | 'm' | 'mx' | 'my' | 'mt' | 'mb' | 'ml' | 'mr' | 'flexDirection' | 'flexWrap' | 'flexShrink' | 'flexGrow' | 'alignItems' | 'justifyContent' | 'bg' | 'border' | 'borderRadius' | 'boxShadow' | 'opacity' | 'overflow' | 'transition'> {
-}
-interface BoxOwnProps extends StyleProps {
+interface BoxOwnProps {
     css?: CSSObject | CSSObject[];
     /**
      * Use to set base styles for the component
@@ -215,9 +213,9 @@ interface BoxOwnProps extends StyleProps {
      */
     __baseCSS?: CSSObject;
 }
-interface BoxProps extends PolymorphicPropsWithRef<BoxOwnProps, 'div'> {
+interface BoxProps extends PropsOf<typeof Box> {
 }
-declare const Box: PolymorphicComponentWithRef<BoxOwnProps, 'div'>;
+declare const Box: PolymorphicComponent<"div", BoxOwnProps>;
 
 type GlobalProps = {
     /**
@@ -231,7 +229,7 @@ type GlobalProps = {
 };
 declare const Global: ({ normalizeDocument, selector }: GlobalProps) => JSX.Element;
 
-interface SVGProps extends ComponentProps<'svg'> {
+interface SVGProps extends HtmlProps<'svg'> {
     size?: number | string | number[] | string[];
     css?: CSSObject;
 }
@@ -290,4 +288,4 @@ interface ThemeProviderProps<T extends Theme> {
 }
 declare function ThemeProvider<T extends Theme>({ theme, children, }: ThemeProviderProps<T>): JSX.Element;
 
-export { Box, BoxOwnProps, BoxProps, CSSObject, CSSProperties, ComponentState, ComponentStyleParts, ComponentStylesProps, Global, GlobalProps, ResponsiveStyleValue, SVG, SVGProps, Scale, ScaleValue, SizeScale, StateAttrKeyProps, StateAttrProps, StyleObject, StyleProps, Theme, ThemeComponentProps, ThemeExtension, ThemeExtensionsWithParts, ThemeProvider, ThemeProviderProps, UseStateProps, ZeroScale, ZeroSizeScale, __defaultTheme, useComponentStyles, useResponsiveValue, useStateProps, useTheme };
+export { Box, BoxOwnProps, BoxProps, CSSObject, CSSProperties, ComponentState, ComponentStyleParts, ComponentStylesProps, Global, GlobalProps, ResponsiveStyleValue, SVG, SVGProps, Scale, ScaleValue, SizeScale, StateAttrKeyProps, StateAttrProps, StyleObject, Theme, ThemeComponentProps, ThemeExtension, ThemeExtensionsWithParts, ThemeProvider, ThemeProviderProps, UseStateProps, ZeroScale, ZeroSizeScale, __defaultTheme, useComponentStyles, useResponsiveValue, useStateProps, useTheme };

package/dist/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -82,6 +86,7 @@ var pseudos = {
   "&:error": createteSelector([selector.self], state.error),
   "&:expanded": createteSelector([selector.self], state.expanded),
   "&:required": createteSelector([selector.self], state.required),
+  // Selector for elements that are part of a group
   "&:in-group": createteSelector(selector.grouped, state.none, selector.self),
   "&:hover-group": createteSelector(
     selector.grouped,
@@ -121,106 +126,21 @@ var transformPseudos = (styles) => {
 };
 
 // src/components/Box/Box.tsx
-var createThemedStyle = ({ __baseCSS, styles, css }) => (theme) => {
+var createThemedStyle = ({ __baseCSS, css }) => (theme) => {
   const themedStyles = import_deepmerge.default.all([
     (0, import_css.css)(__baseCSS)(theme),
-    (0, import_css.css)(styles)(theme),
     ...Array.isArray(css) ? css.map((c) => (0, import_css.css)(c)(theme)) : [(0, import_css.css)(css)(theme)]
   ]);
   return transformPseudos(themedStyles);
 };
 var Box = (0, import_react.forwardRef)(
-  ({
-    as = "div",
-    children,
-    __baseCSS,
-    css,
-    display,
-    height,
-    width,
-    minWidth,
-    maxWidth,
-    position,
-    top,
-    bottom,
-    right,
-    left,
-    zIndex,
-    p,
-    px,
-    py,
-    pt,
-    pb,
-    pl,
-    pr,
-    m,
-    mx,
-    my,
-    mt,
-    mb,
-    ml,
-    mr,
-    flexDirection,
-    flexWrap,
-    flexShrink,
-    flexGrow,
-    alignItems,
-    justifyContent,
-    bg,
-    border,
-    borderRadius,
-    boxShadow,
-    opacity,
-    overflow,
-    transition,
-    ...props
-  }, ref) => (0, import_react2.jsx)(
+  ({ as = "div", children, __baseCSS, css, ...props }, ref) => (0, import_react2.jsx)(
     as,
     {
       ...props,
       css: createThemedStyle({
         __baseCSS,
-        css,
-        styles: {
-          display,
-          height,
-          width,
-          minWidth,
-          maxWidth,
-          position,
-          top,
-          bottom,
-          right,
-          left,
-          zIndex,
-          p,
-          px,
-          py,
-          pt,
-          pb,
-          pl,
-          pr,
-          m,
-          mx,
-          my,
-          mt,
-          mb,
-          ml,
-          mr,
-          flexDirection,
-          flexWrap,
-          flexShrink,
-          flexGrow,
-          alignItems,
-          justifyContent,
-          bg,
-          border,
-          borderRadius,
-          boxShadow,
-          opacity,
-          overflow,
-          transition
-        }
+        css
       }),
       ref
     },
@@ -251,11 +171,7 @@ function ThemeProvider({
   theme,
   children
 }) {
-  return /* @__PURE__ */ import_react3.default.createElement(import_react4.ThemeProvider, {
-    theme
-  }, /* @__PURE__ */ import_react3.default.createElement(InternalContext.Provider, {
-    value: theme
-  }, children));
+  return /* @__PURE__ */ import_react3.default.createElement(import_react4.ThemeProvider, { theme }, /* @__PURE__ */ import_react3.default.createElement(InternalContext.Provider, { value: theme }, children));
 }
 
 // src/components/Global/normalize.ts
@@ -264,13 +180,25 @@ var document = {
     height: "100%"
   },
   html: {
+    /**
+     * Prevent Mobile Safari from zooming stuff ...
+     * Source: https://css-tricks.com/your-css-reset-needs-text-size-adjust-probably/
+     */
     textSizeAdjust: "none"
   },
   body: {
     lineHeight: 1.5,
     WebkitFontSmoothing: "antialiased",
+    /**
+     * We have to duplicate this here, since the "*" selector will not be
+     * applied to the body element if a custom `selector` is used.
+     */
     margin: 0
   },
+  /**
+   * CSS snippet and idea from:
+   * https://css-tricks.com/revisiting-prefers-reduced-motion-the-reduced-motion-media-query/
+   */
   "@media screen and (prefers-reduced-motion: reduce), (update: slow)": {
     "*": {
       animationDuration: "0.001ms !important",
@@ -296,6 +224,10 @@ var element = {
     display: "block",
     maxWidth: "100%"
   },
+  /**
+   * No `maxWidth` for SVG since this makes them responsive
+   * and will cause icons to shrink.
+   */
   svg: {
     display: "block",
     fill: "currentColor"
@@ -334,17 +266,23 @@ var element = {
 };
 
 // src/components/Global/Global.tsx
+var mergeRoot = ({ body, ...rest }) => typeof body === "object" ? {
+  ...body,
+  ...rest
+} : {
+  body,
+  ...rest
+};
 var Global = ({ normalizeDocument = true, selector: selector2 }) => {
   const { css, theme } = useTheme();
   const rootStyles = css((theme == null ? void 0 : theme.root) || {});
   const styles = [
     normalizeDocument ? document : {},
+    // Prefix normalization and root styles with selector if provided.
     selector2 ? { [`:where(${selector2})`]: element } : element,
-    selector2 ? { [`:where(${selector2})`]: rootStyles } : rootStyles
+    selector2 ? { [`:where(${selector2})`]: mergeRoot(rootStyles) } : rootStyles
   ];
-  return /* @__PURE__ */ import_react5.default.createElement(import_react6.Global, {
-    styles
-  });
+  return /* @__PURE__ */ import_react5.default.createElement(import_react6.Global, { styles });
 };
 
 // src/components/SVG/SVG.tsx

package/dist/index.mjs

@@ -42,6 +42,7 @@ var pseudos = {
   "&:error": createteSelector([selector.self], state.error),
   "&:expanded": createteSelector([selector.self], state.expanded),
   "&:required": createteSelector([selector.self], state.required),
+  // Selector for elements that are part of a group
   "&:in-group": createteSelector(selector.grouped, state.none, selector.self),
   "&:hover-group": createteSelector(
     selector.grouped,
@@ -81,106 +82,21 @@ var transformPseudos = (styles) => {
 };
 
 // src/components/Box/Box.tsx
-var createThemedStyle = ({ __baseCSS, styles, css }) => (theme) => {
+var createThemedStyle = ({ __baseCSS, css }) => (theme) => {
   const themedStyles = merge.all([
     transformStyleObject(__baseCSS)(theme),
-    transformStyleObject(styles)(theme),
     ...Array.isArray(css) ? css.map((c) => transformStyleObject(c)(theme)) : [transformStyleObject(css)(theme)]
   ]);
   return transformPseudos(themedStyles);
 };
 var Box = forwardRef(
-  ({
-    as = "div",
-    children,
-    __baseCSS,
-    css,
-    display,
-    height,
-    width,
-    minWidth,
-    maxWidth,
-    position,
-    top,
-    bottom,
-    right,
-    left,
-    zIndex,
-    p,
-    px,
-    py,
-    pt,
-    pb,
-    pl,
-    pr,
-    m,
-    mx,
-    my,
-    mt,
-    mb,
-    ml,
-    mr,
-    flexDirection,
-    flexWrap,
-    flexShrink,
-    flexGrow,
-    alignItems,
-    justifyContent,
-    bg,
-    border,
-    borderRadius,
-    boxShadow,
-    opacity,
-    overflow,
-    transition,
-    ...props
-  }, ref) => jsx(
+  ({ as = "div", children, __baseCSS, css, ...props }, ref) => jsx(
     as,
     {
       ...props,
       css: createThemedStyle({
         __baseCSS,
-        css,
-        styles: {
-          display,
-          height,
-          width,
-          minWidth,
-          maxWidth,
-          position,
-          top,
-          bottom,
-          right,
-          left,
-          zIndex,
-          p,
-          px,
-          py,
-          pt,
-          pb,
-          pl,
-          pr,
-          m,
-          mx,
-          my,
-          mt,
-          mb,
-          ml,
-          mr,
-          flexDirection,
-          flexWrap,
-          flexShrink,
-          flexGrow,
-          alignItems,
-          justifyContent,
-          bg,
-          border,
-          borderRadius,
-          boxShadow,
-          opacity,
-          overflow,
-          transition
-        }
+        css
       }),
       ref
     },
@@ -218,11 +134,7 @@ function ThemeProvider({
   theme,
   children
 }) {
-  return /* @__PURE__ */ React.createElement(EmotionProvider, {
-    theme
-  }, /* @__PURE__ */ React.createElement(InternalContext.Provider, {
-    value: theme
-  }, children));
+  return /* @__PURE__ */ React.createElement(EmotionProvider, { theme }, /* @__PURE__ */ React.createElement(InternalContext.Provider, { value: theme }, children));
 }
 
 // src/components/Global/normalize.ts
@@ -231,13 +143,25 @@ var document = {
     height: "100%"
   },
   html: {
+    /**
+     * Prevent Mobile Safari from zooming stuff ...
+     * Source: https://css-tricks.com/your-css-reset-needs-text-size-adjust-probably/
+     */
     textSizeAdjust: "none"
   },
   body: {
     lineHeight: 1.5,
     WebkitFontSmoothing: "antialiased",
+    /**
+     * We have to duplicate this here, since the "*" selector will not be
+     * applied to the body element if a custom `selector` is used.
+     */
     margin: 0
   },
+  /**
+   * CSS snippet and idea from:
+   * https://css-tricks.com/revisiting-prefers-reduced-motion-the-reduced-motion-media-query/
+   */
   "@media screen and (prefers-reduced-motion: reduce), (update: slow)": {
     "*": {
       animationDuration: "0.001ms !important",
@@ -263,6 +187,10 @@ var element = {
     display: "block",
     maxWidth: "100%"
   },
+  /**
+   * No `maxWidth` for SVG since this makes them responsive
+   * and will cause icons to shrink.
+   */
   svg: {
     display: "block",
     fill: "currentColor"
@@ -301,17 +229,23 @@ var element = {
 };
 
 // src/components/Global/Global.tsx
+var mergeRoot = ({ body, ...rest }) => typeof body === "object" ? {
+  ...body,
+  ...rest
+} : {
+  body,
+  ...rest
+};
 var Global = ({ normalizeDocument = true, selector: selector2 }) => {
   const { css, theme } = useTheme();
   const rootStyles = css((theme == null ? void 0 : theme.root) || {});
   const styles = [
     normalizeDocument ? document : {},
+    // Prefix normalization and root styles with selector if provided.
     selector2 ? { [`:where(${selector2})`]: element } : element,
-    selector2 ? { [`:where(${selector2})`]: rootStyles } : rootStyles
+    selector2 ? { [`:where(${selector2})`]: mergeRoot(rootStyles) } : rootStyles
   ];
-  return /* @__PURE__ */ React2.createElement(EmotionGlobal, {
-    styles
-  });
+  return /* @__PURE__ */ React2.createElement(EmotionGlobal, { styles });
 };
 
 // src/components/SVG/SVG.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marigold/system",
-  "version": "4.2.2",
+  "version": "5.1.0",
   "description": "Marigold System Library",
   "license": "MIT",
   "keywords": [
@@ -26,12 +26,12 @@
     "directory": "packages/system"
   },
   "dependencies": {
-    "@emotion/react": "11.10.5",
+    "@emotion/react": "11.10.6",
     "@theme-ui/css": "0.15.4",
     "csstype": "3.1.1",
     "deepmerge": "^4.2.2",
     "react-fast-compare": "^3.2.0",
-    "@marigold/types": "0.5.7"
+    "@marigold/types": "1.0.0"
   },
   "peerDependencies": {
     "react": "16.x || 17.x || 18.x",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@babel/core": "7.20.12",
     "react": "18.2.0",
-    "tsup": "6.5.0",
+    "tsup": "6.6.3",
     "@marigold/tsconfig": "0.4.0"
   },
   "scripts": {