@basic-ui/material 1.0.0-alpha.5 → 1.0.0-alpha.51

package/src/ThemeExplorer/index.ts

@@ -0,0 +1 @@
+export * from './ThemeBuilder';

package/src/ThemeExplorer/makeColorScheme.tsx

@@ -1,74 +1,111 @@
-import type { TonalPalette } from '@material/material-color-utilities';
-import { hexFromArgb } from '@material/material-color-utilities'; // eslint-disable-line import/no-unresolved
-
-export function makeColorScheme(opts: {
-  primary: TonalPalette;
-  secondary: TonalPalette;
-  tertiary: TonalPalette;
-  error: TonalPalette;
-  neutral: TonalPalette;
-  neutralVariant: TonalPalette;
-}) {
-  function c(palette: TonalPalette, tone: number) {
-    return hexFromArgb(palette.tone(tone));
-  }
-
-  return {
-    primary: c(opts.primary, 40),
-    secondary: c(opts.secondary, 40),
-    tertiary: c(opts.tertiary, 40),
-    error: c(opts.error, 40),
-    'primary-container': c(opts.primary, 90),
-    'secondary-container': c(opts.secondary, 90),
-    'tertiary-container': c(opts.tertiary, 90),
-    'error-container': c(opts.error, 90),
-    background: c(opts.neutral, 99),
-    surface: c(opts.neutral, 99),
-    'surface-variant': c(opts.neutralVariant, 90),
-    outline: c(opts.neutralVariant, 50),
-    on: {
-      primary: c(opts.primary, 100),
-      secondary: c(opts.secondary, 100),
-      tertiary: c(opts.tertiary, 100),
-      error: c(opts.error, 100),
-      'primary-container': c(opts.primary, 10),
-      'secondary-container': c(opts.secondary, 10),
-      'tertiary-container': c(opts.tertiary, 10),
-      'error-container': c(opts.error, 10),
-      background: c(opts.neutral, 10),
-      surface: c(opts.neutral, 10),
-      'surface-variant': c(opts.neutralVariant, 30),
-      outline: c(opts.neutralVariant, 95),
-    },
-    modes: {
-      dark: {
-        primary: c(opts.primary, 80),
-        secondary: c(opts.secondary, 80),
-        tertiary: c(opts.tertiary, 80),
-        error: c(opts.error, 80),
-        'primary-container': c(opts.primary, 30),
-        'secondary-container': c(opts.secondary, 30),
-        'tertiary-container': c(opts.tertiary, 30),
-        'error-container': c(opts.error, 30),
-        background: c(opts.neutral, 10),
-        surface: c(opts.neutral, 10),
-        'surface-variant': c(opts.neutralVariant, 30),
-        outline: c(opts.neutralVariant, 60),
-        on: {
-          primary: c(opts.primary, 20),
-          secondary: c(opts.secondary, 20),
-          tertiary: c(opts.tertiary, 20),
-          error: c(opts.error, 20),
-          'primary-container': c(opts.primary, 90),
-          'secondary-container': c(opts.secondary, 90),
-          'tertiary-container': c(opts.tertiary, 90),
-          'error-container': c(opts.error, 90),
-          background: c(opts.neutral, 90),
-          surface: c(opts.neutral, 90),
-          'surface-variant': c(opts.neutralVariant, 80),
-          outline: c(opts.neutralVariant, 10),
-        },
-      },
-    },
-  };
-}
+import type { TonalPalette } from '@material/material-color-utilities';
+import { hexFromArgb } from '@material/material-color-utilities';
+
+export function makeColorScheme(opts: {
+  primary: TonalPalette;
+  secondary: TonalPalette;
+  tertiary: TonalPalette;
+  error: TonalPalette;
+  neutral: TonalPalette;
+  neutralVariant: TonalPalette;
+}) {
+  function c(palette: TonalPalette, tone: number) {
+    return hexFromArgb(palette.tone(tone));
+  }
+
+  return {
+    primary: c(opts.primary, 40),
+    secondary: c(opts.secondary, 40),
+    tertiary: c(opts.tertiary, 40),
+    error: c(opts.error, 40),
+    'primary-container': c(opts.primary, 90),
+    'secondary-container': c(opts.secondary, 90),
+    'tertiary-container': c(opts.tertiary, 90),
+    'error-container': c(opts.error, 90),
+    background: c(opts.neutral, 98),
+    'surface-variant': c(opts.neutralVariant, 90),
+    outline: c(opts.neutralVariant, 50),
+    'outline-variant': c(opts.neutralVariant, 80),
+    // https://material.io/blog/tone-based-surface-color-m3
+    'surface-dim': c(opts.neutral, 87),
+    surface: c(opts.neutral, 98),
+    'surface-bright': c(opts.neutral, 98),
+    'surface-container-lowest': c(opts.neutral, 100),
+    'surface-container-low': c(opts.neutral, 96),
+    'surface-container': c(opts.neutral, 94),
+    'surface-container-high': c(opts.neutral, 92),
+    'surface-container-highest': c(opts.neutral, 90),
+    on: {
+      primary: c(opts.primary, 100),
+      secondary: c(opts.secondary, 100),
+      tertiary: c(opts.tertiary, 100),
+      error: c(opts.error, 100),
+      'primary-container': c(opts.primary, 10),
+      'secondary-container': c(opts.secondary, 10),
+      'tertiary-container': c(opts.tertiary, 10),
+      'error-container': c(opts.error, 10),
+      background: c(opts.neutral, 10),
+      'surface-variant': c(opts.neutralVariant, 30),
+      outline: c(opts.neutralVariant, 95),
+      'outline-variant': c(opts.neutralVariant, 10),
+      // https://material.io/blog/tone-based-surface-color-m3
+      'surface-dim': c(opts.neutral, 10),
+      surface: c(opts.neutral, 10),
+      'surface-bright': c(opts.neutral, 10),
+      'surface-container-lowest': c(opts.neutral, 10),
+      'surface-container-low': c(opts.neutral, 10),
+      'surface-container': c(opts.neutral, 10),
+      'surface-container-high': c(opts.neutral, 10),
+      'surface-container-highest': c(opts.neutral, 10),
+    },
+    modes: {
+      dark: {
+        primary: c(opts.primary, 80),
+        secondary: c(opts.secondary, 80),
+        tertiary: c(opts.tertiary, 80),
+        error: c(opts.error, 80),
+        'primary-container': c(opts.primary, 30),
+        'secondary-container': c(opts.secondary, 30),
+        'tertiary-container': c(opts.tertiary, 30),
+        'error-container': c(opts.error, 30),
+        background: c(opts.neutral, 6),
+        'surface-variant': c(opts.neutralVariant, 30),
+        outline: c(opts.neutralVariant, 60),
+        'outline-variant': c(opts.neutralVariant, 30),
+        // https://material.io/blog/tone-based-surface-color-m3
+        // TODO: get the actual values from here once updated: https://github.com/material-foundation/material-color-utilities/blob/main/dart/lib/scheme/scheme.dart#L126-L156
+        'surface-dim': c(opts.neutral, 6),
+        surface: c(opts.neutral, 6),
+        'surface-bright': c(opts.neutral, 24),
+        'surface-container-lowest': c(opts.neutral, 4),
+        'surface-container-low': c(opts.neutral, 10),
+        'surface-container': c(opts.neutral, 12),
+        'surface-container-high': c(opts.neutral, 17),
+        'surface-container-highest': c(opts.neutral, 22),
+        on: {
+          primary: c(opts.primary, 20),
+          secondary: c(opts.secondary, 20),
+          tertiary: c(opts.tertiary, 20),
+          error: c(opts.error, 20),
+          'primary-container': c(opts.primary, 90),
+          'secondary-container': c(opts.secondary, 90),
+          'tertiary-container': c(opts.tertiary, 90),
+          'error-container': c(opts.error, 90),
+          background: c(opts.neutral, 90),
+          'surface-variant': c(opts.neutralVariant, 80),
+          outline: c(opts.neutralVariant, 10),
+          'outline-variant': c(opts.neutralVariant, 90),
+          // https://material.io/blog/tone-based-surface-color-m3
+          'surface-dim': c(opts.neutral, 90),
+          surface: c(opts.neutral, 90),
+          'surface-bright': c(opts.neutral, 90),
+          'surface-container-lowest': c(opts.neutral, 90),
+          'surface-container-low': c(opts.neutral, 90),
+          'surface-container': c(opts.neutral, 90),
+          'surface-container-high': c(opts.neutral, 90),
+          'surface-container-highest': c(opts.neutral, 90),
+        },
+      },
+    },
+  };
+}

