From f23b383e797a522ddee064c79e582467dfc08f94 Mon Sep 17 00:00:00 2001 From: Mark Fitzgerald <13896410+mark-fitzgerald@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:33:25 -0800 Subject: [PATCH] [Dropdown] Bugfix - Render options and placeholder inline (#2054) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary: ## The dropdown widget was not rendering content properly. Punctuation and other non-alphanumeric characters were causing the content to break to their own lines, even without TeX markup. Removing the `inline` setting for the `` usages resolved this. Issue: LEMS-2741 ## Test plan: 1. Open Storybook 1. Navigate to the Editor Demo page 1. Add a Dropdown widget 1. Type in TeX content for one of the option 1. Add another option with regular text (all alphanumeric characters) 1. Add another option with punctuation or other non-alphanumeric characters ($%^<>,.:) 1. Viewing the dropdown options in the preview section should show all of the options on their own lines (single line for each) 1. Repeat these steps for the Placeholder portion of the widget Author: mark-fitzgerald Reviewers: jeremywiebe Required Reviewers: Approved By: jeremywiebe Checks: ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x) Pull Request URL: https://github.com/Khan/perseus/pull/2054 --- .changeset/hungry-taxis-clap.md | 5 ++++ .../__snapshots__/renderer.test.tsx.snap | 30 +++++++++++-------- .../__snapshots__/dropdown.test.ts.snap | 28 ++++++++--------- .../perseus/src/widgets/dropdown/dropdown.tsx | 2 -- 4 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 .changeset/hungry-taxis-clap.md diff --git a/.changeset/hungry-taxis-clap.md b/.changeset/hungry-taxis-clap.md new file mode 100644 index 0000000000..f448597617 --- /dev/null +++ b/.changeset/hungry-taxis-clap.md @@ -0,0 +1,5 @@ +--- +"@khanacademy/perseus": patch +--- + +[Dropdown] Bugfix - Render options and placeholder inline diff --git a/packages/perseus/src/__tests__/__snapshots__/renderer.test.tsx.snap b/packages/perseus/src/__tests__/__snapshots__/renderer.test.tsx.snap index 0b73d6e928..f6cb3327b3 100644 --- a/packages/perseus/src/__tests__/__snapshots__/renderer.test.tsx.snap +++ b/packages/perseus/src/__tests__/__snapshots__/renderer.test.tsx.snap @@ -383,10 +383,14 @@ exports[`renderer snapshots correct answer: correct answer 1`] = ` class="perseus-renderer perseus-renderer-responsive" >
- less than or equal to +
+ less than or equal to +
@@ -471,10 +475,14 @@ exports[`renderer snapshots incorrect answer: incorrect answer 1`] = ` class="perseus-renderer perseus-renderer-responsive" >
- greater than or equal to +
+ greater than or equal to +
@@ -559,16 +567,14 @@ exports[`renderer snapshots initial render: initial render 1`] = ` class="perseus-renderer perseus-renderer-responsive" >
- greater -
-
- /less than or equal to +
+ greater/less than or equal to +
diff --git a/packages/perseus/src/widgets/dropdown/__snapshots__/dropdown.test.ts.snap b/packages/perseus/src/widgets/dropdown/__snapshots__/dropdown.test.ts.snap index f7d61d9ea6..0cba374a65 100644 --- a/packages/perseus/src/widgets/dropdown/__snapshots__/dropdown.test.ts.snap +++ b/packages/perseus/src/widgets/dropdown/__snapshots__/dropdown.test.ts.snap @@ -50,16 +50,14 @@ exports[`Dropdown widget should snapshot when opened: dropdown open 1`] = ` class="perseus-renderer perseus-renderer-responsive" >
- greater -
-
- /less than or equal to +
+ greater/less than or equal to +
@@ -138,16 +136,14 @@ exports[`Dropdown widget should snapshot: initial render 1`] = ` class="perseus-renderer perseus-renderer-responsive" >
- greater -
-
- /less than or equal to +
+ greater/less than or equal to +
diff --git a/packages/perseus/src/widgets/dropdown/dropdown.tsx b/packages/perseus/src/widgets/dropdown/dropdown.tsx index b10d6b1020..19494c8f35 100644 --- a/packages/perseus/src/widgets/dropdown/dropdown.tsx +++ b/packages/perseus/src/widgets/dropdown/dropdown.tsx @@ -79,7 +79,6 @@ class Dropdown extends React.Component implements Widget { } labelAsText={this.props.placeholder} @@ -92,7 +91,6 @@ class Dropdown extends React.Component implements Widget { } labelAsText={choice}