GabrielTofvesson/cc-utilities
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix state management

Browse Source
This commit is contained in:
Gabriel Tofvesson 2024-10-12 07:51:58 +02:00
parent 1c2f50a3e0
commit b3fdbb898b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
itemcontroller.lua
View File

@ -260,7 +260,7 @@ end
local PAGES = { local PAGES = {
MAIN = function(state) MAIN = function(state)
local pageState = state:currentPageState({}) local pageState = state:currentPageState({}, state.changingPage)
if pageState.stacks == nil then if pageState.stacks == nil then
pageState.stacks = ItemGroup.collectStacks(state.controller:find(function(stack) pageState.stacks = ItemGroup.collectStacks(state.controller:find(function(stack)
@ -307,7 +307,7 @@ local PAGES = {
return renderDefault(state, listResult) return renderDefault(state, listResult)
end, end,
GROUP_DETAIL = function(state, newPage) GROUP_DETAIL = function(state)
local paddingSide = 0 local paddingSide = 0
local paddingTop = 0 local paddingTop = 0
@ -440,7 +440,7 @@ local PAGES = {
return renderDefault(state, stuffContainer) return renderDefault(state, stuffContainer)
end, end,
REQUEST = function(state, newPage) REQUEST = function(state)
local group = state:getExtra() local group = state:getExtra()
if group == nil then if group == nil then
print("No group passed to REQUEST") print("No group passed to REQUEST")
@ -449,11 +449,8 @@ local PAGES = {
end end
local pageState = state:currentPageState( local pageState = state:currentPageState(
{ request = 0, group = group }, { request = 0 },
function(currentPageState) state.changingPage
-- True = reset state
return currentPageState ~= group
end
) )
local itemName = fitText(group:getSimpleName(), state.width) local itemName = fitText(group:getSimpleName(), state.width)
@ -586,7 +583,7 @@ local PAGES = {
state:itemTransaction(function() state:itemTransaction(function()
group:transferTo(state.node) group:transferTo(state.node)
end) end)
state:setPage("Main") state:setPage("MAIN")
return true return true
end, end,
colors.green, colors.green,
@ -683,7 +680,7 @@ function CONTROLLER_STATE:itemTransaction(transact)
end end
function CONTROLLER_STATE:currentPageState(default, override) function CONTROLLER_STATE:currentPageState(default, override)
self.pageState[self.currentPage] = ((not override or (type(override) ~= "function" or not override(self.pageState[self.currentPage]))) and self.pageState[self.currentPage]) or default self.pageState[self.currentPage] = ((not override or ((type(override) == "function") and not override(self.pageState[self.currentPage]))) and self.pageState[self.currentPage]) or default
return self.pageState[self.currentPage] return self.pageState[self.currentPage]
end end