Skip to content

[BOOKINGSG-9158][GZ] introduce another component layer to dropdown wrapper #1106

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.

Sign up for GitHub

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

Merged
qroll merged 2 commits into from
Apr 16, 2026
Merged

[BOOKINGSG-9158][GZ] introduce another component layer to dropdown wrapper #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dd8108
[BOOKINGSG-9158][GZ] introduce a thin component layer for dropdown wr…
ghazwanmuhammad Apr 16, 2026
959f7f7
[BOOKINGSG-9158][GZ] move types & add forwardRef
ghazwanmuhammad Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 9 additions & 26 deletions src/input-group/input-group-list-addon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import type { OpenChangeReason } from "@floating-ui/react";
import clsx from "clsx";
import React, { useEffect, useRef, useState } from "react";

import { concatIds, VisuallyHidden } from "../shared/accessibility";
import { DropdownList, DropdownListState } from "../shared/dropdown-list";
import { ElementWithDropdown } from "../shared/dropdown-wrapper";
import * as dropdownWrapperStyles from "../shared/dropdown-wrapper/dropdown-wrapper.styles";
import {
LabelContainer,
PlaceholderLabel,
ValueLabel,
} from "../shared/dropdown-wrapper/dropdown-wrapper";
import { SimpleIdGenerator } from "../util";
import {
Divider,
Expand Down Expand Up @@ -182,32 +185,14 @@ export const Component = <T, V>(
// =============================================================================
const renderLabel = () => {
if (selected) {
return (
<div className={dropdownWrapperStyles.valueLabel}>
{getDisplayValue()}
</div>
);
return <ValueLabel>{getDisplayValue()}</ValueLabel>;
}

return (
<div
className={clsx(
dropdownWrapperStyles.valueLabel,
dropdownWrapperStyles.placeholderLabel
)}
>
{placeholder}
</div>
);
return <PlaceholderLabel>{placeholder}</PlaceholderLabel>;
};

const renderSelectorContent = () => (
<div
className={dropdownWrapperStyles.labelContainer}
data-disabled={disabled}
>
{renderLabel()}
</div>
<LabelContainer disabled={disabled}>{renderLabel()}</LabelContainer>
);

const renderElement = () => {
Expand Down Expand Up @@ -273,9 +258,7 @@ export const Component = <T, V>(
aria-describedby={ariaDescribedBy}
aria-invalid={ariaInvalid}
>
<div className={dropdownWrapperStyles.valueLabel}>
{getDisplayValue()}
</div>
<ValueLabel>{getDisplayValue()}</ValueLabel>
</SelectorReadOnly>
) : null;
} else {
Expand Down
35 changes: 14 additions & 21 deletions src/input-multi-select/input-multi-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { OpenChangeReason } from "@floating-ui/react";
import clsx from "clsx";
import findIndex from "lodash/findIndex";
import type React from "react";
import { useEffect, useRef, useState } from "react";
Expand All @@ -10,7 +9,11 @@ import {
ExpandableElement,
} from "../shared/dropdown-list";
import { ElementWithDropdown } from "../shared/dropdown-wrapper";
import * as dropdownWrapperStyles from "../shared/dropdown-wrapper/dropdown-wrapper.styles";
import {
LabelContainer,
PlaceholderLabel,
ValueLabel,
} from "../shared/dropdown-wrapper/dropdown-wrapper";
import { InputBox } from "../shared/input-wrapper";
import { SimpleIdGenerator } from "../util";
import type { InputMultiSelectProps } from "./types";
Expand Down Expand Up @@ -186,37 +189,27 @@ export const InputMultiSelect = <T, V>({
const renderLabel = () => {
if (!selected || selected.length === 0) {
return (
<div
className={clsx(
dropdownWrapperStyles.valueLabel,
dropdownWrapperStyles.placeholderLabel
)}
data-variant={variant}
data-truncate={optionTruncationType}
<PlaceholderLabel
variant={variant}
truncateType={optionTruncationType}
>
{placeholder}
</div>
</PlaceholderLabel>
);
} else {
return (
<div
className={dropdownWrapperStyles.valueLabel}
data-variant={variant}
data-truncate={optionTruncationType}
<ValueLabel
variant={variant}
truncateType={optionTruncationType}
>
{getDisplayValue()}
</div>
</ValueLabel>
);
}
};

const renderSelectorContent = () => (
<div
className={dropdownWrapperStyles.labelContainer}
data-disabled={disabled}
>
{renderLabel()}
</div>
<LabelContainer disabled={disabled}>{renderLabel()}</LabelContainer>
);

const renderElement = () => {
Expand Down
32 changes: 11 additions & 21 deletions src/input-nested-multi-select/input-nested-multi-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { OpenChangeReason } from "@floating-ui/react";
import clsx from "clsx";
import isEmpty from "lodash/isEmpty";
import isEqual from "lodash/isEqual";
import type React from "react";
Expand All @@ -15,7 +14,11 @@ import {
NestedDropdownList,
} from "../shared/dropdown-list";
import { ElementWithDropdown } from "../shared/dropdown-wrapper";
import * as dropdownWrapperStyles from "../shared/dropdown-wrapper/dropdown-wrapper.styles";
import {
LabelContainer,
PlaceholderLabel,
ValueLabel,
} from "../shared/dropdown-wrapper/dropdown-wrapper";
import { InputBox } from "../shared/input-wrapper";
import { SimpleIdGenerator, StringHelper } from "../util";
import type { SelectedItem } from "./helpers";
Expand Down Expand Up @@ -250,36 +253,23 @@ export const InputNestedMultiSelect = <V1, V2, V3>({
const renderLabel = () => {
if (isEmpty(selectedItems)) {
return (
<div
className={clsx(
dropdownWrapperStyles.valueLabel,
dropdownWrapperStyles.placeholderLabel
)}
data-truncate={optionTruncationType}
>
<PlaceholderLabel truncateType={optionTruncationType}>
{placeholder}
</div>
</PlaceholderLabel>
);
} else {
return (
<div
className={dropdownWrapperStyles.valueLabel}
data-truncate={optionTruncationType}
>
<ValueLabel truncateType={optionTruncationType}>
{truncateValue(getDisplayValue())}
</div>
</ValueLabel>
);
}
};

const renderSelectorContent = () => (
<div
className={dropdownWrapperStyles.labelContainer}
ref={labelContainerRef}
data-disabled={disabled}
>
<LabelContainer ref={labelContainerRef} disabled={disabled}>
{renderLabel()}
</div>
</LabelContainer>
);

const renderElement = () => {
Expand Down
32 changes: 11 additions & 21 deletions src/input-nested-select/input-nested-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { OpenChangeReason } from "@floating-ui/react";
import clsx from "clsx";
import isEmpty from "lodash/isEmpty";
import type React from "react";
import { useEffect, useRef, useState } from "react";
Expand All @@ -15,7 +14,11 @@ import {
NestedDropdownList,
} from "../shared/dropdown-list";
import { ElementWithDropdown } from "../shared/dropdown-wrapper";
import * as dropdownWrapperStyles from "../shared/dropdown-wrapper/dropdown-wrapper.styles";
import {
LabelContainer,
PlaceholderLabel,
ValueLabel,
} from "../shared/dropdown-wrapper/dropdown-wrapper";
import { InputBox } from "../shared/input-wrapper";
import { SimpleIdGenerator, StringHelper } from "../util";
import type {
Expand Down Expand Up @@ -206,36 +209,23 @@ export const InputNestedSelect = <V1, V2, V3>({
const renderLabel = () => {
if (isEmpty(selectedItem)) {
return (
<div
className={clsx(
dropdownWrapperStyles.valueLabel,
dropdownWrapperStyles.placeholderLabel
)}
data-truncate={optionTruncationType}
>
<PlaceholderLabel truncateType={optionTruncationType}>
{placeholder}
</div>
</PlaceholderLabel>
);
} else {
return (
<div
className={dropdownWrapperStyles.valueLabel}
data-truncate={optionTruncationType}
>
<ValueLabel truncateType={optionTruncationType}>
{truncateValue(getDisplayValue())}
</div>
</ValueLabel>
);
}
};

const renderSelectorContent = () => (
<div
className={dropdownWrapperStyles.labelContainer}
ref={labelContainerRef}
data-disabled={disabled}
>
<LabelContainer ref={labelContainerRef} disabled={disabled}>
{renderLabel()}
</div>
</LabelContainer>
);

const renderElement = () => {
Expand Down
23 changes: 8 additions & 15 deletions src/input-range-select/input-range-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import clsx from "clsx";
import type React from "react";
import { useEffect, useMemo, useRef, useState } from "react";

Expand All @@ -7,7 +6,10 @@ import { concatIds, VisuallyHidden } from "../shared/accessibility";
import type { DropdownListApi } from "../shared/dropdown-list";
import { DropdownList, DropdownListState } from "../shared/dropdown-list";
import { ElementWithDropdown } from "../shared/dropdown-wrapper";
import * as dropdownWrapperStyles from "../shared/dropdown-wrapper/dropdown-wrapper.styles";
import {
PlaceholderLabel,
ValueLabel,
} from "../shared/dropdown-wrapper/dropdown-wrapper";
import { RangeInputInnerContainer } from "../shared/range-input-inner-container";
import { SimpleIdGenerator } from "../util";
import { StringHelper } from "../util/string-helper";
Expand Down Expand Up @@ -284,15 +286,9 @@ export const InputRangeSelect = <T, V>({

if (!selected) {
return (
<div
className={clsx(
dropdownWrapperStyles.valueLabel,
dropdownWrapperStyles.placeholderLabel
)}
data-truncate={optionTruncationType}
>
<PlaceholderLabel truncateType={optionTruncationType}>
{truncateValue(rangeType, placeholders?.[rangeType] || "")}
</div>
</PlaceholderLabel>
);
}

Expand All @@ -301,12 +297,9 @@ export const InputRangeSelect = <T, V>({
}

return (
<div
className={dropdownWrapperStyles.valueLabel}
data-truncate={optionTruncationType}
>
<ValueLabel truncateType={optionTruncationType}>
{truncateValue(rangeType, getDisplayValue(rangeType))}
</div>
</ValueLabel>
);
};

Expand Down
42 changes: 15 additions & 27 deletions src/input-select/input-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { OpenChangeReason } from "@floating-ui/react";
import clsx from "clsx";
import type React from "react";
import { useEffect, useRef, useState } from "react";

Expand All @@ -8,11 +7,12 @@ import {
DropdownListState,
ExpandableElement,
} from "../shared/dropdown-list";
import { ElementWithDropdown } from "../shared/dropdown-wrapper";
import {
type DropdownWrapperValueLabelDataAttrs,
ElementWithDropdown,
} from "../shared/dropdown-wrapper";
import * as dropdownWrapperStyles from "../shared/dropdown-wrapper/dropdown-wrapper.styles";
LabelContainer,
PlaceholderLabel,
ValueLabel,
} from "../shared/dropdown-wrapper/dropdown-wrapper";
import { InputBox } from "../shared/input-wrapper";
import { SimpleIdGenerator } from "../util";
import { StringHelper } from "../util/string-helper";
Expand Down Expand Up @@ -181,45 +181,33 @@ export const InputSelect = <T, V>({
// RENDER FUNCTIONS
// =============================================================================
const renderLabel = () => {
const valueLabelProps: DropdownWrapperValueLabelDataAttrs = {
"data-variant": variant,
"data-truncate": optionTruncationType,
};

if (!selected) {
return (
<div
className={clsx(
dropdownWrapperStyles.valueLabel,
dropdownWrapperStyles.placeholderLabel
)}
{...valueLabelProps}
<PlaceholderLabel
variant={variant}
truncateType={optionTruncationType}
>
{placeholder}
</div>
</PlaceholderLabel>
);
} else if (renderCustomSelectedOption) {
return renderCustomSelectedOption(selected);
} else {
return (
<div
className={dropdownWrapperStyles.valueLabel}
{...valueLabelProps}
<ValueLabel
variant={variant}
truncateType={optionTruncationType}
>
{truncateValue(getDisplayValue())}
</div>
</ValueLabel>
);
}
};

const renderSelectorContent = () => (
<div
className={dropdownWrapperStyles.labelContainer}
ref={labelContainerRef}
data-disabled={disabled}
>
<LabelContainer ref={labelContainerRef} disabled={disabled}>
{renderLabel()}
</div>
</LabelContainer>
);

const renderElement = () => {
Expand Down
Loading