-
Notifications
You must be signed in to change notification settings - Fork 362
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
Tsify mapColumn #6494
Merged
Merged
Tsify mapColumn #6494
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
f659bf3
fix: move map credits to map column so chart don't hide it
zoran995 642b1d5
feat: tsify map column and reorganize some of the components
zoran995 a3400ac
Merge tag 'pre-prettier-v2' into z995-ts-map-column
steve9164 c57ad52
Merge tag 'post-prettier-v2' into z995-ts-map-column
steve9164 2684dbc
Merge remote-tracking branch 'origin/main' into z995-ts-map-column
steve9164 07d57fe
Merge remote-tracking branch 'upstream/main' into tsify-map-column
zoran995 88cf8f6
organize imports
zoran995 ec738b2
Add react imports to ix errors
staffordsmith83 53c6eca
Merge branch 'main' into tsify-map-column
staffordsmith83 7d9f5b4
Fix import in test
staffordsmith83 053c27f
Rem Splitter.jsx after checking Splitter.tsx
staffordsmith83 dd4f990
Small changes to ProgressBar.tsx
staffordsmith83 f62bfaf
Delete ProgressBar.jsx after checking TS version
staffordsmith83 67237d9
Delete MapColumn.jsx after checking TS version
staffordsmith83 9133539
Redo hide bottom dock with mapUI
staffordsmith83 62239a4
re-implement conditional opacity
staffordsmith83 805ea4b
Merge remote-tracking branch 'terriajs/main' into tsify-map-column
zoran995 5c595f0
fix: update changelog
zoran995 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export * from "./ViewStateContext"; | ||
export * from "./ContextProviders"; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { VFC } from "react"; | ||
import Box from "../../../Styled/Box"; | ||
import { useViewState } from "../../Context"; | ||
import { MapCredits } from "./Credits"; | ||
import { DistanceLegend } from "./DistanceLegend"; | ||
import { LocationBar } from "./LocationBar"; | ||
import React from "react"; | ||
|
||
export const BottomBar: VFC = () => { | ||
const viewState = useViewState(); | ||
return ( | ||
<Box | ||
fullWidth | ||
justifySpaceBetween | ||
css={` | ||
background: linear-gradient(180deg, #000000 0%, #000000 100%); | ||
font-size: 0.7rem; | ||
opacity: 0.75; | ||
`} | ||
> | ||
<MapCredits | ||
hideTerriaLogo={!!viewState.terria.configParameters.hideTerriaLogo} | ||
credits={viewState.terria.configParameters.extraCreditLinks?.slice()} | ||
currentViewer={viewState.terria.mainViewer.currentViewer} | ||
/> | ||
<Box paddedHorizontally={4} gap={2}> | ||
<LocationBar mouseCoords={viewState.terria.currentViewer.mouseCoords} /> | ||
<DistanceLegend /> | ||
</Box> | ||
</Box> | ||
); | ||
}; |
2 changes: 1 addition & 1 deletion
2
lib/ReactViews/Credits/Credit.tsx → ...actViews/Map/BottomBar/Credits/Credit.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
12 changes: 2 additions & 10 deletions
12
lib/ReactViews/Credits/CreditsContainer.tsx → ...ap/BottomBar/Credits/CreditsContainer.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...iews/Credits/MapCredits/MapCreditLogo.tsx → ...s/Map/BottomBar/Credits/MapCreditLogo.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
lib/ReactViews/Credits/TerriaLogo.tsx → ...iews/Map/BottomBar/Credits/TerriaLogo.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export { ICredit } from "./Credit.type"; | ||
export { MapCredits } from "./MapCredits"; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Hey @steve9164 and @staffordsmith83
Before this is merged in can you please update the
CHANGES
file here. Thanks!