fix: search engine selecting

ttuanhung · Sep 21, 2019 · 829cd5f · 829cd5f
1 parent a987218
commit 829cd5f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/renderer/components/Dropdown/index.tsx b/src/renderer/components/Dropdown/index.tsx
@@ -46,7 +46,7 @@ export class Dropdown extends React.PureComponent<Props, State> {
   }
 
   componentDidUpdate(prevProps: Props) {
-    if (this.props.defaultValue !== prevProps) {
+    if (this.props.defaultValue !== prevProps.defaultValue) {
       this.setValue(this.props.defaultValue, false);
     }
   }

diff --git a/src/renderer/views/search/store/index.ts b/src/renderer/views/search/store/index.ts
@@ -29,9 +29,6 @@ export class Store {
   @observable
   public visible = true;
 
-  @observable
-  public searchEngines: ISearchEngine[] = DEFAULT_SEARCH_ENGINES;
-
   @observable
   public history: IHistoryItem[] = [];
 
@@ -44,13 +41,18 @@ export class Store {
   @observable
   public inputText = '';
 
+  @observable
+  public settings: ISettings = DEFAULT_SETTINGS;
+
   @computed
   public get theme() {
     return getTheme(this.settings.theme);
   }
 
-  @observable
-  public settings: ISettings = DEFAULT_SETTINGS;
+  @computed
+  public get searchEngines() {
+    return DEFAULT_SEARCH_ENGINES.concat(this.settings.searchEngines);
+  }
 
   @computed
   public get searchedTabs(): ISuggestion[] {
@@ -79,7 +81,7 @@ export class Store {
 
   @computed
   public get searchEngine() {
-    return this.searchEngines[0];
+    return this.searchEngines[this.settings.searchEngine];
   }
 
   public canSuggest = false;

diff --git a/src/renderer/views/settings/components/AddressBar/index.tsx b/src/renderer/views/settings/components/AddressBar/index.tsx
@@ -23,7 +23,7 @@ const SuggestionsToggle = () => {
 };
 
 const onSearchEngineChange = (value: string) => {
-  const { searchEngines } = store.settings;
+  const { searchEngines } = store;
   store.settings.searchEngine = searchEngines.indexOf(
     searchEngines.find(x => x.name === value),
   );