package/src/ThemeExplorer/makeTailwindTheme.ts

@@ -0,0 +1,44 @@
+import {
+  DARK_SCHEME_CLASS,
+  LIGHT_SCHEME_CLASS,
+  transformTheme,
+} from '@basic-ui/dynamic-theme';
+
+import type { Theme } from '../theme/theme';
+
+export function makeTailwindThemeCSS(theme: Theme) {
+  const transformedTheme = transformTheme(theme, []);
+  const { light, dark } = transformedTheme.colorModes;
+
+  const parseColorMode = (colors: Record<string, string>) => {
+    const keys = Object.keys(colors);
+    const cssLines: string[] = [];
+    // let css = '';
+    for (const key of keys) {
+      if (!key.endsWith('--rgb')) {
+        continue;
+      }
+
+      cssLines.push(`  ` + key + ': ' + colors[key]);
+    }
+    return cssLines.join(';\n') + ';';
+  };
+
+  const bodySelector = `body`;
+  const lightThemeSelector = [
+    '' + bodySelector,
+    '' + bodySelector + '.' + LIGHT_SCHEME_CLASS,
+    '' + bodySelector + ' .' + LIGHT_SCHEME_CLASS,
+  ].join(',\n');
+  const darkThemeSelector = [
+    '' + bodySelector + '.' + DARK_SCHEME_CLASS,
+    '' + bodySelector + ' .' + DARK_SCHEME_CLASS,
+  ].join(',\n');
+
+  return `${lightThemeSelector} {
+${parseColorMode(light)}
+}
+${darkThemeSelector} {
+${parseColorMode(dark)}
+}`;
+}

