@khanacademy/wonder-blocks-button 6.3.9 → 6.3.10

package/src/components/__tests__/button.typestest.tsx

@@ -1,48 +0,0 @@
-import * as React from "react";
-
-import Button from "../button";
-
-<Button beforeNav={() => Promise.resolve()}>Hello, world!</Button>;
-
-<Button safeWithNav={() => Promise.resolve()}>Hello, world!</Button>;
-
-// It's okay to use onClick with href
-<Button href="/foo" onClick={() => {}}>
-    Hello, world!
-</Button>;
-
-<Button href="/foo" beforeNav={() => Promise.resolve()}>
-    Hello, world!
-</Button>;
-
-<Button href="/foo" safeWithNav={() => Promise.resolve()}>
-    Hello, world!
-</Button>;
-
-// All three of these props can be used together
-<Button
-    href="/foo"
-    beforeNav={() => Promise.resolve()}
-    safeWithNav={() => Promise.resolve()}
-    onClick={() => {}}
->
-    Hello, world!
-</Button>;
-
-// It's also fine to use href by itself
-<Button href="/foo">Hello, world!</Button>;
-
-const getUrl = () => "/foo";
-
-// This test purposefully uses a function to get a string to pass with href.
-// This can trigger errors if there are ambiguous cases in the disjoint union
-// type being used to describe the props.  It's unclear why this error isn't
-// trigger by passing a string directly as the href.
-<Button href={getUrl()}>Hello, world!</Button>;
-
-<Button href="/foo" type="submit">
-    Hello, world!
-</Button>;
-
-// type="submit" on its own is fine.
-<Button type="submit">Hello, world!</Button>;

package/src/components/button-core.tsx

