mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 15:07:53 +02:00
Code Issues Releases Wiki Activity

fix: empty string displayed as SelectDropdown title (#3773)

Browse Source 
* fix: empty string displayed as SelectDropdown title

* chore: remove import

* chore: ts-ignore

* Update framework/core/js/src/common/components/SelectDropdown.tsx

Co-authored-by: David Wheatley <david@davwheat.dev>

---------

Co-authored-by: David Wheatley <david@davwheat.dev>
This commit is contained in:
IanM
2023-03-23 08:02:59 +00:00
committed by GitHub
parent 85b63681ae
commit d684248492
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/src/common/components/SelectDropdown.tsx
View File

@@ -1,6 +1,5 @@
import Dropdown, { IDropdownAttrs } from './Dropdown'; import Dropdown, { IDropdownAttrs } from './Dropdown';
import icon from '../helpers/icon'; import icon from '../helpers/icon';
import extractText from '../utils/extractText';
import classList from '../utils/classList'; import classList from '../utils/classList';
import type Component from '../Component'; import type Component from '../Component';
import type Mithril from 'mithril'; import type Mithril from 'mithril';
@@ -50,7 +49,8 @@ export default class SelectDropdown<CustomAttrs extends ISelectDropdownAttrs = I
const activeChild = children.find(isActive); const activeChild = children.find(isActive);
let label = (activeChild && typeof activeChild === 'object' && 'children' in activeChild && activeChild.children) || this.attrs.defaultLabel; 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]; return [<span className="Button-label">{label}</span>, this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : null];
} }