Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

plugins {
id 'org.scm-manager.smp' version '0.10.4'
id 'org.scm-manager.smp' version '0.11.1'
}

dependencies {
Expand All @@ -34,7 +34,7 @@ dependencies {
}

scmPlugin {
scmVersion = "2.32.0"
scmVersion = "2.35.0-SNAPSHOT"
displayName = "Review"
description = "Depict a review process with pull requests"
author = "Cloudogu GmbH"
Expand Down
2 changes: 2 additions & 0 deletions gradle/changelog/modal_diff_comment_icon.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- type: fixed
description: Styling of diff interaction not working in modal ([#210](https://github.com/scm-manager/scm-review-plugin/pull/210))
8 changes: 4 additions & 4 deletions src/main/js/diff/Diff.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import PullRequestComment from "../comment/PullRequestComment";
import CreateComment from "../comment/CreateComment";
import CommentSpacingWrapper from "../comment/CommentSpacingWrapper";
import InlineComments from "./InlineComments";
import StyledDiffWrapper from "./StyledDiffWrapper";
import AddCommentButton from "./AddCommentButton";
import FileComments from "./FileComments";
import MarkReviewedButton from "./MarkReviewedButton";
Expand Down Expand Up @@ -337,7 +336,7 @@ const Diff: FC<Props> = ({
};

return (
<StyledDiffWrapper commentable={isPermittedToComment()}>
<>
{changed ? <ChangeNotificationToast reload={reload} ignore={ignore} /> : null}
<LoadingDiff
isCollapsed={isCollapsed}
Expand All @@ -347,12 +346,13 @@ const Diff: FC<Props> = ({
annotationFactory={annotationFactory}
onClick={onGutterClick}
refetchOnWindowFocus={false}
hunkClass={(hunk: Hunk) => (hunk.expansion ? "expanded" : "commentable")}
hunkGutterHoverIcon={isPermittedToComment() ? "\\f075" : ""}
highlightLineOnHover={isPermittedToComment()}
diffUrl={diffUrl}
actions={actions}
pullRequestComments={comments?._embedded.pullRequestComments || []}
/>
</StyledDiffWrapper>
</>
);
};

Expand Down
64 changes: 0 additions & 64 deletions src/main/js/diff/StyledDiffWrapper.tsx

This file was deleted.