Skip to content

fix(cli): prevent settings dialog border clipping using maxHeight#26507

Merged
jacob314 merged 2 commits intomainfrom
settings-box
May 5, 2026
Merged

fix(cli): prevent settings dialog border clipping using maxHeight#26507
jacob314 merged 2 commits intomainfrom
settings-box

Conversation

@jackwotherspoon
Copy link
Copy Markdown
Collaborator

@jackwotherspoon jackwotherspoon commented May 5, 2026

Summary

This PR fixes a UI bug where the bottom border of the /settings dialog was being clipped off the screen, especially in smaller terminal windows.

image

Details

The root cause was the use of height="100%" on the outer Box of the BaseSettingsDialog. In Ink's flex layout, this forced the dialog to expand beyond its calculated available space, pushing bottom border into the overflow.

Changes:

  • Replaced height="100%" with maxHeight={availableHeight} in BaseSettingsDialog.tsx.
  • This ensures the dialog respects terminal boundaries while allowing it to "shrink-to-fit" for shorter lists, avoiding unnecessary whitespace.
  • Added a robust regression test in SettingsDialog.test.tsx that verifies border integrity under strict height constraints.
  • Updated SVG and text snapshots to include the new test case.

Related Issues

Fixes a visual regression where the bottom border of the settings box was missing.

How to Validate

  1. Run the CLI: npm run start
  2. Open the settings dialog: /settings
  3. Resize the terminal to be small (e.g., 15-20 rows).
  4. Verify the bottom border remains visible and the exit instructions are not clipped.
  5. Run the new regression test: npm test -w @google/gemini-cli -- src/ui/components/SettingsDialog.test.tsx

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run
      • npx
      • Docker
      • Podman
      • Seatbelt

The settings dialog's bottom border was being clipped because height="100%" forced the dialog to expand beyond its calculated available height, pushing siblings (like the exit warning) into the overflow.

This change:
1. Replaces height="100%" with maxHeight={availableHeight} in BaseSettingsDialog.
2. Adds a regression test case in SettingsDialog.test.tsx to verify border integrity under height constraints.
3. Updates snapshots to include the new test case.

The use of maxHeight ensures the dialog fits within terminal bounds while also allowing it to shrink-to-fit shorter content lists, avoiding unnecessary whitespace.
@jackwotherspoon jackwotherspoon requested a review from a team as a code owner May 5, 2026 15:51
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a visual regression where the bottom border of the settings dialog was being clipped in terminal environments with limited vertical space. By switching from a fixed height to a maximum height constraint, the dialog now correctly adapts to the available terminal height, ensuring all UI elements remain visible.

Highlights

  • UI Layout Fix: Replaced the fixed height='100%' property with maxHeight={availableHeight} in the BaseSettingsDialog component to prevent the dialog from overflowing its container in smaller terminal windows.
  • Regression Testing: Added a new test case in SettingsDialog.test.tsx that explicitly verifies the integrity of the bottom border when the terminal height is constrained.
  • Snapshot Updates: Updated existing test snapshots and added a new SVG snapshot to ensure visual consistency across different terminal sizes.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

Size Change: +8 B (0%)

Total Size: 34 MB

