Skip to content
This repository was archived by the owner on Jan 19, 2023. It is now read-only.

Fix key navigation #463

Closed
mmarkelov wants to merge 2 commits into from
Closed

Fix key navigation #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e523b1b
New discourageDownloads
mmarkelov Jul 14, 2021
780e5d6
Fix key navigation
mmarkelov Jul 15, 2021
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
51 changes: 21 additions & 30 deletions src/react-image-lightbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,9 @@ class ReactImageLightbox extends Component {

default:
}
if (this.outerEl.current) {
this.outerEl.current.focus();
}
}

/**
Expand Down Expand Up @@ -1377,37 +1380,25 @@ class ReactImageLightbox extends Component {
}

const imageSrc = bestImageInfo.src;
if (discourageDownloads) {
imageStyle.backgroundImage = `url('${imageSrc}')`;
images.push(
<div
className={`${imageClass} ril__image ril__imageDiscourager`}
onDoubleClick={this.handleImageDoubleClick}
onWheel={this.handleImageMouseWheel}
style={imageStyle}
key={imageSrc + keyEndings[srcType]}
>
<div className="ril-download-blocker ril__downloadBlocker" />
</div>
);
} else {
images.push(
<img
{...(imageCrossOrigin ? { crossOrigin: imageCrossOrigin } : {})}
className={`${imageClass} ril__image`}
onDoubleClick={this.handleImageDoubleClick}
onWheel={this.handleImageMouseWheel}
onDragStart={e => e.preventDefault()}
style={imageStyle}
src={imageSrc}
key={imageSrc + keyEndings[srcType]}
alt={
typeof imageTitle === 'string' ? imageTitle : translate('Image')
images.push(
<img
{...(imageCrossOrigin && { crossOrigin: imageCrossOrigin })}
className={`${imageClass} ril__image`}
onDoubleClick={this.handleImageDoubleClick}
onContextMenu={e => {
if (discourageDownloads) {
e.preventDefault();
}
draggable={false}
/>
);
}
}}
onWheel={this.handleImageMouseWheel}
onDragStart={e => e.preventDefault()}
style={imageStyle}
src={imageSrc}
key={imageSrc + keyEndings[srcType]}
alt={typeof imageTitle === 'string' ? imageTitle : translate('Image')}
draggable={false}
/>
);
};

const zoomMultiplier = this.getZoomMultiplier();
Expand Down
16 changes: 0 additions & 16 deletions src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@
touch-action: none;
}

.ril__imageDiscourager {
background-repeat: no-repeat;
background-position: center;
background-size: contain;
}

.ril__navButtons {
border: none;
position: absolute;
Expand Down Expand Up @@ -90,16 +84,6 @@
no-repeat center;
}

.ril__downloadBlocker {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-image: url('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
background-size: cover;
}

.ril__caption,
.ril__toolbar {
background-color: rgba(0, 0, 0, 0.5);
Expand Down