@@ -1,519 +0,0 @@
-import * as React from "react";
-import {CSSProperties, StyleSheet} from "aphrodite";
-import {Link} from "react-router-dom";
-import {__RouterContext} from "react-router";
-
-import {LabelLarge, LabelSmall} from "@khanacademy/wonder-blocks-typography";
-import {addStyle, View} from "@khanacademy/wonder-blocks-core";
-import {CircularSpinner} from "@khanacademy/wonder-blocks-progress-spinner";
-import {isClientSideUrl} from "@khanacademy/wonder-blocks-clickable";
-import {
-    ThemedStylesFn,
-    useScopedTheme,
-    useStyles,
-} from "@khanacademy/wonder-blocks-theming";
-
-import type {
-    ChildrenProps,
-    ClickableState,
-} from "@khanacademy/wonder-blocks-clickable";
-import type {SharedProps} from "./button";
-import {ButtonThemeContext, ButtonThemeContract} from "../themes/themed-button";
-import {ButtonIcon} from "./button-icon";
-
-type Props = SharedProps & ChildrenProps & ClickableState;
-
-const StyledAnchor = addStyle("a");
-const StyledButton = addStyle("button");
-const StyledLink = addStyle(Link);
-
-const ButtonCore: React.ForwardRefExoticComponent<
-    Props &
-        React.RefAttributes<typeof Link | HTMLButtonElement | HTMLAnchorElement>
-> = React.forwardRef<
-    typeof Link | HTMLButtonElement | HTMLAnchorElement,
-    Props
->(function ButtonCore(props: Props, ref) {
-    const {theme, themeName} = useScopedTheme(ButtonThemeContext);
-    const sharedStyles = useStyles(themedSharedStyles, theme);
-
-    const renderInner = (router: any): React.ReactNode => {
-        const {
-            children,
-            skipClientNav,
-            color,
-            disabled: disabledProp,
-            focused,
-            hovered,
-            href = undefined,
-            kind = "primary",
-            labelStyle,
-            light = false,
-            pressed,
-            size = "medium",
-            style,
-            testId,
-            type = undefined,
-            spinner,
-            startIcon,
-            endIcon,
-            id,
-            waiting: _,
-            ...restProps
-        } = props;
-
-        const buttonStyles = _generateStyles(
-            color,
-            kind,
-            light,
-            size,
-            theme,
-            themeName,
-        );
-
-        const disabled = spinner || disabledProp;
-
-        const defaultStyle = [
-            sharedStyles.shared,
-            disabled && sharedStyles.disabled,
-            startIcon && sharedStyles.withStartIcon,
-            endIcon && sharedStyles.withEndIcon,
-            buttonStyles.default,
-            disabled && buttonStyles.disabled,
-            // apply focus effect only to default and secondary buttons
-            kind !== "tertiary" &&
-                !disabled &&
-                (pressed
-                    ? buttonStyles.active
-                    : (hovered || focused) && buttonStyles.focus),
-            kind === "tertiary" &&
-                !pressed &&
-                focused && [
-                    buttonStyles.focus,
-                    disabled && buttonStyles.disabledFocus,
-                ],
-            size === "small" && sharedStyles.small,
-            size === "large" && sharedStyles.large,
-        ];
-
-        const commonProps = {
-            "data-testid": testId,
-            id: id,
-            role: "button",
-            style: [defaultStyle, style],
-            ...restProps,
-        } as const;
-
-        const Label = size === "small" ? LabelSmall : LabelLarge;
-
-        const label = (
-            <Label
-                style={[
-                    sharedStyles.text,
-                    size === "large" && sharedStyles.largeText,
-                    labelStyle,
-                    spinner && sharedStyles.hiddenText,
-                    kind === "tertiary" && sharedStyles.textWithFocus,
-                    // apply press/hover effects on the label
-                    kind === "tertiary" &&
-                        !disabled &&
-                        (pressed
-                            ? [buttonStyles.hover, buttonStyles.active]
-                            : hovered && buttonStyles.hover),
-                ]}
-                testId={testId ? `${testId}-inner-label` : undefined}
-            >
-                {children}
-            </Label>
-        );
-
-        const sizeMapping = {
-            medium: "small",
-            small: "xsmall",
-            large: "medium",
-        } as const;
-
-        // We have to use `medium` for both md and lg buttons so we can fit the
-        // icons in large buttons.
-        const iconSize = size === "small" ? "small" : "medium";
-
-        const contents = (
-            <React.Fragment>
-                {startIcon && (
-                    <View
-                        // The start icon doesn't have the circle around it
-                        // in the Khanmigo theme, but we wrap it with
-                        // iconWrapper anyway to give it the same spacing
-                        // as the end icon so the button is symmetrical.
-                        style={sharedStyles.iconWrapper}
-                    >
-                        <ButtonIcon
-                            size={iconSize}
-                            icon={startIcon}
-                            style={[
-                                sharedStyles.startIcon,
-                                kind === "tertiary" &&
-                                    sharedStyles.tertiaryStartIcon,
-                            ]}
-                            testId={testId ? `${testId}-start-icon` : undefined}
-                        />
-                    </View>
-                )}
-                {label}
-                {spinner && (
-                    <CircularSpinner
-                        style={sharedStyles.spinner}
-                        size={sizeMapping[size]}
-                        light={kind === "primary"}
-                        testId={`${testId || "button"}-spinner`}
-                    />
-                )}
-                {endIcon && (
-                    <View
-                        testId={
-                            testId ? `${testId}-end-icon-wrapper` : undefined
-                        }
-                        style={[
-                            styles.endIcon,
-                            sharedStyles.iconWrapper,
-                            sharedStyles.endIconWrapper,
-                            kind === "tertiary" &&
-                                sharedStyles.endIconWrapperTertiary,
-                            (focused || hovered) &&
-                                kind !== "primary" &&
-                                sharedStyles.iconWrapperSecondaryHovered,
-                        ]}
-                    >
-                        <ButtonIcon
-                            size={iconSize}
-                            icon={endIcon}
-                            testId={testId ? `${testId}-end-icon` : undefined}
-                        />
-                    </View>
-                )}
-            </React.Fragment>
-        );
-
-        if (href && !disabled) {
-            return router && !skipClientNav && isClientSideUrl(href) ? (
-                <StyledLink
-                    {...commonProps}
-                    to={href}
-                    ref={ref as React.Ref<typeof Link>}
-                >
-                    {contents}
-                </StyledLink>
-            ) : (
-                <StyledAnchor
-                    {...commonProps}
-                    href={href}
-                    ref={ref as React.Ref<HTMLAnchorElement>}
-                >
-                    {contents}
-                </StyledAnchor>
-            );
-        } else {
-            return (
-                <StyledButton
-                    type={type || "button"}
-                    {...commonProps}
-                    aria-disabled={disabled}
-                    ref={ref as React.Ref<HTMLButtonElement>}
-                >
-                    {contents}
-                </StyledButton>
-            );
-        }
-    };
-
-    return (
-        <__RouterContext.Consumer>
-            {(router) => renderInner(router)}
-        </__RouterContext.Consumer>
-    );
-});
-
-export default ButtonCore;
-
-const themedSharedStyles: ThemedStylesFn<ButtonThemeContract> = (theme) => ({
-    shared: {
-        position: "relative",
-        display: "inline-flex",
-        alignItems: "center",
-        justifyContent: "center",
-        height: theme.size.height.medium,
-        paddingTop: 0,
-        paddingBottom: 0,
-        paddingLeft: theme.padding.large,
-        paddingRight: theme.padding.large,
-        border: "none",
-        borderRadius: theme.border.radius.default,
-        cursor: "pointer",
-        outline: "none",
-        textDecoration: "none",
-        boxSizing: "border-box",
-        // This removes the 300ms click delay on mobile browsers by indicating that
-        // "double-tap to zoom" shouldn't be used on this element.
-        touchAction: "manipulation",
-        userSelect: "none",
-        ":focus": {
-            // Mobile: Removes a blue highlight style shown when the user clicks a button
-            WebkitTapHighlightColor: "rgba(0,0,0,0)",
-        },
-    },
-    disabled: {
-        cursor: "auto",
-    },
-    small: {
-        borderRadius: theme.border.radius.small,
-        height: theme.size.height.small,
-    },
-    large: {
-        borderRadius: theme.border.radius.large,
-        height: theme.size.height.large,
-    },
-    text: {
-        alignItems: "center",
-        fontWeight: theme.font.weight.default,
-        whiteSpace: "nowrap",
-        overflow: "hidden",
-        textOverflow: "ellipsis",
-        display: "inline-block", // allows the button text to truncate
-        pointerEvents: "none", // fix Safari bug where the browser was eating mouse events
-    },
-    largeText: {
-        fontSize: theme.font.size.large,
-        lineHeight: `${theme.font.lineHeight.large}px`,
-    },
-    textWithFocus: {
-        position: "relative", // allows the tertiary button border to use the label width
-    },
-    hiddenText: {
-        visibility: "hidden",
-    },
-    spinner: {
-        position: "absolute",
-    },
-    startIcon: {
-        marginRight: theme.padding.small,
-        marginLeft: theme.margin.icon.offset,
-    },
-    tertiaryStartIcon: {
-        // Undo the negative padding from startIcon since tertiary
-        // buttons don't have extra padding.
-        marginLeft: 0,
-    },
-    endIcon: {
-        marginLeft: theme.padding.small,
-    },
-    iconWrapper: {
-        borderRadius: theme.border.radius.icon,
-        padding: theme.padding.xsmall,
-        // View has a default minWidth of 0, which causes the label text
-        // to encroach on the icon when it needs to truncate. We can fix
-        // this by setting the minWidth to auto.
-        minWidth: "auto",
-    },
-    iconWrapperSecondaryHovered: {
-        backgroundColor: theme.color.bg.icon.secondaryHover,
-        color: theme.color.text.icon.secondaryHover,
-    },
-    endIconWrapper: {
-        marginLeft: theme.padding.small,
-        marginRight: theme.margin.icon.offset,
-    },
-    endIconWrapperTertiary: {
-        marginRight: 0,
-    },
-});
-
-const styles: Record<string, any> = {};
-
-// export for testing only
-export const _generateStyles = (
-    buttonColor = "default",
-    kind: "primary" | "secondary" | "tertiary",
-    light: boolean,
-    size: "large" | "medium" | "small",
-    theme: ButtonThemeContract,
-    themeName: string,
-) => {
-    const color: string =
-        buttonColor === "destructive"
-            ? theme.color.bg.critical.default
-            : theme.color.bg.action.default;
-
-    const buttonType = `${color}-${kind}-${light}-${size}-${themeName}`;
-
-    if (styles[buttonType]) {
-        return styles[buttonType];
-    }
-
-    const fadedColor =
-        buttonColor === "destructive"
-            ? theme.color.bg.critical.inverse
-            : theme.color.bg.action.inverse;
-    const activeColor =
-        buttonColor === "destructive"
-            ? theme.color.bg.critical.active
-            : theme.color.bg.action.active;
-    const padding =
-        size === "large" ? theme.padding.xLarge : theme.padding.large;
-
-    let newStyles: Record<string, CSSProperties> = {};
-    if (kind === "primary") {
-        const boxShadowInnerColor: string = light
-            ? theme.color.bg.primary.inverse
-            : theme.color.bg.primary.default;
-
-        newStyles = {
-            default: {
-                background: light ? theme.color.bg.primary.default : color,
-                color: light ? color : theme.color.text.inverse,
-                paddingLeft: padding,
-                paddingRight: padding,
-            },
-            focus: {
-                // This assumes a background of white for the regular button and
-                // a background of darkBlue for the light version. The inner
-                // box shadow/ring is also small enough for a slight variation
-                // in the background color not to matter too much.
-                boxShadow: `0 0 0 1px ${boxShadowInnerColor}, 0 0 0 3px ${
-                    light ? theme.color.bg.primary.default : color
-                }`,
-            },
-            active: {
-                boxShadow: `0 0 0 1px ${boxShadowInnerColor}, 0 0 0 3px ${
-                    light ? fadedColor : activeColor
-                }`,
-                background: light ? fadedColor : activeColor,
-                color: light ? activeColor : fadedColor,
-            },
-            disabled: {
-                background: light
-                    ? fadedColor
-                    : theme.color.bg.primary.disabled,
-                color: light ? color : theme.color.text.primary.disabled,
-                cursor: "default",
-                ":focus": {
-                    boxShadow: `0 0 0 1px ${
-                        light
-                            ? theme.color.bg.primary.disabled
-                            : theme.color.bg.primary.default
-                    }, 0 0 0 3px ${
-                        light ? fadedColor : theme.color.bg.primary.disabled
-                    }`,
-                },
-            },
-        };
-    } else if (kind === "secondary") {
-        const secondaryBorderColor =
-            buttonColor === "destructive"
-                ? theme.color.border.secondary.critical
-                : theme.color.border.secondary.action;
-        const secondaryActiveColor =
-            buttonColor === "destructive"
-                ? theme.color.bg.secondary.active.critical
-                : theme.color.bg.secondary.active.action;
-
-        newStyles = {
-            default: {
-                background: light
-                    ? theme.color.bg.secondary.inverse
-                    : theme.color.bg.secondary.default,
-                color: light ? theme.color.text.inverse : color,
-                borderColor: light
-                    ? theme.color.border.secondary.inverse
-                    : secondaryBorderColor,
-                borderStyle: "solid",
-                borderWidth: theme.border.width.secondary,
-                paddingLeft: padding,
-                paddingRight: padding,
-            },
-            focus: {
-                background: light
-                    ? theme.color.bg.secondary.inverse
-                    : theme.color.bg.secondary.focus,
-                borderColor: "transparent",
-                outlineColor: light
-                    ? theme.color.border.primary.inverse
-                    : color,
-                outlineStyle: "solid",
-                outlineWidth: theme.border.width.focused,
-            },
-
-            active: {
-                background: light ? activeColor : secondaryActiveColor,
-                color: light ? fadedColor : activeColor,
-                borderColor: "transparent",
-                outlineColor: light ? fadedColor : activeColor,
-                outlineStyle: "solid",
-                outlineWidth: theme.border.width.focused,
-            },
-            disabled: {
-                color: light
-                    ? theme.color.text.secondary.inverse
-                    : theme.color.text.disabled,
-                outlineColor: light ? fadedColor : theme.color.border.disabled,
-                cursor: "default",
-                ":focus": {
-                    outlineColor: light
-                        ? theme.color.border.secondary.inverse
-                        : theme.color.border.disabled,
-                    outlineStyle: "solid",
-                    outlineWidth: theme.border.width.disabled,
-                },
-            },
-        };
-    } else if (kind === "tertiary") {
-        newStyles = {
-            default: {
-                background: "none",
-                color: light ? theme.color.text.inverse : color,
-                paddingLeft: 0,
-                paddingRight: 0,
-            },
-            hover: {
-                ":after": {
-                    content: "''",
-                    position: "absolute",
-                    height: theme.size.height.tertiaryHover,
-                    width: "100%",
-                    right: 0,
-                    bottom: 0,
-                    background: light ? theme.color.bg.tertiary.hover : color,
-                    borderRadius: theme.border.radius.tertiary,
-                },
-            },
-            focus: {
-                outlineStyle: "solid",
-                outlineColor: light
-                    ? theme.color.border.tertiary.inverse
-                    : color,
-                outlineWidth: theme.border.width.focused,
-                borderRadius: theme.border.radius.default,
-            },
-            active: {
-                color: light ? fadedColor : activeColor,
-                ":after": {
-                    height: theme.size.height.tertiaryHover,
-                    background: light ? fadedColor : activeColor,
-                },
-            },
-            disabled: {
-                color: light ? fadedColor : theme.color.text.disabled,
-                cursor: "default",
-            },
-            disabledFocus: {
-                outlineColor: light
-                    ? theme.color.border.tertiary.inverse
-                    : theme.color.border.disabled,
-            },
-        };
-    } else {
-        throw new Error("Button kind not recognized");
-    }
-
-    styles[buttonType] = StyleSheet.create(newStyles);
-    return styles[buttonType];
-};

package/src/components/button-icon.tsx

@@ -1,47 +0,0 @@
-import * as React from "react";
-import {StyleType} from "@khanacademy/wonder-blocks-core";
-import {PhosphorIcon, PhosphorIconAsset} from "@khanacademy/wonder-blocks-icon";
-
-/**
- * Returns the phosphor icon component based on the size. This is necessary
- * so we can cast the icon to the correct type.
- */
-export function ButtonIcon({
-    icon,
-    size,
-    style,
-    testId,
-}: {
-    icon: PhosphorIconAsset;
-    size: "small" | "medium";
-    style?: StyleType;
-    testId?: string;
-}) {
-    const commonProps = {
-        "aria-hidden": true,
-        color: "currentColor",
-        style: style,
-        testId,
-    };
-
-    switch (size) {
-        case "small":
-            return (
-                <PhosphorIcon
-                    {...commonProps}
-                    size="small"
-                    icon={icon as PhosphorBold | PhosphorFill}
-                />
-            );
-
-        case "medium":
-        default:
-            return (
-                <PhosphorIcon
-                    {...commonProps}
-                    size="medium"
-                    icon={icon as PhosphorRegular | PhosphorFill}
-                />
-            );
-    }
-}