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.

Sign up for GitHub

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

Jump to bottom

Dummy pr #1276

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dummy pr #1276

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
54ee42f
Revert "Show all relevant thumbnails (#1273)"
Galpittel Aug 19, 2024
bd1ec9c
Revert "prevent listening and manipulating the anchor navigations whe…
Galpittel Aug 19, 2024
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
2 changes: 1 addition & 1 deletion packages/gallery/src/components/gallery/proGallery/navigationPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class NavigationPanel extends React.Component {
style={{ ...thumbnailsStyle }}
>
{items.map(({ thumbnailItem, location, idx }) => {
const highlighted = idx === activeIndex % clearedGalleryItems.length;
const highlighted = idx === activeIndex % items.length;
const itemStyle = {
width: options[optionsMap.layoutParams.thumbnails.size],
height: options[optionsMap.layoutParams.thumbnails.size],
Expand Down
7 changes: 1 addition & 6 deletions packages/gallery/src/components/item/itemView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,7 @@ class ItemView extends React.Component {
onItemInfoClick(e) {
const clickTarget = 'item-info';
this.onItemClick(e, clickTarget, false);
if (!this.shouldUseDirectLink()) {
// stop propagation only if we are not using direct link.
// stop propagation will prevent listening and manipulating the anchor navigations as some users do.
// we dont want to do this when we use a direct link via a tag.
e.stopPropagation();
}
e.stopPropagation();
}

onItemClick(e, clickTarget, shouldPreventDefault = true) {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/core/helpers/thumbnailsLogic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function getThumbnailsData({
const numberOfThumbnails = minNumOfThumbnails % 2 === 1 ? minNumOfThumbnails : minNumOfThumbnails + 1;
const thumbnailsInEachSide = (numberOfThumbnails - 1) / 2;

const itemRangeStart = (activeIndexWithOffset % galleryItems.length) - thumbnailsInEachSide;
const itemRangeStart = activeIndexWithOffset - thumbnailsInEachSide;
const itemRangeEnd = itemRangeStart + numberOfThumbnails;

const itemToDisplay = withInfiniteScroll
Expand Down
Loading