Merge branch 'master' into ff/lighting

NEWS.md

@@ -10,6 +10,8 @@
 - Refactored the `SurfaceLike` family of traits into `VertexBasedGrid`, `CellBasedGrid` and `ImageLike`. [#3106](https://github.com/MakieOrg/Makie.jl/pull/3106)
 - Added `shading = :verbose` in GLMakie to allow for multiple light sources. Also added more light types, fixed light directions for the previous lighting model (now `shading = :fast`) and adjusted `backlight` to affect normals. [#3246](https://github.com/MakieOrg/Makie.jl/pull/3246)
 
+- Fixed a bug where Axis still consumes scroll events when interactions are disabled [#3272](https://github.com/MakieOrg/Makie.jl/pull/3272)
+
 ## v0.19.11
 
 - Setup automatic colorbars for volumeslices [#3253](https://github.com/MakieOrg/Makie.jl/pull/3253).

src/makielayout/blocks/axis.jl

@@ -42,8 +42,8 @@ function register_events!(ax, scene)
 
     on(scene, evs.scroll) do s
         if is_mouseinside(scene)
-            scrollevents[] = ScrollEvent(s[1], s[2])
-            return Consume(true)
+            result = setindex!(scrollevents, ScrollEvent(s[1], s[2]))
+            return Consume(result)
         end
         return Consume(false)
     end

test/events.jl

@@ -440,4 +440,47 @@ Base.:(==)(l::Or, r::Or) = l.left == r.left && l.right == r.right
         @test eventlog[7].px == Point2f(400, 400)
         empty!(eventlog)
     end
+
+    # TODO: test more
+    @testset "Axis Interactions" begin
+        f = Figure(resolution = (400, 400))
+        a = Axis(f[1, 1])
+        e = events(f)
+
+        names = (:rectanglezoom, :dragpan, :limitreset, :scrollzoom)
+        @test keys(a.interactions) == Set(names)
+
+        types = (Makie.RectangleZoom, Makie.DragPan, Makie.LimitReset, Makie.ScrollZoom)
+        for (name, type) in zip(names, types)
+            @test a.interactions[name][1] == true
+            @test a.interactions[name][2] isa type
+        end
+
+        blocked = Observable(true)
+        on(x -> blocked[] = false, e.scroll, priority = typemin(Int))
+
+        @assert !is_mouseinside(a.scene)
+        e.scroll[] = (0.0, 0.0)
+        @test !blocked[]
+        blocked[] = true
+        e.scroll[] = (0.0, 1.0)
+        @test !blocked[]
+
+        blocked[] = true
+        e.mouseposition[] = (200, 200)
+        e.scroll[] = (0.0, 0.0)
+        @test blocked[] # TODO: should it block?
+        blocked[] = true
+        e.scroll[] = (0.0, 1.0)
+        @test blocked[]
+
+        deactivate_interaction!.((a,), names)
+
+        blocked[] = true
+        e.scroll[] = (0.0, 0.0)
+        @test !blocked[]
+        blocked[] = true
+        e.scroll[] = (0.0, 1.0)
+        @test !blocked[]
+    end
 end