package/src/ThemeExplorer/updateGoogleFonts.js

@@ -0,0 +1,33 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { writeFileSync } = require('fs');
+
+// This file auto generates our googleFonts.ts file
+
+// You can generate an API key from here
+// https://developers.google.com/fonts/docs/developer_api#APIKey
+const API_KEY = process.env.GOOGLE_FONTS_API_KEY;
+
+async function main() {
+  const res = await fetch(
+    `https://content-webfonts.googleapis.com/v1/webfonts?sort=POPULARITY&key=${API_KEY}`
+  );
+
+  const json = await res.json();
+  if (json.error) {
+    console.error(json.error);
+    return;
+  }
+  const fonts = json.items.map((item) => item.family);
+  let str = '';
+  str += `// THIS FILE WAS AUTOGENERATED BY updateGoogleFonts.js\n`;
+  str += `// TO UPDATE IT RUN THE FOLLOWING WITH Node.js v18+\n`;
+  str += `// GOOGLE_FONTS_API_KEY="<SECRET>" node updateGoogleFonts.js`;
+  str += `\n\n/* eslint-disable prettier/prettier */\n`;
+  str += `export const googleFonts = [\n`;
+  str += fonts.map((f) => '  ' + JSON.stringify(f)).join(',\n');
+  str += '\n];\n';
+
+  writeFileSync('./googleFonts.ts', str, 'utf-8');
+}
+
+main();

package/src/ThemeExplorer/useDeferredColor.tsx

@@ -1,25 +1,21 @@
-import { useMemo, useDeferredValue } from 'react';
-import { TonalPalette, argbFromHex } from '@material/material-color-utilities'; // eslint-disable-line import/no-unresolved
-import type { Color } from '@basic-ui/color-picker';
-
-import { useLocalStorageCachedState } from './useLocalStorageCachedState';
-
-// import './styles.css';
-export function useDeferredColor(
-  key: string,
-  fallbackValue: TonalPalette
-): [Color | null, TonalPalette, (c: Color | null) => void] {
-  const [color, setColor] = useLocalStorageCachedState<Color | null>(
-    'theme-builder.' + key,
-    null
-  );
-  const deferredColor = useDeferredValue(color);
-  const colorTonal = useMemo(
-    () =>
-      deferredColor?.hex
-        ? TonalPalette.fromInt(argbFromHex(deferredColor.hex))
-        : fallbackValue,
-    [deferredColor?.hex, fallbackValue]
-  );
-  return [color, colorTonal, setColor];
-}
+import { useMemo } from 'react';
+import { TonalPalette, argbFromHex } from '@material/material-color-utilities';
+import type { Color } from '@basic-ui/color-picker';
+
+import { useLocalStorageCachedState } from './useLocalStorageCachedState';
+
+export function useDeferredColor(
+  key: string,
+  fallbackValue: TonalPalette
+): [Color | null, TonalPalette, (c: Color | null) => void] {
+  const [color, setColor] = useLocalStorageCachedState<Color | null>(
+    null,
+    'theme-builder.' + key
+  );
+  const colorTonal = useMemo(
+    () =>
+      color?.hex ? TonalPalette.fromInt(argbFromHex(color.hex)) : fallbackValue,
+    [color?.hex, fallbackValue]
+  );
+  return [color, colorTonal, setColor];
+}

package/src/ThemeExplorer/useLocalStorageCachedState.ts

