Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WB-1617: Remove Icon component #2128

Merged
merged 3 commits into from
Nov 28, 2023
Merged

WB-1617: Remove Icon component #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07a06be
Remove Icon component
jandrade Nov 27, 2023
dd1b2db
Address feedback (enum)
jandrade Nov 28, 2023
f19069e
Revert enum change
jandrade Nov 28, 2023
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/itchy-books-laugh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@khanacademy/wonder-blocks-icon": major
---

Delete Icon component in favor of PhosphorIcon
Copy link
Member

Choose a reason for hiding this comment

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

praise: ❗ 😮 ❗

187 changes: 0 additions & 187 deletions __docs__/wonder-blocks-icon/icon.stories.tsx
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions consistency-tests/__tests__/clickables.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {MemoryRouter} from "react-router-dom";
import {render, screen} from "@testing-library/react";
import userEvent from "@testing-library/user-event";

import plus from "@phosphor-icons/core/regular/plus.svg";
import {ActionItem, OptionItem} from "@khanacademy/wonder-blocks-dropdown";
import Button from "@khanacademy/wonder-blocks-button";
import Clickable from "@khanacademy/wonder-blocks-clickable";
Expand All @@ -18,7 +19,6 @@ import {
RadioGroup,
} from "@khanacademy/wonder-blocks-form";
import IconButton from "@khanacademy/wonder-blocks-icon-button";
import {icons} from "@khanacademy/wonder-blocks-icon";
import Link from "@khanacademy/wonder-blocks-link";
import {CompactCell, DetailCell} from "@khanacademy/wonder-blocks-cell";

Expand All @@ -33,9 +33,7 @@ const ClickableWrapper = (props: any) => {
);
};

const IconButtonWrapper = (props: any) => (
<IconButton {...props} icon={icons.search} />
);
const IconButtonWrapper = (props: any) => <IconButton {...props} icon={plus} />;

describe.each`
Component | name | role
Expand Down
14 changes: 6 additions & 8 deletions consistency-tests/__tests__/ref-forwarded.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import * as ReactDOM from "react-dom";

import plus from "@phosphor-icons/core/regular/plus.svg";

import {icons} from "@khanacademy/wonder-blocks-icon";

import Accordion from "../../packages/wonder-blocks-accordion/src/components/accordion";
import AccordionSection from "../../packages/wonder-blocks-accordion/src/components/accordion-section";
import Breadcrumbs from "../../packages/wonder-blocks-breadcrumbs/src/components/breadcrumbs";
import BreadcrumbsItem from "../../packages/wonder-blocks-breadcrumbs/src/components/breadcrumbs-item";
import Button from "../../packages/wonder-blocks-button/src/components/button";
import Icon from "../../packages/wonder-blocks-icon/src/components/icon";
import {PhosphorIcon} from "../../packages/wonder-blocks-icon/src/components/phosphor-icon";
import IconButton from "@khanacademy/wonder-blocks-icon-button";
import Link from "../../packages/wonder-blocks-link/src/components/link";
import Pill from "../../packages/wonder-blocks-pill/src/components/pill";
Expand Down Expand Up @@ -421,16 +419,16 @@ describe("Form elements", () => {
});
});

describe("Icon", () => {
test("forwards ref to an SVGElement", () => {
describe("PhosphorIcon", () => {
test("forwards ref to an HTMLSpanElement", () => {
// Arrange
const ref: React.RefObject<SVGSVGElement> = React.createRef();
const ref: React.RefObject<HTMLSpanElement> = React.createRef();

// Act
render(<Icon ref={ref} icon={icons.add} />);
render(<PhosphorIcon ref={ref} icon={plus} />);

// Assert
expect(ref.current).toBeInstanceOf(SVGSVGElement);
expect(ref.current).toBeInstanceOf(HTMLSpanElement);
});
});

Expand Down
Loading
Loading