Commit93716d5

committed

refactor(scrollbar): do not custom scrollbar on mobile

1 parentfafbede commit93716d5Copy full SHA for 93716d5

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ const inialPlatform = {`
`10`	`10`	`isIE:false,`
`11`	`11`	`isEdge:false,`
`12`	`12`	`isMacOS:false,`
	`13`	`+isMobile:false,`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`// see https://stackoverflow.com/questions/49328382/browser-detection-in-reactjs/49328524`
`@@ -44,6 +45,8 @@ const usePlatform = (/* { breakpoint } */) => {`
`44`	`45`	`constisMacOS=Global.navigator.appVersion.indexOf('Mac')!=-1`
`45`	`46`	`/* eslint-enable */`
`46`	`47`
	`48`	`+constisMobile=Global.innerWidth<=800&&window.innerHeight<=600`
	`49`	`+`
`47`	`50`	`setPlatform(`
`48`	`51`	`R.merge(inialPlatform,{`
`49`	`52`	`isFirefox,`
`@@ -52,6 +55,7 @@ const usePlatform = (/* { breakpoint } */) => {`
`52`	`55`	`isEdge,`
`53`	`56`	`isChrome,`
`54`	`57`	`isMacOS,`
	`58`	`+ isMobile,`
`55`	`59`	`})`
`56`	`60`	`)`
`57`	`61`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -139,8 +139,8 @@ const GlobalStyle = createGlobalStyle`
`139`	`139`	`color:${theme('searchHighlight.doramonFg')};`
`140`	`140`	`}`
`141`	`141`
`142`		`-${({isMacOS})=>`
`143`		`-isMacOS\|\|`
	`142`	`+${({showCustomScrollbar})=>`
	`143`	`+showCustomScrollbar\|\|`
`144`	`144`	css`
`145`	`145`	`::-webkit-scrollbar {`
`146`	`146`	`background: transparent;`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ import AntUIOverWrite from './AntUIOverWrite'`
`17`	`17`	`importGlobalStylefrom'./GlobalStyle'`
`18`	`18`
`19`	`19`	`constThemeContainer=({ children,theme:{ themeData}})=>{`
`20`		`-const{ isMacOS}=usePlatform()`
`21`		`-`
`22`		`-console.log('isMacOS: ',isMacOS)`
	`20`	`+const{ isMacOS, isMobile}=usePlatform()`
	`21`	`+constshowCustomScrollbar=!isMacOS\|\|!isMobile`
`23`	`22`
`24`	`23`	`return(`
`25`	`24`	`<ThemeProvidertheme={themeData}>`
`@@ -30,7 +29,7 @@ const ThemeContainer = ({ children, theme: { themeData } }) => {`
`30`	`29`	`<div>{children}</div>`
`31`	`30`	`<CodeSyxHighlight/>`
`32`	`31`	`<AntUIOverWrite/>`
`33`		`-<GlobalStyleisMacOS={isMacOS}/>`
	`32`	`+<GlobalStyleshowCustomScrollbar={showCustomScrollbar}/>`
`34`	`33`	`</React.Fragment>`
`35`	`34`	`</ThemeProvider>`
`36`	`35`	`)`

Comments

(0)