chore: Merge branch 'dev'

Author: mydearxym

.travis.yml

@@ -1,10 +1,10 @@
 language: elixir
 elixir:
-  - 1.8
+  - 1.9
 otp_release:
   - 21.0
 addons:
-  postgresql: '9.4'
+  postgresql: '9.6'
 
 before_install:
   - sudo chown -R travis ./travis/install_node.sh

components/Hooks/usePlatform.js

@@ -9,6 +9,7 @@ const inialPlatform = {
   isSafari: false,
   isIE: false,
   isEdge: false,
+  isMacOS: false,
 }
 
 // see https://stackoverflow.com/questions/49328382/browser-detection-in-reactjs/49328524
@@ -40,10 +41,18 @@ const usePlatform = (/* { breakpoint } */) => {
     const isChrome =
       !!Global.chrome && (!!Global.chrome.webstore || !!Global.chrome.runtime)
 
+    const isMacOS = Global.navigator.appVersion.indexOf('Mac') != -1
     /* eslint-enable */
 
     setPlatform(
-      R.merge(inialPlatform, { isFirefox, isSafari, isIE, isEdge, isChrome })
+      R.merge(inialPlatform, {
+        isFirefox,
+        isSafari,
+        isIE,
+        isEdge,
+        isChrome,
+        isMacOS,
+      })
     )
 
     return () => {}

config/endpoint.js

@@ -13,8 +13,8 @@ const getGraphQLEndpoint = () => {
       return 'http://localhost:4001/graphiql'
 
     default:
-      // return 'https://api.coderplanets.com/graphiql'
-      return 'http://localhost:4001/graphiql'
+      return 'https://api.coderplanets.com/graphiql'
+    /* return 'http://localhost:4001/graphiql' */
   }
 }
 

containers/Doraemon/ResultsList.js

@@ -30,7 +30,7 @@ const HintIcon = ({ index, active, cur, length }) => {
 }
 
 const ResultsList = ({ searchValue, searchThread, suggestions, activeRaw }) => (
-  <Wrapper>
+  <Wrapper id="suggestion-scroller">
     <SuggestionWrapper empty={suggestions.length === 0}>
       {suggestions.map((suggestion, i) => (
         <InfoBar

containers/Doraemon/logic/index.js

@@ -500,6 +500,9 @@ export const useInit = _store => {
     pockect$ = new Pocket(store)
     SAK = new SwissArmyKnife(store)
 
+    /* eslint-disable no-undef */
+    OverlayScrollbars(document.getElementById('suggestion-scroller'), {})
+
     initSpecCmdResolver()
 
     pockect$.search().subscribe(res => {
@@ -537,6 +540,8 @@ export const useInit = _store => {
   }, [_store])
 }
 
+/*
+
 export const init2 = _store => {
   if (store) return false
 
@@ -577,3 +582,4 @@ export const init2 = _store => {
   if (sub$) sub$.unsubscribe()
   sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
 }
+*/

containers/Doraemon/styles/results_list.js

@@ -3,6 +3,13 @@ import styled from 'styled-components'
 import Img from '@components/Img'
 import { theme, animate, cs } from '@utils'
 
+export const Wrapper = styled.div.attrs(({ id }) => ({
+  id,
+}))`
+  width: 100%;
+  overflow: hidden;
+  max-height: 400px;
+`
 export const LoadingIcon = styled(Img)`
   fill: ${theme('shell.searchIcon')};
   width: 30px;
@@ -40,18 +47,14 @@ export const PanelContainer = styled.div`
   left: 50%;
   margin-left: -19vw;
 `
-export const Wrapper = styled.div`
-  width: 100%;
-  overflow: hidden;
-`
 export const SuggestionWrapper = styled.div`
   position: relative;
   display: ${({ empty }) => (empty ? 'none' : 'flex')};
   flex-direction: column;
-  max-height: 60vh;
+  // max-height: 400px;
   overflow-y: scroll;
   overflow-x: hidden;
-  width: 102%;
+  width: 100%;
 `
 // #001b21;
 export const BaseBar = styled.div`
@@ -115,7 +118,7 @@ export const Title = styled.div`
 
   ${cs.truncate('400px')};
   ${cs.media.mobile`
-    ${cs.truncate('200px')};
+${cs.truncate('200px')};
   `};
 `
 export const Desc = styled.div`

containers/GlobalLayout/index.js

@@ -8,9 +8,11 @@ import React from 'react'
 import T from 'prop-types'
 import useNetwork from 'react-use/lib/useNetwork'
 
+import 'overlayscrollbars/js/OverlayScrollbars'
+import 'overlayscrollbars/css/OverlayScrollbars.css'
+
 import { ICON_CMD } from '@config'
 import { connectStore } from '@utils'
-
 import { useShortcut, useMedia, usePlatform } from '@hooks'
 
 import { Wrapper, SubCommunitiesExpander, ExpanderIcon } from './styles'

containers/GlobalLayout/logic.js

@@ -22,6 +22,14 @@ export const useInit = (_store, extra) => {
   useEffect(() => {
     store = _store
 
+    // FIXME:  do not show body scrollbar on mac
+    // plus this plugin will break antd's affix staff
+    /* eslint-disable no-undef */
+    // OverlayScrollbars(document.querySelectorAll('body'), {
+    // NOT WORK!
+    // scrollbars: { autoHide: 'scroll', autoHideDelay: 500 },
+    // })
+
     const { online, media, platform } = extra
     store.markState({ online, media, platform })
   }, [_store, extra])

containers/Preview/Viewer.js

@@ -19,10 +19,11 @@ import {
   DynamicStateTree,
 } from './DynamicComps'
 
+import { Wrapper } from './styles/viewer'
 import DefaultViewer from './DefaultViewer'
 import { closePreview } from './logic'
 
-const Viewer = ({ type, root, attachment, attUser }) => {
+const renderViewer = (type, root, attachment, attUser) => {
   switch (type) {
     case TYPE.PREVIEW_ACCOUNT_VIEW:
       return <DynamicAccountViewer />
@@ -83,4 +84,10 @@ const Viewer = ({ type, root, attachment, attUser }) => {
   }
 }
 
+const Viewer = ({ type, root, attachment, attUser }) => (
+  <Wrapper id="preview-viewer-scroller">
+    {renderViewer(type, root, attachment, attUser)}
+  </Wrapper>
+)
+
 export default Viewer

containers/Preview/logic.js

@@ -89,6 +89,9 @@ export const useInit = _store => {
 
     sub$ = sr71$.data().subscribe($solver(DataResolver, []))
 
+    /* eslint-disable no-undef */
+    OverlayScrollbars(document.getElementById('preview-viewer-scroller'), {})
+
     return () => {
       if (!sub$) return false
       sr71$.stop()