Added combinedProperty "selectionColor"

Removed selectItem from ComboBox
Fixed a bug in Input when manually setting text property
Added a callback for Toast elements
Readded the state plugin as store plugin

Author: NoryiE

src/elements/Collection.lua

@@ -17,6 +17,9 @@ Collection.defineProperty(Collection, "selectedBackground", {default = colors.bl
 ---@property selectedForeground color white Text color for selected items
 Collection.defineProperty(Collection, "selectedForeground", {default = colors.white, type = "color", canTriggerRender = true})
 
+---@combinedProperty selectionColor {x number, y number} Combined x, y position
+Collection.combineProperties(Collection, "selectionColor", "selectedForeground", "selectedBackground")
+
 ---@event onSelect {index number, item table} Fired when an item is selected
 
 --- Creates a new Collection instance
@@ -123,29 +126,20 @@ end
 
 function Collection:selectItem(index)
     local items = self.getResolved("items")
-    if index < 1 or index > #items then return end
-    local _index = index
-    if type(index) == "string" then
+    if type(index) == "number" then
+        if items[index] and type(items[index]) == "table" then
+            items[index].selected = true
+        end
+    else
         for k,v in pairs(items)do
             if v == index then
-                _index = k
+                if type(v) == "table" then
+                    v.selected = true
+                end
                 break
             end
         end
     end
-    if not self.getResolved("multiSelection") then
-        for _, otherItem in ipairs(items) do
-            if type(otherItem) == "table" then
-                otherItem.selected = false
-            end
-        end
-    end
-    local item = items[_index]
-    item.selected = true
-    if item.callback then
-        item.callback(self)
-    end
-    self:fireEvent("select", index, item)
     self:updateRender()
     return self
 end

src/elements/ComboBox.lua

@@ -74,17 +74,6 @@ function ComboBox:init(props, basalt)
     return self
 end
 
-function ComboBox:selectItem(index)
-    DropDown.selectItem(self, index)
-    local selectedItem = self:getSelectedItem()
-    if selectedItem and selectedItem.text then
-        self.set("text", selectedItem.text)
-        self.set("cursorPos", #selectedItem.text + 1)
-        self:updateViewport()
-    end
-    self:updateRender()
-end
-
 --- Filters items based on current text for auto-complete
 --- @shortDescription Filters items for auto-complete
 --- @private

src/elements/Input.lua

@@ -9,7 +9,16 @@ local Input = setmetatable({}, VisualElement)
 Input.__index = Input
 
 ---@property text string - The current text content of the input
-Input.defineProperty(Input, "text", {default = "", type = "string", canTriggerRender = true})
+Input.defineProperty(Input, "text", {
+    default = "", 
+    type = "string", 
+    canTriggerRender = true, 
+    setter = function(self, value)
+        self.set("cursorPos", math.min(#value + 1, self.getResolved("cursorPos")))
+        self:updateViewport()
+        return value
+    end
+})
 ---@property cursorPos number 1 The current cursor position in the text
 Input.defineProperty(Input, "cursorPos", {default = 1, type = "number"})
 ---@property viewOffset number 0 The horizontal scroll offset for viewing long text
@@ -122,6 +131,20 @@ function Input:key(key, held)
             self:updateRender()
             self:updateViewport()
         end
+    elseif key == keys.delete then
+        if pos <= #text then
+            self.set("text", text:sub(1, pos-1) .. text:sub(pos+1))
+            self:updateRender()
+            self:updateViewport()
+        end
+    elseif key == keys.home then
+        self.set("cursorPos", 1)
+        self.set("viewOffset", 0)
+    elseif key == keys["end"] then
+        self.set("cursorPos", #text + 1)
+        self:set("viewOffset", math.max(0, #text - width + 1))
+    elseif key == keys.enter then
+        self:fireEvent("submit", self.getResolved("text"))
     end
 
     local relativePos = self.getResolved("cursorPos") - self.getResolved("viewOffset")
@@ -174,6 +197,15 @@ function Input:updateViewport()
     return self
 end
 
+--- Registers a callback for the submit event
+--- @shortDescription Registers a callback for the submit event
+--- @param callback function The callback function to register
+--- @return Input self The Input instance
+function Input:onSubmit(callback)
+    self:registerCallback("submit", callback)
+    return self
+end
+
 --- @shortDescription Handles a focus event
 --- @protected
 function Input:focus()

src/elements/Program.lua

@@ -145,6 +145,8 @@ function BasaltProgram:run(path, width, height)
                 local errorCallback = self.program.get("errorCallback")
                 if errorCallback then
                     local trace = debug.traceback(self.coroutine, result)
+                    if trace == nil then trace = "" end
+                    result = result or "Unknown error"
                     local _result = errorCallback(self.program, result, trace:gsub(result, ""))
                     if(_result==false)then
                         self.filter = nil

src/elements/Toast.lua

@@ -21,6 +21,9 @@ Toast.defineProperty(Toast, "duration", {default = 3, type = "number"})
 ---@property toastType string "default" Type of toast: default, success, error, warning, info
 Toast.defineProperty(Toast, "toastType", {default = "default", type = "string", canTriggerRender = true})
 
+---@property callback function nil Callback function to call when the toast hides
+Toast.defineProperty(Toast, "callback", {default = nil, type = "function"})
+
 ---@property autoHide boolean true Whether the toast should automatically hide after duration
 Toast.defineProperty(Toast, "autoHide", {default = true, type = "boolean"})
 
@@ -70,8 +73,9 @@ end
 --- @param titleOrMessage string The title (if message provided) or the message (if no message)
 --- @param messageOrDuration? string|number The message (if string) or duration (if number)
 --- @param duration? number Duration in seconds
+--- @param callback? function Callback function to call when the toast hides
 --- @return Toast self The Toast instance
-function Toast:show(titleOrMessage, messageOrDuration, duration)
+function Toast:show(titleOrMessage, messageOrDuration, duration, callback)
     local title, message, dur
     if type(messageOrDuration) == "string" then
         title = titleOrMessage
@@ -90,6 +94,7 @@ function Toast:show(titleOrMessage, messageOrDuration, duration)
     self.set("title", title)
     self.set("message", message)
     self.set("active", true)
+    self.set("callback", callback)
 
     if self._hideTimerId then
         os.cancelTimer(self._hideTimerId)
@@ -123,43 +128,47 @@ end
 --- @param titleOrMessage string The title or message
 --- @param messageOrDuration? string|number The message or duration
 --- @param duration? number Duration in seconds
+--- @param callback? function Callback function to call when the toast hides
 --- @return Toast self The Toast instance
-function Toast:success(titleOrMessage, messageOrDuration, duration)
+function Toast:success(titleOrMessage, messageOrDuration, duration, callback)
     self.set("toastType", "success")
-    return self:show(titleOrMessage, messageOrDuration, duration)
+    return self:show(titleOrMessage, messageOrDuration, duration, callback)
 end
 
 --- Shows an error toast
 --- @shortDescription Shows an error toast
 --- @param titleOrMessage string The title or message
 --- @param messageOrDuration? string|number The message or duration
 --- @param duration? number Duration in seconds
+--- @param callback? function Callback function to call when the toast hides
 --- @return Toast self The Toast instance
-function Toast:error(titleOrMessage, messageOrDuration, duration)
+function Toast:error(titleOrMessage, messageOrDuration, duration, callback)
     self.set("toastType", "error")
-    return self:show(titleOrMessage, messageOrDuration, duration)
+    return self:show(titleOrMessage, messageOrDuration, duration, callback)
 end
 
 --- Shows a warning toast
 --- @shortDescription Shows a warning toast
 --- @param titleOrMessage string The title or message
 --- @param messageOrDuration? string|number The message or duration
 --- @param duration? number Duration in seconds
+--- @param callback? function Callback function to call when the toast hides
 --- @return Toast self The Toast instance
-function Toast:warning(titleOrMessage, messageOrDuration, duration)
+function Toast:warning(titleOrMessage, messageOrDuration, duration, callback)
     self.set("toastType", "warning")
-    return self:show(titleOrMessage, messageOrDuration, duration)
+    return self:show(titleOrMessage, messageOrDuration, duration, callback)
 end
 
 --- Shows an info toast
 --- @shortDescription Shows an info toast
 --- @param titleOrMessage string The title or message
 --- @param messageOrDuration? string|number The message or duration
 --- @param duration? number Duration in seconds
+--- @param callback? function Callback function to call when the toast hides
 --- @return Toast self The Toast instance
-function Toast:info(titleOrMessage, messageOrDuration, duration)
+function Toast:info(titleOrMessage, messageOrDuration, duration, callback)
     self.set("toastType", "info")
-    return self:show(titleOrMessage, messageOrDuration, duration)
+    return self:show(titleOrMessage, messageOrDuration, duration, callback)
 end
 
 --- @shortDescription Dispatches events to the Toast instance
@@ -169,6 +178,11 @@ function Toast:dispatchEvent(event, ...)
     if event == "timer" then
         local timerId = select(1, ...)
         if timerId == self._hideTimerId then
+            self._hideTimerId = nil
+            local callback = self.getResolved("callback")
+            if callback then
+                callback(self)
+            end
             self:hide()
         end
     end

src/elements/VisualElement.lua

@@ -162,7 +162,7 @@ end
 --- @param offset number The offset to apply (negative = inside, positive = outside, fractional = percentage)
 --- @return VisualElement self The element instance
 function VisualElement:setConstraint(property, targetElement, targetProperty, offset)
-    local constraints = self.getResolved("constraints")
+    local constraints = self.get("constraints")
     if constraints[property] then
         self:_removeConstraintObservers(property, constraints[property])
     end