Skip to content

fonticon-picker: show modal when clicking on the icon, not only the chrevon #7001

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
h-kataria merged 1 commit into from
Apr 27, 2020
Merged

fonticon-picker: show modal when clicking on the icon, not only the chrevon #7001

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
15 changes: 9 additions & 6 deletions app/javascript/components/fonticon-picker/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,26 @@ const FontIconPicker = ({ iconTypes, selected, onChangeURL }) => {
setState(state => ({ ...state, showModal: false, selectedIcon: activeIcon }));
};

const hideModal = () => setState(state => ({ ...state, showModal: false }));
Copy link
Contributor Author

@himdel himdel Apr 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed because we already have a showModal boolean

const hide = () => setState(state => ({ ...state, showModal: false }));
const show = () => setState(state => ({ ...state, showModal: true }));

return (
<div className="fonticon-picker">
<ButtonGroup>
<Button className="icon-picker-btn">
<Button className="icon-picker-btn" onClick={show}>
{ selectedIcon ? (<i id="selected-icon" className={classNames('fa-lg', selectedIcon)} />) : __('No icon') }
</Button>
<Button onClick={() => setState(state => ({ ...state, showModal: true }))}><Icon type="fa" name="angle-down" /></Button>
<Button onClick={show}>
<Icon type="fa" name="angle-down" />
</Button>
</ButtonGroup>
<Modal show={showModal} onHide={hideModal} bsSize="large">
<Modal show={showModal} onHide={hide} bsSize="large">
<Modal.Header>
<button
id="close-icon-picker-modal"
type="button"
className="close"
onClick={hideModal}
onClick={hide}
aria-label={__('Close')}
>
<Icon type="pf" name="close" />
Expand Down Expand Up @@ -79,7 +82,7 @@ const FontIconPicker = ({ iconTypes, selected, onChangeURL }) => {
>
{ __('Apply') }
</Button>
<Button id="cancel-icon-picker-modal" bsStyle="default" className="btn-cancel" onClick={hideModal}>
<Button id="cancel-icon-picker-modal" bsStyle="default" className="btn-cancel" onClick={hide}>
{ __('Cancel') }
</Button>
</Modal.Footer>
Expand Down