From bba84b912e98034f5117f5470a7ae6484568906e Mon Sep 17 00:00:00 2001
From: Katsiaryna <47710336+KatsiarynaDzibrova@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:29:12 +0100
Subject: [PATCH] Fix selecting table selects an image after (#5917)

---
 packages/lexical-table/src/LexicalTableSelectionHelpers.ts | 4 +---
 packages/lexical/src/LexicalSelection.ts                   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/lexical-table/src/LexicalTableSelectionHelpers.ts b/packages/lexical-table/src/LexicalTableSelectionHelpers.ts
index ed443fc3f17..cc4d9d681cf 100644
--- a/packages/lexical-table/src/LexicalTableSelectionHelpers.ts
+++ b/packages/lexical-table/src/LexicalTableSelectionHelpers.ts
@@ -707,9 +707,7 @@ export function applyTableHandlers(
             if (isFocusInside) {
               newSelection.focus.set(
                 tableNode.getParentOrThrow().getKey(),
-                isBackward
-                  ? tableNode.getIndexWithinParent()
-                  : tableNode.getIndexWithinParent() + 1,
+                tableNode.getIndexWithinParent(),
                 'element',
               );
             } else {
diff --git a/packages/lexical/src/LexicalSelection.ts b/packages/lexical/src/LexicalSelection.ts
index 520541f8e9b..959c9d4ac4a 100644
--- a/packages/lexical/src/LexicalSelection.ts
+++ b/packages/lexical/src/LexicalSelection.ts
@@ -1940,13 +1940,13 @@ function internalResolveSelectionPoint(
             : child.getFirstDescendant();
           if (descendant === null) {
             resolvedElement = child;
-            resolvedOffset = 0;
           } else {
             child = descendant;
             resolvedElement = $isElementNode(child)
               ? child
               : child.getParentOrThrow();
           }
+          resolvedOffset = 0;
         }
         if ($isTextNode(child)) {
           resolvedNode = child;