Skip to content

Commit

Permalink
fix(select): label placement discrepancy in Select (#3853)
Browse files Browse the repository at this point in the history
* fix(select): label placement incorrect in case of multiline

* chore(select): adding the changeset

* chore(select): adding the tests

* chore(select): code imrovement, wkw's suggestions

* chore(changeset): update changeset message

---------

Co-authored-by: WK Wong <wingkwong.code@gmail.com>
  • Loading branch information
macci001 and wingkwong authored Oct 11, 2024
1 parent af3c4f7 commit 488a18f
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changeset/dull-bags-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/select": patch
---

update label placement in Select to use `shouldLabelBeOutside` instead of `isOutsideLeft`, resolving multiline label placement issues (#3841).
57 changes: 57 additions & 0 deletions packages/components/select/__tests__/select.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,63 @@ describe("Select", () => {
expect(onChange).toBeCalledTimes(1);
});
});

it("should place the label outside when labelPlacement is outside", () => {
const labelContent = "Favorite Animal Label";

render(
<Select
aria-label="Favorite Animal"
data-testid="select"
label={labelContent}
labelPlacement="outside"
placeholder="placeholder"
>
<SelectItem key="penguin" value="penguin">
Penguin
</SelectItem>
<SelectItem key="zebra" value="zebra">
Zebra
</SelectItem>
<SelectItem key="shark" value="shark">
Shark
</SelectItem>
</Select>,
);

const base = document.querySelector("[data-slot=base]");
const trigger = document.querySelector("[data-slot=trigger]");

expect(base).toHaveTextContent(labelContent);
expect(trigger).not.toHaveTextContent(labelContent);
});

it("should place the label inside when labelPlacement prop is not passed", () => {
const labelContent = "Favorite Animal Label";

render(
<Select
aria-label="Favorite Animal"
data-testid="select"
label={labelContent}
placeholder="placeholder"
>
<SelectItem key="penguin" value="penguin">
Penguin
</SelectItem>
<SelectItem key="zebra" value="zebra">
Zebra
</SelectItem>
<SelectItem key="shark" value="shark">
Shark
</SelectItem>
</Select>,
);

const trigger = document.querySelector("[data-slot=trigger]");

expect(trigger).toHaveTextContent(labelContent);
});
});

describe("Select with React Hook Form", () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/components/select/src/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function Select<T extends object>(props: Props<T>, ref: ForwardedRef<HTMLSelectE
endContent,
placeholder,
renderValue,
isOutsideLeft,
shouldLabelBeOutside,
disableAnimation,
getBaseProps,
getLabelProps,
Expand Down Expand Up @@ -117,10 +117,10 @@ function Select<T extends object>(props: Props<T>, ref: ForwardedRef<HTMLSelectE
return (
<div {...getBaseProps()}>
<HiddenSelect {...getHiddenSelectProps()} />
{isOutsideLeft ? labelContent : null}
{shouldLabelBeOutside ? labelContent : null}
<div {...getMainWrapperProps()}>
<Component {...getTriggerProps()}>
{!isOutsideLeft ? labelContent : null}
{!shouldLabelBeOutside ? labelContent : null}
<div {...getInnerWrapperProps()}>
{startContent}
<span {...getValueProps()}>{renderSelectedItem}</span>
Expand Down

0 comments on commit 488a18f

Please sign in to comment.