wuira 0.1.4 → 0.1.5

package/lib/ui/mount.lua

@@ -244,6 +244,38 @@ local function __TS__ArrayMap(self, callbackfn, thisArg)
     end
     return result
 end
+
+local function __TS__InstanceOf(obj, classTbl)
+    if type(classTbl) ~= "table" then
+        error("Right-hand side of 'instanceof' is not an object", 0)
+    end
+    if classTbl[Symbol.hasInstance] ~= nil then
+        return not not classTbl[Symbol.hasInstance](classTbl, obj)
+    end
+    if type(obj) == "table" then
+        local luaClass = obj.constructor
+        while luaClass ~= nil do
+            if luaClass == classTbl then
+                return true
+            end
+            luaClass = luaClass.____super
+        end
+    end
+    return false
+end
+
+local function __TS__ObjectAssign(target, ...)
+    local sources = {...}
+    for i = 1, #sources do
+        local source = sources[i]
+        if type(source) == "table" then
+            for key in pairs(source) do
+                target[key] = source[key]
+            end
+        end
+    end
+    return target
+end
 -- End of Lua Library inline imports
 local ____exports = {}
 local ____measureLayout = require("ui.layout.measureLayout")
@@ -254,6 +286,8 @@ local ____Border = require("ui.decorations.Border")
 local Border = ____Border.Border
 local ____statusBarTextures = require("ui.decorations.statusBarTextures")
 local resolveStatusBarTexture = ____statusBarTextures.resolveStatusBarTexture
+local ____Resources = require("datasources.Resources")
+local HP = ____Resources.HP
 local mountedFrames = __TS__New(Map)
 local mountedTrees = __TS__New(Map)
 function ____exports.unmount(self, frame)
@@ -261,12 +295,16 @@ function ____exports.unmount(self, frame)
     if tree == nil then
         return
     end
+    for ____, dispose in ipairs(tree.bindings) do
+        dispose(nil)
+    end
     for ____, decoration in ipairs(tree.decorations) do
         decoration:dispose()
     end
     for ____, child in ipairs(tree.frames) do
         child:UnregisterAllEvents()
         child:SetScript("OnEvent", nil)
+        child:SetScript("OnUpdate", nil)
         child:Hide()
     end
     for ____, cell in ipairs(tree.cells) do
@@ -369,7 +407,8 @@ function ____exports.mount(self, element, parent, rootAnchor)
             pending,
             function(____, item) return item.cell end
         ),
-        decorations = {}
+        decorations = {},
+        bindings = {}
     }
     mountedTrees:set(root, tree)
     do
