Updated visibleParToAllParIndex (#1002)

FXMisc · Feb 10, 2021 · e9c112b · e9c112b
1 parent 4cc49c3
commit e9c112b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java
@@ -984,7 +984,14 @@ public final int visibleParToAllParIndex(int visibleParIndex) {
                     getVisibleParagraphs().size() - 1, visibleParIndex)
             );
         }
-        return virtualFlow.visibleCells().get( visibleParIndex ).getNode().getIndex();
+
+        Cell<Paragraph<PS,SEG,S>, ParagraphBox<PS,SEG,S>> visibleCell = null;
+
+        if ( visibleParIndex > 0 ) visibleCell = virtualFlow.visibleCells().get( visibleParIndex );
+        else visibleCell = virtualFlow.getCellIfVisible( virtualFlow.getFirstVisibleIndex() )
+            .orElseGet( () -> virtualFlow.visibleCells().get( visibleParIndex ) );
+
+        return visibleCell.getNode().getIndex();
     }
 
     @Override