fix: Missing click action to change permissions on a collection
fix: Modals no longer stacking correctly since upgrading react-portal
This commit is contained in:
@ -9,6 +9,7 @@ import breakpoint from "styled-components-breakpoint";
|
|||||||
import { fadeAndScaleIn } from "shared/styles/animations";
|
import { fadeAndScaleIn } from "shared/styles/animations";
|
||||||
import Flex from "components/Flex";
|
import Flex from "components/Flex";
|
||||||
import NudeButton from "components/NudeButton";
|
import NudeButton from "components/NudeButton";
|
||||||
|
import Scrollable from "components/Scrollable";
|
||||||
|
|
||||||
ReactModal.setAppElement("#root");
|
ReactModal.setAppElement("#root");
|
||||||
|
|
||||||
@ -27,7 +28,8 @@ const GlobalStyles = createGlobalStyle`
|
|||||||
}
|
}
|
||||||
|
|
||||||
${breakpoint("tablet")`
|
${breakpoint("tablet")`
|
||||||
.ReactModalPortal + .ReactModalPortal {
|
.ReactModalPortal + .ReactModalPortal,
|
||||||
|
.ReactModalPortal + [data-react-modal-body-trap] + .ReactModalPortal {
|
||||||
.ReactModal__Overlay {
|
.ReactModal__Overlay {
|
||||||
margin-left: 12px;
|
margin-left: 12px;
|
||||||
box-shadow: 0 -2px 10px ${(props) => props.theme.shadow};
|
box-shadow: 0 -2px 10px ${(props) => props.theme.shadow};
|
||||||
@ -36,13 +38,15 @@ const GlobalStyles = createGlobalStyle`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal {
|
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal,
|
||||||
|
.ReactModalPortal + .ReactModalPortal + [data-react-modal-body-trap] + .ReactModalPortal {
|
||||||
.ReactModal__Overlay {
|
.ReactModal__Overlay {
|
||||||
margin-left: 24px;
|
margin-left: 24px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal + .ReactModalPortal {
|
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal + .ReactModalPortal,
|
||||||
|
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal + [data-react-modal-body-trap] + .ReactModalPortal {
|
||||||
.ReactModal__Overlay {
|
.ReactModal__Overlay {
|
||||||
margin-left: 36px;
|
margin-left: 36px;
|
||||||
}
|
}
|
||||||
@ -72,10 +76,11 @@ const Modal = ({
|
|||||||
isOpen={isOpen}
|
isOpen={isOpen}
|
||||||
{...rest}
|
{...rest}
|
||||||
>
|
>
|
||||||
<Content onClick={(ev) => ev.stopPropagation()} column>
|
<Content>
|
||||||
{title && <h1>{title}</h1>}
|
<Centered onClick={(ev) => ev.stopPropagation()} column>
|
||||||
|
{title && <h1>{title}</h1>}
|
||||||
{children}
|
{children}
|
||||||
|
</Centered>
|
||||||
</Content>
|
</Content>
|
||||||
<Back onClick={onRequestClose}>
|
<Back onClick={onRequestClose}>
|
||||||
<BackIcon size={32} color="currentColor" />
|
<BackIcon size={32} color="currentColor" />
|
||||||
@ -89,10 +94,20 @@ const Modal = ({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const Content = styled(Flex)`
|
const Content = styled(Scrollable)`
|
||||||
|
width: 100%;
|
||||||
|
padding: 8vh 2rem 2rem;
|
||||||
|
|
||||||
|
${breakpoint("tablet")`
|
||||||
|
padding-top: 13vh;
|
||||||
|
`};
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Centered = styled(Flex)`
|
||||||
width: 640px;
|
width: 640px;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
margin: 0 auto;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledModal = styled(ReactModal)`
|
const StyledModal = styled(ReactModal)`
|
||||||
@ -107,16 +122,9 @@ const StyledModal = styled(ReactModal)`
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
overflow-x: hidden;
|
|
||||||
overflow-y: auto;
|
|
||||||
background: ${(props) => props.theme.background};
|
background: ${(props) => props.theme.background};
|
||||||
transition: ${(props) => props.theme.backgroundTransition};
|
transition: ${(props) => props.theme.backgroundTransition};
|
||||||
padding: 8vh 2rem 2rem;
|
|
||||||
outline: none;
|
outline: none;
|
||||||
|
|
||||||
${breakpoint("tablet")`
|
|
||||||
padding-top: 13vh;
|
|
||||||
`};
|
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Text = styled.span`
|
const Text = styled.span`
|
||||||
@ -147,7 +155,7 @@ const Close = styled(NudeButton)`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
const Back = styled(NudeButton)`
|
const Back = styled(NudeButton)`
|
||||||
position: fixed;
|
position: absolute;
|
||||||
display: none;
|
display: none;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
top: 2rem;
|
top: 2rem;
|
||||||
|
@ -127,6 +127,7 @@ class CollectionMenu extends React.Component<Props> {
|
|||||||
collection={collection}
|
collection={collection}
|
||||||
onSubmit={this.handleMembersModalClose}
|
onSubmit={this.handleMembersModalClose}
|
||||||
handleEditCollectionOpen={this.handleEditCollectionOpen}
|
handleEditCollectionOpen={this.handleEditCollectionOpen}
|
||||||
|
onEdit={this.handleEditCollectionOpen}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
<DropdownMenu onOpen={onOpen} onClose={onClose} position={position}>
|
<DropdownMenu onOpen={onOpen} onClose={onClose} position={position}>
|
||||||
|
@ -132,7 +132,7 @@ class CollectionMembers extends React.Component<Props> {
|
|||||||
collection. You can make this collection visible to the entire
|
collection. You can make this collection visible to the entire
|
||||||
team by{" "}
|
team by{" "}
|
||||||
<a role="button" onClick={this.props.onEdit}>
|
<a role="button" onClick={this.props.onEdit}>
|
||||||
changing its visibility
|
changing the visibility
|
||||||
</a>
|
</a>
|
||||||
.
|
.
|
||||||
</HelpText>
|
</HelpText>
|
||||||
|
Reference in New Issue
Block a user