fix: show multiple lines in patch/issue description when editing

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/issues/CreateIssuePanel.java

@@ -137,7 +137,7 @@ private JComponent infoComponent() {
         borderPanel.add(projectSelect, BorderLayout.NORTH);
         borderPanel.add(titleField, BorderLayout.CENTER);
 
-        descriptionField = new DragAndDropField(project, 0, false);
+        descriptionField = new DragAndDropField(project, 0, false, false);
         descriptionField.setBackground(UIUtil.getListBackground());
         descriptionField.setFont(JBFont.label());
         descriptionField.getComponent().setBorder(JBUI.Borders.empty(8));

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/issues/overview/IssueComponent.java

@@ -206,7 +206,7 @@ private JComponent getHeader() {
                 issueModel.setValue(edited);
             }
             return success;
-        }).enableDragAndDrop(false).build();
+        }).enableDragAndDrop(false).oneLine(true).build();
         var contentPanel = panelHandle.panel;
         var b = new CodeReviewChatItemUIUtil.Builder(CodeReviewChatItemUIUtil.ComponentType.FULL,
                 i -> new SingleValueModel<>(RadicleIcons.DEFAULT_AVATAR), contentPanel);

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/timeline/EditablePanelHandler.java

@@ -38,6 +38,7 @@ public class EditablePanelHandler {
     private final boolean hideCancelAction;
     private final boolean closeEditorAfterSubmit;
     private final boolean allowDragAndDrop;
+    private final boolean oneLine;
     private DragAndDropField dragAndDropField;
     private SingleValueModel<Boolean> isLoading = new SingleValueModel<>(false);
     private OnCloseListener onCloseListener;
@@ -48,6 +49,7 @@ public EditablePanelHandler(PanelBuilder builder) {
         this.allowDragAndDrop = builder.allowDragAndDrop;
         this.project = builder.project;
         this.paneComponent = builder.paneComponent;
+        this.oneLine = builder.oneLine;
         this.editorPaneLayout = SizeRestrictedSingleComponentLayout.Companion.constant(null, null);
         this.panel = new JPanel(null);
         this.panel.setOpaque(false);
@@ -81,7 +83,7 @@ public void showAndFocusEditor() {
                 hideEditor();
                 return null;
             });
-            dragAndDropField = new DragAndDropField(project, this.allowDragAndDrop);
+            dragAndDropField = new DragAndDropField(project, this.allowDragAndDrop, this.oneLine);
             dragAndDropField.setText(content.getValue());
             //CollaborationToolsUIUtil.installValidator(textField, model.errorValue.map { it?.localizedMessage })
             //var inputField = wrapWithProgressOverlay(textField, model.isBusyValue);
@@ -165,6 +167,7 @@ public static class PanelBuilder {
         private boolean hideCancelAction = false;
         private boolean closeEditorAfterSubmit = true;
         private boolean allowDragAndDrop = true;
+        private boolean oneLine = false;
 
         public PanelBuilder(Project project, JComponent paneComponent, String actionName,
                             SingleValueModel<String> content, Function<DragAndDropField, Boolean> okAction) {
@@ -190,6 +193,11 @@ public PanelBuilder closeEditorAfterSubmit(boolean close) {
             return this;
         }
 
+        public PanelBuilder oneLine(boolean one) {
+            this.oneLine = one;
+            return this;
+        }
+
         public EditablePanelHandler build() {
             return new EditablePanelHandler(this);
         }

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/timeline/TimelineComponent.java

@@ -104,7 +104,7 @@ private EditablePanelHandler getCommentField() {
                 RadicleBundle.message("patch.comment"), new SingleValueModel<>(""),
                 this::createComment)
                 .hideCancelAction(true)
-                .enableDragAndDrop(false)
+                .enableDragAndDrop(true)
                 .closeEditorAfterSubmit(false)
                 .build();
         panelHandle.showAndFocusEditor();
@@ -134,7 +134,7 @@ private JComponent getHeader() {
                 radPatchModel.setValue(edited);
             }
             return success;
-        }).enableDragAndDrop(false).build();
+        }).enableDragAndDrop(false).oneLine(true).build();
         var contentPanel = panelHandle.panel;
         var actionsPanel = CollaborationToolsUIUtilKt.HorizontalListPanel(CodeReviewCommentUIUtil.Actions.HORIZONTAL_GAP);
         actionsPanel.add(CodeReviewCommentUIUtil.INSTANCE.createEditButton(e -> {

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/patches/timeline/TimelineComponentFactory.java

@@ -44,9 +44,6 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import static network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.Utils.getHorizontalPanel;
-import static network.radicle.jetbrains.radiclejetbrainsplugin.toolwindow.Utils.getVerticalPanel;
-
 public class TimelineComponentFactory {
     private static final String PATTERN_FORMAT = "dd/MM/yyyy HH:mm";
     private static final DateTimeFormatter DATE_TIME_FORMATTER =
@@ -96,7 +93,7 @@ public JComponent createDescSection() {
     }
 
     public JComponent createTimeline() {
-        mainPanel = getVerticalPanel(0);
+        mainPanel = Utils.getVerticalPanel(0);
         var loadingIcon = new JLabel(new AnimatedIcon.Default());
         mainPanel.add(loadingIcon);
         ApplicationManager.getApplication().executeOnPooledThread(() -> {
@@ -141,23 +138,23 @@ private String findMessage(String replyTo) {
     }
 
     private JComponent createRevisionComponent(RadPatch.Revision rev) {
-        var contentPanel = getVerticalPanel(4);
+        var contentPanel = Utils.getVerticalPanel(4);
         contentPanel.setOpaque(false);
-        var horizontalPanel = getHorizontalPanel(8);
+        var horizontalPanel = Utils.getHorizontalPanel(8);
         horizontalPanel.setOpaque(false);
         var revAuthor = rev.author().generateLabelText(cli);
         return createTimeLineItem(contentPanel, horizontalPanel, RadicleBundle.message("revisionPublish", rev.id(), revAuthor), rev.timestamp());
     }
 
     private JComponent createReviewComponent(RadPatch.Review review) {
-        var reviewPanel = getVerticalPanel(0);
+        var reviewPanel = Utils.getVerticalPanel(0);
         var textHtmlEditor = new BaseHtmlEditorPane();
         textHtmlEditor.setOpaque(false);
         var message = Strings.nullToEmpty(review.summary());
         var panel = new BorderLayoutPanel();
         panel.setOpaque(false);
         var editorPane = new MarkDownEditorPaneFactory(message, patch.project, patch.radProject.id, file);
-        var myPanel = getVerticalPanel(1);
+        var myPanel = Utils.getVerticalPanel(1);
         myPanel.setOpaque(false);
         myPanel.add(editorPane.htmlEditorPane());
         var verdictMsg = review.verdict() == RadPatch.Review.Verdict.ACCEPT ? RadicleBundle.message("approved") : RadicleBundle.message("requestChanges");
@@ -175,7 +172,7 @@ private JComponent createReviewComponent(RadPatch.Review review) {
     }
 
     private JComponent createCommentComponent(RadDiscussion com) {
-        var myMainPanel = getVerticalPanel(0);
+        var myMainPanel = Utils.getVerticalPanel(0);
         var textHtmlEditor = new BaseHtmlEditorPane();
         textHtmlEditor.setOpaque(false);
         var message = com.body;
@@ -188,15 +185,15 @@ private JComponent createCommentComponent(RadDiscussion com) {
         var editorPane = new MarkDownEditorPaneFactory(message, patch.project, patch.radProject.id, file);
         panel.addToCenter(StatusMessageComponentFactory.INSTANCE.create(editorPane.htmlEditorPane(), StatusMessageType.WARNING));
         emojiPanel = new PatchEmojiPanel(patchModel, com.reactions, com.id, radDetails);
-        var verticalPanel = getVerticalPanel(5);
+        var verticalPanel = Utils.getVerticalPanel(5);
         verticalPanel.setOpaque(false);
         emojiJPanel = emojiPanel.getEmojiPanel();
         verticalPanel.add(emojiJPanel);
         replyPanel = new MyReplyPanel(patch.project, com, patchModel).getThreadActionsComponent();
         verticalPanel.add(replyPanel);
         panel.addToBottom(verticalPanel);
         if (com.isReviewComment()) {
-            var infoPanel = getHorizontalPanel(0);
+            var infoPanel = Utils.getHorizontalPanel(0);
             infoPanel.setOpaque(false);
             var msg = RadicleBundle.message("comment.on", com.location.path, com.location.start);
             if (!patch.isDiscussionBelongedToLatestRevision(com)) {
@@ -217,7 +214,7 @@ private JComponent createCommentComponent(RadDiscussion com) {
         var contentPanel = panelHandle.panel;
         var actionsPanel = CollaborationToolsUIUtilKt.HorizontalListPanel(CodeReviewCommentUIUtil.Actions.HORIZONTAL_GAP);
         var self = cli.getCurrentIdentity();
-        if (self != null && com.author.id.contains(self.nodeId)) {
+        if (self != null && com.author != null && com.author.contains(self.nodeId)) {
             final var editButton = CodeReviewCommentUIUtil.INSTANCE.createEditButton(e -> {
                 panelHandle.showAndFocusEditor();
                 return null;
@@ -235,7 +232,7 @@ private JComponent createCommentComponent(RadDiscussion com) {
             actionsPanel.add(editButton);
             actionsPanel.add(deleteButton);
         }
-        commentPanel = createTimeLineItem(contentPanel, actionsPanel, com.author.generateLabelText(cli), com.timestamp);
+        commentPanel = createTimeLineItem(contentPanel, actionsPanel, com.author == null ? "" : com.author.generateLabelText(cli), com.timestamp);
         myMainPanel.add(commentPanel);
         myMainPanel.setName(JPANEL_PREFIX_NAME + com.id);
         return myMainPanel;

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/toolwindow/DragAndDropField.java

@@ -37,21 +37,23 @@ public class DragAndDropField extends EditorTextField {
     private static final Logger logger = LoggerFactory.getLogger(DragAndDropField.class);
     private int border = 0;
     private final boolean enableDragAndDrop;
+    private final boolean oneLine;
     private final FileService fileService;
     private final Project project;
     private List<Embed> embedList;
 
-    public DragAndDropField(Project project, boolean allowDragAndDrop) {
+    public DragAndDropField(Project project, boolean allowDragAndDrop, boolean oneLine) {
         this.enableDragAndDrop = allowDragAndDrop;
+        this.oneLine = oneLine;
         this.fileService = project.getService(FileService.class);
         this.embedList = new ArrayList<>();
         this.project = project;
         this.putClientProperty(UIUtil.HIDE_EDITOR_FROM_DATA_CONTEXT_PROPERTY, true);
         this.addDocumentListener(new MyListener(this));
     }
 
-    public DragAndDropField(Project project, int border, boolean allowDragAndDrop) {
-        this(project, allowDragAndDrop);
+    public DragAndDropField(Project project, int border, boolean allowDragAndDrop, boolean oneLine) {
+        this(project, allowDragAndDrop, oneLine);
         this.border = border;
     }
 
@@ -60,7 +62,7 @@ public DragAndDropField(Project project, int border, boolean allowDragAndDrop) {
         var editor =  super.createEditor();
         editor.getSettings().setUseSoftWraps(true);
         editor.setBorder(JBUI.Borders.empty(border));
-        editor.setOneLineMode(false);
+        editor.setOneLineMode(oneLine);
         editor.setVerticalScrollbarVisible(true);
         editor.getComponent().setOpaque(false);
         editor.getScrollPane().setOpaque(false);

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/toolwindow/MarkDownEditorPaneFactory.java

@@ -56,7 +56,8 @@ public MarkDownEditorPaneFactory(String content, Project project, String radProj
     public JEditorPane htmlEditorPane() {
         var textPane = new JTextPane();
         var editorKit = new HTMLEditorKitBuilder();
-        editorKit.withViewFactoryExtensions(ExtendableHTMLViewFactory.Extensions.WORD_WRAP, HtmlEditorPaneUtil.INSTANCE.getCONTENT_TOOLTIP(),
+        editorKit.withViewFactoryExtensions(ExtendableHTMLViewFactory.Extensions.WORD_WRAP, ExtendableHTMLViewFactory.Extensions.FIT_TO_WIDTH_IMAGES,
+                HtmlEditorPaneUtil.INSTANCE.getCONTENT_TOOLTIP(),
                 HtmlEditorPaneUtil.INSTANCE.getINLINE_ICON_EXTENSION(),
                 HtmlEditorPaneUtil.INSTANCE.getIMAGES_EXTENSION());
         editorKit.withStyleSheet(StyleSheetUtil.getDefaultStyleSheet());

src/main/java/network/radicle/jetbrains/radiclejetbrainsplugin/toolwindow/Utils.java

@@ -96,9 +96,10 @@ public static String formatReplyMessage(String message, String replyMessage) {
 
     public static JPanel descriptionPanel(
             MarkDownEditorPaneFactory editorPane, Project project, String changeTitle, Function<DragAndDropField, Boolean> editAction) {
-        var panelHandle = new EditablePanelHandler.PanelBuilder(project, editorPane.htmlEditorPane(),
-                RadicleBundle.message(changeTitle),
-                new SingleValueModel<>(editorPane.getRawContent()), editAction).build();
+        var panel = Utils.getVerticalPanel(1);
+        panel.add(editorPane.htmlEditorPane());
+        var panelHandle = new EditablePanelHandler.PanelBuilder(project, panel, RadicleBundle.message(changeTitle),
+                new SingleValueModel<>(editorPane.getRawContent()), editAction).oneLine(false).enableDragAndDrop(false).build();
         var contentPanel = panelHandle.panel;
         var b = new CodeReviewChatItemUIUtil.Builder(CodeReviewChatItemUIUtil.ComponentType.FULL,
                 i -> new SingleValueModel<>(new ImageIcon()), contentPanel);
@@ -107,8 +108,10 @@ public static JPanel descriptionPanel(
             panelHandle.showAndFocusEditor();
             return null;
         }));
-        b.withHeader(contentPanel, actionsPanel);
-        b.setMaxContentWidth(Integer.MAX_VALUE);
+        var malakia = new JPanel(null);
+        malakia.setOpaque(false);
+        b.withHeader(malakia, actionsPanel);
+        //b.setMaxContentWidth(Integer.MAX_VALUE);
         return (JPanel) b.build();
     }