Skip to content

fix: set data attributes #463

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
merged 1 commit into from
Mar 16, 2020
Merged

fix: set data attributes #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 19 additions & 46 deletions src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,7 @@ const OptionList: React.RefForwardingComponent<
return -1;
};

const [activeIndex, setActiveIndex] = React.useState(() =>
getEnabledActiveIndex(0),
);
const [activeIndex, setActiveIndex] = React.useState(() => getEnabledActiveIndex(0));
const setActive = (index: number) => {
setActiveIndex(index);

Expand All @@ -126,9 +124,7 @@ const OptionList: React.RefForwardingComponent<

// Auto active first item when list length or searchValue changed
React.useEffect(() => {
setActive(
defaultActiveFirstOption !== false ? getEnabledActiveIndex(0) : -1,
);
setActive(defaultActiveFirstOption !== false ? getEnabledActiveIndex(0) : -1);
}, [memoFlattenOptions.length, searchValue]);

// Auto scroll to item position in single mode
Expand Down Expand Up @@ -171,10 +167,7 @@ const OptionList: React.RefForwardingComponent<
}

if (offset !== 0) {
const nextActiveIndex = getEnabledActiveIndex(
activeIndex + offset,
offset,
);
const nextActiveIndex = getEnabledActiveIndex(activeIndex + offset, offset);
scrollIntoView(nextActiveIndex);
setActive(nextActiveIndex);
}
Expand Down Expand Up @@ -226,24 +219,15 @@ const OptionList: React.RefForwardingComponent<
const item = memoFlattenOptions[index];
const value = item && (item.data as OptionData).value;
return item ? (
<div
key={index}
role="option"
id={`${id}_list_${index}`}
aria-selected={values.has(value)}
>
<div key={index} role="option" id={`${id}_list_${index}`} aria-selected={values.has(value)}>
{value}
</div>
) : null;
}

return (
<>
<div
role="listbox"
id={`${id}_list`}
style={{ height: 0, overflow: 'hidden' }}
>
<div role="listbox" id={`${id}_list`} style={{ height: 0, overflow: 'hidden' }}>
{renderItem(activeIndex - 1)}
{renderItem(activeIndex)}
{renderItem(activeIndex + 1)}
Expand All @@ -265,9 +249,7 @@ const OptionList: React.RefForwardingComponent<
// Group
if (group) {
return (
<div
className={classNames(itemPrefixCls, `${itemPrefixCls}-group`)}
>
<div className={classNames(itemPrefixCls, `${itemPrefixCls}-group`)}>
{label !== undefined ? label : key}
</div>
);
Expand All @@ -280,34 +262,28 @@ const OptionList: React.RefForwardingComponent<
children,
style,
className,
...otherProps
} = data as OptionData;

// Option
const selected = values.has(value);

const optionPrefixCls = `${itemPrefixCls}-option`;
const optionClassName = classNames(
itemPrefixCls,
optionPrefixCls,
className,
{
[`${optionPrefixCls}-grouped`]: groupOption,
[`${optionPrefixCls}-active`]:
activeIndex === itemIndex && !disabled,
[`${optionPrefixCls}-disabled`]: disabled,
[`${optionPrefixCls}-selected`]: selected,
},
);
const optionClassName = classNames(itemPrefixCls, optionPrefixCls, className, {
[`${optionPrefixCls}-grouped`]: groupOption,
[`${optionPrefixCls}-active`]: activeIndex === itemIndex && !disabled,
[`${optionPrefixCls}-disabled`]: disabled,
[`${optionPrefixCls}-selected`]: selected,
});

const mergedLabel = childrenAsData ? children : label;

const iconVisible =
!menuItemSelectedIcon ||
typeof menuItemSelectedIcon === 'function' ||
selected;
!menuItemSelectedIcon || typeof menuItemSelectedIcon === 'function' || selected;

return (
<div
{...otherProps}
aria-selected={selected}
className={optionClassName}
title={title}
Expand All @@ -325,9 +301,7 @@ const OptionList: React.RefForwardingComponent<
}}
style={style}
>
<div className={`${optionPrefixCls}-content`}>
{mergedLabel || value}
</div>
<div className={`${optionPrefixCls}-content`}>{mergedLabel || value}</div>
{React.isValidElement(menuItemSelectedIcon) || selected}
{iconVisible && (
<TransBtn
Expand All @@ -346,10 +320,9 @@ const OptionList: React.RefForwardingComponent<
);
};

const RefOptionList = React.forwardRef<
RefOptionListProps,
OptionListProps<SelectOptionsType>
>(OptionList);
const RefOptionList = React.forwardRef<RefOptionListProps, OptionListProps<SelectOptionsType>>(
OptionList,
);
RefOptionList.displayName = 'OptionList';

export default RefOptionList;
15 changes: 15 additions & 0 deletions tests/OptionList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,19 @@ describe('OptionList', () => {

expect(preventDefault).toHaveBeenCalled();
});

it('Data attributes should be set correct', () => {
const wrapper = mount(
generateList({
options: [{ value: '1' }, { value: '2', 'data-num': '123' }],
}),
);

expect(
wrapper
.find('.rc-select-item-option')
.last()
.prop('data-num'),
).toBe('123');
});
});