@@ -1,18 +1,18 @@
-import { useCallback, useState } from 'react';
-
-export function useLocalStorageCachedState<T>(
-  key: string,
-  initialValue: T
-): [T, (c: T) => void] {
-  const [state, _setState] = useState<T>(
-    () => JSON.parse(localStorage.getItem(key) || 'null') || initialValue
-  );
-  const setState = useCallback(
-    (c: T): void => {
-      _setState(c);
-      localStorage.setItem(key, JSON.stringify(c));
-    },
-    [key]
-  );
-  return [state, setState];
-}
+import { useCallback, useState } from 'react';
+
+export function useLocalStorageCachedState<T>(
+  initialValue: T,
+  key: string
+): [T, (c: T) => void] {
+  const [state, _setState] = useState<T>(
+    () => JSON.parse(localStorage.getItem(key) || 'null') || initialValue
+  );
+  const setState = useCallback(
+    (c: T): void => {
+      _setState(c);
+      localStorage.setItem(key, JSON.stringify(c));
+    },
+    [key]
+  );
+  return [state, setState];
+}

package/src/Tooltip/Tooltip.story.tsx

@@ -1,35 +1,35 @@
-import React, { useEffect, useRef, useState } from 'react';
-
-import { Tooltip } from './';
-import { Button } from '../Button';
-// import './styles.css';
-
-export default {
-  title: 'components/Tooltip',
-};
-
-const Example = () => {
-  const buttonRef = useRef();
-  const [counter, setCounter] = useState(0);
-  useEffect(() => {
-    const interval = setInterval(() => setCounter((f) => f + 1), 50);
-    return () => clearInterval(interval);
-  }, []);
-
-  return (
-    <div style={{ margin: 100, display: 'flex' }}>
-      <Tooltip label="Secondary action">
-        <Button ref={buttonRef} mx={2} variant="outlined">
-          Cancel
-        </Button>
-      </Tooltip>
-      <Tooltip label={`Main action ${counter}`}>
-        <Button ref={buttonRef} mx={2} variant="filled">
-          Ok
-        </Button>
-      </Tooltip>
-    </div>
-  );
-};
-
-export const Default = () => <Example />;
+import { useEffect, useRef, useState } from 'react';
+
+import { Tooltip } from './';
+import { Button } from '../Button';
+// import './styles.css';
+
+export default {
+  title: 'components/Tooltip',
+};
+
+const Example = () => {
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const [counter, setCounter] = useState(0);
+  useEffect(() => {
+    const interval = setInterval(() => setCounter((f) => f + 1), 50);
+    return () => clearInterval(interval);
+  }, []);
+
+  return (
+    <div style={{ margin: 100, display: 'flex' }}>
+      <Tooltip label="Secondary action">
+        <Button ref={buttonRef} mx={2} variant="outlined">
+          Cancel
+        </Button>
+      </Tooltip>
+      <Tooltip label={`Main action ${counter}`}>
+        <Button ref={buttonRef} mx={2} variant="filled">
+          Ok
+        </Button>
+      </Tooltip>
+    </div>
+  );
+};
+
+export const Default = () => <Example />;

package/src/Tooltip/Tooltip.tsx

