Skip to content

Commit

Permalink
fix(modal): outside close button handling
Browse files Browse the repository at this point in the history
when you have two modals on top of each other, if the height of both of them are the same and close buttons are out of the modal, the close buttons are on each other which has a bad user experience.

In addition the close icon from the first modal was still clickable and would close the first modal.

In some cases the close icon could be shown over a different inner Dimmer making the close icon invisible, so i added a slight text shadow to keep it visible. This text shadow is not recognizable on usual modal usage .

At last i made the dimmer class of the inner dimmer optional, so one could customize that as well.
  • Loading branch information
lubber-de authored Jan 7, 2022
1 parent 143371c commit 118ddb1
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/definitions/modules/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ $.fn.modal = function(parameters) {
module.verbose('Creating unique id for element', id);
},
innerDimmer: function() {
if ( $module.find(selector.dimmer).length == 0 ) {
$module.prepend('<div class="ui inverted dimmer"></div>');
if ( $module.find(selector.dimmer).length === 0 ) {
$('<div/>', {class: className.innerDimmer}).prependTo($module);
}
}
},
Expand Down Expand Up @@ -1422,7 +1422,8 @@ $.fn.modal.settings = {
template : 'ui tiny modal',
ok : 'positive',
cancel : 'negative',
prompt : 'ui fluid input'
prompt : 'ui fluid input',
innerDimmer: 'ui inverted dimmer'
},
text: {
ok : 'Ok',
Expand Down
10 changes: 10 additions & 0 deletions src/definitions/modules/modal.less
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,16 @@
.ui.modal:not(.fullscreen) {
width: @tabletWidth;
margin: @tabletMargin;
& > .active.dimmer + .close:not(.inside) {
pointer-events: none;
opacity: @closeOpacityDimmed;
}
}
.ui.dimmer > .ui.modal:not(.fullscreen) > .close:not(.inside){
text-shadow: @closeShadow;
}
.ui.inverted.dimmer > .ui.modal:not(.fullscreen) > .close:not(.inside){
text-shadow: @invertedCloseShadow;
}
}
@media only screen and (min-width : @computerBreakpoint) {
Expand Down
13 changes: 13 additions & 0 deletions src/themes/default/modules/modal.variables
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

/* Close Icon */
@closeOpacity: 0.8;
@closeOpacityDimmed: 0.1;
@closeSize: 1.25em;
@closeColor: @white;

Expand All @@ -23,6 +24,12 @@
@closePadding: @closeHitBoxOffset 0 0 0;
@closeTop: -(@closeDistance + @closeHitbox);
@closeRight: -(@closeDistance + @closeHitbox);
@closeShadow:
-1px -1px 2px rgba(0, 0, 0, 0.3),
1px -1px 2px rgba(0, 0, 0, 0.3),
-1px 2px 2px rgba(0, 0, 0, 0.3),
1px 2px 2px rgba(0, 0, 0, 0.3)
;

/* Header */
@headerMargin: 0;
Expand Down Expand Up @@ -249,3 +256,9 @@
@invertedActionBorder: 1px solid rgba(34, 36, 38, 0.85);
@invertedActionColor: @white;
@invertedDimmerCloseColor: rgba(0,0,0,.85);
@invertedCloseShadow:
-1px -1px 2px rgba(255, 255, 255, 0.3),
1px -1px 2px rgba(255, 255, 255, 0.3),
-1px 2px 2px rgba(255, 255, 255, 0.3),
1px 2px 2px rgba(255, 255, 255, 0.3)
;

0 comments on commit 118ddb1

Please sign in to comment.