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

Merge ToC Extension into core #8538

Merged
merged 527 commits into from Jun 11, 2020
Merged

Conversation

marthacryan
Copy link
Member

@marthacryan marthacryan commented Jun 9, 2020

References

As discussed in this issue and in the weekly dev meetings, the ToC extension seems to have enough support to be merged into jupyterlab core.

Code changes

To follow the conventions of other core packages, the ToC extension is split into a toc package and a toc-extension package. There are a few changes to the configurations and imports to follow conventions for packages / make the extension work in core. Otherwise it's importing the toc code "as-is" at the moment.

User-facing changes

This will cause the ToC extension to appear as an option in the left side panel along with the File Browser, Running Terminals and Kernels, etc.

zuoyuanh and others added 30 commits August 30, 2018 15:28
Make toolbar button sizing and styling more consistent with other items in the application.
Check if tags are actually an array, and simplify tag list creation.
Sanitize html before dangerously setting it.
@marthacryan
Copy link
Member Author

Fixed the remaining lint errors - I had to use unsafe react methods (such as UNSAFE_componentWillReceiveProps) to fix a couple of these errors, but this method is used in another core extension in Jupyterlab here, so I thought it'd be ok for now - let me know if I should fix that in this PR.

I also changed the version of toc and toc-extension to 4.2.0-alpha.0.

@jasongrout
Copy link
Contributor

Just checking - did you change the collapsing functionality already to a signal or something, or is that something we'll need to do in another PR?

Copy link
Contributor

@ajbozarth ajbozarth left a comment

Choose a reason for hiding this comment

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

LGTM with the assumption that the follow issues will be opened and dealt with in follow up PRs:

  • Update icon usage to LabIcon, this includes moving the svgs into ui-components
  • Write tests
  • Update Docs to include toc
  • Open issues for any other things raised in jupyterlab/team-compass#63 or in key issues on the toc repo

@marthacryan
Copy link
Member Author

@jasongrout No I didn't include the collapsing signal in this PR (it's currently a setting that makes the collapsing disabled by default).

@blink1073 blink1073 mentioned this pull request Jun 11, 2020
7 tasks
@blink1073
Copy link
Member

I opened #8546 for tracking.

@blink1073
Copy link
Member

The usage test is hanging again, merging. Thanks @marthacryan! This is an epic first contribution 😄

@blink1073 blink1073 merged commit 94a622d into jupyterlab:master Jun 11, 2020
@marthacryan marthacryan deleted the mergetoc branch June 11, 2020 18:33
@marthacryan
Copy link
Member Author

marthacryan commented Jun 11, 2020

@blink1073 Thank you!

@jasongrout jasongrout mentioned this pull request Jun 12, 2020
43 tasks
@saulshanabrook saulshanabrook added this to the 3.0 milestone Jun 24, 2020
@saulshanabrook saulshanabrook modified the milestones: 3.0, 2.2 Jun 24, 2020
saulshanabrook pushed a commit that referenced this pull request Jun 25, 2020
Merge ToC Extension into core
@jasongrout jasongrout modified the milestones: 3.0, 2.2 Nov 12, 2020
@jasongrout jasongrout modified the milestones: 2.2, 2.2.x, 3.0 Dec 23, 2020
@github-actions github-actions bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Jun 22, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. tag:CSS For general CSS related issues and pecadilloes tag:Design System CSS If a PR is editing any CSS files please add this tag for design team to review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet