Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fixes issue#200 #571

Merged
merged 1 commit into from
Jul 24, 2020
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion client/src/components/AddToGroupModal/index.jsx
Original file line number Diff line number Diff line change
@@ -131,7 +131,11 @@ export default function AddToGroupModal({ onCancel, updateUser, user }) {
};

return (
<Modal onCancel={onCancel}>
<Modal
onCancel={onCancel}
className={style.container}
overlayClassName={style.overlay}
>
<h1 className={style.title}>Add to Group</h1>
<div className={style.searchRow}>
<ZoomIcon className={style.zoomIcon} />
8 changes: 8 additions & 0 deletions client/src/components/AddToGroupModal/style.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
@import "../../styles/mixins";

.container {
z-index: 1100;
}

.overlay {
z-index: 1010;
}

.buttons {
display: flex;
justify-content: flex-end;
7 changes: 5 additions & 2 deletions client/src/components/Modal/index.jsx
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import PT from "prop-types";

import style from "./style.module.scss";

export default function Modal({ children, className }) {
export default function Modal({ children, className, overlayClassName = "" }) {
const [portal, setPortal] = React.useState();

React.useEffect(() => {
@@ -21,6 +21,9 @@ export default function Modal({ children, className }) {
let containerStyle = style.container;
if (className) containerStyle += ` ${className}`;

let overlayStyle = style.overlay;
if (overlayClassName) overlayStyle += ` ${overlayClassName}`;

return portal
? ReactDom.createPortal(
<>
@@ -32,7 +35,7 @@ export default function Modal({ children, className }) {
</div>
<button
aria-label="Cancel"
className={style.overlay}
className={overlayStyle}
ref={(node) => {
if (node) {
node.focus();