@@ -1,50 +1,67 @@
-import type { PopperProps } from '@basic-ui/core';
-import { Tooltip as _BaseTooltip, Popper } from '@basic-ui/core';
-import type { FC } from 'react';
-import React, { forwardRef } from 'react';
-
-import type { BoxProps } from '../Box';
-import { Box } from '../Box';
-import { alpha } from '../color';
-
-export interface TooltipProps
-  extends BoxProps,
-    Omit<PopperProps, 'color' | 'anchorEl'> {
-  label: React.ReactNode;
-  disabled?: boolean;
-}
-
-const BaseTooltip: FC<
-  BoxProps & {
-    innerAs?: React.ElementType<any>;
-  } & Omit<PopperProps, 'color' | 'anchorEl'>
-> = _BaseTooltip as any;
-export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
-  function Tooltip(props, forwardedRef) {
-    const { placement = 'bottom', __css, ...otherProps } = props;
-
-    return (
-      <BaseTooltip
-        as={Popper}
-        innerAs={Box}
-        ref={forwardedRef}
-        placement={placement}
-        distance={8}
-        __css={{
-          bg: alpha('#616161', 0.9),
-          color: '#fff',
-          fontSize: [2, 2, 1],
-          fontFamily: 'body',
-          fontWeight: 'regular',
-          lineHeight: [1.2, 1.2, 1.33],
-          px: [3, 3, 2],
-          py: [2, 2, 1],
-          borderRadius: '4px',
-          zIndex: 'tooltip',
-          ...__css,
-        }}
-        {...otherProps}
-      />
-    );
-  }
-);
+import type { PopperProps } from '@basic-ui/core';
+import { Tooltip as _BaseTooltip, Popper } from '@basic-ui/core';
+import type { ElementType, FC, ReactNode } from 'react';
+import { forwardRef } from 'react';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
+import { alpha } from '../color';
+
+export interface TooltipProps
+  extends BoxProps,
+    Omit<PopperProps, 'color' | 'anchorEl'> {
+  label: ReactNode;
+  disabled?: boolean;
+}
+
+const BaseTooltip: FC<
+  BoxProps & {
+    innerAs?: ElementType<any>;
+    label: ReactNode;
+  } & Omit<PopperProps, 'color' | 'anchorEl'>
+> = _BaseTooltip as any;
+
+export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
+  function Tooltip(props, forwardedRef) {
+    const {
+      placement = 'bottom',
+      children,
+      label,
+      __css,
+      ...otherProps
+    } = props;
+    const cssStyle = {
+      variant: ['text.body-medium', 'text.body-small'],
+      bg: alpha('#616161', 0.9),
+      color: '#fff',
+      px: 2,
+      py: 1,
+      borderRadius: 'extra-small',
+      zIndex: 'tooltip',
+      ...__css,
+    };
+
+    if (!children) {
+      return (
+        <Box ref={forwardedRef} __css={cssStyle} {...otherProps}>
+          {label}
+        </Box>
+      );
+    }
+
+    return (
+      <BaseTooltip
+        as={Popper}
+        innerAs={Box}
+        ref={forwardedRef}
+        placement={placement}
+        distance={8}
+        label={label}
+        __css={cssStyle}
+        {...otherProps}
+      >
+        {children}
+      </BaseTooltip>
+    );
+  }
+);

package/src/Tooltip/index.ts

@@ -1 +1 @@
-export * from './Tooltip';
+export * from './Tooltip';

package/src/color.ts

@@ -1,8 +1,8 @@
 import type { SystemStyleObject } from '@styled-system/css';
 import { get } from '@styled-system/css';
 import { parseToRgb } from 'polished';
+import { DARK_SCHEME_CLASS } from '@basic-ui/dynamic-theme';
 
-import { DARK_THEME_CLASS } from './ColorMode';
 import type { Theme } from './theme';
 
 export const alpha =
@@ -12,22 +12,46 @@ export const alpha =
       const color = get(theme, 'colors.' + colorString + '_rgb', colorString);
       return `rgba(${color},${alphaValue})`;
     }
+    if (color.startsWith('rgba(')) {
+      return color;
+    }
 
     const rgb = parseToRgb(color);
     return `rgba(${rgb.red},${rgb.green},${rgb.blue},${alphaValue})`;
   };
 
+export function mixColor(
+  baseColor: string,
+  overlayColor: string
+): (theme: any) => string;
+export function mixColor(
+  baseColor: string,
+  overlayColor: string,
+  overlayOpacity: number
+): (theme: any) => string;
+export function mixColor(
+  baseColor: string,
+  overlayColor: string,
+  overlayOpacity?: number
+): (theme: any) => string {
+  return (theme) => {
+    baseColor = get(theme, `colors.${baseColor}`, baseColor);
+    overlayColor = overlayOpacity
+      ? alpha(overlayColor, overlayOpacity)(theme)
+      : get(theme, `colors.${overlayColor}`, overlayColor);
+
+    return `linear-gradient(${overlayColor}, ${overlayColor}), ${baseColor}`;
+  };
+}
+
 export function getColorOverlay(
   theme: Theme,
   baseColor: string,
   overlayColor: string,
   overlayOpacity: number
 ): SystemStyleObject {
-  baseColor = get(theme, `colors.${baseColor}`) || baseColor;
-  overlayColor = alpha(overlayColor, overlayOpacity)(theme);
-
   return {
-    background: `linear-gradient(${overlayColor}, ${overlayColor}), ${baseColor}`,
+    background: mixColor(baseColor, overlayColor, overlayOpacity)(theme),
   };
 }
 
@@ -53,7 +77,7 @@ export function getDarkThemeBackgroundOverlay(
   }
 
   return {
-    [`.${DARK_THEME_CLASS} &, &.${DARK_THEME_CLASS}`]: {
+    [`.${DARK_SCHEME_CLASS} &, &.${DARK_SCHEME_CLASS}`]: {
       ...getBackgroundOverlay(theme, backgroundOverlay, overlayColor),
     },
   };

package/src/css.ts

@@ -1,2 +1,2 @@
-// eslint-disable-next-line prettier/prettier
-export * from '@styled-system/css';
+// eslint-disable-next-line prettier/prettier
+export * from '@styled-system/css';