diff --git a/src/models/dialog-store.ts b/src/models/dialog-store.ts index f7ca52108..209584b91 100644 --- a/src/models/dialog-store.ts +++ b/src/models/dialog-store.ts @@ -1,5 +1,5 @@ import { ipcRenderer, remote } from 'electron'; -import { observable, computed } from 'mobx'; +import { observable, computed, makeObservable } from 'mobx'; import { getTheme } from '~/utils/themes'; import { ISettings } from '~/interfaces'; import { DEFAULT_SETTINGS } from '~/constants'; @@ -35,6 +35,12 @@ export class DialogStore { persistent?: boolean; } = {}, ) { + makeObservable(this, { + theme: computed, + settings: observable, + visible: observable, + }); + const { visibilityWrapper, hideOnBlur, persistent } = { hideOnBlur: true, visibilityWrapper: true, diff --git a/src/renderer/components/GlobalNavigationDrawer/index.tsx b/src/renderer/components/GlobalNavigationDrawer/index.tsx index c56d1ba72..5ac15c3ab 100644 --- a/src/renderer/components/GlobalNavigationDrawer/index.tsx +++ b/src/renderer/components/GlobalNavigationDrawer/index.tsx @@ -42,12 +42,12 @@ export const GlobalNavigationDrawer = () => { Bookmarks - + {/* Downloads Extensions - + */} ); }; diff --git a/src/renderer/views/app/components/Tab/index.tsx b/src/renderer/views/app/components/Tab/index.tsx index 2e1afa59a..30e992ddf 100644 --- a/src/renderer/views/app/components/Tab/index.tsx +++ b/src/renderer/views/app/components/Tab/index.tsx @@ -82,6 +82,8 @@ const onMouseEnter = (tab: ITab) => (e: React.MouseEvent) => { const onMouseLeave = () => { store.tabs.hoveredTabId = -1; + ipcRenderer.send(`hide-tab-preview-${store.windowId}`); + store.tabs.canShowPreview = true; }; const onClick = (tab: ITab) => (e: React.MouseEvent) => { diff --git a/src/renderer/views/app/components/Tabbar/index.tsx b/src/renderer/views/app/components/Tabbar/index.tsx index b93fab61e..354ec1d4a 100644 --- a/src/renderer/views/app/components/Tabbar/index.tsx +++ b/src/renderer/views/app/components/Tabbar/index.tsx @@ -20,8 +20,6 @@ const onTabsMouseLeave = () => { store.tabs.removedTabs = 0; store.tabs.updateTabsBounds(true); }, 300); - ipcRenderer.send(`hide-tab-preview-${store.windowId}`); - store.tabs.canShowPreview = true; }; const onAddTabClick = () => { diff --git a/src/renderer/views/newtab/components/App/index.tsx b/src/renderer/views/newtab/components/App/index.tsx index 2951ffc44..1e9189cb0 100644 --- a/src/renderer/views/newtab/components/App/index.tsx +++ b/src/renderer/views/newtab/components/App/index.tsx @@ -79,7 +79,7 @@ export default observer(() => { icon={ICON_BOOKMARKS} onClick={onIconClick('bookmarks')} > - { title="Extensions" icon={ICON_EXTENSIONS} onClick={onIconClick('extensions')} - > + > */} )} - {store.newsBehavior !== 'hidden' && ( + {/* {store.newsBehavior !== 'hidden' && ( - )} + )} */} ); diff --git a/src/renderer/views/newtab/components/Preferences/index.tsx b/src/renderer/views/newtab/components/Preferences/index.tsx index bba0b519f..92aa1a819 100644 --- a/src/renderer/views/newtab/components/Preferences/index.tsx +++ b/src/renderer/views/newtab/components/Preferences/index.tsx @@ -110,7 +110,7 @@ export const Preferences = observer(() => { > Inspirational - { icon={ICON_WINDOW} > Informational - + */} { pointerEvents: store.preferencesContent === 'custom' ? 'inherit' : 'none', transition: '0.3s max-height, 0.3s transform, 0.3s opacity', - maxHeight: store.preferencesContent === 'custom' ? 390 : 200, + // maxHeight: store.preferencesContent === 'custom' ? 390 : 200, + maxHeight: store.preferencesContent === 'custom' ? 300 : 150, transform: store.preferencesContent === 'custom' ? 'translateX(-100%)' @@ -162,7 +163,7 @@ export const Preferences = observer(() => { Show top sites Show quick menu - + {/* News visibility: { Always visible Hidden Visible on scroll - + */} diff --git a/src/renderer/views/newtab/store/index.ts b/src/renderer/views/newtab/store/index.ts index a22138f34..4a66f9a62 100644 --- a/src/renderer/views/newtab/store/index.ts +++ b/src/renderer/views/newtab/store/index.ts @@ -37,7 +37,8 @@ export class Store { @computed public get fullSizeImage() { - return this.newsBehavior === 'on-scroll' || this.newsBehavior === 'hidden'; + // return this.newsBehavior === 'on-scroll' || this.newsBehavior === 'hidden'; + return true; } @observable @@ -169,13 +170,13 @@ export class Store { this.loadTopSites(); - window.onscroll = () => { - this.updateNews(); - }; + // window.onscroll = () => { + // this.updateNews(); + // }; - window.onresize = () => { - this.updateNews(); - }; + // window.onresize = () => { + // this.updateNews(); + // }; } public async loadImage() {