From f2e461a6509042dad0100022c6d8a78b86a6294a Mon Sep 17 00:00:00 2001 From: Mark Fitzgerald Date: Thu, 20 Jun 2024 15:30:54 -0700 Subject: [PATCH 1/4] Move locked figures files to their own directories. Update references in consuming files. --- .../__stories__/locked-ellipse-settings.stories.tsx | 2 +- .../__stories__/locked-figures-section.stories.tsx | 2 +- .../__stories__/locked-line-settings.stories.tsx | 2 +- .../__stories__/locked-point-settings.stories.tsx | 2 +- .../__stories__/locked-polygon-settings.stories.tsx | 2 +- .../__stories__/locked-vector-settings.stories.tsx | 2 +- .../__tests__/locked-ellipse-settings.test.tsx | 2 +- .../__tests__/locked-figures-section.test.tsx | 2 +- .../__tests__/locked-line-settings.test.tsx | 2 +- .../__tests__/locked-point-settings.test.tsx | 2 +- .../__tests__/locked-polygon-settings.test.tsx | 2 +- .../__tests__/locked-vector-settings.test.tsx | 4 ++-- .../src/components/defining-point-settings.tsx | 2 +- .../locked-ellipse-settings.tsx | 8 ++++---- .../locked-figure-select.tsx | 0 .../locked-figure-settings-accordion.tsx | 0 .../locked-figure-settings-actions.tsx | 0 .../locked-figure-settings.tsx | 0 .../locked-figures-section.tsx | 4 ++-- .../locked-line-settings.tsx | 6 +++--- .../locked-point-settings.tsx | 8 ++++---- .../locked-polygon-settings.tsx | 8 ++++---- .../locked-vector-settings.tsx | 6 +++--- .../src/widgets/interactive-graph-editor.tsx | 2 +- .../interactive-graphs/graph-locked-layer.tsx | 10 +++++----- .../{ => locked-figures}/locked-ellipse.tsx | 2 +- .../{ => locked-figures}/locked-line.tsx | 13 ++++++------- .../{ => locked-figures}/locked-point.tsx | 2 +- .../{ => locked-figures}/locked-polygon.tsx | 7 +++++-- .../{ => locked-figures}/locked-vector.tsx | 7 +++---- 30 files changed, 56 insertions(+), 55 deletions(-) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-ellipse-settings.tsx (96%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-figure-select.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-figure-settings-accordion.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-figure-settings-actions.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-figure-settings.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-figures-section.tsx (98%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-line-settings.tsx (97%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-point-settings.tsx (93%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-polygon-settings.tsx (97%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/locked-vector-settings.tsx (97%) rename packages/perseus/src/widgets/interactive-graphs/{ => locked-figures}/locked-ellipse.tsx (94%) rename packages/perseus/src/widgets/interactive-graphs/{ => locked-figures}/locked-line.tsx (92%) rename packages/perseus/src/widgets/interactive-graphs/{ => locked-figures}/locked-point.tsx (88%) rename packages/perseus/src/widgets/interactive-graphs/{ => locked-figures}/locked-polygon.tsx (84%) rename packages/perseus/src/widgets/interactive-graphs/{ => locked-figures}/locked-vector.tsx (66%) diff --git a/packages/perseus-editor/src/components/__stories__/locked-ellipse-settings.stories.tsx b/packages/perseus-editor/src/components/__stories__/locked-ellipse-settings.stories.tsx index ade3409a31..2436950d37 100644 --- a/packages/perseus-editor/src/components/__stories__/locked-ellipse-settings.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/locked-ellipse-settings.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import LockedEllipseSettings from "../locked-ellipse-settings"; +import LockedEllipseSettings from "../graph-locked-figures/locked-ellipse-settings"; import {getDefaultFigureForType} from "../util"; import type {Meta, StoryObj} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/__stories__/locked-figures-section.stories.tsx b/packages/perseus-editor/src/components/__stories__/locked-figures-section.stories.tsx index b58d98f5a7..cbc315f0d0 100644 --- a/packages/perseus-editor/src/components/__stories__/locked-figures-section.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/locked-figures-section.stories.tsx @@ -3,7 +3,7 @@ import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import LockedFiguresSection from "../locked-figures-section"; +import LockedFiguresSection from "../graph-locked-figures/locked-figures-section"; import {getDefaultFigureForType} from "../util"; import type {Meta, StoryObj} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/__stories__/locked-line-settings.stories.tsx b/packages/perseus-editor/src/components/__stories__/locked-line-settings.stories.tsx index 50c762d67a..003e30999c 100644 --- a/packages/perseus-editor/src/components/__stories__/locked-line-settings.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/locked-line-settings.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import LockedLineSettings from "../locked-line-settings"; +import LockedLineSettings from "../graph-locked-figures/locked-line-settings"; import {getDefaultFigureForType} from "../util"; import type {Meta, StoryObj} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/__stories__/locked-point-settings.stories.tsx b/packages/perseus-editor/src/components/__stories__/locked-point-settings.stories.tsx index 1b45eeff3f..ba36d489cf 100644 --- a/packages/perseus-editor/src/components/__stories__/locked-point-settings.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/locked-point-settings.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import LockedPointSettings from "../locked-point-settings"; +import LockedPointSettings from "../graph-locked-figures/locked-point-settings"; import {getDefaultFigureForType} from "../util"; import type {Meta, StoryObj} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/__stories__/locked-polygon-settings.stories.tsx b/packages/perseus-editor/src/components/__stories__/locked-polygon-settings.stories.tsx index b0836aae80..aed7fc842f 100644 --- a/packages/perseus-editor/src/components/__stories__/locked-polygon-settings.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/locked-polygon-settings.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import LockedPolygonSettings from "../locked-polygon-settings"; +import LockedPolygonSettings from "../graph-locked-figures/locked-polygon-settings"; import {getDefaultFigureForType} from "../util"; import type {Meta, StoryObj} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/__stories__/locked-vector-settings.stories.tsx b/packages/perseus-editor/src/components/__stories__/locked-vector-settings.stories.tsx index 4886bf5311..f127556cea 100644 --- a/packages/perseus-editor/src/components/__stories__/locked-vector-settings.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/locked-vector-settings.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import LockedVectorSettings from "../locked-vector-settings"; +import LockedVectorSettings from "../graph-locked-figures/locked-vector-settings"; import {getDefaultFigureForType} from "../util"; import type {Meta, StoryObj} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/__tests__/locked-ellipse-settings.test.tsx b/packages/perseus-editor/src/components/__tests__/locked-ellipse-settings.test.tsx index 566307c427..6637f6f152 100644 --- a/packages/perseus-editor/src/components/__tests__/locked-ellipse-settings.test.tsx +++ b/packages/perseus-editor/src/components/__tests__/locked-ellipse-settings.test.tsx @@ -3,7 +3,7 @@ import {render, screen} from "@testing-library/react"; import {userEvent as userEventLib} from "@testing-library/user-event"; import * as React from "react"; -import LockedEllipseSettings from "../locked-ellipse-settings"; +import LockedEllipseSettings from "../graph-locked-figures/locked-ellipse-settings"; import {getDefaultFigureForType} from "../util"; import type {UserEvent} from "@testing-library/user-event"; diff --git a/packages/perseus-editor/src/components/__tests__/locked-figures-section.test.tsx b/packages/perseus-editor/src/components/__tests__/locked-figures-section.test.tsx index 3e39738eb9..e6b354354a 100644 --- a/packages/perseus-editor/src/components/__tests__/locked-figures-section.test.tsx +++ b/packages/perseus-editor/src/components/__tests__/locked-figures-section.test.tsx @@ -3,7 +3,7 @@ import {screen, render} from "@testing-library/react"; import {userEvent as userEventLib} from "@testing-library/user-event"; import * as React from "react"; -import LockedFiguresSection from "../locked-figures-section"; +import LockedFiguresSection from "../graph-locked-figures/locked-figures-section"; import {getDefaultFigureForType} from "../util"; import type {UserEvent} from "@testing-library/user-event"; diff --git a/packages/perseus-editor/src/components/__tests__/locked-line-settings.test.tsx b/packages/perseus-editor/src/components/__tests__/locked-line-settings.test.tsx index 32f4986e69..311d0d5ae5 100644 --- a/packages/perseus-editor/src/components/__tests__/locked-line-settings.test.tsx +++ b/packages/perseus-editor/src/components/__tests__/locked-line-settings.test.tsx @@ -3,7 +3,7 @@ import {render, screen} from "@testing-library/react"; import {userEvent as userEventLib} from "@testing-library/user-event"; import * as React from "react"; -import LockedLineSettings from "../locked-line-settings"; +import LockedLineSettings from "../graph-locked-figures/locked-line-settings"; import {getDefaultFigureForType} from "../util"; import type {UserEvent} from "@testing-library/user-event"; diff --git a/packages/perseus-editor/src/components/__tests__/locked-point-settings.test.tsx b/packages/perseus-editor/src/components/__tests__/locked-point-settings.test.tsx index 5ad1cf2a0e..8481c3a0f0 100644 --- a/packages/perseus-editor/src/components/__tests__/locked-point-settings.test.tsx +++ b/packages/perseus-editor/src/components/__tests__/locked-point-settings.test.tsx @@ -3,7 +3,7 @@ import {render, screen} from "@testing-library/react"; import {userEvent as userEventLib} from "@testing-library/user-event"; import * as React from "react"; -import LockedPointSettings from "../locked-point-settings"; +import LockedPointSettings from "../graph-locked-figures/locked-point-settings"; import {getDefaultFigureForType} from "../util"; import type {UserEvent} from "@testing-library/user-event"; diff --git a/packages/perseus-editor/src/components/__tests__/locked-polygon-settings.test.tsx b/packages/perseus-editor/src/components/__tests__/locked-polygon-settings.test.tsx index 66c3c474e6..083f606d80 100644 --- a/packages/perseus-editor/src/components/__tests__/locked-polygon-settings.test.tsx +++ b/packages/perseus-editor/src/components/__tests__/locked-polygon-settings.test.tsx @@ -3,7 +3,7 @@ import {render, screen} from "@testing-library/react"; import {userEvent as userEventLib} from "@testing-library/user-event"; import * as React from "react"; -import LockedPolygonSettings from "../locked-polygon-settings"; +import LockedPolygonSettings from "../graph-locked-figures/locked-polygon-settings"; import {getDefaultFigureForType} from "../util"; import type {UserEvent} from "@testing-library/user-event"; diff --git a/packages/perseus-editor/src/components/__tests__/locked-vector-settings.test.tsx b/packages/perseus-editor/src/components/__tests__/locked-vector-settings.test.tsx index e1005b6968..b9d449d464 100644 --- a/packages/perseus-editor/src/components/__tests__/locked-vector-settings.test.tsx +++ b/packages/perseus-editor/src/components/__tests__/locked-vector-settings.test.tsx @@ -3,10 +3,10 @@ import {render, screen} from "@testing-library/react"; import {userEvent as userEventLib} from "@testing-library/user-event"; import * as React from "react"; -import LockedVectorSettings from "../locked-vector-settings"; +import LockedVectorSettings from "../graph-locked-figures/locked-vector-settings"; import {getDefaultFigureForType} from "../util"; -import type {Props} from "../locked-vector-settings"; +import type {Props} from "../graph-locked-figures/locked-vector-settings"; import type {UserEvent} from "@testing-library/user-event"; const defaultProps = { diff --git a/packages/perseus-editor/src/components/defining-point-settings.tsx b/packages/perseus-editor/src/components/defining-point-settings.tsx index dba6308f73..4214c551ed 100644 --- a/packages/perseus-editor/src/components/defining-point-settings.tsx +++ b/packages/perseus-editor/src/components/defining-point-settings.tsx @@ -14,8 +14,8 @@ import * as React from "react"; import ColorSelect from "./color-select"; import ColorSwatch from "./color-swatch"; import CoordinatePairInput from "./coordinate-pair-input"; +import LockedFigureSettingsAccordion from "./graph-locked-figures/locked-figure-settings-accordion"; import LabeledSwitch from "./labeled-switch"; -import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import type {LockedPointType} from "@khanacademy/perseus"; diff --git a/packages/perseus-editor/src/components/locked-ellipse-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx similarity index 96% rename from packages/perseus-editor/src/components/locked-ellipse-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx index 00a9628ca5..82eb3db5bd 100644 --- a/packages/perseus-editor/src/components/locked-ellipse-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx @@ -7,10 +7,10 @@ import {LabelMedium, LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import AngleInput from "./angle-input"; -import ColorSelect from "./color-select"; -import CoordinatePairInput from "./coordinate-pair-input"; -import EllipseSwatch from "./ellipse-swatch"; +import AngleInput from "../angle-input"; +import ColorSelect from "../color-select"; +import CoordinatePairInput from "../coordinate-pair-input"; +import EllipseSwatch from "../ellipse-swatch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/locked-figure-select.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figure-select.tsx similarity index 100% rename from packages/perseus-editor/src/components/locked-figure-select.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-figure-select.tsx diff --git a/packages/perseus-editor/src/components/locked-figure-settings-accordion.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figure-settings-accordion.tsx similarity index 100% rename from packages/perseus-editor/src/components/locked-figure-settings-accordion.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-figure-settings-accordion.tsx diff --git a/packages/perseus-editor/src/components/locked-figure-settings-actions.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figure-settings-actions.tsx similarity index 100% rename from packages/perseus-editor/src/components/locked-figure-settings-actions.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-figure-settings-actions.tsx diff --git a/packages/perseus-editor/src/components/locked-figure-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figure-settings.tsx similarity index 100% rename from packages/perseus-editor/src/components/locked-figure-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-figure-settings.tsx diff --git a/packages/perseus-editor/src/components/locked-figures-section.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx similarity index 98% rename from packages/perseus-editor/src/components/locked-figures-section.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx index 7770cda492..1087a4eafd 100644 --- a/packages/perseus-editor/src/components/locked-figures-section.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx @@ -12,10 +12,10 @@ import * as React from "react"; import LockedFigureSelect from "./locked-figure-select"; import LockedFigureSettings from "./locked-figure-settings"; -import {getDefaultFigureForType} from "./util"; +import {getDefaultFigureForType} from "../util"; import type {LockedFigureSettingsMovementType} from "./locked-figure-settings-actions"; -import type {Props as InteractiveGraphEditorProps} from "../widgets/interactive-graph-editor"; +import type {Props as InteractiveGraphEditorProps} from "../../widgets/interactive-graph-editor"; import type {LockedFigure, LockedFigureType} from "@khanacademy/perseus"; type Props = { diff --git a/packages/perseus-editor/src/components/locked-line-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx similarity index 97% rename from packages/perseus-editor/src/components/locked-line-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx index 07684f843a..fef8abf969 100644 --- a/packages/perseus-editor/src/components/locked-line-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx @@ -13,9 +13,9 @@ import {LabelMedium, LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "./color-select"; -import DefiningPointSettings from "./defining-point-settings"; -import LineSwatch from "./line-swatch"; +import ColorSelect from "../color-select"; +import DefiningPointSettings from "../defining-point-settings"; +import LineSwatch from "../line-swatch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/locked-point-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx similarity index 93% rename from packages/perseus-editor/src/components/locked-point-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx index fdd8de7fe6..e7b3296540 100644 --- a/packages/perseus-editor/src/components/locked-point-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx @@ -11,10 +11,10 @@ import {LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "./color-select"; -import ColorSwatch from "./color-swatch"; -import CoordinatePairInput from "./coordinate-pair-input"; -import LabeledSwitch from "./labeled-switch"; +import ColorSelect from "../color-select"; +import ColorSwatch from "../color-swatch"; +import CoordinatePairInput from "../coordinate-pair-input"; +import LabeledSwitch from "../labeled-switch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/locked-polygon-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx similarity index 97% rename from packages/perseus-editor/src/components/locked-polygon-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx index aeb24a29c4..311d7eea68 100644 --- a/packages/perseus-editor/src/components/locked-polygon-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx @@ -17,12 +17,12 @@ import plusCircle from "@phosphor-icons/core/regular/plus-circle.svg"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "./color-select"; -import CoordinatePairInput from "./coordinate-pair-input"; -import LabeledSwitch from "./labeled-switch"; +import ColorSelect from "../color-select"; +import CoordinatePairInput from "../coordinate-pair-input"; +import LabeledSwitch from "../labeled-switch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; -import PolygonSwatch from "./polygon-swatch"; +import PolygonSwatch from "../polygon-swatch"; import type {LockedFigureSettingsCommonProps} from "./locked-figure-settings"; diff --git a/packages/perseus-editor/src/components/locked-vector-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx similarity index 97% rename from packages/perseus-editor/src/components/locked-vector-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx index 30067b1389..0477ad042d 100644 --- a/packages/perseus-editor/src/components/locked-vector-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx @@ -12,9 +12,9 @@ import {LabelLarge, LabelMedium} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "./color-select"; -import CoordinatePairInput from "./coordinate-pair-input"; -import LineSwatch from "./line-swatch"; +import ColorSelect from "../color-select"; +import CoordinatePairInput from "../coordinate-pair-input"; +import LineSwatch from "../line-swatch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx index 6a8e9efd21..621b909865 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx @@ -17,11 +17,11 @@ import {StyleSheet} from "aphrodite"; import * as React from "react"; import _ from "underscore"; +import LockedFiguresSection from "../components/graph-locked-figures/locked-figures-section"; import GraphPointsCountSelector from "../components/graph-points-count-selector"; import GraphTypeSelector from "../components/graph-type-selector"; import InteractiveGraphSettings from "../components/interactive-graph-settings"; import LabeledRow from "../components/labeled-row"; -import LockedFiguresSection from "../components/locked-figures-section"; import SegmentCountSelector from "../components/segment-count-selector"; import {parsePointCount} from "../util/points"; diff --git a/packages/perseus/src/widgets/interactive-graphs/graph-locked-layer.tsx b/packages/perseus/src/widgets/interactive-graphs/graph-locked-layer.tsx index 9df183a77f..fc0dd02120 100644 --- a/packages/perseus/src/widgets/interactive-graphs/graph-locked-layer.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/graph-locked-layer.tsx @@ -1,11 +1,11 @@ import {UnreachableCaseError} from "@khanacademy/wonder-stuff-core"; import * as React from "react"; -import LockedEllipse from "./locked-ellipse"; -import LockedLine from "./locked-line"; -import LockedPoint from "./locked-point"; -import LockedPolygon from "./locked-polygon"; -import LockedVector from "./locked-vector"; +import LockedEllipse from "./locked-figures/locked-ellipse"; +import LockedLine from "./locked-figures/locked-line"; +import LockedPoint from "./locked-figures/locked-point"; +import LockedPolygon from "./locked-figures/locked-polygon"; +import LockedVector from "./locked-figures/locked-vector"; import type {LockedFigure} from "../../perseus-types"; import type {Interval} from "mafs"; diff --git a/packages/perseus/src/widgets/interactive-graphs/locked-ellipse.tsx b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-ellipse.tsx similarity index 94% rename from packages/perseus/src/widgets/interactive-graphs/locked-ellipse.tsx rename to packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-ellipse.tsx index 4e3756421e..0abd9bd677 100644 --- a/packages/perseus/src/widgets/interactive-graphs/locked-ellipse.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-ellipse.tsx @@ -5,7 +5,7 @@ import { lockedFigureFillStyles, lockedFigureColors, type LockedEllipseType, -} from "../../perseus-types"; +} from "../../../perseus-types"; const LockedEllipse = (props: LockedEllipseType) => { const {center, radius, angle, color, fillStyle, strokeStyle} = props; diff --git a/packages/perseus/src/widgets/interactive-graphs/locked-line.tsx b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-line.tsx similarity index 92% rename from packages/perseus/src/widgets/interactive-graphs/locked-line.tsx rename to packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-line.tsx index 94bb5e428b..494cb39962 100644 --- a/packages/perseus/src/widgets/interactive-graphs/locked-line.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-line.tsx @@ -2,17 +2,16 @@ import {color as wbColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {Point, Line, vec} from "mafs"; import * as React from "react"; -import {lockedFigureColors} from "../../perseus-types"; - -import {Arrowhead} from "./graphs/components/arrowhead"; -import {Vector} from "./graphs/components/vector"; -import {useTransformVectorsToPixels} from "./graphs/use-transform"; +import {lockedFigureColors} from "../../../perseus-types"; +import {Arrowhead} from "../graphs/components/arrowhead"; +import {Vector} from "../graphs/components/vector"; +import {useTransformVectorsToPixels} from "../graphs/use-transform"; import { calculateAngleInDegrees, getIntersectionOfRayWithBox, -} from "./graphs/utils"; +} from "../graphs/utils"; -import type {LockedLineType} from "../../perseus-types"; +import type {LockedLineType} from "../../../perseus-types"; import type {Interval} from "mafs"; type Props = LockedLineType & { diff --git a/packages/perseus/src/widgets/interactive-graphs/locked-point.tsx b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-point.tsx similarity index 88% rename from packages/perseus/src/widgets/interactive-graphs/locked-point.tsx rename to packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-point.tsx index 57fd0f3522..c7c1046dbe 100644 --- a/packages/perseus/src/widgets/interactive-graphs/locked-point.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-point.tsx @@ -2,7 +2,7 @@ import {color as wbColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {Point} from "mafs"; import * as React from "react"; -import {lockedFigureColors, type LockedPointType} from "../../perseus-types"; +import {lockedFigureColors, type LockedPointType} from "../../../perseus-types"; const LockedPoint = (props: LockedPointType) => { const {color, coord, filled} = props; diff --git a/packages/perseus/src/widgets/interactive-graphs/locked-polygon.tsx b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-polygon.tsx similarity index 84% rename from packages/perseus/src/widgets/interactive-graphs/locked-polygon.tsx rename to packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-polygon.tsx index d4735965b9..f80e8dbc8a 100644 --- a/packages/perseus/src/widgets/interactive-graphs/locked-polygon.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-polygon.tsx @@ -1,9 +1,12 @@ import {Point, Polygon} from "mafs"; import * as React from "react"; -import {lockedFigureColors, lockedFigureFillStyles} from "../../perseus-types"; +import { + lockedFigureColors, + lockedFigureFillStyles, +} from "../../../perseus-types"; -import type {LockedPolygonType} from "../../perseus-types"; +import type {LockedPolygonType} from "../../../perseus-types"; const LockedPolygon = (props: LockedPolygonType) => { const {points, color, showVertices, fillStyle, strokeStyle} = props; diff --git a/packages/perseus/src/widgets/interactive-graphs/locked-vector.tsx b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-vector.tsx similarity index 66% rename from packages/perseus/src/widgets/interactive-graphs/locked-vector.tsx rename to packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-vector.tsx index 1fac389241..76da8f769d 100644 --- a/packages/perseus/src/widgets/interactive-graphs/locked-vector.tsx +++ b/packages/perseus/src/widgets/interactive-graphs/locked-figures/locked-vector.tsx @@ -1,10 +1,9 @@ import * as React from "react"; -import {lockedFigureColors} from "../../perseus-types"; +import {lockedFigureColors} from "../../../perseus-types"; +import {Vector} from "../graphs/components/vector"; -import {Vector} from "./graphs/components/vector"; - -import type {LockedVectorType} from "../../perseus-types"; +import type {LockedVectorType} from "../../../perseus-types"; const LockedVector = (props: LockedVectorType) => { const {color, points} = props; From d829468281c5ddb3e3786957c257745e67291703 Mon Sep 17 00:00:00 2001 From: Mark Fitzgerald Date: Thu, 20 Jun 2024 15:34:38 -0700 Subject: [PATCH 2/4] Fix linting errors. --- .../graph-locked-figures/locked-ellipse-settings.tsx | 1 + .../components/graph-locked-figures/locked-figures-section.tsx | 3 ++- .../components/graph-locked-figures/locked-line-settings.tsx | 1 + .../components/graph-locked-figures/locked-point-settings.tsx | 1 + .../graph-locked-figures/locked-polygon-settings.tsx | 3 ++- .../components/graph-locked-figures/locked-vector-settings.tsx | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx index 82eb3db5bd..eb94cda180 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx @@ -11,6 +11,7 @@ import AngleInput from "../angle-input"; import ColorSelect from "../color-select"; import CoordinatePairInput from "../coordinate-pair-input"; import EllipseSwatch from "../ellipse-swatch"; + import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx index 1087a4eafd..40ca3b8620 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx @@ -10,9 +10,10 @@ import {spacing} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet} from "aphrodite"; import * as React from "react"; +import {getDefaultFigureForType} from "../util"; + import LockedFigureSelect from "./locked-figure-select"; import LockedFigureSettings from "./locked-figure-settings"; -import {getDefaultFigureForType} from "../util"; import type {LockedFigureSettingsMovementType} from "./locked-figure-settings-actions"; import type {Props as InteractiveGraphEditorProps} from "../../widgets/interactive-graph-editor"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx index fef8abf969..116c05a767 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx @@ -16,6 +16,7 @@ import * as React from "react"; import ColorSelect from "../color-select"; import DefiningPointSettings from "../defining-point-settings"; import LineSwatch from "../line-swatch"; + import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx index e7b3296540..2f231b0b83 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx @@ -15,6 +15,7 @@ import ColorSelect from "../color-select"; import ColorSwatch from "../color-swatch"; import CoordinatePairInput from "../coordinate-pair-input"; import LabeledSwitch from "../labeled-switch"; + import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx index 311d7eea68..81e2403882 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx @@ -20,9 +20,10 @@ import * as React from "react"; import ColorSelect from "../color-select"; import CoordinatePairInput from "../coordinate-pair-input"; import LabeledSwitch from "../labeled-switch"; +import PolygonSwatch from "../polygon-swatch"; + import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; -import PolygonSwatch from "../polygon-swatch"; import type {LockedFigureSettingsCommonProps} from "./locked-figure-settings"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx index 0477ad042d..9fd5f241fc 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx @@ -15,6 +15,7 @@ import * as React from "react"; import ColorSelect from "../color-select"; import CoordinatePairInput from "../coordinate-pair-input"; import LineSwatch from "../line-swatch"; + import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; From b6389671eb8a819df9b9c361dd8ef2172c5781fd Mon Sep 17 00:00:00 2001 From: Mark Fitzgerald Date: Thu, 20 Jun 2024 15:35:47 -0700 Subject: [PATCH 3/4] Include changeset. --- .changeset/giant-shoes-wait.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/giant-shoes-wait.md diff --git a/.changeset/giant-shoes-wait.md b/.changeset/giant-shoes-wait.md new file mode 100644 index 0000000000..0c3e74d62e --- /dev/null +++ b/.changeset/giant-shoes-wait.md @@ -0,0 +1,6 @@ +--- +"@khanacademy/perseus": patch +"@khanacademy/perseus-editor": patch +--- + +Organize locked figures within Interactive Graph into their own folders for better organization From 525ea1df8799eb7445c008d900310988d6c2f9c3 Mon Sep 17 00:00:00 2001 From: Mark Fitzgerald Date: Thu, 20 Jun 2024 15:54:30 -0700 Subject: [PATCH 4/4] Relocate additional locked-figures files. --- .../src/components/__stories__/color-select.stories.tsx | 2 +- .../src/components/__stories__/color-swatch.stories.tsx | 2 +- .../{ => graph-locked-figures}/color-select.tsx | 0 .../{ => graph-locked-figures}/color-swatch.tsx | 0 .../{ => graph-locked-figures}/coordinate-pair-input.tsx | 0 .../defining-point-settings.tsx | 2 +- .../{ => graph-locked-figures}/ellipse-swatch.tsx | 0 .../{ => graph-locked-figures}/labeled-row.tsx | 0 .../{ => graph-locked-figures}/labeled-switch.tsx | 0 .../{ => graph-locked-figures}/line-swatch.tsx | 0 .../graph-locked-figures/locked-ellipse-settings.tsx | 6 +++--- .../graph-locked-figures/locked-line-settings.tsx | 7 +++---- .../graph-locked-figures/locked-point-settings.tsx | 9 ++++----- .../graph-locked-figures/locked-polygon-settings.tsx | 9 ++++----- .../graph-locked-figures/locked-vector-settings.tsx | 7 +++---- .../{ => graph-locked-figures}/polygon-swatch.tsx | 0 .../src/components/interactive-graph-settings.tsx | 2 +- .../src/widgets/interactive-graph-editor.tsx | 2 +- 18 files changed, 22 insertions(+), 26 deletions(-) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/color-select.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/color-swatch.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/coordinate-pair-input.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/defining-point-settings.tsx (97%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/ellipse-swatch.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/labeled-row.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/labeled-switch.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/line-swatch.tsx (100%) rename packages/perseus-editor/src/components/{ => graph-locked-figures}/polygon-swatch.tsx (100%) diff --git a/packages/perseus-editor/src/components/__stories__/color-select.stories.tsx b/packages/perseus-editor/src/components/__stories__/color-select.stories.tsx index abc510ee4e..53150bc5a7 100644 --- a/packages/perseus-editor/src/components/__stories__/color-select.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/color-select.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import ColorSelect from "../color-select"; +import ColorSelect from "../graph-locked-figures/color-select"; import {getDefaultFigureForType} from "../util"; import type {LockedFigureColor} from "@khanacademy/perseus"; diff --git a/packages/perseus-editor/src/components/__stories__/color-swatch.stories.tsx b/packages/perseus-editor/src/components/__stories__/color-swatch.stories.tsx index b74582c6eb..d2f94f9690 100644 --- a/packages/perseus-editor/src/components/__stories__/color-swatch.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/color-swatch.stories.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import ColorSwatch from "../color-swatch"; +import ColorSwatch from "../graph-locked-figures/color-swatch"; import {getDefaultFigureForType} from "../util"; import type {Meta} from "@storybook/react"; diff --git a/packages/perseus-editor/src/components/color-select.tsx b/packages/perseus-editor/src/components/graph-locked-figures/color-select.tsx similarity index 100% rename from packages/perseus-editor/src/components/color-select.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/color-select.tsx diff --git a/packages/perseus-editor/src/components/color-swatch.tsx b/packages/perseus-editor/src/components/graph-locked-figures/color-swatch.tsx similarity index 100% rename from packages/perseus-editor/src/components/color-swatch.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/color-swatch.tsx diff --git a/packages/perseus-editor/src/components/coordinate-pair-input.tsx b/packages/perseus-editor/src/components/graph-locked-figures/coordinate-pair-input.tsx similarity index 100% rename from packages/perseus-editor/src/components/coordinate-pair-input.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/coordinate-pair-input.tsx diff --git a/packages/perseus-editor/src/components/defining-point-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/defining-point-settings.tsx similarity index 97% rename from packages/perseus-editor/src/components/defining-point-settings.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/defining-point-settings.tsx index 4214c551ed..dba6308f73 100644 --- a/packages/perseus-editor/src/components/defining-point-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/defining-point-settings.tsx @@ -14,8 +14,8 @@ import * as React from "react"; import ColorSelect from "./color-select"; import ColorSwatch from "./color-swatch"; import CoordinatePairInput from "./coordinate-pair-input"; -import LockedFigureSettingsAccordion from "./graph-locked-figures/locked-figure-settings-accordion"; import LabeledSwitch from "./labeled-switch"; +import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import type {LockedPointType} from "@khanacademy/perseus"; diff --git a/packages/perseus-editor/src/components/ellipse-swatch.tsx b/packages/perseus-editor/src/components/graph-locked-figures/ellipse-swatch.tsx similarity index 100% rename from packages/perseus-editor/src/components/ellipse-swatch.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/ellipse-swatch.tsx diff --git a/packages/perseus-editor/src/components/labeled-row.tsx b/packages/perseus-editor/src/components/graph-locked-figures/labeled-row.tsx similarity index 100% rename from packages/perseus-editor/src/components/labeled-row.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/labeled-row.tsx diff --git a/packages/perseus-editor/src/components/labeled-switch.tsx b/packages/perseus-editor/src/components/graph-locked-figures/labeled-switch.tsx similarity index 100% rename from packages/perseus-editor/src/components/labeled-switch.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/labeled-switch.tsx diff --git a/packages/perseus-editor/src/components/line-swatch.tsx b/packages/perseus-editor/src/components/graph-locked-figures/line-swatch.tsx similarity index 100% rename from packages/perseus-editor/src/components/line-swatch.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/line-swatch.tsx diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx index eb94cda180..b066762e60 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-ellipse-settings.tsx @@ -8,10 +8,10 @@ import {StyleSheet} from "aphrodite"; import * as React from "react"; import AngleInput from "../angle-input"; -import ColorSelect from "../color-select"; -import CoordinatePairInput from "../coordinate-pair-input"; -import EllipseSwatch from "../ellipse-swatch"; +import ColorSelect from "./color-select"; +import CoordinatePairInput from "./coordinate-pair-input"; +import EllipseSwatch from "./ellipse-swatch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx index 116c05a767..07684f843a 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-line-settings.tsx @@ -13,10 +13,9 @@ import {LabelMedium, LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "../color-select"; -import DefiningPointSettings from "../defining-point-settings"; -import LineSwatch from "../line-swatch"; - +import ColorSelect from "./color-select"; +import DefiningPointSettings from "./defining-point-settings"; +import LineSwatch from "./line-swatch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx index 2f231b0b83..fdd8de7fe6 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-point-settings.tsx @@ -11,11 +11,10 @@ import {LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "../color-select"; -import ColorSwatch from "../color-swatch"; -import CoordinatePairInput from "../coordinate-pair-input"; -import LabeledSwitch from "../labeled-switch"; - +import ColorSelect from "./color-select"; +import ColorSwatch from "./color-swatch"; +import CoordinatePairInput from "./coordinate-pair-input"; +import LabeledSwitch from "./labeled-switch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx index 81e2403882..aeb24a29c4 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-polygon-settings.tsx @@ -17,13 +17,12 @@ import plusCircle from "@phosphor-icons/core/regular/plus-circle.svg"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "../color-select"; -import CoordinatePairInput from "../coordinate-pair-input"; -import LabeledSwitch from "../labeled-switch"; -import PolygonSwatch from "../polygon-swatch"; - +import ColorSelect from "./color-select"; +import CoordinatePairInput from "./coordinate-pair-input"; +import LabeledSwitch from "./labeled-switch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; +import PolygonSwatch from "./polygon-swatch"; import type {LockedFigureSettingsCommonProps} from "./locked-figure-settings"; diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx index 9fd5f241fc..30067b1389 100644 --- a/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx +++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-vector-settings.tsx @@ -12,10 +12,9 @@ import {LabelLarge, LabelMedium} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; -import ColorSelect from "../color-select"; -import CoordinatePairInput from "../coordinate-pair-input"; -import LineSwatch from "../line-swatch"; - +import ColorSelect from "./color-select"; +import CoordinatePairInput from "./coordinate-pair-input"; +import LineSwatch from "./line-swatch"; import LockedFigureSettingsAccordion from "./locked-figure-settings-accordion"; import LockedFigureSettingsActions from "./locked-figure-settings-actions"; diff --git a/packages/perseus-editor/src/components/polygon-swatch.tsx b/packages/perseus-editor/src/components/graph-locked-figures/polygon-swatch.tsx similarity index 100% rename from packages/perseus-editor/src/components/polygon-swatch.tsx rename to packages/perseus-editor/src/components/graph-locked-figures/polygon-swatch.tsx diff --git a/packages/perseus-editor/src/components/interactive-graph-settings.tsx b/packages/perseus-editor/src/components/interactive-graph-settings.tsx index 8d9e797859..61a2316d05 100644 --- a/packages/perseus-editor/src/components/interactive-graph-settings.tsx +++ b/packages/perseus-editor/src/components/interactive-graph-settings.tsx @@ -17,7 +17,7 @@ import {css, StyleSheet} from "aphrodite"; import * as React from "react"; import _ from "underscore"; -import LabeledRow from "./labeled-row"; +import LabeledRow from "./graph-locked-figures/labeled-row"; import ToggleableCaret from "./toggleable-caret"; import type {PerseusImageBackground} from "@khanacademy/perseus"; diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx index 660ef98e9a..6ad0e12743 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor.tsx @@ -17,11 +17,11 @@ import {StyleSheet} from "aphrodite"; import * as React from "react"; import _ from "underscore"; +import LabeledRow from "../components/graph-locked-figures/labeled-row"; import LockedFiguresSection from "../components/graph-locked-figures/locked-figures-section"; import GraphPointsCountSelector from "../components/graph-points-count-selector"; import GraphTypeSelector from "../components/graph-type-selector"; import InteractiveGraphSettings from "../components/interactive-graph-settings"; -import LabeledRow from "../components/labeled-row"; import SegmentCountSelector from "../components/segment-count-selector"; import {parsePointCount} from "../util/points";