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.

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

BUGFIX: Let unapplied changes overlay cover everything except inspector #3491

Merged
merged 2 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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: 3 additions & 3 deletions cssVariables.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@
--zIndex-SecondaryInspector-Close: 3;
--zIndex-SecondaryInspectorElevated-Context: 1;
--zIndex-SecondaryInspectorElevated-DropdownContents: 2;
--zIndex-Dialog-Context: 1;
--zIndex-Dialog: 55;
--zIndex-FullScreenClose-Context: 1;
--zIndex-Drawer: 45;
--zIndex-Bar-Context: 1;
--zIndex-PrimaryToolbar: 40;
--zIndex-CheckboxInput-Context: 1;
--zIndex-DropdownContents-Context: 1;
--zIndex-SelectBoxContents: 40;
--zIndex-SelectBoxContents: 55;
--zIndex-NotInlineEditableOverlay-Context: 1;
--zIndex-CalendarFakeInputMirror-Context: 1;
--zIndex-RdtPicker-Context: 1;
--zIndex-SideBar-DropTargetBefore: 1;
--zIndex-SideBar-DropTargetAfter: 2;
--zIndex-WrapperDropdown-Context: 1;
--zIndex-UnappliedChangesOverlay-Context: 1;
--zIndex-UnappliedChangesOverlay: 55;
--zIndex-NodeToolBar: 2147483646;
--fontSize-Base: 14px;
--fontSize-Small: 12px;
Expand Down
6 changes: 3 additions & 3 deletions packages/build-essentials/src/styles/styleConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ const config = {
loadingIndicatorContainer: '5',
secondaryInspector: ['context', 'iframe', 'close'],
secondaryInspectorElevated: ['context', 'dropdownContents'],
dialog: ['context'],
dialog: '5',
fullScreenClose: ['context'],
drawer: ['context'],
bar: ['context'],
primaryToolbar: '4',
checkboxInput: ['context'],
dropdownContents: ['context'],
selectBoxContents: '4',
selectBoxContents: '5',
notInlineEditableOverlay: ['context'],
calendarFakeInputMirror: ['context'],
rdtPicker: ['context'],
sideBar: ['dropTargetBefore', 'dropTargetAfter'],
wrapperDropdown: ['context'],
unappliedChangesOverlay: ['context'],
unappliedChangesOverlay: '5',
nodeToolBar: '2147483646'
},
fontSize: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PureComponent} from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import {produce} from 'immer';
import {mapValues} from 'lodash';
Expand Down Expand Up @@ -315,13 +316,14 @@ export default class Inspector extends PureComponent {

return (
<div id="neos-Inspector" className={style.inspector}>
{shouldShowUnappliedChangesOverlay &&
{shouldShowUnappliedChangesOverlay && ReactDOM.createPortal(
<div
role="button"
className={style.unappliedChangesOverlay}
onClick={this.handleEscape}
/>
}
/>,
document.body
)}
<SelectedElement/>
<Tabs
className={style.tabs}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
left: 0;
width: calc(100% - var(--size-SidebarWidth));
height: 100%;
z-index: var(--zIndex-UnappliedChangesOverlay-Context);
z-index: var(--zIndex-UnappliedChangesOverlay);
&,
&::after {
position: fixed;
Expand All @@ -59,7 +59,7 @@
&::after {
content: '';
top: 0;
right: 0;
right: calc(-1 * var(--size-SidebarWidth));
height: var(--spacing-GoldenUnit);
width: var(--size-SidebarWidth);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-ui-components/src/Dialog/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
position: fixed;
top: 0;
left: 0;
z-index: var(--zIndex-Dialog-Context);
z-index: var(--zIndex-Dialog);
width: 100vw;
height: 100vh;
background: rgba(#000, .8);
Expand Down