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

Jump to bottom

fix: LSDV-5482: Fix autocomplete Escape in modal #4692

Merged
merged 3 commits into from Aug 25, 2023
Merged

fix: LSDV-5482: Fix autocomplete Escape in modal #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90142e6
fix: LSDV-5482: Fix autocomplete Escape in modal
hlomzik Aug 25, 2023
8276fd1
ci: Build frontend
robot-ci-heartex Aug 25, 2023
4ced775
Trigger CI
hlomzik Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion label_studio/frontend/dist/react-app/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion label_studio/frontend/dist/react-app/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions label_studio/frontend/src/components/Modal/ModalPopup.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import { aroundTransition } from '../../utils/transition';
import { Button } from '../Button/Button';
import "./Modal.styl";

const {Block, Elem} = BemWithSpecifiContext();
const { Block, Elem } = BemWithSpecifiContext();

const ModalContext = createContext();

Expand All @@ -32,11 +32,13 @@ export class Modal extends React.Component {
setTimeout(() => this.show(), 30);
}

document.addEventListener('keydown', this.closeOnEscape, {capture: true});
// with `allowToInterceptEscape` we can prevent closing modal on escape
// by handling it inside modal, before event will be bubbled here
document.addEventListener('keydown', this.closeOnEscape, { capture: !this.props.allowToInterceptEscape });
}

componentWillUnmount() {
document.removeEventListener('keydown', this.closeOnEscape, {capture: true});
document.removeEventListener('keydown', this.closeOnEscape, { capture: !this.props.allowToInterceptEscape });
}

componentDidUpdate(prevProps, prevState) {
Expand Down Expand Up @@ -71,7 +73,7 @@ export class Modal extends React.Component {
});
}

render () {
render() {
if (!this.state.visible) return null;

const bare = this.props.bare;
Expand Down Expand Up @@ -105,7 +107,7 @@ export class Modal extends React.Component {
)}
</Modal.Header>
)}
<Elem name="body" mod={{bare}}>
<Elem name="body" mod={{ bare }}>
{this.body}
</Elem>
{this.props.footer && (
Expand All @@ -124,7 +126,7 @@ export class Modal extends React.Component {

onClickOutside = (e) => {
if (!this.modalRef.current) return;
const {closeOnClickOutside} = this.props;
const { closeOnClickOutside } = this.props;
const allowClose = this.props.allowClose !== false;
const isInModal = this.modalRef.current.contains(e.target);
const content = cn('modal').elem('content').closest(e.target);
Expand Down Expand Up @@ -180,6 +182,7 @@ export class Modal extends React.Component {
get body() {
if (this.state.body) {
const Content = this.state.body;

return Content instanceof Function ? <Content/> : Content;
} else {
return this.props.children;
Expand All @@ -189,6 +192,7 @@ export class Modal extends React.Component {
get footer() {
if (this.state.footer) {
const Content = this.state.footer;

return Content instanceof Function ? <Content/> : Content;
}

Expand All @@ -197,13 +201,13 @@ export class Modal extends React.Component {
}

Modal.Header = ({ children, divided }) => (
<Elem name="header" mod={{divided}}>
<Elem name="header" mod={{ divided }}>
{children}
</Elem>
);

Modal.Footer = ({ children, bare }) => (
<Elem name="footer" mod={{bare}}>
<Elem name="footer" mod={{ bare }}>
{children}
</Elem>
);
Expand Down
2 changes: 2 additions & 0 deletions label_studio/frontend/src/pages/CreateProject/Config/Config.js
View file
Open in desktop
Expand Up @@ -444,6 +444,8 @@ const Configurator = ({ columns, config, project, template, setTemplate, onBrows
},
hintOptions: { schemaInfo: tags },
}}
// don't close modal with Escape while editing config
onKeyDown={(editor, e) => { if (e.code === 'Escape') e.stopPropagation(); }}
onChange={(editor, data, value) => onChange(value)}
/>
</div>
Expand Down
9 changes: 8 additions & 1 deletion label_studio/frontend/src/pages/CreateProject/CreateProject.js
View file
Open in desktop
Expand Up @@ -141,7 +141,14 @@ export const CreateProject = ({ onClose }) => {
}, [project]);

return (
<Modal onHide={onDelete} fullscreen visible bare closeOnClickOutside={false}>
<Modal
onHide={onDelete}
closeOnClickOutside={false}
allowToInterceptEscape
fullscreen
visible
bare
>
<div className={rootClass}>
<Modal.Header>
<h1>Create Project</h1>
Expand Down