From bd68b8a4ed29c109bab07051024a0d4212f99be1 Mon Sep 17 00:00:00 2001
From: Alexis Placet <2400067+Alex-PLACET@users.noreply.github.com>
Date: Tue, 28 Apr 2026 14:50:13 +0200
Subject: [PATCH] Fix index mapping in `xview` for assignments through views
 with multiple leading `newaxis()` slices

---
 include/xtensor/views/xview.hpp |  5 +++--
 test/test_xview.cpp             | 39 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/include/xtensor/views/xview.hpp b/include/xtensor/views/xview.hpp
index ea546d4ff..025df0ae4 100644
--- a/include/xtensor/views/xview.hpp
+++ b/include/xtensor/views/xview.hpp
@@ -1645,8 +1645,9 @@ namespace xt
     {
         if constexpr (lesser_condition<I>::value)
         {
-            return sliced_access<I - integral_count_before<S...>(I) + newaxis_count_before<S...>(I + 1)>(
-                std::get<I + newaxis_count_before<S...>(I + 1)>(m_slices),
+            constexpr size_type slice_index = newaxis_skip<S...>(I);
+            return sliced_access<slice_index - integral_count_before<S...>(slice_index)>(
+                std::get<slice_index>(m_slices),
                 args...
             );
         }
diff --git a/test/test_xview.cpp b/test/test_xview.cpp
index 5f81047b2..c98993bf9 100644
--- a/test/test_xview.cpp
+++ b/test/test_xview.cpp
@@ -1591,6 +1591,45 @@ namespace xt
         EXPECT_EQ(a, b);
     }
 
+    TEST(xview, assign_through_multiple_leading_newaxis)
+    {
+        SUBCASE("updates the underlying tensor for every element")
+        {
+            xt::xtensor<uint8_t, 2> tensor = xt::zeros<uint8_t>({4, 3});
+            auto view = xt::view(tensor, xt::newaxis(), xt::newaxis(), xt::newaxis(), xt::all(), xt::all());
+
+            uint8_t value = 0;
+            for (std::size_t row = 0; row < 4; ++row)
+            {
+                for (std::size_t col = 0; col < 3; ++col)
+                {
+                    view(std::size_t{0}, std::size_t{0}, std::size_t{0}, row, col) = value;
+                    EXPECT_EQ(tensor(row, col), value);
+                    ++value;
+                }
+            }
+
+            EXPECT_EQ(tensor, xt::arange<uint8_t>(12).reshape({4, 3}));
+        }
+
+        SUBCASE("preserves bool assignment semantics")
+        {
+            xt::xtensor<bool, 2> tensor = xt::zeros<bool>({4, 3});
+            auto view = xt::view(tensor, xt::newaxis(), xt::newaxis(), xt::newaxis(), xt::all(), xt::all());
+
+            for (std::size_t row = 0; row < 4; ++row)
+            {
+                for (std::size_t col = 0; col < 3; ++col)
+                {
+                    view(std::size_t{0}, std::size_t{0}, std::size_t{0}, row, col) = true;
+                    EXPECT_TRUE(tensor(row, col));
+                }
+            }
+
+            EXPECT_EQ(tensor, xt::ones<bool>({4, 3}));
+        }
+    }
+
     TEST(xview, in_bounds)
     {
         xt::xtensor<size_t, 2> a = {{0, 1, 2}, {3, 4, 5}};