1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-25 12:56:41 +07:00

fixed image slider

This commit is contained in:
Fedor Katurov 2020-04-24 14:36:18 +07:00
parent f683fbe1dc
commit f52ae5f0b2
3 changed files with 23 additions and 25 deletions

View file

@ -9,12 +9,13 @@
position: absolute; position: absolute;
background: transparentize(black, 0.5); background: transparentize(black, 0.5);
display: flex; display: flex;
right: 0; left: 50%;
top: 0; top: -60px;
border-radius: 8px; border-radius: 24px;
padding: 0 3px; padding: 0 3px;
flex-wrap: wrap; flex-wrap: wrap;
transition: background-color 0.5s; transition: background-color 0.5s;
transform: translate(-50%, 0);
&:hover { &:hover {
background: transparentize(black, 0.2); background: transparentize(black, 0.2);

View file

@ -41,6 +41,7 @@ const NodeImageSlideBlock: FC<IProps> = ({
const [initial_x, setInitialX] = useState(0); const [initial_x, setInitialX] = useState(0);
const [offset, setOffset] = useState(0); const [offset, setOffset] = useState(0);
const [is_dragging, setIsDragging] = useState(false); const [is_dragging, setIsDragging] = useState(false);
const [drag_start, setDragStart] = useState();
const slide = useRef<HTMLDivElement>(); const slide = useRef<HTMLDivElement>();
const wrap = useRef<HTMLDivElement>(); const wrap = useRef<HTMLDivElement>();
@ -165,7 +166,6 @@ const NodeImageSlideBlock: FC<IProps> = ({
const updateMaxHeight = useCallback(() => { const updateMaxHeight = useCallback(() => {
if (!wrap.current) return; if (!wrap.current) return;
const { width } = wrap.current.getBoundingClientRect(); const { width } = wrap.current.getBoundingClientRect();
// setMaxHeight(width * NODE_SETTINGS.MAX_IMAGE_ASPECT);
setMaxHeight(window.innerHeight - 143); setMaxHeight(window.innerHeight - 143);
normalizeOffset(); normalizeOffset();
}, [wrap, setMaxHeight, normalizeOffset]); }, [wrap, setMaxHeight, normalizeOffset]);
@ -183,11 +183,12 @@ const NodeImageSlideBlock: FC<IProps> = ({
setIsDragging(false); setIsDragging(false);
normalizeOffset(); normalizeOffset();
if (initial_x - getX(event) < 10) { if (+new Date() - drag_start < 300) {
// click detection
onOpenPhotoSwipe(); onOpenPhotoSwipe();
} }
}, },
[setIsDragging, is_dragging, normalizeOffset, onOpenPhotoSwipe] [setIsDragging, is_dragging, normalizeOffset, onOpenPhotoSwipe, drag_start]
); );
const startDragging = useCallback( const startDragging = useCallback(
@ -195,8 +196,9 @@ const NodeImageSlideBlock: FC<IProps> = ({
setIsDragging(true); setIsDragging(true);
setInitialX(getX(event)); setInitialX(getX(event));
setInitialOffset(offset); setInitialOffset(offset);
setDragStart(+new Date());
}, },
[setIsDragging, setInitialX, offset, setInitialOffset] [setIsDragging, setInitialX, offset, setInitialOffset, setDragStart]
); );
useEffect(() => updateMaxHeight(), [images]); useEffect(() => updateMaxHeight(), [images]);
@ -243,15 +245,6 @@ const NodeImageSlideBlock: FC<IProps> = ({
</div> </div>
</div> </div>
{!is_loading && (
<ImageSwitcher
total={images.length}
current={current}
onChange={changeCurrent}
loaded={loaded}
/>
)}
<div <div
className={classNames(styles.image_container, { [styles.is_dragging]: is_dragging })} className={classNames(styles.image_container, { [styles.is_dragging]: is_dragging })}
style={{ style={{
@ -283,6 +276,15 @@ const NodeImageSlideBlock: FC<IProps> = ({
</div> </div>
))} ))}
</div> </div>
{!is_loading && (
<ImageSwitcher
total={images.length}
current={current}
onChange={changeCurrent}
loaded={loaded}
/>
)}
</div> </div>
); );
}; };

View file

@ -2,9 +2,10 @@
overflow: hidden; overflow: hidden;
position: relative; position: relative;
min-width: 0; min-width: 0;
width: 100%;
transition: height 0.25s; transition: height 0.25s;
border-radius: $radius; border-radius: $radius;
margin-right: -10px;
margin-left: -10px;
.is_loading { .is_loading {
.placeholder { .placeholder {
@ -14,7 +15,6 @@
} }
.image_container { .image_container {
// background: $node_image_bg;
border-radius: $panel_radius 0 0 $panel_radius; border-radius: $panel_radius 0 0 $panel_radius;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
@ -31,10 +31,7 @@
} }
.image { .image {
// that was for containered image: max-width: 100%;
// max-height: 960px;
// max-height: 120vh !important;
// max-width: 100%;
opacity: 1; opacity: 1;
border-radius: $radius; border-radius: $radius;
box-shadow: transparentize($color: white, $amount: 0.95) 0 -1px, box-shadow: transparentize($color: white, $amount: 0.95) 0 -1px,
@ -48,15 +45,13 @@
.image_wrap { .image_wrap {
width: 100%; width: 100%;
// top: 0;
// left: 0;
// opacity: 0;
pointer-events: none; pointer-events: none;
touch-action: none; touch-action: none;
z-index: 1; z-index: 1;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 0 10px;
&:global(.is_active) { &:global(.is_active) {
opacity: 1; opacity: 1;