@@ -378,20 +417,48 @@ function ____exports.mount(self, element, parent, rootAnchor)
             error(failure, 0)
         end
         local ____try, ____hasReturned = pcall(function()
+            local updates = {}
             for ____, item in ipairs(pending) do
+                local sourceActive = true
+                local lastVisible
+                local visible = item.cell.props.visible
+                local function refreshVisibility()
+                    local ____sourceActive_10 = sourceActive
+                    if ____sourceActive_10 then
+                        local ____temp_9 = visible and visible(nil)
+                        if ____temp_9 == nil then
+                            ____temp_9 = true
+                        end
+                        ____sourceActive_10 = ____temp_9
+                    end
+                    local value = ____sourceActive_10
+                    if value == lastVisible then
+                        return
+                    end
+                    lastVisible = value
+                    if value then
+                        item.frame:Show()
+                    else
+                        item.frame:Hide()
+                    end
+                end
+                local function onActiveChange(____, active)
+                    sourceActive = active
+                    refreshVisibility(nil)
+                end
                 local position = item.cell.props
                 local target = anchors:get(item.frame)
-                local ____opt_7 = item.placement
-                local x = ____opt_7 and ____opt_7.x or (position.mode == "absolute" and position.x or position.offset.x)
-                local ____opt_9 = item.placement
-                local y = ____opt_9 and ____opt_9.y or (position.mode == "absolute" and position.y or position.offset.y)
-                local ____temp_11
+                local ____opt_11 = item.placement
+                local x = ____opt_11 and ____opt_11.x or (position.mode == "absolute" and position.x or position.offset.x)
+                local ____opt_13 = item.placement
+                local y = ____opt_13 and ____opt_13.y or (position.mode == "absolute" and position.y or position.offset.y)
+                local ____temp_15
                 if item.frame == root then
-                    ____temp_11 = rootAnchor
+                    ____temp_15 = rootAnchor
                 else
-                    ____temp_11 = nil
+                    ____temp_15 = nil
                 end
-                local overrideAnchor = ____temp_11
+                local overrideAnchor = ____temp_15
                 local anchor = overrideAnchor or (item.placement ~= nil and "TOPLEFT" or (position.anchor or "TOPLEFT"))
                 local relativeAnchor = overrideAnchor or (item.placement ~= nil and "TOPLEFT" or (position.relativeAnchor or anchor))
                 item.frame:SetPoint(
@@ -401,48 +468,177 @@ function ____exports.mount(self, element, parent, rootAnchor)
                     x + item.margin.left,
                     -(y + item.margin.top)
                 )
+                if item.cell.kind == "label" then
+                    local props = item.cell.props
+                    local label = item.frame:CreateFontString(nil, "OVERLAY")
+                    label:SetAllPoints(item.frame)
+                    label:SetFont(props.font or "Fonts\\FRIZQT__.TTF", props.fontSize or 12, "OUTLINE")
+                    label:SetJustifyH(props.align or "LEFT")
+                    label:SetJustifyV("MIDDLE")
+                    local color = props.color
+                    label:SetTextColor(color and color.r or 1, color and color.g or 1, color and color.b or 1, color and color.a or 1)
+                    local text = props.text
+                    if type(text) == "function" then
+                        local previous
+                        updates[#updates + 1] = function()
+                            local value = text(nil)
+                            if issecretvalue(value) or value ~= previous then
+                                label:SetText(value)
+                            end
+                            if not issecretvalue(value) then
+                                previous = value
+                            end
+                        end
+                    else
+                        label:SetText(text)
+                    end
+                end
+                if item.cell.kind == "icon" then
+                    local props = item.cell.props
+                    local texture = item.frame:CreateTexture(nil, "OVERLAY")
+                    texture:SetAllPoints(item.frame)
+                    local uv = props.texCoords or ({0, 1, 0, 1})
+                    texture:SetTexCoord(uv[1], uv[2], uv[3], uv[4])
+                    texture:SetTexture(props.texture)
+                    local ____opt_24 = props.textureSource
+                    if ____opt_24 ~= nil then
+                        ____opt_24:BindTo(item.frame, texture, onActiveChange)
+                    end
+                end
                 if item.cell.kind == "progress" then
                     local props = item.cell.props
                     local bar = item.frame
-                    local ____opt_12 = props.foreground
-                    local color = ____opt_12 and ____opt_12.color or props.color
-                    local ____bar_SetStatusBarTexture_17 = bar.SetStatusBarTexture
-                    local ____resolveStatusBarTexture_16 = resolveStatusBarTexture
-                    local ____opt_14 = props.foreground
-                    ____bar_SetStatusBarTexture_17(
+                    local ____opt_26 = props.foreground
+                    local color = ____opt_26 and ____opt_26.color or props.color
+                    local ____bar_SetStatusBarTexture_31 = bar.SetStatusBarTexture
+                    local ____resolveStatusBarTexture_30 = resolveStatusBarTexture
+                    local ____opt_28 = props.foreground
+                    ____bar_SetStatusBarTexture_31(
                         bar,
-                        ____resolveStatusBarTexture_16(nil, ____opt_14 and ____opt_14.texture or props.texture or "solid")
+                        ____resolveStatusBarTexture_30(nil, ____opt_28 and ____opt_28.texture or props.texture or "solid")
                     )
                     bar:SetStatusBarColor(color and color.r or 1, color and color.g or 1, color and color.b or 1, color and color.a or 1)
                     if props.foreground ~= nil then
                         local fill = bar:GetStatusBarTexture()
-                        local ____fill_SetHorizTile_27 = fill.SetHorizTile
-                        local ____props_foreground_tileX_26 = props.foreground.tileX
-                        if ____props_foreground_tileX_26 == nil then
-                            ____props_foreground_tileX_26 = false
+                        local ____fill_SetHorizTile_41 = fill.SetHorizTile
+                        local ____props_foreground_tileX_40 = props.foreground.tileX
+                        if ____props_foreground_tileX_40 == nil then
+                            ____props_foreground_tileX_40 = false
                         end
-                        ____fill_SetHorizTile_27(fill, ____props_foreground_tileX_26)
-                        local ____fill_SetVertTile_29 = fill.SetVertTile
-                        local ____props_foreground_tileY_28 = props.foreground.tileY
-                        if ____props_foreground_tileY_28 == nil then
-                            ____props_foreground_tileY_28 = false
+                        ____fill_SetHorizTile_41(fill, ____props_foreground_tileX_40)
+                        local ____fill_SetVertTile_43 = fill.SetVertTile
+                        local ____props_foreground_tileY_42 = props.foreground.tileY
+                        if ____props_foreground_tileY_42 == nil then
+                            ____props_foreground_tileY_42 = false
                         end
-                        ____fill_SetVertTile_29(fill, ____props_foreground_tileY_28)
+                        ____fill_SetVertTile_43(fill, ____props_foreground_tileY_42)
                         fill:SetBlendMode(props.foreground.blendMode or "BLEND")
                         local uv = props.foreground.texCoords or ({0, 1, 0, 1})
                         fill:SetTexCoord(uv[1], uv[2], uv[3], uv[4])
                     end
                     bar:SetOrientation(props.orientation == "vertical" and "VERTICAL" or "HORIZONTAL")
-                    local ____bar_SetReverseFill_31 = bar.SetReverseFill
-                    local ____props_reverse_30 = props.reverse
-                    if ____props_reverse_30 == nil then
-                        ____props_reverse_30 = false
+                    local ____bar_SetReverseFill_45 = bar.SetReverseFill
+                    local ____props_reverse_44 = props.reverse
+                    if ____props_reverse_44 == nil then
+                        ____props_reverse_44 = false
                     end
-                    ____bar_SetReverseFill_31(bar, ____props_reverse_30)
+                    ____bar_SetReverseFill_45(bar, ____props_reverse_44)
                     bar:SetMinMaxValues(props.min or 0, props.max or 100)
                     local source = item.cell.source or props.source
                     if source ~= nil then
-                        source:BindTo(bar, {min = props.min, max = props.max, current = props.current or props.value})
+                        local healPredictionBar
+                        local absorbPredictionBar
+                        if __TS__InstanceOf(source, HP) then
+                            local function overlay(____, style, heal)
+                                bar:SetClipsChildren(true)
+                                local layer = CreateFrame("StatusBar", nil, bar)
+                                local ____tree_frames_46 = tree.frames
+                                ____tree_frames_46[#____tree_frames_46 + 1] = layer
+                                layer:EnableMouse(false)
+                                layer:SetFrameLevel(bar:GetFrameLevel())
+                                layer:SetSize(item.width, item.height)
+                                layer:SetStatusBarTexture(resolveStatusBarTexture(nil, style.texture or "solid"))
+                                local tint = style.color
+                                layer:SetStatusBarColor(tint.r, tint.g, tint.b, tint.a or 0.5)
+                                local texture = layer:GetStatusBarTexture()
+                                texture:SetBlendMode(style.blendMode or "BLEND")
+                                local ____texture_SetHorizTile_48 = texture.SetHorizTile
+                                local ____style_tileX_47 = style.tileX
+                                if ____style_tileX_47 == nil then
+                                    ____style_tileX_47 = false
+                                end
+                                ____texture_SetHorizTile_48(texture, ____style_tileX_47)
+                                local ____texture_SetVertTile_50 = texture.SetVertTile
+                                local ____style_tileY_49 = style.tileY
+                                if ____style_tileY_49 == nil then
+                                    ____style_tileY_49 = false
+                                end
+                                ____texture_SetVertTile_50(texture, ____style_tileY_49)
+                                local uv = style.texCoords or ({0, 1, 0, 1})
+                                texture:SetTexCoord(uv[1], uv[2], uv[3], uv[4])
+                                local vertical = props.orientation == "vertical"
+                                local ____props_reverse_51 = props.reverse
+                                if ____props_reverse_51 == nil then
+                                    ____props_reverse_51 = false
+                                end
+                                local reverse = ____props_reverse_51
+                                layer:SetOrientation(vertical and "VERTICAL" or "HORIZONTAL")
+                                local ____layer_SetReverseFill_53 = layer.SetReverseFill
+                                local ____heal_52
+                                if heal then
+                                    ____heal_52 = reverse
+                                else
+                                    ____heal_52 = not reverse
+                                end
+                                ____layer_SetReverseFill_53(layer, ____heal_52)
+                                if heal then
+                                    local point = vertical and (reverse and "TOPLEFT" or "BOTTOMLEFT") or (reverse and "TOPRIGHT" or "TOPLEFT")
+                                    local relative = vertical and (reverse and "BOTTOMLEFT" or "TOPLEFT") or (reverse and "TOPLEFT" or "TOPRIGHT")
+                                    layer:SetPoint(
+                                        point,
+                                        bar:GetStatusBarTexture(),
+                                        relative,
+                                        0,
+                                        0
+                                    )
+                                else
+                                    layer:SetAllPoints(bar)
+                                end
+                                return layer
+                            end
+                            local ____opt_54 = source.HealPrediction
+                            if (____opt_54 and ____opt_54.IsAvailable) == true and props.healPrediction ~= false then
+                                local ____props_healPrediction_58 = props.healPrediction
+                                local ____opt_56 = props.healPrediction
+                                healPredictionBar = overlay(
+                                    nil,
+                                    __TS__ObjectAssign({}, ____props_healPrediction_58, {color = ____opt_56 and ____opt_56.color or ({r = 0.4, g = 1, b = 0.5, a = 0.5})}),
+                                    true
+                                )
+                            end
+                            local ____opt_59 = source.AbsorbPrediction
+                            if (____opt_59 and ____opt_59.IsAvailable) == true and props.absorbPrediction ~= false then
+                                local ____props_absorbPrediction_63 = props.absorbPrediction
+                                local ____opt_61 = props.absorbPrediction
+                                absorbPredictionBar = overlay(
+                                    nil,
+                                    __TS__ObjectAssign({}, ____props_absorbPrediction_63, {color = ____opt_61 and ____opt_61.color or ({r = 0.8, g = 0.9, b = 1, a = 0.55})}),
+                                    false
+                                )
+                            end
+                        end
+                        local dispose = source:BindTo(bar, {
+                            min = props.min,
+                            max = props.max,
+                            current = props.current or props.value,
+                            onActiveChange = onActiveChange,
+                            healPredictionBar = healPredictionBar,
+                            absorbPredictionBar = absorbPredictionBar
+                        })
+                        if dispose ~= nil then
+                            local ____tree_bindings_64 = tree.bindings
+                            ____tree_bindings_64[#____tree_bindings_64 + 1] = dispose
+                        end
                     else
                         bar:SetValue(props.current or props.value or 0)
                     end
@@ -451,30 +647,56 @@ function ____exports.mount(self, element, parent, rootAnchor)
                 local function attach(self, decoration)
                     if decoration ~= nil then
                         decoration:mount(item.frame, item.width, item.height)
-                        local ____tree_decorations_32 = tree.decorations
-                        ____tree_decorations_32[#____tree_decorations_32 + 1] = decoration
+                        local ____tree_decorations_65 = tree.decorations
+                        ____tree_decorations_65[#____tree_decorations_65 + 1] = decoration
                     end
                 end
                 local progress = item.cell.kind == "progress" and item.cell.props or nil
-                local ____attach_40 = attach
-                local ____temp_39
+                local ____attach_73 = attach
+                local ____temp_72
                 if (progress and progress.background) == false then
-                    ____temp_39 = nil
+                    ____temp_72 = nil
                 else
-                    ____temp_39 = (progress and progress.background) ~= nil and __TS__New(Background, progress.background) or decorations and decorations.background
+                    ____temp_72 = (progress and progress.background) ~= nil and __TS__New(Background, progress.background) or decorations and decorations.background
                 end
-                ____attach_40(nil, ____temp_39)
-                local ____attach_48 = attach
-                local ____temp_47
+                ____attach_73(nil, ____temp_72)
+                local ____attach_81 = attach
+                local ____temp_80
                 if (progress and progress.backdrop) == false then
-                    ____temp_47 = nil
+                    ____temp_80 = nil
                 else
-                    ____temp_47 = (progress and progress.backdrop) ~= nil and __TS__New(Border, progress.backdrop) or decorations and decorations.border
+                    ____temp_80 = (progress and progress.backdrop) ~= nil and __TS__New(Border, progress.backdrop) or decorations and decorations.border
                 end
-                ____attach_48(nil, ____temp_47)
+                ____attach_81(nil, ____temp_80)
                 attach(nil, decorations and decorations.glow)
                 mountedFrames:set(item.cell.props, item.frame)
-                item.frame:Show()
+                refreshVisibility(nil)
+                if visible ~= nil then
+                    updates[#updates + 1] = refreshVisibility
+                end
+            end
+            if #updates > 0 then
+                local driver = CreateFrame("Frame", nil, parent)
+                local ____tree_frames_84 = tree.frames
+                ____tree_frames_84[#____tree_frames_84 + 1] = driver
+                local elapsed = 0
+                driver:SetScript(
+                    "OnUpdate",
+                    function(_frame, delta)
+                        elapsed = elapsed + delta
+                        if elapsed < 0.05 then
+                            return
+                        end
+                        elapsed = 0
+                        for ____, update in ipairs(updates) do
+                            update(nil)
+                        end
+                    end
+                )
+                for ____, update in ipairs(updates) do
+                    update(nil)
+                end
+                driver:Show()
             end
         end)
         if not ____try then

package/lib/ui/primitives/jsx.d.ts

@@ -3,18 +3,21 @@ import type { FlowLayoutProps } from "../FlowLayout";
 import type { GridLayoutProps } from "../GridLayout";
 import type { ProgressBarProps } from "../ProgressBar";
 import type { ProgressSource } from "../../datasources/ProgressSource";
+import type { TimerSource } from "../../datasources/TimerSource";
+import type { LabelProps } from "../Label";
+import type { IconProps } from "../Icon";
 /** Declarative UI description; native frames are created by mount. */
 export interface Element {
     kind: string;
     props: object;
     child?: Element;
     children?: Element[];
-    source?: ProgressSource;
+    source?: ProgressSource | TimerSource;
 }
 export type Component<P extends object> = (props: P, child?: Element) => Element;
 export declare namespace UI {
     function Fragment(): Element;
-    function createElement<P extends object>(component: Component<P> | "cell" | "flow" | "grid" | "progress", props: P | undefined, ...children: (Element | Element[])[]): Element;
+    function createElement<P extends object>(component: Component<P> | "cell" | "flow" | "grid" | "progress" | "label" | "icon", props: P | undefined, ...children: (Element | Element[])[]): Element;
     namespace JSX {
         type Element = import("./jsx").Element;
         interface ElementChildrenAttribute {
@@ -33,6 +36,8 @@ export declare namespace UI {
             progress: Partial<ProgressBarProps> & {
                 child?: Element;
             };
+            label: Partial<LabelProps>;
+            icon: Partial<IconProps>;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wuira",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "author": {
     "name": "Kerim Cetinbas",
     "email": "a.cetinbas@icloud.com"