Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Tabs Page: Enable NTP to be theme aware #3115

Merged
merged 1 commit into from
Aug 14, 2019
Merged

New Tabs Page: Enable NTP to be theme aware #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion common/extensions/api/_api_features.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
"contexts": ["webui"],
"matches": [
"chrome://welcome/*",
"chrome://settings/*"
"chrome://settings/*",
"chrome://newtab/*"
]
}]
}
30 changes: 20 additions & 10 deletions components/brave_new_tab_ui/brave_new_tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import * as React from 'react'
import { render } from 'react-dom'
import { Provider } from 'react-redux'
import Theme from 'brave-ui/theme/brave-default'
import { ThemeProvider } from 'brave-ui/theme'
import DarkTheme from 'brave-ui/theme/brave-dark'
import BraveCoreThemeProvider from '../common/BraveCoreThemeProvider'
import wireAPIEventsToStore from './apiEventsToStore'

// Components
Expand All @@ -24,15 +25,24 @@ import '../fonts/muli.css'
function initialize () {
console.timeStamp('loaded')
// Get rendering going
render(
<Provider store={store}>
<ThemeProvider theme={Theme}>
<App />
</ThemeProvider>
</Provider>,
document.getElementById('root'),
() => console.timeStamp('first react render')
)
new Promise(resolve => chrome.braveTheme.getBraveThemeType(resolve))
.then((themeType: chrome.braveTheme.ThemeType) => {
render(
<Provider store={store}>
<BraveCoreThemeProvider
initialThemeType={themeType}
dark={DarkTheme}
light={Theme}
>
<App />
</BraveCoreThemeProvider>
</Provider>,
document.getElementById('root'),
() => console.timeStamp('first react render'))
})
.catch((error) => {
console.error('Problem mounting brave new tab', error)
})
window.i18nTemplate.process(window.document, window.loadTimeData)
}

Expand Down