-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
feat(welcomeScreen): add custom story markers to globe #448
Conversation
…s to globe directly
@@ -5,6 +5,11 @@ | |||
font-family: NotesEsa | |||
src: url('../../../../assets/fonts/NotesEsaReg.otf') | |||
|
|||
@font-face |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we still need this here? we only use the bold font in the markers which load the font by themselves, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't this the global font import for all components? We use both fonts in other components.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry i mean: you're right we don't use is yet 😄 But we need it at least for the splash screen title. I have used the regular one before, but that's not correct.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah I see 👍
src/scripts/components/app/app.tsx
Outdated
@@ -36,6 +38,19 @@ const App: FunctionComponent = () => ( | |||
|
|||
const TranslatedApp: FunctionComponent = () => { | |||
const language = useSelector(languageSelector); | |||
const selectedLayers = useSelector(selectedLayerIdsSelector); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we could put this stuff in a custom hook 'const markers = useStoryMarkers()' so that we keep the app.tsx
clean
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also only map over the stories if hideMarkers is false to save some work if we don't show the markers
selectedLayers.mainId || selectedLayers.compareId | ||
); | ||
|
||
if (!hideMarkers) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you turn this around. we usually always use the positiv case:
if (hideMarkers) {
return []
}
return ... storyMarkers
closes #95