Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 9868ccb

Browse files
committed
chore: merge branch 'dev'
2 parents 346c1ef + 6ba05e4 commit 9868ccb

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

containers/Preview/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import React from 'react'
88

99
import { connectStore, buildLog } from '@utils'
10-
import { useShortcut } from '@hooks'
10+
import { useShortcut, usePlatform } from '@hooks'
1111

1212
import SliderPreview from './SliderPreview'
1313
import ModalPreview from './ModalPreview'
1414
import Viewer from './Viewer'
1515

16-
import { useInit, closePreview } from './logic'
16+
import { useInit, useScrollbar, closePreview } from './logic'
1717

1818
/* eslint-disable-next-line */
1919
const log = buildLog('C:Preview')
@@ -22,6 +22,9 @@ const PreviewContainer = ({ preview }) => {
2222
useInit(preview)
2323
useShortcut('esc', closePreview)
2424

25+
const { isMacOS } = usePlatform()
26+
useScrollbar(isMacOS)
27+
2528
const {
2629
modalVisible,
2730
slideVisible,

containers/Preview/logic.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,18 @@ const DataResolver = [
8383
// ###############################
8484
// init & uninit
8585
// ###############################
86+
export const useScrollbar = isMacOS => {
87+
useEffect(() => {
88+
if (isMacOS) {
89+
/* eslint-disable no-undef */
90+
OverlayScrollbars(document.getElementById('preview-viewer-scroller'), {})
91+
}
92+
}, [isMacOS])
93+
}
94+
8695
export const useInit = _store => {
8796
useEffect(() => {
8897
store = _store
89-
9098
sub$ = sr71$.data().subscribe($solver(DataResolver, []))
9199

92100
/* eslint-disable no-undef */

0 commit comments

Comments
 (0)