Fix styling

jupyterlab · Mar 3, 2021 · a5cfa74 · a5cfa74
1 parent 221b716
commit a5cfa74
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 231 deletions.
diff --git a/TODO b/TODO
@@ -2,20 +2,22 @@
   - Not all discussion are set in the UI
 - [x] Fix using ref from commit sha rather than branch to ensure consistency when requesting file content and discussion
 - [x] Use Widget panel and handle life cycle for discussion
-- [ ] Fix styling
+- [x] Fix styling
 - [ ] Fix use effect on panel
 - [ ] Fix notebooks
   - [ ] Hide unchanged cells (and the comments structure)
   - [x] Support added and removed notebooks (currently JSON error as content on one side is "")
 - [x] Use codemirror as new comment editor
 - [ ] Take advantage of builtin feature of MainAreaWidget (spinner)
+- [ ] Add label - base / head in diff widgets
 - [x] Simplify number of div to include add button on notebook (and to fix hiding it when unchanged cells are collapsed)
 - [ ] Take into account review from Nick
-- [ ] Use model to support diff view - this will allow refresh
-- [ ] Switch to virtual tree
-- [ ] Organize PR by project
+- [ ] Add support for comment at PR level for GitHub
 - [ ] Document the code
 - [ ] Tests
 - [ ] Update README
 - [ ] Publish beta
+- [ ] Use model to support diff view - this will allow refresh
+- [ ] Switch to virtual tree
+- [ ] Organize PR by project
 - [ ] TBC Switch to current folder remote
diff --git a/src/components/diff/NotebookCommentDiffWidget.ts b/src/components/diff/NotebookCommentDiffWidget.ts
@@ -77,6 +77,7 @@ export class NotebookCommentDiffWidget extends NotebookDiffWidget {
       cellDiff.addWidget(new Widget({ node: commentButton }));
 
       const chunkWidget = new Panel();
+      chunkWidget.addClass('jp-PullRequestCellDiff');
       chunkWidget.addWidget(cellDiff);
 
       this._threads[currentPosition].threads.forEach((thread, _, array) => {

diff --git a/src/components/diff/plaintext.ts b/src/components/diff/plaintext.ts
@@ -119,7 +119,8 @@ export class PlainTextDiff extends Widget {
         connect: 'align',
         collapseIdentical: true,
         readOnly: true,
-        revertButtons: false
+        revertButtons: false,
+        lineWrapping: true
       }
     ) as MergeView.MergeViewEditor;
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -134,7 +134,7 @@ function activate(
   restorer.add(prPanel, NAMESPACE);
 
   // Add the panel to the sidebar
-  shell.add(prPanel, 'right', { rank: 200 });
+  shell.add(prPanel, 'right', { rank: 1000 });
 }
 
 export default pullRequestPlugin;