mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Manual merge of changes from react-swipeable branch, update react-swipeable version

This commit is contained in:
PJ-Watson 2022-08-12 07:00:05 +01:00
parent 4169a2c102
commit 0d106274d2
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/package-lock.json generated
View File

@ -39,6 +39,7 @@
"react-i18next": "^11.18.0",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
"react-swipeable": "^7.0.0",
"react-test-renderer": "^18.2.0",
"styled-components": "^5.3.5",
"subscriptions-transport-ws": "^0.11.0",
@ -20874,6 +20875,14 @@
"react": "^16.3.0 || ^17.0.0 || ^18.0.0"
}
},
"node_modules/react-swipeable": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.0.tgz",
"integrity": "sha512-NI7KGfQ6gwNFN0Hor3vytYW3iRfMMaivGEuxcADOOfBCx/kqwXE8IfHFxEcxSUkxCYf38COLKYd9EMYZghqaUA==",
"peerDependencies": {
"react": "^16.8.3 || ^17 || ^18"
}
},
"node_modules/react-test-renderer": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.2.0.tgz",
@ -40414,6 +40423,12 @@
"integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
"requires": {}
},
"react-swipeable": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.0.tgz",
"integrity": "sha512-NI7KGfQ6gwNFN0Hor3vytYW3iRfMMaivGEuxcADOOfBCx/kqwXE8IfHFxEcxSUkxCYf38COLKYd9EMYZghqaUA==",
"requires": {}
},
"react-test-renderer": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.2.0.tgz",

2
ui/package.json
View File

@ -49,7 +49,7 @@
"react-i18next": "^11.18.0",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
"react-swipeable": "^6.1.0",
"react-swipeable": "^7.0.0",
"react-test-renderer": "^18.2.0",
"styled-components": "^5.3.5",
"subscriptions-transport-ws": "^0.11.0",

15
ui/src/components/photoGallery/presentView/PresentNavigationOverlay.tsx
View File

@ -3,7 +3,7 @@ import styled from 'styled-components'
import { debounce, DebouncedFn } from '../../../helpers/utils'
import { closePresentModeAction, GalleryAction } from '../mediaGalleryReducer'
import { useSwipeable } from 'react-swipeable';
import { useSwipeable } from 'react-swipeable'
import ExitIcon from './icons/Exit'
import NextIcon from './icons/Next'
@ -98,21 +98,19 @@ const PresentNavigationOverlay = ({
const handlers = useSwipeable({
onSwipedLeft: () => dispatchMedia({ type: 'nextImage' }),
onSwipedRight: () => dispatchMedia({ type: 'previousImage' }),
preventDefaultTouchmoveEvent: false,
trackMouse: false
});
preventScrollOnSwipe: false,
trackMouse: false,
})
return (
<StyledOverlayContainer
data-testid="present-overlay"
onMouseMove={() => {
onMouseMove.current && onMouseMove.current()
}}
>
<div {...handlers} >
<div {...handlers}>
{children}
<NavigationButton
aria-label="Previous image"
className={hide ? 'hide' : undefined}
@ -142,9 +140,8 @@ const PresentNavigationOverlay = ({
>
<ExitIcon />
</ExitButton>
</div>
</div>
</StyledOverlayContainer>
)
}