Filename Size Change
./bundle/chunk-BJKEP7LW.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-CWU2TNL6.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-ELXVW2I7.js 0 B -12.5 kB (removed) 🏆
./bundle/chunk-FGZS4LDI.js 0 B -2.78 MB (removed) 🏆
./bundle/chunk-FPM6DKT5.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-GOOJC2T2.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-RPE5QIO6.js 0 B -658 kB (removed) 🏆
./bundle/chunk-YGJAWP4C.js 0 B -14.7 MB (removed) 🏆
./bundle/core-IJHE2WXQ.js 0 B -48.7 kB (removed) 🏆
./bundle/devtoolsService-TDEFJ3GT.js 0 B -28 kB (removed) 🏆
./bundle/gemini-WZA3RDAR.js 0 B -583 kB (removed) 🏆
./bundle/interactiveCli-PHOIVRAO.js 0 B -1.29 MB (removed) 🏆
./bundle/liteRtServerManager-C3IKSW7D.js 0 B -2.11 kB (removed) 🏆
./bundle/oauth2-provider-UEPVCW3L.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-3LC62N7S.js 658 kB +658 kB (new file) 🆕
./bundle/chunk-FNWHK5YQ.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-HQDXDEG3.js 2.78 MB +2.78 MB (new file) 🆕
./bundle/chunk-JZVLLSTK.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-N6N2LPKI.js 12.5 kB +12.5 kB (new file) 🆕
./bundle/chunk-PEJTCCWU.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-YIHOUQYE.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/chunk-YKDML6SM.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/core-XVNYO5CX.js 48.7 kB +48.7 kB (new file) 🆕
./bundle/devtoolsService-PD6A3EW7.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-35KRUROR.js 583 kB +583 kB (new file) 🆕
./bundle/interactiveCli-NZQEJX3B.js 1.29 MB +1.29 MB (new file) 🆕
./bundle/liteRtServerManager-E2WIOCKU.js 2.11 kB +2.11 kB (new file) 🆕
./bundle/oauth2-provider-4LRBSOQC.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-ECNYAST2.js 1.97 MB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/cleanup-4XEZMNEL.js 0 B -932 B (removed) 🏆
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 5.1 kB 0 B
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-FB7MMKTA.js 980 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-DBUJAPA7.js 0 B -652 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-QZ5QLCV3.js 932 B +932 B (new file) 🆕
./bundle/start-6IX3ENUU.js 652 B +652 B (new file) 🆕

compressed-size-action

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request replaces the fixed height in BaseSettingsDialog with a maxHeight constraint and adds a test case with snapshots to verify border rendering in height-constrained environments. Feedback indicates that removing the default height could cause overflows when the height prop is missing, recommending a conditional fallback and explanatory comments for the layout logic.

Comment thread packages/cli/src/ui/components/shared/BaseSettingsDialog.tsx
Copy link
Copy Markdown
Contributor

@jacob314 jacob314 left a comment

Choose a reason for hiding this comment

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

lgtm

@jacob314 jacob314 added this pull request to the merge queue May 5, 2026
Merged via the queue into main with commit 7cc19c2 May 5, 2026
27 checks passed
@jacob314 jacob314 deleted the settings-box branch May 5, 2026 16:32
@scidomino
Copy link
Copy Markdown
Collaborator

/patch preview

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

🚀 [Step 1/4] Patch workflow(s) waiting for approval!

📋 Details:

  • Channels: preview
  • Commit: 7cc19c2a1b5eea14b2fc35b5b4e5bed4089152e2
  • Workflows Created: 1

⏳ Status: The patch creation workflow has been triggered and is waiting for deployment approval. Please visit the specific workflow links below and approve the runs.

🔗 Track Progress:

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

🚀 [Step 2/4] Patch PR Created!

📋 Patch Details:

📝 Next Steps:

  1. Review and approve the hotfix PR: #26530
  2. Once merged, the patch release will automatically trigger
  3. You'll receive updates here when the release completes

🔗 Track Progress:

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

🚀 [Step 3/4] Patch Release Waiting for Approval!

📋 Release Details:

  • Environment: prod
  • Channel: preview → publishing to npm tag preview
  • Version: v0.41.0-preview.2
  • Hotfix PR: Merged ✅
  • Release Branch: release/v0.41.0-preview.2-pr-26507

⏳ Status: The patch release has been triggered and is waiting for deployment approval. Please visit the specific workflow run link below and approve the deployment. You'll receive another update when it completes.

🔗 Track Progress:

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

[Step 4/4] Patch Release Complete!

📦 Release Details:

🎉 Status: Your patch has been successfully released and published to npm!

📝 What's Available:

🔗 Links:

kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants