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.

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

fix: empty string displayed as SelectDropdown title #3773

Merged
merged 4 commits into from
Mar 23, 2023
Merged

fix: empty string displayed as SelectDropdown title #3773

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bba9733
fix: empty string displayed as SelectDropdown title
imorland Mar 21, 2023
fbdc9b9
chore: remove import
imorland Mar 21, 2023
422445d
chore: ts-ignore
imorland Mar 21, 2023
3b72d6d
Update framework/core/js/src/common/components/SelectDropdown.tsx
imorland Mar 22, 2023
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
4 changes: 2 additions & 2 deletions framework/core/js/src/common/components/SelectDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Dropdown, { IDropdownAttrs } from './Dropdown';
import icon from '../helpers/icon';
import extractText from '../utils/extractText';
import classList from '../utils/classList';
import type Component from '../Component';
import type Mithril from 'mithril';
Expand Down Expand Up @@ -50,7 +49,8 @@ export default class SelectDropdown<CustomAttrs extends ISelectDropdownAttrs = I
const activeChild = children.find(isActive);
let label = (activeChild && typeof activeChild === 'object' && 'children' in activeChild && activeChild.children) || this.attrs.defaultLabel;

label = extractText(label);
// @ts-ignore
if (Array.isArray(label)) label = label[0];

return [<span className="Button-label">{label}</span>, this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : null];
}
Expand Down