Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tough-chicken-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@khanacademy/math-input": patch
---

Updates MathInput to use `semanticColor` tokens instead of the now deprecated WB color tokens.
9 changes: 5 additions & 4 deletions packages/math-input/src/components/input/math-input.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable max-lines */
import {KeypadContext} from "@khanacademy/keypad-context";
import {View} from "@khanacademy/wonder-blocks-core";
import {color} from "@khanacademy/wonder-blocks-tokens";
import {semanticColor} from "@khanacademy/wonder-blocks-tokens";
import {entries} from "@khanacademy/wonder-stuff-core";
import {StyleSheet} from "aphrodite";
import * as React from "react";
Expand Down Expand Up @@ -921,7 +921,8 @@ class MathInput extends React.Component<Props, State> {
borderWidth: this.getBorderWidthPx(),
...(showInputFocusStyle
? {
borderColor: color.blue,
borderColor:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

semanticColor.core.border.instructive.default,
}
: {}),
...style,
Expand Down Expand Up @@ -1043,9 +1044,9 @@ const inlineStyles = {
boxSizing: "border-box",
position: "relative",
borderStyle: "solid",
borderColor: color.offBlack50,
borderColor: semanticColor.core.border.neutral.default,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

borderRadius: 4,
color: color.offBlack,
color: semanticColor.core.foreground.neutral.strong,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

},
} as const;

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -89,7 +89,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -120,7 +120,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -151,7 +151,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -182,7 +182,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -213,7 +213,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -244,7 +244,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -275,7 +275,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -306,7 +306,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -337,7 +337,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -368,7 +368,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
data-testid="period-decimal"
Expand Down Expand Up @@ -400,7 +400,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52"
class="default_xu2jcg-o_O-base_5bv98r"
>
<svg
fill="none"
Expand Down Expand Up @@ -433,7 +433,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52-o_O-inlineStyles_s65xgl"
class="default_xu2jcg-o_O-base_5bv98r-o_O-inlineStyles_s65xgl"
>
<svg
fill="none"
Expand Down Expand Up @@ -466,7 +466,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52-o_O-inlineStyles_s65xgl"
class="default_xu2jcg-o_O-base_5bv98r-o_O-inlineStyles_s65xgl"
>
<svg
fill="none"
Expand Down Expand Up @@ -497,7 +497,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52-o_O-inlineStyles_s65xgl"
class="default_xu2jcg-o_O-base_5bv98r-o_O-inlineStyles_s65xgl"
>
<svg
fill="none"
Expand Down Expand Up @@ -530,7 +530,7 @@ exports[`mobile keypad should render keypad when active 1`] = `
class="default_xu2jcg-o_O-outerBoxBase_3w5jmh"
>
<div
class="default_xu2jcg-o_O-base_muxx52-o_O-inlineStyles_s65xgl"
class="default_xu2jcg-o_O-base_5bv98r-o_O-inlineStyles_s65xgl"
>
<svg
fill="none"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Popover, PopoverContentCore} from "@khanacademy/wonder-blocks-popover";
import {color} from "@khanacademy/wonder-blocks-tokens";
import {semanticColor} from "@khanacademy/wonder-blocks-tokens";
import {render, screen} from "@testing-library/react";
import {userEvent as userEventLib} from "@testing-library/user-event";
import * as React from "react";
Expand Down Expand Up @@ -108,7 +108,7 @@ function V2KeypadWithMathquill(props: Props) {
style={{
width: "100%",
marginBottom: "1em",
border: `1px solid ${color.offBlack16}`,
border: `1px solid ${semanticColor.core.border.neutral.subtle}`,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}}
ref={mathFieldWrapperRef}
/>
Expand Down
12 changes: 6 additions & 6 deletions packages/math-input/src/components/keypad/keypad-button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Clickable from "@khanacademy/wonder-blocks-clickable";
import {View} from "@khanacademy/wonder-blocks-core";
import {color} from "@khanacademy/wonder-blocks-tokens";
import {semanticColor} from "@khanacademy/wonder-blocks-tokens";
import {StyleSheet} from "aphrodite";
import * as React from "react";

Expand Down Expand Up @@ -84,9 +84,9 @@ const styles = StyleSheet.create({
display: "flex",
justifyContent: "center",
alignItems: "center",
boxShadow: `0px 1px 0px ${color.offBlack32}`,
boxShadow: `0px 1px 0px ${semanticColor.core.shadow.chonky.neutral.subtle}`,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

boxSizing: "border-box",
background: color.white,
background: semanticColor.core.background.base.default,
borderRadius: 4,
borderWidth: 2,
borderStyle: "solid",
Expand All @@ -98,19 +98,19 @@ const styles = StyleSheet.create({
fontFamily: 'Lato, "Noto Sans", sans-serif',
},
hovered: {
borderColor: color.blue,
borderColor: semanticColor.core.border.instructive.default,
padding: 1,
boxShadow: "none",
},
focused: {
borderColor: color.blue,
borderColor: semanticColor.core.border.instructive.default,
padding: 0,
boxShadow: "none",
},
pressed: {
border: "2px solid #1B50B3",
padding: 0,
background: `linear-gradient(0deg, rgba(24, 101, 242, 0.32), rgba(24, 101, 242, 0.32)), ${color.white}`,
background: `linear-gradient(0deg, rgba(24, 101, 242, 0.32), rgba(24, 101, 242, 0.32)), ${semanticColor.core.background.base.default}`,
boxShadow: "none",
},
outerBoxBase: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Popover, PopoverContentCore} from "@khanacademy/wonder-blocks-popover";
import {color, spacing} from "@khanacademy/wonder-blocks-tokens";
import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens";
import * as React from "react";

import {mockStrings} from "../../strings";
Expand Down Expand Up @@ -107,7 +107,7 @@ export function V2KeypadWithMathquill() {
style={{
width: "100%",
marginBottom: "1em",
border: `1px solid ${color.offBlack16}`,
border: `1px solid ${semanticColor.core.border.neutral.subtle}`,
}}
ref={mathFieldWrapperRef}
/>
Expand Down
14 changes: 7 additions & 7 deletions packages/math-input/src/components/keypad/navigation-button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Clickable from "@khanacademy/wonder-blocks-clickable";
import {View} from "@khanacademy/wonder-blocks-core";
import {color} from "@khanacademy/wonder-blocks-tokens";
import {semanticColor} from "@khanacademy/wonder-blocks-tokens";
import {StyleSheet} from "aphrodite";
import * as React from "react";

Expand Down Expand Up @@ -87,13 +87,13 @@ const styles = StyleSheet.create({
width: "100%",
},
base: {
boxShadow: `0px 1px 0px ${color.offBlack32}`,
boxShadow: `0px 1px 0px ${semanticColor.core.shadow.chonky.neutral.subtle}`,
display: "flex",
justifyContent: "center",
alignItems: "center",
background: color.white,
background: semanticColor.core.background.base.default,
borderWidth: 2,
borderColor: color.white,
borderColor: semanticColor.core.border.knockout.default,
},
up: {
borderTopLeftRadius: borderRadiusPx,
Expand All @@ -112,16 +112,16 @@ const styles = StyleSheet.create({
borderBottomLeftRadius: borderRadiusPx,
},
hovered: {
borderColor: color.blue,
borderColor: semanticColor.core.border.instructive.default,
boxShadow: "none",
},
focused: {
borderColor: color.blue,
borderColor: semanticColor.core.border.instructive.default,
boxShadow: "none",
},
pressed: {
border: "2px solid #1B50B3",
background: `linear-gradient(0deg, rgba(24, 101, 242, 0.32), rgba(24, 101, 242, 0.32)), ${color.white}`,
background: `linear-gradient(0deg, rgba(24, 101, 242, 0.32), rgba(24, 101, 242, 0.32)), ${semanticColor.core.background.base.default}`,
boxShadow: "none",
},
});
4 changes: 2 additions & 2 deletions packages/math-input/src/components/keypad/navigation-pad.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {View} from "@khanacademy/wonder-blocks-core";
import {color} from "@khanacademy/wonder-blocks-tokens";
import {semanticColor} from "@khanacademy/wonder-blocks-tokens";
import {StyleSheet} from "aphrodite";
import * as React from "react";

Expand Down Expand Up @@ -65,6 +65,6 @@ const styles = StyleSheet.create({
spacer: {
gridColumn: 2,
gridRow: 2,
background: color.white,
background: semanticColor.core.background.base.default,
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ exports[`rendering supports mobile rendering: mobile render 1`] = `
>
<div
class="mq-editable-field mq-math-mode"
style="background-color: white; min-height: 44px; min-width: 64px; max-width: 128px; box-sizing: border-box; position: relative; border-style: solid; border-color: rgba(33,36,44,0.50); border-radius: 4px; color: rgb(33, 36, 44); border-width: 1px;"
style="background-color: white; min-height: 44px; min-width: 64px; max-width: 128px; box-sizing: border-box; position: relative; border-style: solid; border-radius: 4px; border-width: 1px;"
>
<span
class="mq-textarea"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ exports[`Numeric input widget styles differently on mobile: mobile render 1`] =
>
<div
class="mq-editable-field mq-math-mode"
style="background-color: white; min-height: 44px; min-width: 64px; max-width: 128px; box-sizing: border-box; position: relative; border-style: solid; border-color: rgba(33,36,44,0.50); border-radius: 4px; color: rgb(33, 36, 44); border-width: 1px;"
style="background-color: white; min-height: 44px; min-width: 64px; max-width: 128px; box-sizing: border-box; position: relative; border-style: solid; border-radius: 4px; border-width: 1px;"
>
<span
class="mq-textarea"
Expand Down
Loading