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.

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

fix(theme): show margin only with label in Switch component #3861

Merged
merged 6 commits into from
Oct 15, 2024

Conversation

ShrinidhiUpadhyaya
Copy link
Contributor

@ShrinidhiUpadhyaya ShrinidhiUpadhyaya commented Oct 9, 2024

Closes #3791

📝 Description

Removed the extra right margin of the wrapper.

⛳️ Current behavior (updates)

image

🚀 New behavior

image

💣 Is this a breaking change (Yes/No):

📝 Additional Information

Summary by CodeRabbit

  • New Features

    • Updated styling for the toggle component, enhancing its visual appearance.
  • Bug Fixes

    • Adjusted spacing for the toggle component in small, medium, and large sizes to improve layout consistency.
    • Improved layout behavior of the Switch component by showing margin only when a label is present.

Copy link

changeset-bot bot commented Oct 9, 2024

🦋 Changeset detected

Latest commit: 2c56f36

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
@nextui-org/theme Patch
@nextui-org/react Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

vercel bot commented Oct 9, 2024

@ShrinidhiUpadhyaya is attempting to deploy a commit to the NextUI Inc Team on Vercel.

A member of the Team first needs to authorize it.

Copy link
Contributor

coderabbitai bot commented Oct 9, 2024

Walkthrough

The changes in this pull request focus on the toggle component located in the packages/core/theme/src/components/toggle.ts file. The primary modification involves removing the mr-2 and me-2 classes from the wrapper styles for the sm, md, and lg size variants, which alters the margin-right and margin-end properties for these sizes. Additionally, the label style has been updated to include the ms-2 class. The component's overall structure, functionality, and control flow remain unchanged, with adjustments made solely to the visual styling.

Changes

File Path Change Summary
packages/core/theme/src/components/toggle.ts Removed mr-2 and me-2 classes from wrapper styles for sm, md, and lg size variants. Added ms-2 class to label styles. Updated type exports for ToggleVariantProps and ToggleSlots.

Assessment against linked issues

Objective Addressed Explanation
Should be no more width (related to #3791)

Possibly related PRs

Suggested labels

👀 Status: In Review


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 8d2a2fb and 2c56f36.

📒 Files selected for processing (1)
  • .changeset/tricky-fans-draw.md (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • .changeset/tricky-fans-draw.md

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@ShrinidhiUpadhyaya ShrinidhiUpadhyaya changed the title fix(switch): removed right margin in wrapper #3791 fix(switch): removed right margin in wrapper Oct 9, 2024
@wingkwong wingkwong self-assigned this Oct 10, 2024
@wingkwong wingkwong added this to the v2.5.0 milestone Oct 10, 2024
@macci001
Copy link
Contributor

Hey @ShrinidhiUpadhyaya, could you please add the changeset as well.
You can run pnpm changeset for the same.

@wingkwong
Copy link
Member

@ShrinidhiUpadhyaya please resolve the conflict and click re-request review once it's done.

@wingkwong
Copy link
Member

@ShrinidhiUpadhyaya there's no change to review.

@ShrinidhiUpadhyaya
Copy link
Contributor Author

ShrinidhiUpadhyaya commented Oct 13, 2024

@ShrinidhiUpadhyaya there's no change to review.

I guess we can close this PR, because #3868 had similar changes for the fix.

@wingkwong
Copy link
Member

@ShrinidhiUpadhyaya That PR has been merged into canary but I could still reproduce the issue on canary branch.

image

@ShrinidhiUpadhyaya
Copy link
Contributor Author

@ShrinidhiUpadhyaya That PR has been merged into canary but I could still reproduce the issue on canary branch.

image

Okay i will have look into it.

Copy link

vercel bot commented Oct 14, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nextui-docs-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 15, 2024 2:43am
nextui-storybook-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 15, 2024 2:43am

Copy link
Member

@wingkwong wingkwong left a comment

Choose a reason for hiding this comment

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

As I mentioned in the original issue, the margin is not required when there is no label. If you just remove me-2, it will affect Switch with Label. In other word, margin is required when there is a label. This is what you need to solve, not just remove right margin.

your pr:
image

prod:
image

@ShrinidhiUpadhyaya
Copy link
Contributor Author

As I mentioned in the original issue, the margin is not required when there is no label. If you just remove me-2, it will affect Switch with Label. In other word, margin is required when there is a label. This is what you need to solve, not just remove right margin.

your pr: image

prod: image

Ohh okay, i missed reading that in the original issue. So can i just add left margin to the label label: "relative text-foreground select-none ml-2",. Is that fine?

With Label:-
image

Without Label:-
image

@wingkwong
Copy link
Member

don't use ml. this would fail in RTL. use ms instead which covers RTL case.

@wingkwong wingkwong changed the title fix(switch): removed right margin in wrapper fix(theme): show margin only with label in Switch component Oct 15, 2024
@wingkwong wingkwong merged commit 8a33eab into nextui-org:canary Oct 15, 2024
5 of 7 checks passed
@ShrinidhiUpadhyaya ShrinidhiUpadhyaya deleted the fix/switch-width branch October 24, 2024 14:15
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.

[BUG] - SWITCH Component Width Excessely
3 participants