Inline helper.is_enabled, remove unused code, documentation fixes, remove formats and druid_input files, add more tests

test/test.gui_script

@@ -5,6 +5,9 @@ local tests = {
 	require("test.tests.test_button"),
 	require("test.tests.test_hover"),
 	require("test.tests.test_drag"),
+	require("test.tests.test_back_handler"),
+	require("test.tests.test_blocker"),
+	--require("test.tests.test_static_grid"),
 }
 
 

test/tests/test_back_handler.lua

@@ -0,0 +1,40 @@
+local mock_gui = require "deftest.mock.gui"
+local mock_time = require("deftest.mock.time")
+local mock_input = require("test.helper.mock_input")
+local test_helper = require("test.helper.test_helper")
+local druid_system = require("druid.druid")
+
+return function()
+	local druid = nil
+	local context = test_helper.get_context()
+	describe("Back Handler component", function()
+		before(function()
+			mock_gui.mock()
+			mock_time.mock()
+			mock_time.set(60)
+			druid = druid_system.new(context)
+		end)
+
+		after(function()
+			mock_gui.unmock()
+			mock_time.unmock()
+			druid:final(context)
+			druid = nil
+		end)
+
+		it("Should react on back action id with custom args", function()
+			local on_back_handler, on_back_handler_mock = test_helper.get_function()
+			druid:new_back_handler(on_back_handler, { args = "custom" })
+
+			druid:on_input(mock_input.key_pressed("key_back"))
+			druid:on_input(mock_input.key_released("key_back"))
+			assert(on_back_handler_mock.calls == 1)
+			assert(on_back_handler_mock.params[1] == context)
+			assert(on_back_handler_mock.params[2].args  == "custom")
+
+			druid:on_input(mock_input.key_pressed("key_a"))
+			druid:on_input(mock_input.key_released("key_a"))
+			assert(on_back_handler_mock.calls == 1)
+		end)
+	end)
+end

test/tests/test_blocker.lua

@@ -0,0 +1,93 @@
+
+local mock_gui = require "deftest.mock.gui"
+local mock_time = require("deftest.mock.time")
+local mock_input = require("test.helper.mock_input")
+local test_helper = require("test.helper.test_helper")
+local druid_system = require("druid.druid")
+
+return function()
+	local druid = nil
+	local context = test_helper.get_context()
+	describe("Blocker component", function()
+		before(function()
+			mock_gui.mock()
+			mock_time.mock()
+			mock_time.set(60)
+			druid = druid_system.new(context)
+		end)
+
+		after(function()
+			mock_gui.unmock()
+			mock_time.unmock()
+			druid:final(context)
+			druid = nil
+		end)
+
+		it("Should consume input", function()
+			local button_node = mock_gui.add_box("button", 0, 0, 100, 50)
+			local blocker_node = mock_gui.add_box("blocker", 20, 20, 20, 20)
+			local on_click, on_click_mock = test_helper.get_function()
+
+			druid:new_button(button_node, on_click)
+			druid:new_blocker(blocker_node)
+
+			druid:on_input(mock_input.click_pressed(10, 10))
+			druid:on_input(mock_input.click_released(10, 10))
+			assert(on_click_mock.calls == 1)
+
+			-- Click should been consumed by blocker component
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(20, 20))
+			assert(on_click_mock.calls == 1)
+
+			-- If move from button to blocker, should consume too
+			druid:on_input(mock_input.click_pressed(10, 10))
+			druid:on_input(mock_input.click_released(20, 20))
+			assert(on_click_mock.calls == 1)
+
+			-- And from blocker to button too
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(10, 10))
+			assert(on_click_mock.calls == 1)
+		end)
+
+		it("Should be disabled via node or set_enabled", function()
+			local button_node = mock_gui.add_box("button", 0, 0, 100, 50)
+			local blocker_node = mock_gui.add_box("blocker", 20, 20, 20, 20)
+			local on_click, on_click_mock = test_helper.get_function()
+
+			druid:new_button(button_node, on_click)
+			local blocker = druid:new_blocker(blocker_node)
+
+			-- Click should been consumed by blocker component
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(20, 20))
+			assert(on_click_mock.calls == 0)
+
+			-- Disable blocker component
+			blocker:set_enabled(false)
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(20, 20))
+			assert(gui.is_enabled(blocker_node) == true)
+			assert(blocker:is_enabled() == false)
+			assert(on_click_mock.calls == 1)
+
+			-- Disable blocker node component
+			blocker:set_enabled(true)
+			gui.set_enabled(blocker_node, false)
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(20, 20))
+			assert(gui.is_enabled(blocker_node) == false)
+			assert(blocker:is_enabled() == true)
+			assert(on_click_mock.calls == 2)
+
+			-- Return state
+			gui.set_enabled(blocker_node, true)
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(20, 20))
+			assert(gui.is_enabled(blocker_node) == true)
+			assert(blocker:is_enabled() == true)
+			assert(on_click_mock.calls == 2)
+		end)
+	end)
+end

test/tests/test_static_grid.lua

@@ -0,0 +1,43 @@
+local mock_gui = require "deftest.mock.gui"
+local mock_time = require("deftest.mock.time")
+local mock_input = require("test.helper.mock_input")
+local test_helper = require("test.helper.test_helper")
+local druid_system = require("druid.druid")
+
+return function()
+	local druid = nil
+	local context = test_helper.get_context()
+	describe("Static Grid component", function()
+		local parent = nil
+		---@type druid.static_grid
+		local grid = nil
+		local prefab = nil
+
+		before(function()
+			mock_gui.mock()
+			mock_time.mock()
+			mock_time.set(60)
+			druid = druid_system.new(context)
+
+			parent = mock_gui.add_box("parent", 0, 0, 50, 50)
+			prefab = mock_gui.add_box("prefab", 50, 50, 25, 25)
+			grid = druid:new_static_grid(parent, prefab, 3)
+		end)
+
+		after(function()
+			mock_gui.unmock()
+			mock_time.unmock()
+			druid:final(context)
+			druid = nil
+		end)
+
+		it("Should add nodes", function()
+			local nodes = {}
+			for index = 1, 4 do
+				local cloned = gui.clone(prefab)
+				grid:add(cloned)
+				table.insert(nodes, cloned)
+			end
+		end)
+	end)
+end