Commit538b2ec

committed

refactor(preview): use react-version of custom-scrollbar

1 parentb8755d8 commit538b2ecCopy full SHA for 538b2ec

File tree

-18

lines changed

-18

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importReactfrom'react'`
	`2`	`+import{OverlayScrollbarsComponent}from'overlayscrollbars-react'`
`2`	`3`
`3`	`4`	`import{TYPE}from'@constant'`
`4`	`5`
`@@ -85,9 +86,11 @@ const renderViewer = (type, root, attachment, attUser) => {`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`constViewer=({ type, root, attachment, attUser})=>(`
`88`		`-<Wrapperid="preview-viewer-scroller">`
`89`		`-{renderViewer(type,root,attachment,attUser)}`
`90`		`-</Wrapper>`
	`89`	`+<OverlayScrollbarsComponent`
	`90`	`+options={{scrollbars:{autoHide:'scroll',autoHideDelay:200}}}`
	`91`	`+>`
	`92`	`+<Wrapper>{renderViewer(type,root,attachment,attUser)}</Wrapper>`
	`93`	`+</OverlayScrollbarsComponent>`
`91`	`94`	`)`
`92`	`95`
`93`	`96`	`exportdefaultViewer`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`importReactfrom'react'`
`8`	`8`
`9`	`9`	`import{connectStore,buildLog}from'@utils'`
`10`		`-import{useShortcut,usePlatform}from'@hooks'`
	`10`	`+import{useShortcut}from'@hooks'`
`11`	`11`
`12`	`12`	`importSliderPreviewfrom'./SliderPreview'`
`13`	`13`	`importModalPreviewfrom'./ModalPreview'`
`14`	`14`	`importViewerfrom'./Viewer'`
`15`	`15`
`16`		`-import{useInit,useScrollbar,closePreview}from'./logic'`
	`16`	`+import{useInit,closePreview}from'./logic'`
`17`	`17`
`18`	`18`	`/* eslint-disable-next-line */`
`19`	`19`	`constlog=buildLog('C:Preview')`
`@@ -22,9 +22,6 @@ const PreviewContainer = ({ preview }) => {`
`22`	`22`	`useInit(preview)`
`23`	`23`	`useShortcut('esc',closePreview)`
`24`	`24`
`25`		`-const{ isMacOS}=usePlatform()`
`26`		`-useScrollbar(isMacOS)`
`27`		`-`
`28`	`25`	`const{`
`29`	`26`	`modalVisible,`
`30`	`27`	`slideVisible,`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,15 +83,6 @@ const DataResolver = [`
`83`	`83`	`// ###############################`
`84`	`84`	`// init & uninit`
`85`	`85`	`// ###############################`
`86`		`-exportconstuseScrollbar=isMacOS=>{`
`87`		`-useEffect(()=>{`
`88`		`-if(isMacOS){`
`89`		`-/* eslint-disable no-undef */`
`90`		`-OverlayScrollbars(document.getElementById('preview-viewer-scroller'),{})`
`91`		`-}`
`92`		`-},[isMacOS])`
`93`		`-}`
`94`		`-`
`95`	`86`	`exportconstuseInit=_store=>{`
`96`	`87`	`useEffect(()=>{`
`97`	`88`	`store=_store`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import styled from 'styled-components'`
`3`	`3`	`exportconstWrapper=styled.div.attrs(({ id})=>({`
`4`	`4`	`id,`
`5`	`5`	}))`
`6`		`- height:calc(100% - 10px);`
	`6`	`+ height:100vh;`
`7`	`7`	`width: 100%;`
`8`	`8`	`
`9`	`9`

Comments

(0)