Merge 9106b52 into 308fe79

Khan · Jun 12, 2024 · a469439 · a469439
2 parents 308fe79 + 9106b52
commit a469439
Show file tree

Hide file tree

Showing 44 changed files with 2,011 additions and 764 deletions.
diff --git a/.changeset/old-adults-admire.md b/.changeset/old-adults-admire.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/wonder-blocks-theming": minor
+---
+
+Add Panda preset
diff --git a/.changeset/plenty-dolls-refuse.md b/.changeset/plenty-dolls-refuse.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/wonder-blocks-layout": major
+---
+
+Migrate Strut to PandaCss
diff --git a/.changeset/polite-melons-peel.md b/.changeset/polite-melons-peel.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/wonder-blocks-icon": major
+---
+
+Migrate PhosphorIcon to Panda CSS
diff --git a/.changeset/rare-actors-boil.md b/.changeset/rare-actors-boil.md
@@ -0,0 +1,6 @@
+---
+"@khanacademy/wonder-blocks-form": major
+"@khanacademy/wonder-blocks-typography": major
+---
+
+Migrate TextField and Typography to PandaCSS
diff --git a/.changeset/sharp-nails-peel.md b/.changeset/sharp-nails-peel.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/wonder-blocks-progress-spinner": major
+---
+
+Migrate ProgressSpinner to Panda"
diff --git a/.changeset/small-parrots-smell.md b/.changeset/small-parrots-smell.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/wonder-blocks-core": major
+---
+
+Use PandaCSS in View
diff --git a/.changeset/spotty-rivers-admire.md b/.changeset/spotty-rivers-admire.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/wonder-blocks-button": major
+---
+
+Add panda support to Button (including theming)
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,7 @@ storybook-static
 !.vscode
 .DS_Store
 yarn-error.log
+
+## Panda
+styled-system
+styled-system-studio
diff --git a/.storybook/index.css b/.storybook/index.css
@@ -0,0 +1,2 @@
+@layer reset, base, tokens, recipes, utilities;
+/* @layer utilities; */
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -34,6 +34,13 @@ const config: StorybookConfig = {
                             "../packages/wonder-blocks$1/src",
                         ),
                     },
+                    {
+                        find: /^\@\/styled-system\/([\w]+)/,
+                        replacement: resolve(
+                            __dirname,
+                            "../styled-system/$1",
+                        ),
+                    },
                 ],
             },
         });

diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -7,6 +7,8 @@ import {ThemeSwitcherContext} from "@khanacademy/wonder-blocks-theming";
 import {RenderStateRoot} from "../packages/wonder-blocks-core/src";
 import {Preview} from "@storybook/react";
 
