chore: merge branch 'dev'

Author: mydearxym

containers/Doraemon/InputEditor.js

@@ -20,7 +20,7 @@ import {
 } from './logic'
 
 const InputEditor = ({ searching, value, prefix }) => {
-  useShortcut(['ctrl+c', 'ctrl+g'], hidePanel)
+  useShortcut(['ctrl+c', 'ctrl+g', 'esc'], hidePanel)
   useShortcut('ctrl+p', () => navSuggestion('up'))
   useShortcut('ctrl+n', () => navSuggestion('down'))
 
@@ -46,54 +46,3 @@ const InputEditor = ({ searching, value, prefix }) => {
 }
 
 export default InputEditor
-
-/*
-
-   export default class InputEditor extends React.Component {
-   @keydown(['ctrl+g', 'ctrl+c'])
-   hidePanel() {
-   hidePanel()
-   }
-
-   // Prevent default behavior in text input while pressing arrow up
-   // https://stackoverflow.com/questions/1080532/prevent-default-behavior-in-text-input-while-pressing-arrow-up
-   @keydown(['ctrl+p'])
-   up(e) {
-   navSuggestion('up')
-   e.preventDefault()
-   }
-
-   @keydown(['ctrl+n'])
-   down(e) {
-   navSuggestion('down')
-   e.preventDefault()
-   }
-
-   render() {
-   const { searching, value, prefix } = this.props
-
-   // if you want to use innerRef
-   // see https://github.com/styled-components/styled-components/issues/102
-   // innerRef={input => (this.doraemonInput = input)}
-   return (
-   <EditorBar>
-   <PrefixWraper>
-   <InputPrefix prefix={prefix} searching={searching} />
-   </PrefixWraper>
-   <InputBar
-   id="doraemonInputbar"
-   spellCheck={false}
-   autoCapitalize="off"
-   autoCorrect="off"
-   autoComplete="off"
-   onKeyDown={logic.handleKeyDown}
-   onBlur={logic.inputOnBlur}
-   onChange={logic.inputOnChange}
-   value={value}
-   placeholder="type ? for help"
-   />
-   </EditorBar>
-   )
-   }
-   }
- */

containers/Doraemon/ResultsList.js

@@ -17,7 +17,7 @@ import {
   HintEnter,
 } from './styles/results_list'
 
-import { navToSuggestion, selectSuggestion } from './logic'
+import { navToSuggestion, suggestionOnSelect } from './logic'
 
 const HintIcon = ({ index, active, cur, length }) => {
   if (active === cur) {
@@ -38,7 +38,7 @@ const ResultsList = ({ searchValue, searchThread, suggestions, activeRaw }) => (
           key={suggestion.raw}
           id={suggestion.raw}
           onMouseEnter={navToSuggestion.bind(this, suggestion)}
-          onClick={selectSuggestion}
+          onClick={suggestionOnSelect}
         >
           <SuggestIcon
             raw={suggestion.raw}

containers/Doraemon/logic/index.js

@@ -88,19 +88,22 @@ export const handleKeyDown = e => {
 export const navSuggestion = direction => SAK.navSuggestion(direction)
 // mounseEnter
 export const navToSuggestion = suggestion => SAK.navToSuggestion(suggestion)
-export const selectSuggestion = () => {
+export const suggestionOnSelect = () => {
   if (store.showThreadSelector) return doNavigate()
   doSpecCmd()
 }
 
 export const inputOnBlur = () => {
-  if (R.contains(store.prefix, ['/', '?', '@'])) {
-    hidePanel()
-  }
-
-  if (!store.showThreadSelector && R.isEmpty(store.prefix)) {
-    hidePanel()
-  }
+  return false
+  // if (R.contains(store.prefix, ['/', '?', '@'])) {
+  //   log('11')
+  //   hidePanel()
+  // }
+
+  // if (!store.showThreadSelector && R.isEmpty(store.prefix)) {
+  //   log('22')
+  //   hidePanel()
+  // }
 }
 
 // do dearch when thread changes
@@ -545,47 +548,3 @@ export const useInit = _store => {
     }
   }, [_store])
 }
-
-/*
-
-export const init2 = _store => {
-  if (store) return false
-
-  store = _store
-
-  pockect$ = new Pocket(store)
-  SAK = new SwissArmyKnife(store)
-
-  initSpecCmdResolver()
-
-  pockect$.search().subscribe(res => {
-    if (R.isEmpty(res)) return emptySearchStates()
-
-    store.markState({
-      searching: true,
-      showThreadSelector: true,
-      showAlert: false,
-      showUtils: false,
-    })
-    searchContents(store, sr71$, res)
-  })
-
-  pockect$.searchUser().subscribe(name => {
-    const nickname = R.slice(1, Infinity, name)
-    store.markState({
-      prefix: '@',
-      searchThread: THREAD.USER,
-      showThreadSelector: true,
-      showAlert: false,
-    })
-    if (R.isEmpty(nickname)) return false
-    searchContents(store, sr71$, nickname)
-  })
-
-  pockect$.cmdSuggesttion().subscribe(res => store.loadSuggestions(res))
-  pockect$.emptyInput().subscribe(() => store.clearSuggestions())
-
-  if (sub$) sub$.unsubscribe()
-  sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
-}
-*/