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.

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 explorer window and data catalog #6466

Open
wants to merge 23 commits into
base: main
Choose a base branch
from

Conversation

zoran995
Copy link
Contributor

@zoran995 zoran995 commented Jul 31, 2022

What this PR does

Fixes #5204

Move of explorer window and data catalog to ts and styled-components.

Test me

  • Important note on testing, test this against scene editor

Checklist

  • There are unit tests to verify my changes are correct or unit tests aren't applicable (if so, write quick reason why unit tests don't exist)
  • I've updated relevant documentation in doc/.
  • I've updated CHANGES.md with what I changed.
  • I've provided instructions in the PR description on how to test this PR.

@AnaBelgun AnaBelgun assigned steve9164 and unassigned na9da Sep 28, 2022
Copy link
Member

@steve9164 steve9164 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try to get around to applying prettier2 to this and merging later this week.

lib/ReactViews/ExplorerWindow/Tabs/Tabs.tsx Outdated Show resolved Hide resolved
@steve9164
Copy link
Member

Got the prettier v2 merge & merge from main done. Also it should deploy to http://ci.terria.io/z995-ts-ew-6466/.

@@ -23,7 +23,7 @@ const ActionBarPortal: React.FC<PropsType> = ({ show }) => {
const StyledPortal = styled(Portal)<{ show: boolean }>`
display: flex;
position: absolute;
height: 56px;
height: ${(p) => (p.show ? "56px" : "0")};
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was necessary as element of screen was causing the whole page to move as scrollable on scrollIntoView

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @na9da

@zoran995
Copy link
Contributor Author

Hi @steve9164, are there any plans to merge this? I might get some time next week to get this in sync with the latest main.

@steve9164
Copy link
Member

Yes. With some small fixes to the styling we can get this merged. Here are a couple of cases:

  1. Groups should have a horizontal line when expanded (they probably shouldn't have horizontal lines when collapsed on top level, as they currently do in main):

Before:
image

After:
image

  1. Font weight should be 700 for groups (at all levels - main is currently incorrect at top level)

@steve9164
Copy link
Member

It might be worth waiting til next week for the React 18 upgrade to be merged into main (see #6902 - just fixing some tests on it now).

@zoran995
Copy link
Contributor Author

zoran995 commented Oct 4, 2023

Fixed the mentioned styling issues. I am not quite sure if you meant all groups should have a horizontal line or only top-level so I added it only for top-level groups when expanded (subgroups don't have underline in main)
Screenshot 2023-10-04 at 11 13 16

@zoran995
Copy link
Contributor Author

Hi @steve9164, @nf-s is still of interest to the team?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

when sharing a specific group or layer in catalogue, scroll down to the item
3 participants