+import "./index.css";
+
 /**
  * WB Official breakpoints
  * @see https://khanacademy.atlassian.net/wiki/spaces/WB/pages/2099970518/Layout+Breakpoints

diff --git a/__docs__/wonder-blocks-button/button.stories.tsx b/__docs__/wonder-blocks-button/button.stories.tsx
@@ -1,11 +1,11 @@
 import * as React from "react";
-import {StyleSheet} from "aphrodite";
+// import {StyleSheet} from "aphrodite";
 import type {Meta, StoryObj} from "@storybook/react";
 import {expect, fireEvent, userEvent, within} from "@storybook/test";
 
 import {MemoryRouter, Route, Switch} from "react-router-dom";
 
-import type {StyleDeclaration} from "aphrodite";
+// import type {StyleDeclaration} from "aphrodite";
 
 import pencilSimple from "@phosphor-icons/core/regular/pencil-simple.svg";
 import pencilSimpleBold from "@phosphor-icons/core/bold/pencil-simple-bold.svg";
@@ -26,6 +26,8 @@ import ComponentInfo from "../../.storybook/components/component-info";
 
 import ButtonArgTypes from "./button.argtypes";
 import {ThemeSwitcherContext} from "@khanacademy/wonder-blocks-theming";
+import {SystemStyleObject} from "@/styled-system/types";
+import {css} from "@/styled-system/css";
 
 /**
  * Reusable button component.
@@ -132,35 +134,35 @@ export const Tertiary: StoryComponentType = {
     },
 };
 
-export const styles: StyleDeclaration = StyleSheet.create({
-    row: {
+export const styles: Record<string, SystemStyleObject> = {
+    row: css.raw({
         flexDirection: "row",
         alignItems: "center",
-        marginBottom: spacing.xSmall_8,
-    },
-    button: {
-        marginRight: spacing.xSmall_8,
-    },
-    truncatedButton: {
+        marginBottom: "xSmall_8",
+    }),
+    button: css.raw({
+        marginRight: "xSmall_8",
+    }),
+    truncatedButton: css.raw({
         maxWidth: 200,
-        marginBottom: spacing.medium_16,
-    },
-    fillSpace: {
+        marginBottom: "medium_16",
+    }),
+    fillSpace: css.raw({
         minWidth: 140,
-    },
-    example: {
-        background: color.offWhite,
-        padding: spacing.medium_16,
-    },
-    label: {
-        marginTop: spacing.large_24,
-        marginBottom: spacing.xSmall_8,
-    },
-});
+    }),
+    example: css.raw({
+        background: "offWhite",
+        padding: "medium_16",
+    }),
+    label: css.raw({
+        marginTop: "large_24",
+        marginBottom: "xSmall_8",
+    }),
+};
 
 export const Variants: StoryComponentType = () => (
-    <View style={{padding: spacing.medium_16, gap: spacing.medium_16}}>
-        <View style={{flexDirection: "row", gap: spacing.medium_16}}>
+    <View style={{padding: "medium_16", gap: "medium_16"}}>
+        <View style={{flexDirection: "row", gap: "medium_16"}}>
             <Button onClick={() => {}}>Hello, world!</Button>
             <Button onClick={() => {}} kind="secondary">
                 Hello, world!
@@ -169,7 +171,7 @@ export const Variants: StoryComponentType = () => (
                 Hello, world!
             </Button>
         </View>
-        <View style={{flexDirection: "row", gap: spacing.medium_16}}>
+        <View style={{flexDirection: "row", gap: "medium_16"}}>
             <Button onClick={() => {}} disabled={true}>
                 Hello, world!
             </Button>
@@ -180,7 +182,7 @@ export const Variants: StoryComponentType = () => (
                 Hello, world!
             </Button>
         </View>
-        <View style={{flexDirection: "row", gap: spacing.medium_16}}>
+        <View style={{flexDirection: "row", gap: "medium_16"}}>
             <Button onClick={() => {}} color="destructive">
                 Hello, world!
             </Button>
@@ -247,26 +249,28 @@ WithColor.parameters = {
 };
 
 export const Dark: StoryComponentType = () => (
-    <View style={{backgroundColor: color.darkBlue, padding: spacing.medium_16}}>
-        <View style={{flexDirection: "row"}}>
+    <View
+        style={{
+            backgroundColor: "darkBlue",
+            padding: "medium_16",
+            gap: "medium_16",
+        }}
+    >
+        <View style={{flexDirection: "row", gap: "medium_16"}}>
             <Button onClick={() => {}} light={true}>
                 Hello, world!
             </Button>
-            <Strut size={16} />
             <Button onClick={() => {}} light={true} kind="secondary">
                 Hello, world!
             </Button>
-            <Strut size={16} />
             <Button onClick={() => {}} light={true} kind="tertiary">
                 Hello, world!
             </Button>
         </View>
-        <Strut size={16} />
-        <View style={{flexDirection: "row"}}>
+        <View style={{flexDirection: "row", gap: "medium_16"}}>
             <Button onClick={() => {}} light={true} disabled={true}>
                 Hello, world!
             </Button>
-            <Strut size={16} />
             <Button
                 onClick={() => {}}
                 light={true}
@@ -275,7 +279,6 @@ export const Dark: StoryComponentType = () => (
             >
                 Hello, world!
             </Button>
-            <Strut size={16} />
             <Button
                 onClick={() => {}}
                 light={true}
@@ -285,12 +288,10 @@ export const Dark: StoryComponentType = () => (
                 Hello, world!
             </Button>
         </View>
-        <Strut size={16} />
-        <View style={{flexDirection: "row"}}>
+        <View style={{flexDirection: "row", gap: "medium_16"}}>
             <Button onClick={() => {}} light={true} color="destructive">
                 Hello, world!
             </Button>
-            <Strut size={16} />
             <Button
                 onClick={() => {}}
                 light={true}
@@ -299,7 +300,6 @@ export const Dark: StoryComponentType = () => (
             >
                 Hello, world!
             </Button>
-            <Strut size={16} />
             <Button
                 onClick={() => {}}
                 light={true}
@@ -622,15 +622,15 @@ export const CustomStyles = {
         },
     },
     render: (args: any) => (
-        <View style={{gap: spacing.medium_16}}>
+        <View style={{gap: "medium_16"}}>
             <HeadingSmall>Wonder Blocks theme (default)</HeadingSmall>
-            <View style={{flexDirection: "row", gap: spacing.medium_16}}>
+            <View style={{flexDirection: "row", gap: "medium_16"}}>
                 <Button {...args} kind="primary" />
                 <Button {...args} kind="secondary" />
                 <Button {...args} kind="tertiary" />
             </View>
             <HeadingSmall>Khanmigo theme</HeadingSmall>
-            <View style={{flexDirection: "row", gap: spacing.medium_16}}>
+            <View style={{flexDirection: "row", gap: "medium_16"}}>
                 <ThemeSwitcherContext.Provider value="khanmigo">
                     <Button {...args} kind="primary" />
                     <Button {...args} kind="secondary" />
@@ -758,7 +758,7 @@ export const KhanmigoTheme: StoryComponentType = {
 
         return (
             <ThemeSwitcherContext.Provider value="khanmigo">
-                <View style={{gap: spacing.medium_16}}>
+                <View style={{gap: "medium_16"}}>
                     {stories.map((Story, i) => (
                         <Story key={i} />
                     ))}

diff --git a/__docs__/wonder-blocks-core/view.stories.tsx b/__docs__/wonder-blocks-core/view.stories.tsx
@@ -1,7 +1,13 @@
 import * as React from "react";
-import {StyleSheet} from "aphrodite";
+// import {StyleSheet} from "aphrodite";
 import type {Meta, StoryObj} from "@storybook/react";
 
+import {css} from "@/styled-system/css";
+// ISSUE(juan): Panda CSS does not support external files.
+// This is due to the fact that static analysis is not possible with external
+// references.
+// https://panda-css.com/docs/guides/dynamic-styling#what-you-cant-do
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {color, spacing} from "@khanacademy/wonder-blocks-tokens";
 import {
     HeadingMedium,
@@ -51,11 +57,15 @@ export const InlineStyles: StoryComponentType = () => (
         <View
             style={[
                 styles.container,
-                {
-                    background: color.lightBlue,
-                    border: `1px solid ${color.blue}`,
-                    padding: spacing.xxxSmall_4,
-                },
+                css.raw({
+                    background: "{colors.lightBlue}",
+                    // ISSUE(juan): shorthand property defined in view.tsx
+                    // will take precedence over the longhand property.
+                    // This means that the border will be 0px (instead of 1px).
+                    // https://panda-css.com/docs/concepts/writing-styles#property-conflicts
+                    border: "1px solid {colors.gold}",
+                    padding: 4,
+                }),
             ]}
         >
             The style prop can accept a (nested) array of Aphrodite styles and
@@ -133,21 +143,28 @@ DefiningLayout.parameters = {
     },
 };
 
-const styles = StyleSheet.create({
-    container: {
-        background: color.offBlack8,
-        gap: spacing.medium_16,
-        padding: spacing.xLarge_32,
-    },
-
-    view: {
-        border: `1px dashed ${color.lightBlue}`,
-        gap: spacing.medium_16,
-        padding: spacing.medium_16,
-    },
-
-    item: {
-        background: color.offBlack32,
-        padding: spacing.medium_16,
-    },
-});
+const styles = {
+    // HACK(juan): css.raw needs to be used so that the compiler can identify
+    // that the tokens are being used and extract them via static analysis.
+    // https://panda-css.com/docs/guides/dynamic-styling#alternative
+    container: css.raw({
+        background: "offBlack8",
+        gap: "medium_16",
+        padding: "xLarge_32",
+    }),
+
+    view: css.raw({
+        // ISSUE(juan): shorthand property defined in view.tsx will take
+        // precedence over the longhand property. This means that the border
+        // will be 0px (instead of 1px).
+        // https://panda-css.com/docs/concepts/writing-styles#property-conflicts
+        border: `1px dashed {colors.lightBlue}`,
+        gap: "medium_16",
+        padding: "medium_16",
+    }),
+
+    item: css.raw({
+        background: "offBlack32",
+        padding: "medium_16",
+    }),
+};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@layer reset, base, tokens, recipes, utilities;
		/* @layer utilities; */