diff --git a/packages/@ourworldindata/grapher/src/controls/RadioButton.scss b/packages/@ourworldindata/components/src/RadioButton.scss similarity index 100% rename from packages/@ourworldindata/grapher/src/controls/RadioButton.scss rename to packages/@ourworldindata/components/src/RadioButton.scss diff --git a/packages/@ourworldindata/grapher/src/controls/RadioButton.tsx b/packages/@ourworldindata/components/src/RadioButton.tsx similarity index 100% rename from packages/@ourworldindata/grapher/src/controls/RadioButton.tsx rename to packages/@ourworldindata/components/src/RadioButton.tsx diff --git a/packages/@ourworldindata/components/src/index.ts b/packages/@ourworldindata/components/src/index.ts index fc95473f911..d4d3f6a5d3a 100644 --- a/packages/@ourworldindata/components/src/index.ts +++ b/packages/@ourworldindata/components/src/index.ts @@ -33,6 +33,7 @@ export { export { IndicatorProcessing } from "./IndicatorProcessing/IndicatorProcessing.js" export { Checkbox } from "./Checkbox.js" +export { RadioButton } from "./RadioButton.js" export { IndicatorSources } from "./IndicatorSources/IndicatorSources.js" export { diff --git a/packages/@ourworldindata/grapher/src/core/grapher.scss b/packages/@ourworldindata/grapher/src/core/grapher.scss index 1af95e7fe00..33e0bc952b2 100644 --- a/packages/@ourworldindata/grapher/src/core/grapher.scss +++ b/packages/@ourworldindata/grapher/src/core/grapher.scss @@ -78,7 +78,6 @@ $zindex-controls-drawer: 150; @import "../slideInDrawer/SlideInDrawer.scss"; @import "../sidePanel/SidePanel.scss"; @import "../closeButton/CloseButton.scss"; - @import "../controls/RadioButton.scss"; @import "../controls/Dropdown.scss"; @import "../core/OverlayHeader.scss"; } @@ -89,6 +88,7 @@ $zindex-controls-drawer: 150; @import "../controls/globalEntitySelector/GlobalEntitySelector.scss"; @import "../fullScreen/FullScreen.scss"; @import "../../../components/src/Checkbox.scss"; +@import "../../../components/src/RadioButton.scss"; .grapher_dark { color: $dark-text; diff --git a/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx b/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx index c9b8b4285e8..dd6ad58e7c9 100644 --- a/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx +++ b/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx @@ -21,7 +21,7 @@ import { excludeUndefined, intersection, } from "@ourworldindata/utils" -import { Checkbox } from "@ourworldindata/components" +import { Checkbox, RadioButton } from "@ourworldindata/components" import { FuzzySearch } from "../controls/FuzzySearch" import { faCircleXmark, @@ -31,7 +31,6 @@ import { import { FontAwesomeIcon } from "@fortawesome/react-fontawesome/index.js" import { SelectionArray } from "../selection/SelectionArray" import { Flipper, Flipped } from "react-flip-toolkit" -import { RadioButton } from "../controls/RadioButton" import { makeSelectionArray } from "../chart/ChartUtils.js" import { DEFAULT_GRAPHER_ENTITY_TYPE,