Skip to content

Commit a35edea

Browse files
committed
After CR
1 parent 1257dca commit a35edea

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/bundle/Resources/public/scss/ui/modules/muti-file-upload/_upload.popup.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.c-upload-popup {
22
background: rgba($ibexa-color-black, 0.35);
33
position: fixed;
4-
z-index: 10250;
4+
z-index: 10100;
55
top: 0;
66
left: 0;
77
height: 100vh;
@@ -15,6 +15,10 @@
1515
line-height: calculateRem(18px);
1616
}
1717

18+
&--elevated {
19+
z-index: 10250;
20+
}
21+
1822
.c-tooltip-popup {
1923
width: 100%;
2024
max-height: 90vh;

src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-popup/upload.popup.component.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ import { getContentTypeName } from '@ibexa-admin-ui/src/bundle/Resources/public/
88
import TooltipPopup from '../../../common/tooltip-popup/tooltip.popup.component';
99
import DropAreaComponent from '../drop-area/drop.area.component';
1010
import UploadListComponent from '../upload-list/upload.list.component';
11+
import { UDWContext } from '../../../universal-discovery/universal.discovery.module';
12+
import { createCssClassNames } from '../../..//common/helpers/css.class.names';
1113

1214
const CLASS_SCROLL_DISABLED = 'ibexa-scroll-disabled';
1315

1416
export default class UploadPopupModule extends Component {
17+
static contextType = UDWContext;
18+
1519
constructor(props) {
1620
super(props);
1721

@@ -47,6 +51,7 @@ export default class UploadPopupModule extends Component {
4751
}
4852

4953
render() {
54+
const isUDW = this.context;
5055
const Translator = getTranslator();
5156
const hasAnyUploadedItems = !!this.props.uploadedItems.length;
5257
const hasAnyItemsToUpload = !!this.props.itemsToUpload.length;
@@ -60,6 +65,10 @@ export default class UploadPopupModule extends Component {
6065
{},
6166
'ibexa_multi_file_upload',
6267
);
68+
const className = createCssClassNames({
69+
'c-upload-popup': true,
70+
'c-upload-popup--elevated': !!isUDW
71+
});
6372
const {
6473
addItemsToUpload,
6574
subtitle,
@@ -120,7 +129,7 @@ export default class UploadPopupModule extends Component {
120129
}
121130

122131
return (
123-
<div className="c-upload-popup" ref={this.refTooltip}>
132+
<div className={className} ref={this.refTooltip}>
124133
<TooltipPopup {...tooltipAttrs}>
125134
<div className="c-upload-popup__label">{label}</div>
126135
<DropAreaComponent

0 commit comments

Comments
 (0)